Avoid autotool depends #304901 by Kevin Morgan.

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

4 files changed, 40 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 4de861e8bcae..d2a00a789591 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.246 2010/02/04 00:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.247 2010/03/06 22:52:36 vapier Exp $
+
+  06 Mar 2010; Mike Frysinger <vapier@gentoo.org> bash-4.0_p37.ebuild,
+  +files/bash-4.0-configure.patch:
+  Avoid autotool depends #304901 by Kevin Morgan.
 
   04 Feb 2010; Mike Frysinger <vapier@gentoo.org> bash-4.1_p2.ebuild:
   Move USE=bashlogger from custom patch to supported define #303333 by
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 9f2693751ce9..408742c5c1cf 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -19,6 +19,7 @@ AUX bash-3.2-process-subst.patch 272 RMD160 1e36678aea1628618a7bece166006e21a891
 AUX bash-3.2-protos.patch 1106 RMD160 c54848169ebf937486c53af2e6f7e73a6c28285c SHA1 bd8a0d6c170ad3664c851dc857f59d577cde5c4f SHA256 2c9a9d655d9da8e7d5dbc8535f1da2c831a6fb9067e5ff65beb906b25d6ff9ad
 AUX bash-3.2-session-leader.patch 2098 RMD160 b298743fb54162d0caa8d409bf1f7b6f796c65f5 SHA1 ff136654614731ec3252ee5f34235138f0bf381e SHA256 533861310e7cba05f315ff56af32aaca5e4bdf7c2a450d4e616bb14fdf4a1f3d
 AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
+AUX bash-4.0-configure.patch 749 RMD160 30119c7d9aa27b9594182ef5632b61c1b986842a SHA1 e43c9b31dcd5f52ad3e9d08f38916d0232a719b5 SHA256 12419ea6f91178608b0fe028d85b4e0daac5c339a52fbbb79d77d97a2f6bf010
 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 2237 RMD160 82aa28d48f12978cbaea7ebed987d13f5368c2c8 SHA1 c82d0c9ca049fe3c53418f4a3b399a840bbcdc90 SHA256 65db03b0c0b8e2fd917f049e9e84f7b2b234b3e9e37f395d4d8984194b392a56
@@ -142,14 +143,14 @@ DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d
 EBUILD bash-3.1_p17.ebuild 4643 RMD160 46f3d1fe569cc0b5f23cb3f1c06244caf090fbd6 SHA1 9d90d18bfc54f10c7309694931cf9dc3557346ba SHA256 277165a62442284edc34bad6e47721e451b1e1b6db21d6a16c5ba9cb61df27ed
 EBUILD bash-3.2_p50.ebuild 6146 RMD160 13f3957af7bc8763d431846802dfcdd8455f14cf SHA1 283ec5975998e5cf7128a9a0e889d6f54d506922 SHA256 703287cd42028c99c5a4f610042732f9af27a971d5728878fba12f8a25020515
 EBUILD bash-4.0_p35.ebuild 5784 RMD160 0d3f12c317794f751da33ab6e51926aafde10694 SHA1 120e55091bc67363214967fbf02fcb373905aef7 SHA256 be228bea883c3b952851959f27f206777bfe571a575ee3b6202f9db5b4517ac8
-EBUILD bash-4.0_p37.ebuild 5793 RMD160 f85841f1042b14820632491fbb6fc6c2724910e7 SHA1 395469b960072db40dd671dedb1a1a7142372a7b SHA256 e52487614d05c9bca31e9d3c4ed5e94ed504c33bf4451d8c617d8f302bd48e47
+EBUILD bash-4.0_p37.ebuild 5888 RMD160 1d037381cb18ff31d96342f91163bac60b8eb3c6 SHA1 2e1271234b27c9f362e960b0deaef89a5066d78c SHA256 391257037ab2a18769b244b7cc423393abf687355f30d28fa03994984a85657e
 EBUILD bash-4.1_p2.ebuild 5491 RMD160 0c6d7734f41862701c320a648d97f6faa85bf70f SHA1 a4a48fd39d12db7aa620aeee2feef9b8fbfbaeea SHA256 b422714c9a54ec97a5c10a4bf7fb2de88fa65c3cad507b5924473e5fa6f7bc77
-MISC ChangeLog 39176 RMD160 65cc95f1462067acb785db8de5398c1b62196cf2 SHA1 152d3dbfdcc172518badb63ece3e959ec5d49daf SHA256 915c34b663b0056430acd48c2bccbe4573f8a790fce5669b0a9b36152221aad6
+MISC ChangeLog 39333 RMD160 62330441c0c3bd06fb181204941b31baf62b9127 SHA1 655f199b9783f803220370f3f994977768857cc0 SHA256 68f07982cba8b53b8fc8aa4b595f5aa3b2d7872f8692fd9700f5e266e6b7057f
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkt3SGMACgkQTwhj9JtAlp7vNwD/cJi8V61z1eOdIqQ1T5e0448a
-rnzNJ2X+deLwZz0T2rcA/0nyNW11c42aGey3U5NgjDSXvP27+CcJQ5qNsTKXDEab
-=Wbkl
+iF4EAREIAAYFAkuS3LkACgkQTwhj9JtAlp5mugEAkjooz9cZH73PvQetezJxV2tK
+Oh2vu1wjRmG+q+NW+TQA/RzmXaqoron0FYPAznvt3fPWi2sslHSWLOlxzXuIjOM3
+=UPzW
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0_p37.ebuild b/app-shells/bash/bash-4.0_p37.ebuild
index 7971f9b1772a..4abf017d2414 100644
--- a/app-shells/bash/bash-4.0_p37.ebuild
+++ b/app-shells/bash/bash-4.0_p37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p37.ebuild,v 1.1 2010/01/21 05:43:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p37.ebuild,v 1.2 2010/03/06 22:52:36 vapier Exp $
 
 EAPI="1"
 
@@ -65,6 +65,9 @@ src_unpack() {
 	[[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER})
 	cd ../..
 
+	# bash40-037 touches configure.in :x
+	epatch "${FILESDIR}"/${PN}-4.0-configure.patch #304901
+
 	if ! use vanilla ; then
 		sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
 		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
diff --git a/app-shells/bash/files/bash-4.0-configure.patch b/app-shells/bash/files/bash-4.0-configure.patch
new file mode 100644
index 000000000000..e57cb6b2402e
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-configure.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/304901
+
+newer patches touch configure ... we don't want autotool deps, so update
+the files ourselves
+
+--- bash-4.0/configure
++++ bash-4.0/configure
+@@ -5806,7 +5806,7 @@
+ 		# static version specified as -llibname to override the
+ 		# dynamic version
+ 		case "${host_os}" in
+-		darwin[89]*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
++ 		darwin[89]*|darwin10*) READLINE_LIB='${READLINE_LIBRARY}' ;;
+ 		*)		READLINE_LIB=-lreadline ;;
+ 		esac
+ 	fi
+@@ -5847,7 +5847,7 @@
+ 		# static version specified as -llibname to override the
+ 		# dynamic version
+ 		case "${host_os}" in
+-		darwin[89]*)	HISTORY_LIB='${HISTORY_LIBRARY}' ;;
++ 		darwin[89]*|darwin10*) HISTORY_LIB='${HISTORY_LIBRARY}' ;;
+ 		*)		HISTORY_LIB=-lhistory ;;
+ 		esac
+ 	fi