6 files changed, 44 insertions, 4 deletions
diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index c6a6561b312d..d85494292da2 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.130 2009/07/19 18:40:15 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.131 2009/07/26 14:59:01 idl0r Exp $
+
+  26 Jul 2009; Christian Ruppert <idl0r@gentoo.org> bind-tools-9.6.1.ebuild,
+  +files/bind-tools-9.6.1-parallel.patch:
+  Add parallel-build patch, bug 278364 (only a workaround).
 
 *bind-tools-9.6.1 (19 Jul 2009)
 
diff --git a/net-dns/bind-tools/bind-tools-9.6.1.ebuild b/net-dns/bind-tools/bind-tools-9.6.1.ebuild
index c8fb5f1b4e29..7f63f5517796 100644
--- a/net-dns/bind-tools/bind-tools-9.6.1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.6.1.ebuild,v 1.1 2009/07/19 18:40:15 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.6.1.ebuild,v 1.2 2009/07/26 14:59:01 idl0r Exp $
 
 inherit eutils
 
@@ -39,6 +39,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
 
+	# bug 278364 (workaround)
+	epatch "${FILESDIR}/${P}-parallel.patch"
+
 	# bug #151839
 	sed -i -e \
 		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
diff --git a/net-dns/bind-tools/files/bind-tools-9.6.1-parallel.patch b/net-dns/bind-tools/files/bind-tools-9.6.1-parallel.patch
new file mode 100644
index 000000000000..b1da99d9a805
--- /dev/null
+++ b/net-dns/bind-tools/files/bind-tools-9.6.1-parallel.patch
@@ -0,0 +1,13 @@
+--- bind-9.6.1/lib/isc/Makefile.in.orig	2009-02-16 02:02:58.000000000 +0100
++++ bind-9.6.1/lib/isc/Makefile.in	2009-07-22 01:07:13.000000000 +0200
+@@ -80,6 +80,10 @@
+ 
+ LIBS =		@LIBS@
+ 
++# Note: the order of SUBDIRS is important.
++# Attempt to disable parallel processing.
++.NOTPARALLEL:
++.NO_PARALLEL:
+ SUBDIRS =	include unix nls @ISC_THREAD_DIR@ @ISC_ARCH_DIR@
+ TARGETS =	timestamp
+ 
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index c5e80ce93964..9707ab3a5ed5 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.232 2009/07/19 19:57:22 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.233 2009/07/26 15:02:59 idl0r Exp $
+
+  26 Jul 2009; Christian Ruppert <idl0r@gentoo.org> bind-9.6.1.ebuild,
+  +files/bind-9.6.1-parallel.patch:
+  Add parallel-build patch, bug 278364 (only a workaround).
 
 *bind-9.6.1 (19 Jul 2009)
 
diff --git a/net-dns/bind/bind-9.6.1.ebuild b/net-dns/bind/bind-9.6.1.ebuild
index ccce54d7c74d..8efee0c5a12f 100644
--- a/net-dns/bind/bind-9.6.1.ebuild
+++ b/net-dns/bind/bind-9.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.1.ebuild,v 1.1 2009/07/19 19:57:22 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.1.ebuild,v 1.2 2009/07/26 15:02:59 idl0r Exp $
 
 EAPI="2"
 
@@ -53,6 +53,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug 278364 (workaround)
+	epatch "${FILESDIR}/${P}-parallel.patch"
+
 	# Adjusting PATHs in manpages
 	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
 		sed -i \
diff --git a/net-dns/bind/files/bind-9.6.1-parallel.patch b/net-dns/bind/files/bind-9.6.1-parallel.patch
new file mode 100644
index 000000000000..b1da99d9a805
--- /dev/null
+++ b/net-dns/bind/files/bind-9.6.1-parallel.patch
@@ -0,0 +1,13 @@
+--- bind-9.6.1/lib/isc/Makefile.in.orig	2009-02-16 02:02:58.000000000 +0100
++++ bind-9.6.1/lib/isc/Makefile.in	2009-07-22 01:07:13.000000000 +0200
+@@ -80,6 +80,10 @@
+ 
+ LIBS =		@LIBS@
+ 
++# Note: the order of SUBDIRS is important.
++# Attempt to disable parallel processing.
++.NOTPARALLEL:
++.NO_PARALLEL:
+ SUBDIRS =	include unix nls @ISC_THREAD_DIR@ @ISC_ARCH_DIR@
+ TARGETS =	timestamp
+