4 files changed, 18 insertions, 95 deletions
diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 45134d048818..2d597be1a842 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.113 2008/11/19 21:28:40 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.114 2008/12/26 21:10:53 dertobi123 Exp $
+
+*bind-tools-9.5.1 (26 Dec 2008)
+
+  26 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -bind-tools-9.4.3.ebuild, -bind-tools-9.5.0_p2.ebuild,
+  +bind-tools-9.5.1.ebuild:
+  Version bump
 
 *bind-tools-9.4.3 (19 Nov 2008)
 
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 0aa8d2d5cf70..7c2ac2811cfc 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -2,11 +2,9 @@ AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 RMD160 c14e44da385b69d80e0635f56a3d3
 AUX bind-tools-configure.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST bind-9.4.1-P1.tar.gz 6341409 RMD160 ced75a96098d78a7fdd8cc1d1e3daf2ad142ee9f SHA1 c65bfd3d6ff1dd78b678fe350e323bfb6d47fe1b SHA256 912d07be9a6b4fa180d38637bf32ac4e802b087e46fbbf2a76314ecc3444b693
 DIST bind-9.4.2-P2.tar.gz 6456550 RMD160 c0934436914cbc0963298cec326fe14a73130873 SHA1 e6aebf6e73dfd4d8ccae397bc5cafaa17fbc5ce4 SHA256 eddf17749abb469bd67213c151450c8e07414d7fcf5a4cd0dc6c03da9656d74d
-DIST bind-9.4.3.tar.gz 6543773 RMD160 05bf5650761f56e9b3b7f27f97fb7dbd0b70ca88 SHA1 8b34602d2877e2855c380c2adea09c0b319aeb71 SHA256 f1b991947fe673310fa4c61b42723f4efb48ea5c24fb5b802bd66786ea660be6
-DIST bind-9.5.0-P2.tar.gz 6627081 RMD160 2ac07f4d48f22cfeabd4d8089aaf955b81199dc0 SHA1 e93a230e0e80e8e5975c83bf0ca0b1186f53fe52 SHA256 e614450ddaa9ac9ad0138c4da536ea6443e70455f99ef3dcaca8067b5a846a3c
+DIST bind-9.5.1.tar.gz 6690642 RMD160 c71dc803b9ddc5c55831dc7652d5c1b9cac78b85 SHA1 1dc0cc2aee726949d1ab857d5e75d8805ca01838 SHA256 320441f4297e4c5cea0c6026afb98d5d9a3c2ccfe05e46d68279218f73867d9a
 EBUILD bind-tools-9.4.1_p1.ebuild 1968 RMD160 21080df2272cbf7362bf909e15afb815e959001f SHA1 ea7d449c2627c1c89a85a6467cfd3d2a970c3609 SHA256 fa0e4d746c995ebf3e94c596b8351ca003e2bcabe8e1c9e817db60a90ffa7613
 EBUILD bind-tools-9.4.2_p2.ebuild 2085 RMD160 998a0e89b0ea50aaf19018f6f1d990d7d1c01807 SHA1 e37b927708da7f1f060c56b5b349c8d7e176929c SHA256 14ef196140a589385b313c81a52b2dd36abadf78ce35bb50de1b1ffc90a7d683
-EBUILD bind-tools-9.4.3.ebuild 2046 RMD160 3836391615960211ae2dbb4196a21bf5e1a8d5bb SHA1 da801b75efa080b4b918e4c41e7b9dfce683f48e SHA256 eb5b262315da2fa2cb4f3353e6f05b108b1975e8f76ca4581965adf989bb6d85
-EBUILD bind-tools-9.5.0_p2.ebuild 2197 RMD160 50870c272b5723b9b1c43ae8d83182a1da6ae8f3 SHA1 f5f6f43013d5f4b4d2d4cf5f96cebbc7da05a614 SHA256 6cbe4aa84240dd3a3ac609a9fc34c20fc63e1f1b0f6ef601a41bdf4127825226
-MISC ChangeLog 16290 RMD160 0b88164cf0e57a162e495928fcc9823fffbc1d04 SHA1 32f79aebef19c3f1b9227a7a2636bd96920b9094 SHA256 604cbf7e88464923892af459b9d51dd39e521d5d8eafb8771ce52b9091bbb100
+EBUILD bind-tools-9.5.1.ebuild 2168 RMD160 a8542a2cf0e52b6aa233497005bb884628a6181c SHA1 138687cbb9f986df1b807357ef76580c4f0f25ed SHA256 bdbe60cfc13f8cd7d4be0f5f7873c0ed5414dbea8c25856b57962cede7c6f340
+MISC ChangeLog 16480 RMD160 b8f0b898c35a183ccf142bfa4807b9f40322691c SHA1 51959804092d2a7fcd61faaff0f3acc905b95954 SHA256 b13e02f4c3f6af932f43ec47066c8774678ba8650c13d128e9db2f7d6e49faf3
 MISC metadata.xml 334 RMD160 5bf93af61fefc6ad5d6c78fa595fcd70bd35c3a9 SHA1 0f537e70e9ddba477f8cd430f6d24589ba268755 SHA256 5a6b75435f504f86c0ff197f0374e59fbb00c9eb351e39336d07ed67ed54b92d
diff --git a/net-dns/bind-tools/bind-tools-9.5.0_p2.ebuild b/net-dns/bind-tools/bind-tools-9.5.0_p2.ebuild
deleted file mode 100644
index 01fec3c2ebd8..000000000000
--- a/net-dns/bind-tools/bind-tools-9.5.0_p2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2008 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.5.0_p2.ebuild,v 1.1 2008/08/02 07:16:53 dertobi123 Exp $
-
-inherit flag-o-matic
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p2/-P2}
-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 -
-	}
-
-	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
-
-	# 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"
-
-	# bug #227333
-	append-flags -D_GNU_SOURCE
-
-	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.8 || 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.4.3.ebuild b/net-dns/bind-tools/bind-tools-9.5.1.ebuild
index af361179efb4..dfbcc7942857 100644
--- a/net-dns/bind-tools/bind-tools-9.4.3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.ebuild,v 1.1 2008/11/19 21:28:40 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.5.1.ebuild,v 1.1 2008/12/26 21:10:53 dertobi123 Exp $
 
 inherit flag-o-matic
 
@@ -32,6 +32,8 @@ src_unpack() {
 		cd -
 	}
 
+	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
+
 	# bug #151839
 	sed -e \
 		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
@@ -45,6 +47,9 @@ src_compile() {
 
 	has_version sys-libs/glibc || myconf="${myconf} --with-iconv"
 
+	# bug #227333
+	append-flags -D_GNU_SOURCE
+
 	econf ${myconf} || die "Configure failed"
 
 	cd "${S}"/lib
@@ -72,6 +77,7 @@ src_install() {
 
 	cd "${S}"/bin/nsupdate
 	dobin nsupdate || die
+	doman nsupdate.1 || die
 	dohtml nsupdate.html || die
 
 	cd "${S}"/bin/dnssec