16 files changed, 119 insertions, 902 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 94a37761ac75..b3303399f3a2 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,15 @@
 # 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.66 2005/04/10 18:12:52 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.67 2005/04/12 11:01:19 voxus Exp $
+
+*bind-9.2.5-r1 (12 Apr 2005)
+
+  12 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> -bind-9.2.2.ebuild,
+  -bind-9.2.2-r1.ebuild, -bind-9.2.2-r2.ebuild, -bind-9.2.2-r4.ebuild,
+  -bind-9.2.2-r5.ebuild, -bind-9.2.3.ebuild, +bind-9.2.5-r1.ebuild,
+  bind-9.3.1.ebuild:
+  Dropped old ebuild, closing bug #88712 by 9.2.5-r1 and minor cosmetic
+  changes for 9.3.1.
 
   10 Apr 2005; Joshua Kinard <kumba@gentoo.org> bind-9.2.5.ebuild:
   Added ~mips to keywords.
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 95de5b2cbea8..2bcc1fdfb6cd 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,37 +1,27 @@
-MD5 d835d1e90173a41e3c7569f62f4dde0b ChangeLog 10394
-MD5 5a5afd0ab570b531cd0094bf16f6735d bind-9.2.2-r1.ebuild 4880
-MD5 242fac0b5f26fab0bc0a3bded1fccdfa bind-9.2.2-r2.ebuild 4895
+MD5 92fc5c7d9bc05e7c3cb01d403bdd223a bind-9.3.1.ebuild 6299
 MD5 23c809afe06852c286f137645287abb4 bind-9.2.2-r3.ebuild 5708
-MD5 0fce7dffc077cc801ceeaf46cce6ead0 bind-9.2.2-r4.ebuild 5828
-MD5 61a6fb5346e4f405c35bf0c823e75476 bind-9.2.2-r5.ebuild 6434
-MD5 9676ca38b8a2af68a01785194ecd12d8 bind-9.2.2.ebuild 4678
-MD5 45b230cb3f1fd14ba338701d4080b4ba bind-9.2.3.ebuild 5875
-MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
+MD5 98e578fbc0e6b2a464733544ca4b3b16 bind-9.2.5-r1.ebuild 7158
 MD5 26d25b02b7943946d08174024bd2923c bind-9.2.5.ebuild 7268
-MD5 dddb6eb8d23d2bcc3e69dec4baabe6aa bind-9.3.1.ebuild 6394
-MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
+MD5 d835d1e90173a41e3c7569f62f4dde0b ChangeLog 10394
+MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
-MD5 51197afe8da37b1b453456de90ca4f25 files/127.zone 227
-MD5 dca1f666d891ce36c77564bbf7eaeeb4 files/bind-9.2.2-mysql.patch 10993
-MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2 63
-MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2-r1 63
-MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2-r2 63
+MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
 MD5 309110e09d923344a34a803f8906fae3 files/digest-bind-9.2.2-r3 121
-MD5 309110e09d923344a34a803f8906fae3 files/digest-bind-9.2.2-r4 121
-MD5 ce78c05705c759f2494388ad313bdcbb files/digest-bind-9.2.2-r5 182
-MD5 feb1027d97d15dcf8fdc57b2de185af2 files/digest-bind-9.2.3 63
-MD5 c46a805da6650356db77b023d4d042d8 files/digest-bind-9.3.1 63
+MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r1 127
 MD5 a8ffc671392ffacafb5c49ffc1c6a4c6 files/named.rc6-pid_fix 488
-MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
+MD5 4346332cc9681502a3aedfd0a7a1ac41 files/bind-9.2.5-berkdb_fix.patch 537
+MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
+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
-MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
-MD5 e83e7a76e253debfdd120311fda73fb6 files/named.ca 2518
 MD5 b3af799ce2505e78a14bb16868cf0593 files/named.conf-r1 758
 MD5 e9bb1e01cf0b7597e739e889499ddd7a files/named.conf-r2 768
 MD5 be5fd752bdbd59385f2a559d603098d5 files/named.conf-r3 1314
-MD5 21e3efd21e18f4c660155978105f8ebe files/named.confd 351
+MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
+MD5 dca1f666d891ce36c77564bbf7eaeeb4 files/bind-9.2.2-mysql.patch 10993
+MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
 MD5 412d666c947769b6015a65a42bb8ea00 files/named.rc6 1434
-MD5 4346332cc9681502a3aedfd0a7a1ac41 files/bind-9.2.5-berkdb_fix.patch 537
-MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
-MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
-MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5 127
+MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
+MD5 e83e7a76e253debfdd120311fda73fb6 files/named.ca 2518
diff --git a/net-dns/bind/bind-9.2.2-r1.ebuild b/net-dns/bind/bind-9.2.2-r1.ebuild
deleted file mode 100644
index 49d0987304f1..000000000000
--- a/net-dns/bind/bind-9.2.2-r1.ebuild
+++ /dev/null
@@ -1,156 +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.2.2-r1.ebuild,v 1.11 2005/01/01 16:19:26 weeve Exp $
-
-IUSE="doc ipv6 selinux ssl"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-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"
-LICENSE="as-is"
-SLOT="0"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-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"
-
-	econf 	--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--enable-threads \
-		--with-libtool \
-		${myconf} || die "econf failed"
-
-	MAKEOPTS="${MAKEOPTS} -j1" emake || 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 ; 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
-}
-
-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."
-	einfo
-}
-
-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.2-r2.ebuild b/net-dns/bind/bind-9.2.2-r2.ebuild
deleted file mode 100644
index c1bf71b5a892..000000000000
--- a/net-dns/bind/bind-9.2.2-r2.ebuild
+++ /dev/null
@@ -1,156 +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.2.2-r2.ebuild,v 1.14 2005/01/01 16:19:26 weeve Exp $
-
-IUSE="doc ipv6 selinux ssl"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-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"
-LICENSE="as-is"
-SLOT="0"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-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"
-
-	econf 	--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--enable-threads \
-		--with-libtool \
-		${myconf} || die "econf failed"
-
-	MAKEOPTS="${MAKEOPTS} -j1" emake || 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 ; 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
-}
-
-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."
-	einfo
-}
-
-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.2-r4.ebuild b/net-dns/bind/bind-9.2.2-r4.ebuild
deleted file mode 100644
index a2981ca170e4..000000000000
--- a/net-dns/bind/bind-9.2.2-r4.ebuild
+++ /dev/null
@@ -1,182 +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.2.2-r4.ebuild,v 1.8 2005/01/01 16:19:26 weeve Exp $
-
-inherit eutils gnuconfig libtool
-
-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
-	ftp://ftp.isc.org/isc/bind9/${PV}/patch.${PV}-P1"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ppc ~ppc64 ~sparc ~x86 ~mips"
-IUSE="doc ipv6 mysql selinux ssl"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${DISTDIR}/patch.${PV}-P1
-
-	# 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} || die "sed $i"
-	done
-
-	if use mysql; then
-		EPATCH_OPTS="-p0 -d ${S}" \
-		epatch ${FILESDIR}/bind-9.2.2-mysql.patch
-	fi
-
-	gnuconfig_update
-	uclibctoolize
-}
-
-src_compile() {
-	local myconf=""
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
-
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--enable-threads \
-		--with-libtool \
-		${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 ; 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
-}
-
-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/bind-9.2.2.ebuild b/net-dns/bind/bind-9.2.2.ebuild
deleted file mode 100644
index e47db7bd4b2e..000000000000
--- a/net-dns/bind/bind-9.2.2.ebuild
+++ /dev/null
@@ -1,152 +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.2.2.ebuild,v 1.15 2005/01/01 16:19:26 weeve Exp $
-
-IUSE="doc ipv6 selinux ssl"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-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 ~amd64"
-LICENSE="as-is"
-SLOT="0"
-
-DEPEND=">=sys-apps/sed-4
-	sys-apps/groff
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-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"
-
-	econf 	--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--enable-threads \
-		--with-libtool \
-		${myconf} || die "econf failed"
-
-	MAKEOPTS="${MAKEOPTS} -j1" emake || 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 ; 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}
-
-	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r1 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}
-
-	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
-}
-
-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
-	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."
-	einfo
-}
-
-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.3.ebuild b/net-dns/bind/bind-9.2.3.ebuild
deleted file mode 100644
index ad7c7ac67a49..000000000000
--- a/net-dns/bind/bind-9.2.3.ebuild
+++ /dev/null
@@ -1,176 +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.2.3.ebuild,v 1.16 2005/01/01 16:19:26 weeve Exp $
-
-IUSE="caps doc ipv6 selinux ssl"
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-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 -mips"
-LICENSE="as-is"
-SLOT="0"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	ssl? ( >=dev-libs/openssl-0.9.6e )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-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 \
-		--enable-threads \
-		--with-libtool \
-		--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/bind-9.2.2-r5.ebuild b/net-dns/bind/bind-9.2.5-r1.ebuild
index a327a60e71ef..d52b92e65ab0 100644
--- a/net-dns/bind/bind-9.2.2-r5.ebuild
+++ b/net-dns/bind/bind-9.2.5-r1.ebuild
@@ -1,27 +1,28 @@
 # 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.2.2-r5.ebuild,v 1.1 2005/01/31 11:41:54 mglauche Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.5-r1.ebuild,v 1.1 2005/04/12 11:01:19 voxus Exp $
 
-inherit eutils
+inherit eutils gnuconfig libtool
 
-IUSE="ssl ipv6 doc dlz postgres bind-mysql mysql odbc ldap selinux"
+IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux \
+	idn caps threads"
 
-DLZ_VER=0.7.0
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	ftp://ftp.isc.org/isc/bind9/${PV}/patch.${PV}-P1
-	dlz? ( mirror://sourceforge/bind-dlz/DLZ-${DLZ_VER}.tar.gz )"
+	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${PV}.patch.bz2 )"
 HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
 
-# this ebuild contains the very untested dlz extension, hard-masking it for now
-KEYWORDS="-x86 -ppc -sparc -alpha -hppa -amd64 -ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64 ~mips"
 
 LICENSE="as-is"
 SLOT="0"
 
 DEPEND="sys-apps/groff
+	sys-devel/autoconf
 	>=sys-apps/sed-4
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	mysql? ( >=dev-db/mysql-4 )
+	ldap? ( net-nds/openldap )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
@@ -29,43 +30,73 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A} && cd ${S}
 
-	epatch ${DISTDIR}/patch.${PV}-P1
-
 	# 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
+
+	if use dlz; then
+		epatch ${DISTDIR}/dlz-${PV}.patch.bz2
+		epatch ${FILESDIR}/${P}-berkdb_fix.patch
+	fi
+
 	if use bind-mysql; then
-		epatch ${FILESDIR}/bind-9.2.2-mysql.patch
+		if use dlz; then
+			epatch ${FILESDIR}/${P}-dlz-mysql.patch
+		else
+			epatch ${FILESDIR}/${P}-mysql.patch
+		fi
 	fi
-	if use dlz; then
-		epatch ../dlz.patch
+
+	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
+
+	# 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 ipv6 && myconf="${myconf} --enable-ipv6" || myconf="${myconf} --enable-ipv6=no"
-	use dlz && myconf="${myconf} --disable-threads --with-dlz-filesystem --with-dlz-stub" || myconf="${myconf} --enable-threads"
-	use postgres && myconf="${myconf} --with-dlz-postgres"
-	use mysql && myconf="${myconf} --with-dlz-mysql"
-	# use berkdb is broken, at least with my machine 
-	# commenting out for now
-	# use berkdb && myconf="${myconf} --with-dlz-bdb"
-	use ldap  && myconf="${myconf} --with-dlz-ldap"
-	use odbc  && myconf="${myconf} --with-dlz-odbc"
-
-	econf 	--sysconfdir=/etc/bind \
+	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"
+	}
+	use caps || myconf="${myconf} --disable-linux-caps"
+
+	econf \
+		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
+		`use_enable threads` \
+		`use_enable ipv6` \
 		--with-libtool \
 		${myconf} || die "econf failed"
 
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "failed to compile bind"
+	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() {
@@ -75,7 +106,7 @@ src_install() {
 
 	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 \
@@ -97,17 +128,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
-}
 
-pkg_preinst() {
+	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.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}
 }
 
@@ -145,10 +181,23 @@ pkg_postinst() {
 	echo
 	einfo "	zone "com" IN { type delegation-only; };"
 	einfo "	zone "net" IN { type delegation-only; };"
+
+	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
+	fi
 }
 
 pkg_config() {
-
 	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
 	EXISTS="no"
 
diff --git a/net-dns/bind/bind-9.3.1.ebuild b/net-dns/bind/bind-9.3.1.ebuild
index 81aad21ac260..12dc1a5ea2f9 100644
--- a/net-dns/bind/bind-9.3.1.ebuild
+++ b/net-dns/bind/bind-9.3.1.ebuild
@@ -1,17 +1,15 @@
 # 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.ebuild,v 1.1 2005/03/25 23:15:00 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.1.ebuild,v 1.2 2005/04/12 11:01:19 voxus Exp $
 
 inherit eutils gnuconfig libtool
 
-IUSE="ssl ipv6 doc selinux idn caps"
+IUSE="ssl ipv6 doc selinux idn caps threads"
 
-DLZ_VER=0.7.0
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
 
-# this ebuild contains the very untested dlz extension, hard-masking it for now
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
 
 LICENSE="as-is"
@@ -36,10 +34,6 @@ src_unpack() {
 		       ${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
@@ -49,6 +43,10 @@ src_unpack() {
 
 	gnuconfig_update
 
+	# 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"
 }
@@ -57,13 +55,14 @@ 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 \
+		`use_enable threads` \
+		`use_enable ipv6` \
 		${myconf} || die "econf failed"
 
 	emake -j1 || die "failed to compile bind"
@@ -200,4 +199,3 @@ pkg_config() {
 		einfo
 	fi
 }
-
diff --git a/net-dns/bind/files/digest-bind-9.2.2 b/net-dns/bind/files/digest-bind-9.2.2
deleted file mode 100644
index a11f05a79883..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
diff --git a/net-dns/bind/files/digest-bind-9.2.2-r1 b/net-dns/bind/files/digest-bind-9.2.2-r1
deleted file mode 100644
index a11f05a79883..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
diff --git a/net-dns/bind/files/digest-bind-9.2.2-r2 b/net-dns/bind/files/digest-bind-9.2.2-r2
deleted file mode 100644
index a11f05a79883..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
diff --git a/net-dns/bind/files/digest-bind-9.2.2-r4 b/net-dns/bind/files/digest-bind-9.2.2-r4
deleted file mode 100644
index 95fe6b80e521..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.2-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
-MD5 063edc41c756ffc6a1051d5f1937fa2c patch.9.2.2-P1 40087
diff --git a/net-dns/bind/files/digest-bind-9.2.2-r5 b/net-dns/bind/files/digest-bind-9.2.2-r5
deleted file mode 100644
index 7f7c4fb25f26..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.2-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
-MD5 063edc41c756ffc6a1051d5f1937fa2c patch.9.2.2-P1 40087
-MD5 2095ceb0be6f86d6ac7e0990a04d08de DLZ-0.7.0.tar.gz 249768
diff --git a/net-dns/bind/files/digest-bind-9.2.3 b/net-dns/bind/files/digest-bind-9.2.3
deleted file mode 100644
index fac669f6a7f9..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94ae7b0f20dc406fdbbf6fac5d57b32f bind-9.2.3.tar.gz 4553260
diff --git a/net-dns/bind/files/digest-bind-9.2.5-r1 b/net-dns/bind/files/digest-bind-9.2.5-r1
new file mode 100644
index 000000000000..917f82e7d0d6
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.2.5-r1
@@ -0,0 +1,2 @@
+MD5 35a265fb97a068c066e22306ea32fd1f bind-9.2.5.tar.gz 4504389
+MD5 3bb820ced02fa2db7ae37e5288a73706 dlz-9.2.5.patch.bz2 135932