If active profile no longer exists, make sure -c spits out an error message.

Package-Manager: portage-2.1_pre9-r4

5 files changed, 106 insertions, 48 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index c4ea561a0333..1ca397e0b44d 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.126 2006/04/24 01:10:11 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.127 2006/04/25 00:20:17 vapier Exp $
+
+*gcc-config-1.3.13-r2 (25 Apr 2006)
+
+  25 Apr 2006; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.13,
+  +gcc-config-1.3.13-r2.ebuild:
+  If active profile no longer exists, make sure -c spits out an error message.
 
   29 Apr 2006; Joshua Kinard <kumba@gentoo.org> gcc-config-1.3.13-r1.ebuild:
   Marked stable on mips.
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 5a8bf14be7c8..227d1432a402 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,45 +1,41 @@
-AUX gcc-config-1.3.12 17638 RMD160 22ce6df5fe85e5b8560d897db3c00b0856f86366 SHA1 e87b8069483667154c942dda2bfe0e64fbbcf601 SHA256 4b758ea208605973b1f8c78381d5f2d21608e3f50dffa63dbdca019d7d17ffdb size 17638
-MD5 e16d1156d700ec03bf4161f179aba162 files/gcc-config-1.3.12 17638
-RMD160 22ce6df5fe85e5b8560d897db3c00b0856f86366 files/gcc-config-1.3.12 17638
-SHA256 4b758ea208605973b1f8c78381d5f2d21608e3f50dffa63dbdca019d7d17ffdb files/gcc-config-1.3.12 17638
-AUX gcc-config-1.3.13 17915 RMD160 dcf80e7ed8fa21a29bccc81c1ceea46fb06c1a66 SHA1 f8f286982626788502951f1b6650ecc856ebdae3 SHA256 542f47b24c2cc663414b8c82454f40f0f634b27f6143ea203098cbd46ff54dbb size 17915
-MD5 0cd3e8c6d329598e829e750561b150ed files/gcc-config-1.3.13 17915
-RMD160 dcf80e7ed8fa21a29bccc81c1ceea46fb06c1a66 files/gcc-config-1.3.13 17915
-SHA256 542f47b24c2cc663414b8c82454f40f0f634b27f6143ea203098cbd46ff54dbb files/gcc-config-1.3.13 17915
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gcc-config-1.3.13 18125 RMD160 49eab57eddc25eca58293189fef4ffeb9a465957 SHA1 edc89b633363432bdf7cbd8ebfecfddaef72088b SHA256 015be2a22372836bb0ce7b41266f23e1e32772c655cdb76d3ce58fb6bd8a808a size 18125
+MD5 c200b9bcdda23bd0ea9dad626462bdc0 files/gcc-config-1.3.13 18125
+RMD160 49eab57eddc25eca58293189fef4ffeb9a465957 files/gcc-config-1.3.13 18125
+SHA256 015be2a22372836bb0ce7b41266f23e1e32772c655cdb76d3ce58fb6bd8a808a files/gcc-config-1.3.13 18125
 AUX wrapper-1.4.7.c 9837 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 SHA1 4aee9df408a84b22b4007bc9b74543dd8a6f4fc8 SHA256 f462c49721d291ce3b91c46e5fb8e567d6344f0e359e788301bac07065987744 size 9837
 MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 files/wrapper-1.4.7.c 9837
 SHA256 f462c49721d291ce3b91c46e5fb8e567d6344f0e359e788301bac07065987744 files/wrapper-1.4.7.c 9837
 DIST compiler-config-2.0.0_beta2.tar.gz 116097 RMD160 35e2ee0362d151668817439fe3ca90b6cb929bc2 SHA256 a4ab94d00389d3f360ebad32b7ccc01bed4d13e8879260cc31d381f46e9481b2 size 116097
-EBUILD gcc-config-1.3.12-r6.ebuild 1458 RMD160 6d940052ee970648e0aa5dc8a2528feed3f663ff SHA1 a28c496683e4658823dc5a69f647731c2c88f670 SHA256 f8ce67362ace944a1d3a484f9b122ef365fa2a3ba497ff0163b20a287932b9ab size 1458
-MD5 15eb934411212481076e228d609466d9 gcc-config-1.3.12-r6.ebuild 1458
-RMD160 6d940052ee970648e0aa5dc8a2528feed3f663ff gcc-config-1.3.12-r6.ebuild 1458
-SHA256 f8ce67362ace944a1d3a484f9b122ef365fa2a3ba497ff0163b20a287932b9ab gcc-config-1.3.12-r6.ebuild 1458
-EBUILD gcc-config-1.3.13-r1.ebuild 1468 RMD160 cefacff12a931ecbd48018b2b16f48a205a13216 SHA1 56a0f850898c48f26bb6add42af76891372f2f09 SHA256 c4f9be2276234139061c3f646e74497f407d1a72ecfb74944527af7be88d4fad size 1468
-MD5 591d6c12b287437b450856d96bcae222 gcc-config-1.3.13-r1.ebuild 1468
-RMD160 cefacff12a931ecbd48018b2b16f48a205a13216 gcc-config-1.3.13-r1.ebuild 1468
-SHA256 c4f9be2276234139061c3f646e74497f407d1a72ecfb74944527af7be88d4fad gcc-config-1.3.13-r1.ebuild 1468
+EBUILD gcc-config-1.3.13-r2.ebuild 1468 RMD160 25506a9890f93371dd41f93e9348496dee4cccc6 SHA1 6804f0f1d4cab112ada14d4e6a6ff57d1eaf676f SHA256 5ad228a66aac8a1581df6ec44448f4de776480233fc741d6827e33aa6944fddf size 1468
+MD5 df98c534043def871c565512a9ecccd9 gcc-config-1.3.13-r2.ebuild 1468
+RMD160 25506a9890f93371dd41f93e9348496dee4cccc6 gcc-config-1.3.13-r2.ebuild 1468
+SHA256 5ad228a66aac8a1581df6ec44448f4de776480233fc741d6827e33aa6944fddf gcc-config-1.3.13-r2.ebuild 1468
 EBUILD gcc-config-2.0.0_beta2.ebuild 788 RMD160 9af7bed8a6777079ceb6b4f1d792085efdd3ef31 SHA1 e6a5a0eb496ae850fa372fb3043cdb4cace708e5 SHA256 44226fce90648a8cbd8d4133c5befc8b3029f28668d442ed98f4df7e7e198ac9 size 788
 MD5 f74c7f48c7ae501ac30c992e7d2d7e87 gcc-config-2.0.0_beta2.ebuild 788
 RMD160 9af7bed8a6777079ceb6b4f1d792085efdd3ef31 gcc-config-2.0.0_beta2.ebuild 788
 SHA256 44226fce90648a8cbd8d4133c5befc8b3029f28668d442ed98f4df7e7e198ac9 gcc-config-2.0.0_beta2.ebuild 788
-MISC ChangeLog 24585 RMD160 4ff8d79a91f8b845818ef7de2848c1626c7d0018 SHA1 273c89d1e8b4aab6b9250952b0ea8f481dc3ada2 SHA256 a54c7bc2f736c0a11efa704bb02963ddc3c7ce4dffbdf128334eaf977720008f size 24585
-MD5 bdf6174cc84ec5926c15720ec7b4ca6b ChangeLog 24585
-RMD160 4ff8d79a91f8b845818ef7de2848c1626c7d0018 ChangeLog 24585
-SHA256 a54c7bc2f736c0a11efa704bb02963ddc3c7ce4dffbdf128334eaf977720008f ChangeLog 24585
+MISC ChangeLog 24810 RMD160 16f438fc6c7f949ca04034fad197950000934b23 SHA1 f5276a5ad5ed6cc268679ce023f71286aa6ff44f SHA256 bf1342c6f9e891754f9acce5902f91ea222940cacc904c91ae6d08d76ec75c48 size 24810
+MD5 fb606822eaf655deedfb9c5652f86e71 ChangeLog 24810
+RMD160 16f438fc6c7f949ca04034fad197950000934b23 ChangeLog 24810
+SHA256 bf1342c6f9e891754f9acce5902f91ea222940cacc904c91ae6d08d76ec75c48 ChangeLog 24810
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a size 162
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gcc-config-1.3.12-r6 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gcc-config-1.3.12-r6 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gcc-config-1.3.12-r6 1
-size 1 files/digest-gcc-config-1.3.12-r6 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gcc-config-1.3.13-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gcc-config-1.3.13-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gcc-config-1.3.13-r1 1
-size 1 files/digest-gcc-config-1.3.13-r1 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gcc-config-1.3.13-r2 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gcc-config-1.3.13-r2 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gcc-config-1.3.13-r2 1
 MD5 372b7ef82a36d586d64cabe3f7c6fa53 files/digest-gcc-config-2.0.0_beta2 283
 RMD160 bd192638549de35aa6ea6c518dd51ff2797fb98e files/digest-gcc-config-2.0.0_beta2 283
 SHA256 623518c8fb4d5c311a4317cc569334f59f1173412a3b004ad733fda5d08453b1 files/digest-gcc-config-2.0.0_beta2 283
-size 283 files/digest-gcc-config-2.0.0_beta2 283
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFETWtX2+ySkm8kpY0RAo5eAJ997XxCZ11AnhDLfzql6zu8IyO1+QCguGFV
+0r0SamKtB57X3cIuE/ZssB8=
+=b46c
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r2 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r2
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r2
@@ -0,0 +1 @@
+
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.13 b/sys-devel/gcc-config/files/gcc-config-1.3.13
index 3121c2c3a339..1b32bcaf0cc8 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.13
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.13
@@ -1,12 +1,13 @@
 #!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.13,v 1.6 2006/04/21 23:50:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v 1.7 2006/04/25 00:20:17 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
+argv0=${0##*/}
 source /sbin/functions.sh || {
-	echo "$0: Could not source /sbin/functions.sh!"
+	echo "${argv0}: Could not source /sbin/functions.sh!"
 	exit 1
 }
 umask 022
@@ -116,10 +117,10 @@ get_real_chost() {
 	fi
 
 	if [[ -z ${REAL_CHOST} ]] ; then
-		eerror "$0: Could not get portage CHOST!"
-		eerror "$0: You should verify that CHOST is set in one of these places:"
-		eerror "$0:  - ${ROOT}/etc/make.conf"
-		eerror "$0:  - active environment"
+		eerror "${argv0}: Could not get portage CHOST!"
+		eerror "${argv0}: You should verify that CHOST is set in one of these places:"
+		eerror "${argv0}:  - ${ROOT}/etc/make.conf"
+		eerror "${argv0}:  - active environment"
 		exit 1
 	fi
 }
@@ -136,7 +137,7 @@ switch_profile() {
 	local GCC_BIN_PATH=
 
 	if [[ "$(id -u)" -ne 0 ]] ; then
-		eerror "$0: Must be root."
+		eerror "${argv0}: Must be root."
 		exit 1
 	fi
 
@@ -345,14 +346,17 @@ get_current_profile() {
 	fi
 
 	if [[ ! -f ${conf} ]] ; then
-		eerror "$0: No gcc profile is active!"
+		eerror "${argv0}: No gcc profile is active!"
 		return 1
 	fi
 
 	source "${conf}"
 
 	if [[ -z ${CURRENT} ]] ; then
-		eerror "$0: No gcc profile is active!"
+		eerror "${argv0}: No gcc profile is active!"
+		return 1
+	elif [[ ! -f ${GCC_ENV_D}/${CURRENT} ]] ; then
+		eerror "${argv0}: Active gcc profile is invalid!"
 		return 1
 	fi
 
@@ -369,7 +373,7 @@ list_profiles() {
 	fi
 
 	if [[ ! -f ${GCC_ENV_D}/config ]] ; then
-		eerror "$0: No gcc profile is active; please select one!"
+		eerror "${argv0}: No gcc profile is active; please select one!"
 	fi
 
 	eval $(grep -s ^CURRENT= "${GCC_ENV_D}"/config)
@@ -595,7 +599,7 @@ for x in "$@" ; do
 			exit 0
 			;;
 		-*)
-			eerror "$0: Invalid switch!  Run $0 without parameters for help."
+			eerror "${argv0}: Invalid switch!  Run ${argv0} without parameters for help."
 			exit 1
 			;;
 		*)
@@ -624,14 +628,14 @@ for x in "$@" ; do
 						if [[ -f ${GCC_ENV_D}/${REAL_CHOST}-${x} ]] ; then
 							x=${REAL_CHOST}-${x}
 						else
-							eerror "$0: Could not locate '$x' in '${GCC_ENV_D}/' !"
+							eerror "${argv0}: Could not locate '$x' in '${GCC_ENV_D}/' !"
 							exit 1
 						fi
 					fi
 					CC_COMP=${x}
 				fi
 			else
-				eerror "$0: Too many arguments!  Run $0 without parameters for help."
+				eerror "${argv0}: Too many arguments!  Run ${argv0} without parameters for help."
 				exit 1
 			fi
 			;;
@@ -645,9 +649,9 @@ fi
 cmd_setup
 
 if [[ -z ${CC_COMP} ]] ; then
-	if get_current_profile &>/dev/null ; then
-		CC_COMP="$(get_current_profile)"
-	else
+	CC_COMP=$(get_current_profile)
+	if [[ $? -ne 0 ]] ; then
+		echo "${CC_COMP}"
 		list_profiles
 		exit 1
 	fi
@@ -669,7 +673,7 @@ if [[ ${DOIT} != "get_current_profile" ]] ; then
 	if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]] || \
 	   [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]]
 	then
-		eerror "$0: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2
+		eerror "${argv0}: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2
 		#exit 1
 	fi
 fi
diff --git a/sys-devel/gcc-config/gcc-config-1.3.13-r2.ebuild b/sys-devel/gcc-config/gcc-config-1.3.13-r2.ebuild
new file mode 100644
index 000000000000..e7169eb503c2
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.3.13-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 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.13-r2.ebuild,v 1.1 2006/04/25 00:20:17 vapier Exp $
+
+inherit toolchain-funcs multilib
+
+# Version of .c wrapper to use
+W_VER="1.4.7"
+
+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 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}
+
+src_compile() {
+	$(tc-getCC) -O2 -Wall -o wrapper \
+		"${FILESDIR}"/wrapper-${W_VER}.c || 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
+		[[ ${ROOT} = "/" ]] && gcc-config $(/usr/bin/gcc-config --get-current-profile)
+	fi
+
+	# Make sure old versions dont exist #79062
+	rm -f "${ROOT}"/usr/sbin/gcc-config
+}