Cleanup and version bumps

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

4 files changed, 39 insertions, 35 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index f5b14823f6b5..c0684f4ecf5a 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.270 2014/08/02 18:20:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.271 2014/08/15 12:03:17 idl0r Exp $
+
+*bind-tools-9.10.0_p2 (15 Aug 2014)
+*bind-tools-9.9.5_p1 (15 Aug 2014)
+
+  15 Aug 2014; Christian Ruppert <idl0r@gentoo.org>
+  -bind-tools-9.9.3_p2.ebuild, -bind-tools-9.9.4.ebuild,
+  +bind-tools-9.9.5_p1.ebuild, +bind-tools-9.10.0_p2.ebuild,
+  -files/bind-libxml2-2.8.x.patch:
+  Cleanup and version bumps
 
   02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> bind-tools-9.9.5.ebuild:
   Stable for ppc64, wrt bug #506796
diff --git a/net-dns/bind-tools/bind-tools-9.9.3_p2.ebuild b/net-dns/bind-tools/bind-tools-9.10.0_p2.ebuild
index aa6c75c40070..91e23dcccae2 100644
--- a/net-dns/bind-tools/bind-tools-9.9.3_p2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.10.0_p2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.9.3_p2.ebuild,v 1.13 2014/01/18 18:17:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.10.0_p2.ebuild,v 1.1 2014/08/15 12:03:17 idl0r Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils autotools flag-o-matic toolchain-funcs
 
@@ -17,11 +17,14 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gssapi idn ipv6 readline ssl urandom xml"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc gost gssapi idn ipv6 readline ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
+REQUIRED_USE="gost? ( ssl )"
+
 DEPEND="ssl? ( dev-libs/openssl:0 )
+	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
 	xml? ( dev-libs/libxml2 )
 	idn? ( net-dns/idnkit )
 	gssapi? ( virtual/krb5 )
@@ -30,6 +33,9 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+# bug 479092, requires networking
+RESTRICT="test"
+
 src_prepare() {
 	# bug 231247
 	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
@@ -38,7 +44,8 @@ src_prepare() {
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
 	# bug #220361
-	rm {aclocal,libtool}.m4
+	rm aclocal.m4
+	rm -rf libtool.m4/
 	eautoreconf
 }
 
@@ -65,6 +72,7 @@ src_configure() {
 		$(use_with xml libxml2) \
 		$(use_with gssapi) \
 		$(use_with readline) \
+		$(use_with gost) \
 		${myconf}
 
 	# bug #151839
@@ -75,6 +83,7 @@ src_compile() {
 	local AR=$(tc-getAR)
 
 	emake AR=$AR -C lib/ || die "emake lib failed"
+	emake AR=$AR -C bin/delv/ || die "emake bin/delv failed"
 	emake AR=$AR -C bin/dig/ || die "emake bin/dig failed"
 	emake AR=$AR -C bin/nsupdate/ || die "emake bin/nsupdate failed"
 	emake AR=$AR -C bin/dnssec/ || die "emake bin/dnssec failed"
@@ -83,6 +92,10 @@ src_compile() {
 src_install() {
 	dodoc README CHANGES FAQ
 
+	cd "${S}"/bin/delv
+	dobin delv
+	doman delv.1
+
 	cd "${S}"/bin/dig
 	dobin dig host nslookup
 	doman {dig,host,nslookup}.1
diff --git a/net-dns/bind-tools/bind-tools-9.9.4.ebuild b/net-dns/bind-tools/bind-tools-9.9.5_p1.ebuild
index 82f8a7eda3f1..9c7570dca98e 100644
--- a/net-dns/bind-tools/bind-tools-9.9.4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.9.5_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.9.4.ebuild,v 1.11 2014/03/19 16:15:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.9.5_p1.ebuild,v 1.1 2014/08/15 12:03:17 idl0r Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils autotools flag-o-matic toolchain-funcs
 
@@ -17,11 +17,14 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gssapi idn ipv6 readline ssl urandom xml"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc gost gssapi idn ipv6 readline ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
+REQUIRED_USE="gost? ( ssl )"
+
 DEPEND="ssl? ( dev-libs/openssl:0 )
+	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
 	xml? ( dev-libs/libxml2 )
 	idn? ( net-dns/idnkit )
 	gssapi? ( virtual/krb5 )
@@ -30,6 +33,9 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+# bug 479092, requires networking
+RESTRICT="test"
+
 src_prepare() {
 	# bug 231247
 	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
@@ -66,6 +72,7 @@ src_configure() {
 		$(use_with xml libxml2) \
 		$(use_with gssapi) \
 		$(use_with readline) \
+		$(use_with gost) \
 		${myconf}
 
 	# bug #151839
diff --git a/net-dns/bind-tools/files/bind-libxml2-2.8.x.patch b/net-dns/bind-tools/files/bind-libxml2-2.8.x.patch
deleted file mode 100644
index 539f5a47ca40..000000000000
--- a/net-dns/bind-tools/files/bind-libxml2-2.8.x.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d2da04f6e412b1c115ceb8c2fb857c724de1faa7 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Sat, 28 Jul 2012 21:42:36 +0200
-Subject: [PATCH] Detect libxml2-2.8.x
-
----
- configure.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 2c3f1f2..b0d5ff7 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1222,7 +1222,7 @@ case "$use_libxml2" in
- 		;;
- 	auto|yes)
- 		case X`(xml2-config --version) 2>/dev/null` in
--		X2.[[67]].*)
-+		X2.[[678]].*)
- 			libxml2_libs=`xml2-config --libs`
- 			libxml2_cflags=`xml2-config --cflags`
- 			;;
--- 
-1.7.3.4
-