* closing bugs #151839 and #175644

Package-Manager: portage-2.1.2.9

10 files changed, 439 insertions, 29 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 163a98154153..930c932de34e 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.164 2007/05/12 23:19:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.165 2007/06/02 22:34:48 voxus Exp $
+
+*bind-9.4.1-r1 (02 Jun 2007)
+*bind-9.3.4-r3 (02 Jun 2007)
+*bind-9.2.8-r3 (02 Jun 2007)
+
+  02 Jun 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +files/named.confd-r2, +files/named.init-r5, -bind-9.2.8-r2.ebuild,
+  +bind-9.2.8-r3.ebuild, +bind-9.3.4-r3.ebuild, -bind-9.4.1.ebuild,
+  +bind-9.4.1-r1.ebuild:
+  Closing bugs #151839 and #175644.
 
   12 May 2007; Roy Marples <uberlord@gentoo.org> files/named.init-r4:
   Fix chroots for non bash shells, #178050 thanks to Pierre Guinoiseau.
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index e9582408706f..0e924a862f2b 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
 RMD160 872245707b4f72a212cda162c59495744d77a6e3 files/10bind.env 27
@@ -74,6 +77,10 @@ AUX named.confd-r1 392 RMD160 eb80118694d541aeb06df96473ca7d226adf0f6c SHA1 8a0a
 MD5 668f9697d07bbf60b2040ed0c835d7f3 files/named.confd-r1 392
 RMD160 eb80118694d541aeb06df96473ca7d226adf0f6c files/named.confd-r1 392
 SHA256 7f985999486b6cfea652b7a7470976bc703c259ef8cbc1cedc3eaacb302805a6 files/named.confd-r1 392
+AUX named.confd-r2 479 RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb SHA1 d0b0e2f5d72d43862c5aaff9a226fd8599992323 SHA256 bae05257852ecbc7f66bd30e452162f15b6f6e8c3fc170fb6dfdfa7d22361915
+MD5 1057eda0d358d8735a7e3765d83989f5 files/named.confd-r2 479
+RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb files/named.confd-r2 479
+SHA256 bae05257852ecbc7f66bd30e452162f15b6f6e8c3fc170fb6dfdfa7d22361915 files/named.confd-r2 479
 AUX named.init 1641 RMD160 8f6ff9334b258a1167ac02572391bc4c71d946d2 SHA1 1dd468ba20c1c050b428d5dedd5bb61b44fc3006 SHA256 505604e2e1ac3d7f8e5aea74e1f9fba543570809dadc4769a0de179a10637c1b
 MD5 620cf3c88d615f841884ee25bc8f8397 files/named.init 1641
 RMD160 8f6ff9334b258a1167ac02572391bc4c71d946d2 files/named.init 1641
@@ -90,6 +97,10 @@ AUX named.init-r4 1585 RMD160 30ed0f443f0ec1b63d3fd15e4d32fc79ad6199af SHA1 e600
 MD5 3bc65e1020d0e33c3425a12babada042 files/named.init-r4 1585
 RMD160 30ed0f443f0ec1b63d3fd15e4d32fc79ad6199af files/named.init-r4 1585
 SHA256 f2eb9393a7380f670af0e09bd378cf619681e33b81ed7e5c7f5b7a1b01964821 files/named.init-r4 1585
+AUX named.init-r5 1620 RMD160 37279362e437241188a07e5f274730e68645827e SHA1 00a14819a322b391183084c79cc9a4dc04d0d484 SHA256 07fb9d653f086319680d04abde0218495ed09d3528087257788bf294252a0bad
+MD5 08f352d515e2f6c41bfc9f19bbd91b4a files/named.init-r5 1620
+RMD160 37279362e437241188a07e5f274730e68645827e files/named.init-r5 1620
+SHA256 07fb9d653f086319680d04abde0218495ed09d3528087257788bf294252a0bad files/named.init-r5 1620
 AUX named.rc 1644 RMD160 ab040b05deea9b8b1b2a8a75c174be103aa9a4a9 SHA1 1d3503cb3312f68851bda57c1fd23a90af36256e SHA256 07a1b0958594e067259cfbf8b6eeb33125536e2f82f0e63c2d802943eed1bdb6
 MD5 33e3834bbd0adf80e570fc73aa5a7147 files/named.rc 1644
 RMD160 ab040b05deea9b8b1b2a8a75c174be103aa9a4a9 files/named.rc 1644
@@ -140,10 +151,10 @@ EBUILD bind-9.2.7.ebuild 8914 RMD160 871d2a4d042900b48660a98917defc0aca306fc6 SH
 MD5 379a473fb8689d5a423ebabf6c3c3a69 bind-9.2.7.ebuild 8914
 RMD160 871d2a4d042900b48660a98917defc0aca306fc6 bind-9.2.7.ebuild 8914
 SHA256 075ab269a7a4b8a50fafc32a0ab1d771dc31f6a81ad5dbc96983e551eacd5c2d bind-9.2.7.ebuild 8914
-EBUILD bind-9.2.8-r2.ebuild 8476 RMD160 80cacbc861e9509a2290fc1f63da41f4f2d846e5 SHA1 d052753f6d534586976060e8fe3f328afc1f8b3c SHA256 8cbd6c0ce590eb73126e7dac5dc621d102bf78a810dc04623507f851d2062909
-MD5 b2577b9d0fecd3f6946faa1b33f872d1 bind-9.2.8-r2.ebuild 8476
-RMD160 80cacbc861e9509a2290fc1f63da41f4f2d846e5 bind-9.2.8-r2.ebuild 8476
-SHA256 8cbd6c0ce590eb73126e7dac5dc621d102bf78a810dc04623507f851d2062909 bind-9.2.8-r2.ebuild 8476
+EBUILD bind-9.2.8-r3.ebuild 8493 RMD160 fe62f3e187eacc7eb80216513d2c7f1ee33fb527 SHA1 72ad9412f29682879131fe6ebcc1ed3e4a59166d SHA256 6740e5741c22a719e129d0a596af1dfd45332f585ea489788ebcb550197a6d41
+MD5 b6df64c2854bc77e53b85e7ca5fea5a2 bind-9.2.8-r3.ebuild 8493
+RMD160 fe62f3e187eacc7eb80216513d2c7f1ee33fb527 bind-9.2.8-r3.ebuild 8493
+SHA256 6740e5741c22a719e129d0a596af1dfd45332f585ea489788ebcb550197a6d41 bind-9.2.8-r3.ebuild 8493
 EBUILD bind-9.2.8.ebuild 8326 RMD160 5fe2c855e3270a7813b384ea6761ded0f5be2cce SHA1 26a04e1a4652a0d34a3613b7f48d7b1e4f969564 SHA256 f756e730887636f94cc97b87ec5653cd6d59fad2d5e9da33c5a982b4a9cf1be1
 MD5 5c48c1ca70080087e19e7ba985702206 bind-9.2.8.ebuild 8326
 RMD160 5fe2c855e3270a7813b384ea6761ded0f5be2cce bind-9.2.8.ebuild 8326
@@ -172,18 +183,22 @@ EBUILD bind-9.3.4-r2.ebuild 8447 RMD160 cb692d63ab8178d5cce31da082ce6e932c3566ac
 MD5 fa7e56d3b4ea0c9e4096c8191bbb2cba bind-9.3.4-r2.ebuild 8447
 RMD160 cb692d63ab8178d5cce31da082ce6e932c3566ac bind-9.3.4-r2.ebuild 8447
 SHA256 5fd19e64c06fe0cdd221174d70cadff3fdec567784c0cae45a941ae67068a720 bind-9.3.4-r2.ebuild 8447
+EBUILD bind-9.3.4-r3.ebuild 8468 RMD160 08f3bafd248521afe9961c9a6343bfc04e5e16a5 SHA1 9b6d5346b0570ba9bdc002f569162f9ab69d92b4 SHA256 d90887dcfc2505b2e319e1ee2deacaf590204709749ed29de1189fa33431e475
+MD5 53a78b38c8db15db6ba4a1c39a22cb61 bind-9.3.4-r3.ebuild 8468
+RMD160 08f3bafd248521afe9961c9a6343bfc04e5e16a5 bind-9.3.4-r3.ebuild 8468
+SHA256 d90887dcfc2505b2e319e1ee2deacaf590204709749ed29de1189fa33431e475 bind-9.3.4-r3.ebuild 8468
 EBUILD bind-9.3.4.ebuild 8298 RMD160 61c783d7411ac600837c6b9d50dffe623646b433 SHA1 ec9305b80ac8dcd55c66e34789eb5f59a93021e0 SHA256 721749020b17413479057648d5be73d6c735c2c3618492c58fbfad4f2ecbbba0
 MD5 eeaa764edbc4b1b56a90d482c7e36955 bind-9.3.4.ebuild 8298
 RMD160 61c783d7411ac600837c6b9d50dffe623646b433 bind-9.3.4.ebuild 8298
 SHA256 721749020b17413479057648d5be73d6c735c2c3618492c58fbfad4f2ecbbba0 bind-9.3.4.ebuild 8298
-EBUILD bind-9.4.1.ebuild 8353 RMD160 d8d8fffbeb2da936b6aa538352b6d85499487e63 SHA1 1f3d793f0eaa60f6bc2068d3fb4ed10b824cf5f2 SHA256 27414fa84c1a5e9423155f201d106d6d4a0a11810b509f75aa1b32ca7081d186
-MD5 6107a17c4edb2bbd934fa5e9ed1d3939 bind-9.4.1.ebuild 8353
-RMD160 d8d8fffbeb2da936b6aa538352b6d85499487e63 bind-9.4.1.ebuild 8353
-SHA256 27414fa84c1a5e9423155f201d106d6d4a0a11810b509f75aa1b32ca7081d186 bind-9.4.1.ebuild 8353
-MISC ChangeLog 27297 RMD160 64e6582587b93db2bf132e90b40ce6d063c560c4 SHA1 7dd853a16384f7a5ef4844b6fd1c599eec7d6a7b SHA256 01e7b5521629b97024d4a46e084ca4064c951e77c7aea8b40fe3c04fdcbaa674
-MD5 afa4fecb9e986ae4e481b4f97cb8cb4b ChangeLog 27297
-RMD160 64e6582587b93db2bf132e90b40ce6d063c560c4 ChangeLog 27297
-SHA256 01e7b5521629b97024d4a46e084ca4064c951e77c7aea8b40fe3c04fdcbaa674 ChangeLog 27297
+EBUILD bind-9.4.1-r1.ebuild 8374 RMD160 250ae5de571508f69e38c064145bea4bf777af87 SHA1 fd267d20be982ac1c71c8283acb4b2f96754a581 SHA256 a6348d96a386f053ef53bff329026ff6bbb44a3a5f7c4f3adda823e9aef25e1d
+MD5 2098d21f9818c421a2054f9758da3b5d bind-9.4.1-r1.ebuild 8374
+RMD160 250ae5de571508f69e38c064145bea4bf777af87 bind-9.4.1-r1.ebuild 8374
+SHA256 a6348d96a386f053ef53bff329026ff6bbb44a3a5f7c4f3adda823e9aef25e1d bind-9.4.1-r1.ebuild 8374
+MISC ChangeLog 27639 RMD160 0ae4f84357c86fd2dbe8b3c95da4f8c070810fc2 SHA1 64a86d4da77c54bd1b212dc04030e738d5fd772f SHA256 72f1b028aec2dc9fc40796a3127f2e22b3b5d6bae841ede1f01ee5b05778e42a
+MD5 e961c8a6e68fa08fa1583e6745ecb578 ChangeLog 27639
+RMD160 0ae4f84357c86fd2dbe8b3c95da4f8c070810fc2 ChangeLog 27639
+SHA256 72f1b028aec2dc9fc40796a3127f2e22b3b5d6bae841ede1f01ee5b05778e42a ChangeLog 27639
 MISC metadata.xml 352 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 SHA1 24f998969c955accd1fd4f3719bdf83d4e9d432b SHA256 f6f6ae15da16a20d5e0ce76563e3e27901e25787131b8784ffe872ffe3ddd034
 MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
 RMD160 0c1a848023a0dd76c5173c0a2135beed46e90263 metadata.xml 352
@@ -206,9 +221,9 @@ SHA256 86986d0504a6a3a9c27236ef6920ec1c66b0a4427f69b12f25b08b8b6b6d6ff6 files/di
 MD5 70279966f522410c64d88c0bb1268020 files/digest-bind-9.2.8 708
 RMD160 8ab16a0818d61f217bcddd761fb82d1060080aa4 files/digest-bind-9.2.8 708
 SHA256 a41b936338851072eac98938385c61fb38fba2d4ed53c4427ee44358d8959c39 files/digest-bind-9.2.8 708
-MD5 70279966f522410c64d88c0bb1268020 files/digest-bind-9.2.8-r2 708
-RMD160 8ab16a0818d61f217bcddd761fb82d1060080aa4 files/digest-bind-9.2.8-r2 708
-SHA256 a41b936338851072eac98938385c61fb38fba2d4ed53c4427ee44358d8959c39 files/digest-bind-9.2.8-r2 708
+MD5 70279966f522410c64d88c0bb1268020 files/digest-bind-9.2.8-r3 708
+RMD160 8ab16a0818d61f217bcddd761fb82d1060080aa4 files/digest-bind-9.2.8-r3 708
+SHA256 a41b936338851072eac98938385c61fb38fba2d4ed53c4427ee44358d8959c39 files/digest-bind-9.2.8-r3 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
@@ -230,6 +245,16 @@ SHA256 34a9746ac50c14de6bc2e6383676681b87b0dde42379e8fa8cad2fc5d56b4fd1 files/di
 MD5 e90002b0ea49566f01d00de55bab0a27 files/digest-bind-9.3.4-r2 723
 RMD160 2a25d4a9f6f7e0688054a0da4ada926df2f189dc files/digest-bind-9.3.4-r2 723
 SHA256 34a9746ac50c14de6bc2e6383676681b87b0dde42379e8fa8cad2fc5d56b4fd1 files/digest-bind-9.3.4-r2 723
-MD5 69f3c68218feaeea605687613d133f85 files/digest-bind-9.4.1 470
-RMD160 ab065b887c1e736908274e8c969fd539c42e7d8e files/digest-bind-9.4.1 470
-SHA256 590ac098601811fc3b70e03889c82888bcf8d9e0024c26b41d2edd3cc25b7144 files/digest-bind-9.4.1 470
+MD5 e90002b0ea49566f01d00de55bab0a27 files/digest-bind-9.3.4-r3 723
+RMD160 2a25d4a9f6f7e0688054a0da4ada926df2f189dc files/digest-bind-9.3.4-r3 723
+SHA256 34a9746ac50c14de6bc2e6383676681b87b0dde42379e8fa8cad2fc5d56b4fd1 files/digest-bind-9.3.4-r3 723
+MD5 69f3c68218feaeea605687613d133f85 files/digest-bind-9.4.1-r1 470
+RMD160 ab065b887c1e736908274e8c969fd539c42e7d8e files/digest-bind-9.4.1-r1 470
+SHA256 590ac098601811fc3b70e03889c82888bcf8d9e0024c26b41d2edd3cc25b7144 files/digest-bind-9.4.1-r1 470
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGYfCVbwxeDFj+ScoRAhceAKDD4MVQSRTIdNdl43nS84AP+TEqsgCcCE0y
+Ffxz3o3+OYRa1NemAdk5rQc=
+=dJsS
+-----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.2.8-r2.ebuild b/net-dns/bind/bind-9.2.8-r3.ebuild
index bf4921dfb24b..e81e9770f522 100644
--- a/net-dns/bind/bind-9.2.8-r2.ebuild
+++ b/net-dns/bind/bind-9.2.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8-r2.ebuild,v 1.4 2007/05/06 08:50:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8-r3.ebuild,v 1.1 2007/06/02 22:34:48 voxus Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -69,8 +69,8 @@ src_unpack() {
 	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
 
 	# bug #151839
-	sed \
-		-e 's:<config.h>:<config.h>\n\n#undef SO_BSDCOMPAT:' \
+	sed -e \
+		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
 		-i lib/isc/unix/socket.c
 }
 
@@ -167,8 +167,8 @@ src_install() {
 	doins ${FILESDIR}/127.zone
 	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
 
-	newinitd ${FILESDIR}/named.init-r4 named
-	newconfd ${FILESDIR}/named.confd-r1 named
+	newinitd ${FILESDIR}/named.init-r5 named
+	newconfd ${FILESDIR}/named.confd-r2 named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
 	dosym ../../var/bind/pri /etc/bind/pri
diff --git a/net-dns/bind/bind-9.3.4-r3.ebuild b/net-dns/bind/bind-9.3.4-r3.ebuild
new file mode 100644
index 000000000000..ed3479cee116
--- /dev/null
+++ b/net-dns/bind/bind-9.3.4-r3.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r3.ebuild,v 1.1 2007/06/02 22:34:48 voxus Exp $
+
+inherit eutils libtool autotools toolchain-funcs flag-o-matic
+
+DLZ_VERSION="9.3.3"
+
+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 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf"
+
+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 )
+	resolvconf? ( net-dns/resolvconf-gentoo )"
+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 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
+		epatch ${FILESDIR}/${PN}-dlzbdb-close_cursor.patch
+
+		use odbc && epatch ${FILESDIR}/${P}-missing_odbc_test.patch
+	}
+
+	# should be installed by bind-tools
+	sed -e "s:nsupdate ::g" -i ${S}/bin/Makefile.in
+
+	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
+
+	# bug #151839
+	sed -e \
+		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
+		-i lib/isc/unix/socket.c
+}
+
+src_compile() {
+	local myconf=""
+
+	use ssl && myconf="${myconf} --with-openssl"
+	use idn && myconf="${myconf} --with-idn"
+
+	use dlz && {
+		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
+		use postgres && myconf="${myconf} --with-dlz-postgres"
+		use mysql && myconf="${myconf} --with-dlz-mysql"
+		use berkdb && myconf="${myconf} --with-dlz-bdb"
+		use ldap  && myconf="${myconf} --with-dlz-ldap"
+		use odbc  && myconf="${myconf} --with-dlz-odbc"
+	}
+
+	if use threads; then
+		if use dlz && use mysql; then
+			echo
+			ewarn
+			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
+			ewarn "requires that each thread of an application execute a MySQL"
+			ewarn "\"thread initialization\" to setup the thread local storage."
+			ewarn "This is impossible to do safely while staying within the DLZ"
+			ewarn "driver API. This is a limitation caused by MySQL, and not"
+			ewarn "the DLZ API."
+			ewarn "Because of this BIND MUST only run with a single thread when"
+			ewarn "using the MySQL driver."
+			ewarn
+			myconf="${myconf} --disable-linux-caps --disable-threads"
+			ewarn "Threading support disabled"
+			epause 10
+		else
+			myconf="${myconf} --enable-linux-caps --enable-threads"
+			einfo "Threading support enabled"
+		fi
+	else
+		myconf="${myconf} --disable-linux-caps --disable-threads"
+	fi
+
+	# bug #158664
+	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		`use_enable ipv6` \
+		${myconf} || die "econf failed"
+
+	emake -j1 || die "failed to compile bind"
+}
+
+src_install() {
+	einstall || die "failed to install bind"
+
+	dodoc CHANGES COPYRIGHT FAQ README
+
+	use doc && {
+		docinto misc
+		dodoc doc/misc/*
+
+		docinto html
+		dohtml doc/arm/*
+
+		docinto	draft
+		dodoc doc/draft/*
+
+		docinto rfc
+		dodoc doc/rfc/*
+
+		docinto contrib
+		dodoc contrib/named-bootconf/named-bootconf.sh \
+			contrib/nanny/nanny.pl
+
+		# some handy-dandy dynamic dns examples
+		cd ${D}/usr/share/doc/${PF}
+		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
+	}
+
+	newenvd ${FILESDIR}/10bind.env 10bind
+
+	dodir /etc/bind /var/bind/{pri,sec}
+	keepdir /var/bind/sec
+
+	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.ca:
+	insinto /var/bind ; doins ${FILESDIR}/named.ca
+
+	insinto /var/bind/pri
+	doins ${FILESDIR}/127.zone
+	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
+
+	newinitd ${FILESDIR}/named.init-r5 named
+	newconfd ${FILESDIR}/named.confd-r2 named
+
+	dosym ../../var/bind/named.ca /var/bind/root.cache
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f ${D}/usr/share/man/man1/{dig.1,host.1,nslookup.1}
+	rm -f ${D}/usr/bin/{dig,host,nslookup}
+
+	use resolvconf && {
+		exeinto /etc/resolvconf/update.d
+		newexe ${FILESDIR}/resolvconf.bind bind
+	}
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if [ -c /dev/urandom ]; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a -u named
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a -u named
+			echo
+		fi
+	fi
+
+	install -d -o named -g named ${ROOT}/var/run/named \
+		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
+	chown -R named:named ${ROOT}/var/bind
+
+	elog "The default zone files are now installed as *.zone,"
+	elog "be careful merging config files if you have modified"
+	elog "/var/bind/pri/127 or /var/bind/pri/localhost"
+	elog
+	elog "You can edit /etc/conf.d/named to customize named settings"
+	elog
+	elog "The BIND ebuild now includes chroot support."
+	elog "If you like to run bind in chroot AND this is a new install OR"
+	elog "your bind doesn't already run in chroot, simply run:"
+	elog "\`emerge --config '=${CATEGORY}/${PF}'\`"
+	elog "Before running the above command you might want to change the chroot"
+	elog "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
+	elog
+	elog "Recently verisign added a wildcard A record to the .COM and .NET TLD"
+	elog "zones making all .com and .net domains appear to be registered"
+	elog "This causes many problems such as breaking important anti-spam checks"
+	elog "which verify source domains exist. ISC released a patch for BIND which"
+	elog "adds 'delegation-only' zones to allow admins to return the .com and .net"
+	elog "domain resolution to their normal function."
+	elog
+	elog "There is no need to create a com or net data file. Just the"
+	elog "entries to the named.conf file is enough."
+	elog
+	elog "	zone "com" IN { type delegation-only; };"
+	elog "	zone "net" IN { type delegation-only; };"
+
+	echo
+	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
+	ewarn "when it was previously optional.  If the priority is missing, BIND"
+	ewarn "won't load the zone file at all."
+	echo
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null`
+	EXISTS="no"
+
+	if [ -z "${CHROOT}" -a ! -d "/chroot/dns" ]; then
+		CHROOT="/chroot/dns"
+	elif [ -d ${CHROOT} ]; then
+		eerror; eerror "${CHROOT:-/chroot/dns} already exists. Quitting."; eerror; EXISTS="yes"
+	fi
+
+	if [ ! "$EXISTS" = yes ]; then
+		einfo ; einfon "Setting up the chroot directory..."
+		mkdir -m 700 -p ${CHROOT}
+		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
+		chown -R named:named ${CHROOT}/var/run/named
+		cp -R /etc/bind ${CHROOT}/etc/
+		cp /etc/localtime ${CHROOT}/etc/localtime
+		chown named:named ${CHROOT}/etc/bind/rndc.key
+		cp -R /var/bind ${CHROOT}/var/
+		chown -R named:named ${CHROOT}/var/
+		mknod ${CHROOT}/dev/zero c 1 5
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 666 ${CHROOT}/dev/{random,zero}
+		chown root:named ${CHROOT}
+		chmod 0750 ${CHROOT}
+
+		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
+			mv --force /etc/conf.d/named.orig /etc/conf.d/named
+		fi
+
+		sleep 1; echo " Done."; sleep 1
+		einfo
+		einfo "Add the following to your root .bashrc or .bash_profile: "
+		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
+		einfo "Then do the following: "
+		einfo "   source /root/.bashrc or .bash_profile"
+		einfo
+	fi
+}
diff --git a/net-dns/bind/bind-9.4.1.ebuild b/net-dns/bind/bind-9.4.1-r1.ebuild
index fb3b45c80fc9..4f3e7782f405 100644
--- a/net-dns/bind/bind-9.4.1.ebuild
+++ b/net-dns/bind/bind-9.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.1.ebuild,v 1.3 2007/05/11 13:17:02 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.1-r1.ebuild,v 1.1 2007/06/02 22:34:48 voxus Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -63,8 +63,8 @@ src_unpack() {
 	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf || die "eautoreconf failed"
 
 	# bug #151839
-	sed \
-		-e 's:<config.h>:<config.h>\n\n#undef SO_BSDCOMPAT:' \
+	sed -e \
+		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
 		-i lib/isc/unix/socket.c
 }
 
@@ -167,8 +167,8 @@ src_install() {
 	doins ${FILESDIR}/127.zone
 	newins ${FILESDIR}/localhost.zone-r2 localhost.zone
 
-	newinitd ${FILESDIR}/named.init-r4 named
-	newconfd ${FILESDIR}/named.confd-r1 named
+	newinitd ${FILESDIR}/named.init-r5 named
+	newconfd ${FILESDIR}/named.confd-r2 named
 
 	dosym ../../var/bind/named.ca /var/bind/root.cache
 	dosym ../../var/bind/pri /etc/bind/pri
diff --git a/net-dns/bind/files/digest-bind-9.2.8-r2 b/net-dns/bind/files/digest-bind-9.2.8-r3
index 6d73dad89748..6d73dad89748 100644
--- a/net-dns/bind/files/digest-bind-9.2.8-r2
+++ b/net-dns/bind/files/digest-bind-9.2.8-r3
diff --git a/net-dns/bind/files/digest-bind-9.3.4-r3 b/net-dns/bind/files/digest-bind-9.3.4-r3
new file mode 100644
index 000000000000..52fae07ad51b
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.3.4-r3
@@ -0,0 +1,9 @@
+MD5 df5417e7e7cf017fa28b65d0a3d6e999 bind-9.3.4.tar.gz 5405022
+RMD160 8b5fda9542f6afbe7ffb857d72f7e545237d7826 bind-9.3.4.tar.gz 5405022
+SHA256 40152026af715b15ac958f374394e5189a099b562eb913470ccc43f6fbd19c21 bind-9.3.4.tar.gz 5405022
+MD5 00419378bdf3691c7d2fe7737f25007d ctrix_dlz_9.3.3.patch.bz2 66143
+RMD160 ee3a7ef8e1b3167ff572ca8a7836a8d4d64a834d ctrix_dlz_9.3.3.patch.bz2 66143
+SHA256 6550455ba37f5f25f047078bedf825d05eab45bbc4a3d8b7bf23a716749423cf ctrix_dlz_9.3.3.patch.bz2 66143
+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.4.1 b/net-dns/bind/files/digest-bind-9.4.1-r1
index 2c4c145380ec..2c4c145380ec 100644
--- a/net-dns/bind/files/digest-bind-9.4.1
+++ b/net-dns/bind/files/digest-bind-9.4.1-r1
diff --git a/net-dns/bind/files/named.confd-r2 b/net-dns/bind/files/named.confd-r2
new file mode 100644
index 000000000000..2106938c5308
--- /dev/null
+++ b/net-dns/bind/files/named.confd-r2
@@ -0,0 +1,20 @@
+# Set various named options here.
+#
+OPTIONS=""
+
+# Set this to the number of processors you have.
+#
+CPU="1"
+
+# If you wish to run bind in a chroot, run:
+# emerge --config =<bind-version>
+# and un-comment the following line.
+# You can specify a different chroot directory but MAKE SURE it's empty.
+# CHROOT="/chroot/dns"
+
+# Default pid file location
+PIDFILE="${CHROOT}/var/run/named/named.pid"
+
+# Scheduling priority: 19 is the lowest and -20 is the highest.
+#
+NAMED_NICELEVEL="0"
diff --git a/net-dns/bind/files/named.init-r5 b/net-dns/bind/files/named.init-r5
new file mode 100755
index 000000000000..734ac5d76b36
--- /dev/null
+++ b/net-dns/bind/files/named.init-r5
@@ -0,0 +1,71 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.1 2007/06/02 22:34:48 voxus Exp $
+
+opts="start stop reload restart"
+
+depend() {
+	need net
+	use logger
+	provide dns
+}
+
+checkconfig() {
+	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
+		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
+	fi
+	
+	# In case someone doesn't have $CPU set from /etc/conf.d/named
+	if [ ! ${CPU} ] ; then
+		CPU="1"
+	fi
+
+	# as suggested in bug #107724
+	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
+		egrep -v \
+			"^([[:cntrl:] ]+(#|//|/\*)|(#|//|/\*))" \
+			${CHROOT}/etc/bind/named.conf \
+				| egrep -o -m1 "pid\-file +\".+\" *;" \
+				| cut -d\" -f2
+	)
+
+	KEY="${CHROOT}/etc/bind/rndc.key"
+}
+
+start() {
+	ebegin "Starting ${CHROOT:+chrooted }named"
+	checkconfig || return 1
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
+		--nicelevel ${NAMED_NICELEVEL:-0} \
+		--exec /usr/sbin/named \
+		-- -u named -n ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${CHROOT:+chrooted }named"
+	checkconfig || return 2
+	if [ -f $KEY ] ; then
+		rndc -k $KEY stop &>/dev/null
+	else
+		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+			--exec /usr/sbin/named -- stop
+	fi
+	eend $?
+}
+
+reload() {
+	checkconfig || return 3
+	if [ ! -f $PIDFILE ] ; then
+		/etc/init.d/named start &>/dev/null
+		exit
+	fi
+
+	if [ -f $KEY ] ; then
+		ebegin "Reloading named.conf and zone files"
+		rndc -k $KEY reload &>/dev/null
+		eend $?
+	else /etc/init.d/named restart &>/dev/null
+	fi
+}