* bug #139354

(Portage version: 2.1.1_pre4)
 (Signed Manifest commit)

5 files changed, 21 insertions, 615 deletions

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 7303bde5bec9..383f8940b298 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -90,26 +90,26 @@ DIST bind-9.3.2.tar.gz 5302112 RMD160 c825b6308eb374e9bcf9b6ccc48f65d8753c0a6d S
 DIST ctrix_dlz_9.3.2b1.patch.bz2 60982 RMD160 dd76c79d58fdcf75d5c991bac4b6de54aeb4f8bb SHA1 a3c65ef330846f62e22655261954a7fe982cb616 SHA256 f0764290a08b4a839eae8b82a6e27301ce9ff41f3132f697139d73698f89cffc
 DIST dlz-9.2.5.patch.bz2 135932 RMD160 d1686658b04b8896828e0b40c1cb869a2b3735f1 SHA1 d90b47284260dbc1437232b44da5d9a98ae54a6a SHA256 051ba8ba5825fe3a4f77adcc75e46471bc3ed74c132043bc9e6a6b8d516cd442
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
-EBUILD bind-9.2.6-r2.ebuild 9021 RMD160 de1aecdfaa057e0faaa580637af674e35cf3bfe4 SHA1 f56bf85c7f97bbe9e3b4d2e23e8bdc1df0e38363 SHA256 9cc9213d77b0e799fb3d47c1e0e70de2203cbda7b70cd9d159e9c149ba14c0df
-MD5 1eb110ca5fa134b90218ea0390f4a100 bind-9.2.6-r2.ebuild 9021
-RMD160 de1aecdfaa057e0faaa580637af674e35cf3bfe4 bind-9.2.6-r2.ebuild 9021
-SHA256 9cc9213d77b0e799fb3d47c1e0e70de2203cbda7b70cd9d159e9c149ba14c0df bind-9.2.6-r2.ebuild 9021
+EBUILD bind-9.2.6-r3.ebuild 9043 RMD160 e50384a5caaa008c8801e2a09ccd27f767660ad2 SHA1 69cabfc4100ca2c0900344c6b51f11f6c58600a6 SHA256 da2d5f1b8e379b7a4cd10340d3a6199bfb3936af463b09b12635479af85bef2e
+MD5 26075fb5b3a3cc8aaa074fd54a71d681 bind-9.2.6-r3.ebuild 9043
+RMD160 e50384a5caaa008c8801e2a09ccd27f767660ad2 bind-9.2.6-r3.ebuild 9043
+SHA256 da2d5f1b8e379b7a4cd10340d3a6199bfb3936af463b09b12635479af85bef2e bind-9.2.6-r3.ebuild 9043
 EBUILD bind-9.2.6.ebuild 8982 RMD160 dd22890fed5b7f7936dca6820ad1714d1601b075 SHA1 ab1245f9f718b8a0103e64c3268ab707ccf5215e SHA256 66df53d6c7d170a5264720ee093f35fef9997542bb5c72b595d81740c09d1cb9
 MD5 334a5be8f5323d414ee6ea243a568eb0 bind-9.2.6.ebuild 8982
 RMD160 dd22890fed5b7f7936dca6820ad1714d1601b075 bind-9.2.6.ebuild 8982
 SHA256 66df53d6c7d170a5264720ee093f35fef9997542bb5c72b595d81740c09d1cb9 bind-9.2.6.ebuild 8982
-EBUILD bind-9.3.2-r2.ebuild 8642 RMD160 279613b0e7f6f99d0b120672594b8f313e6852c4 SHA1 cfb74a512c34dfbd0e0909f346b0868ac146ca79 SHA256 da73030b1f0220e4c82fd04e28ec6188658366ca69f1ed7f956e15bc5b60283b
-MD5 fe6e8282da0d553f132343bb5154ff06 bind-9.3.2-r2.ebuild 8642
-RMD160 279613b0e7f6f99d0b120672594b8f313e6852c4 bind-9.3.2-r2.ebuild 8642
-SHA256 da73030b1f0220e4c82fd04e28ec6188658366ca69f1ed7f956e15bc5b60283b bind-9.3.2-r2.ebuild 8642
+EBUILD bind-9.3.2-r3.ebuild 8664 RMD160 ef15bd3b6d9d6401222cc63496d0541827f2469c SHA1 9641e064df2cc0737fc0508b66baaf1fdcb3914a SHA256 23a4d969db4e48d33e4c11cd1df9870d0f5d44df095425d23db3486337b960b4
+MD5 2abcc4f652751807355fa6897ba21299 bind-9.3.2-r3.ebuild 8664
+RMD160 ef15bd3b6d9d6401222cc63496d0541827f2469c bind-9.3.2-r3.ebuild 8664
+SHA256 23a4d969db4e48d33e4c11cd1df9870d0f5d44df095425d23db3486337b960b4 bind-9.3.2-r3.ebuild 8664
 EBUILD bind-9.3.2.ebuild 8625 RMD160 3f63faba82c9a8b4a742e6790c3117aa618661f0 SHA1 a6fbfe8a5bfceccacabf6185624d5d6750f3c47c SHA256 1330dec99df448083bfb3bf1f73ded066a662456b786f10087455c5b57744e5b
 MD5 c2a3cb362f2f88e61d29ac79b34ea328 bind-9.3.2.ebuild 8625
 RMD160 3f63faba82c9a8b4a742e6790c3117aa618661f0 bind-9.3.2.ebuild 8625
 SHA256 1330dec99df448083bfb3bf1f73ded066a662456b786f10087455c5b57744e5b bind-9.3.2.ebuild 8625
-MISC ChangeLog 19101 RMD160 1b5f25f55f1cb7550f0bc7ea00a6fbd799973f37 SHA1 446a6525e5e5afd54d7616960fa496729b123c5c SHA256 29f79dc0ede68b99906bc278b9c849f3a85365766a21ec379da18ffc2812fb10
-MD5 f7633d59b422b38692b06300729f5cd6 ChangeLog 19101
-RMD160 1b5f25f55f1cb7550f0bc7ea00a6fbd799973f37 ChangeLog 19101
-SHA256 29f79dc0ede68b99906bc278b9c849f3a85365766a21ec379da18ffc2812fb10 ChangeLog 19101
+MISC ChangeLog 19332 RMD160 d03c28df7ff18dc3d555653b41e6ff1e67f007b9 SHA1 78caada0db4e8946b81d3426880804acbb4e51fb SHA256 652045aebabb4945910415566b444c9ea178e4d6add0ddbab8aab24bf5fe59b5
+MD5 64a9ae5ade146a23b975f89c8acf4b23 ChangeLog 19332
+RMD160 d03c28df7ff18dc3d555653b41e6ff1e67f007b9 ChangeLog 19332
+SHA256 652045aebabb4945910415566b444c9ea178e4d6add0ddbab8aab24bf5fe59b5 ChangeLog 19332
 MISC metadata.xml 352 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 SHA1 24f998969c955accd1fd4f3719bdf83d4e9d432b SHA256 f6f6ae15da16a20d5e0ce76563e3e27901e25787131b8784ffe872ffe3ddd034
 MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 metadata.xml 352
@@ -117,19 +117,19 @@ SHA256 f6f6ae15da16a20d5e0ce76563e3e27901e25787131b8784ffe872ffe3ddd034 metadata
 MD5 579e491cb632a7ba7f3fd5533b595821 files/digest-bind-9.2.6 708
 RMD160 afc4e94e81cf5eb04bb285e0dfc5bac6b7317953 files/digest-bind-9.2.6 708
 SHA256 7275e1e44f5325ece2457bf8fb28fc92b49bc384fd91810e5e4d25a88de16b24 files/digest-bind-9.2.6 708
-MD5 579e491cb632a7ba7f3fd5533b595821 files/digest-bind-9.2.6-r2 708
-RMD160 afc4e94e81cf5eb04bb285e0dfc5bac6b7317953 files/digest-bind-9.2.6-r2 708
-SHA256 7275e1e44f5325ece2457bf8fb28fc92b49bc384fd91810e5e4d25a88de16b24 files/digest-bind-9.2.6-r2 708
+MD5 579e491cb632a7ba7f3fd5533b595821 files/digest-bind-9.2.6-r3 708
+RMD160 afc4e94e81cf5eb04bb285e0dfc5bac6b7317953 files/digest-bind-9.2.6-r3 708
+SHA256 7275e1e44f5325ece2457bf8fb28fc92b49bc384fd91810e5e4d25a88de16b24 files/digest-bind-9.2.6-r3 708
 MD5 ff0c0177b13e665beafd68ea30cd4e5a files/digest-bind-9.3.2 729
 RMD160 578baea200800e5a983e726cd7633d1dee2b3c0e files/digest-bind-9.3.2 729
 SHA256 39453324f8464c8ffef631fcd7300cd771763b9c069ea086b1a5e5cc4a1662c9 files/digest-bind-9.3.2 729
-MD5 ff0c0177b13e665beafd68ea30cd4e5a files/digest-bind-9.3.2-r2 729
-RMD160 578baea200800e5a983e726cd7633d1dee2b3c0e files/digest-bind-9.3.2-r2 729
-SHA256 39453324f8464c8ffef631fcd7300cd771763b9c069ea086b1a5e5cc4a1662c9 files/digest-bind-9.3.2-r2 729
+MD5 ff0c0177b13e665beafd68ea30cd4e5a files/digest-bind-9.3.2-r3 729
+RMD160 578baea200800e5a983e726cd7633d1dee2b3c0e files/digest-bind-9.3.2-r3 729
+SHA256 39453324f8464c8ffef631fcd7300cd771763b9c069ea086b1a5e5cc4a1662c9 files/digest-bind-9.3.2-r3 729
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEyinMbwxeDFj+ScoRAo42AJ45NGMa1hjRzs9AeoFSRBwwl2rnWwCeKVcZ
-fwwtAw+0VJI9u7WeKvKcTXU=
-=u7w1
+iD8DBQFEzTSlbwxeDFj+ScoRAoNJAKDDyqC9y4cPD/SzKY3kaaVNe/EJJQCeIBfG
+a378vSf/o+yjlaZFElUXfpE=
+=MsK3
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.2.6-r2.ebuild b/net-dns/bind/bind-9.2.6-r2.ebuild
deleted file mode 100644
index 3c1aba004834..000000000000
--- a/net-dns/bind/bind-9.2.6-r2.ebuild
+++ /dev/null
@@ -1,292 +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/bind-9.2.6-r2.ebuild,v 1.2 2006/07/28 15:14:07 voxus 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="ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=dev-db/mysql-4 )
-	bind-mysql? ( >=dev-db/mysql-4 )
-	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 ""
-			einfo "MySQL uses thread local storage in its C api. Thus MySQL"
-			einfo "requires that each thread of an application execute a MySQL"
-			einfo "\"thread initialization\" to setup the thread local storage."
-			einfo "This is impossible to do safely while staying within the DLZ"
-			einfo "driver API. This is a limitation caused by MySQL, and not the"
-			einfo "DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			echo
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			einfo "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"
-
-	# idea from dev-libs/cyrus-sasl
-	if has distcc ${FEATURES}; then
-		einfo "You have \"distcc\" enabled"
-		einfo "build with MAKEOPTS=\"-j1\""
-		jobs="-j1"
-	else
-		einfo "build with MAKEOPTS=${MAKEOPTS}"
-		jobs=""
-	fi
-
-	emake ${jobs} || 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
-	}
-
-	insinto /etc/env.d
-	newins ${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
-
-	cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
-	cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/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
-
-	einfo "The default zone files are now installed as *.zone,"
-	einfo "be careful merging config files if you have modified"
-	einfo "/var/bind/pri/127 or /var/bind/pri/localhost"
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	einfo "The BIND ebuild now includes chroot support."
-	einfo "If you like to run bind in chroot AND this is a new install OR"
-	einfo "your bind doesn't already run in chroot, simply run:"
-	einfo "\`emerge --config =${CATEGORY}/${PF}\`"
-	einfo "Before running the above command you might want to change the chroot"
-	einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	echo
-	einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	einfo "zones making all .com and .net domains appear to be registered"
-	einfo "This causes many problems such as breaking important anti-spam checks"
-	einfo "which verify source domains exist. ISC released a patch for BIND which"
-	einfo "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	einfo "domain resolution to their normal function."
-	echo
-	einfo "There is no need to create a com or net data file. Just the"
-	einfo "entries to the named.conf file is enough."
-	echo
-	einfo "	zone "com" IN { type delegation-only; };"
-	einfo "	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.2-r2.ebuild b/net-dns/bind/bind-9.3.2-r2.ebuild
deleted file mode 100644
index fdebf03d8ac7..000000000000
--- a/net-dns/bind/bind-9.3.2-r2.ebuild
+++ /dev/null
@@ -1,284 +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/bind-9.3.2-r2.ebuild,v 1.1 2006/07/04 20:14:40 voxus 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="ssl? ( >=dev-libs/openssl-0.9.6g )
-	mysql? ( >=dev-db/mysql-4 )
-	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 ""
-			einfo "MySQL uses thread local storage in its C api. Thus MySQL"
-			einfo "requires that each thread of an application execute a MySQL"
-			einfo "\"thread initialization\" to setup the thread local storage."
-			einfo "This is impossible to do safely while staying within the DLZ"
-			einfo "driver API. This is a limitation caused by MySQL, and not"
-			einfo "the DLZ API."
-			ewarn "Because of this BIND MUST only run with a single thread when"
-			ewarn "using the MySQL driver."
-			echo
-			myconf="${myconf} --disable-linux-caps --disable-threads"
-			einfo "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"
-
-	# idea from dev-libs/cyrus-sasl
-	if has distcc ${FEATURES}; then
-		einfo "You have \"distcc\" enabled"
-		einfo "build with MAKEOPTS=\"-j1\""
-		jobs="-j1"
-	else
-		einfo "build with MAKEOPTS=${MAKEOPTS}"
-		jobs=""
-	fi
-
-	emake ${jobs} || 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
-	}
-
-	insinto /etc/env.d
-	newins ${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
-
-	cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
-	cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/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
-
-	einfo "The default zone files are now installed as *.zone,"
-	einfo "be careful merging config files if you have modified"
-	einfo "/var/bind/pri/127 or /var/bind/pri/localhost"
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	einfo "The BIND ebuild now includes chroot support."
-	einfo "If you like to run bind in chroot AND this is a new install OR"
-	einfo "your bind doesn't already run in chroot, simply run:"
-	einfo "\`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo "Before running the above command you might want to change the chroot"
-	einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	echo
-	einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD"
-	einfo "zones making all .com and .net domains appear to be registered"
-	einfo "This causes many problems such as breaking important anti-spam checks"
-	einfo "which verify source domains exist. ISC released a patch for BIND which"
-	einfo "adds 'delegation-only' zones to allow admins to return the .com and .net"
-	einfo "domain resolution to their normal function."
-	echo
-	einfo "There is no need to create a com or net data file. Just the"
-	einfo "entries to the named.conf file is enough."
-	echo
-	einfo "	zone "com" IN { type delegation-only; };"
-	einfo "	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/files/digest-bind-9.2.6-r2 b/net-dns/bind/files/digest-bind-9.2.6-r2
deleted file mode 100644
index 3b48490174dd..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.6-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a1b1224cfd9c9599fb4b336c371879b9 bind-9.2.6.tar.gz 5125776
-RMD160 6c732cf9fbc9c68d822833689088701af97a6b3a bind-9.2.6.tar.gz 5125776
-SHA256 05f4be2c62beacc38a5ab29520a33ec1f716222f3f09634ec89345671b4c758d bind-9.2.6.tar.gz 5125776
-MD5 3bb820ced02fa2db7ae37e5288a73706 dlz-9.2.5.patch.bz2 135932
-RMD160 d1686658b04b8896828e0b40c1cb869a2b3735f1 dlz-9.2.5.patch.bz2 135932
-SHA256 051ba8ba5825fe3a4f77adcc75e46471bc3ed74c132043bc9e6a6b8d516cd442 dlz-9.2.5.patch.bz2 135932
-MD5 2bb12cfcd70284e72fbf9e70e5e2974d dyndns-samples.tbz2 22866
-RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d dyndns-samples.tbz2 22866
-SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 dyndns-samples.tbz2 22866
diff --git a/net-dns/bind/files/digest-bind-9.3.2-r2 b/net-dns/bind/files/digest-bind-9.3.2-r2
deleted file mode 100644
index 9c335838860b..000000000000
--- a/net-dns/bind/files/digest-bind-9.3.2-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 55e709501a7780233c36e25ccd15ece2 bind-9.3.2.tar.gz 5302112
-RMD160 c825b6308eb374e9bcf9b6ccc48f65d8753c0a6d bind-9.3.2.tar.gz 5302112
-SHA256 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694 bind-9.3.2.tar.gz 5302112
-MD5 a70b386bf85c26b1c797e0936be28b79 ctrix_dlz_9.3.2b1.patch.bz2 60982
-RMD160 dd76c79d58fdcf75d5c991bac4b6de54aeb4f8bb ctrix_dlz_9.3.2b1.patch.bz2 60982
-SHA256 f0764290a08b4a839eae8b82a6e27301ce9ff41f3132f697139d73698f89cffc ctrix_dlz_9.3.2b1.patch.bz2 60982
-MD5 2bb12cfcd70284e72fbf9e70e5e2974d dyndns-samples.tbz2 22866
-RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d dyndns-samples.tbz2 22866
-SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 dyndns-samples.tbz2 22866