Revision bump due to baselayout-1 compatibility fixes.

Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64

8 files changed, 391 insertions, 21 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index c0ca160052a1..ad28fc91408d 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.295 2010/10/05 10:43:52 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.296 2010/10/24 20:47:16 idl0r Exp $
+
+*bind-9.7.2_p2-r1 (24 Oct 2010)
+*bind-9.7.1_p2-r2 (24 Oct 2010)
+*bind-9.6.2_p2-r2 (24 Oct 2010)
+*bind-9.4.3_p5-r2 (24 Oct 2010)
+
+  24 Oct 2010; Christian Ruppert <idl0r@gentoo.org> -bind-9.4.3_p5-r1.ebuild,
+  +bind-9.4.3_p5-r2.ebuild, +bind-9.6.2_p2-r2.ebuild, -bind-9.7.1_p2-r1.ebuild,
+  +bind-9.7.1_p2-r2.ebuild, -bind-9.7.2_p2.ebuild, +bind-9.7.2_p2-r1.ebuild,
+  files/named.confd-r4, files/named.init-r8:
+  Revision bump due to baselayout-1 compatibility fixes.
 
 *bind-9.7.2_p2 (05 Oct 2010)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index e925ca13f2c4..18a15c6b46ce 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -14,10 +14,10 @@ AUX named.conf-r3 1317 RMD160 dace9861fb15a7ad415b23f2452fca5eb3ef2604 SHA1 0238
 AUX named.conf-r4 5288 RMD160 d5b56d46370b0e54e42aefbe41e1ff290df30439 SHA1 945ee47a99d37c2160829b2fdfd9ffbd3293b333 SHA256 852fc5f2100c94834b59ee64566b7414f0ec12b17751900bb572ab2375c8ca50
 AUX named.confd-r2 479 RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb SHA1 d0b0e2f5d72d43862c5aaff9a226fd8599992323 SHA256 bae05257852ecbc7f66bd30e452162f15b6f6e8c3fc170fb6dfdfa7d22361915
 AUX named.confd-r3 719 RMD160 813e82a611c24a0aa3aca0400f499b68727cc8ef SHA1 d4bc0d753e9ec52fa9091b10eca10aee4462b83c SHA256 b37c19dccf3af6e313b09720c12ef7de107a297d2434c78b7101cd67ba0798f6
-AUX named.confd-r4 1293 RMD160 4177cffeef1ff0c8abc1eaba6f5cbeaed5477733 SHA1 89b0c4f4b7dca771bf121e8ce3b00e00bc31ec8c SHA256 2a4b36a7d42b5c8e54b0b4389ac32cba54cfc6187a3fd67c80d90d57434c9dbb
+AUX named.confd-r4 1295 RMD160 aa3a3da754405df0362b7ba67a730b5ed4f7da33 SHA1 23ce37d133bd46561b82874709fe784b4470e243 SHA256 061c6c2ffb72859b46c9e8ad8922000cf397c3f91a3681a8b1bf21493ec13491
 AUX named.init-r5 1798 RMD160 a4cf8a2d19c79c40f7121559a5b0252204ede75b SHA1 0a131aa6b42050c6173c144d26a927f2fe5d3a1b SHA256 71153fce5461d4d85853218371599f5c909c625bacd9894b8a0ff16636773e05
 AUX named.init-r7 3622 RMD160 4ed3c76403bf5ddc545b0d681b176fbe5f7f8484 SHA1 dfe2e1a0925b23584581f8dd243bc15a9833bbe0 SHA256 9999609ce9ecb7fcafac50174713e72c2af80137f2c7c06fc5cfee26620a3e7e
-AUX named.init-r8 4285 RMD160 368f711212a528e77f97e5cbbd7d9c958b448418 SHA1 cfe9583ef08e2a8785cbb367324f496dec58cdc8 SHA256 40259658fd2b2531195f22b4c07f5fb0f1f7524515fee0c8efeb9f69c3b9df66
+AUX named.init-r8 4417 RMD160 6aac0609b04e8cb3a1a91bf0532506be151a0e01 SHA1 5754951e9163cb0e7cfc2323c8d759c404ac8a27 SHA256 720880c274f14df595370e3fab257e32f08a0df0f3495a212cff86b6933b83d3
 DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939
 DIST bind-9.6.2-P2.tar.gz 6543309 RMD160 0706aa4f4f6cd4927d2e8ff72d5fb8a91be94fa9 SHA1 fce8067d3ff03366d5ee305adf941b5c41e41d07 SHA256 233404ea08c4880eb867ee4e1084d96cff748a2bdd8857014203bef511f17e64
 DIST bind-9.7.1-P2.tar.gz 7549535 RMD160 ec978498c0e0fa7f709fa3398a573e67557f06a4 SHA1 b24ea0e8a67b841601b803f54070610036931e64 SHA256 37ac37d11e8c16658f3fec49a54747b65c3b5a74b375af638c5944447aebce2c
@@ -26,23 +26,24 @@ DIST bind-geoip-1.3-readme.txt 10040 RMD160 073956324ed4780e0e0cdbf40ae259f85ebe
 DIST bind-geoip-1.3.patch 54070 RMD160 5d01a20104b572588507aea4b8f6cbf66f68a973 SHA1 8a465d04d5c2d9c7cb881c3331a64e61077e1e3a SHA256 126db2f6e603f0dbe102b3ddfda85e0243fae314b40bb16dce2fd7d4d4bb93b4
 DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a62602 SHA1 fae539a29615fda56a2dcb55a1e01d335835b980 SHA256 afe9cc6a99c20f1dc1929b0a30ff815b0aac509a6c12f8df432853c856d35754
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
-EBUILD bind-9.4.3_p5-r1.ebuild 10442 RMD160 8abf66b700f0584ba4cce11fc53a61f00602d543 SHA1 b13a11ffe75e5b7c33c2b98c1cf36dea6fb5cac6 SHA256 75d8f282c8e80b69ac2a46e9384835b845b2dbc195054e9bfd5cf56afa36bdef
+EBUILD bind-9.4.3_p5-r2.ebuild 10438 RMD160 47e04cc712e266cbefe82750b148f090561612aa SHA1 016efc2b19a7695df543bd343a6c12e8d617cc23 SHA256 551c83e5b93270a310c8215230c6b3cb0cf16af45097ae6d785d23c790edfac8
 EBUILD bind-9.4.3_p5.ebuild 9208 RMD160 6e7ff13da934a07ba7973e886b0ac03aa7033fb0 SHA1 8320223ec6b82e8988ca23f994457175c25caef0 SHA256 ae0e300cc78a666ef49c7f84432c14f4238b7017e7b579054e54397c28946e3e
 EBUILD bind-9.6.2_p2-r1.ebuild 11253 RMD160 663c0a7984502e9b0631fa6957124cd658343aed SHA1 e15ccc0c99c2782de79ceccfb1b5129db83cab3d SHA256 89778dc5a07ce8bb1cd579c9568dfc795b99b106909b5a9231083e1449f8d649
+EBUILD bind-9.6.2_p2-r2.ebuild 11253 RMD160 0ce5dd88aa64c19edb79a5706103d9e0d3608992 SHA1 e2d7e046c6834a0b45ba20233da6b6b9372006d0 SHA256 294b928c98099a3821e32db06d13cb8d6fd68ebf36bad72f89e58a4ca5a03fcf
 EBUILD bind-9.6.2_p2.ebuild 10460 RMD160 0d36479c453bcde968c980bbcae2a5bf9bea29dd SHA1 5bdf5d1a1f20bd8a61927136a83f028a7aedffb6 SHA256 03d6dd0b671df679299f188c9d5c79dd23c6757d926deb88e23c095aef736c5e
-EBUILD bind-9.7.1_p2-r1.ebuild 10983 RMD160 60d8a199640e56281f98c6aba0a3c2a2adf35881 SHA1 721f14291de4e94e51dcf6941852ebddbc71e8c8 SHA256 b968a30fff23fd769ab2608f76263851400338a159df261f22a7bf8dc338a686
+EBUILD bind-9.7.1_p2-r2.ebuild 10979 RMD160 d608d2f7acb42cf3c0ce6e1e3e2d4628fd67eb76 SHA1 a429923535eb401e957b7a48a8f919974bbbc474 SHA256 1739e216e4a32c9c22a913eb8c1447cf6d0641f2166510a9700a01b6b0f84f94
 EBUILD bind-9.7.1_p2.ebuild 10548 RMD160 59755418ef1dacfc2fa4548f5723b62dd08b2e1d SHA1 18cd6e4b132beaf9e0db1c5db7b394eb0a01f11e SHA256 2ba35b0f43f9e953c5b6f87faa2ecec16091ece156d56978e860b2f76b1f274c
-EBUILD bind-9.7.2_p2.ebuild 10976 RMD160 dd563a337a1d2519cde94d599b1c0f88896e48ac SHA1 a6d76c96fa64c9d9c457e32e297428aa82afcb6d SHA256 f797f9932c3a37df4fbb48fde45c924d03a11287493bca050a95fe1664e4407f
-MISC ChangeLog 49948 RMD160 bcb55445a728bb9836f42acb6e940d112e2d8c2d SHA1 d6e54d55bf187f4bcaad6c841ef9654b4f9191c3 SHA256 f9755e61a2db401bffec2c600cfe164828e30d9cd23952038537defa9e377fe1
+EBUILD bind-9.7.2_p2-r1.ebuild 10979 RMD160 ee0326a8b00b5b3a9b899bd35ae0861f57f315e8 SHA1 1a9f26a4a16c843f7c2beeff1ac5c2cd4483bda8 SHA256 c1bd1b0c23dc0bc9d785672061ae128602407618e4ae6a24a42290afc77ae3af
+MISC ChangeLog 50415 RMD160 64badea2950b1a194da4e4cae93ab188ef1366e6 SHA1 7bcfed27af084f44a76c1b837bd6b4adea190e6d SHA256 feec567bba6b7959ec85bfa9ee92a60cfa641a485d58d42cd7962c818e8ef02f
 MISC metadata.xml 788 RMD160 bf52f4f66dbf21e131ef2e8f3d4066cc61ba5aee SHA1 30c5619a8831a452fe6881e46f0082fdca6f1664 SHA256 a698cbceada96d79667f8eb109f1ea14ab0fd0590276c8eab1d2abc2f28ab438
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMvINGAAoJEMOx0zmdw4Z1F3EH/0aEQE57gszrUyZZE/Fz2TRu
-yJnAuBgy6QUSQxJr4QFJ/f/2ZiAG1ex2Eque250G18tVPVl8g7ajIx/WyiRYc2Iw
-8bVFOBnL9jvbmmgg8HT9ctkNz0XsYiNoRiUGxQ/MmtRK7xRi42sB5+KVLX97xCEf
-9gZ3OslmyQogfeVU8qF5jQg2U7nKYALAuZJsO/Y8jOhGftPaZ4+T9uTghozdPpn0
-ZD+pJZiSGaxc9t+KOWELnhARg/fD5/pTn+1KIe4VDHQo1HrffWPBUX7qIWfFgucQ
-BSbcdr8muox8VN78NgUln0Ule536X/lf7zbba6k9PVbrCBJ9QzVk9mvBCMhG6f0=
-=9Iec
+iQEcBAEBAgAGBQJMxJtbAAoJEMOx0zmdw4Z15PMIALFUIm1SbdbxxH8G0sj+TZx2
+/jeYYwXLXOURzOZPfpllz0avZFUOSX8/g4k8vmd1+3F4gHYLKTsuP8htW6kz4HU0
+aarSF6mo4W5JQaLhIMa4nxYHR1aIMBXXSqnGSHm1vePY3JnQEKXzRQOO125ljNsq
+xq1BiIelF22uFA5ETvULhU2LhStz1Nbtc1RgIZNNkO0AbCtC1ihefibJ0M4rpAmg
+S4gX0RuIyFiflcCmJTpPPs/+dq0wNQ8YkGChuXiSIlgWIW8goYakxEaVkm1VFn9q
+Q6RQkrfec/hBaMQZ4C/GnYaoDEbFPSb+Q5t2Q06c6a8BEZkR8M8GSYuIpqhm/Jo=
+=Z+5H
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.4.3_p5-r1.ebuild b/net-dns/bind/bind-9.4.3_p5-r2.ebuild
index ddc6be83021c..a0bcb4d173a4 100644
--- a/net-dns/bind/bind-9.4.3_p5-r1.ebuild
+++ b/net-dns/bind/bind-9.4.3_p5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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_p5-r1.ebuild,v 1.2 2010/09/24 15:32:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.3_p5-r2.ebuild,v 1.1 2010/10/24 20:47:16 idl0r Exp $
 
 EAPI="3"
 
diff --git a/net-dns/bind/bind-9.6.2_p2-r2.ebuild b/net-dns/bind/bind-9.6.2_p2-r2.ebuild
new file mode 100644
index 000000000000..7651e2d3fb59
--- /dev/null
+++ b/net-dns/bind/bind-9.6.2_p2-r2.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2-r2.ebuild,v 1.1 2010/10/24 20:47:16 idl0r Exp $
+
+EAPI="3"
+
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+MY_PV="${PV/_p/-P}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0"
+
+GEOIP_PV=1.3
+GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
+GEOIP_P="bind-geoip-${GEOIP_PV}"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+	geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_P}-readme.txt
+			 ${GEOIP_SRC_URI_BASE}/files/${GEOIP_P}.patch )"
+#	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.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
+	resolvconf urandom xml geoip gssapi" # 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? ( dev-db/postgresql-base )
+	threads? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( >=dev-libs/geoip-1.4.6 )
+	gssapi? ( virtual/krb5 )"
+#	sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	resolvconf? ( net-dns/openresolv )
+	sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use threads && {
+		ewarn
+		ewarn "If you're in vserver enviroment, you're probably want to"
+		ewarn "disable threads support because of linux capabilities dependency"
+		ewarn
+	}
+
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	# bug 278364 (workaround)
+	epatch "${FILESDIR}/${PN}-9.6.1-parallel.patch"
+
+	# 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}" || die "sed failed, ${i} doesn't exist"
+	done
+
+	if use dlz; then
+		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/)
+		if use mysql && has_version ">=dev-db/mysql-5"; then
+			epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+		fi
+
+		if use ldap; then
+			# bug 238681
+			epatch "${FILESDIR}/bind-9.6.1-dlz-patch-ldap-url.patch" \
+				"${FILESDIR}/bind-9.6.1-dlz-patch-dollar2.patch"
+		fi
+	fi
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
+
+	# sdb-ldap patch as per  bug #160567
+	# Upstream URL: http://bind9-ldap.bayour.com/
+	# FIXME: bug 302735
+#	use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+
+	if use geoip; then
+		cp "${DISTDIR}"/${GEOIP_P}.patch "${S}" || die
+		sed -i -e 's/-RELEASEVER=3/-RELEASEVER=2/' \
+			-e 's/+RELEASEVER=3-geoip-1.3/+RELEASEVER=2-geoip-1.3/' \
+			${GEOIP_P}.patch || die
+		epatch ${GEOIP_P}.patch
+	fi
+
+	# bug #220361
+	rm {aclocal,libtool}.m4
+	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
+
+	# remove useless c++ checks
+	epunt_cxx
+}
+
+src_configure() {
+	local myconf=""
+
+	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
+			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"
+		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
+
+	use geoip && myconf="${myconf} --with-geoip"
+
+	# bug #158664
+	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		$(use_with ssl openssl) \
+		$(use_with idn) \
+		$(use_enable ipv6) \
+		$(use_with xml libxml2) \
+		$(use_with gssapi) \
+		${myconf}
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc CHANGES FAQ KNOWN-DEFECTS README
+
+	if use idn; then
+		dodoc README.idnkit || die
+	fi
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf || die
+
+		docinto misc
+		dodoc doc/misc/* || die
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dohtml -r doc/arm/* || die
+
+		docinto	draft
+		dodoc doc/draft/* || die
+
+		docinto rfc
+		dodoc doc/rfc/* || die
+
+		docinto contrib
+		dodoc contrib/named-bootconf/named-bootconf.sh \
+			contrib/nanny/nanny.pl || die
+
+		# some handy-dandy dynamic dns examples
+		cd "${D}"/usr/share/doc/${PF}
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+	fi
+
+	use geoip && dodoc "${DISTDIR}"/${GEOIP_P}-readme.txt
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r4 named.conf || die
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	doins "${FILESDIR}"/named.cache || die
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/127.zone-r1 127.zone || die
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die
+
+	newinitd "${FILESDIR}"/named.init-r8 named || die
+	newconfd "${FILESDIR}"/named.confd-r4 named || die
+
+	newenvd "${FILESDIR}"/10bind.env 10bind || die
+
+	# 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,host,nslookup}.1*
+	rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8*
+	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+	rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+
+	dosym /var/bind/named.cache /var/bind/root.cache || die
+	dosym /var/bind/pri /etc/bind/pri || die
+	dosym /var/bind/sec /etc/bind/sec || die
+	keepdir /var/bind/sec
+
+	dodir /var/{run,log}/named || die
+
+	fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri}
+	fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/named.conf
+	fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/named.conf
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/{run,log}/named /var/bind/{,sec}
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		chown root:named /etc/bind/rndc.key
+		chmod 0640 /etc/bind/rndc.key
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+
+	ewarn
+	ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
+	ewarn "you may need to fix your named.conf!"
+	ewarn
+	ewarn "NOTE: If you upgrade from <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
+	ewarn "To fix the permissions do:"
+	ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri}"
+	ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+	ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+	ewarn "chmod 0750 /etc/bind /var/bind/pri"
+	ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec}"
+	ewarn
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT}
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/{run,log}}
+	mkdir -m 0750 -p ${CHROOT}/etc/bind
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named}
+	chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind
+
+	cp /etc/localtime ${CHROOT}/etc/localtime
+
+	mknod ${CHROOT}/dev/null c 1 3
+	chmod 0666 ${CHROOT}/dev/null
+
+	mknod ${CHROOT}/dev/zero c 1 5
+	chmod 0666 ${CHROOT}/dev/zero
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9
+		chmod 0666 ${CHROOT}/dev/urandom
+	else
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 0666 ${CHROOT}/dev/random
+	fi
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/
+		cp -a /var/bind ${CHROOT}/var/
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/bind-9.7.2_p2.ebuild b/net-dns/bind/bind-9.7.1_p2-r2.ebuild
index 23186ead39d0..6e7af0889abb 100644
--- a/net-dns/bind/bind-9.7.2_p2.ebuild
+++ b/net-dns/bind/bind-9.7.1_p2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.2_p2.ebuild,v 1.1 2010/10/05 10:43:52 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.1_p2-r2.ebuild,v 1.1 2010/10/24 20:47:16 idl0r Exp $
 
 EAPI="3"
 
diff --git a/net-dns/bind/bind-9.7.1_p2-r1.ebuild b/net-dns/bind/bind-9.7.2_p2-r1.ebuild
index 31392f740194..53c3419a7483 100644
--- a/net-dns/bind/bind-9.7.1_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.7.2_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.1_p2-r1.ebuild,v 1.2 2010/09/24 15:32:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.2_p2-r1.ebuild,v 1.1 2010/10/24 20:47:16 idl0r Exp $
 
 EAPI="3"
 
diff --git a/net-dns/bind/files/named.confd-r4 b/net-dns/bind/files/named.confd-r4
index 6fdb00e238d0..633977a90c47 100644
--- a/net-dns/bind/files/named.confd-r4
+++ b/net-dns/bind/files/named.confd-r4
@@ -1,6 +1,6 @@
 # Set various named options here.
 #
-OPTIONS=""
+#OPTIONS=""
 
 # Set this to the number of processors you want bind to use.
 # Leave this unchanged if you want bind to automatically detect the number
@@ -21,7 +21,7 @@ OPTIONS=""
 # RNDC needs to be told what server we're using sometimes.
 #SERVER="-s 127.0.0.1"
 # rndc key to use
-RNDC_KEY="${CHROOT}/etc/bind/rndc.key"
+#RNDC_KEY="${CHROOT}/etc/bind/rndc.key"
 
 # Default pid file location
 PIDFILE="${CHROOT}/var/run/named/named.pid"
diff --git a/net-dns/bind/files/named.init-r8 b/net-dns/bind/files/named.init-r8
index 9af3b2ffcabd..954107b9b72b 100644
--- a/net-dns/bind/files/named.init-r8
+++ b/net-dns/bind/files/named.init-r8
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r8,v 1.2 2010/10/18 17:26:25 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r8,v 1.3 2010/10/24 20:47:17 idl0r Exp $
 
 opts="start stop reload restart"
 
@@ -173,7 +173,8 @@ reload() {
 		rndc $SERVER -k $RNDC_KEY reload 1>/dev/null
 		ret=$?
 	elif [ -n "${PIDFILE}" ]; then
-		start-stop-daemon --pidfile $PIDFILE --signal HUP
+		# FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed... finally...
+		start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/sbin/named
 		ret=$?
 	else
 		ewarn "Neither an rndc key has been specified nor a pidfile... this is"