Update list output to show the active version for all targets.

Package-Manager: portage-2.0.51.22-r2

3 files changed, 33 insertions, 16 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 7ddf2f88b8a5..97c039e0c0db 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.99 2005/08/09 08:34:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.100 2005/08/25 23:06:50 vapier Exp $
+
+  25 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.12:
+  Update list output to show the active version for all targets.
 
   09 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -files/gcc-config-1.4.0, -gcc-config-1.4.0.ebuild:
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 1a3e40162625..7cdf16114a65 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -7,7 +7,7 @@ MD5 cd10419eb3bb6bca89691a1d3679f324 gcc-config-1.3.12-r2.ebuild 1392
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 8ddb51e4d22a768b490aea079b28c334 gcc-config-1.3.11-r3.ebuild 1387
 MD5 e1e82310909ead9c8b474d56cb94ee8c gcc-config-1.3.10-r1.ebuild 1393
-MD5 c3f2535a7028dc981a7bbf4e5b0e2c24 ChangeLog 20368
+MD5 0c4ac926940a46292f4a7ac68bb84136 ChangeLog 20506
 MD5 4f38cac9c208dfd3f4e8b798a8108366 gcc-config-1.3.12.ebuild 1389
 MD5 d153788edf3039aa4f68ae41bf46bf0d files/gcc-config-1.3.11 15776
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r4 0
@@ -19,12 +19,12 @@ MD5 e3203a5aa6df669ffa479aeeb7605029 files/wrapper-1.4.5.c 10671
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10-r1 0
 MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
 MD5 72557949fda7b1226549291b8f171e15 files/wrapper-1.4.6.c 10568
-MD5 94f79c9743fc9a40b2203f90bbd42b88 files/gcc-config-1.3.12 16247
+MD5 3476857382b4719438ec3d1e5a3505b7 files/gcc-config-1.3.12 16621
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDBt2VgIKl8Uu19MoRAjXMAJ0eddNOGuZ+NLEbpLg6Z4HNhrY+kACfajJl
-KEObq1HasnqNYwsn3VM5dCg=
-=XrIU
+iD8DBQFDDk9HgIKl8Uu19MoRAmFKAJ9UObayH+ZIJowRdS5AVUj5xvw8YgCfQeE/
+zZf7ikt788ZldtW6vH1N3CA=
+=/ntP
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.12 b/sys-devel/gcc-config/files/gcc-config-1.3.12
index 9366d86756e4..25abc348a769 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.12
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.12
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 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.12,v 1.4 2005/08/20 07:36:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.5 2005/08/25 23:06:50 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -323,21 +323,35 @@ get_current_profile() {
 list_profiles() {
 	local i=1
 
+	if [[ ${ROOT} != "/" ]] ; then
+		echo "Using gcc-config info in ${ROOT}"
+	fi
+
 	if [[ ! -f ${GCC_ENV_D}/config ]] ; then
 		eerror "$0: No gcc profile is active; please select one!"
-	else
-		get_current_profile >/dev/null
 	fi
 
-	if [[ ${ROOT} != "/" ]] ; then
-		echo "Using gcc-config info in ${ROOT}"
-	fi
+	eval $(grep ^CURRENT= "${GCC_ENV_D}"/config)
+	CURRENT_NATIVE=${CURRENT}
+	local target=
 	for x in "${GCC_ENV_D}"/* ; do
 		if [[ -f ${x} ]] && [[ ${x/\/config} == ${x} ]] ; then
+			source "${x}"
+			if [[ ${target} != ${CTARGET} ]] ; then
+				[[ -n ${target} ]] && echo
+				target=${CTARGET}
+				CTARGET=""
+			fi
+
 			x=${x##*/}
-			[[ ${x} == ${CURRENT} ]] && x="${x} *"
-			echo "[${i}] ${x}"
-			i=$((i + 1))
+			if [[ ${x} == ${CURRENT_NATIVE} ]] ; then
+				x="${x} ${GOOD}*${NORMAL}"
+			elif [[ -e ${GCC_ENV_D}/config-${target} ]] ; then
+				source "${GCC_ENV_D}/config-${target}"
+				[[ ${x} == ${CURRENT} ]] && x="${x} ${HILITE}*${NORMAL}"
+			fi
+			echo " [${i}] ${x}"
+			((++i))
 		fi
 	done
 }
@@ -546,7 +560,7 @@ for x in "$@" ; do
 							CC_COMP="${y##*/}"
 							break
 						fi
-						i=$((i + 1))
+						((++i))
 					done
 				else
 					# User gave us a full HOST-gccver