Fix bug #163398.

Package-Manager: portage-2.1.2-r2

4 files changed, 25 insertions, 16 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 91739119c4f6..a13dd0d0eadb 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.87 2007/01/16 19:53:49 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.88 2007/01/23 18:00:04 hansmi Exp $
+
+*djbdns-1.05-r21 (23 Jan 2007)
+
+  23 Jan 2007; Michael Hanselmann <hansmi@gentoo.org>
+  -djbdns-1.05-r20.ebuild, +djbdns-1.05-r21.ebuild:
+  Fix bug #163398.
 
 *djbdns-1.05-r20 (16 Jan 2007)
 
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index aaa2b49532f7..0dbd925e6afc 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -54,14 +54,14 @@ EBUILD djbdns-1.05-r19.ebuild 5594 RMD160 443c4b38f34fa83aa304d179b0b5fd91432ff5
 MD5 416d48337725c727222e062b61ebab10 djbdns-1.05-r19.ebuild 5594
 RMD160 443c4b38f34fa83aa304d179b0b5fd91432ff517 djbdns-1.05-r19.ebuild 5594
 SHA256 76ee67fe191cca9b483ce910d2714fa6271e3863b4791b14b1130cb4ea3e7669 djbdns-1.05-r19.ebuild 5594
-EBUILD djbdns-1.05-r20.ebuild 3310 RMD160 b59327367080d39d0399d415ab5d1aeb2b664507 SHA1 a87d3865c876ac7450de7d0c79e80e8b76a26ea2 SHA256 3fc44c5aecfe8d7835bf8f3ecf870e5ff3f3fdf9b214456349d0770894c29e90
-MD5 0dc616d9dd5c4e64330c0e639bc90454 djbdns-1.05-r20.ebuild 3310
-RMD160 b59327367080d39d0399d415ab5d1aeb2b664507 djbdns-1.05-r20.ebuild 3310
-SHA256 3fc44c5aecfe8d7835bf8f3ecf870e5ff3f3fdf9b214456349d0770894c29e90 djbdns-1.05-r20.ebuild 3310
-MISC ChangeLog 14801 RMD160 f3dc9b715c4b01c00b090313fcd6156f7d8f4515 SHA1 d1e5e0d0110423c984fdacb3e6257662924236d5 SHA256 7f3722df418f12e5de69eaed592ce90310fa435f787c2e2ac7c2321c6b40e2ce
-MD5 b41112798e25b0d2c2ce8669bc3a5ea9 ChangeLog 14801
-RMD160 f3dc9b715c4b01c00b090313fcd6156f7d8f4515 ChangeLog 14801
-SHA256 7f3722df418f12e5de69eaed592ce90310fa435f787c2e2ac7c2321c6b40e2ce ChangeLog 14801
+EBUILD djbdns-1.05-r21.ebuild 3317 RMD160 83b63cddbf9bf65af65a5c7f1045de3adc2de803 SHA1 f3fde32628dd8fc6e8e9a11ccd452100272dc432 SHA256 4bd0a6b3b6738f972d78c2269a9f77e32fa852f16fc86ba6a10fd576ef7ba8f5
+MD5 5ac471142d73f72fe3ad22d9e7416690 djbdns-1.05-r21.ebuild 3317
+RMD160 83b63cddbf9bf65af65a5c7f1045de3adc2de803 djbdns-1.05-r21.ebuild 3317
+SHA256 4bd0a6b3b6738f972d78c2269a9f77e32fa852f16fc86ba6a10fd576ef7ba8f5 djbdns-1.05-r21.ebuild 3317
+MISC ChangeLog 14959 RMD160 98a9629aec88a4fd3ad84e7adbe76e6f32c0c05f SHA1 b5eec15b07b8befa061168aafa4f230d5605996d SHA256 27a5941cddd8d67c24497aeb77df04a653918e8b4c81285bcdb407fcaeba6d10
+MD5 290aab96b037af971dcc4df89662cc3c ChangeLog 14959
+RMD160 98a9629aec88a4fd3ad84e7adbe76e6f32c0c05f ChangeLog 14959
+SHA256 27a5941cddd8d67c24497aeb77df04a653918e8b4c81285bcdb407fcaeba6d10 ChangeLog 14959
 MISC metadata.xml 254 RMD160 e81ca3ce54d13af0e64f9667b84832764b9d6cb7 SHA1 2e282dc077a0668723c3985a957325baaab313dd SHA256 9fed9bb1854d7d47ee1f1d7719bd888fefc543ab0549b05a81f7b9edd28840b5
 MD5 126c0768ab916bb5855092f1b55413ab metadata.xml 254
 RMD160 e81ca3ce54d13af0e64f9667b84832764b9d6cb7 metadata.xml 254
@@ -72,6 +72,6 @@ SHA256 483bd5f138de646c5a78c0141866a67ca3ab4148c1e1771184c4cd213f3888b5 files/di
 MD5 691159b56c8f6f70d375d573f660d6a5 files/digest-djbdns-1.05-r19 3096
 RMD160 8be66e99bc0f2433f3ab2f48fe8fa31845b3cc8e files/digest-djbdns-1.05-r19 3096
 SHA256 bcc41e62176433742c77cce88684f3f0ab81a3a44d33b623a57bfab2cb74108c files/digest-djbdns-1.05-r19 3096
-MD5 1b40ae55380076100a39bf70b4a6d9d3 files/digest-djbdns-1.05-r20 491
-RMD160 513cba78a22f9bd7adf69f8f2973250c5dd7cfc5 files/digest-djbdns-1.05-r20 491
-SHA256 6ba2d8757c899a53ec59ecc5be806ea5e8d1959b1d6ed55716ebaf9f28528df4 files/digest-djbdns-1.05-r20 491
+MD5 1b40ae55380076100a39bf70b4a6d9d3 files/digest-djbdns-1.05-r21 491
+RMD160 513cba78a22f9bd7adf69f8f2973250c5dd7cfc5 files/digest-djbdns-1.05-r21 491
+SHA256 6ba2d8757c899a53ec59ecc5be806ea5e8d1959b1d6ed55716ebaf9f28528df4 files/digest-djbdns-1.05-r21 491
diff --git a/net-dns/djbdns/djbdns-1.05-r20.ebuild b/net-dns/djbdns/djbdns-1.05-r21.ebuild
index 52cebd095353..39694a3892a5 100644
--- a/net-dns/djbdns/djbdns-1.05-r20.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r21.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/djbdns/djbdns-1.05-r20.ebuild,v 1.1 2007/01/16 19:53:49 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r21.ebuild,v 1.1 2007/01/23 18:00:04 hansmi Exp $
 
 IUSE="doc ipv6 selinux static"
 
@@ -63,7 +63,12 @@ src_unpack() {
 		ewarn "this feature. You're on your own from now!"
 		echo
 		ebeep
-		epatch "${DJBDNS_PATCH_DIR}/"*
+
+		cd "${S}" && epatch "${DJBDNS_PATCH_DIR}/"*
+
+		if use ipv6; then
+			cd "${S}-noipv6" && epatch "${DJBDNS_PATCH_DIR}/"*
+		fi
 	fi
 }
 
@@ -101,8 +106,6 @@ src_install() {
 	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 
 	dobin "${FILESDIR}/dnscache-setup"
-	use fwdzone && cd "${D}${DESTTREE}/bin" && \
-		epatch "${FILESDIR}/fwdzone-fix.patch"
 	dobin "${FILESDIR}/tinydns-setup"
 	newbin "${FILESDIR}/djbdns-setup-${PR}" djbdns-setup
 }
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r20 b/net-dns/djbdns/files/digest-djbdns-1.05-r21
index eab66fda236f..eab66fda236f 100644
--- a/net-dns/djbdns/files/digest-djbdns-1.05-r20
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r21