Cleanup

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64)

12 files changed, 20 insertions, 684 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index bdbffda5f812..a5ab49998bfa 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,14 @@
 # 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.103 2008/07/10 20:55:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.104 2008/07/20 09:40:56 dertobi123 Exp $
+
+  20 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -bind-tools-9.2.5.ebuild, -bind-tools-9.2.6.ebuild,
+  -bind-tools-9.2.6-r3.ebuild, -bind-tools-9.2.8.ebuild,
+  -bind-tools-9.2.8-r1.ebuild, -bind-tools-9.3.2.ebuild,
+  -bind-tools-9.3.2-r3.ebuild, -bind-tools-9.3.4.ebuild,
+  -bind-tools-9.3.4-r1.ebuild, -bind-tools-9.4.1-r1.ebuild:
+  Cleanup
 
   10 Jul 2008; Guy Martin <gmsoft@gentoo.org> bind-tools-9.4.2_p1.ebuild:
   Stable on hppa, bug #231201
diff --git a/net-dns/bind-tools/bind-tools-9.2.5.ebuild b/net-dns/bind-tools/bind-tools-9.2.5.ebuild
deleted file mode 100644
index cdb96b8e7328..000000000000
--- a/net-dns/bind-tools/bind-tools-9.2.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 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.5.ebuild,v 1.9 2005/05/07 21:35:54 dostrow 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 sparc x86"
-IUSE="ipv6"
-
-DEPEND=""
-
-src_compile() {
-	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
-
-	econf ${myconf} || die "Configure failed"
-
-	export MAKEOPTS="${MAKEOPTS} -j1"
-
-	cd ${S}/lib/isc
-	emake || die "make failed in /lib/isc"
-
-	cd ${S}/lib/dns
-	emake || die "make failed in /lib/dns"
-
-	cd ${S}/bin/dig
-	emake || die "make failed in /bin/dig"
-
-	cd ${S}/lib/lwres/
-	emake || die "make failed in /lib/lwres"
-
-	cd ${S}/bin/nsupdate/
-	emake || die "make failed in /bin/nsupdate"
-}
-
-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.2.6-r3.ebuild b/net-dns/bind-tools/bind-tools-9.2.6-r3.ebuild
deleted file mode 100644
index 57a4b520abb1..000000000000
--- a/net-dns/bind-tools/bind-tools-9.2.6-r3.ebuild
+++ /dev/null
@@ -1,68 +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.2.6-r3.ebuild,v 1.2 2008/02/29 21:57:54 armin76 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 sparc x86"
-IUSE="idn ipv6"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	use idn && {
-		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
-	}
-}
-
-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.2.6.ebuild b/net-dns/bind-tools/bind-tools-9.2.6.ebuild
deleted file mode 100644
index c45923418901..000000000000
--- a/net-dns/bind-tools/bind-tools-9.2.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 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.6.ebuild,v 1.9 2006/04/25 02:26:18 tcort 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"
-IUSE="ipv6"
-
-DEPEND=""
-
-src_compile() {
-	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
-
-	econf ${myconf} || die "Configure failed"
-
-	export MAKEOPTS="${MAKEOPTS} -j1"
-
-	cd ${S}/lib
-	emake || die "make failed in /lib"
-
-	cd ${S}/bin/dig
-	emake || die "make failed in /bin/dig"
-
-	cd ${S}/lib/lwres/
-	emake || die "make failed in /lib/lwres"
-
-	cd ${S}/bin/nsupdate/
-	emake || die "make failed in /bin/nsupdate"
-}
-
-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.2.8-r1.ebuild b/net-dns/bind-tools/bind-tools-9.2.8-r1.ebuild
deleted file mode 100644
index 3f1c33b04479..000000000000
--- a/net-dns/bind-tools/bind-tools-9.2.8-r1.ebuild
+++ /dev/null
@@ -1,75 +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.2.8-r1.ebuild,v 1.2 2008/02/29 21:57:54 armin76 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.2.8.ebuild b/net-dns/bind-tools/bind-tools-9.2.8.ebuild
deleted file mode 100644
index 3783056ba87a..000000000000
--- a/net-dns/bind-tools/bind-tools-9.2.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.ebuild,v 1.5 2007/08/25 14:33:18 vapier 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:CDEFINES =:CDEFINES = -USO_BSDCOMPAT:' \
-		-i lib/isc/unix/Makefile.in
-}
-
-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.2-r3.ebuild b/net-dns/bind-tools/bind-tools-9.3.2-r3.ebuild
deleted file mode 100644
index 613ed74a3556..000000000000
--- a/net-dns/bind-tools/bind-tools-9.3.2-r3.ebuild
+++ /dev/null
@@ -1,68 +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.3.2-r3.ebuild,v 1.3 2008/02/29 21:57:54 armin76 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 sparc x86 ~x86-fbsd"
-IUSE="idn ipv6"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	use idn && {
-		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
-	}
-}
-
-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.2.ebuild b/net-dns/bind-tools/bind-tools-9.3.2.ebuild
deleted file mode 100644
index 541e0d77ca4e..000000000000
--- a/net-dns/bind-tools/bind-tools-9.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 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.2.ebuild,v 1.9 2006/04/25 02:26:18 tcort 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"
-IUSE="ipv6"
-
-DEPEND=""
-
-src_compile() {
-	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
-
-	econf ${myconf} || die "Configure failed"
-
-	export MAKEOPTS="${MAKEOPTS} -j1"
-
-	cd ${S}/lib
-	emake || die "make failed in /lib"
-
-	cd ${S}/bin/dig
-	emake || die "make failed in /bin/dig"
-
-	cd ${S}/lib/lwres/
-	emake || die "make failed in /lib/lwres"
-
-	cd ${S}/bin/nsupdate/
-	emake || die "make failed in /bin/nsupdate"
-}
-
-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
deleted file mode 100644
index 099e7eef0978..000000000000
--- a/net-dns/bind-tools/bind-tools-9.3.4-r1.ebuild
+++ /dev/null
@@ -1,75 +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.3.4-r1.ebuild,v 1.2 2008/02/29 21:57:54 armin76 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.3.4.ebuild b/net-dns/bind-tools/bind-tools-9.3.4.ebuild
deleted file mode 100644
index 73885fc1536f..000000000000
--- a/net-dns/bind-tools/bind-tools-9.3.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.ebuild,v 1.9 2007/04/22 18:48:44 armin76 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:CDEFINES =:CDEFINES = -USO_BSDCOMPAT:' \
-		-i lib/isc/unix/Makefile.in
-}
-
-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-r1.ebuild b/net-dns/bind-tools/bind-tools-9.4.1-r1.ebuild
deleted file mode 100644
index 24f52c64808b..000000000000
--- a/net-dns/bind-tools/bind-tools-9.4.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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-r1.ebuild,v 1.9 2007/06/24 22:06:01 vapier Exp $
-
-inherit flag-o-matic
-
-MY_P=${P//-tools}
-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="idn? ( || ( sys-libs/glibc dev-libs/libiconv ) )"
-
-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"
-
-	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
-		local myconf=
-		has_version sys-libs/glibc || myconf="${myconf} --with-iconv"
-		econf ${myconf} || 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_p1.ebuild b/net-dns/bind-tools/bind-tools-9.4.1_p1.ebuild
index 262b42713bbe..4bea122d8d52 100644
--- a/net-dns/bind-tools/bind-tools-9.4.1_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.4.1_p1.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_p1.ebuild,v 1.10 2007/08/25 14:33:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.4.1_p1.ebuild,v 1.11 2008/07/20 09:40:55 dertobi123 Exp $
 
 inherit flag-o-matic
 
@@ -20,15 +20,15 @@ IUSE="idn ipv6"
 DEPEND="idn? ( || ( sys-libs/glibc dev-libs/libiconv ) )"
 
 src_unpack() {
-	unpack "${A}" || die
+	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 "${S}"/contrib/idn/idnkit-1.0-src
+		epatch "${FILESDIR}"/${PN}-configure.patch
 		cd -
 	}
 
@@ -44,20 +44,20 @@ src_compile() {
 
 	econf ${myconf} || die "Configure failed"
 
-	cd ${S}/lib
+	cd "${S}"/lib
 	emake -j1 || die "make failed in /lib"
 
-	cd ${S}/bin/dig
+	cd "${S}"/bin/dig
 	emake -j1 || die "make failed in /bin/dig"
 
-	cd ${S}/lib/lwres/
+	cd "${S}"/lib/lwres/
 	emake -j1 || die "make failed in /lib/lwres"
 
-	cd ${S}/bin/nsupdate/
+	cd "${S}"/bin/nsupdate/
 	emake -j1 || die "make failed in /bin/nsupdate"
 
 	use idn && {
-		cd ${S}/contrib/idn/idnkit-1.0-src
+		cd "${S}"/contrib/idn/idnkit-1.0-src
 		local myconf=
 		has_version sys-libs/glibc || myconf="${myconf} --with-iconv"
 		econf ${myconf} || die "idn econf failed"
@@ -68,11 +68,11 @@ src_compile() {
 src_install() {
 	dodoc README CHANGES FAQ
 
-	cd ${S}/bin/dig
+	cd "${S}"/bin/dig
 	dobin dig host nslookup || die
 	doman dig.1 host.1 nslookup.1 || die
 
-	cd ${S}/bin/nsupdate
+	cd "${S}"/bin/nsupdate
 	dobin nsupdate || die
 	doman nsupdate.8 || die
 	dohtml nsupdate.html || die