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

(Portage version: 2.2_rc61/cvs/Linux i686)

5 files changed, 190 insertions, 8 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/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
+}