From b93ae3e06bc5826955dc350a53de4d89d718ff5e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 7 Jan 2005 20:14:57 +0000
Subject: [PATCH] move multilib into unstable

---
 sys-devel/gcc-config/Manifest                | 16 +++++-----
 sys-devel/gcc-config/files/gcc-config-1.3.9  | 32 ++++++++++++--------
 sys-devel/gcc-config/gcc-config-1.3.9.ebuild |  3 +-
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index d078dca2e01f..40dbdc7b9e86 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 9f09057218a96b38cfeb526dfdf2eeae gcc-config-1.3.9.ebuild 1356
 MD5 5d9bf515454f54cc1fa8c6f39ff6dc25 ChangeLog 14989
 MD5 4b9c47ec37e9e99b4811baaca5c1ce8f gcc-config-1.3.8-r4.ebuild 1347
-MD5 8d1e179549c1c01e991cd0eebd80f0d8 gcc-config-1.3.9.ebuild 1371
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 7723c767ef3e4935c2299fb253412d7e files/wrapper-1.4.4.c 10132
+MD5 bd9ae2143c2f5ba864ec1261284d0689 files/gcc-config-1.3.8 12455
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r4 0
-MD5 9b21f65b6185fb72a0d9f7b045419292 files/gcc-config-1.3.9 12404
+MD5 fa87d6829c82df95a04f6cd1e6e15ade files/gcc-config-1.3.9 12598
+MD5 7723c767ef3e4935c2299fb253412d7e files/wrapper-1.4.4.c 10132
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.9 0
-MD5 bd9ae2143c2f5ba864ec1261284d0689 files/gcc-config-1.3.8 12455
 MD5 e7c7a83406a374ee4262c97d6e5673b2 files/wrapper-1.4.3.c 7545
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB26YEArHZZzCEUG0RApOaAJ9hB4fUnlQ9MPvJNGq65DTo2IipuwCfQfP/
-LY1/F7YONniyskajsbadkHg=
-=y1SZ
+iD8DBQFB3u3ProRuSHgZdywRAhQuAJ9Ds1R2qnrUwhAKh74zELR/bguD6wCfe3X5
+QOT39jv3AYhLkgeLQ0SGG8E=
+=01LC
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.9 b/sys-devel/gcc-config/files/gcc-config-1.3.9
index a481a9dd7ee7..4a6689342815 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.9
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.9
@@ -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.9,v 1.2 2005/01/05 08:31:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.9,v 1.3 2005/01/07 20:14:57 vapier Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 trap ":" INT QUIT TSTP
@@ -255,7 +255,11 @@ switch_profile() {
 
 get_current_profile() {
 	local conf="${GCC_ENV_D}/config"
-	[[ -n ${CTARGET} ]] && conf="${GCC_ENV_D}/config-${CTARGET}"
+	if [[ -n ${CTARGET} ]] ; then
+		conf="${conf}-${CTARGET}"
+	elif [[ -f ${GCC_ENV_D}/config-${CC_COMP} ]] ; then
+		conf="${conf}-${CC_COMP}"
+	fi
 
 	if [[ ! -f ${conf} ]] ; then
 		eerror "$0: No gcc profile is active!"
@@ -438,7 +442,9 @@ for x in "$@" ; do
 				else
 					# User gave us a full HOST-gccver
 					x=${x##*/}
-					if [[ ! -f ${GCC_ENV_D}/${x} ]] ; then
+					if [[ ${DOIT} != "get_current_profile" ]] && \
+					   [[ ! -f ${GCC_ENV_D}/${x} ]]
+					then
 						eerror "$0: Could not locate '$x' in '${GCC_ENV_D}/'!"
 						exit 1
 					fi
@@ -466,17 +472,19 @@ if [[ -z ${CC_COMP} ]] ; then
 	fi
 fi
 
-CC_COMP_NO_SPECS=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4"-"$5 }')
+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"/" }')
+	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##*-} ]] || \
-   [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]]
-then
-	eerror "$0: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2
-	#exit 1
+	if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-} ]] || \
+	   [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]]
+	then
+		eerror "$0: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2
+		#exit 1
+	fi
 fi
 
 if [[ ${CHECK_CHOST} = "yes" ]] ; then
diff --git a/sys-devel/gcc-config/gcc-config-1.3.9.ebuild b/sys-devel/gcc-config/gcc-config-1.3.9.ebuild
index 9c55ac2fa4d7..4963fc34b21b 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.9.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.9.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.9.ebuild,v 1.2 2005/01/03 00:02:43 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.9.ebuild,v 1.3 2005/01/07 20:14:57 vapier Exp $
 
 inherit toolchain-funcs
 
@@ -14,7 +14,6 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="-*"
 IUSE=""
 
 DEPEND="virtual/libc
-- 
2.26.2