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

(Portage version: 2.2_rc88/cvs/Linux x86_64)

3 files changed, 103 insertions, 84 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/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
+}