Version bump (bug #301548). Do not hardcode patchlevel in MY_PV.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

6 files changed, 197 insertions, 11 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 409a924fcb80..5aa8dd97bd4c 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/bind-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.148 2009/12/09 18:54:29 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.149 2010/01/27 18:18:20 jer Exp $
+
+*bind-tools-9.6.1_p3 (27 Jan 2010)
+*bind-tools-9.4.3_p5 (27 Jan 2010)
+
+  27 Jan 2010; Jeroen Roovers <jer@gentoo.org> bind-tools-9.4.3_p3.ebuild,
+  bind-tools-9.4.3_p4.ebuild, +bind-tools-9.4.3_p5.ebuild,
+  +bind-tools-9.6.1_p3.ebuild:
+  Version bump (bug #301548). Do not hardcode patchlevel in MY_PV.
 
   09 Dec 2009; Raúl Porcel <armin76@gentoo.org> bind-tools-9.4.3_p4.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #294497
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 7c44caf76a55..b4b351a1e5db 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -3,9 +3,13 @@ AUX bind-tools-9.6.1-parallel.patch 386 RMD160 a48bdcf7fe020e55c64a692852b6ca718
 AUX bind-tools-configure.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST bind-9.4.3-P3.tar.gz 6544968 RMD160 1e59f48f538141bb5c36fa58607ac4689cb6a161 SHA1 165b3ee52309ae4a483901db6992a979f6382ba7 SHA256 cf1186b9f9bb993053e49f7c9bc22a1f218266cc6112d4e668a56ab8861a2b6d
 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.1-P2.tar.gz 6601674 RMD160 7842404116ec75cd11a73276e9d534bd9ff8c171 SHA1 0169c7898790b72ee3b5a1e090c2bdf68792b952 SHA256 8ad9593ae7ae6903150cfd9202200c26a1caf47816becdd5821b5360d544fc30
-EBUILD bind-tools-9.4.3_p3.ebuild 2086 RMD160 003f4aa44f32e5666a31652e02d763967586533f SHA1 81cf9d2ef5c73567a746f0b4ee26fc1078a358c2 SHA256 c0af336e9472a0ff38b885d09f10303593a3c36faa15d5f7ae0b4f4787631aee
-EBUILD bind-tools-9.4.3_p4.ebuild 2087 RMD160 e35ef3a41d412697213926b54c8d9c636beace04 SHA1 2067ee48ee918b5e3630446c5e858773a56806bb SHA256 32d769b5150f42761a655e041234579cbadc33612d51dfd7621e416314cb1a43
+DIST bind-9.6.1-P3.tar.gz 6508797 RMD160 ff444f39d7cf9673497e43c18c40dd77af121851 SHA1 9cb2bfb933083ab4e85aa884ca0dff7b0ae5cfb2 SHA256 869f5079a900b280c051d4c9cf7eefea000a0e70ccec9e6fcddd79e3caa10198
+EBUILD bind-tools-9.4.3_p3.ebuild 2080 RMD160 c5be9f64f8d5ef0a3383b444fe7b9278d1e85a0b SHA1 6e7980bb00cd4c9948cef8b25096dc7293979152 SHA256 f9310270c8cfd193acb5afb2de1750e712ff5d63cee005cd44521a148ebb4d70
+EBUILD bind-tools-9.4.3_p4.ebuild 2081 RMD160 e692dcdd96ab2e8d83f4046e3caa0a9c4a7ea91f SHA1 904c53623ea5a95fa0a8c4473b126753312e877a SHA256 f7a1556b63af94791b77cb7f0f83339d8b17b2b072d5efbe50edb01c8dbdd10b
+EBUILD bind-tools-9.4.3_p5.ebuild 2091 RMD160 4a828a25240c8544eb6b0bd511614116d516d9fc SHA1 15b7054af5657d7ff41a707423ef4a57a9fc13c2 SHA256 b377ce40663d5d77b1637fb4a431470e3b87c80e2f55bdb801cab6ea6119f5a0
 EBUILD bind-tools-9.6.1_p2.ebuild 2072 RMD160 e305b525a8697906c94f2850075e0642feaf2c14 SHA1 e7231388be5460ce5adbe0d95ef5fd7b029e14d3 SHA256 eba23d068544d49f12f225530aaae3494cb7046f9bfdc0cbd118c165455d080e
-MISC ChangeLog 21267 RMD160 c62951a8f502811f8e894893979e2aecbaeb4ca8 SHA1 379750644314f8d9c974c7ca730602f7ee363fe7 SHA256 ee6555c573f4c79056d2296528fdb0e3a64d27d5c2663c48eadbe0ec256b0f4e
+EBUILD bind-tools-9.6.1_p3.ebuild 2070 RMD160 921e4474eb7c0d9343eb30f238b1a23f04a7532e SHA1 3de42e1bfea0a65cde8144f6e65c9d267f6a491d SHA256 2c199731199487d764b40e07a3637b509e5b07709e23943ce1d88cac9c880696
+MISC ChangeLog 21567 RMD160 2650590355b9ca6b129f5da814b1deef41377518 SHA1 b137ffad81936423b76d0cd0a87191017b64554d SHA256 5f002da559537fd4ef430406535a52037005621a777304fcd261f1cfe28d4de3
 MISC metadata.xml 334 RMD160 5bf93af61fefc6ad5d6c78fa595fcd70bd35c3a9 SHA1 0f537e70e9ddba477f8cd430f6d24589ba268755 SHA256 5a6b75435f504f86c0ff197f0374e59fbb00c9eb351e39336d07ed67ed54b92d
diff --git a/net-dns/bind-tools/bind-tools-9.4.3_p3.ebuild b/net-dns/bind-tools/bind-tools-9.4.3_p3.ebuild
index 1eb6ecb0b08e..62e1e6f8ae1b 100644
--- a/net-dns/bind-tools/bind-tools-9.4.3_p3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.4.3_p3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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_p3.ebuild,v 1.8 2009/08/01 19:09:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.4.3_p3.ebuild,v 1.9 2010/01/27 18:18:20 jer Exp $
 
 inherit flag-o-matic
 
 MY_PN=${PN//-tools}
-MY_PV=${PV/_p3/-P3}
+MY_PV=${PV/_p/-P}
 MY_P="${MY_PN}-${MY_PV}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
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
index 43d6ebebc65d..8e74148dd436 100644
--- a/net-dns/bind-tools/bind-tools-9.4.3_p4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.4.3_p4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.5 2009/12/09 18:54:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.4.3_p4.ebuild,v 1.6 2010/01/27 18:18:20 jer Exp $
 
 inherit flag-o-matic
 
 MY_PN=${PN//-tools}
-MY_PV=${PV/_p4/-P4}
+MY_PV=${PV/_p/-P}
 MY_P="${MY_PN}-${MY_PV}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
diff --git a/net-dns/bind-tools/bind-tools-9.4.3_p5.ebuild b/net-dns/bind-tools/bind-tools-9.4.3_p5.ebuild
new file mode 100644
index 000000000000..13ba1e7c58c3
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.4.3_p5.ebuild
@@ -0,0 +1,83 @@
+# 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_p5.ebuild,v 1.1 2010/01/27 18:18:20 jer 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.6.1_p3.ebuild b/net-dns/bind-tools/bind-tools-9.6.1_p3.ebuild
new file mode 100644
index 000000000000..2a0b3c224a49
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.6.1_p3.ebuild
@@ -0,0 +1,91 @@
+# 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.6.1_p3.ebuild,v 1.1 2010/01/27 18:18:20 jer Exp $
+
+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 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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use idn && {
+		cd "${S}"/contrib/idn/idnkit-1.0-src
+		epatch "${FILESDIR}"/${PN}-configure.patch
+		cd -
+	}
+
+	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
+
+	# bug #151839
+	sed -i -e \
+		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
+		lib/isc/unix/socket.c || die
+
+	# bug 278364 (workaround)
+	epatch "${FILESDIR}/${PN}-9.6.1-parallel.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=
+
+	has_version sys-libs/glibc || myconf="${myconf} --with-iconv"
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_with idn) \
+		$(use_with ssl openssl) \
+		$(use_with xml libxml2) \
+		${myconf}
+
+	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
+}