Default to /etc/portage/make.conf #338032 by Dennis Schridde.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 18 insertions, 12 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 8dc3d9d7b62a..255768c4b877 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.191 2011/03/18 19:47:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.192 2011/03/21 13:49:02 vapier Exp $
+
+  21 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.5:
+  Default to /etc/portage/make.conf #338032 by Dennis Schridde.
 
 *gcc-config-1.5-r1 (18 Mar 2011)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 0000752f8743..513eee3d6316 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX gcc-config-1.4.1 21703 RMD160 cb01cc5713dec475ff07cfe4f94c038520692a8b SHA1 cae8ea36b179057979dcbe1122ef886d02bae679 SHA256 809e8c3234bf4138d5274ab2934c95e4d281fbea09d89e46ea0f686c4ca23c16
-AUX gcc-config-1.5 19395 RMD160 6d4d70fde46c29d7683c13ad33e574f44f599138 SHA1 8074d60e80d65f149f6af40d300a06e843d0df52 SHA256 6a3a31ec500357dff2f6d3aa01ead9de7c186bef415de19fa0ad78bd1a22a1b1
+AUX gcc-config-1.5 19498 RMD160 804f6fcc4cc32497287075c31b33ace61b13c2ba SHA1 9d3477e9382fe606a9c25999ec147f464019d04e SHA256 12363295a56d32b77018ee94e8cf93aa707bf692bb928c0b6b3769c4be5de0ec
 AUX wrapper-1.5.1.c 9788 RMD160 b628944ee01dd772eb917cd08d13dc41bf58409f SHA1 51ac1f9419bc2230a9ce2196e70b5ee4ba61be18 SHA256 991981059fdcd0a9c76d73ff2ce576e553f37ae7d3b378b92ead553963f7339a
 AUX wrapper-1.5.2.c 7968 RMD160 b550c9f5ca378b4aba3ea493093bbb50255edb11 SHA1 8504af6612ba2ae59fe839224865beac1fea910f SHA256 190540ec2c820a6868b4cb3bf4eeda8134071f01ef666c8b405cbaec9130e45d
 EBUILD gcc-config-1.4.1.ebuild 1642 RMD160 b6af302e3654e7dbf5aa808e0c037c66df810ae8 SHA1 b5853c35cf17285d852ef424f12bb1eb0f1b19ab SHA256 5ad070e899901f17a57a515829d83a243ae79ffe5dbe46999328139e13cc9d23
 EBUILD gcc-config-1.5-r1.ebuild 1646 RMD160 8cb85f46321682f6314dae0eb0d88edf4d4a399c SHA1 748986759f14006326a2e35da4e27a82c5617261 SHA256 bc1e4b67d12a02e3f357b3d3f4a983df248c41ba6917eac99dfb031c4245dd36
-MISC ChangeLog 34391 RMD160 885a06d966a7aaac265a69515e5a170a347a0654 SHA1 fab1583912d7e42a0c5c1db86289b3c25d861dff SHA256 ff2b485b9a66fdbc5f73622da8c608d36d52b599b128e87e70dbc48a1badf2d5
+MISC ChangeLog 34528 RMD160 f0ad4b7ce3d9827595ca51025993463ed3801b1c SHA1 fbd566edb67e6897a2864850c71cb7dd37018a67 SHA256 39d67e24cafe3577817a1ade93642b123d588e8d21e5893999b62f76dfaa468a
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2Dtt4ACgkQaC/OocHi7JaMOQD+OFDOJlB773cnDTMWkN0MZkIM
-qSctVMGCY/4mRudsyOUA/RQME/gVeF82BfkBqcZR8j3ht0lkRxXtNV578fvfnMTb
-=8gm7
+iF4EAREIAAYFAk2HV1UACgkQaC/OocHi7JbNBQD+PE24jx0XOlnHhkPcSQhHuSZd
+l2cFsMEvljTrub1uYRoA/0yAK+UgBMdScg43UDETgyp/VdNr6W4GxPJnutqUqyPn
+=q9uc
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.5 b/sys-devel/gcc-config/files/gcc-config-1.5
index badbf4352abe..46e7b5c1511d 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.5
+++ b/sys-devel/gcc-config/files/gcc-config-1.5
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2011 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.5,v 1.4 2011/03/07 12:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5,v 1.5 2011/03/21 13:49:02 vapier Exp $
 
 # Format of /etc/env.d/gcc/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -47,7 +47,7 @@ Options:
   -O, --use-old              Use the old profile if one was selected.
   -f, --force                Make sure all config files are regenerated.
   -P, --use-portage-chost    Only set to given profile if its CHOST is the
-                             same as that set for portage in /etc/make.conf
+                             same as that set in /etc/portage/make.conf
                              (or one of other portage config files...).
   -c, --get-current-profile  Print current used gcc profile.
   -l, --list-profiles        Print a list of available profiles.
@@ -84,7 +84,10 @@ try_real_hard_to_find_CHOST() {
 	#
 
 	local varname=${1:-CHOST}
-	local conf=${ROOT}/etc/make.conf
+	local conf=${ROOT}/etc/portage/make.conf
+	if [[ ! -e ${conf} && -e ${ROOT}/etc/make.conf ]] ; then
+		conf=${ROOT}/etc/make.conf
+	fi
 	local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname})
 	if [[ -z ${ret} ]] ; then
 		# newer portage supports spaces between the var and =
@@ -132,7 +135,7 @@ get_real_chost() {
 	if [[ -z ${REAL_CHOST} ]] ; then
 		eerror "${argv0}: Could not get portage CHOST!"
 		eerror "${argv0}: You should verify that CHOST is set in one of these places:"
-		eerror "${argv0}:  - ${ROOT}/etc/make.conf"
+		eerror "${argv0}:  - ${ROOT}/etc/portage/make.conf"
 		eerror "${argv0}:  - active environment"
 		exit 1
 	fi
@@ -618,9 +621,9 @@ for x in "$@" ; do
 			rcsfile="$RCSfile: gcc-config-1.5,v $"
 			rcsfile=${rcsfile#: }
 			rcsfile=${rcsfile%,v*}
-			cvsrev="$Revision: 1.4 $"
+			cvsrev="$Revision: 1.5 $"
 			cvsrev=${cvsrev#: }
-			cvsdate="$Date: 2011/03/07 12:48:15 $"
+			cvsdate="$Date: 2011/03/21 13:49:02 $"
 			cvsdate=${cvsdate#: }
 			echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})"
 			exit 0