Add dependency fix by Peter Alfredsen for parallel builds #267613.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 33 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 1caaa459c7cf..86df5915ab2b 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.217 2009/05/17 20:59:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.218 2009/05/29 23:07:58 vapier Exp $
+
+  29 May 2009; Mike Frysinger <vapier@gentoo.org> bash-4.0_p24.ebuild,
+  +files/bash-4.0-parallel-build.patch:
+  Add dependency fix by Peter Alfredsen for parallel builds #267613.
 
 *bash-4.0_p24 (17 May 2009)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ac93490447bb..10a39bfdb7c6 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -25,6 +25,7 @@ AUX bash-4.0-bar-and-piping.patch 516 RMD160 22b09fa96906ecabcec9f3aac9c8bf2f1eb
 AUX bash-4.0-debug-trap-jobs.patch 1392 RMD160 ea7c7c48099e916d37f70a9da7c1cd2fb05f001e SHA1 ab6c3deaa913bb1d06d63f291236d07b59036de7 SHA256 ada8cc935a8c727c65e9fb1ec3865b8e0841d943a07167d0da75bc1297549c06
 AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d6267ba826b9 SHA1 8967f82ba01bcb4913f914672d456f1d4b3682d6 SHA256 97b0ee283846e6530a0f025b1fe69054229a37b00180b82fcd44dc0c3381dc8a
 AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea51e323 SHA1 8fe1b27ad67e3e3b098b7ddeb6ded35594a9b106 SHA256 771f89825fc81ff035f1b03dfe1e65b7e58a0039c005067b0c37414b84ddbf2b
+AUX bash-4.0-parallel-build.patch 874 RMD160 0a33dd9d60b0e1b5a4fbf89f8de1934c0e8e6ecb SHA1 b5c678c4d7b33ce4d1ea126350d859dfe060d8e2 SHA256 cab2cbe41768a2a4e6c34d0b00bd92ec4e598c049e3d8ee6080b27f77ce14284
 AUX bash-4.0-redisplay-sigwinch.patch 1773 RMD160 372166ca1f310e1b570a93be6135aecfc1d5e1ee SHA1 1cada57ec2124471aa6916bf63504da7179549eb SHA256 fedef04f7a06095e10af90ecb074c245526f3e34592fa8dda2d2e203cf6bc1ef
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
 AUX bashrc 2796 RMD160 7d88ed1dbe1f88c8752b2301376f4702fc178375 SHA1 783fcfd8c3273184db638f5e61da1d0921426d00 SHA256 de72a331ed65585fd70353d0d36d5d69e229b7db52c7cb97aeefd8f1b148d218
@@ -132,13 +133,13 @@ EBUILD bash-4.0_p10-r1.ebuild 5643 RMD160 9ddc369370b4ee5c7eef01fa4c65a20058c99c
 EBUILD bash-4.0_p10.ebuild 6230 RMD160 0cbd5c35482c601757ac4a73710a675fd3f6351b SHA1 b24e7f108bd10b56dc80fa6c34fc70417612b3de SHA256 8037f550138f948b83946c5d49633e84e9c17c1248834856156f4222c251d86c
 EBUILD bash-4.0_p17-r1.ebuild 5648 RMD160 c83adb9c8b3c8cd4ff2ee9b56797c992cc4e86e6 SHA1 61bd4ddefb0145d685145bd33ec2264e3fc3dce7 SHA256 6a33af89e89548c0671ec416ebe41b9cd707164c17b4bccac6779ebe36445086
 EBUILD bash-4.0_p17.ebuild 5532 RMD160 7fc209d153ffeeb0e29e1f12bbfe71748e69f5d8 SHA1 140a2ec331f365c22cc1ab0ce7b6990dd464a8af SHA256 b712cfde5fa006a7d67130db7ebe50bba4b1535163c50bbb6226d748f5eb4561
-EBUILD bash-4.0_p24.ebuild 5598 RMD160 152b649fc9e495ca347c68cc77ef03818f52801c SHA1 626dbaeccbaf34e86789706bcaba953998db0c96 SHA256 77d20bd8ba9d35a4814508e15df70b547887cb90c1fad479d415dfb487711e32
-MISC ChangeLog 35485 RMD160 5ab8f88a7aede018c8604785efca7db1632030eb SHA1 ae529ad17a45d84cb549df90880d9bdde9751324 SHA256 7f3d1bada2181561f32fba654e2ccd60180ccd9fc7bcd38333e53b5380bbe150
+EBUILD bash-4.0_p24.ebuild 5660 RMD160 efa4a9be39b74879792a39138d52fce6f7d969c2 SHA1 38d57779acf3e3f9ea77463fca422c86020f441b SHA256 bcf9a6c93480b2a54bc23d45354a0fbbbfc86854bd9413d49e188a902a08ecfe
+MISC ChangeLog 35666 RMD160 3bd4041549ebe5e77908232335666a5890e45ac3 SHA1 f18d73a387f7958ce737c4b71cbc0dae32ffeef2 SHA256 6f5c05d6fa1c46f42115e87a27a2620c86a02f763a168893baf7d6b48ee85743
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoQeroACgkQn/5bYzqsSmHKaQCfVktYN1lYc3X8UwRbD3MLdHi7
-8kkAn15ULQhGJYlmEdlpv7eDEVa4NB0K
-=VjBz
+iEYEARECAAYFAkogatQACgkQn/5bYzqsSmFYLwCdGNeqPCY/0bAU2Gy98kUeb311
+OcEAnAhgiFWb1lZpIXgZhsm7bqbV7qHL
+=KOae
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0_p24.ebuild b/app-shells/bash/bash-4.0_p24.ebuild
index bbde94e00464..0c39b1cfd862 100644
--- a/app-shells/bash/bash-4.0_p24.ebuild
+++ b/app-shells/bash/bash-4.0_p24.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/app-shells/bash/bash-4.0_p24.ebuild,v 1.1 2009/05/17 20:59:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p24.ebuild,v 1.2 2009/05/29 23:07:58 vapier Exp $
 
 EAPI="1"
 
@@ -69,6 +69,7 @@ src_unpack() {
 		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
 		epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
 		epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
+		epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
 		# Log bash commands to syslog #91327
 		if use bashlogger ; then
 			ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
diff --git a/app-shells/bash/files/bash-4.0-parallel-build.patch b/app-shells/bash/files/bash-4.0-parallel-build.patch
new file mode 100644
index 000000000000..aed92c644429
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-parallel-build.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/267613
+
+add missing dep
+
+patch by Peter Alfredsen
+
+--- bash-4.0/Makefile.in
++++ bash-4.0/Makefile.in
+@@ -1022,10 +1022,11 @@
+ subst.o: flags.h jobs.h siglist.h execute_cmd.h ${BASHINCDIR}/filecntl.h trap.h pathexp.h
+ subst.o: mailcheck.h input.h $(DEFSRC)/getopt.h $(DEFSRC)/common.h
+ subst.o: bashline.h bashhist.h ${GLOB_LIBSRC}/strmatch.h
+ subst.o: ${BASHINCDIR}/chartypes.h
+ subst.o: ${BASHINCDIR}/shmbutil.h
++subst.o: ${DEFDIR}/builtext.h
+ test.o: bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h
+ test.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
+ test.o: general.h xmalloc.h bashtypes.h variables.h arrayfunc.h conftypes.h array.h hashlib.h
+ test.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
+ test.o: make_cmd.h subst.h sig.h pathnames.h externs.h test.h