Fix multilib support with @GENTOO_LIBDIR@.

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

4 files changed, 19 insertions, 15 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index bfcdaab940ef..875215ffb48e 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,10 @@
 # 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.197 2011/11/11 16:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.198 2011/12/07 05:42:19 vapier Exp $
+
+  07 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.4.1,
+  files/gcc-config-1.5:
+  Fix multilib support with @GENTOO_LIBDIR@.
 
 *gcc-config-1.5-r2 (11 Nov 2011)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index f90066d64cba..39d01b92edc8 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gcc-config-1.4.1 21703 RMD160 cb01cc5713dec475ff07cfe4f94c038520692a8b SHA1 cae8ea36b179057979dcbe1122ef886d02bae679 SHA256 809e8c3234bf4138d5274ab2934c95e4d281fbea09d89e46ea0f686c4ca23c16
-AUX gcc-config-1.5 20073 RMD160 d74b1f29f1f2f2a7ecec11ce869fc5eaa72eb080 SHA1 38caed35e10df7f5163a43b2769e95aed7890601 SHA256 11e72ed88ab2adab94b6004d8a5b5891e2de711ada82581a8dde6d905d713845
+AUX gcc-config-1.4.1 21715 RMD160 21996c504686930b6d57d50d2988031ae254851a SHA1 e19d1d03675c1319bb4b1c07af75007eeaa6e168 SHA256 0b6fd9ff44350638b45875bf8e0c020c503a814270e2093733293d87e7ea26d6
+AUX gcc-config-1.5 20085 RMD160 5acb920190c96e75a524d35c1e5c9dafedad0f9e SHA1 b4e8d0dbe28d0737f3c7654d5ef1e49f00ddc775 SHA256 d35d9de2c3950c036a39c184dd5ef10777925d683b8b9c7a6ef6e33cecaddde9
 AUX wrapper-1.5.1.c 9788 RMD160 b628944ee01dd772eb917cd08d13dc41bf58409f SHA1 51ac1f9419bc2230a9ce2196e70b5ee4ba61be18 SHA256 991981059fdcd0a9c76d73ff2ce576e553f37ae7d3b378b92ead553963f7339a
 AUX wrapper-1.5.2.c 8021 RMD160 1b008c513fc38009665964b6dfeafa66e1899fb8 SHA1 1a83c24b859b0b61fe6dc420debe57054eb87a1b SHA256 5ed07f88103ecea30f66a4415421f90d1ddfdd4a902aa34a346a7883cd947e36
 EBUILD gcc-config-1.4.1-r1.ebuild 1645 RMD160 4d94a4a9be9fe092e6b6ba3f0cb665641271e58a SHA1 d9aa6e233c13827c6a551b9b6b3a21efe5eb230c SHA256 f19f05b52db8eb0816ad4953ecba68a28943a6c8948439edc35c56ce18761b1d
 EBUILD gcc-config-1.5-r1.ebuild 1647 RMD160 ebd03e749a514a0cf446ae323e7bf8e6926621e2 SHA1 da17446b4b83cce6d3d488b77eab1b1d7a496db8 SHA256 96e9b0e83ac1ce0e194f839b0dbfa713beb3951c7c53619fe80afaacba8f0c7b
 EBUILD gcc-config-1.5-r2.ebuild 1645 RMD160 faef9289957d5773629265777703b0d5c843067a SHA1 78e489d76d35ca3d1babc30cc7765a2cd37ad4e1 SHA256 754b43200ea77533efa3d582a457c960d864a3e1ab25c1abd49afeba5391f2c4
-MISC ChangeLog 35325 RMD160 fc99e00b6d910635b83c99bba21abde1f667edbf SHA1 849f6ef328fe21ff32a0b160119030c63dcb6025 SHA256 0ff1fd7b1a08b596ffb87ccb5abe39a623a88eeeb388e61c5f13e880a5f81048
+MISC ChangeLog 35469 RMD160 7778d17f2c7c9a03a18207dbaefb51f98f982607 SHA1 47e4364586ab1344477a49a6f64b5e98fde6d2d8 SHA256 242a84d3ba1bfd32510a81b887bc2ee6fb8f6cedb49275c278b997f6d7e71ea1
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk69SYcACgkQaC/OocHi7JbpnQEAml6T/6pgnlBNLIvMiGDr/LZE
-JY+f6DOo92P3TgZ8hC8A/2nxTU8C2OeiYen1CyUE04TEeuZkNbO/XwZ0IBQb9tm1
-=MUWB
+iF4EAREIAAYFAk7e/MMACgkQaC/OocHi7JYwfgD/RtkfTro+wOML3y85aDnBqr+U
+MWvke1eeEpzn+VV+DIcA/3ZhfdY9QRekyrKuwB2a6gJjiQ9rLf0uRWXQJbMJbahC
+=g59F
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.1 b/sys-devel/gcc-config/files/gcc-config-1.4.1
index 53b71f16f434..4d9d2524e58b 100644
--- a/sys-devel/gcc-config/files/gcc-config-1.4.1
+++ b/sys-devel/gcc-config/files/gcc-config-1.4.1
@@ -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.4.1,v 1.11 2011/03/07 12:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.12 2011/12/07 05:42:19 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -19,7 +19,7 @@ umask 022
 SED=$(type -P gsed)
 SED=${SED:-$(type -P sed)}
 
-GENTOO_LIBDIR="lib"
+GENTOO_LIBDIR="@GENTOO_LIBDIR@"
 [[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib"
 
 usage() {
@@ -694,9 +694,9 @@ for x in "$@" ; do
 			rcsfile="$RCSfile: gcc-config-1.4.1,v $"
 			rcsfile=${rcsfile#: }
 			rcsfile=${rcsfile%,v*}
-			cvsrev="$Revision: 1.11 $"
+			cvsrev="$Revision: 1.12 $"
 			cvsrev=${cvsrev#: }
-			cvsdate="$Date: 2011/03/07 12:48:15 $"
+			cvsdate="$Date: 2011/12/07 05:42:19 $"
 			cvsdate=${cvsdate#: }
 			echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})"
 			exit 0
diff --git a/sys-devel/gcc-config/files/gcc-config-1.5 b/sys-devel/gcc-config/files/gcc-config-1.5
index ae9e580e6462..64eb6473aede 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.6 2011/11/11 16:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5,v 1.7 2011/12/07 05:42:19 vapier Exp $
 
 # Format of /etc/env.d/gcc/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -39,7 +39,7 @@ if ! type -P tac >/dev/null ; then
 	tac() { ${SED} -e '1!G;h;$!d' "$@" ; }
 fi
 
-GENTOO_LIBDIR="lib"
+GENTOO_LIBDIR="@GENTOO_LIBDIR@"
 [[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib"
 
 usage() {
@@ -633,9 +633,9 @@ for x in "$@" ; do
 			rcsfile="$RCSfile: gcc-config-1.5,v $"
 			rcsfile=${rcsfile#: }
 			rcsfile=${rcsfile%,v*}
-			cvsrev="$Revision: 1.6 $"
+			cvsrev="$Revision: 1.7 $"
 			cvsrev=${cvsrev#: }
-			cvsdate="$Date: 2011/11/11 16:12:49 $"
+			cvsdate="$Date: 2011/12/07 05:42:19 $"
 			cvsdate=${cvsdate#: }
 			echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})"
 			exit 0