net-dns/djbdns: Remove -j1 workaround. No longer seems necessary.

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

3 files changed, 24 insertions, 19 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 026bf4a86abc..4fa200d33ad7 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.122 2011/04/04 16:57:45 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.123 2011/04/04 18:58:49 c1pher Exp $
+
+  04 Apr 2011; Dane Smith <c1pher@gentoo.org> djbdns-1.05-r24.ebuild:
+  Remove parallel compilation workaround. Seems to be fixed upstream.
 
   04 Apr 2011; Dane Smith <c1pher@gentoo.org> djbdns-1.05-r24.ebuild:
   Moved enewuser calls to pkg_preinstall wrt bug 361923. Thanks Michael.
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index b3f9b269d7c7..b3846202f957 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -18,23 +18,23 @@ AUX tinydns-setup 3206 RMD160 16679596e3902c8eda4c9605b0fef6e778cdee63 SHA1 e222
 DIST djbdns-1.05-test23.diff.bz2 18480 RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 SHA1 34251597d211ff00791cb6546e8ef60d75ce5477 SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
 DIST djbdns-1.05.tar.gz 85648 RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed SHA1 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48
 EBUILD djbdns-1.05-r23.ebuild 3684 RMD160 74a29155bc31f39a9b16d39c6711b585bef06601 SHA1 f5b2e17144d3c03a2845c9bc69eb6c1e5b8f830d SHA256 fe946870ccc68646c51783d040f5f985660764b53f71ab320df46f12a5c48cae
-EBUILD djbdns-1.05-r24.ebuild 3786 RMD160 9207923e0715cdedaaded7ad096e96e5577bf002 SHA1 7ec2f803b00399026fa80f1eb8f7cd74ea84630e SHA256 91d6d4e124a11d17483a5bb591169c2a0ce94544053199eac8ee5f5361ba95ab
-MISC ChangeLog 19416 RMD160 f4e3aba04820c36d2c2b0fa08a36f625fd0c8079 SHA1 4ae6d5f88f85766880105070e0bf1723530903d3 SHA256 778c249fc2468209027434db6153d03df47b8b1d0ec1ed6eb11bb070b391509f
+EBUILD djbdns-1.05-r24.ebuild 3856 RMD160 c93f9d134fa88608cbb0256f32389b320b1dd120 SHA1 6895a63a5627912a4ee30c70e296141e83ece57b SHA256 cc2b95d305f72e1b29dfa6e368b40be880d7eb5e1eeb85bb4998ca66b286d162
+MISC ChangeLog 19557 RMD160 7183a3afc68c313d649d5701b894aec5cbda8ef7 SHA1 ca20bdf81350460b7713bea12331a217c7afe977 SHA256 1de23c91e155ca9c16283b4fbdf62c8b2d84dab66940b10f791d6e2f0da6b905
 MISC metadata.xml 399 RMD160 e428c6bbe8fa476817cdc8f00bbcd5990a9d645d SHA1 2215e63ddcac55ff5f449ffd4fa5f0389befb9a3 SHA256 99568cce63f5dacde89fab8b8c4c4c06699844d885dfb00943fb2a8fa2b16adc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNmffcAAoJEEsurZwMLhUxgHEP/0FWB1tLdjaraNkUqXpWeW6T
-kOpUQAsXKox3J8skjlxNOvhLP8uPYpDt0EiKYo+UabGnR7epHCbX2WRGl6kPoPD/
-egeIN473Z+8C4bBw/b0uMKyOf1GQ9F2PDyORHmxkdw2gKDtHbyTaanTsktZMb7b0
-U86jldBNhmjYvmIA/4PnV4qaEI9OZrikfdZrNL4qoAjHywf9QGAwVKtLgpVnIst1
-d5ndtQlZibWhN8F2Szn9+OaJeRobnWEku1/kpKRVwIDMcGgLIkG9Z7my9ZcA/XdI
-PdYJiNpJV1vGbFZppy2dAJCyDvNC/T44Lrvkzn9fD+nK3dodVJcKI1kGVs+docQF
-aVxKzAsWWZ+7P9Ep0VSNJj3xmrofZFL2fitDDHeYEyg6AIjyQAs2X5cyct7koGzZ
-R4c9cYXd0rD0hY3r+PipkhdMLqeOnhR5WyFOOpRiVw8wOqdlkZsHbqNoUM6zZGre
-bgL2oUj0XLDrAxprJPX0e7WqiUe5XmdW/aQWqNcXrkm0NfEnwCd/KVEUSIQ+j9+t
-sFxrO54vIfQk+DZLuU3PSuedfs7+zQy+0R7OD5MXSXf3VYsYSntstSndAo1kNtR2
-Rc6cq9ayJOa8JsvoI7njK7E86MrkLRiGxZGs5//KIdbHH42wAqcz1sgzE6iC4tzI
-N7BvcBAkdC+kug8vpic7
-=9GVh
+iQIcBAEBAgAGBQJNmhQ5AAoJEEsurZwMLhUxQ18P/jYj+xSupHsSMfArsjiWHnJX
+wES4kasCY+vpBAbOkFh035YzfGVuDmG0LkClALQDv43WCfkbXJeY6fx9/wq9LGXk
+zHecFZ9cjZHK1Xmx9yTL6isRI4mQpPeg+Ky0qEFhsYhfploawHg3Iu7JhDw6kSvE
+BXtxQj8KLMW9uX4iuy9Q30EeVv0LSvA8gv5hSwNPDLzEKI4Yzjd552bKZWMunGj3
+cVTJ8xmgpLENQFdXRFR69ik2dI+71VKO+ZiTvMoCzGCvy/EgQLcRI8+bHm+I+x+q
+kDnYf/4yB9cBXrVJTLov8NggU2fsMFLj6ylU+DxWKyv2zcb4s3+lqymrJcCmss4c
+Fywnz+uYk2klFeTkrjWhyLHg27BNScJDpMPITpfQXvh/4eFGnnIiD+G+N0ceKbOS
+UO13QqORCqqAimFNhDrBXTBjpig3VdDEQJeVF3/uhE7D5admX8Ti0osZAJZ2hF1p
+nFt7NdhNIbbSek84ZkUoeG1E4lqTYwUKApQ1eLF7g8rq1DEaSR9z72LDsMwQfKhW
+vmBLwGPY06brltOLCwjkXYda6eyLSaEGwPHpwmiZAV/KX3wRoNayaHbbqHdEOiMP
+O5TxbDQX7sVtAqPctTgRP7XU1gvn18TbA8Lixkjl8rzjsvUn7uyAOCQQ3eNhX2hS
+F5gC4ONrX9zSDPc5Jqnb
+=TFUn
 -----END PGP SIGNATURE-----
diff --git a/net-dns/djbdns/djbdns-1.05-r24.ebuild b/net-dns/djbdns/djbdns-1.05-r24.ebuild
index d594252f2d87..84bd9960cccd 100644
--- a/net-dns/djbdns/djbdns-1.05-r24.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r24.ebuild,v 1.2 2011/04/04 16:57:45 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r24.ebuild,v 1.3 2011/04/04 18:58:49 c1pher Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs
@@ -83,7 +83,8 @@ src_compile() {
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
 	echo "/usr" > conf-home
-	emake -j1 || die "emake failed"
+	#emake -j1 || die "emake failed"
+	emake || die "emake failed"
 
 	# If djbdns is compiled with IPv6 support, it breaks dnstrace.
 	# Therefore we must compile dnstrace separately without IPv6
@@ -94,7 +95,8 @@ src_compile() {
 		echo "$(tc-getCC) ${CFLAGS}" > conf-cc
 		echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
 		echo "/usr" > conf-home
-		emake -j1 dnstrace || die "emake failed"
+		#emake -j1 dnstrace || die "emake failed"
+		emake dnstrace || die "emake failed"
 	fi
 }