Clean up.

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

12 files changed, 8 insertions, 904 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 52e52f1665f6..9b3d0cf978a4 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.249 2009/11/25 09:36:04 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.250 2009/11/25 19:54:00 idl0r Exp $
+
+  25 Nov 2009; Christian Ruppert <idl0r@gentoo.org> -files/127.zone,
+  -files/bind-9.3.2-missing_odbc_test.patch, -bind-9.4.3_p2.ebuild,
+  -bind-9.5.1_p3.ebuild, -files/bind-dlzbdb-includes.patch,
+  -files/libcap.patch, -files/localhost.zone-r1, -files/localhost.zone-r2,
+  -files/named.confd-r1, -files/named.init-r4, -files/named.init-r6:
+  Clean up.
 
 *bind-9.6.1_p2 (25 Nov 2009)
 *bind-9.4.3_p4 (25 Nov 2009)
diff --git a/net-dns/bind/bind-9.4.3_p2.ebuild b/net-dns/bind/bind-9.4.3_p2.ebuild
deleted file mode 100644
index a74ef070648e..000000000000
--- a/net-dns/bind/bind-9.4.3_p2.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.3_p2.ebuild,v 1.5 2009/04/15 19:50:38 maekke Exp $
-
-inherit eutils libtool autotools toolchain-funcs flag-o-matic
-
-DLZ_VERSION="9.3.3"
-MY_PV="${PV/_p2/-P2}"
-
-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}/${PN}-${MY_PV}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-
-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 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 )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	resolvconf? ( net-dns/openresolv )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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
-
-	# 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
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
-
-	# bug #220361
-	rm "${S}"/aclocal.m4 "${S}"/libtool.m4
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
-
-	# bug #151839
-	sed -e \
-		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
-		-i lib/isc/unix/socket.c
-
-	# remove useless c++ checks
-	epunt_cxx
-}
-
-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
-	export BUILD_CC="${CBUILD}-gcc"
-	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
-	newins "${FILESDIR}"/127.zone-r1 127.zone
-	newins "${FILESDIR}"/localhost.zone-r3 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,nsupdate.1}
-	rm -f "${D}"/usr/share/man/man8/dnssec-keygen.8
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-}
-
-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
-		chmod 666 ${CHROOT}/dev/zero
-		if use urandom; then
-			mknod ${CHROOT}/dev/urandom c 1 9
-			chmod 666 ${CHROOT}/dev/urandom
-		else
-			mknod ${CHROOT}/dev/random c 1 8
-			chmod 666 ${CHROOT}/dev/random
-		fi
-		echo "none    ${CHROOT}/proc    proc    defaults    0 0" >>/etc/fstab
-		mkdir ${CHROOT}/proc
-		mount -t proc none ${CHROOT}/proc
-		if [ -f '/etc/syslog-ng/syslog-ng.conf' ]; then
-			echo "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" >>/etc/syslog-ng/syslog-ng.conf
-		fi
-		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.5.1_p3.ebuild b/net-dns/bind/bind-9.5.1_p3.ebuild
deleted file mode 100644
index e2da1798e082..000000000000
--- a/net-dns/bind/bind-9.5.1_p3.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.5.1_p3.ebuild,v 1.1 2009/07/30 15:35:42 dertobi123 Exp $
-
-inherit eutils libtool autotools toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_p3/-P3}"
-SDB_LDAP_VER="1.1.0"
-
-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}/${PN}-${MY_PV}.tar.gz
-	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-
-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 resolvconf urandom sdb-ldap"
-
-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 )
-	postgres? ( virtual/postgresql-base )
-	threads? ( >=sys-libs/libcap-2.1.0 )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	resolvconf? ( net-dns/openresolv )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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
-
-	# 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 && has_version ">=dev-db/mysql-5" && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
-
-	# should be installed by bind-tools
-	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
-
-	# sdb-ldap patch as per  bug #160567
-	# Upstream URL: http://bind9-ldap.bayour.com/
-	use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-
-	# bug #220361
-	rm "${S}"/aclocal.m4 "${S}"/libtool.m4
-	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
-
-	# bug #151839
-	sed -e \
-		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
-		-i lib/isc/unix/socket.c
-
-	# remove useless c++ checks
-	epunt_cxx
-}
-
-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 #227333
-	append-flags -D_GNU_SOURCE
-
-	# bug #158664
-	gcc-specs-ssp && replace-flags -O[23s] -O
-	export BUILD_CC="${CBUILD}-gcc"
-	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
-	newins "${FILESDIR}"/127.zone-r1 127.zone
-	newins "${FILESDIR}"/localhost.zone-r3 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/share/man/man8/{dnssec-keygen.8,nsupdate.8}
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-}
-
-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
-		chmod 666 ${CHROOT}/dev/zero
-		if use urandom; then
-			mknod ${CHROOT}/dev/urandom c 1 9
-			chmod 666 ${CHROOT}/dev/urandom
-		else
-			mknod ${CHROOT}/dev/random c 1 8
-			chmod 666 ${CHROOT}/dev/random
-		fi
-		echo "none    ${CHROOT}/proc    proc    defaults    0 0" >>/etc/fstab
-		mkdir ${CHROOT}/proc
-		mount -t proc none ${CHROOT}/proc
-		if [ -f '/etc/syslog-ng/syslog-ng.conf' ]; then
-			echo "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" >>/etc/syslog-ng/syslog-ng.conf
-		fi
-		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/files/127.zone b/net-dns/bind/files/127.zone
deleted file mode 100644
index 2ad28de52c3c..000000000000
--- a/net-dns/bind/files/127.zone
+++ /dev/null
@@ -1,11 +0,0 @@
-$ORIGIN 127.in-addr.arpa.
-$TTL 1W
-@			1D IN SOA	localhost. root.localhost. (
-					2002081601	; serial
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum
-
-			1D IN NS	localhost.
-1			1D IN PTR	localhost.
diff --git a/net-dns/bind/files/bind-9.3.2-missing_odbc_test.patch b/net-dns/bind/files/bind-9.3.2-missing_odbc_test.patch
deleted file mode 100644
index ead47527451a..000000000000
--- a/net-dns/bind/files/bind-9.3.2-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-includes.patch b/net-dns/bind/files/bind-dlzbdb-includes.patch
deleted file mode 100644
index b940840a177e..000000000000
--- a/net-dns/bind/files/bind-dlzbdb-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bin/dlzbdb/Makefile.in	2006-03-25 22:11:15.840755988 +0000
-+++ bin/dlzbdb/Makefile.in	2006-03-25 22:33:43.873082259 +0000
-@@ -26,6 +26,9 @@
- DLZINCLUDES =	@DLZ_BDB_INC@
- 
- CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include \
-+		-I${top_srcdir}/lib/isc/include \
-+		-I${top_srcdir}/lib/isc/unix/include \
-+		-I${top_srcdir}/lib/isc/@ISC_THREAD_DIR@/include \
-                 ${ISC_INCLUDES} ${DLZINCLUDES}
-                 
- CDEFINES =      @USE_DLZ_BDB@
diff --git a/net-dns/bind/files/libcap.patch b/net-dns/bind/files/libcap.patch
deleted file mode 100644
index 50cf69df57e7..000000000000
--- a/net-dns/bind/files/libcap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur bind-9.5.0-P2.orig/bin/named/unix/os.c bind-9.5.0-P2/bin/named/unix/os.c
---- bind-9.5.0-P2.orig/bin/named/unix/os.c	2008-05-06 03:32:51.000000000 +0200
-+++ bind-9.5.0-P2/bin/named/unix/os.c	2008-08-03 17:46:19.000000000 +0200
-@@ -170,7 +170,11 @@
- 		return;
- #ifndef HAVE_LIBCAP
- 	memset(&caphead, 0, sizeof(caphead));
-+#ifdef _LINUX_CAPABILITY_VERSION_3
-+	caphead.version = _LINUX_CAPABILITY_VERSION_3;
-+#else
- 	caphead.version = _LINUX_CAPABILITY_VERSION;
-+#endif
- 	caphead.pid = 0;
- 	memset(&cap, 0, sizeof(cap));
- 	cap.effective = caps;
diff --git a/net-dns/bind/files/localhost.zone-r1 b/net-dns/bind/files/localhost.zone-r1
deleted file mode 100644
index aee7b92a3e56..000000000000
--- a/net-dns/bind/files/localhost.zone-r1
+++ /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      127.0.0.1
-localhost.	IN	A	127.0.0.1
diff --git a/net-dns/bind/files/localhost.zone-r2 b/net-dns/bind/files/localhost.zone-r2
deleted file mode 100644
index 338d7050ca03..000000000000
--- a/net-dns/bind/files/localhost.zone-r2
+++ /dev/null
@@ -1,11 +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
-ns		IN	A	127.0.0.1
-
-ns		IN	AAAA	::1
diff --git a/net-dns/bind/files/named.confd-r1 b/net-dns/bind/files/named.confd-r1
deleted file mode 100644
index 62f4c165c763..000000000000
--- a/net-dns/bind/files/named.confd-r1
+++ /dev/null
@@ -1,16 +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"
-
-# Default pid file location
-PIDFILE="${CHROOT}/var/run/named/named.pid"
diff --git a/net-dns/bind/files/named.init-r4 b/net-dns/bind/files/named.init-r4
deleted file mode 100755
index aa2b2162df55..000000000000
--- a/net-dns/bind/files/named.init-r4
+++ /dev/null
@@ -1,70 +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-r4,v 1.2 2007/05/12 23:19:40 uberlord 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
-	if [ -f $KEY ] ; then
-		rndc -k $KEY stop &>/dev/null
-	else
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-			--exec /usr/sbin/named -- stop
-	fi
-	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-r6 b/net-dns/bind/files/named.init-r6
deleted file mode 100644
index 436ea1c58a09..000000000000
--- a/net-dns/bind/files/named.init-r6
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r6,v 1.2 2009/08/13 00:41:06 idl0r Exp $
-
-opts="start stop reload restart"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-_mount() {
-	local from
-	local to
-	local opts
-
-	if [[ $# -lt 3 ]];
-	then
-		eerror "_mount(): to few arguments"
-		return 1
-	fi
-
-	from=$1
-	to=$2
-	shift 2
-	
-	opts="${*}"
-	shift $#
-
-	if [[ -z $(grep "${to}" /proc/mounts) ]];
-	then
-		einfo "mounting ${from} to ${to}"
-		mount ${from} ${to} ${opts} || return 1
-	fi
-}
-
-_umount() {
-	local dir=$1
-	
-	if [[ -n $(grep "${dir}" /proc/mounts) ]];
-	then
-		einfo "umount ${dir}"
-		umount ${dir}
-	fi
-}
-
-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"
-
-	if [[ -n ${CHROOT} ]];
-	then
-		einfo "Mounting chroot dirs"
-		_mount /etc/bind ${CHROOT}/etc/bind -o bind
-		_mount /var/bind ${CHROOT}/var/bind -o bind
-		_mount /var/log/named ${CHROOT}/var/log/named -o bind
-	fi
-
-	checkconfig || return 1
-
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
-		--nicelevel ${NAMED_NICELEVEL:-0} \
-		--exec /usr/sbin/named \
-		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
-	eend $?
-}
-
-stop() {
-	local reported=0
-
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-	checkconfig || return 2
-	if [ -f $KEY ] ; then
-		rndc -k $KEY stop &>/dev/null
-	else
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-			--exec /usr/sbin/named -- stop
-	fi
-
-	if [[ -n ${CHROOT} ]];
-	then
-		einfo "Umounting chroot dirs"
-
-		# just to be sure everything gets clean
-		while [[ -n $(fuser ${CHROOT} 2>&1) ]]
-		do
-			if [[ ${reported} -eq 0 ]];
-			then
-				einfo "Waiting until all named processes are stopped"
-				reported=1
-			fi
-			sleep 1
-		done
-
-		_umount ${CHROOT}/etc/bind
-		_umount ${CHROOT}/var/log/named
-		_umount ${CHROOT}/var/bind
-	fi
-
-	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
-}