Make sure we dont create CTARGET-VER entries in env.d #195054.

Package-Manager: portage-2.1.3.12

5 files changed, 86 insertions, 21 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 6e4af78d6fee..d1e701be36ca 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.167 2007/10/07 04:20:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.168 2007/10/11 05:27:56 vapier Exp $
+
+*gcc-config-1.4.0-r4 (11 Oct 2007)
+
+  11 Oct 2007; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.4.0,
+  +gcc-config-1.4.0-r4.ebuild:
+  Make sure we dont create CTARGET-VER entries in env.d #195054.
 
 *gcc-config-1.4.0-r3 (07 Oct 2007)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 1ae21d1f3b66..c2e7e55d90bc 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -17,10 +17,10 @@ AUX gcc-config-1.3.16 19744 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae SHA1
 MD5 5fc3469999611894758a1b9c2365b719 files/gcc-config-1.3.16 19744
 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae files/gcc-config-1.3.16 19744
 SHA256 c4c3ada7597b7a8610873ff2b45b0137264821df870a1700fd278727c72e3717 files/gcc-config-1.3.16 19744
-AUX gcc-config-1.4.0 20642 RMD160 70a84ecd387ad4ca88eaedd32466c96632f16712 SHA1 cc6743892883cc04cf83bdb0f9106c5a9b1beb2e SHA256 a14dccf1bcaa62536377c8a1172db9cf3623be6310112672390f1bb90d6b2f91
-MD5 ce51ce87b1d12596bbaab32866ffafc0 files/gcc-config-1.4.0 20642
-RMD160 70a84ecd387ad4ca88eaedd32466c96632f16712 files/gcc-config-1.4.0 20642
-SHA256 a14dccf1bcaa62536377c8a1172db9cf3623be6310112672390f1bb90d6b2f91 files/gcc-config-1.4.0 20642
+AUX gcc-config-1.4.0 20808 RMD160 a7cb5a56b8e7322dbaa9b7c37434c4f2797655b3 SHA1 0094641c508975d5c86c2222602fe069c8470cad SHA256 a9e45f934c82fe8cd449300df4b861303c20c21a213165ce28c81ef5406d58db
+MD5 84e36b231d584beb8ed41eb2d16fe605 files/gcc-config-1.4.0 20808
+RMD160 a7cb5a56b8e7322dbaa9b7c37434c4f2797655b3 files/gcc-config-1.4.0 20808
+SHA256 a9e45f934c82fe8cd449300df4b861303c20c21a213165ce28c81ef5406d58db files/gcc-config-1.4.0 20808
 AUX wrapper-1.4.7.c 9837 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 SHA1 4aee9df408a84b22b4007bc9b74543dd8a6f4fc8 SHA256 f462c49721d291ce3b91c46e5fb8e567d6344f0e359e788301bac07065987744
 MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 files/wrapper-1.4.7.c 9837
@@ -50,18 +50,18 @@ EBUILD gcc-config-1.3.16.ebuild 1527 RMD160 69365cd208813bb12bd862588108334d0b3e
 MD5 34eb120d8476b4885b7a2305df9cb288 gcc-config-1.3.16.ebuild 1527
 RMD160 69365cd208813bb12bd862588108334d0b3ef084 gcc-config-1.3.16.ebuild 1527
 SHA256 5996ca2ce991811fd6a0989c6bcaeb41f154585a8176c3499f3ec5f727c8b4ed gcc-config-1.3.16.ebuild 1527
-EBUILD gcc-config-1.4.0-r3.ebuild 1563 RMD160 9502f484c163f0ce8954b3921b8a943cedd147dd SHA1 4b2503b7896f81ccd62b18ea3ba599a755cacd4f SHA256 2de8d4bec01e3334df05fa663b346065590f94355320e550a3a7a019373d7966
-MD5 8dcf2d99586c70c6c449b043ac346868 gcc-config-1.4.0-r3.ebuild 1563
-RMD160 9502f484c163f0ce8954b3921b8a943cedd147dd gcc-config-1.4.0-r3.ebuild 1563
-SHA256 2de8d4bec01e3334df05fa663b346065590f94355320e550a3a7a019373d7966 gcc-config-1.4.0-r3.ebuild 1563
+EBUILD gcc-config-1.4.0-r4.ebuild 1563 RMD160 aa628219c6eb50b431f4498ed9a60cdd6bba347e SHA1 8b744168eb2fc94b3481892289a826ccc230d81e SHA256 0e206c3e448d25b7bd1b16c75c8d08673aeba9c6c7cc0fab9730a5f83270b95e
+MD5 ff08667288a12dd699fbf0f9a70a8045 gcc-config-1.4.0-r4.ebuild 1563
+RMD160 aa628219c6eb50b431f4498ed9a60cdd6bba347e gcc-config-1.4.0-r4.ebuild 1563
+SHA256 0e206c3e448d25b7bd1b16c75c8d08673aeba9c6c7cc0fab9730a5f83270b95e gcc-config-1.4.0-r4.ebuild 1563
 EBUILD gcc-config-2.0.0_rc1.ebuild 775 RMD160 a41c99cba464ed16040552f329c067326094174d SHA1 4a7a816e8e3d596369a53e127ac8933bb5fe2aa2 SHA256 5be5dcd340934282c6147d8e90dd47a36b9af54416a301855e5f767f021f0a7a
 MD5 d7781cb8103fd03712bf341e79153ed0 gcc-config-2.0.0_rc1.ebuild 775
 RMD160 a41c99cba464ed16040552f329c067326094174d gcc-config-2.0.0_rc1.ebuild 775
 SHA256 5be5dcd340934282c6147d8e90dd47a36b9af54416a301855e5f767f021f0a7a gcc-config-2.0.0_rc1.ebuild 775
-MISC ChangeLog 30739 RMD160 c44dc44962c0ee783cac2d101190ecb66a9e19bd SHA1 8231ba3ed9d9fa674d04b80c39b8ae3f50103c54 SHA256 8e69c95d83186a359428efb94febddfebdd080c08769f45ba15691f89c52f2a4
-MD5 bbf4a2df17726f73075cd06cba3674d8 ChangeLog 30739
-RMD160 c44dc44962c0ee783cac2d101190ecb66a9e19bd ChangeLog 30739
-SHA256 8e69c95d83186a359428efb94febddfebdd080c08769f45ba15691f89c52f2a4 ChangeLog 30739
+MISC ChangeLog 30946 RMD160 df911c0ae03bb4e5496a6b56679ab96d3e4f9d4d SHA1 1877a9ef8e1a194c61890932ffa9796521aab38e SHA256 446799b2e88a54f10291f60ef42c530a0bc0648915252dab672c33f7f898d7e2
+MD5 3c0614a999b1a4f36849a93b90987fc7 ChangeLog 30946
+RMD160 df911c0ae03bb4e5496a6b56679ab96d3e4f9d4d ChangeLog 30946
+SHA256 446799b2e88a54f10291f60ef42c530a0bc0648915252dab672c33f7f898d7e2 ChangeLog 30946
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -78,16 +78,16 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.16 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.3.16 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.3.16 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0-r3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.4.0-r3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.4.0-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0-r4 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gcc-config-1.4.0-r4 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gcc-config-1.4.0-r4 0
 MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-gcc-config-2.0.0_rc1 277
 RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-gcc-config-2.0.0_rc1 277
 SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-gcc-config-2.0.0_rc1 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHCF6bp/wUKkr7RBoRAs0LAJ9hHCNbtbUPjYtJ8I8PwEPyITZrqQCfY9Q+
-bVEl5FIL0+fyEcJAEbZLT/Q=
-=890b
+iD8DBQFHDbQFp/wUKkr7RBoRAp1QAJ9PYLQTKsrzplmWFAdbT3yavHAuAgCg3jjx
+rsrQpphUs4wjQHnvOgEyQC0=
+=hZ5W
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r4 b/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r4
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.4.0-r4
diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.0 b/sys-devel/gcc-config/files/gcc-config-1.4.0
index 68de99859ee8..e9dfe5d9dcbb 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.4.0
+++ b/sys-devel/gcc-config/files/gcc-config-1.4.0
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2007 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.0,v 1.22 2007/10/07 04:20:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.23 2007/10/11 05:27:57 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -265,7 +265,9 @@ switch_profile() {
 
 		# Punt old files
 		rm -f "${ENV_D}/05gcc"
+		rm -f "${ENV_D}/05gcc-${CTARGET}"-*
 		rm -f "${GCC_ENV_D}/config"
+		rm -f "${GCC_ENV_D}/config-${CTARGET}"-*
 	fi
 
 	# Find the bin wrapper
@@ -715,7 +717,9 @@ done
 ${SET_X} && set -x
 
 get_real_chost
-CTARGET=${CTARGET:-${CC_COMP:-${REAL_CHOST}}}
+[[ ${DOIT} == "get_current_profile" ]] \
+	&& CTARGET=${CTARGET:-${CC_COMP:-${REAL_CHOST}}} \
+	|| CTARGET=${CTARGET:-${REAL_CHOST}}
 
 if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then
 	usage 1
diff --git a/sys-devel/gcc-config/gcc-config-1.4.0-r4.ebuild b/sys-devel/gcc-config/gcc-config-1.4.0-r4.ebuild
new file mode 100644
index 000000000000..92f413716ca6
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.4.0-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 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.4.0-r4.ebuild,v 1.1 2007/10/11 05:27:56 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs multilib
+
+# Version of .c wrapper to use
+W_VER="1.5.0"
+
+DESCRIPTION="Utility to change the gcc compiler being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!app-admin/eselect-compiler"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die
+}
+
+src_compile() {
+	strip-flags
+	emake CC="$(tc-getCC)" wrapper || die "compile wrapper"
+}
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config"
+	sed -i \
+		-e "s:PORTAGE-VERSION:${PVR}:g" \
+		-e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+		"${D}"/usr/bin/${PN}
+
+	exeinto /usr/$(get_libdir)/misc
+	newexe wrapper gcc-config || die "install wrapper"
+}
+
+pkg_postinst() {
+	# Do we have a valid multi ver setup ?
+	if gcc-config --get-current-profile &>/dev/null ; then
+		# We not longer use the /usr/include/g++-v3 hacks, as
+		# it is not needed ...
+		[[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++
+		[[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3
+		gcc-config $(/usr/bin/gcc-config --get-current-profile)
+	fi
+
+	# Make sure old versions dont exist #79062
+	rm -f "${ROOT}"/usr/sbin/gcc-config
+}