Add support for spaces in make.conf settings #105855.

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

3 files changed, 47 insertions, 16 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index b6d5aca3991c..2497ebdea03f 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.106 2005/09/16 11:20:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.107 2005/09/18 04:51:24 vapier Exp $
+
+  18 Sep 2005; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.12:
+  Add support for spaces in make.conf settings #105855.
 
   16 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   gcc-config-1.3.12-r2.ebuild:
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 801df198d64a..e5ed605a0718 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,20 +1,30 @@
-MD5 4f38cac9c208dfd3f4e8b798a8108366 gcc-config-1.3.12.ebuild 1389
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 0b06a536a1eed2690536cfdd6f503055 ChangeLog 21116
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 afc6f633e9ba456750668a4b552c9593 gcc-config-1.3.11-r4.ebuild 1379
+MD5 e7cff05773a87f50205a8777e899b626 gcc-config-1.3.12-r1.ebuild 1392
 MD5 95389ec5fa2833933f895e112caa78c6 gcc-config-1.3.12-r2.ebuild 1381
+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 afc6f633e9ba456750668a4b552c9593 gcc-config-1.3.11-r4.ebuild 1379
-MD5 e7cff05773a87f50205a8777e899b626 gcc-config-1.3.12-r1.ebuild 1392
+MD5 8a831316e897e5236a0e57636ce3061a ChangeLog 21246
+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
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12 0
-MD5 72557949fda7b1226549291b8f171e15 files/wrapper-1.4.6.c 10568
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r3 0
 MD5 4c31f7f5f8723588a4401dd102061301 files/gcc-config-1.3.10 13549
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10-r1 0
-MD5 e3203a5aa6df669ffa479aeeb7605029 files/wrapper-1.4.5.c 10671
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r4 0
+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 d153788edf3039aa4f68ae41bf46bf0d files/gcc-config-1.3.11 15776
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11-r3 0
-MD5 20de8c8784ad44678da552256fcd3559 files/gcc-config-1.3.12 16718
+MD5 72557949fda7b1226549291b8f171e15 files/wrapper-1.4.6.c 10568
+MD5 3ad3453c2b6d47e7f169f858eebce9f0 files/gcc-config-1.3.12 17101
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.12-r1 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLPJhgIKl8Uu19MoRAi7nAJ4iBomrKCElgZIEXYysEDTey/R3xgCfX9tx
+5C37NtwqtoA/pg0zgkBq0gY=
+=4EWF
+-----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 b39391a8b720..f11433a7cdc8 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.6 2005/09/02 05:05:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.7 2005/09/18 04:51:24 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -81,6 +81,24 @@ cmd_setup() {
 	ENV_UPDATE=$(find_path env-update)
 }
 
+cheap_portageq_envvar() {
+	local varname=$1
+	local conf=${ROOT}/etc/make.conf
+	local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname})
+	if [[ -z ${ret} ]] ; then
+		# newer portage supports spaces between the var and =
+		# CHOST     =  "this-is-retarded"
+		ret=$(eval $(
+			${SED} -n \
+				-e 's:[[:space:]]::g' \
+				-e '/^CHOST=/p' \
+				"${conf}"
+			) ; echo ${!varname}
+		)
+	fi
+	echo ${ret}
+}
+
 get_real_chost() {
 	[[ -n ${REAL_CHOST} ]] && return 0
 
@@ -88,7 +106,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=$(source "${ROOT}"/etc/make.conf ; echo ${CHOST})
+		export REAL_CHOST=$(cheap_portageq_envvar CHOST)
 	fi
 
 	if [[ -z ${REAL_CHOST} ]] ; then