* closing bug #151839

(Portage version: 2.1.2.9)

7 files changed, 170 insertions, 5 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 9d8d69b3cf6a..ce665786c778 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.73 2007/05/12 08:30:31 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.74 2007/06/02 22:35:39 voxus Exp $
+
+*bind-tools-9.4.1-r1 (02 Jun 2007)
+*bind-tools-9.3.4-r1 (02 Jun 2007)
+*bind-tools-9.2.8-r1 (02 Jun 2007)
+
+  02 Jun 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +bind-tools-9.2.8-r1.ebuild, +bind-tools-9.3.4-r1.ebuild,
+  -bind-tools-9.4.1.ebuild, +bind-tools-9.4.1-r1.ebuild:
+  Closing bug #151839 again.
 
   12 May 2007; Joshua Kinard <kumba@gentoo.org> bind-tools-9.3.3.ebuild:
   Stable on mips.
diff --git a/net-dns/bind-tools/bind-tools-9.2.8-r1.ebuild b/net-dns/bind-tools/bind-tools-9.2.8-r1.ebuild
new file mode 100644
index 000000000000..b32c3536e8d4
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.2.8-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 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.2.8-r1.ebuild,v 1.1 2007/06/02 22:35:39 voxus Exp $
+
+inherit flag-o-matic
+
+MY_P=${P//-tools}
+MY_P=${MY_P/_}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="bind tools: dig, nslookup, and host"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${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=""
+
+src_unpack() {
+	unpack "${A}" || die
+	cd "${S}" || die
+
+	use idn && {
+		# This file does not exist in the bind-9.2.8 tarball - mjolnir
+		# 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() {
+	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
+
+	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"
+
+	use idn && {
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		econf || die "idn econf failed"
+		emake -j1 || die "idn emake failed"
+	}
+}
+
+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.8 || die
+	dohtml nsupdate.html || die
+}
diff --git a/net-dns/bind-tools/bind-tools-9.3.4-r1.ebuild b/net-dns/bind-tools/bind-tools-9.3.4-r1.ebuild
new file mode 100644
index 000000000000..ff458ec608da
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.3.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 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.3.4-r1.ebuild,v 1.1 2007/06/02 22:35:39 voxus Exp $
+
+inherit flag-o-matic
+
+MY_P=${P//-tools}
+MY_P=${MY_P/_}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="bind tools: dig, nslookup, and host"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${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=""
+
+src_unpack() {
+	unpack "${A}" || die
+	cd "${S}" || die
+
+	use idn && {
+		# bind 9.3.4 does not 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() {
+	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
+
+	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"
+
+	use idn && {
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		econf || die "idn econf failed"
+		emake -j1 || die "idn emake failed"
+	}
+}
+
+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.8 || die
+	dohtml nsupdate.html || die
+}
diff --git a/net-dns/bind-tools/bind-tools-9.4.1.ebuild b/net-dns/bind-tools/bind-tools-9.4.1-r1.ebuild
index 2046fecef52d..62ff497fbcbf 100644
--- a/net-dns/bind-tools/bind-tools-9.4.1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.ebuild,v 1.1 2007/05/01 13:19:20 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.4.1-r1.ebuild,v 1.1 2007/06/02 22:35:39 voxus Exp $
 
 inherit flag-o-matic
 
@@ -31,9 +31,9 @@ src_unpack() {
 	}
 
 	# bug #151839
-	sed \
-		-e 's:CDEFINES =:CDEFINES = -USO_BSDCOMPAT:' \
-		-i lib/isc/unix/Makefile.in
+	sed -e \
+		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
+		-i lib/isc/unix/socket.c
 }
 
 src_compile() {
diff --git a/net-dns/bind-tools/files/digest-bind-tools-9.2.8-r1 b/net-dns/bind-tools/files/digest-bind-tools-9.2.8-r1
new file mode 100644
index 000000000000..3e2ec6993f56
--- /dev/null
+++ b/net-dns/bind-tools/files/digest-bind-tools-9.2.8-r1
@@ -0,0 +1,3 @@
+MD5 55455401e8b45b79cea89d3d79118ced bind-9.2.8.tar.gz 5208805
+RMD160 4bdba3e75a9d188d05787ca553aa656a416d4534 bind-9.2.8.tar.gz 5208805
+SHA256 4c037a1ffe71f8baa8b416589faa0a3c312b2afe7b79bde9ebf9bbde5af5a11d bind-9.2.8.tar.gz 5208805
diff --git a/net-dns/bind-tools/files/digest-bind-tools-9.3.4-r1 b/net-dns/bind-tools/files/digest-bind-tools-9.3.4-r1
new file mode 100644
index 000000000000..488396d6df8b
--- /dev/null
+++ b/net-dns/bind-tools/files/digest-bind-tools-9.3.4-r1
@@ -0,0 +1,3 @@
+MD5 df5417e7e7cf017fa28b65d0a3d6e999 bind-9.3.4.tar.gz 5405022
+RMD160 8b5fda9542f6afbe7ffb857d72f7e545237d7826 bind-9.3.4.tar.gz 5405022
+SHA256 40152026af715b15ac958f374394e5189a099b562eb913470ccc43f6fbd19c21 bind-9.3.4.tar.gz 5405022
diff --git a/net-dns/bind-tools/files/digest-bind-tools-9.4.1 b/net-dns/bind-tools/files/digest-bind-tools-9.4.1-r1
index c308121c43d7..c308121c43d7 100644
--- a/net-dns/bind-tools/files/digest-bind-tools-9.4.1
+++ b/net-dns/bind-tools/files/digest-bind-tools-9.4.1-r1