Cleanup

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

45 files changed, 78 insertions, 5677 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
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index cf32d846bfa5..8de55497c6be 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.200 2008/07/10 20:38:51 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.201 2008/07/20 09:36:05 dertobi123 Exp $
+
+  20 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/bind-9.2.5-berkdb_fix.patch, -files/bind-9.2.5-dlz-mysql.patch,
+  -files/bind-9.2.5-mysql.patch, -files/bind-9.2.8-missing_odbc_test.patch,
+  -files/bind-9.3.4-missing_odbc_test.patch,
+  -files/bind-dlzbdb-close_cursor.patch, -files/localhost.zone,
+  -files/named.conf-r2, -files/named.confd, -files/named.init,
+  -files/named.init-r2, -files/named.init-r3, -files/named.rc,
+  -files/named.rc6, -files/named.rc6-pid_fix,
+  -files/named.rc6-smart_pid_fix, -bind-9.2.6.ebuild, -bind-9.2.6-r3.ebuild,
+  -bind-9.2.6-r4.ebuild, -bind-9.2.6-r5.ebuild, -bind-9.2.8.ebuild,
+  -bind-9.2.8-r3.ebuild, -bind-9.3.2.ebuild, -bind-9.3.2-r3.ebuild,
+  -bind-9.3.2-r4.ebuild, -bind-9.3.4.ebuild, -bind-9.3.4-r2.ebuild,
+  -bind-9.3.4-r3.ebuild, -bind-9.4.1-r1.ebuild:
+  Cleanup
 
   10 Jul 2008; Guy Martin <gmsoft@gentoo.org> bind-9.4.2_p1.ebuild:
   Stable on hppa, bug #231201
diff --git a/net-dns/bind/bind-9.2.6-r3.ebuild b/net-dns/bind/bind-9.2.6-r3.ebuild
deleted file mode 100644
index 8a13d9d2845a..000000000000
--- a/net-dns/bind/bind-9.2.6-r3.ebuild
+++ /dev/null
@@ -1,283 +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/bind-9.2.6-r3.ebuild,v 1.8 2007/05/06 08:50:30 genone Exp $
-
-inherit eutils libtool autotools
-
-DLZ_VERSION="9.2.5"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	mirror://gentoo/dyndns-samples.tbz2
-	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux idn threads"
-
-DEPEND="!net-dns/idnkit
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	bind-mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	unpack ${A} && cd ${S}
-
-	# Adjusting PATHs in manpages
-	for i in `echo bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8}`; do
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-		       ${i}
-	done
-
-	if use dlz; then
-		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/bind-${DLZ_VERSION}-berkdb_fix.patch
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-	fi
-
-	if use bind-mysql; then
-		if use dlz; then
-			MP=${P}-dlz-mysql.patch
-		else
-			MP=${P}-mysql.patch
-		fi
-
-		ebegin "Fixing mysql patch"
-		eindent
-
-		cp ${FILESDIR}/${MP} ${T}/${MP}
-
-		sed -e "s:-I/usr/local/include:`mysql_config --include`:" \
-			-e "s:-L/usr/local/lib/mysql -lmysqlclient:`mysql_config --libs`:" \
-			-i ${T}/${MP}
-
-		epatch ${T}/${MP}
-
-		eoutdent
-		eend $?
-	fi
-
-	if use idn; then
-		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
-	fi
-
-	# it should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	cd ${S}
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc=/usr/include"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not the"
-			ewarn "DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		`use_enable ipv6` \
-		--with-libtool \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		econf || die "idn econf failed"
-		emake || die "idn emake failed"
-	fi
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc ; dodoc doc/misc/*
-		docinto html ; dohtml doc/arm/*
-		docinto	draft ; dodoc doc/draft/*
-		docinto rfc ; dodoc doc/rfc/*
-		docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
-		contrib/nanny/nanny.pl
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	# some handy-dandy dynamic dns examples
-	cd ${D}/usr/share/doc/${PF}
-	tar pjxf ${DISTDIR}/dyndns-samples.tbz2
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
-
-	newinitd ${FILESDIR}/named.init-r3 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		einstall || die "failed to install idn kit"
-		docinto idn
-		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
-	fi
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config =${CATEGORY}/${PF}\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.2.6-r4.ebuild b/net-dns/bind/bind-9.2.6-r4.ebuild
deleted file mode 100644
index 26ebce198798..000000000000
--- a/net-dns/bind/bind-9.2.6-r4.ebuild
+++ /dev/null
@@ -1,287 +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/bind-9.2.6-r4.ebuild,v 1.15 2007/08/25 14:32:26 vapier Exp $
-
-inherit eutils libtool autotools
-
-DLZ_VERSION="9.2.5"
-MY_P="${P}-P1"
-MY_PV="${PV}-P1"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	mirror://gentoo/dyndns-samples.tbz2
-	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux idn threads"
-
-DEPEND="!net-dns/idnkit
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	bind-mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	unpack ${A} && cd ${S}
-
-	# Adjusting PATHs in manpages
-	for i in `echo bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8}`; do
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-		       ${i}
-	done
-
-	if use dlz; then
-		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/bind-${DLZ_VERSION}-berkdb_fix.patch
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-	fi
-
-	if use bind-mysql; then
-		if use dlz; then
-			MP=${P}-dlz-mysql.patch
-		else
-			MP=${P}-mysql.patch
-		fi
-
-		ebegin "Fixing mysql patch"
-		eindent
-
-		cp ${FILESDIR}/${MP} ${T}/${MP}
-
-		sed -e "s:-I/usr/local/include:`mysql_config --include`:" \
-			-e "s:-L/usr/local/lib/mysql -lmysqlclient:`mysql_config --libs`:" \
-			-i ${T}/${MP}
-
-		epatch ${T}/${MP}
-
-		eoutdent
-		eend $?
-	fi
-
-	if use idn; then
-		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
-	fi
-
-	# it should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	cd ${S}
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc=/usr/include"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not the"
-			ewarn "DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		`use_enable ipv6` \
-		--with-libtool \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		econf || die "idn econf failed"
-		emake || die "idn emake failed"
-	fi
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc ; dodoc doc/misc/*
-		docinto html ; dohtml doc/arm/*
-		docinto	draft ; dodoc doc/draft/*
-		docinto rfc ; dodoc doc/rfc/*
-		docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
-		contrib/nanny/nanny.pl
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	# some handy-dandy dynamic dns examples
-	cd ${D}/usr/share/doc/${PF}
-	tar pjxf ${DISTDIR}/dyndns-samples.tbz2
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
-
-	newinitd ${FILESDIR}/named.init-r3 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		einstall || die "failed to install idn kit"
-		docinto idn
-		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
-	fi
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config =${CATEGORY}/${PF}\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.2.6-r5.ebuild b/net-dns/bind/bind-9.2.6-r5.ebuild
deleted file mode 100644
index 4da0471d23ad..000000000000
--- a/net-dns/bind/bind-9.2.6-r5.ebuild
+++ /dev/null
@@ -1,292 +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/bind-9.2.6-r5.ebuild,v 1.8 2008/02/29 21:59:32 armin76 Exp $
-
-inherit eutils libtool autotools
-
-DLZ_VERSION="9.2.5"
-MY_P="${P}-P1"
-MY_PV="${PV}-P1"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	mirror://gentoo/dyndns-samples.tbz2
-	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux idn threads"
-
-DEPEND="!net-dns/idnkit
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	bind-mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	unpack ${A} && cd ${S}
-
-	# Adjusting PATHs in manpages
-	for i in `echo bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8}`; do
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-		       ${i}
-	done
-
-	if use dlz; then
-		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/bind-${DLZ_VERSION}-berkdb_fix.patch
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-	fi
-
-	if use bind-mysql; then
-		if use dlz; then
-			MP=${P}-dlz-mysql.patch
-		else
-			MP=${P}-mysql.patch
-		fi
-
-		ebegin "Fixing mysql patch"
-		eindent
-
-		cp ${FILESDIR}/${MP} ${T}/${MP}
-
-		sed -e "s:-I/usr/local/include:`mysql_config --include`:" \
-			-e "s:-L/usr/local/lib/mysql -lmysqlclient:`mysql_config --libs`:" \
-			-i ${T}/${MP}
-
-		epatch ${T}/${MP}
-
-		eoutdent
-		eend $?
-	fi
-
-	if use idn; then
-		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
-	fi
-
-	# it should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	cd "${S}"
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-
-	# bug #151839
-	sed \
-		-e 's:CDEFINES = :CDEFINES = -USO_BSDCOMPAT:' \
-		-i lib/isc/unix/Makefile.in
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc=/usr/include"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not the"
-			ewarn "DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			ewarn "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		`use_enable ipv6` \
-		--with-libtool \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		econf || die "idn econf failed"
-		emake || die "idn emake failed"
-	fi
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc ; dodoc doc/misc/*
-		docinto html ; dohtml doc/arm/*
-		docinto	draft ; dodoc doc/draft/*
-		docinto rfc ; dodoc doc/rfc/*
-		docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
-		contrib/nanny/nanny.pl
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	# some handy-dandy dynamic dns examples
-	cd ${D}/usr/share/doc/${PF}
-	tar pjxf ${DISTDIR}/dyndns-samples.tbz2
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
-
-	newinitd ${FILESDIR}/named.init-r4 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		einstall || die "failed to install idn kit"
-		docinto idn
-		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
-	fi
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config =${CATEGORY}/${PF}\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.2.6.ebuild b/net-dns/bind/bind-9.2.6.ebuild
deleted file mode 100644
index 08f84ab0ada3..000000000000
--- a/net-dns/bind/bind-9.2.6.ebuild
+++ /dev/null
@@ -1,282 +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/bind-9.2.6.ebuild,v 1.21 2008/03/17 05:08:52 ricmm Exp $
-
-inherit eutils libtool
-
-DLZ_VERSION="9.2.5"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	mirror://gentoo/dyndns-samples.tbz2
-	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux idn threads"
-
-DEPEND="!net-dns/idnkit
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	bind-mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	unpack ${A} && cd ${S}
-
-	# Adjusting PATHs in manpages
-	for i in `echo bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8}`; do
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-		       ${i}
-	done
-
-	if use dlz; then
-		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/bind-${DLZ_VERSION}-berkdb_fix.patch
-	fi
-
-	if use bind-mysql; then
-		if use dlz; then
-			MP=${P}-dlz-mysql.patch
-		else
-			MP=${P}-mysql.patch
-		fi
-
-		ebegin "Fixing mysql patch"
-		eindent
-
-		cp ${FILESDIR}/${MP} ${T}/${MP}
-
-		sed -e "s:-I/usr/local/include:`mysql_config --include`:" \
-			-e "s:-L/usr/local/lib/mysql -lmysqlclient:`mysql_config --libs`:" \
-			-i ${T}/${MP}
-
-		epatch ${T}/${MP}
-
-		eoutdent
-		eend $?
-	fi
-
-	if use idn; then
-		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
-	fi
-
-	# it should be installed by bind-tools
-	sed "s:nsupdate ::g" ${S}/bin/Makefile.in > ${T}/Makefile
-	mv ${T}/Makefile ${S}/bin/Makefile.in
-
-	cd ${S}
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not the"
-			ewarn "DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		`use_enable ipv6` \
-		--with-libtool \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		econf || die "idn econf failed"
-		emake || die "idn emake failed"
-	fi
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc ; dodoc doc/misc/*
-		docinto html ; dohtml doc/arm/*
-		docinto	draft ; dodoc doc/draft/*
-		docinto rfc ; dodoc doc/rfc/*
-		docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
-		contrib/nanny/nanny.pl
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	# some handy-dandy dynamic dns examples
-	cd ${D}/usr/share/doc/${PF}
-	tar pjxf ${DISTDIR}/dyndns-samples.tbz2
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
-
-	newinitd ${FILESDIR}/named.init-r3 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		einstall || die "failed to install idn kit"
-		docinto idn
-		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
-	fi
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config =${CATEGORY}/${PF}\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown named:named ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.2.8-r3.ebuild b/net-dns/bind/bind-9.2.8-r3.ebuild
deleted file mode 100644
index 9b22434e3fe0..000000000000
--- a/net-dns/bind/bind-9.2.8-r3.ebuild
+++ /dev/null
@@ -1,277 +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/bind-9.2.8-r3.ebuild,v 1.3 2008/05/29 19:11:36 armin76 Exp $
-
-inherit eutils libtool autotools toolchain-funcs flag-o-matic
-
-DLZ_VERSION="9.2.7"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
-	done
-
-	use dlz && {
-		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/bind-9.2.5-berkdb_fix.patch
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-		epatch ${FILESDIR}/${PN}-dlzbdb-close_cursor.patch
-
-		# use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
-	}
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-
-	# 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 ssl && myconf="${myconf} --with-openssl"
-	use idn && myconf="${myconf} --with-idn"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	# bug #158664
-	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r5 named
-	newconfd ${FILESDIR}/named.confd-r2 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-
-	use resolvconf && {
-		exeinto /etc/resolvconf/update.d
-		newexe ${FILESDIR}/resolvconf.bind bind
-	}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.2.8.ebuild b/net-dns/bind/bind-9.2.8.ebuild
deleted file mode 100644
index 5e4ea2c720d6..000000000000
--- a/net-dns/bind/bind-9.2.8.ebuild
+++ /dev/null
@@ -1,273 +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/bind-9.2.8.ebuild,v 1.13 2008/05/29 19:11:36 armin76 Exp $
-
-inherit eutils libtool autotools
-
-DLZ_VERSION="9.2.7"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ppc64 sparc x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
-	done
-
-	use dlz && {
-		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/bind-9.2.5-berkdb_fix.patch
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-
-		# use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
-	}
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-
-	# bug #151839
-	sed \
-		-e 's:<config.h>:<config.h>\n\n#undef SO_BSDCOMPAT:' \
-		-i lib/isc/unix/socket.c
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use idn && myconf="${myconf} --with-idn"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r4 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-
-	use resolvconf && {
-		exeinto /etc/resolvconf/update.d
-		newexe ${FILESDIR}/resolvconf.bind bind
-	}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.3.2-r3.ebuild b/net-dns/bind/bind-9.3.2-r3.ebuild
deleted file mode 100644
index 1248156a5e79..000000000000
--- a/net-dns/bind/bind-9.3.2-r3.ebuild
+++ /dev/null
@@ -1,275 +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/bind-9.3.2-r3.ebuild,v 1.8 2007/05/06 08:50:30 genone Exp $
-
-inherit eutils libtool autotools
-
-DLZ_VERSION="9.3.2b1"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads"
-
-DEPEND="!net-dns/idnkit
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-
-	# Adjusting PATHs in manpages
-	for i in `echo bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8}`; do
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-		       ${i}
-	done
-
-	use dlz && {
-		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-
-		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
-	}
-
-	use idn && epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	cd ${S}
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-
-	use idn && {
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		econf || die "idn econf failed"
-		emake || die "idn emake failed"
-	}
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r1 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r3 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		einstall || die "failed to install idn kit"
-		docinto idn
-		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
-	fi
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.3.2-r4.ebuild b/net-dns/bind/bind-9.3.2-r4.ebuild
deleted file mode 100644
index 6ad59220eec7..000000000000
--- a/net-dns/bind/bind-9.3.2-r4.ebuild
+++ /dev/null
@@ -1,280 +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/bind-9.3.2-r4.ebuild,v 1.19 2007/05/06 08:50:30 genone Exp $
-
-inherit eutils libtool autotools
-
-DLZ_VERSION="9.3.2b1"
-MY_P="${P}-P1"
-MY_PV="${PV}-P1"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads"
-
-DEPEND="!net-dns/idnkit
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
-	done
-
-	use dlz && {
-		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-
-		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
-	}
-
-	use idn && epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	cd ${S}
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-
-	use idn && {
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		econf || die "idn econf failed"
-		emake || die "idn emake failed"
-	}
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r1 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r3 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		einstall || die "failed to install idn kit"
-		docinto idn
-		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
-	fi
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.3.2-r5.ebuild b/net-dns/bind/bind-9.3.2-r5.ebuild
index afd3ed2f2d4d..982f0d628ef3 100644
--- a/net-dns/bind/bind-9.3.2-r5.ebuild
+++ b/net-dns/bind/bind-9.3.2-r5.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/bind-9.3.2-r5.ebuild,v 1.8 2008/02/29 21:59:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2-r5.ebuild,v 1.9 2008/07/20 09:36:05 dertobi123 Exp $
 
 inherit eutils libtool autotools
 
@@ -58,16 +58,16 @@ src_unpack() {
 	done
 
 	use dlz && {
-		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
+		epatch "${DISTDIR}"/ctrix_dlz_${DLZ_VERSION}.patch.bz2
+		epatch "${FILESDIR}"/${PN}-dlzbdb-includes.patch
 
-		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
+		use odbc && epatch "${FILESDIR}"/${P}-missing_odbc_test.patch
 	}
 
-	use idn && epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
+	use idn && epatch "${S}"/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
 
 	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
+	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
 
 	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
 
@@ -125,7 +125,7 @@ src_compile() {
 	emake -j1 || die "failed to compile bind"
 
 	use idn && {
-		cd ${S}/contrib/idn/idnkit-1.0-src
+		cd "${S}"/contrib/idn/idnkit-1.0-src
 		econf || die "idn econf failed"
 		emake || die "idn emake failed"
 	}
@@ -154,41 +154,41 @@ src_install() {
 			contrib/nanny/nanny.pl
 
 		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
+		cd $"{D}"/usr/share/doc/${PF}
+		tar pjxf "${DISTFILES}"/dyndns-samples.tbz2
 	}
 
-	newenvd ${FILESDIR}/10bind.env 10bind
+	newenvd "${FILESDIR}"/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
 
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
+	insinto /etc/bind ; newins "${FILESDIR}"/named.conf-r3 named.conf
 
 	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
+	insinto /var/bind ; doins "${FILESDIR}"/named.ca
 
 	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r1 localhost.zone
+	doins "${FILESDIR}"/127.zone
+	newins "${FILESDIR}"/localhost.zone-r1 localhost.zone
 
-	newinitd ${FILESDIR}/named.init-r4 named
-	newconfd ${FILESDIR}/named.confd-r1 named
+	newinitd "${FILESDIR}"/named.init-r4 named
+	newconfd "${FILESDIR}"/named.confd-r1 named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
 	dosym ../../var/bind/pri /etc/bind/pri
 	dosym ../../var/bind/sec /etc/bind/sec
 
 	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
+		cd "${S}"/contrib/idn/idnkit-1.0-src
 		einstall || die "failed to install idn kit"
 		docinto idn
 		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
 	fi
 
 	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
+	rm -f "${D}"/usr/share/man/man1/{dig.1,host.1,nslookup.1}
+	rm -f "${D}"/usr/bin/{dig,host,nslookup}
 }
 
 pkg_postinst() {
@@ -204,9 +204,9 @@ pkg_postinst() {
 		fi
 	fi
 
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
+	install -d -o named -g named "${ROOT}"/var/run/named \
+		"${ROOT}"/var/bind/pri "${ROOT}"/var/bind/sec
+	chown -R named:named "${ROOT}"/var/bind
 
 	elog "The default zone files are now installed as *.zone,"
 	elog "be careful merging config files if you have modified"
diff --git a/net-dns/bind/bind-9.3.2.ebuild b/net-dns/bind/bind-9.3.2.ebuild
deleted file mode 100644
index 8dae03319301..000000000000
--- a/net-dns/bind/bind-9.3.2.ebuild
+++ /dev/null
@@ -1,276 +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/bind-9.3.2.ebuild,v 1.20 2008/03/17 05:08:52 ricmm Exp $
-
-inherit eutils libtool
-
-DLZ_VERSION="9.3.2b1"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${DLZ_VERSION}.patch.bz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads"
-
-DEPEND="!net-dns/idnkit
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-
-	# Adjusting PATHs in manpages
-	for i in `echo bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8}`; do
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-		       ${i}
-	done
-
-	use dlz && {
-		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2 || \
-			die "dlz patch failed"
-	}
-
-	use idn && {
-		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch \
-			|| die "idn patch failed"
-	}
-
-	# it should be installed by bind-tools
-	sed "s:nsupdate ::g" ${S}/bin/Makefile.in > ${T}/Makefile
-	mv ${T}/Makefile ${S}/bin/Makefile.in
-
-	cd ${S}
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-
-	use idn && {
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		econf || die "idn econf failed"
-		emake || die "idn emake failed"
-	}
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r1 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r3 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	if use idn; then
-		cd ${S}/contrib/idn/idnkit-1.0-src
-		einstall || die "failed to install idn kit"
-		docinto idn
-		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
-	fi
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown named:named ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.3.4-r2.ebuild b/net-dns/bind/bind-9.3.4-r2.ebuild
deleted file mode 100644
index 714d53bffc81..000000000000
--- a/net-dns/bind/bind-9.3.4-r2.ebuild
+++ /dev/null
@@ -1,275 +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/bind-9.3.4-r2.ebuild,v 1.12 2008/05/29 19:11:36 armin76 Exp $
-
-inherit eutils libtool autotools toolchain-funcs flag-o-matic
-
-DLZ_VERSION="9.3.3"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${DLZ_VERSION}.patch.bz2	)"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
-	done
-
-	use dlz && {
-		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-		epatch ${FILESDIR}/${PN}-dlzbdb-close_cursor.patch
-
-		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
-	}
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-
-	# bug #151839
-	sed \
-		-e 's:<config.h>:<config.h>\n\n#undef SO_BSDCOMPAT:' \
-		-i lib/isc/unix/socket.c
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use idn && myconf="${myconf} --with-idn"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	# bug #158664
-	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r4 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-
-	use resolvconf && {
-		exeinto /etc/resolvconf/update.d
-		newexe ${FILESDIR}/resolvconf.bind bind
-	}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.3.4-r3.ebuild b/net-dns/bind/bind-9.3.4-r3.ebuild
deleted file mode 100644
index d9832a218894..000000000000
--- a/net-dns/bind/bind-9.3.4-r3.ebuild
+++ /dev/null
@@ -1,275 +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/bind-9.3.4-r3.ebuild,v 1.4 2008/05/29 19:11:36 armin76 Exp $
-
-inherit eutils libtool autotools toolchain-funcs flag-o-matic
-
-DLZ_VERSION="9.3.3"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${DLZ_VERSION}.patch.bz2	)"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
-	done
-
-	use dlz && {
-		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-		epatch ${FILESDIR}/${PN}-dlzbdb-close_cursor.patch
-
-		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
-	}
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-
-	# 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 ssl && myconf="${myconf} --with-openssl"
-	use idn && myconf="${myconf} --with-idn"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	# bug #158664
-	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r5 named
-	newconfd ${FILESDIR}/named.confd-r2 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-
-	use resolvconf && {
-		exeinto /etc/resolvconf/update.d
-		newexe ${FILESDIR}/resolvconf.bind bind
-	}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.3.4.ebuild b/net-dns/bind/bind-9.3.4.ebuild
deleted file mode 100644
index a460e74b41d8..000000000000
--- a/net-dns/bind/bind-9.3.4.ebuild
+++ /dev/null
@@ -1,271 +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/bind-9.3.4.ebuild,v 1.15 2008/05/29 19:11:36 armin76 Exp $
-
-inherit eutils libtool autotools
-
-DLZ_VERSION="9.3.3"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${DLZ_VERSION}.patch.bz2	)"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
-	done
-
-	use dlz && {
-		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2
-		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
-
-		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
-	}
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-
-	# bug #151839
-	sed \
-		-e 's:<config.h>:<config.h>\n\n#undef SO_BSDCOMPAT:' \
-		-i lib/isc/unix/socket.c
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use idn && myconf="${myconf} --with-idn"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r4 named
-	newconfd ${FILESDIR}/named.confd-r1 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-
-	use resolvconf && {
-		exeinto /etc/resolvconf/update.d
-		newexe ${FILESDIR}/resolvconf.bind bind
-	}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.4.1-r1.ebuild b/net-dns/bind/bind-9.4.1-r1.ebuild
deleted file mode 100644
index f707a9a30d29..000000000000
--- a/net-dns/bind/bind-9.4.1-r1.ebuild
+++ /dev/null
@@ -1,277 +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/bind-9.4.1-r1.ebuild,v 1.12 2008/05/29 19:11:36 armin76 Exp $
-
-inherit eutils libtool autotools toolchain-funcs flag-o-matic
-
-DLZ_VERSION="9.3.3"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV/_/}/${P/_/}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf urandom"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-S="${WORKDIR}/${P/_/}"
-
-pkg_setup() {
-	use threads && {
-		echo
-		ewarn "If you're in vserver enviroment, you're probably want to"
-		ewarn "disable threads support because of linux capabilities dependency"
-		echo
-	}
-
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
-	done
-
-	use dlz && epatch ${FILESDIR}/${PN}-9.4.0-dlzbdb-close_cursor.patch
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
-
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
-
-	# 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 ssl && myconf="${myconf} --with-openssl"
-	use idn && myconf="${myconf} --with-idn"
-
-	use dlz && {
-		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
-		use postgres && myconf="${myconf} --with-dlz-postgres"
-		use mysql && myconf="${myconf} --with-dlz-mysql"
-		use berkdb && myconf="${myconf} --with-dlz-bdb"
-		use ldap  && myconf="${myconf} --with-dlz-ldap"
-		use odbc  && myconf="${myconf} --with-dlz-odbc"
-	}
-
-	if use threads; then
-		if use dlz && use mysql; then
-			echo
-			ewarn
-			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
-			ewarn "requires that each thread of an application execute a MySQL"
-			ewarn "\"thread initialization\" to setup the thread local storage."
-			ewarn "This is impossible to do safely while staying within the DLZ"
-			ewarn "driver API. This is a limitation caused by MySQL, and not"
-			ewarn "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			ewarn
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			ewarn "Threading support disabled"
-			epause 10
-		else
-			myconf="${myconf} --enable-linux-caps --enable-threads"
-			einfo "Threading support enabled"
-		fi
-	else
-		myconf="${myconf} --disable-linux-caps --disable-threads"
-	fi
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	# bug #158664
-	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		`use_enable ipv6` \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "failed to compile bind"
-}
-
-src_install() {
-	einstall || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc
-		dodoc doc/misc/*
-
-		docinto html
-		dohtml doc/arm/*
-
-		docinto	draft
-		dodoc doc/draft/*
-
-		docinto rfc
-		dodoc doc/rfc/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
-	}
-
-	newenvd ${FILESDIR}/10bind.env 10bind
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-
-	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
-
-	newinitd ${FILESDIR}/named.init-r5 named
-	newconfd ${FILESDIR}/named.confd-r2 named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-
-	use resolvconf && {
-		exeinto /etc/resolvconf/update.d
-		newexe ${FILESDIR}/resolvconf.bind bind
-	}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if [ -c /dev/urandom ]; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a -u named
-			echo
-		fi
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	elog "The default zone files are now installed as *.zone,"
-	elog "be careful merging config files if you have modified"
-	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
-	elog
-	elog "You can edit /etc/conf.d/named to customize named settings"
-	elog
-	elog "The BIND ebuild now includes chroot support."
-	elog "If you like to run bind in chroot AND this is a new install OR"
-	elog "your bind doesn't already run in chroot, simply run:"
-	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	elog
-	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	elog "zones making all .com and .net domains appear to be registered"
-	elog "This causes many problems such as breaking important anti-spam checks"
-	elog "which verify source domains exist. ISC released a patch for BIND which"
-	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	elog "domain resolution to their normal function."
-	elog
-	elog "There is no need to create a com or net data file. Just the"
-	elog "entries to the named.conf file is enough."
-	elog
-	elog "	zone "com" IN { type delegation-only; };"
-	elog "	zone "net" IN { type delegation-only; };"
-
-	echo
-	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
-	ewarn "when it was previously optional.  If the priority is missing, BIND"
-	ewarn "won't load the zone file at all."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
-	EXISTS="no"
-
-	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
-		CHROOT="/chroot/dns"
-	elif [ -d ${CHROOT} ]; then
-		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
-	fi
-
-	if [ ! "$EXISTS" = yes ]; then
-		einfo ; einfon "Setting up the chroot directory..."
-		mkdir -m 700 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
-		chown -R named:named ${CHROOT}/var/run/named
-		cp -R /etc/bind ${CHROOT}/etc/
-		cp /etc/localtime ${CHROOT}/etc/localtime
-		chown named:named ${CHROOT}/etc/bind/rndc.key
-		cp -R /var/bind ${CHROOT}/var/
-		chown -R named:named ${CHROOT}/var/
-		mknod ${CHROOT}/dev/zero c 1 5
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 666 ${CHROOT}/dev/{random,zero}
-		chown root:named ${CHROOT}
-		chmod 0750 ${CHROOT}
-
-		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
-		if [ $RETVAL = 0 ]; then
-			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
-			mv --force /etc/conf.d/named.orig /etc/conf.d/named
-		fi
-
-		sleep 1; echo " Done."; sleep 1
-		einfo
-		einfo "Add the following to your root .bashrc or .bash_profile: "
-		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
-		einfo "Then do the following: "
-		einfo "   source /root/.bashrc or .bash_profile"
-		einfo
-	fi
-}
diff --git a/net-dns/bind/bind-9.4.1_p1.ebuild b/net-dns/bind/bind-9.4.1_p1.ebuild
index fac4f8dceb3f..e2cccde13885 100644
--- a/net-dns/bind/bind-9.4.1_p1.ebuild
+++ b/net-dns/bind/bind-9.4.1_p1.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/bind-9.4.1_p1.ebuild,v 1.11 2008/05/29 19:11:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.1_p1.ebuild,v 1.12 2008/07/20 09:36:05 dertobi123 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -55,10 +55,10 @@ src_unpack() {
 			"${i}"
 	done
 
-	use dlz && epatch ${FILESDIR}/${PN}-9.4.0-dlzbdb-close_cursor.patch
+	use dlz && epatch "${FILESDIR}"/${PN}-9.4.0-dlzbdb-close_cursor.patch
 
 	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
+	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
 
 	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
 
@@ -149,38 +149,38 @@ src_install() {
 			contrib/nanny/nanny.pl
 
 		# some handy-dandy dynamic dns examples
-		cd ${D}/usr/share/doc/${PF}
-		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
+		cd "${D}"/usr/share/doc/${PF}
+		tar pjxf "${DISTFILES}"/dyndns-samples.tbz2
 	}
 
-	newenvd ${FILESDIR}/10bind.env 10bind
+	newenvd "${FILESDIR}"/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
 
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
+	insinto /etc/bind ; newins "${FILESDIR}"/named.conf-r3 named.conf
 
 	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
+	insinto /var/bind ; doins "${FILESDIR}"/named.ca
 
 	insinto /var/bind/pri
-	doins ${FILESDIR}/127.zone
-	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
+	doins "${FILESDIR}"/127.zone
+	newins "${FILESDIR}"/localhost.zone-r2 localhost.zone
 
-	newinitd ${FILESDIR}/named.init-r5 named
-	newconfd ${FILESDIR}/named.confd-r2 named
+	newinitd "${FILESDIR}"/named.init-r5 named
+	newconfd "${FILESDIR}"/named.confd-r2 named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
 	dosym ../../var/bind/pri /etc/bind/pri
 	dosym ../../var/bind/sec /etc/bind/sec
 
 	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
+	rm -f "${D}"/usr/share/man/man1/{dig.1,host.1,nslookup.1}
+	rm -f "${D}"/usr/bin/{dig,host,nslookup}
 
 	use resolvconf && {
 		exeinto /etc/resolvconf/update.d
-		newexe ${FILESDIR}/resolvconf.bind bind
+		newexe "${FILESDIR}"/resolvconf.bind bind
 	}
 }
 
@@ -197,9 +197,9 @@ pkg_postinst() {
 		fi
 	fi
 
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
+	install -d -o named -g named "${ROOT}"/var/run/named \
+		"${ROOT}"/var/bind/pri "${ROOT}"/var/bind/sec
+	chown -R named:named "${ROOT}"/var/bind
 
 	elog "The default zone files are now installed as *.zone,"
 	elog "be careful merging config files if you have modified"
diff --git a/net-dns/bind/bind-9.5.0_p1.ebuild b/net-dns/bind/bind-9.5.0_p1.ebuild
index 6b3cede51a19..d70ef77d40be 100644
--- a/net-dns/bind/bind-9.5.0_p1.ebuild
+++ b/net-dns/bind/bind-9.5.0_p1.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/bind-9.5.0_p1.ebuild,v 1.1 2008/07/08 18:59:50 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.5.0_p1.ebuild,v 1.2 2008/07/20 09:36:05 dertobi123 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -59,7 +59,7 @@ src_unpack() {
 
 	# bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
 	# (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
-	use dlz && use mysql && epatch ${FILESDIR}/bind-dlzmysql5-reconnect.patch
+	use dlz && use mysql && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
 
 	# should be installed by bind-tools
 	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
diff --git a/net-dns/bind/files/bind-9.2.5-berkdb_fix.patch b/net-dns/bind/files/bind-9.2.5-berkdb_fix.patch
deleted file mode 100644
index ba6bc3f1758a..000000000000
--- a/net-dns/bind/files/bind-9.2.5-berkdb_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2005-03-25 23:33:33.000000000 +0300
-+++ configure.in	2005-03-25 23:34:04.000000000 +0300
-@@ -453,7 +453,7 @@
- 				then
-                                         use_dlz_bdb=$d
- 					DLZ_BDB_INCDIR=$use_dlz_bdb/include
--                                        DLB_BDB_LIB="-ldb"                                        
-+                                        DLZ_BDB_LIB="-ldb"                                        
-                                         break                                  
- 				fi
- 			done
diff --git a/net-dns/bind/files/bind-9.2.5-dlz-mysql.patch b/net-dns/bind/files/bind-9.2.5-dlz-mysql.patch
deleted file mode 100644
index e4ac2e94f4cb..000000000000
--- a/net-dns/bind/files/bind-9.2.5-dlz-mysql.patch
+++ /dev/null
@@ -1,402 +0,0 @@
-diff -uraN bind-9.2.5-dlz/bin/named/include/mysqldb.h bind-9.2.5-dlz-mysql/bin/named/include/mysqldb.h
---- bind-9.2.5-dlz/bin/named/include/mysqldb.h	1970-01-01 03:00:00.000000000 +0300
-+++ bind-9.2.5-dlz-mysql/bin/named/include/mysqldb.h	2005-03-25 21:41:25.000000000 +0300
-@@ -0,0 +1,7 @@
-+
-+#include <isc/types.h>
-+
-+isc_result_t mysqldb_init(void);
-+
-+void mysqldb_clear(void);
-+
-diff -uraN bind-9.2.5-dlz/bin/named/main.c bind-9.2.5-dlz-mysql/bin/named/main.c
---- bind-9.2.5-dlz/bin/named/main.c	2005-03-25 21:41:01.000000000 +0300
-+++ bind-9.2.5-dlz-mysql/bin/named/main.c	2005-03-25 21:41:25.000000000 +0300
-@@ -68,6 +68,7 @@
-  * Include header files for database drivers here.
-  */
- /* #include "xxdb.h" */
-+#include "mysqldb.h"
- 
- #ifdef DLZ_STUB
- #include <named/dlz_stub_driver.h>
-@@ -594,6 +595,7 @@
- 	 * Add calls to register sdb drivers here.
- 	 */
- 	/* xxdb_init(); */
-+	mysqldb_init ();
- 
- #ifdef DLZ_STUB
-     dlz_stub_init();
-@@ -637,6 +639,7 @@
- 	 * Add calls to unregister sdb drivers here.
- 	 */
- 	/* xxdb_clear(); */
-+	mysqldb_clear ();
- 
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "exiting");
-diff -uraN bind-9.2.5-dlz/bin/named/Makefile.in bind-9.2.5-dlz-mysql/bin/named/Makefile.in
---- bind-9.2.5-dlz/bin/named/Makefile.in	2005-03-25 21:41:01.000000000 +0300
-+++ bind-9.2.5-dlz-mysql/bin/named/Makefile.in	2005-03-25 21:41:25.000000000 +0300
-@@ -26,10 +26,10 @@
- #
- # Add database drivers here.
- #
--DBDRIVER_OBJS =
--DBDRIVER_SRCS =
--DBDRIVER_INCLUDES =
--DBDRIVER_LIBS =
-+DBDRIVER_OBJS = mysqldb.@O@
-+DBDRIVER_SRCS = mysqldb.c
-+DBDRIVER_INCLUDES = -I/usr/local/include
-+DBDRIVER_LIBS = -L/usr/local/lib/mysql -lmysqlclient
- 
- DLZINCLUDES =	@DLZ_BDB_INC@ @DLZ_POSTGRES_INC@ @DLZ_ODBC_INC@ \
-                 @DLZ_MYSQL_INC@ @DLZ_LDAP_INC@
-diff -uraN bind-9.2.5-dlz/bin/named/mysqldb.c bind-9.2.5-dlz-mysql/bin/named/mysqldb.c
---- bind-9.2.5-dlz/bin/named/mysqldb.c	1970-01-01 03:00:00.000000000 +0300
-+++ bind-9.2.5-dlz-mysql/bin/named/mysqldb.c	2005-03-25 21:41:25.000000000 +0300
-@@ -0,0 +1,342 @@
-+/*
-+ * Copyright (C) 2002 Mihai Chelaru ( kefren@netbastards.org )
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND I DISCLAIM ALL WARRANTIES WITH
-+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS. IN NO EVENT SHALL I BE LIABLE FOR ANY SPECIAL, DIRECT,
-+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+
-+#include <config.h>
-+#include <stdio.h>
-+#include <malloc.h>
-+#include <mysql/mysql.h>
-+#include <isc/mem.h>
-+#include <dns/sdb.h>
-+#include <dns/result.h>
-+#include <named/globals.h>
-+
-+#include <mysqldb.h>
-+
-+#define ROWS 20
-+#define MAXCOLUMN 200
-+
-+/*
-+#define ONEDATABASE
-+#define MDEBUG
-+*/
-+struct mysqlrow {
-+	char           *s[ROWS];
-+};
-+
-+static dns_sdbimplementation_t *mysqldb = NULL;
-+
-+struct mydbinfo {
-+	MYSQL          *conn;
-+	char           *database;
-+	char           *table;
-+	char           *host;
-+	char           *user;
-+	char           *passwd;
-+};
-+
-+/* My internal functions */
-+
-+int             mysql_dbcon(struct mydbinfo *);
-+
-+int 
-+mysql_dbcon(struct mydbinfo * dbi)
-+{
-+#ifdef MDEBUG
-+	printf("Connecting\n");
-+#endif
-+	dbi->conn=mysql_init(NULL);
-+	if (dbi->conn == NULL) return 0;
-+	if (!mysql_real_connect(dbi->conn, dbi->host, dbi->user, dbi->passwd, dbi->database, 3306, NULL, 0))
-+		return 0;
-+#ifdef MDEBUG
-+	printf("Connected\n");
-+#endif
-+	return 1;
-+}
-+
-+/* External functions */
-+
-+static isc_result_t 
-+mysqldb_lookup(const char *zone, const char *name, void *dbdata, dns_sdblookup_t * lookup)
-+{
-+	char           *querystring = NULL, seclook[150];
-+	struct mydbinfo *dbi = (struct mydbinfo *) dbdata;
-+	MYSQL_RES      *result;
-+	struct mysqlrow myrow;
-+	int             i, j, totlen;
-+	MYSQL_ROW       row;
-+	int             num_fields, putrr_success=0;
-+#ifdef MDEBUG
-+	printf("Lookup in %.200s for %.200s ", zone, name);
-+#endif
-+	querystring = (char *) malloc(200);
-+	if (!querystring)
-+		return ISC_R_NOMEMORY;
-+	snprintf(querystring, 200, "SELECT TTL,RDTYPE,RDATA FROM %s where name='%.150s'", dbi->table, name);
-+#ifdef MDEBUG
-+	printf("Query = %s\n", querystring);
-+#endif
-+	mysql_ping(dbi->conn);
-+	if (mysql_query(dbi->conn, querystring)) {
-+		printf("Query Error in lookup\n");
-+		free(querystring);
-+		return ISC_R_FAILURE;
-+	}
-+	free(querystring);
-+	result = mysql_store_result(dbi->conn);
-+
-+	num_fields = mysql_num_fields(result);
-+	if (num_fields > ROWS) {
-+		printf("Incorrect database format\n");
-+		mysql_free_result(result);
-+		return ISC_R_FAILURE;
-+	}
-+	/* allocate to fetch */
-+	for (i = 0; i < ROWS; i++)
-+		if (!(myrow.s[i] = (char *) malloc(MAXCOLUMN))) {
-+			for (j = 0; j < i; j++)
-+				free(myrow.s[i]);
-+			mysql_free_result(result);
-+			return ISC_R_NOMEMORY;
-+		}
-+	/* Ok. we found no reason why to not let fetch */
-+	while ((row = mysql_fetch_row(result))) {
-+		unsigned long  *lengths;
-+		lengths = mysql_fetch_lengths(result);
-+		totlen = 0;
-+		for (i = 0; i < num_fields; i++) {
-+			totlen += lengths[i];
-+			snprintf(myrow.s[i], MAXCOLUMN, "%.*s", (int) lengths[i], row[i] ? row[i] : "NULL");
-+		}
-+#ifdef MDEBUG
-+		printf("Lookup: %s %s %s\n", myrow.s[0], myrow.s[1], myrow.s[2]);
-+#endif
-+		if (dns_sdb_putrr(lookup, myrow.s[1], strtol(myrow.s[0], NULL, 10), myrow.s[2]) != ISC_R_SUCCESS) {
-+			for (i = 0; i < ROWS; i++)
-+				free(myrow.s[i]);
-+			mysql_free_result(result);
-+			printf("Lookup Failure\n");
-+			return ISC_R_FAILURE;
-+		} else putrr_success=1;
-+	}
-+#ifdef MDEBUG
-+	printf ("Bailing out lookup\n");
-+#endif
-+	/* Ok. success. bail out. */
-+	for (i = 0; i < ROWS; i++)
-+		free(myrow.s[i]);
-+	mysql_free_result(result);
-+
-+	/* Check if there is any *.foo.com available and return it in case that this is not a *.foo.com call */
-+	if ((!putrr_success)&&(name[0]!='*')) {
-+#ifdef MDEBUG
-+printf ("Cannot find it. Trying to check * record\n");
-+#endif
-+		snprintf (seclook,150,"*.%s",zone);
-+		return mysqldb_lookup (zone, seclook, dbdata, lookup);
-+		}
-+	
-+	/* else return SUCCESS */
-+	return ISC_R_SUCCESS;
-+}
-+
-+static isc_result_t 
-+mysqldb_allnodes(const char *zone, void *dbdata, dns_sdballnodes_t * allnodes)
-+{
-+	char           *querystring = NULL;
-+	struct mydbinfo *dbi = (struct mydbinfo *) dbdata;
-+	MYSQL_RES      *result;
-+	struct mysqlrow myrow;
-+	MYSQL_ROW       row;
-+	int             num_fields;
-+	int             i, totlen, j;
-+#ifdef MDEBUG
-+	printf("All Nodes\n");
-+#endif
-+	querystring = (char *) malloc(200);
-+	if (!querystring)
-+		return ISC_R_NOMEMORY;
-+	snprintf(querystring, 200, "SELECT TTL,NAME,RDTYPE,RDATA FROM %s where name like('%%%.150s')", dbi->table, zone);
-+	mysql_ping(dbi->conn);
-+	if (mysql_query(dbi->conn, querystring)) {
-+		printf("Query Error\n");
-+		free(querystring);
-+		return ISC_R_FAILURE;
-+	}
-+	free(querystring);
-+	result = mysql_store_result(dbi->conn);
-+
-+	num_fields = mysql_num_fields(result);
-+	if (num_fields > ROWS) {
-+		printf("Incorrect database format\n");
-+		mysql_free_result(result);
-+		return ISC_R_FAILURE;
-+	}
-+	/* allocate to fetch */
-+	for (i = 0; i < ROWS; i++)
-+		if (!(myrow.s[i] = (char *) malloc(MAXCOLUMN))) {
-+			for (j = 0; j < i; j++)
-+				free(myrow.s[i]);
-+			mysql_free_result(result);
-+			return ISC_R_NOMEMORY;
-+		}
-+	/* Ok. we found no reason why to not let fetch */
-+	while ((row = mysql_fetch_row(result))) {
-+		unsigned long  *lengths;
-+		lengths = mysql_fetch_lengths(result);
-+		totlen = 0;
-+		for (i = 0; i < num_fields; i++) {
-+			totlen += lengths[i];
-+			snprintf(myrow.s[i], MAXCOLUMN, "%.*s", (int) lengths[i], row[i] ? row[i] : "NULL");
-+		}
-+#ifdef MDEBUG
-+		printf("All Nodes: %s %s %s %s\n", myrow.s[0], myrow.s[1], myrow.s[2], myrow.s[3]);
-+#endif
-+		if (dns_sdb_putnamedrr(allnodes, myrow.s[1], myrow.s[2], strtol(myrow.s[0], NULL, 10), myrow.s[3]) != ISC_R_SUCCESS) {
-+			for (i = 0; i < ROWS; i++)
-+				free(myrow.s[i]);
-+			mysql_free_result(result);
-+			return ISC_R_FAILURE;
-+		}
-+	}
-+
-+	/* Ok. success. bail out. */
-+	mysql_free_result(result);
-+	for (i = 0; i < ROWS; i++)
-+		free(myrow.s[i]);
-+	return ISC_R_SUCCESS;
-+}
-+
-+
-+
-+/*
-+ * Open database argv[i]=database,table,hostname,user,passwd
-+ */
-+
-+static isc_result_t 
-+mysqldb_create(const char *zone, int argc, char **argv, void *driverdata, void **dbdata)
-+{
-+	struct mydbinfo *dbi;
-+	#ifdef ONEDATABASE
-+	static MYSQL *dbconstat;
-+	#endif
-+
-+	/* Argument count checking */
-+	if (argc < 5)
-+		return ISC_R_FAILURE;
-+
-+	/* dbi init */
-+
-+	dbi = (struct mydbinfo *) isc_mem_get(ns_g_mctx, sizeof(struct mydbinfo));
-+	if (!dbi)
-+		return ISC_R_NOMEMORY;
-+	dbi->database = NULL;
-+	dbi->table = NULL;
-+	dbi->host = NULL;
-+	dbi->user = NULL;
-+	dbi->passwd = NULL;
-+
-+	dbi->database = isc_mem_strdup(ns_g_mctx, argv[0]);
-+	dbi->table = isc_mem_strdup(ns_g_mctx, argv[1]);
-+	dbi->host = isc_mem_strdup(ns_g_mctx, argv[2]);
-+	dbi->user = isc_mem_strdup(ns_g_mctx, argv[3]);
-+	dbi->passwd = isc_mem_strdup(ns_g_mctx, argv[4]);
-+
-+	if ((!dbi->database) || (!dbi->table) || (!dbi->host) || (!dbi->user) || (!dbi->passwd)) {
-+		printf("Cannot strdup\n");
-+		if (dbi->conn)
-+			mysql_close(dbi->conn);
-+		if (dbi->database)
-+			isc_mem_free(ns_g_mctx, dbi->database);
-+		if (dbi->table)
-+			isc_mem_free(ns_g_mctx, dbi->table);
-+		if (dbi->host)
-+			isc_mem_free(ns_g_mctx, dbi->host);
-+		if (dbi->user)
-+			isc_mem_free(ns_g_mctx, dbi->user);
-+		if (dbi->passwd)
-+			isc_mem_free(ns_g_mctx, dbi->passwd);
-+		isc_mem_put(ns_g_mctx, dbi, sizeof(struct mydbinfo));
-+		return ISC_R_NOMEMORY;
-+	}
-+	/* connect to database */
-+	#ifdef ONEDATABASE
-+	if (!((dbconstat) && (!mysql_ping(dbconstat))))
-+	#endif
-+	if (!mysql_dbcon(dbi)) {
-+		printf("Cannot connect to database\n");
-+		return ISC_R_FAILURE;
-+	}
-+	#ifdef ONEDATABASE
-+	if (dbconstat) dbi->conn = dbconstat; else dbconstat = dbi->conn;
-+	#endif
-+	*dbdata = dbi;
-+	return ISC_R_SUCCESS;
-+}
-+
-+static void 
-+mysqldb_destroy(const char *zone, void *driverdata, void **dbdata)
-+{
-+	struct mydbinfo *dbi;
-+
-+	dbi = (struct mydbinfo *) (*dbdata);
-+	if (!dbi)
-+		return;
-+	if (dbi->conn)
-+		mysql_close(dbi->conn);
-+	if (dbi->database)
-+		isc_mem_free(ns_g_mctx, dbi->database);
-+	if (dbi->table)
-+		isc_mem_free(ns_g_mctx, dbi->table);
-+	if (dbi->host)
-+		isc_mem_free(ns_g_mctx, dbi->host);
-+	if (dbi->user)
-+		isc_mem_free(ns_g_mctx, dbi->user);
-+	if (dbi->passwd)
-+		isc_mem_free(ns_g_mctx, dbi->passwd);
-+	isc_mem_put(ns_g_mctx, dbi, sizeof(struct mydbinfo));
-+#ifdef MDEBUG
-+	printf("Destroyed\n");
-+#endif
-+}
-+
-+
-+/* SDB methods */
-+
-+static dns_sdbmethods_t mysqldb_methods = {
-+	mysqldb_lookup,
-+	NULL,			/* authority */
-+	mysqldb_allnodes,
-+	mysqldb_create,
-+	mysqldb_destroy
-+};
-+
-+
-+
-+isc_result_t 
-+mysqldb_init()
-+{
-+	unsigned int    flags = 0;
-+	return dns_sdb_register("mysql", &mysqldb_methods, NULL, flags, ns_g_mctx, &mysqldb);
-+}
-+
-+void 
-+mysqldb_clear()
-+{
-+	if (mysqldb)
-+		dns_sdb_unregister(&mysqldb);
-+}
diff --git a/net-dns/bind/files/bind-9.2.5-mysql.patch b/net-dns/bind/files/bind-9.2.5-mysql.patch
deleted file mode 100644
index 28b02f375d5b..000000000000
--- a/net-dns/bind/files/bind-9.2.5-mysql.patch
+++ /dev/null
@@ -1,402 +0,0 @@
-diff -uraN bind-9.2.5-orig/bin/named/include/mysqldb.h bind-9.2.5-mysql/bin/named/include/mysqldb.h
---- bind-9.2.5-orig/bin/named/include/mysqldb.h	1970-01-01 03:00:00.000000000 +0300
-+++ bind-9.2.5-mysql/bin/named/include/mysqldb.h	2005-03-25 21:35:47.000000000 +0300
-@@ -0,0 +1,7 @@
-+
-+#include <isc/types.h>
-+
-+isc_result_t mysqldb_init(void);
-+
-+void mysqldb_clear(void);
-+
-diff -uraN bind-9.2.5-orig/bin/named/main.c bind-9.2.5-mysql/bin/named/main.c
---- bind-9.2.5-orig/bin/named/main.c	2004-10-25 04:50:53.000000000 +0400
-+++ bind-9.2.5-mysql/bin/named/main.c	2005-03-25 21:35:47.000000000 +0300
-@@ -68,6 +68,7 @@
-  * Include header files for database drivers here.
-  */
- /* #include "xxdb.h" */
-+#include "mysqldb.h"
- 
- static isc_boolean_t	want_stats = ISC_FALSE;
- static char		program_name[ISC_DIR_NAMEMAX] = "named";
-@@ -565,6 +566,7 @@
- 	 * Add calls to register sdb drivers here.
- 	 */
- 	/* xxdb_init(); */
-+	mysqldb_init ();
- 
- 	ns_server_create(ns_g_mctx, &ns_g_server);
- }
-@@ -579,6 +581,7 @@
- 	 * Add calls to unregister sdb drivers here.
- 	 */
- 	/* xxdb_clear(); */
-+	mysqldb_clear ();
- 
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "exiting");
-diff -uraN bind-9.2.5-orig/bin/named/Makefile.in bind-9.2.5-mysql/bin/named/Makefile.in
---- bind-9.2.5-orig/bin/named/Makefile.in	2004-09-07 01:42:06.000000000 +0400
-+++ bind-9.2.5-mysql/bin/named/Makefile.in	2005-03-25 21:35:47.000000000 +0300
-@@ -26,10 +26,10 @@
- #
- # Add database drivers here.
- #
--DBDRIVER_OBJS =
--DBDRIVER_SRCS =
--DBDRIVER_INCLUDES =
--DBDRIVER_LIBS =
-+DBDRIVER_OBJS = mysqldb.@O@
-+DBDRIVER_SRCS = mysqldb.c
-+DBDRIVER_INCLUDES = -I/usr/local/include
-+DBDRIVER_LIBS = -L/usr/local/lib/mysql -lmysqlclient
- 
- CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include \
- 		${LWRES_INCLUDES} ${DNS_INCLUDES} \
-diff -uraN bind-9.2.5-orig/bin/named/mysqldb.c bind-9.2.5-mysql/bin/named/mysqldb.c
---- bind-9.2.5-orig/bin/named/mysqldb.c	1970-01-01 03:00:00.000000000 +0300
-+++ bind-9.2.5-mysql/bin/named/mysqldb.c	2005-03-25 21:35:47.000000000 +0300
-@@ -0,0 +1,342 @@
-+/*
-+ * Copyright (C) 2002 Mihai Chelaru ( kefren@netbastards.org )
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND I DISCLAIM ALL WARRANTIES WITH
-+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS. IN NO EVENT SHALL I BE LIABLE FOR ANY SPECIAL, DIRECT,
-+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+
-+#include <config.h>
-+#include <stdio.h>
-+#include <malloc.h>
-+#include <mysql/mysql.h>
-+#include <isc/mem.h>
-+#include <dns/sdb.h>
-+#include <dns/result.h>
-+#include <named/globals.h>
-+
-+#include <mysqldb.h>
-+
-+#define ROWS 20
-+#define MAXCOLUMN 200
-+
-+/*
-+#define ONEDATABASE
-+#define MDEBUG
-+*/
-+struct mysqlrow {
-+	char           *s[ROWS];
-+};
-+
-+static dns_sdbimplementation_t *mysqldb = NULL;
-+
-+struct mydbinfo {
-+	MYSQL          *conn;
-+	char           *database;
-+	char           *table;
-+	char           *host;
-+	char           *user;
-+	char           *passwd;
-+};
-+
-+/* My internal functions */
-+
-+int             mysql_dbcon(struct mydbinfo *);
-+
-+int 
-+mysql_dbcon(struct mydbinfo * dbi)
-+{
-+#ifdef MDEBUG
-+	printf("Connecting\n");
-+#endif
-+	dbi->conn=mysql_init(NULL);
-+	if (dbi->conn == NULL) return 0;
-+	if (!mysql_real_connect(dbi->conn, dbi->host, dbi->user, dbi->passwd, dbi->database, 3306, NULL, 0))
-+		return 0;
-+#ifdef MDEBUG
-+	printf("Connected\n");
-+#endif
-+	return 1;
-+}
-+
-+/* External functions */
-+
-+static isc_result_t 
-+mysqldb_lookup(const char *zone, const char *name, void *dbdata, dns_sdblookup_t * lookup)
-+{
-+	char           *querystring = NULL, seclook[150];
-+	struct mydbinfo *dbi = (struct mydbinfo *) dbdata;
-+	MYSQL_RES      *result;
-+	struct mysqlrow myrow;
-+	int             i, j, totlen;
-+	MYSQL_ROW       row;
-+	int             num_fields, putrr_success=0;
-+#ifdef MDEBUG
-+	printf("Lookup in %.200s for %.200s ", zone, name);
-+#endif
-+	querystring = (char *) malloc(200);
-+	if (!querystring)
-+		return ISC_R_NOMEMORY;
-+	snprintf(querystring, 200, "SELECT TTL,RDTYPE,RDATA FROM %s where name='%.150s'", dbi->table, name);
-+#ifdef MDEBUG
-+	printf("Query = %s\n", querystring);
-+#endif
-+	mysql_ping(dbi->conn);
-+	if (mysql_query(dbi->conn, querystring)) {
-+		printf("Query Error in lookup\n");
-+		free(querystring);
-+		return ISC_R_FAILURE;
-+	}
-+	free(querystring);
-+	result = mysql_store_result(dbi->conn);
-+
-+	num_fields = mysql_num_fields(result);
-+	if (num_fields > ROWS) {
-+		printf("Incorrect database format\n");
-+		mysql_free_result(result);
-+		return ISC_R_FAILURE;
-+	}
-+	/* allocate to fetch */
-+	for (i = 0; i < ROWS; i++)
-+		if (!(myrow.s[i] = (char *) malloc(MAXCOLUMN))) {
-+			for (j = 0; j < i; j++)
-+				free(myrow.s[i]);
-+			mysql_free_result(result);
-+			return ISC_R_NOMEMORY;
-+		}
-+	/* Ok. we found no reason why to not let fetch */
-+	while ((row = mysql_fetch_row(result))) {
-+		unsigned long  *lengths;
-+		lengths = mysql_fetch_lengths(result);
-+		totlen = 0;
-+		for (i = 0; i < num_fields; i++) {
-+			totlen += lengths[i];
-+			snprintf(myrow.s[i], MAXCOLUMN, "%.*s", (int) lengths[i], row[i] ? row[i] : "NULL");
-+		}
-+#ifdef MDEBUG
-+		printf("Lookup: %s %s %s\n", myrow.s[0], myrow.s[1], myrow.s[2]);
-+#endif
-+		if (dns_sdb_putrr(lookup, myrow.s[1], strtol(myrow.s[0], NULL, 10), myrow.s[2]) != ISC_R_SUCCESS) {
-+			for (i = 0; i < ROWS; i++)
-+				free(myrow.s[i]);
-+			mysql_free_result(result);
-+			printf("Lookup Failure\n");
-+			return ISC_R_FAILURE;
-+		} else putrr_success=1;
-+	}
-+#ifdef MDEBUG
-+	printf ("Bailing out lookup\n");
-+#endif
-+	/* Ok. success. bail out. */
-+	for (i = 0; i < ROWS; i++)
-+		free(myrow.s[i]);
-+	mysql_free_result(result);
-+
-+	/* Check if there is any *.foo.com available and return it in case that this is not a *.foo.com call */
-+	if ((!putrr_success)&&(name[0]!='*')) {
-+#ifdef MDEBUG
-+printf ("Cannot find it. Trying to check * record\n");
-+#endif
-+		snprintf (seclook,150,"*.%s",zone);
-+		return mysqldb_lookup (zone, seclook, dbdata, lookup);
-+		}
-+	
-+	/* else return SUCCESS */
-+	return ISC_R_SUCCESS;
-+}
-+
-+static isc_result_t 
-+mysqldb_allnodes(const char *zone, void *dbdata, dns_sdballnodes_t * allnodes)
-+{
-+	char           *querystring = NULL;
-+	struct mydbinfo *dbi = (struct mydbinfo *) dbdata;
-+	MYSQL_RES      *result;
-+	struct mysqlrow myrow;
-+	MYSQL_ROW       row;
-+	int             num_fields;
-+	int             i, totlen, j;
-+#ifdef MDEBUG
-+	printf("All Nodes\n");
-+#endif
-+	querystring = (char *) malloc(200);
-+	if (!querystring)
-+		return ISC_R_NOMEMORY;
-+	snprintf(querystring, 200, "SELECT TTL,NAME,RDTYPE,RDATA FROM %s where name like('%%%.150s')", dbi->table, zone);
-+	mysql_ping(dbi->conn);
-+	if (mysql_query(dbi->conn, querystring)) {
-+		printf("Query Error\n");
-+		free(querystring);
-+		return ISC_R_FAILURE;
-+	}
-+	free(querystring);
-+	result = mysql_store_result(dbi->conn);
-+
-+	num_fields = mysql_num_fields(result);
-+	if (num_fields > ROWS) {
-+		printf("Incorrect database format\n");
-+		mysql_free_result(result);
-+		return ISC_R_FAILURE;
-+	}
-+	/* allocate to fetch */
-+	for (i = 0; i < ROWS; i++)
-+		if (!(myrow.s[i] = (char *) malloc(MAXCOLUMN))) {
-+			for (j = 0; j < i; j++)
-+				free(myrow.s[i]);
-+			mysql_free_result(result);
-+			return ISC_R_NOMEMORY;
-+		}
-+	/* Ok. we found no reason why to not let fetch */
-+	while ((row = mysql_fetch_row(result))) {
-+		unsigned long  *lengths;
-+		lengths = mysql_fetch_lengths(result);
-+		totlen = 0;
-+		for (i = 0; i < num_fields; i++) {
-+			totlen += lengths[i];
-+			snprintf(myrow.s[i], MAXCOLUMN, "%.*s", (int) lengths[i], row[i] ? row[i] : "NULL");
-+		}
-+#ifdef MDEBUG
-+		printf("All Nodes: %s %s %s %s\n", myrow.s[0], myrow.s[1], myrow.s[2], myrow.s[3]);
-+#endif
-+		if (dns_sdb_putnamedrr(allnodes, myrow.s[1], myrow.s[2], strtol(myrow.s[0], NULL, 10), myrow.s[3]) != ISC_R_SUCCESS) {
-+			for (i = 0; i < ROWS; i++)
-+				free(myrow.s[i]);
-+			mysql_free_result(result);
-+			return ISC_R_FAILURE;
-+		}
-+	}
-+
-+	/* Ok. success. bail out. */
-+	mysql_free_result(result);
-+	for (i = 0; i < ROWS; i++)
-+		free(myrow.s[i]);
-+	return ISC_R_SUCCESS;
-+}
-+
-+
-+
-+/*
-+ * Open database argv[i]=database,table,hostname,user,passwd
-+ */
-+
-+static isc_result_t 
-+mysqldb_create(const char *zone, int argc, char **argv, void *driverdata, void **dbdata)
-+{
-+	struct mydbinfo *dbi;
-+	#ifdef ONEDATABASE
-+	static MYSQL *dbconstat;
-+	#endif
-+
-+	/* Argument count checking */
-+	if (argc < 5)
-+		return ISC_R_FAILURE;
-+
-+	/* dbi init */
-+
-+	dbi = (struct mydbinfo *) isc_mem_get(ns_g_mctx, sizeof(struct mydbinfo));
-+	if (!dbi)
-+		return ISC_R_NOMEMORY;
-+	dbi->database = NULL;
-+	dbi->table = NULL;
-+	dbi->host = NULL;
-+	dbi->user = NULL;
-+	dbi->passwd = NULL;
-+
-+	dbi->database = isc_mem_strdup(ns_g_mctx, argv[0]);
-+	dbi->table = isc_mem_strdup(ns_g_mctx, argv[1]);
-+	dbi->host = isc_mem_strdup(ns_g_mctx, argv[2]);
-+	dbi->user = isc_mem_strdup(ns_g_mctx, argv[3]);
-+	dbi->passwd = isc_mem_strdup(ns_g_mctx, argv[4]);
-+
-+	if ((!dbi->database) || (!dbi->table) || (!dbi->host) || (!dbi->user) || (!dbi->passwd)) {
-+		printf("Cannot strdup\n");
-+		if (dbi->conn)
-+			mysql_close(dbi->conn);
-+		if (dbi->database)
-+			isc_mem_free(ns_g_mctx, dbi->database);
-+		if (dbi->table)
-+			isc_mem_free(ns_g_mctx, dbi->table);
-+		if (dbi->host)
-+			isc_mem_free(ns_g_mctx, dbi->host);
-+		if (dbi->user)
-+			isc_mem_free(ns_g_mctx, dbi->user);
-+		if (dbi->passwd)
-+			isc_mem_free(ns_g_mctx, dbi->passwd);
-+		isc_mem_put(ns_g_mctx, dbi, sizeof(struct mydbinfo));
-+		return ISC_R_NOMEMORY;
-+	}
-+	/* connect to database */
-+	#ifdef ONEDATABASE
-+	if (!((dbconstat) && (!mysql_ping(dbconstat))))
-+	#endif
-+	if (!mysql_dbcon(dbi)) {
-+		printf("Cannot connect to database\n");
-+		return ISC_R_FAILURE;
-+	}
-+	#ifdef ONEDATABASE
-+	if (dbconstat) dbi->conn = dbconstat; else dbconstat = dbi->conn;
-+	#endif
-+	*dbdata = dbi;
-+	return ISC_R_SUCCESS;
-+}
-+
-+static void 
-+mysqldb_destroy(const char *zone, void *driverdata, void **dbdata)
-+{
-+	struct mydbinfo *dbi;
-+
-+	dbi = (struct mydbinfo *) (*dbdata);
-+	if (!dbi)
-+		return;
-+	if (dbi->conn)
-+		mysql_close(dbi->conn);
-+	if (dbi->database)
-+		isc_mem_free(ns_g_mctx, dbi->database);
-+	if (dbi->table)
-+		isc_mem_free(ns_g_mctx, dbi->table);
-+	if (dbi->host)
-+		isc_mem_free(ns_g_mctx, dbi->host);
-+	if (dbi->user)
-+		isc_mem_free(ns_g_mctx, dbi->user);
-+	if (dbi->passwd)
-+		isc_mem_free(ns_g_mctx, dbi->passwd);
-+	isc_mem_put(ns_g_mctx, dbi, sizeof(struct mydbinfo));
-+#ifdef MDEBUG
-+	printf("Destroyed\n");
-+#endif
-+}
-+
-+
-+/* SDB methods */
-+
-+static dns_sdbmethods_t mysqldb_methods = {
-+	mysqldb_lookup,
-+	NULL,			/* authority */
-+	mysqldb_allnodes,
-+	mysqldb_create,
-+	mysqldb_destroy
-+};
-+
-+
-+
-+isc_result_t 
-+mysqldb_init()
-+{
-+	unsigned int    flags = 0;
-+	return dns_sdb_register("mysql", &mysqldb_methods, NULL, flags, ns_g_mctx, &mysqldb);
-+}
-+
-+void 
-+mysqldb_clear()
-+{
-+	if (mysqldb)
-+		dns_sdb_unregister(&mysqldb);
-+}
diff --git a/net-dns/bind/files/bind-9.2.8-missing_odbc_test.patch b/net-dns/bind/files/bind-9.2.8-missing_odbc_test.patch
deleted file mode 100644
index ead47527451a..000000000000
--- a/net-dns/bind/files/bind-9.2.8-missing_odbc_test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in	2006-07-09 22:00:54.000000000 +0000
-+++ configure.in	2006-07-09 22:01:05.000000000 +0000
-@@ -686,17 +686,7 @@
- 				fi
- 			done
- 			
--			if   test -z "`${CC} contrib/sdb/test//test.c -lodbc -o contrib/sdb/test/test.ok 2>&1`"; then
- 			    DLZ_ODBC_LIB="-lodbc"
--			elif test -z "`${CC} contrib/sdb/test//test.c -liodbc -o contrib/sdb/test/test.ok 2>&1`"; then
--			    DLZ_ODBC_LIB="-liodbc"
--			else 
--			    DLZ_ODBC_LIB=""
--			    use_dlz_odbc="no"
--			    AC_MSG_RESULT("no ODBC libraries found")
--			fi
--			rm -f contrib/sdb/test/test.ok
--			
- 			
- 			if test "$use_dlz_odbc" = "yes"
- 			then
diff --git a/net-dns/bind/files/bind-9.3.4-missing_odbc_test.patch b/net-dns/bind/files/bind-9.3.4-missing_odbc_test.patch
deleted file mode 100644
index ead47527451a..000000000000
--- a/net-dns/bind/files/bind-9.3.4-missing_odbc_test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in	2006-07-09 22:00:54.000000000 +0000
-+++ configure.in	2006-07-09 22:01:05.000000000 +0000
-@@ -686,17 +686,7 @@
- 				fi
- 			done
- 			
--			if   test -z "`${CC} contrib/sdb/test//test.c -lodbc -o contrib/sdb/test/test.ok 2>&1`"; then
- 			    DLZ_ODBC_LIB="-lodbc"
--			elif test -z "`${CC} contrib/sdb/test//test.c -liodbc -o contrib/sdb/test/test.ok 2>&1`"; then
--			    DLZ_ODBC_LIB="-liodbc"
--			else 
--			    DLZ_ODBC_LIB=""
--			    use_dlz_odbc="no"
--			    AC_MSG_RESULT("no ODBC libraries found")
--			fi
--			rm -f contrib/sdb/test/test.ok
--			
- 			
- 			if test "$use_dlz_odbc" = "yes"
- 			then
diff --git a/net-dns/bind/files/bind-dlzbdb-close_cursor.patch b/net-dns/bind/files/bind-dlzbdb-close_cursor.patch
deleted file mode 100644
index 5eb8c122290d..000000000000
--- a/net-dns/bind/files/bind-dlzbdb-close_cursor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/named/dlz_bdbhpt_driver.c	Thu May  4 13:13:20 2006
-+++ bin/named/dlz_bdbhpt_driver.c	Thu May  4 13:27:05 2006
-@@ -462,7 +462,7 @@
- 		xfr_cursor->c_close(xfr_cursor);
- 		
-    if(dns_cursor != NULL)
--      dns_cursor->c_close(xfr_cursor);
-+      dns_cursor->c_close(dns_cursor);
- 
- 	return result;
- }
diff --git a/net-dns/bind/files/localhost.zone b/net-dns/bind/files/localhost.zone
deleted file mode 100644
index 44dff11c69f3..000000000000
--- a/net-dns/bind/files/localhost.zone
+++ /dev/null
@@ -1,9 +0,0 @@
-$TTL 1W
-@       IN      SOA     ns.localhost. root.localhost.  (
-                                      2002081601 ; Serial
-                                      28800      ; Refresh
-                                      14400      ; Retry
-                                      604800     ; Expire - 1 week
-                                      86400 )    ; Minimum
-		IN      NS      ns
-localhost.	IN	A	127.0.0.1
diff --git a/net-dns/bind/files/named.conf-r2 b/net-dns/bind/files/named.conf-r2
deleted file mode 100644
index f9ae4cc98814..000000000000
--- a/net-dns/bind/files/named.conf-r2
+++ /dev/null
@@ -1,42 +0,0 @@
-options {
-	directory "/var/bind";
-
-	// uncomment the following lines to turn on DNS forwarding,
-	// and change the forwarding ip address(es) :
-	//forward first;
-	//forwarders {
-	//	123.123.123.123;
-	//	123.123.123.123;
-	//};
-
-	listen-on-v6 { none; };
-        listen-on { 127.0.0.1; };
-
-	// to allow only specific hosts to use the DNS server:
-	//allow-query {
-	//	127.0.0.1;
-	//};
-
-	// if you have problems and are behind a firewall:
-	//query-source address * port 53;
-	pid-file "/var/run/named/named.pid";
-};
-
-zone "." IN {
-	type hint;
-	file "named.ca";
-};
-
-zone "localhost" IN {
-	type master;
-	file "pri/localhost.zone";
-	allow-update { none; };
-	notify no;
-};
-
-zone "127.in-addr.arpa" IN {
-	type master;
-	file "pri/127.zone";
-	allow-update { none; };
-	notify no;
-};
diff --git a/net-dns/bind/files/named.confd b/net-dns/bind/files/named.confd
deleted file mode 100644
index c59ed25fa905..000000000000
--- a/net-dns/bind/files/named.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Set various named options here.
-#
-OPTIONS=""
-
-# Set this to the number of processors you have.
-#
-CPU="1"
-
-# If you wish to run bind in a chroot, run:
-# emerge --config =<bind-version>
-# and un-comment the following line.
-# You can specify a different chroot directory but MAKE SURE it's empty.
-# CHROOT="/chroot/dns"
diff --git a/net-dns/bind/files/named.init b/net-dns/bind/files/named.init
deleted file mode 100755
index ff556bc969dc..000000000000
--- a/net-dns/bind/files/named.init
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init,v 1.1 2005/06/23 17:37:44 voxus Exp $
-
-opts="start stop reload restart"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-checkconfig() {
-	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
-		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
-	fi
-	
-	# In case someone doesn't have $CPU set from /etc/conf.d/named
-	if [ ! ${CPU} ] ; then
-		CPU="1"
-	fi
-
-	# As with the named.conf test, above, there's no need
-	# for chroot and non-chroot cases here
-	PIDFILE=$(grep "pid-file" ${CHROOT}/etc/bind/named.conf | \
-		egrep -v ".*[#,//].*pid-file" | \
-		head -n 1 | \
-		sed -ne 's:.*pid-file \"\(.*\)\";:\1:p')
-	[ -n "$PIDFILE" ] || PIDFILE=/var/run/named.pid
-
-	PIDFILE="${CHROOT}$PIDFILE"
-
-	KEY="${CHROOT}/etc/bind/rndc.key"
-}
-
-start() {
-	ebegin "Starting ${CHROOT:+chrooted }named"
-	checkconfig || return 1
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
-		--exec /usr/sbin/named \
-		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t $CHROOT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-	checkconfig || return 2
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--exec /usr/sbin/named -- stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 3
-	if [ ! -f $PIDFILE ] ; then
-		/etc/init.d/named start &>/dev/null
-		exit
-	fi
-
-	if [ -f $KEY ] ; then
-		ebegin "Reloading named.conf and zone files"
-		rndc -k $KEY reload &>/dev/null
-		eend $?
-	else /etc/init.d/named restart &>/dev/null
-	fi
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
diff --git a/net-dns/bind/files/named.init-r2 b/net-dns/bind/files/named.init-r2
deleted file mode 100755
index 65804e112141..000000000000
--- a/net-dns/bind/files/named.init-r2
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r2,v 1.1 2005/09/30 22:33:25 voxus Exp $
-
-opts="start stop reload restart"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-checkconfig() {
-	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
-		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
-	fi
-	
-	# In case someone doesn't have $CPU set from /etc/conf.d/named
-	if [ ! ${CPU} ] ; then
-		CPU="1"
-	fi
-
-	# as suggested in bug #107724
-	PIDFILE=$(\
-		egrep -v \
-			"^([[:cntrl:] ]+(#|//|/\*)|(#|//|/\*))" \
-			${CHROOT}/etc/bind/named.conf \
-				| egrep -o -m1 "pid\-file +\".+\" *;" \
-				| cut -d\" -f2
-	)
-
-	KEY="${CHROOT}/etc/bind/rndc.key"
-}
-
-start() {
-	ebegin "Starting ${CHROOT:+chrooted }named"
-	checkconfig || return 1
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
-		--exec /usr/sbin/named \
-		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t $CHROOT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-	checkconfig || return 2
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--exec /usr/sbin/named -- stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 3
-	if [ ! -f $PIDFILE ] ; then
-		/etc/init.d/named start &>/dev/null
-		exit
-	fi
-
-	if [ -f $KEY ] ; then
-		ebegin "Reloading named.conf and zone files"
-		rndc -k $KEY reload &>/dev/null
-		eend $?
-	else /etc/init.d/named restart &>/dev/null
-	fi
-}
diff --git a/net-dns/bind/files/named.init-r3 b/net-dns/bind/files/named.init-r3
deleted file mode 100755
index 576b51d317cb..000000000000
--- a/net-dns/bind/files/named.init-r3
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r3,v 1.1 2005/11/09 09:25:53 voxus Exp $
-
-opts="start stop reload restart"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-checkconfig() {
-	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
-		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
-	fi
-	
-	# In case someone doesn't have $CPU set from /etc/conf.d/named
-	if [ ! ${CPU} ] ; then
-		CPU="1"
-	fi
-
-	# as suggested in bug #107724
-	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
-		egrep -v \
-			"^([[:cntrl:] ]+(#|//|/\*)|(#|//|/\*))" \
-			${CHROOT}/etc/bind/named.conf \
-				| egrep -o -m1 "pid\-file +\".+\" *;" \
-				| cut -d\" -f2
-	)
-
-	KEY="${CHROOT}/etc/bind/rndc.key"
-}
-
-start() {
-	ebegin "Starting ${CHROOT:+chrooted }named"
-	checkconfig || return 1
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
-		--exec /usr/sbin/named \
-		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t $CHROOT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-	checkconfig || return 2
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--exec /usr/sbin/named -- stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 3
-	if [ ! -f $PIDFILE ] ; then
-		/etc/init.d/named start &>/dev/null
-		exit
-	fi
-
-	if [ -f $KEY ] ; then
-		ebegin "Reloading named.conf and zone files"
-		rndc -k $KEY reload &>/dev/null
-		eend $?
-	else /etc/init.d/named restart &>/dev/null
-	fi
-}
diff --git a/net-dns/bind/files/named.rc b/net-dns/bind/files/named.rc
deleted file mode 100755
index 22fa5eca4bfe..000000000000
--- a/net-dns/bind/files/named.rc
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc,v 1.1 2005/08/03 16:54:38 voxus Exp $
-
-opts="start stop reload restart"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-checkconfig() {
-	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
-		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
-	fi
-	
-	# In case someone doesn't have $CPU set from /etc/conf.d/named
-	if [ ! ${CPU} ] ; then
-		CPU="1"
-	fi
-
-	# As with the named.conf test, above, there's no need
-	# for chroot and non-chroot cases here
-	PIDFILE=$(grep "pid-file" ${CHROOT}/etc/bind/named.conf | \
-		egrep -v ".*[#,//].*pid-file" | \
-		head -n 1 | \
-		sed -ne 's:.*pid-file\(.*\)\"\(.*\)\";:\2:p')
-	[ -n "$PIDFILE" ] || PIDFILE=/var/run/named.pid
-
-	PIDFILE="${CHROOT}$PIDFILE"
-
-	KEY="${CHROOT}/etc/bind/rndc.key"
-}
-
-start() {
-	ebegin "Starting ${CHROOT:+chrooted }named"
-	checkconfig || return 1
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
-		--exec /usr/sbin/named \
-		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t $CHROOT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-	checkconfig || return 2
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--exec /usr/sbin/named -- stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 3
-	if [ ! -f $PIDFILE ] ; then
-		/etc/init.d/named start &>/dev/null
-		exit
-	fi
-
-	if [ -f $KEY ] ; then
-		ebegin "Reloading named.conf and zone files"
-		rndc -k $KEY reload &>/dev/null
-		eend $?
-	else /etc/init.d/named restart &>/dev/null
-	fi
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
diff --git a/net-dns/bind/files/named.rc6 b/net-dns/bind/files/named.rc6
deleted file mode 100644
index 7c3f4dfabbf2..000000000000
--- a/net-dns/bind/files/named.rc6
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc6,v 1.15 2004/07/14 23:18:19 agriffis Exp $
-
-opts="start stop reload restart"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-checkconfig() {
-	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
-		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
-	fi
-	
-	# In case someone doesn't have $CPU set from /etc/conf.d/named
-	if [ ! $CPU ] ; then
-		CPU=1
-	fi
-
-	if [ $CHROOT -a -d $CHROOT ] ; then
-		PIDFILE="${CHROOT}/var/run/named/named.pid"
-		KEY="${CHROOT}/etc/bind/rndc.key"
-	else
-		PIDFILE="/var/run/named/named.pid"
-		KEY="/etc/bind/rndc.key"
-	fi
-}
-
-start() {
-	ebegin "Starting ${CHROOT:+chrooted }named"
-	checkconfig || return 1
-	start-stop-daemon --start --quiet --exec /usr/sbin/named -- -u named -n $CPU $OPTIONS ${CHROOT:+-t $CHROOT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-	checkconfig || return 2
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--exec /usr/sbin/named -- stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 3
-	if [ ! -f $PIDFILE ] ; then
-		/etc/init.d/named start &>/dev/null
-		exit
-	fi
-
-	if [ -f $KEY ] ; then
-		ebegin "Reloading named.conf and zone files"
-		rndc -k $KEY reload &>/dev/null
-		eend $?
-	else /etc/init.d/named restart &>/dev/null
-	fi
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
diff --git a/net-dns/bind/files/named.rc6-pid_fix b/net-dns/bind/files/named.rc6-pid_fix
deleted file mode 100644
index 3f3c4fa787d5..000000000000
--- a/net-dns/bind/files/named.rc6-pid_fix
+++ /dev/null
@@ -1,13 +0,0 @@
---- files/named.rc6	2004-07-15 03:36:02.000000000 +0400
-+++ named	2005-03-25 20:19:16.000000000 +0300
-@@ -33,7 +33,9 @@
- start() {
- 	ebegin "Starting ${CHROOT:+chrooted }named"
- 	checkconfig || return 1
--	start-stop-daemon --start --quiet --exec /usr/sbin/named -- -u named -n $CPU $OPTIONS ${CHROOT:+-t $CHROOT}
-+	start-stop-daemon --start --quiet --exec /usr/sbin/named \
-+		--pid ${CHROOT}/var/run/named/named.pid \
-+		-- -u named -n $CPU $OPTIONS ${CHROOT:+-t $CHROOT}
- 	eend $?
- }
- 
diff --git a/net-dns/bind/files/named.rc6-smart_pid_fix b/net-dns/bind/files/named.rc6-smart_pid_fix
deleted file mode 100644
index 3af7c0401f02..000000000000
--- a/net-dns/bind/files/named.rc6-smart_pid_fix
+++ /dev/null
@@ -1,42 +0,0 @@
---- named.orig	2005-04-17 16:14:08.000000000 +0400
-+++ named.rc6	2005-04-17 16:18:00.000000000 +0400
-@@ -17,23 +17,29 @@
- 	fi
- 	
- 	# In case someone doesn't have $CPU set from /etc/conf.d/named
--	if [ ! $CPU ] ; then
--		CPU=1
-+	if [ ! ${CPU} ] ; then
-+		CPU="1"
- 	fi
- 
--	if [ $CHROOT -a -d $CHROOT ] ; then
--		PIDFILE="${CHROOT}/var/run/named/named.pid"
--		KEY="${CHROOT}/etc/bind/rndc.key"
--	else
--		PIDFILE="/var/run/named/named.pid"
--		KEY="/etc/bind/rndc.key"
--	fi
-+	# As with the named.conf test, above, there's no need
-+	# for chroot and non-chroot cases here
-+	PIDFILE=$(grep "pid-file" ${CHROOT}/etc/bind/named.conf | \
-+		egrep -v ".*[#,//].*pid-file" | \
-+		head -n 1 | \
-+		sed -ne 's:.*pid-file \"\(.*\)\";:\1:p')
-+	[ -n "$PIDFILE" ] || PIDFILE=/var/run/named.pid
-+
-+	PIDFILE="${CHROOT}$PIDFILE"
-+
-+	KEY="${CHROOT}/etc/bind/rndc.key"
- }
- 
- start() {
- 	ebegin "Starting ${CHROOT:+chrooted }named"
- 	checkconfig || return 1
--	start-stop-daemon --start --quiet --exec /usr/sbin/named -- -u named -n $CPU $OPTIONS ${CHROOT:+-t $CHROOT}
-+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
-+		--exec /usr/sbin/named \
-+		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t $CHROOT}
- 	eend $?
- }
-