Version bump to 9.7.2-P2. Remove old 9.4.3-P4.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 106 insertions, 87 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 8125fa106959..22d82e5199a8 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.165 2010/10/01 14:11:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.166 2010/10/05 15:47:56 idl0r Exp $
+
+*bind-tools-9.7.2_p2 (05 Oct 2010)
+
+  05 Oct 2010; Christian Ruppert <idl0r@gentoo.org>
+  -bind-tools-9.4.3_p4.ebuild, +bind-tools-9.7.2_p2.ebuild:
+  Version bump to 9.7.2-P2. Remove old 9.4.3-P4.
 
   01 Oct 2010; Brent Baude <ranger@gentoo.org> bind-tools-9.6.2_p2.ebuild,
   bind-tools-9.7.1.ebuild:
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 9832d8854145..e942372325c7 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,13 +1,13 @@
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 RMD160 c14e44da385b69d80e0635f56a3d3a3eda7471d9 SHA1 9297301e6b43d5887b3d40b7a97c1ee6c015cd38 SHA256 5e39cd20da4f2b3bf5ee352d73249c105de1e182c595afb20a15e950f2f88f02
 AUX bind-tools-9.6.1-parallel.patch 386 RMD160 a48bdcf7fe020e55c64a692852b6ca71849d6a1c SHA1 cfbf5b9b9bf24cb564eef60716cfa19a89c05c9a SHA256 bc4d39f01190e890590a9841ae682bc68062a1202f67e649a90712ab19f89428
 AUX bind-tools-configure.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
-DIST bind-9.4.3-P4.tar.gz 6545707 RMD160 e8757d67dbdeb6c0f2c88860214a48c1bd6c8132 SHA1 16686bec02960ba5541852031352acdc12971b7e SHA256 6374354f72a25335ae54799e84f2f0f90b94e8849084ef50709ea8eef8534fc9
 DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939
 DIST bind-9.6.2-P2.tar.gz 6543309 RMD160 0706aa4f4f6cd4927d2e8ff72d5fb8a91be94fa9 SHA1 fce8067d3ff03366d5ee305adf941b5c41e41d07 SHA256 233404ea08c4880eb867ee4e1084d96cff748a2bdd8857014203bef511f17e64
 DIST bind-9.7.1.tar.gz 7547503 RMD160 eb57f77ed9afc3481e698668c3a54c254829d8a4 SHA1 e2540c02b8979b5c8a7303e5a0081c00f9cee7ae SHA256 0a720ea095f5d9fddf76571e3f39ec07f0300e1f0970330f74d340e2f8bea8c8
-EBUILD bind-tools-9.4.3_p4.ebuild 2083 RMD160 5f2718d0676b74b5a0d8c39e0107ef8756fd9e6b SHA1 673822794bc34794c9da4715b95a7e81e645c203 SHA256 74cf6e4eae2dd934af41af5ee3582c8c2c9e26495726253df57fb6ceb61e2f06
+DIST bind-9.7.2-P2.tar.gz 7573857 RMD160 dcc8bf34d0e72c53257d9ac61f88fd0f3f039672 SHA1 ad143fa002d16352648c651ac12471258971a0d1 SHA256 e6d5938184066fc793c28ff975e09e9721116aede2a2d6d93b1be5e8654a5c8a
 EBUILD bind-tools-9.4.3_p5.ebuild 2083 RMD160 b1f335b764b8197ca19c5415b36350761ad5d25b SHA1 f6dc623e7a5da2536e128aa5de5aea3ede110ca8 SHA256 1f985a6281d652d2b01a5a5275501672d103183d572d2cf918554da1bd69160f
 EBUILD bind-tools-9.6.2_p2.ebuild 2069 RMD160 db7486212c47ca87a978a36f2fa8d6787d96d714 SHA1 ad2f73e987159371bd8b975be395836d429bec3d SHA256 6ecf54a41d6a67dc3919611c28cec85ba81876993389fe65fee15997d0a376e2
 EBUILD bind-tools-9.7.1.ebuild 2094 RMD160 d09088dce414def1f4a652b6dbbd9a323c3b079c SHA1 054aff725b7664f8748777e261468dc8cb9c6958 SHA256 c0ae73221db6224fc506506b4a3469e31a56fc761a24d15a04376cb1ef6eb905
-MISC ChangeLog 23838 RMD160 f793b5292d8be2032c9883702ff761a96ad3cee1 SHA1 4a2c30b2c4131d7dd96257f4189dd32ed26c902f SHA256 9f8cd7175ebf110e1eddec587f62b341894a69f91931b8c329e87e531de0620d
+EBUILD bind-tools-9.7.2_p2.ebuild 2101 RMD160 b20f41ac48add8bd0d27fb5bcbbc2eb21490ceac SHA1 f7e4d59cea03e700aeffb1c7bc25e2e3e63200e0 SHA256 984dcc7f809a357e479777b46a3b21a5a93813444a3b963ba6620af70b290c0c
+MISC ChangeLog 24035 RMD160 f91941155261d1bc880f3f1c72a72e0f03dc8aa6 SHA1 a3ebc5191ea56937d6fc7c4e4d1546ff773eb2d0 SHA256 f18c4e72eab3146415bb564e61adc4bb191829733c7fd3f8a442a62e5985e77c
 MISC metadata.xml 505 RMD160 57f122da1d663760d4f721958d0c3b12e54e5fb8 SHA1 45be033d6ef8bf2c94cd49ecf447860b78d311e6 SHA256 0a51967cc58dc3253474f5da5020072534fdc58c84f5a8a3c25684c1d556fef8
diff --git a/net-dns/bind-tools/bind-tools-9.4.3_p4.ebuild b/net-dns/bind-tools/bind-tools-9.4.3_p4.ebuild
deleted file mode 100644
index 542c1cdc8274..000000000000
--- a/net-dns/bind-tools/bind-tools-9.4.3_p4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 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.4.3_p4.ebuild,v 1.7 2010/01/27 18:41:29 ranger Exp $
-
-inherit flag-o-matic
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_P="${MY_PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-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="idn ipv6"
-
-DEPEND="idn? ( || ( sys-libs/glibc dev-libs/libiconv )
-			net-dns/idnkit )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd "${S}" || die
-
-	use idn && {
-		# BIND 9.4.0 doesn't have this patch
-		# epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/bind-${PV}-patch
-
-		cd "${S}"/contrib/idn/idnkit-1.0-src
-		epatch "${FILESDIR}"/${PN}-configure.patch
-		cd -
-	}
-
-	# bug #151839
-	sed -e \
-		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
-		-i lib/isc/unix/socket.c
-}
-
-src_compile() {
-	local myconf=
-	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
-	use idn  && myconf="${myconf} --with-idn"
-
-	has_version sys-libs/glibc || myconf="${myconf} --with-iconv"
-
-	econf ${myconf} || die "Configure failed"
-
-	cd "${S}"/lib
-	emake -j1 || die "make failed in /lib"
-
-	cd "${S}"/bin/dig
-	emake -j1 || die "make failed in /bin/dig"
-
-	cd "${S}"/lib/lwres/
-	emake -j1 || die "make failed in /lib/lwres"
-
-	cd "${S}"/bin/nsupdate/
-	emake -j1 || die "make failed in /bin/nsupdate"
-
-	cd "${S}"/bin/dnssec/
-	emake -j1 || die "make failed in /bin/dnssec"
-}
-
-src_install() {
-	dodoc README CHANGES FAQ
-
-	cd "${S}"/bin/dig
-	dobin dig host nslookup || die
-	doman dig.1 host.1 nslookup.1 || die
-
-	cd "${S}"/bin/nsupdate
-	dobin nsupdate || die
-	doman nsupdate.1 || die
-	dohtml nsupdate.html || die
-
-	cd "${S}"/bin/dnssec
-	dobin dnssec-keygen || die
-	doman dnssec-keygen.8 || die
-	dohtml dnssec-keygen.html || die
-}
diff --git a/net-dns/bind-tools/bind-tools-9.7.2_p2.ebuild b/net-dns/bind-tools/bind-tools-9.7.2_p2.ebuild
new file mode 100644
index 000000000000..415a4d83b92f
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.7.2_p2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 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.7.2_p2.ebuild,v 1.1 2010/10/05 15:47:56 idl0r Exp $
+
+EAPI="3"
+
+inherit eutils autotools
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="http://www.isc.org/software/bind"
+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"
+
+DEPEND="ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	idn? (
+		|| ( sys-libs/glibc dev-libs/libiconv )
+		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
+
+	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
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_with idn) \
+		$(use_with ssl openssl) \
+		$(use_with xml libxml2) \
+		${myconf}
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	emake -C lib/ || die "emake lib failed"
+	emake -C bin/dig/ || die "emake bin/dig failed"
+	emake -C bin/nsupdate/ || die "emake bin/nsupdate failed"
+	emake -C bin/dnssec/ || die "emake bin/dnssec failed"
+}
+
+src_install() {
+	dodoc README CHANGES FAQ || die
+
+	cd "${S}"/bin/dig
+	dobin dig host nslookup || die
+	doman {dig,host,nslookup}.1 || die
+
+	cd "${S}"/bin/nsupdate
+	dobin nsupdate || die
+	doman nsupdate.1 || die
+	if use doc; then
+		dohtml nsupdate.html || die
+	fi
+
+	cd "${S}"/bin/dnssec
+	dobin dnssec-keygen || die
+	doman dnssec-keygen.8 || die
+
+	if use doc; then
+		dohtml dnssec-keygen.html || die
+	fi
+}