Version bump to 9.8.1. Some cleanup.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 27 insertions, 26 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 5f8e6dda8bdf..22e3289109f3 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.196 2011/06/02 10:54:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.197 2011/09/02 15:07:36 idl0r Exp $
+
+*bind-tools-9.8.1 (02 Sep 2011)
+
+  02 Sep 2011; Christian Ruppert <idl0r@gentoo.org> -bind-tools-9.8.0.ebuild,
+  +bind-tools-9.8.1.ebuild, metadata.xml:
+  Version bump to 9.8.1. Some cleanup.
 
   02 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   bind-tools-9.8.0.ebuild:
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 46a23b8c3d65..e7bc5fe37736 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 RMD160 c14e44da385b69d80e0635f56a3d3a3eda7471d9 SHA1 9297301e6b43d5887b3d40b7a97c1ee6c015cd38 SHA256 5e39cd20da4f2b3bf5ee352d73249c105de1e182c595afb20a15e950f2f88f02
 AUX bind-tools-configure.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST bind-9.7.3.tar.gz 7653584 RMD160 9e53c9cefa2e8261bc52b5d6d7ed550891d9dce5 SHA1 78e14b3d3e653a8c21b098361b645dee5ed66238 SHA256 7c584ca838da4adb6e94e4507b97b180248ca2b1e6aec1513336b58b344a29f7
-DIST bind-9.8.0.tar.gz 7760161 RMD160 648ed29a16a0bb3202e177ea3762301ed00f1cde SHA1 33019694ef3119d9daa1e8ff5117a6688e188528 SHA256 e44183f5a4ab7d3deb3c08171c4821c391d6b10ed8d4bc6485a1fc3ba6490c06
+DIST bind-9.8.1.tar.gz 8450567 RMD160 a1a49ce0b1b6a5c6dd339fe160920cd4f39e2372 SHA1 7e6ed6ebc896b1de33a9f440233066c60539de4c SHA256 02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c
 EBUILD bind-tools-9.7.3.ebuild 2147 RMD160 9f242789eeb1e2e6575dcb93420967eff81680a7 SHA1 9a7d0574190cbcef267da6b0d1739f828ed16063 SHA256 717d44766969ebd19b7b2a79ffe243011d313d35a1225ec6c3a7671b694b9cf1
-EBUILD bind-tools-9.8.0.ebuild 2233 RMD160 e0d3b5e958c382a0a8d83f0aa1901a65c30ae90c SHA1 2ee151481efd7adf0cad9960d02c1fe250909538 SHA256 9ba5f8cf17e82379a1e81b4be629be09ddb442d83d4d36111ebd40dce92a8807
-MISC ChangeLog 29025 RMD160 4ad3ca0200d40b5dbe46fc78858203de3cafcfe3 SHA1 00c581cfdaa4a6ec4523b08c0f79ee046029a9de SHA256 133cd61b00a455d56057fc5fb27c9c238ec3615dfe9cbf9cc853b92012acb004
-MISC metadata.xml 404 RMD160 195b3b18d3e39f54752a237fb4cb5a3b81711693 SHA1 efcb09b5b1b373bfc8752ceb0e2d3c8a0ddf3406 SHA256 154ff8de1840636e48824951b20e2d2f3246f33f83abe2651f9d61ec5cd24d60
+EBUILD bind-tools-9.8.1.ebuild 2047 RMD160 7cab00b895ed520f0437668fb3ee3ba4005039ff SHA1 9ddc57caa3ad8a86c47cc9dd985cd97a1e2f0db4 SHA256 f692dd89edd5d67a9c316e744d53af9a4fe3c4201a69dc9fea2c0f1c95e0005c
+MISC ChangeLog 29214 RMD160 8af539dc9838c77ce53ffc5412b637c5a17509b0 SHA1 c80022c9aeefe233afd784fdae24edf2b55f4a97 SHA256 dd8e811882b4f7bd4541ebcac2d682e15258d0549339ef1acb6d5b1ad6b2587d
+MISC metadata.xml 477 RMD160 c74cf7f96347ec0c3d1cc214b9ea32c9f1005502 SHA1 e38b5a455371ff74db0dbae7bfc726436e32f426 SHA256 4a01813570119a3fffc49cfb4e98a33169a43e58c87c71e41c7acb5a9b459cfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3na7cACgkQAiZjviIA2XhmYwCfe7OeYjcvwBhgQPX7+Cq4Dk+b
-TykAnA/IVIH02C37wrrAjVmfyh2PSx6l
-=St/s
+iQEcBAEBCAAGBQJOYPE+AAoJEMOx0zmdw4Z15sIIAIpdD+vUASCOY5g2S6Msk3eA
+Iydv1seFmI6WM+b5gH0W5Yk2hws4IUsR0CrXLNkXAzNv4ejk8s7CPf2XXtvMmOrZ
+bIRjm4JFO4DRWC7bhjL2fzSrWK2LK/HIVmrs8N9umQjQOPLcIVKIeKxdz/V4IY7r
+1cJ+hEA3Y4Wbej3/ANGU0s4i045mxoScpFcYPiF5xNxxqWNCO+5uEAXLT6obpKvq
+vmpBhk6LBnP7uKDcLBTE4FziRogmXyRLkmTkmZ0A+x1tP5KUjp3L7oGtK9xgavTh
+s3dypY7ofy7k8MZUFTASdnUhAk02wnTkRw5R89RHZZNUH0QtKM+j8XaFRrk2JFk=
+=v1LU
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind-tools/bind-tools-9.8.0.ebuild b/net-dns/bind-tools/bind-tools-9.8.1.ebuild
index c786aa0921c0..08f7781f593d 100644
--- a/net-dns/bind-tools/bind-tools-9.8.0.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.8.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.8.0.ebuild,v 1.2 2011/06/02 10:54:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.8.1.ebuild,v 1.1 2011/09/02 15:07:37 idl0r Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils autotools flag-o-matic toolchain-funcs
 
@@ -18,37 +18,27 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc idn ipv6 ssl urandom xml"
+IUSE="doc idn ipv6 pkcs11 ssl urandom xml"
 
 DEPEND="ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
-	idn? (
-		virtual/libiconv
-		net-dns/idnkit
-		)"
+	idn? ( net-dns/idnkit )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	# bug 122597
-	use idn && {
-		cd "${S}"/contrib/idn/idnkit-1.0-src
-		epatch "${FILESDIR}"/${PN}-configure.patch
-		cd "${S}"
-	}
-
 	# bug 231247
 	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
 
+	# bug #220361
+	rm {aclocal,libtool}.m4
 	eautoreconf
 }
 
 src_configure() {
 	local myconf=
 
-	has_version sys-libs/glibc || myconf="${myconf} --with-iconv"
-
 	if use urandom; then
 		myconf="${myconf} --with-randomdev=/dev/urandom"
 	else
@@ -61,10 +51,10 @@ src_configure() {
 	tc-export BUILD_CC
 	econf \
 		$(use_enable ipv6) \
-		$(use_enable kernel_linux epoll) \
 		$(use_with idn) \
 		$(use_with ssl openssl) \
 		$(use_with xml libxml2) \
+		$(use_with pkcs11) \
 		${myconf}
 
 	# bug #151839
diff --git a/net-dns/bind-tools/metadata.xml b/net-dns/bind-tools/metadata.xml
index 41c24e40b3b1..7ab404eecad3 100644
--- a/net-dns/bind-tools/metadata.xml
+++ b/net-dns/bind-tools/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Christian Ruppert</name>
 	</maintainer>
 	<use>
+		<flag name="pkcs11">Enable PKCS#11 key support/tools for DNSSEC</flag>
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 	</use>
 	<longdescription>ISC's Bind DNS' server tools</longdescription>