Make gcc-config support gcc version strings containing '-'. This allows for wider multislot support.

Package-Manager: portage-2.0.51-r15

5 files changed, 28 insertions, 14 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index a8f873364dc5..0b66eff42590 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.78 2005/01/31 05:39:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.79 2005/02/01 05:38:27 eradicator Exp $
+
+*gcc-config-1.3.10-r1 (31 Jan 2005)
+
+  31 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  files/gcc-config-1.3.10, +gcc-config-1.3.10-r1.ebuild,
+  -gcc-config-1.3.10.ebuild:
+  Make gcc-config support gcc version strings containing '-'.  This allows for
+  wider multislot support.
 
 *gcc-config-1.3.10 (30 Jan 2005)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 78fa4401697f..8a2f28bac817 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d18eee9990d63f7d65853267584e5d32 ChangeLog 15670
+MD5 ac4b2313bf51b65d7c58382a72f06a4f ChangeLog 15957
 MD5 012868b502a874cc4f1abfa862bafb8a gcc-config-1.3.8-r4.ebuild 1429
 MD5 14131db9b618f3ccc2efbd915e0fbaf8 gcc-config-1.3.9.ebuild 1437
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 47ab493a752835edc3158beb3d6c8af7 gcc-config-1.3.10.ebuild 1508
+MD5 9118b0dcd3edf14c0a7cc9057af8c660 gcc-config-1.3.10-r1.ebuild 1511
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.9 0
 MD5 396974306d3ccab6db5354d94ffd21fd files/gcc-config-1.3.8 12498
@@ -13,12 +13,12 @@ MD5 e7c7a83406a374ee4262c97d6e5673b2 files/wrapper-1.4.3.c 7545
 MD5 7723c767ef3e4935c2299fb253412d7e files/wrapper-1.4.4.c 10132
 MD5 a6c7c0536d2ab7cfc65d7169178ab71d files/wrapper-1.4.5.c 10668
 MD5 0181c8024c1c636b700dbf7a11f07fd6 files/gcc-config-1.3.9 12641
-MD5 9c5f1032109e37d3f576d3ba2d1d28a9 files/gcc-config-1.3.10 13026
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10 0
+MD5 b979d8ab219868fc127151f6abe094eb files/gcc-config-1.3.10 13258
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB/c1oArHZZzCEUG0RArWmAJ9ZI5bza/oSsAbqr9lwhIA83cIT8gCaAwo5
-/fVoFboXBAOcfK2GwN0QOOo=
-=pYFM
+iD8DBQFB/xXgArHZZzCEUG0RAlUVAJ41aZcpT1pIB/gzT2wR+y6bNhmEUwCdGbyl
+eBgRemMJ81Bd+/7m+YnrvNE=
+=Y20n
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.10 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.10-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.10
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.10-r1
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.10 b/sys-devel/gcc-config/files/gcc-config-1.3.10
index b0009a2a5eb8..911e33c4acfe 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.10
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.10
@@ -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.10,v 1.1 2005/01/31 05:39:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.10,v 1.2 2005/02/01 05:38:27 eradicator Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 trap ":" INT QUIT TSTP
@@ -486,13 +486,18 @@ if [[ -z ${CC_COMP} ]] ; then
 fi
 
 if [[ ${DOIT} != "get_current_profile" ]] ; then
-	CC_COMP_NO_SPECS=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4"-"$5 }')
-
 	GCC_LIB=$(source "${GCC_ENV_D}/${CC_COMP}"
 		cmd_setup
 		echo ${LDPATH} | ${AWK} -F/ '{ print  "/"$2"/"$3"/"$4"/" }')
 
-	if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-} ]] || \
+	CC_COMP_TARGET=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4 }')
+	CC_COMP_VERSION=${CC_COMP/${CC_COMP_TARGET}-/}
+
+	if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]]; then
+		CC_COMP_VERSION=${CC_COMP_VERSION%-*}
+	fi
+
+	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
@@ -504,7 +509,8 @@ if [[ ${CHECK_CHOST} = "yes" ]] ; then
 	# Chosen CHOST are not the same as the real CHOST according to
 	# make.conf, and --use-portage-chost option was given, so do nothing
 	get_real_chost
-	[[ ${CC_COMP%-*} != ${REAL_CHOST} ]] && exit 0
+	CC_COMP_TARGET=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4 }')
+	[[ ${CC_COMP_TARGET} != ${REAL_CHOST} ]] && exit 0
 fi
 
 eval ${DOIT}
diff --git a/sys-devel/gcc-config/gcc-config-1.3.10.ebuild b/sys-devel/gcc-config/gcc-config-1.3.10-r1.ebuild
index 6fac1019fb3e..16122856cf16 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.10.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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/gcc-config-1.3.10.ebuild,v 1.1 2005/01/31 05:39:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.10-r1.ebuild,v 1.1 2005/02/01 05:38:27 eradicator Exp $
 
 inherit toolchain-funcs