Fix bug #235025 for libtool-2.2 and non-bash boxes.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089 x86_64

7 files changed, 52 insertions, 17 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 10d9fbbb3f4f..006bb04635f8 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.262 2008/08/16 23:27:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.263 2008/09/09 05:38:29 robbat2 Exp $
+
+  09 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> db-4.2.52_p5-r1.ebuild,
+  db-4.3.29_p1-r1.ebuild, db-4.5.20_p2-r1.ebuild, db-4.6.21_p3-r1.ebuild,
+  db-4.7.25_p1-r1.ebuild:
+  Fix bug #235025 for libtool-2.2 and non-bash boxes.
 
   16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org>
   +files/db-3.2.9-gcc43.patch, db-3.2.9_p2.ebuild:
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index d5e827349914..a54a720249ce 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -55,20 +55,20 @@ EBUILD db-1.85-r3.ebuild 1380 RMD160 5f83a60a3e196d9988af40a0e1a5c1b4781f81ca SH
 EBUILD db-3.2.9-r11.ebuild 4425 RMD160 3da3794a23f356fcf6fbbccae274afb4001d16fc SHA1 d5fecadf49d8ad9ee8f9bff0f3cc9df6e37ffa0b SHA256 04cbaa35c5e27d25a483432b8c3b709c7a68f7a9c98d11b95efb70c5cdcdcc4a
 EBUILD db-3.2.9_p2.ebuild 4939 RMD160 3321c012e427e73eed26cd2bdde5d6b37478f475 SHA1 95911d96c91a0fd9ec037af4c74bb9e1e881af01 SHA256 4c721f4dea8b5056fb54d2f757b91711d42a7c2b369cf661101c61edcfe7b617
 EBUILD db-4.2.52_p4-r2.ebuild 3486 RMD160 de46f7d210692588bbbed1acccb6e8aa5047bb5f SHA1 509c581644371e4735df1bfae0b57f056cb6fb6e SHA256 c29ae939d9740e0d43a57b178e2423a5bf72749a1bd1adc55c9ec901b43077c3
-EBUILD db-4.2.52_p5-r1.ebuild 5101 RMD160 66237ad74414a126cd6a5a0402613da8130d575d SHA1 4ad2718ac64c09e1a18c3f065d5a364c2f7f466d SHA256 b6fd948b3af04b43391899c4d4dffb385ee74c95724a3b498cfc5044f6fcae8e
+EBUILD db-4.2.52_p5-r1.ebuild 5259 RMD160 67b8071b2bd8c96296e7c68f8eec5572cdf50109 SHA1 00137c80b6a5477fbcbf26cdf0f8eb8581830285 SHA256 4efbb8673771639a7fbc8254f01da5da0dd5b73763d5a2f3c19f9bc2c26777d1
 EBUILD db-4.2.52_p5.ebuild 3601 RMD160 1ae0ed4f4aefef8787cdfad43ba2b9538e3db3cc SHA1 a0f18167ecb42beb306b611a5d8c313fbfbc067b SHA256 2eec1df5abc79855a961e9d866a25791ae0c05bcf8c08c0e8967fd90ac597751
 EBUILD db-4.3.29-r2.ebuild 3715 RMD160 e0533bcad7d7eb9b6b3834ebea4ba4082d4b86f3 SHA1 a9d4f84420e5f1f2666a86efce3b8098b0fd8f8a SHA256 784011081d9ddeaaa611e3bbf982350cd090f2aa02dafa2b829b9f2bc6a9f62b
-EBUILD db-4.3.29_p1-r1.ebuild 5060 RMD160 0b2937509439d6ae082d658566aad66409d4a91b SHA1 6ab082761ee1d77386de664af4037bfb18cb230b SHA256 779313c8bb6413c5f4551c14f7ef6d9f275c9dd5dd81f0038712409f4ce57e06
+EBUILD db-4.3.29_p1-r1.ebuild 5218 RMD160 f04415129fbf2b2557c366e3f1163d59c5e41af9 SHA1 f503b27579ad73d7e94086e8d04bf829e203bf54 SHA256 e91e36f2b8d81f3cde942ba5290b844cb52adc4af53cd409f9eaf75f1b3703f3
 EBUILD db-4.3.29_p1.ebuild 3771 RMD160 d202d849ab74eb1ce91f7f0ceb30543d7ae85fd6 SHA1 f62118646085075302795bb72c95697306f5d808 SHA256 8336abd71322d428d55905de36afaa8f9c8dae3581bd17e765563402a6abdbd6
 EBUILD db-4.4.20_p4-r1.ebuild 4972 RMD160 1e6351eb4a3f818b332a2a6dda56fb35c2cd2cfc SHA1 b4dfd66e2adce21a5f4f0394d4ba02a6829ea86f SHA256 b0ea8e7948d4fc9d881e9595afb281e598062c824388b4ee580d26fa0e93aa28
 EBUILD db-4.4.20_p4.ebuild 3683 RMD160 fb33c73182e555de6fd419a3c0d04f948d53685d SHA1 ad56ab59f80816cdc50538db331af5056da99327 SHA256 5f4c9808f5776fc08011250de1054f97ab209d52c84af5bab721a9992c855989
-EBUILD db-4.5.20_p2-r1.ebuild 5237 RMD160 1bccf63e72888d001ade7137ba6a0f8ebaafb48d SHA1 3194417b497682cf0b3bbb9776d7d510aad2330c SHA256 5172887fd33c31728a396cc68d8c5a18f1c9deec9f3f43e827aae294a807871a
+EBUILD db-4.5.20_p2-r1.ebuild 5383 RMD160 3d4ec2595ce6de6f54760b1dc15c8cffbb5ca779 SHA1 5211104085e1dcac6479025a218f70ddbe797677 SHA256 9fa6bfc6d6558542ef7e8b0252840563e0525ef6edbc7474712dc0bf1de72113
 EBUILD db-4.5.20_p2.ebuild 3937 RMD160 d7857fc73ba5e3e46f3d2e056863112e6b0b01b2 SHA1 9037c83cc03dffce5857ff923dd8ef39178d877b SHA256 9740c42be6b0589191da27209ae1817816e05b5dc5fab2727397c1090ea66411
 EBUILD db-4.6.21_p1.ebuild 3938 RMD160 73adabeb81be1df6cdefbd92838c31980d473f1a SHA1 41ca803b0c7fac5d156f9ad2ff594ccd20458b52 SHA256 6dfb6e2516531b3716df28a5da2955a89d142f5126b059b171a8dba036d402b2
-EBUILD db-4.6.21_p3-r1.ebuild 4953 RMD160 7bce8f70738a2d9b3020f389a4e8e0a106036105 SHA1 2afd13880be94e8d191b3b453b5f2aaab1868a2e SHA256 be7adada9990f39babc66667924d21796d60bd3f1244ac2a220d027bc7fa1e6a
+EBUILD db-4.6.21_p3-r1.ebuild 5099 RMD160 eda590e5fa78caefd25dcaff0c478491d42829f2 SHA1 7eec5e8958f94ae97a10ea0d5604790dfb866a45 SHA256 fe775c57c53d6f36f2e6e9543d6e40d03610ab8d571f5f1689a12d4d65ba7cda
 EBUILD db-4.6.21_p3.ebuild 3948 RMD160 16bc15d03ec7dfbc6ec74afcdd4fd33863d93a78 SHA1 c54aeca496c02ae5e37eb7ed068f8db15fc09ddf SHA256 7d93f4471fff67da3ee6c2d15be5705a63e92c752edfbbd503435e9504f65e90
 EBUILD db-4.7.25.ebuild 3933 RMD160 98c4ddf234c7a274d7ae655008f2f010fda3bedc SHA1 1b0438c3811c64b66ac9a9711523fbe925e66027 SHA256 32ee208e2ab19cc48c04d732d2a7694803e9a15f84faa90374329600698e5669
-EBUILD db-4.7.25_p1-r1.ebuild 4941 RMD160 115a99bfe76c1c2e1f6be597751aa091f3d5fe8e SHA1 5295a7a949463a64bf56c9fa88cd1c1bc75432a5 SHA256 4a5fd922abccafcd9ea78465dde8b3df206fec1113efc878d4a4012f546788ff
+EBUILD db-4.7.25_p1-r1.ebuild 5087 RMD160 858967ca1e191998c7dcd42722b350d66aef80c4 SHA1 5df59ac4528d46959449b0398da501267737f021 SHA256 551bd1de5ca81e7ccb401bc46bd8f3d8f87f3263c9c14117382c1e8a117807e5
 EBUILD db-4.7.25_p1.ebuild 3936 RMD160 a61846bc739c71452b7e72489c639ffbe7aa9591 SHA1 a1723f9759a2d6030f4c2e0fad5bf97677db1aaf SHA256 2ee7ea6bce661792a46b92c2943688101a3b5c9c3c3f8b348eeede1c08d3228c
-MISC ChangeLog 40558 RMD160 e4b9616d1979ffb0fd4e51793d0328f9c0e1a2f1 SHA1 f932300aa0b2ac938e8e101a421b74f6822b34c1 SHA256 f8c1914a12dc49b5e3e91a7a7a9c12577c74a155761e98a0545d93e868a4d883
+MISC ChangeLog 40790 RMD160 1b5f8244039dc5080f5c8201c7190137e08048ab SHA1 c387ba28d364f6c1068be6d1b7c0a74a29bc3618 SHA256 53a85163acd71358be66e402b2d417d8eb7effd078cd0ac696bb303a95262519
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild b/sys-libs/db/db-4.2.52_p5-r1.ebuild
index 152a957c0015..9ebc2f9c0b11 100644
--- a/sys-libs/db/db-4.2.52_p5-r1.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.1 2008/08/16 22:22:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.2 2008/09/09 05:38:29 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -71,6 +71,12 @@ src_unpack() {
 		# END of 4.5+earlier specific
 		cd "${S}"/../dist
 		rm -f aclocal/libtool.{m4,ac} aclocal.m4
+		sed -i \
+			-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+			configure.ac
+		sed -i \
+			-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
+			aclocal/programs.m4
 		AT_M4DIR="aclocal aclocal_java" eautoreconf
 		# Upstream sucks - they do autoconf and THEN replace the version variables.
 		. ./RELEASE
@@ -133,7 +139,7 @@ src_compile() {
 	sed -i \
 		-e 's/-shrext  $(SOFLAGS)/-shrext .so $(SOFLAGS)/g' \
 		Makefile
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/sys-libs/db/db-4.3.29_p1-r1.ebuild b/sys-libs/db/db-4.3.29_p1-r1.ebuild
index 9d64f2e23f69..47c79bc98705 100644
--- a/sys-libs/db/db-4.3.29_p1-r1.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1-r1.ebuild,v 1.3 2008/08/16 22:46:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1-r1.ebuild,v 1.4 2008/09/09 05:38:29 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -72,6 +72,12 @@ src_unpack() {
 		# END of 4.5+earlier specific
 		cd "${S}"/../dist
 		rm -f aclocal/libtool.{m4,ac} aclocal.m4
+		sed -i \
+			-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+			configure.ac
+		sed -i \
+			-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
+			aclocal/programs.m4
 		AT_M4DIR="aclocal aclocal_java" eautoreconf
 		# Upstream sucks - they do autoconf and THEN replace the version variables.
 		. ./RELEASE
@@ -136,7 +142,7 @@ src_compile() {
 		--host="${CHOST}" \
 		${myconf}  "${javaconf}" || die "configure failed"
 
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild b/sys-libs/db/db-4.5.20_p2-r1.ebuild
index 3e6a5cc4844c..aa6d86d7bca6 100644
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.2 2008/08/16 22:46:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.3 2008/09/09 05:38:29 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -70,6 +70,12 @@ src_unpack() {
 		# END of 4.5+earlier specific
 		cd "${S}"/../dist
 		rm -f aclocal/libtool.{m4,ac} aclocal.m4
+		sed -i \
+			-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+			configure.ac
+		sed -i \
+			-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+			aclocal/programs.m4
 		AT_M4DIR="aclocal aclocal_java" eautoreconf
 		# Upstream sucks - they do autoconf and THEN replace the version variables.
 		. ./RELEASE
@@ -143,7 +149,7 @@ src_compile() {
 	sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
 	    && mv Makefile.cpy Makefile
 
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/sys-libs/db/db-4.6.21_p3-r1.ebuild b/sys-libs/db/db-4.6.21_p3-r1.ebuild
index 46852ddf2b1b..58ad18d50870 100644
--- a/sys-libs/db/db-4.6.21_p3-r1.ebuild
+++ b/sys-libs/db/db-4.6.21_p3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p3-r1.ebuild,v 1.2 2008/08/16 22:46:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p3-r1.ebuild,v 1.3 2008/09/09 05:38:29 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -63,6 +63,12 @@ src_unpack() {
 	if use !bootstrap; then
 		cd "${S}"/../dist
 		rm -f aclocal/libtool.m4
+		sed -i \
+			-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+			configure.ac
+		sed -i \
+			-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+			aclocal/programs.m4
 		AT_M4DIR="aclocal aclocal_java" eautoreconf
 		# Upstream sucks - they do autoconf and THEN replace the version variables.
 		. ./RELEASE
@@ -136,7 +142,7 @@ src_compile() {
 	sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
 	    && mv Makefile.cpy Makefile
 
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/sys-libs/db/db-4.7.25_p1-r1.ebuild b/sys-libs/db/db-4.7.25_p1-r1.ebuild
index 3e54a28c885b..8d66541ed3ca 100644
--- a/sys-libs/db/db-4.7.25_p1-r1.ebuild
+++ b/sys-libs/db/db-4.7.25_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p1-r1.ebuild,v 1.3 2008/08/16 22:46:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p1-r1.ebuild,v 1.4 2008/09/09 05:38:29 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -63,6 +63,12 @@ src_unpack() {
 	if use !bootstrap; then
 		cd "${S}"/../dist
 		rm -f aclocal/libtool.m4
+		sed -i \
+			-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+			configure.ac
+		sed -i \
+			-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+			aclocal/programs.m4
 		AT_M4DIR="aclocal aclocal_java" eautoreconf
 		# Upstream sucks - they do autoconf and THEN replace the version variables.
 		. ./RELEASE
@@ -136,7 +142,7 @@ src_compile() {
 	sed -e "s,\(^STRIP *=\).*,\1\"true\"," Makefile > Makefile.cpy \
 	    && mv Makefile.cpy Makefile
 
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_install() {