Make sure GCC_CONFIG is taken only from the selected profile.

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index c274396820954580780e41c625feebc5e0ad9c48..934dda12e09d71dc796e2ec3225c225ebf95e6b8 100644 (file)
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.66 2004/12/03 02:43:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.67 2004/12/03 21:39:59 vapier Exp $
+
+*gcc-config-1.3.7-r4 (03 Dec 2004)
+
+  03 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.7,
+  -gcc-config-1.3.7-r3.ebuild, +gcc-config-1.3.7-r4.ebuild:
+  Make sure GCC_CONFIG is taken only from the selected profile.
 
 *gcc-config-1.3.7-r3 (02 Dec 2004)
 

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 3f87a4520f077a8f6165ce80c250ac1d12de9523..b54910f0339d5474b0c4df0ef066320252ec85ff 100644 (file)
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b6cf159c7fc6998244095afffd1c87c1 gcc-config-1.3.7-r3.ebuild 1426
-MD5 7d2fe90bde1fc09514181aafbcd340db ChangeLog 12772
+MD5 5af7f23de1f7b79d6a6edc6facb481f3 ChangeLog 13007
 MD5 0a250a07d02f1343f64fe7f7bbdbd820 gcc-config-1.3.6-r4.ebuild 2636
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 2d0140e7f438c795905ea1e75d443a16 gcc-config-1.3.7-r4.ebuild 1426
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r4 0
 MD5 2902e905147ff6ba0703f0f72660aa9a files/wrapper-1.4.3.c 8434
 MD5 5f5ba2d67203ed8386ae76352f15000d files/gcc-config-1.3.6 10285
-MD5 124a5e345bbd70ad6cd9ca2b8e8d4e6d files/gcc-config-1.3.7 11797
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r4 0
+MD5 63e3b7a19daaa9442cc9fc21807f5e69 files/gcc-config-1.3.7 11815
 MD5 e64a89abafa7f6f7d16c2540fb0edcf4 files/wrapper-1.4.2.c 7381
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r3 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBr9LmroRuSHgZdywRAkE8AJ93tys8ySdf5h7i6NzIDvS5RTBiKQCfVcFi
-fIWIuB0dg0WwsGneimtClq0=
-=O/nb
+iD8DBQFBsN1KroRuSHgZdywRAnfxAJ4tNK0Us0D38qSL/OU2fJymBqSywwCfU3/K
++Rlw0hukf0rTWb2a0xdnuz0=
+=VNRD
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r3 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r4
similarity index 100%
rename from sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r3
rename to sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r4

diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.7 b/sys-devel/gcc-config/files/gcc-config-1.3.7
index 11fa5d1cfb58fb43d704a53f97537dad855b816a..604fc92b3b324367587036e81e96c67f81d10cdf 100755 (executable)
--- a/sys-devel/gcc-config/files/gcc-config-1.3.7
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.7
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 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.3.7,v 1.6 2004/12/03 02:43:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.7,v 1.7 2004/12/03 21:39:59 vapier Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 trap ":" INT QUIT TSTP
@@ -162,6 +162,7 @@ switch_profile() {
        fi
 
        # Setup things properly again for this profile
+       unset GCC_CONFIG
        source "${GCC_ENV_D}/${CC_COMP}"
        OLD_CC_COMP=$(get_current_profile)
 

diff --git a/sys-devel/gcc-config/gcc-config-1.3.7-r3.ebuild b/sys-devel/gcc-config/gcc-config-1.3.7-r4.ebuild
similarity index 95%
rename from sys-devel/gcc-config/gcc-config-1.3.7-r3.ebuild
rename to sys-devel/gcc-config/gcc-config-1.3.7-r4.ebuild
index 13cec197e5e4966c3b6b94faf433f5b84722f60b..6b797473719c771d7a4725fd866be8c0fa89cbe6 100644 (file)
--- a/sys-devel/gcc-config/gcc-config-1.3.7-r3.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.7-r3.ebuild,v 1.1 2004/12/03 02:43:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.7-r4.ebuild,v 1.1 2004/12/03 21:39:59 vapier Exp $
 
 inherit toolchain-funcs