try even harder to find CHOST when python is broken

Package-Manager: portage-2.1.1_pre1-r1

2 files changed, 35 insertions, 9 deletions

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index c856432ba82c..c3bc6b72d20a 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,7 +1,10 @@
-AUX gcc-config-1.3.13 18125 RMD160 49eab57eddc25eca58293189fef4ffeb9a465957 SHA1 edc89b633363432bdf7cbd8ebfecfddaef72088b SHA256 015be2a22372836bb0ce7b41266f23e1e32772c655cdb76d3ce58fb6bd8a808a
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gcc-config-1.3.13 18389 RMD160 88bb29d20c12880067bcffaed40463af6c5b031e SHA1 a4beca22b39cf5b31dbfa3256ffd0f09aa279a74 SHA256 c08dbff910689594e19683084c553121c8a8d5a444e74d440c1a48debb655e7b
+MD5 223acb454ff40ed7456c3107e435fb5a files/gcc-config-1.3.13 18389
+RMD160 88bb29d20c12880067bcffaed40463af6c5b031e files/gcc-config-1.3.13 18389
+SHA256 c08dbff910689594e19683084c553121c8a8d5a444e74d440c1a48debb655e7b files/gcc-config-1.3.13 18389
 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
@@ -29,3 +32,10 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 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 v1.4.3 (GNU/Linux)
+
+iD8DBQFElwXRamhnQswr0vIRAl5AAKC9YeJyx9ZMWX2VlsUEBBfBjbXYWQCfW4C4
++PhTQzjleW+PrffAVLzT6JA=
+=5Er4
+-----END PGP SIGNATURE-----
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 1b32bcaf0cc8..3b56952da529 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.13
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.13
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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.7 2006/04/25 00:20:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v 1.8 2006/06/19 20:10:12 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -82,7 +82,11 @@ cmd_setup() {
 	ENV_UPDATE=$(find_path env-update)
 }
 
-cheap_portageq_envvar() {
+try_real_hard_to_find_CHOST() {
+	#
+	# First we read make.conf
+	#
+
 	local varname=$1
 	local conf=${ROOT}/etc/make.conf
 	local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname})
@@ -97,7 +101,19 @@ cheap_portageq_envvar() {
 			) ; echo ${!varname}
 		)
 	fi
-	echo ${ret}
+
+	if [[ -n ${ret} ]] ; then
+		echo ${ret}
+		return 0
+	fi
+
+	#
+	# Then we try /etc/env.d/gcc/config
+	#
+	if [[ -s ${ROOT}/etc/env.d/gcc/config ]] ; then
+		ret=$(split_gcc_ver $(<"${ROOT}"/etc/env.d/gcc/config))
+		echo ${ret% *}
+	fi
 }
 
 get_real_chost() {
@@ -113,7 +129,7 @@ get_real_chost() {
 	if ${PYTHON} -V &>/dev/null ; then
 		export REAL_CHOST=$(${ENV} -i ${PORTAGEQ} envvar CHOST 2>/dev/null)
 	else
-		export REAL_CHOST=$(cheap_portageq_envvar CHOST)
+		export REAL_CHOST=$(try_real_hard_to_find_CHOST)
 	fi
 
 	if [[ -z ${REAL_CHOST} ]] ; then
@@ -477,7 +493,7 @@ split_gcc_ver() {
 	# target [1]
 	#    accept everything we have left
 	#
-	echo "$@" | awk -F- '
+	echo "$@" | ${AWK:-awk} -F- '
 	function pushit(onme, pushee) {
 		return (onme == "" ? pushee : pushee"-"onme);
 	}