Make --use-old work again, thanks to Brian Childs <brian AT rentec DOT com>; bug #221109

Package-Manager: portage-2.2_rc33-r1/cvs/Linux i686

3 files changed, 22 insertions, 7 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 751e81c6e30f..44c918ef7c3d 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.184 2009/05/20 17:43:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.185 2009/08/03 00:40:07 halcy0n Exp $
+
+  03 Aug 2009; Mark Loeser <halcy0n@gentoo.org> files/gcc-config-1.4.1:
+  Make --use-old work again, thanks to Brian Childs <brian AT rentec DOT
+  com>; bug #221109
 
   20 May 2009; Raúl Porcel <armin76@gentoo.org> gcc-config-1.4.1.ebuild:
   ia64 stable
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 494eb44c48eb..c1df3415f714 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gcc-config-1.3.16 19744 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae SHA1 88d6816fc979c7a9b800145a38e523dc4e462922 SHA256 c4c3ada7597b7a8610873ff2b45b0137264821df870a1700fd278727c72e3717
 AUX gcc-config-1.4.0 20822 RMD160 5f0865c95634a3748462e2b6da3f26aa3b62a8d5 SHA1 711c5ddf9ffe3f65a5a1bf39ce6aa3b40a178cb3 SHA256 877df92b4fdb064686b648e13b25e60c9a22e86a3ed8652f199e541d12bdbe44
-AUX gcc-config-1.4.1 21666 RMD160 62b5ac30eda547226cccfeee31eceac1d79f7e75 SHA1 06e61308ab1864ae9c1d6a8de0451c757cd881c9 SHA256 e1fd51b4bfa1fab08c497482d58838b614f9f0d36b61ee4bd06f413924afa465
+AUX gcc-config-1.4.1 21709 RMD160 ba1bd74fa9756be2e037997c4aac0df749024d32 SHA1 b3deb1f52502fd67b40c6dc0ee805161ad99457c SHA256 49b362ca2dcf2082000890cd8c2150014892c6cdaa24299c95fb111bea800573
 AUX wrapper-1.4.8.c 9712 RMD160 1210dc111da9955926dc98264991e39489525f20 SHA1 6189891f1577451e34d4f7cc7ada851d63d2f352 SHA256 a45dec68f7a2b4f1d96e83181693afb10cf73b6fbdcd3456055e2bc64bc114e7
 AUX wrapper-1.5.0.c 9656 RMD160 9f2838e2bc1e43a752196930a94fdbb79a6efcda SHA1 f824622eeccfc60a8c07bb1878667ee5253c4e42 SHA256 df3fcb1d135d654b57fe685de5321fd1959296cabcbfcf1c3174e075286f5591
 AUX wrapper-1.5.1.c 9788 RMD160 b628944ee01dd772eb917cd08d13dc41bf58409f SHA1 51ac1f9419bc2230a9ce2196e70b5ee4ba61be18 SHA256 991981059fdcd0a9c76d73ff2ce576e553f37ae7d3b378b92ead553963f7339a
 EBUILD gcc-config-1.3.16.ebuild 1527 RMD160 69365cd208813bb12bd862588108334d0b3ef084 SHA1 0c724faff5a919c723ada92e2069fc480ae3ee53 SHA256 5996ca2ce991811fd6a0989c6bcaeb41f154585a8176c3499f3ec5f727c8b4ed
 EBUILD gcc-config-1.4.0-r4.ebuild 1678 RMD160 479bb75080507a991c8bced82dc051be906eb4a5 SHA1 c7d5bd1d3770648c5757360c5be863b3cc178d45 SHA256 a7f98327b8fbd2d587e7bbefcdb86fcb6ba6571ab92de8d2e4764dbd6e0ab2e1
 EBUILD gcc-config-1.4.1.ebuild 1642 RMD160 b6af302e3654e7dbf5aa808e0c037c66df810ae8 SHA1 b5853c35cf17285d852ef424f12bb1eb0f1b19ab SHA256 5ad070e899901f17a57a515829d83a243ae79ffe5dbe46999328139e13cc9d23
-MISC ChangeLog 33041 RMD160 e4c175524c90430d9b2619d1ee0d77de0b00c27a SHA1 06cbb874d894c825a30c74aed10bab23e7404825 SHA256 ed0479637c4ed87101af8fe83b0aa5ed312e5065d07e9ba0ffc49bc05dcef2ca
+MISC ChangeLog 33207 RMD160 1e7706f4f6f06d1dad8ea9ca46cd14cf5c3cde92 SHA1 050b35504bd73bf442453227e1f07d7bfd8169ed SHA256 af8315f0cdb2100ba183ae8fad3660c55af43813c3ad6ea276a853162d959c49
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkp2MfIACgkQCRZPokWLroQ2HACfXjAo3TdFmj5jF53hVwhcMV5l
+b/cAn3411nrX20saUfnwuaU4FEm/qAoA
+=KOgQ
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.1 b/sys-devel/gcc-config/files/gcc-config-1.4.1
index d487d85fe72d..ebaa184f3ab8 100644
--- a/sys-devel/gcc-config/files/gcc-config-1.4.1
+++ b/sys-devel/gcc-config/files/gcc-config-1.4.1
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.8 2009/01/28 02:32:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.9 2009/08/03 00:40:07 halcy0n Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -19,7 +19,7 @@ umask 022
 SED=$(type -P gsed)
 SED=${SED:-$(type -P sed)}
 
-GENTOO_LIBDIR="@GENTOO_LIBDIR@"
+GENTOO_LIBDIR="lib"
 [[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib"
 
 usage() {
@@ -621,6 +621,7 @@ for x in "$@" ; do
 	case "${x}" in
 		# Only use specified compiler if one is not already selected.
 		-O|--use-old)
+			CTARGET=${CTARGET:-$(try_real_hard_to_find_CHOST)}
 			if get_current_profile &>/dev/null ; then
 				CC_COMP=$(get_current_profile)
 			else
@@ -693,9 +694,9 @@ for x in "$@" ; do
 			rcsfile="$RCSfile: gcc-config-1.4.1,v $"
 			rcsfile=${rcsfile#: }
 			rcsfile=${rcsfile%,v*}
-			cvsrev="$Revision: 1.8 $"
+			cvsrev="$Revision: 1.9 $"
 			cvsrev=${cvsrev#: }
-			cvsdate="$Date: 2009/01/28 02:32:50 $"
+			cvsdate="$Date: 2009/08/03 00:40:07 $"
 			cvsdate=${cvsdate#: }
 			echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})"
 			exit 0