Version bump

(Portage version: 2.2_rc19/cvs/Linux 2.6.25-gentoo-r7 x86_64)

3 files changed, 15 insertions, 90 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/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