version bump. masked bump.

(Portage version: 2.0.51.19)

11 files changed, 125 insertions, 212 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 62b41c648be9..e466761eb6b9 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.33 2005/03/25 22:28:18 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.34 2005/03/25 23:14:59 voxus Exp $
+
+*bind-tools-9.3.1 (26 Mar 2005)
+
+  26 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +bind-tools-9.3.1.ebuild:
+  Version bump. Masked for heavy testing.
 
 *bind-tools-9.2.5 (26 Mar 2005)
 
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 0843f42d9d80..37a49aa6ef82 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,13 +1,15 @@
 MD5 029fef1a2f516b68ae910f4844ef8a55 bind-tools-9.2.3.ebuild 1711
+MD5 d09421bb579a362f404ac7b3d240e088 bind-tools-9.3.1.ebuild 1302
 MD5 4e58a10a9c95eef5d3c0abfb3c67b433 bind-tools-9.2.3-r1.ebuild 1293
 MD5 76e6badd2aca8296c9b2297dc194b2d0 bind-tools-9.2.5.ebuild 1357
 MD5 faf7b704ec9140b479d7399ebf5dfc0c bind-tools-9.2.2.ebuild 983
 MD5 8e5b22b08d615682d2aa8954dcef325a bind-tools-9.2.2_rc1.ebuild 926
-MD5 6a9f4eab1ea16abef3f3352d5cfeec97 ChangeLog 4446
+MD5 650a602a6bee555c770fe993ebbb412f ChangeLog 4602
 MD5 043de8e11b1e5b8825337b4a1965a92c metadata.xml 325
 MD5 feb1027d97d15dcf8fdc57b2de185af2 files/digest-bind-tools-9.2.3-r1 63
 MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-tools-9.2.2 63
 MD5 feb1027d97d15dcf8fdc57b2de185af2 files/digest-bind-tools-9.2.3 63
 MD5 0b0f1e16a0bf51db8f99fd21c01f7426 files/digest-bind-tools-9.2.5 63
+MD5 c46a805da6650356db77b023d4d042d8 files/digest-bind-tools-9.3.1 63
 MD5 8c87d7839f4a6caa9c690e5905a247f4 files/digest-bind-tools-9.2.2_rc1 66
 MD5 1d83f3065ae3bad0e88ae3bfe1e95ced files/nslookup.8 14638
diff --git a/net-dns/bind-tools/bind-tools-9.3.1.ebuild b/net-dns/bind-tools/bind-tools-9.3.1.ebuild
new file mode 100644
index 000000000000..227141b48928
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.3.1.ebuild
@@ -0,0 +1,54 @@
+# 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.3.1.ebuild,v 1.1 2005/03/25 23:14:59 voxus Exp $
+
+inherit flag-o-matic gnuconfig
+
+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="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~mips ~ppc64"
+IUSE="ipv6"
+
+DEPEND="virtual/libc"
+
+src_compile() {
+	gnuconfig_update
+
+	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
+
+	econf ${myconf} || die "Configure failed"
+
+	cd ${S}/lib
+	emake || die "make failed in /lib/isc"
+
+	export MAKEOPTS="${MAKEOPTS} -j1"
+
+	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/files/digest-bind-tools-9.3.1 b/net-dns/bind-tools/files/digest-bind-tools-9.3.1
new file mode 100644
index 000000000000..027fffee4bd7
--- /dev/null
+++ b/net-dns/bind-tools/files/digest-bind-tools-9.3.1
@@ -0,0 +1 @@
+MD5 9ff3204eea27184ea0722f37e43fc95d bind-9.3.1.tar.gz 4673603
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index ba9a5de8af2d..d60f0650a4cd 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.57 2005/03/25 22:28:20 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.58 2005/03/25 23:15:00 voxus Exp $
+
+*bind-9.3.1 (26 Mar 2005)
+
+  26 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +bind-9.3.1.ebuild,
+  -bind-9.3.0_rc2.ebuild, -bind-9.3.1_beta2.ebuild:
+  Version bump. Closing bugs #54230, #54230 and #76806.
+  However, masked for heavy testing.
 
 *bind-9.2.5 (26 Mar 2005)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 189786575856..9256b28a947e 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,19 +1,16 @@
 MD5 45b230cb3f1fd14ba338701d4080b4ba bind-9.2.3.ebuild 5875
+MD5 9ee54d3e3120aac81faeea72d4fe8c6a bind-9.3.1.ebuild 6400
 MD5 23c809afe06852c286f137645287abb4 bind-9.2.2-r3.ebuild 5708
 MD5 22fc459df0ee1ab39349ef5c331ef94e bind-9.2.5.ebuild 7270
 MD5 61a6fb5346e4f405c35bf0c823e75476 bind-9.2.2-r5.ebuild 6434
-MD5 e74705fa1f4ec70e05cf44eb7796ba0e bind-9.3.1_beta2.ebuild 5937
 MD5 9676ca38b8a2af68a01785194ecd12d8 bind-9.2.2.ebuild 4678
-MD5 01424b3848125e67c3f94c902f8f984f bind-9.3.0_rc2.ebuild 5892
 MD5 242fac0b5f26fab0bc0a3bded1fccdfa bind-9.2.2-r2.ebuild 4895
 MD5 0fce7dffc077cc801ceeaf46cce6ead0 bind-9.2.2-r4.ebuild 5828
-MD5 07d84c456460f4a957cdf55e133610b4 ChangeLog 9328
+MD5 ae025ca5a15110441c83e6ca9033b99f ChangeLog 9538
 MD5 9878980f4b7a34ac4812812325b9ad85 metadata.xml 349
 MD5 5a5afd0ab570b531cd0094bf16f6735d bind-9.2.2-r1.ebuild 4880
 MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
-MD5 9737865ebae92ab0721c61d7906d7a89 files/digest-bind-9.3.0_rc2 66
 MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
-MD5 fa18c5f14f85becd0f8809b13d3156b9 files/digest-bind-9.3.1_beta2 68
 MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2-r1 63
 MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2-r2 63
 MD5 309110e09d923344a34a803f8906fae3 files/digest-bind-9.2.2-r3 121
@@ -25,6 +22,7 @@ MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
 MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2 63
 MD5 feb1027d97d15dcf8fdc57b2de185af2 files/digest-bind-9.2.3 63
 MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5 127
+MD5 c46a805da6650356db77b023d4d042d8 files/digest-bind-9.3.1 63
 MD5 21e3efd21e18f4c660155978105f8ebe files/named.confd 351
 MD5 51197afe8da37b1b453456de90ca4f25 files/127.zone 227
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost 412
diff --git a/net-dns/bind/bind-9.3.0_rc2.ebuild b/net-dns/bind/bind-9.3.1.ebuild
index e4d1fa47fd4e..81aad21ac260 100644
--- a/net-dns/bind/bind-9.3.0_rc2.ebuild
+++ b/net-dns/bind/bind-9.3.1.ebuild
@@ -1,22 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.0_rc2.ebuild,v 1.3 2005/01/01 16:19:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.1.ebuild,v 1.1 2005/03/25 23:15:00 voxus Exp $
 
-IUSE="caps doc ipv6 selinux ssl"
+inherit eutils gnuconfig libtool
 
+IUSE="ssl ipv6 doc selinux idn caps"
+
+DLZ_VER=0.7.0
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-MY_P="${P/_/}"
-S=${WORKDIR}/${MY_P}
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_P}/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
 
-KEYWORDS="-x86 -ppc -sparc -alpha -hppa -amd64 -ia64"
+# this ebuild contains the very untested dlz extension, hard-masking it for now
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
+
 LICENSE="as-is"
 SLOT="0"
 
 DEPEND="sys-apps/groff
+	sys-devel/autoconf
 	>=sys-apps/sed-4
-	ssl? ( >=dev-libs/openssl-0.9.6e )"
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
@@ -25,12 +29,28 @@ src_unpack() {
 	unpack ${A} && cd ${S}
 
 	# Adjusting PATHs in manpages
-	for i in `echo bin/{named/named.8,check/named-checkconf.8,nsupdate/nsupdate.8,rndc/rndc.8}`; do
+	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
+
+	# it should be installed by bind-tools
+	sed "s:nsupdate ::g" ${S}/bin/Makefile.in > ${T}/Makefile
+	mv ${T}/Makefile ${S}/bin/Makefile.in
+
+	if use idn; then
+		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
+	fi
+
+	cp ${FILESDIR}/named.rc6 ${T}
+	cd ${T} && epatch ${FILESDIR}/named.rc6-pid_fix
+
+	gnuconfig_update
+
+	cd ${S}
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
 }
 
 src_compile() {
@@ -40,23 +60,29 @@ src_compile() {
 	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
 	use caps || myconf="${myconf} --disable-linux-caps"
 
-	econf 	--sysconfdir=/etc/bind \
+	econf \
+		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
 		--with-libtool \
-		--enable-libbind \
-		${myconf} || die "configure failed"
+		${myconf} || die "econf failed"
+
+	emake -j1 || die "failed to compile bind"
 
-	MAKEOPTS="${MAKEOPTS} -j1" emake || 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() {
-	make install DESTDIR=${D} || die "failed to install bind"
+	einstall || die "failed to install bind"
 
 	dodoc CHANGES COPYRIGHT FAQ README
 
 	use doc && {
 		docinto misc ; dodoc doc/misc/*
-		docinto html ; dodoc doc/arm/*
+		docinto html ; dohtml doc/arm/*
 		docinto	draft ; dodoc doc/draft/*
 		docinto rfc ; dodoc doc/rfc/*
 		docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
@@ -78,23 +104,22 @@ src_install() {
 	insinto /var/bind ; doins ${FILESDIR}/named.ca
 	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/named.rc6 named
+	exeinto /etc/init.d ; newexe ${T}/named.rc6 named
 	insinto /etc/conf.d ; newins ${FILESDIR}/named.confd named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
 	dosym ../../var/bind/pri /etc/bind/pri
 	dosym ../../var/bind/sec /etc/bind/sec
 
-	# Fix lib dependancy craziness (Bug #32214)
-	cd ${D}/usr/lib
-	dosym libisc.so.7 /usr/lib/libisc.so.4
-	dosym libdns.so.11.0.2 /usr/lib/libdns.so.10
-	dosym libdns.so.11.0.2 /usr/lib/libdns.so.8
-}
+	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
 
-pkg_preinst() {
 	# 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.gz,host.1.gz}
+	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
 	rm -f ${D}/usr/bin/{dig,host,nslookup}
 }
 
@@ -175,3 +200,4 @@ pkg_config() {
 		einfo
 	fi
 }
+
diff --git a/net-dns/bind/bind-9.3.1_beta2.ebuild b/net-dns/bind/bind-9.3.1_beta2.ebuild
deleted file mode 100644
index 0497a976ed96..000000000000
--- a/net-dns/bind/bind-9.3.1_beta2.ebuild
+++ /dev/null
@@ -1,179 +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/bind-9.3.1_beta2.ebuild,v 1.1 2005/01/28 19:29:15 robbat2 Exp $
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-KEYWORDS="-x86 -ppc -sparc -alpha -hppa -amd64 -ia64"
-LICENSE="as-is"
-IUSE="caps doc ipv6 selinux ssl"
-SLOT="0"
-
-MY_P="${P/_/}"
-MY_PV="${PV/_/}"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	ssl? ( >=dev-libs/openssl-0.9.6e )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-
-	# Adjusting PATHs in manpages
-	for i in `echo bin/{named/named.8,check/named-checkconf.8,nsupdate/nsupdate.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
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
-	use caps || myconf="${myconf} --disable-linux-caps"
-
-	econf 	--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		--enable-threads \
-		--enable-libbind \
-		${myconf} || die "configure failed"
-
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "failed to compile bind"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "failed to install bind"
-
-	dodoc CHANGES COPYRIGHT FAQ README
-
-	use doc && {
-		docinto misc ; dodoc doc/misc/*
-		docinto html ; dodoc 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 ${FILESDIR}/dyndns-samples.tbz2
-
-	dodir /etc/bind /var/bind/{pri,sec}
-	keepdir /var/bind/sec
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r2 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
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/named.rc6 named
-	insinto /etc/conf.d ; newins ${FILESDIR}/named.confd named
-
-	dosym ../../var/bind/named.ca /var/bind/root.cache
-	dosym ../../var/bind/pri /etc/bind/pri
-	dosym ../../var/bind/sec /etc/bind/sec
-
-	# Fix lib dependancy craziness (Bug #32214)
-	cd ${D}/usr/lib
-	dosym libisc.so.7 /usr/lib/libisc.so.4
-	dosym libdns.so.11.0.2 /usr/lib/libdns.so.10
-	dosym libdns.so.11.0.2 /usr/lib/libdns.so.8
-}
-
-pkg_preinst() {
-	# 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.gz,host.1.gz}
-	rm -f ${D}/usr/bin/{dig,host,nslookup}
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		/usr/sbin/rndc-confgen -a -u named
-	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 "\`ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\`"
-	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; };"
-}
-
-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.3.0_rc2 b/net-dns/bind/files/digest-bind-9.3.0_rc2
deleted file mode 100644
index b47af480ac6f..000000000000
--- a/net-dns/bind/files/digest-bind-9.3.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19d4d1601c50f0b73007e6307bf46f43 bind-9.3.0rc2.tar.gz 4665014
diff --git a/net-dns/bind/files/digest-bind-9.3.1 b/net-dns/bind/files/digest-bind-9.3.1
new file mode 100644
index 000000000000..027fffee4bd7
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.3.1
@@ -0,0 +1 @@
+MD5 9ff3204eea27184ea0722f37e43fc95d bind-9.3.1.tar.gz 4673603
diff --git a/net-dns/bind/files/digest-bind-9.3.1_beta2 b/net-dns/bind/files/digest-bind-9.3.1_beta2
deleted file mode 100644
index 4d6783f796a6..000000000000
--- a/net-dns/bind/files/digest-bind-9.3.1_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 557035a25a544d1acfba473b352f335e bind-9.3.1beta2.tar.gz 4673716