Version bump. Clean up.

(Portage version: 2.2_rc51/cvs/Linux x86_64)

4 files changed, 12 insertions, 176 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 398150412107..4aa26d8e32d4 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.142 2009/08/01 19:09:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.143 2009/11/25 19:05:36 idl0r Exp $
+
+*bind-tools-9.6.1_p2 (25 Nov 2009)
+
+  25 Nov 2009; Christian Ruppert <idl0r@gentoo.org>
+  -bind-tools-9.4.3_p2.ebuild, -bind-tools-9.5.1_p3.ebuild,
+  -bind-tools-9.6.1.ebuild, +bind-tools-9.6.1_p2.ebuild:
+  Version bump. Clean up.
 
   01 Aug 2009; Raúl Porcel <armin76@gentoo.org> bind-tools-9.4.3_p3.ebuild:
   alpha/arm/ia64/s390/sh stable wrt #279508
diff --git a/net-dns/bind-tools/bind-tools-9.4.3_p2.ebuild b/net-dns/bind-tools/bind-tools-9.4.3_p2.ebuild
deleted file mode 100644
index feec29af23ee..000000000000
--- a/net-dns/bind-tools/bind-tools-9.4.3_p2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 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_p2.ebuild,v 1.5 2009/04/15 19:49:25 maekke 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 -
-	}
-
-	# 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.5.1_p3.ebuild b/net-dns/bind-tools/bind-tools-9.5.1_p3.ebuild
deleted file mode 100644
index 6be9b3d21ada..000000000000
--- a/net-dns/bind-tools/bind-tools-9.5.1_p3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 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.1_p3.ebuild,v 1.1 2009/07/30 15:37:30 dertobi123 Exp $
-
-inherit flag-o-matic
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p3/-P3}
-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.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.ebuild b/net-dns/bind-tools/bind-tools-9.6.1_p2.ebuild
index 05ccc778e1c0..070bde7e0671 100644
--- a/net-dns/bind-tools/bind-tools-9.6.1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.6.1_p2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2009 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.ebuild,v 1.3 2009/07/26 16:03:14 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.6.1_p2.ebuild,v 1.1 2009/11/25 19:05:36 idl0r Exp $
 
 inherit eutils autotools
 
 MY_PN=${PN//-tools}
-MY_PV=${PV/_p1/-P1}
+MY_PV=${PV/_p/-P}
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
+HOMEPAGE="http://www.isc.org/software/bind"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="as-is"
@@ -45,7 +45,7 @@ src_unpack() {
 		lib/isc/unix/socket.c || die
 
 	# bug 278364 (workaround)
-	epatch "${FILESDIR}/${P}-parallel.patch"
+	epatch "${FILESDIR}/${PN}-9.6.1-parallel.patch"
 
 	eautoreconf
 }