* closing bugs: #119679, #124680, #127564

Package-Manager: portage-2.1_pre7

7 files changed, 636 insertions, 4 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 5f7f466bfb02..1cd296443989 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.108 2006/02/23 18:24:15 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.109 2006/03/26 00:07:20 voxus Exp $
+
+*bind-9.3.2-r1 (26 Mar 2006)
+*bind-9.2.5-r1 (26 Mar 2006)
+
+  26 Mar 2006; Konstantin Arkhipov <voxus@gentoo.org> +bind-9.3.2-r1.ebuild,
+  +bind-9.2.6-r1.ebuild, +files/bind-dlzbdb-includes.patch:
+  Closing bugs: #119679, #124680, #127564.
 
   23 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> bind-9.2.5-r4.ebuild,
   bind-9.2.5-r6.ebuild, bind-9.2.6.ebuild, bind-9.3.2.ebuild,
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index a37fd0db1c37..6aa13fe7de8c 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,15 +1,21 @@
-MD5 0af1d5f0422d52a1800bdd9723abbb5c ChangeLog 17981
-RMD160 74acba7e175a97b8c0c2327940bdcfbb1765be02 ChangeLog 17981
-SHA256 fddb1aae58055f78dfe292b64c302f8abc675cda8bc299b2dd6c9bfef3a5d701 ChangeLog 17981
+MD5 6f8b1fcbf717a6be4f02807e0143fc3f ChangeLog 18221
+RMD160 46e5ce98c4ce473fd0840da029fdd070febe73fb ChangeLog 18221
+SHA256 610b30f59c56bb4761a154e6843702cb119a9da6912ef04ac8d692b7948e4814 ChangeLog 18221
 MD5 f3e8df20ae29c5234f7ced7b86a003f8 bind-9.2.5-r4.ebuild 8385
 RMD160 0c4642aa570b8256e3297487f1b2c18204497be6 bind-9.2.5-r4.ebuild 8385
 SHA256 4e578f9770ec6dcdaf2188e0c0234a3afb3c8c73dd3ef7ce1cd5997ea7a257fe bind-9.2.5-r4.ebuild 8385
 MD5 31dffa03157d2f3b6c9749728828d84e bind-9.2.5-r6.ebuild 8413
 RMD160 5d0f43cafa60abdf22bc5e1240ab2588f24a00c2 bind-9.2.5-r6.ebuild 8413
 SHA256 699d59be18e9b4a10d108f7cefa72982a04989d48ae5c835553800696fc6fce6 bind-9.2.5-r6.ebuild 8413
+MD5 3dfccf5b9b3f730521853c7a3ee2fe5e bind-9.2.6-r1.ebuild 9117
+RMD160 487ff58aab9adf25df759184190c08c344b85a67 bind-9.2.6-r1.ebuild 9117
+SHA256 4deba73a3e1765b97b0be266078cf5513ee8c10988d2dc119d88a3d1dddba317 bind-9.2.6-r1.ebuild 9117
 MD5 2c9d9bc552621e69923a91c7f8c595ec bind-9.2.6.ebuild 9024
 RMD160 2a963ad9c315d6960686457ad6f8e2663732cda6 bind-9.2.6.ebuild 9024
 SHA256 045a15bbda0b78ba2e34268e376c4fa32233682fa9df45b16e0d1037ac5757e7 bind-9.2.6.ebuild 9024
+MD5 d630ed44c29cfb6b054826538cc16520 bind-9.3.2-r1.ebuild 8669
+RMD160 38794e5b6dcc61182b3bc28293e4df8d2318b2dd bind-9.3.2-r1.ebuild 8669
+SHA256 0ac4298c31d08196aea6e7e178de789d3f0698946032fff439da993214e8e1e3 bind-9.3.2-r1.ebuild 8669
 MD5 6c26b8a0ccfb53517d72039ec0775df8 bind-9.3.2.ebuild 8661
 RMD160 0f883d8418064d958a68fad40c4bb01a6a5c4c3b bind-9.3.2.ebuild 8661
 SHA256 87250853244eea735a9e7790598328661f6830c4cd7d56bab17fb746f3b95b85 bind-9.3.2.ebuild 8661
@@ -28,6 +34,9 @@ SHA256 c7130b90a0afa27d91117466a6e09783b43a0ae9227e86d9f2d7e08b89539b37 files/bi
 MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
 RMD160 6161e9ebaed3b13a64d3cc17edcce8a0e64e48fc files/bind-9.2.5-mysql.patch 11315
 SHA256 f275c2f5566bdc57dbe54c6a17db4397f54999715bda1c06a5457b10a8dbbc94 files/bind-9.2.5-mysql.patch 11315
+MD5 5299fb17398d9613850e0b68ff1d38e1 files/bind-dlzbdb-includes.patch 465
+RMD160 07e120527c34ebc044f1312e491a8d8dc13ec558 files/bind-dlzbdb-includes.patch 465
+SHA256 16ac0b8ba61287a2172c99ab21dd66d0a46b104ef34f710da5933720604f70c6 files/bind-dlzbdb-includes.patch 465
 MD5 67fd12e4cea46beb3d78e3f6ed9822a8 files/digest-bind-9.2.5-r4 708
 RMD160 ffeca12b50856b425bd64d8894bc3f9b55d7e4d9 files/digest-bind-9.2.5-r4 708
 SHA256 941cd5e52dd9b613c6c81b521d50bf9ddb36fe51605f45dc4c55093bca6aa1fa files/digest-bind-9.2.5-r4 708
@@ -37,9 +46,15 @@ SHA256 941cd5e52dd9b613c6c81b521d50bf9ddb36fe51605f45dc4c55093bca6aa1fa files/di
 MD5 579e491cb632a7ba7f3fd5533b595821 files/digest-bind-9.2.6 708
 RMD160 afc4e94e81cf5eb04bb285e0dfc5bac6b7317953 files/digest-bind-9.2.6 708
 SHA256 7275e1e44f5325ece2457bf8fb28fc92b49bc384fd91810e5e4d25a88de16b24 files/digest-bind-9.2.6 708
+MD5 579e491cb632a7ba7f3fd5533b595821 files/digest-bind-9.2.6-r1 708
+RMD160 afc4e94e81cf5eb04bb285e0dfc5bac6b7317953 files/digest-bind-9.2.6-r1 708
+SHA256 7275e1e44f5325ece2457bf8fb28fc92b49bc384fd91810e5e4d25a88de16b24 files/digest-bind-9.2.6-r1 708
 MD5 ff0c0177b13e665beafd68ea30cd4e5a files/digest-bind-9.3.2 729
 RMD160 578baea200800e5a983e726cd7633d1dee2b3c0e files/digest-bind-9.3.2 729
 SHA256 39453324f8464c8ffef631fcd7300cd771763b9c069ea086b1a5e5cc4a1662c9 files/digest-bind-9.3.2 729
+MD5 ff0c0177b13e665beafd68ea30cd4e5a files/digest-bind-9.3.2-r1 729
+RMD160 578baea200800e5a983e726cd7633d1dee2b3c0e files/digest-bind-9.3.2-r1 729
+SHA256 39453324f8464c8ffef631fcd7300cd771763b9c069ea086b1a5e5cc4a1662c9 files/digest-bind-9.3.2-r1 729
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
 RMD160 74d734f124f9078c300d089218536bcb108643d9 files/localhost.zone 412
 SHA256 a67891fb66beb12999ade1b599f57a349337ec9a7f941962db94ac5816bc4088 files/localhost.zone 412
diff --git a/net-dns/bind/bind-9.2.6-r1.ebuild b/net-dns/bind/bind-9.2.6-r1.ebuild
new file mode 100644
index 000000000000..08599f9bf32e
--- /dev/null
+++ b/net-dns/bind/bind-9.2.6-r1.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.6-r1.ebuild,v 1.1 2006/03/26 00:07:20 voxus Exp $
+
+inherit eutils libtool
+
+DLZ_VERSION="9.2.5"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
+	mirror://gentoo/dyndns-samples.tbz2
+	dlz? ( http://dev.gentoo.org/~voxus/dlz/dlz-${DLZ_VERSION}.patch.bz2 )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb bind-mysql mysql odbc ldap selinux idn threads"
+
+DEPEND="sys-apps/groff
+	sys-devel/autoconf
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	mysql? ( >=dev-db/mysql-4 )
+	bind-mysql? ( >=dev-db/mysql-4 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_unpack() {
+	use threads && {
+		echo
+		ewarn "If you're in vserver enviroment, you're probably want to"
+		ewarn "disable threads support because of linux capabilities dependency"
+		echo
+	}
+
+	unpack ${A} && cd ${S}
+
+	# Adjusting PATHs in manpages
+	for i in `echo bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8}`; do
+		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+		       ${i}
+	done
+
+	if use dlz; then
+		epatch ${DISTDIR}/dlz-${DLZ_VERSION}.patch.bz2
+		epatch ${FILESDIR}/bind-${DLZ_VERSION}-berkdb_fix.patch
+		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
+	fi
+
+	if use bind-mysql; then
+		if use dlz; then
+			MP=${P}-dlz-mysql.patch
+		else
+			MP=${P}-mysql.patch
+		fi
+
+		ebegin "Fixing mysql patch"
+		eindent
+
+		cp ${FILESDIR}/${MP} ${T}/${MP}
+
+		sed -e "s:-I/usr/local/include:`mysql_config --include`:" \
+			-e "s:-L/usr/local/lib/mysql -lmysqlclient:`mysql_config --libs`:" \
+			-i ${T}/${MP}
+
+		epatch ${T}/${MP}
+
+		eoutdent
+		eend $?
+	fi
+
+	if use idn; then
+		epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
+	fi
+
+	# it should be installed by bind-tools
+	sed "s:nsupdate ::g" ${S}/bin/Makefile.in > ${T}/Makefile
+	mv ${T}/Makefile ${S}/bin/Makefile.in
+
+	cd ${S}
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+	use dlz && {
+		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
+		use postgres && myconf="${myconf} --with-dlz-postgres"
+		use mysql && myconf="${myconf} --with-dlz-mysql"
+		use berkdb && myconf="${myconf} --with-dlz-bdb"
+		use ldap  && myconf="${myconf} --with-dlz-ldap"
+		use odbc  && myconf="${myconf} --with-dlz-odbc"
+	}
+
+	if use threads; then
+		if use dlz && use mysql; then
+			echo
+			ewarn ""
+			einfo "MySQL uses thread local storage in its C api. Thus MySQL"
+			einfo "requires that each thread of an application execute a MySQL"
+			einfo "\"thread initialization\" to setup the thread local storage."
+			einfo "This is impossible to do safely while staying within the DLZ"
+			einfo "driver API. This is a limitation caused by MySQL, and not the"
+			einfo "DLZ API."
+			ewarn "Because of this BIND MUST only run with a single thread when"
+			ewarn "using the MySQL driver."
+			echo
+			myconf="${myconf} --disable-linux-caps --disable-threads"
+			einfo "Threading support disabled"
+			epause 10
+		else
+			myconf="${myconf} --enable-linux-caps --enable-threads"
+			einfo "Threading support enabled"
+		fi
+	else
+		myconf="${myconf} --disable-linux-caps --disable-threads"
+	fi
+
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		`use_enable ipv6` \
+		--with-libtool \
+		${myconf} || die "econf failed"
+
+	# idea from dev-libs/cyrus-sasl
+	if has distcc ${FEATURES}; then
+		einfo "You have \"distcc\" enabled"
+		einfo "build with MAKEOPTS=\"-j1\""
+		jobs="-j1"
+	else
+		einfo "build with MAKEOPTS=${MAKEOPTS}"
+		jobs=""
+	fi
+
+	emake ${MAKEOPTS} ${jobs} || die "failed to compile bind"
+
+	if use idn; then
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		econf || die "idn econf failed"
+		emake || die "idn emake failed"
+	fi
+}
+
+src_install() {
+	einstall || die "failed to install bind"
+
+	dodoc CHANGES COPYRIGHT FAQ README
+
+	use doc && {
+		docinto misc ; dodoc doc/misc/*
+		docinto html ; dohtml doc/arm/*
+		docinto	draft ; dodoc doc/draft/*
+		docinto rfc ; dodoc doc/rfc/*
+		docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
+		contrib/nanny/nanny.pl
+	}
+
+	insinto /etc/env.d
+	newins ${FILESDIR}/10bind.env 10bind
+
+	# some handy-dandy dynamic dns examples
+	cd ${D}/usr/share/doc/${PF}
+	tar pjxf ${DISTDIR}/dyndns-samples.tbz2
+
+	dodir /etc/bind /var/bind/{pri,sec}
+	keepdir /var/bind/sec
+
+	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
+	# ftp://ftp.rs.internic.net/domain/named.ca:
+	insinto /var/bind ; doins ${FILESDIR}/named.ca
+	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
+
+	cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
+	cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
+
+	dosym ../../var/bind/named.ca /var/bind/root.cache
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+
+	if use idn; then
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		einstall || die "failed to install idn kit"
+		docinto idn
+		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
+	fi
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
+	rm -f ${D}/usr/bin/{dig,host,nslookup}
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if [ -c /dev/urandom ]; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a -u named
+			echo
+		fi
+	fi
+
+	install -d -o named -g named ${ROOT}/var/run/named \
+		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
+	chown -R named:named ${ROOT}/var/bind
+
+	einfo "The default zone files are now installed as *.zone,"
+	einfo "be careful merging config files if you have modified"
+	einfo "/var/bind/pri/127 or /var/bind/pri/localhost"
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	einfo "The BIND ebuild now includes chroot support."
+	einfo "If you like to run bind in chroot AND this is a new install OR"
+	einfo "your bind doesn't already run in chroot, simply run:"
+	einfo "\`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; };"
+
+	echo
+	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
+	ewarn "when it was previously optional.  If the priority is missing, BIND"
+	ewarn "won't load the zone file at all."
+	echo
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
+	EXISTS="no"
+
+	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
+		CHROOT="/chroot/dns"
+	elif [ -d ${CHROOT} ]; then
+		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
+	fi
+
+	if [ ! "$EXISTS" = yes ]; then
+		einfo ; einfon "Setting up the chroot directory..."
+		mkdir -m 700 -p ${CHROOT}
+		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
+		chown -R named:named ${CHROOT}/var/run/named
+		cp -R /etc/bind ${CHROOT}/etc/
+		cp /etc/localtime ${CHROOT}/etc/localtime
+		chown named:named ${CHROOT}/etc/bind/rndc.key
+		cp -R /var/bind ${CHROOT}/var/
+		chown -R named:named ${CHROOT}/var/
+		mknod ${CHROOT}/dev/zero c 1 5
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 666 ${CHROOT}/dev/{random,zero}
+		chown named:named ${CHROOT}
+
+		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
+			mv --force /etc/conf.d/named.orig /etc/conf.d/named
+		fi
+
+		sleep 1; echo " Done."; sleep 1
+		einfo
+		einfo "Add the following to your root .bashrc or .bash_profile: "
+		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
+		einfo "Then do the following: "
+		einfo "   source /root/.bashrc or .bash_profile"
+		einfo
+	fi
+}
diff --git a/net-dns/bind/bind-9.3.2-r1.ebuild b/net-dns/bind/bind-9.3.2-r1.ebuild
new file mode 100644
index 000000000000..57400db13ede
--- /dev/null
+++ b/net-dns/bind/bind-9.3.2-r1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2-r1.ebuild,v 1.1 2006/03/26 00:07:20 voxus Exp $
+
+inherit eutils libtool
+
+DLZ_VERSION="9.3.2b1"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
+
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+	dlz? ( http://dev.gentoo.org/~voxus/bind/ctrix_dlz_${DLZ_VERSION}.patch.bz2 )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads"
+
+DEPEND="sys-apps/groff
+	sys-devel/autoconf
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	mysql? ( >=dev-db/mysql-4 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )"
+
+pkg_setup() {
+	use threads && {
+		echo
+		ewarn "If you're in vserver enviroment, you're probably want to"
+		ewarn "disable threads support because of linux capabilities dependency"
+		echo
+	}
+
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+
+	# Adjusting PATHs in manpages
+	for i in `echo bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8}`; do
+		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+		       ${i}
+	done
+
+	use dlz && {
+		epatch ${DISTDIR}/ctrix_dlz_${DLZ_VERSION}.patch.bz2
+		epatch ${FILESDIR}/${PN}-dlzbdb-includes.patch
+	}
+
+	use idn && epatch ${S}/contrib/idn/idnkit-1.0-src/patch/bind9/${P}-patch
+
+	# it should be installed by bind-tools
+	sed "s:nsupdate ::g" ${S}/bin/Makefile.in > ${T}/Makefile
+	mv ${T}/Makefile ${S}/bin/Makefile.in
+
+	cd ${S}
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+
+	use dlz && {
+		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
+		use postgres && myconf="${myconf} --with-dlz-postgres"
+		use mysql && myconf="${myconf} --with-dlz-mysql"
+		use berkdb && myconf="${myconf} --with-dlz-bdb"
+		use ldap  && myconf="${myconf} --with-dlz-ldap"
+		use odbc  && myconf="${myconf} --with-dlz-odbc"
+	}
+
+	if use threads; then
+		if use dlz && use mysql; then
+			echo
+			ewarn ""
+			einfo "MySQL uses thread local storage in its C api. Thus MySQL"
+			einfo "requires that each thread of an application execute a MySQL"
+			einfo "\"thread initialization\" to setup the thread local storage."
+			einfo "This is impossible to do safely while staying within the DLZ"
+			einfo "driver API. This is a limitation caused by MySQL, and not"
+			einfo "the DLZ API."
+			ewarn "Because of this BIND MUST only run with a single thread when"
+			ewarn "using the MySQL driver."
+			echo
+			myconf="${myconf} --disable-linux-caps --disable-threads"
+			einfo "Threading support disabled"
+			epause 10
+		else
+			myconf="${myconf} --enable-linux-caps --enable-threads"
+			einfo "Threading support enabled"
+		fi
+	else
+		myconf="${myconf} --disable-linux-caps --disable-threads"
+	fi
+
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		`use_enable ipv6` \
+		${myconf} || die "econf failed"
+
+	# idea from dev-libs/cyrus-sasl
+	if has distcc ${FEATURES}; then
+		einfo "You have \"distcc\" enabled"
+		einfo "build with MAKEOPTS=\"-j1\""
+		jobs="-j1"
+	else
+		einfo "build with MAKEOPTS=${MAKEOPTS}"
+		jobs=""
+	fi
+
+	emake ${MAKEOPTS} ${jobs} || die "failed to compile bind"
+
+	use idn && {
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		econf || die "idn econf failed"
+		emake || die "idn emake failed"
+	}
+}
+
+src_install() {
+	einstall || die "failed to install bind"
+
+	dodoc CHANGES COPYRIGHT FAQ README
+
+	use doc && {
+		docinto misc
+		dodoc doc/misc/*
+
+		docinto html
+		dohtml doc/arm/*
+
+		docinto	draft
+		dodoc doc/draft/*
+
+		docinto rfc
+		dodoc doc/rfc/*
+
+		docinto contrib
+		dodoc contrib/named-bootconf/named-bootconf.sh \
+			contrib/nanny/nanny.pl
+
+		# some handy-dandy dynamic dns examples
+		cd ${D}/usr/share/doc/${PF}
+		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
+	}
+
+	insinto /etc/env.d
+	newins ${FILESDIR}/10bind.env 10bind
+
+	dodir /etc/bind /var/bind/{pri,sec}
+	keepdir /var/bind/sec
+
+	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.ca:
+	insinto /var/bind ; doins ${FILESDIR}/named.ca
+
+	insinto /var/bind/pri
+	doins ${FILESDIR}/127.zone
+	newins ${FILESDIR}/localhost.zone-r1 localhost.zone
+
+	cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
+	cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
+
+	dosym ../../var/bind/named.ca /var/bind/root.cache
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+
+	if use idn; then
+		cd ${S}/contrib/idn/idnkit-1.0-src
+		einstall || die "failed to install idn kit"
+		docinto idn
+		dodoc ChangeLog INSTALL{,.ja} README{,.ja} NEWS
+	fi
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
+	rm -f ${D}/usr/bin/{dig,host,nslookup}
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if [ -c /dev/urandom ]; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a -u named
+			echo
+		fi
+	fi
+
+	install -d -o named -g named ${ROOT}/var/run/named \
+		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
+	chown -R named:named ${ROOT}/var/bind
+
+	einfo "The default zone files are now installed as *.zone,"
+	einfo "be careful merging config files if you have modified"
+	einfo "/var/bind/pri/127 or /var/bind/pri/localhost"
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	einfo "The BIND ebuild now includes chroot support."
+	einfo "If you like to run bind in chroot AND this is a new install OR"
+	einfo "your bind doesn't already run in chroot, simply run:"
+	einfo "\`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo "Before running the above command you might want to change the chroot"
+	einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
+	echo
+	einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD"
+	einfo "zones making all .com and .net domains appear to be registered"
+	einfo "This causes many problems such as breaking important anti-spam checks"
+	einfo "which verify source domains exist. ISC released a patch for BIND which"
+	einfo "adds 'delegation-only' zones to allow admins to return the .com and .net"
+	einfo "domain resolution to their normal function."
+	echo
+	einfo "There is no need to create a com or net data file. Just the"
+	einfo "entries to the named.conf file is enough."
+	echo
+	einfo "	zone "com" IN { type delegation-only; };"
+	einfo "	zone "net" IN { type delegation-only; };"
+
+	echo
+	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
+	ewarn "when it was previously optional.  If the priority is missing, BIND"
+	ewarn "won't load the zone file at all."
+	echo
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
+	EXISTS="no"
+
+	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
+		CHROOT="/chroot/dns"
+	elif [ -d ${CHROOT} ]; then
+		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
+	fi
+
+	if [ ! "$EXISTS" = yes ]; then
+		einfo ; einfon "Setting up the chroot directory..."
+		mkdir -m 700 -p ${CHROOT}
+		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
+		chown -R named:named ${CHROOT}/var/run/named
+		cp -R /etc/bind ${CHROOT}/etc/
+		cp /etc/localtime ${CHROOT}/etc/localtime
+		chown named:named ${CHROOT}/etc/bind/rndc.key
+		cp -R /var/bind ${CHROOT}/var/
+		chown -R named:named ${CHROOT}/var/
+		mknod ${CHROOT}/dev/zero c 1 5
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 666 ${CHROOT}/dev/{random,zero}
+		chown named:named ${CHROOT}
+
+		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
+			mv --force /etc/conf.d/named.orig /etc/conf.d/named
+		fi
+
+		sleep 1; echo " Done."; sleep 1
+		einfo
+		einfo "Add the following to your root .bashrc or .bash_profile: "
+		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
+		einfo "Then do the following: "
+		einfo "   source /root/.bashrc or .bash_profile"
+		einfo
+	fi
+}
diff --git a/net-dns/bind/files/bind-dlzbdb-includes.patch b/net-dns/bind/files/bind-dlzbdb-includes.patch
new file mode 100644
index 000000000000..b940840a177e
--- /dev/null
+++ b/net-dns/bind/files/bind-dlzbdb-includes.patch
@@ -0,0 +1,12 @@
+--- 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/digest-bind-9.2.6-r1 b/net-dns/bind/files/digest-bind-9.2.6-r1
new file mode 100644
index 000000000000..3b48490174dd
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.2.6-r1
@@ -0,0 +1,9 @@
+MD5 a1b1224cfd9c9599fb4b336c371879b9 bind-9.2.6.tar.gz 5125776
+RMD160 6c732cf9fbc9c68d822833689088701af97a6b3a bind-9.2.6.tar.gz 5125776
+SHA256 05f4be2c62beacc38a5ab29520a33ec1f716222f3f09634ec89345671b4c758d bind-9.2.6.tar.gz 5125776
+MD5 3bb820ced02fa2db7ae37e5288a73706 dlz-9.2.5.patch.bz2 135932
+RMD160 d1686658b04b8896828e0b40c1cb869a2b3735f1 dlz-9.2.5.patch.bz2 135932
+SHA256 051ba8ba5825fe3a4f77adcc75e46471bc3ed74c132043bc9e6a6b8d516cd442 dlz-9.2.5.patch.bz2 135932
+MD5 2bb12cfcd70284e72fbf9e70e5e2974d dyndns-samples.tbz2 22866
+RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d dyndns-samples.tbz2 22866
+SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 dyndns-samples.tbz2 22866
diff --git a/net-dns/bind/files/digest-bind-9.3.2-r1 b/net-dns/bind/files/digest-bind-9.3.2-r1
new file mode 100644
index 000000000000..9c335838860b
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.3.2-r1
@@ -0,0 +1,9 @@
+MD5 55e709501a7780233c36e25ccd15ece2 bind-9.3.2.tar.gz 5302112
+RMD160 c825b6308eb374e9bcf9b6ccc48f65d8753c0a6d bind-9.3.2.tar.gz 5302112
+SHA256 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694 bind-9.3.2.tar.gz 5302112
+MD5 a70b386bf85c26b1c797e0936be28b79 ctrix_dlz_9.3.2b1.patch.bz2 60982
+RMD160 dd76c79d58fdcf75d5c991bac4b6de54aeb4f8bb ctrix_dlz_9.3.2b1.patch.bz2 60982
+SHA256 f0764290a08b4a839eae8b82a6e27301ce9ff41f3132f697139d73698f89cffc ctrix_dlz_9.3.2b1.patch.bz2 60982
+MD5 2bb12cfcd70284e72fbf9e70e5e2974d dyndns-samples.tbz2 22866
+RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d dyndns-samples.tbz2 22866
+SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 dyndns-samples.tbz2 22866