Fix parallel builds #87247

Package-Manager: portage-2.0.51.20-r5

4 files changed, 51 insertions, 40 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index df0fe903f5ea..aae49de41029 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.67 2005/06/27 21:11:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.68 2005/06/27 21:54:54 agriffis Exp $
+
+  27 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/bash-3.0-parallel.patch, bash-3.0-r11.ebuild:
+  Fix parallel builds #87247
 
   09 Jun 2005; Mike Frysinger <vapier@gentoo.org> bash-3.0-r11.ebuild:
   Stabilize for all arches.
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 33e1980f982c..763e07952144 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,47 +1,38 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a4df32e089db48d7c99fd6be36368475 bash-2.05b-r9.ebuild 3516
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 da9f095641a223a8bcbaa27aae9d0f1c ChangeLog 14001
 MD5 3da49e27281cbe16582393239ba5b29b bash-2.05b-r11.ebuild 3715
-MD5 9b1c7560b709859229e06dabe8d4f622 bash-3.0-r11.ebuild 5070
-MD5 46c2816ee5909e997477063cdc050620 files/bash-3.0-manpage.patch 533
-MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
-MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
-MD5 c8362f29e2f8e6cdfd3306c7bcce0439 files/bash-3.0-pwd.patch 583
+MD5 27a795f52631ec69ef83b28d72e449dc bash-3.0-r11.ebuild 5143
+MD5 ca7ee8a43aeb061e45ceb0b826622a20 ChangeLog 14136
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
+MD5 edac0c7e2accd7f60d64d6361913db6e files/bash-3.0-darwin-conn.patch 983
+MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
+MD5 b86b65863c2ae21b59d8201c2a3a9e91 files/bash-3.0-trap-fg-signals.patch 641
+MD5 da9995bff4b3377fe028f3ef95427cd1 files/dot-bash_profile 308
 MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 4af330b479f27337b6e77fff11d6c468 files/bash_logout 132
+MD5 00cd6ee276de4810e2209dc426b133e4 files/bash-3.0-ulimit.patch 2659
+MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
+MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
 MD5 b3345c5274b7b08ce50dc5ec0aa11197 files/bash-3.0-read-e-segfault.patch 825
-MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
+MD5 46c2816ee5909e997477063cdc050620 files/bash-3.0-manpage.patch 533
 MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
-MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
-MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
-MD5 0387efe97e963a932d870b8f61c5b864 files/dot-bash_logout 240
-MD5 b802ce25d76787d8c9b4484ca66b17be files/bash-3.0-bash-logger.patch 2197
-MD5 edac0c7e2accd7f60d64d6361913db6e files/bash-3.0-darwin-conn.patch 983
-MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
-MD5 a2845a2a194bba75c1875f4a1ad49344 files/bash30-014 698
-MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
-MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
 MD5 3a15c63dcc58cecd09b00ae08524322c files/bashrc 1627
-MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
-MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
-MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
-MD5 b3df3a162a43845cf9f107de9ea6ac27 files/dot-bashrc 1306
-MD5 00cd6ee276de4810e2209dc426b133e4 files/bash-3.0-ulimit.patch 2659
+MD5 c8362f29e2f8e6cdfd3306c7bcce0439 files/bash-3.0-pwd.patch 583
+MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
 MD5 ccc195288edb06eb44f4d5e2a9c1da62 files/bash-3.0-crash.patch 1191
+MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
+MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
+MD5 3b706b4e822e0480f1ba098db4b292f6 files/bash-3.0-parallel.patch 378
+MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
+MD5 b802ce25d76787d8c9b4484ca66b17be files/bash-3.0-bash-logger.patch 2197
+MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
+MD5 eea55a33e84dc42b1683592dc8113400 files/bash-3.0-afs.patch 428
+MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
-MD5 b86b65863c2ae21b59d8201c2a3a9e91 files/bash-3.0-trap-fg-signals.patch 641
-MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
-MD5 4af330b479f27337b6e77fff11d6c468 files/bash_logout 132
-MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
+MD5 a2845a2a194bba75c1875f4a1ad49344 files/bash30-014 698
+MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
+MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
 MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
-MD5 da9995bff4b3377fe028f3ef95427cd1 files/dot-bash_profile 308
-MD5 eea55a33e84dc42b1683592dc8113400 files/bash-3.0-afs.patch 428
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCwGufBXaUFmZvwyMRApcgAKCM/YuwXLxi0e7JGlfQq4Ykdluu1wCgrvc6
-929HRPy1WM+w2FgZN1QflNM=
-=vfjU
------END PGP SIGNATURE-----
+MD5 b3df3a162a43845cf9f107de9ea6ac27 files/dot-bashrc 1306
+MD5 0387efe97e963a932d870b8f61c5b864 files/dot-bash_logout 240
+MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
diff --git a/app-shells/bash/bash-3.0-r11.ebuild b/app-shells/bash/bash-3.0-r11.ebuild
index 9b09ba5be058..236991e8c3a4 100644
--- a/app-shells/bash/bash-3.0-r11.ebuild
+++ b/app-shells/bash/bash-3.0-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r11.ebuild,v 1.7 2005/06/09 02:46:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r11.ebuild,v 1.8 2005/06/27 21:54:54 agriffis Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -85,6 +85,9 @@ src_unpack() {
 	echo '#define PGRP_PIPE 1' >> config-bot.h
 
 	sed -i 's:-lcurses:-lncurses:' configure || die "sed configure"
+
+	# Fix parallel builds #87247
+	epatch ${FILESDIR}/${P}-parallel.patch
 }
 
 src_compile() {
diff --git a/app-shells/bash/files/bash-3.0-parallel.patch b/app-shells/bash/files/bash-3.0-parallel.patch
new file mode 100644
index 000000000000..9ca82360b09d
--- /dev/null
+++ b/app-shells/bash/files/bash-3.0-parallel.patch
@@ -0,0 +1,13 @@
+--- bash-3.0/lib/readline/Makefile.in.old	2003-12-10 12:01:39.000000000 -0500
++++ bash-3.0/lib/readline/Makefile.in	2005-06-27 17:43:57.859826148 -0400
+@@ -115,7 +115,9 @@
+ 
+ ##########################################################################
+ 
+-all: libreadline.a libhistory.a
++all:
++	$(MAKE) libreadline.a
++	$(MAKE) libhistory.a
+ 
+ libreadline.a: $(OBJECTS)
+ 	$(RM) $@