Version bump. Clean up.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

5 files changed, 25 insertions, 183 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/Manifest b/net-dns/bind-tools/Manifest
index b5b7a7cf3819..11480385871a 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,13 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 RMD160 c14e44da385b69d80e0635f56a3d3a3eda7471d9 SHA1 9297301e6b43d5887b3d40b7a97c1ee6c015cd38 SHA256 5e39cd20da4f2b3bf5ee352d73249c105de1e182c595afb20a15e950f2f88f02
 AUX bind-tools-9.6.1-parallel.patch 386 RMD160 a48bdcf7fe020e55c64a692852b6ca71849d6a1c SHA1 cfbf5b9b9bf24cb564eef60716cfa19a89c05c9a SHA256 bc4d39f01190e890590a9841ae682bc68062a1202f67e649a90712ab19f89428
 AUX bind-tools-configure.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
-DIST bind-9.4.3-P2.tar.gz 6544865 RMD160 89d7c41a8c04833f4427914857f91ffffb0ac5ee SHA1 6ef00b9db269180e4cfa2ea3fe06f7ab9bc7cfa0 SHA256 fb7c9964942ecc07606bb8d4361bf9d9bd8091e059fea1b56e6a0972f99b1ba1
 DIST bind-9.4.3-P3.tar.gz 6544968 RMD160 1e59f48f538141bb5c36fa58607ac4689cb6a161 SHA1 165b3ee52309ae4a483901db6992a979f6382ba7 SHA256 cf1186b9f9bb993053e49f7c9bc22a1f218266cc6112d4e668a56ab8861a2b6d
-DIST bind-9.5.1-P3.tar.gz 6690806 RMD160 6a929a8860b4e0f4394783023eef8b488ad58af8 SHA1 fa17c60a1e0e95c67b2680f091e46c5677dcb805 SHA256 81dfb6ef4d5b1fc5adb24b4b099cf7fc94c785d04f4c96b634d35ec98758560a
-DIST bind-9.6.1.tar.gz 6724683 RMD160 18431b1418eda7298295945d63d5ad185f19d78f SHA1 50c485a152b566ca89d082e5d6f777c00f0a92b2 SHA256 58968b601ebb66be73c32d69111afd6dd17f087e1bff12030f0dc2dada76d7cf
-EBUILD bind-tools-9.4.3_p2.ebuild 2085 RMD160 f8234395158a39ddeea8cce326e30285c677ed1a SHA1 31074cff7db147f0aff6837f291f42554d692db3 SHA256 fd464bae49631c3091c8927c139b4c9b78c2cf57a03fd3e392da73768854920b
+DIST bind-9.6.1-P2.tar.gz 6601674 RMD160 7842404116ec75cd11a73276e9d534bd9ff8c171 SHA1 0169c7898790b72ee3b5a1e090c2bdf68792b952 SHA256 8ad9593ae7ae6903150cfd9202200c26a1caf47816becdd5821b5360d544fc30
 EBUILD bind-tools-9.4.3_p3.ebuild 2086 RMD160 003f4aa44f32e5666a31652e02d763967586533f SHA1 81cf9d2ef5c73567a746f0b4ee26fc1078a358c2 SHA256 c0af336e9472a0ff38b885d09f10303593a3c36faa15d5f7ae0b4f4787631aee
-EBUILD bind-tools-9.5.1_p3.ebuild 2197 RMD160 17b41bdb01387eb0b0ac8f727dee42df974b7f54 SHA1 272ba2ef12294bb14a8de4857ba9d65a787b9312 SHA256 7f6a8b28ddb0e363b3c570e8f8619929cf6ca11b1d915922d930ec451e1a60d8
-EBUILD bind-tools-9.6.1.ebuild 2065 RMD160 35e41b3a7025691cf949bc4d11b42839e190ad28 SHA1 72e79fb7f2b4c1aac94db83929b8848c24a910b5 SHA256 8944fde49da6faf08988dfcc681a9b18c19b3a492b5b0f67ca431eaa6a05fa8e
-MISC ChangeLog 20438 RMD160 05b363df0b2870694040aa166c3fd1844223a9a5 SHA1 43840b23d83fefddc89cc34aeac44986a1897d06 SHA256 ede2cd92ad4482e3f0475662ca83d49de289a4a6fe8d9aac10bb0f605a1241be
+EBUILD bind-tools-9.6.1_p2.ebuild 2072 RMD160 e305b525a8697906c94f2850075e0642feaf2c14 SHA1 e7231388be5460ce5adbe0d95ef5fd7b029e14d3 SHA256 eba23d068544d49f12f225530aaae3494cb7046f9bfdc0cbd118c165455d080e
+MISC ChangeLog 20668 RMD160 5e5d962c0ad1610ed81ff9b3eaa0c8f4c44399ce SHA1 e72134e5b25c44a0b390d5fb51b4bea7a04ec474 SHA256 df055c99919b883387d67774e977dca6331e324a55e7b4b1eb73867fc7eac8de
 MISC metadata.xml 334 RMD160 5bf93af61fefc6ad5d6c78fa595fcd70bd35c3a9 SHA1 0f537e70e9ddba477f8cd430f6d24589ba268755 SHA256 5a6b75435f504f86c0ff197f0374e59fbb00c9eb351e39336d07ed67ed54b92d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAksNgBkACgkQixe2jn+ufThP0wCdF+wtuHLvVVmofhtRtMa7bYMT
+1usAn3Zs46iAWxcWZmJP2maZxpoc28Ft
+=HXqh
+-----END PGP SIGNATURE-----
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
 }