Fix from upstream for running tests under bash-4 #263068 by Nick Fortino.

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

4 files changed, 41 insertions, 11 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index fd882a1535a8..4c42d1482754 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.132 2009/03/21 11:40:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.133 2009/03/21 11:42:54 vapier Exp $
+
+  21 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/automake-1.10.2-bash4.patch, automake-1.10.2.ebuild:
+  Fix from upstream for running tests under bash-4 #263068 by Nick Fortino.
 
   21 Mar 2009; Mike Frysinger <vapier@gentoo.org>
   +files/automake-1.7.9-libtool-2.patch, automake-1.7.9-r1.ebuild:
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 390e5286109f..5f455ac1979b 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX automake-1.10.1-tests.patch 3283 RMD160 6ddc6524fa2e26f96dabb3062fb926d4ad9a08d2 SHA1 0f2616f5fa9eca0f6caf79539809391c9de8e146 SHA256 107f073536a7104d5b25dc7ff80933c22f44f847789435f5678c01090890506b
+AUX automake-1.10.2-bash4.patch 644 RMD160 5ab94e24f620ba2817fa1d227308cf3cb5c34f5b SHA1 43d2a5bd5ac0f32c5d0cb57433263b9bdfe76a09 SHA256 c07951416ab13e34d5090892cbba5e4d0e6e351fef1ee540d11b0da88d6ea677
 AUX automake-1.4-ansi2knr-stdlib.patch 249 RMD160 f17983551ea326df6dc03f8389c02df3670eb475 SHA1 f6f23af88bde758dcc6893c01c98adb502a4c1e1 SHA256 8a29de01493b888f392388a0cffc0e4e2c0f4d81bc2ff34a4b65d27fab804210
 AUX automake-1.4-libtoolize.patch 542 RMD160 8ae18870f6b6f934b5f3d0440bb472c54f4f0bfb SHA1 90d41bbb160578142b540638a99426d9440c6c13 SHA256 1620b99a3043c66d6e6ae8a369733a1042ff5deec08ab11c727dea15032a684b
 AUX automake-1.4-nls-nuisances.patch 746 RMD160 0b791a0f27a402343c0a78cf032937bf1ecb50aa SHA1 aeaca0172c9db128f8e0784ef44341aa39189094 SHA256 aa35eb06e5aff390812e31c705976a11fbdff38a5567737f0b234a3fb00fd002
@@ -11,6 +12,7 @@ AUX automake-1.5-target_hook.patch 1132 RMD160 7f0614d273825d415ef30eff9de9c37ce
 AUX automake-1.5-test-fixes.patch 1300 RMD160 02d88482792d77972aeb5fbf1cbb207bd0d53278 SHA1 5e31b7413ed7dbc1fb61084bf0c448befed62080 SHA256 117bdb7848b0c7daf8ed6253e81de265c92f427176e703c28f9de4bdbb13c235
 AUX automake-1.6.3-test-fixes.patch 723 RMD160 f35536db686bbfd7eac9e315e3fa2e02183134a3 SHA1 a563a64f25acd30dba299a08a9deb03820a02b0b SHA256 4cfdd0646848be45106befc2652d88c307212decfd3869a029315eb8ba082134
 AUX automake-1.7.9-infopage-namechange.patch 592 RMD160 78f09d0a4ce09d0389cd3d3f54edc16b7df8541d SHA1 816b31bd1887bad43a50e34f04d4bfe7aa702474 SHA256 3e0dae801e4ff79dc2d5a469a8be1efb5df09344f566cf39b897f385b39212ee
+AUX automake-1.7.9-libtool-2.patch 859 RMD160 9cf0f3c8099e4570ccaab8ad5c6b70eb9631f296 SHA1 7462940d4abbc47cab21be3c58a82dd1dd90e6fe SHA256 3e919b1611dec9bd3a43945c881aa11cca6c3359e3425805d32d386be4d182d3
 AUX automake-1.7.9-test-fixes.patch 1159 RMD160 9d90c8d6cdcc5ba3455dee28701c2c6eb7fa86dd SHA1 bf2fd0227124555af86fdc09e9cfc6fcfcde7d91 SHA256 44221e4c945b0cb61663cb2857a3238e50800d228e7612203529726c53272dbb
 AUX automake-1.8.2-infopage-namechange.patch 1131 RMD160 c520c80b37dd30e0b6fca359bcc7f242ded15fae SHA1 28a051a76d90530b484c3dab1f868264df71829c SHA256 305979b9a07496352bfc6cc2177bf7aa1587ef1d0dcbbab1de7a56cb9d0ac539
 AUX automake-1.8.5-test-fixes.patch 1068 RMD160 517f75255fa9d29e459b56079e2e27fff073d41c SHA1 350ac439fee8f6d0082ca876d0c7501e1e5a8a09 SHA256 1a94bcc5a8e33b4c187e6291ad672daf3dca7b2e2995586d6af39f653678cebd
@@ -18,6 +20,7 @@ AUX automake-1.9.6-aclocal7-test-sleep.patch 1102 RMD160 8e32341de00eb09af25a820
 AUX automake-1.9.6-ignore-comments.patch 614 RMD160 2d9ca9b4de82171370edd6843b4a3c2b9c073b4c SHA1 c10645bafd86fe2dfa15a4e62f96b55032c66c1b SHA256 28b80f088b53a72935f15c7d845919f474224ece83847d7b3bae5f2236fe30fe
 AUX automake-1.9.6-include-dir-prefix.patch 1106 RMD160 1a440ea039e4b71a44caaae7cb790e6b5e859820 SHA1 ec02014d99fd1cd0849bf5ed1da0c4db5a057bc0 SHA256 01d85d830875aa05eec4ad209033473f3f8603f66781fdd9fd9b3cbb07ecbbd2
 AUX automake-1.9.6-infopage-namechange.patch 1156 RMD160 6c6c899d0119bd1068c3e1c63301c7ee74663ba9 SHA1 3060100d79f5b1e43c5cb61805c7f30269a123e9 SHA256 32fcbef369731846abb28181cc924c4d8261eafd3b86d3c506976de622b76737
+AUX automake-1.9.6-subst-test.patch 1332 RMD160 00223b889535970a3f50b15a7383ad9d79375c29 SHA1 f4c757db0b583963daa1d7849d1baf55453eba36 SHA256 3e793187719a3149f24eec1c4d4a3603ae02625f31c82056300d4e37248bd359
 DIST automake-1.10.2.tar.bz2 936322 RMD160 cf3a31b5dac83295651c3c8b9a668cc3f3fae3da SHA1 fad55795a57b82d107808ae1bf51f72eba45c921 SHA256 c38ac9fe53d9492b0a0a02a8e691cd2c96d7f4cc13aedeedc6d08613b77e640f
 DIST automake-1.4-p6.tar.gz 375060 RMD160 ae40b2200eec95b601ebc65bc3cc916bb2a54066 SHA1 330c75c98e6dcdf21cbb63cf94ced8ea564b9438 SHA256 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f
 DIST automake-1.5.tar.gz 526934 RMD160 5c5310c3923a8bfb1c94d77c7c53c593552e0464 SHA1 9c426ac75e514dc214dea6309b07c5d9cb95002c SHA256 24b4775e3143fd3e35db5cbaba80845d9359c7bfd751a6cebe3014fbf6115d78
@@ -25,20 +28,20 @@ DIST automake-1.6.3.tar.bz2 476275 RMD160 2ca8c4f2dc6651db8472b61c4cb098493177d6
 DIST automake-1.7.9.tar.bz2 577705 RMD160 d967c0dd5bf4a8430d6b598660a98e7158869556 SHA1 da96734fa972a22cfbc4118dcd222871272e4d96 SHA256 32c13b6ad38ed5e7bfd1756cbc19cf5efd67b7ade2d06000a4c99b0ce94bd46d
 DIST automake-1.8.5.tar.bz2 663182 RMD160 36892a845b189d81593e4b1146352c391c4affac SHA1 b639ff48033e9ac7347a6f938b015107754fdf3a SHA256 84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410
 DIST automake-1.9.6.tar.bz2 765505 RMD160 ad93e095056f41f0369ac6a06fed3904d8e3514f SHA1 d205dbb274d3ff5be1cf6734f27fb452c7131866 SHA256 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d
-EBUILD automake-1.10.2.ebuild 1648 RMD160 d1ca608e0f3cfbd6d23ed6b1ec2b1c8ab90915ba SHA1 543de07bdd3958aae41bb03e599ee9111217fdac SHA256 a2004518b6bf87abb68a62139ae7cac7e91a1a63802b0e9106d87ddd06ed12e7
+EBUILD automake-1.10.2.ebuild 1695 RMD160 0fd9acb40486ad66972d470dcd917a8de2219526 SHA1 ba7797430d68d6e4c3d823fdadbabd288cbe07b0 SHA256 c4a14f8272d5bcf5456b6b9313dcd79926477c2bfeee104cac153633930acf04
 EBUILD automake-1.4_p6.ebuild 1761 RMD160 f5bb9fb1c89d9a1c23c771476580bd610e2165a5 SHA1 39c9f8b688e7465f57e79860aa85f43694df5e2a SHA256 23f76d39345964515b71aa56aabe318309014e877958111932612d519b3f9c40
 EBUILD automake-1.5.ebuild 1648 RMD160 0b8aabd070f97500426a23f1578346bd785e1e28 SHA1 0849201ac37059b959ee2c678fa2c7ae19f06e6a SHA256 253e1b42033ad1df3c9d53718b06ace231e837463b180b7dff3d9d09b3a7a1ac
 EBUILD automake-1.6.3.ebuild 1372 RMD160 b7b18bb00994e5e32b2a5060c682140a47feb1f7 SHA1 257ce275260115e1bcab6169fae0894e1c65f603 SHA256 76ce5f15659c3b978f982d58b4e48b775d40d00cc821c02b19cd511fd4dedd19
-EBUILD automake-1.7.9-r1.ebuild 1439 RMD160 49edb1f4a89f41a8efe2d1813923fa8669ca06d6 SHA1 ae9adbfffd31de3b5ef78899c3e7846a0258d581 SHA256 d04fb42df271345d3d5a05cb3264f6b5aac58cffd2f6b2fc265f6a8ba7ca03a5
-EBUILD automake-1.8.5-r3.ebuild 1512 RMD160 317417c0a689486fba5f59411585f404a6db7fa3 SHA1 ea909f2ad1ecc3dcdc63d8b4e9e4319db7f24d5a SHA256 847d15be66b8b6978a23cabcb5d00fa276a03014a8f24cf7cb49dbb5c3fc4372
-EBUILD automake-1.9.6-r2.ebuild 1728 RMD160 b82c7562cec4e2c8e85c24da578eef4701e8f31e SHA1 82166bddfe1a1afc3cfc826c6d0e04ab886e2d77 SHA256 14961731adf6a53a841e404385e2315bf21ded2c5a38904ee131fd404569390e
+EBUILD automake-1.7.9-r1.ebuild 1549 RMD160 f3840732e70cbb505e8941457092d2b9285036a7 SHA1 02cdbcf4661e2ca2ce5500e46a0f5aa588832caf SHA256 8ddc09e3affa768ef88a65a91232545986c81b51fbea89ac8e98b386e9cf172b
+EBUILD automake-1.8.5-r3.ebuild 1571 RMD160 7ad9d8475450cd591d2b438d61b81898e5976cb4 SHA1 2c502f477a7e72883dca957e68defb7b460db9b2 SHA256 a5b80b27b46fdfa29799a4ac91aefea4401381d7a967761f294783d462d682c5
+EBUILD automake-1.9.6-r2.ebuild 1787 RMD160 d016f299ae9975e8b7a62c603be9ee9d1cec2665 SHA1 16fac58e9deedd7f5fe8f8eb6911e504035b0865 SHA256 c388887266dccf2f325d438833510579f990b86d3c2e6587ec667a2012032594
 EBUILD automake-9999.ebuild 1486 RMD160 4e82fd03d3ccdf006d3ff1da24c9e6c49cb8991f SHA1 8d5b190a9c21aa9f311cdc39ad77477b57837d4a SHA256 010c5638f1bd10c9697b42bc08e15454b82bb186c30518c37fbe0eeca94b9ac1
-MISC ChangeLog 19876 RMD160 f1f672ba5cb8722bdba2feac575a21e6d7b9826e SHA1 4116e0dd950d3de95493f0419204dfec63594673 SHA256 42de2578fbdd5b833b3e2c22045d76f66093bfd8df73d913c42ae1662b31672f
+MISC ChangeLog 20474 RMD160 430295d3a3911672a0ab9dd6c5dcd65881be1c69 SHA1 fe792779be237f3495e2967dad842c9aefabd1b9 SHA256 70448cbcbe096924459e4944f80548b737318a3d101d96d74b6149a254692e50
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmPNcYACgkQn/5bYzqsSmFQDQCeMYHFZj3YnwpUkw8LnbIMlp3O
-wj8AnilgoptaMcxtN6XCCaEzcNmtPI7D
-=ewFX
+iEYEARECAAYFAknE0sYACgkQn/5bYzqsSmHM8QCeOkaeqZ9B0ql5wwyfxcby+Oyc
+dJ4AoK5RxPaGOH8wX8slN1ZpL+9KDR2W
+=8e7L
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.10.2.ebuild b/sys-devel/automake/automake-1.10.2.ebuild
index c4f2aef34611..fa397c86e77c 100644
--- a/sys-devel/automake/automake-1.10.2.ebuild
+++ b/sys-devel/automake/automake-1.10.2.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/sys-devel/automake/automake-1.10.2.ebuild,v 1.8 2009/02/08 19:42:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.2.ebuild,v 1.9 2009/03/21 11:42:54 vapier Exp $
 
 inherit eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 		-e "s:automake.info:automake${SLOT}.info:" \
 		-e "s:automake.texi:automake${SLOT}.texi:" \
 		doc/Makefile.in || die "sed on Makefile.in failed"
+	epatch "${FILESDIR}"/${P}-bash4.patch #263068
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/files/automake-1.10.2-bash4.patch b/sys-devel/automake/files/automake-1.10.2-bash4.patch
new file mode 100644
index 000000000000..01829ce1741e
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.10.2-bash4.patch
@@ -0,0 +1,22 @@
+An upstream patch to fix ksh test issues, which also affect bash 4.0
+
+http://bugs.gentoo.org/263068
+http://git.savannah.gnu.org/cgit/automake.git/commit/?h=branch-1-10&id=319305db77dfdcbba3d5a1703c781750affdb20a
+
+2008-12-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ Testsuite fix for ksh.
+ * tests/check10.test: Add ':' as last command in subshell, for
+ zero exit status of the subshell.
+ Missing backport from master reported by Tim Rice.
+
+--- a/tests/check10.test
++++ b/tests/check10.test
+@@ -72,6 +72,7 @@
+   env TESTS="xpass xpass2" $MAKE -e check
+   env TESTS='pass skip xfail' $MAKE -e check
+   $MAKE check
++  :
+ ) >stdout
+ cat stdout
+