Update libgcj.pc symlinks #136382 #216241 and set GCC_SPECS with -E #251271 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 49 insertions, 18 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 3a090d7818c4..286caf9820e8 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc-config
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.177 2008/03/16 12:40:34 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.178 2009/01/28 02:32:51 vapier Exp $
+
+  28 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.4.1,
+  gcc-config-1.4.1.ebuild:
+  Update libgcj.pc symlinks #136382 #216241 and set GCC_SPECS with -E
+  #251271 by Diego E. Pettenò.
 
   16 Mar 2008; Christian Heim <phreak@gentoo.org> Manifest:
   Fixing the Manifest (emerge is complaining about missing
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 79d28395e60e..6cac8b01fce3 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -3,19 +3,19 @@ Hash: SHA1
 
 AUX gcc-config-1.3.16 19744 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae SHA1 88d6816fc979c7a9b800145a38e523dc4e462922 SHA256 c4c3ada7597b7a8610873ff2b45b0137264821df870a1700fd278727c72e3717
 AUX gcc-config-1.4.0 20822 RMD160 5f0865c95634a3748462e2b6da3f26aa3b62a8d5 SHA1 711c5ddf9ffe3f65a5a1bf39ce6aa3b40a178cb3 SHA256 877df92b4fdb064686b648e13b25e60c9a22e86a3ed8652f199e541d12bdbe44
-AUX gcc-config-1.4.1 20945 RMD160 72d1f3fe65b15948ad2019e7ef854f654b048f2b SHA1 9b83e3ea4a50adac2b7533bf78b860c4957ba11a SHA256 ca8d4b96d1672d8cef4be7cbdf6161797a2f673df162753fa8960243ba12ccd1
+AUX gcc-config-1.4.1 21666 RMD160 62b5ac30eda547226cccfeee31eceac1d79f7e75 SHA1 06e61308ab1864ae9c1d6a8de0451c757cd881c9 SHA256 e1fd51b4bfa1fab08c497482d58838b614f9f0d36b61ee4bd06f413924afa465
 AUX wrapper-1.4.8.c 9712 RMD160 1210dc111da9955926dc98264991e39489525f20 SHA1 6189891f1577451e34d4f7cc7ada851d63d2f352 SHA256 a45dec68f7a2b4f1d96e83181693afb10cf73b6fbdcd3456055e2bc64bc114e7
 AUX wrapper-1.5.0.c 9656 RMD160 9f2838e2bc1e43a752196930a94fdbb79a6efcda SHA1 f824622eeccfc60a8c07bb1878667ee5253c4e42 SHA256 df3fcb1d135d654b57fe685de5321fd1959296cabcbfcf1c3174e075286f5591
 AUX wrapper-1.5.1.c 9788 RMD160 b628944ee01dd772eb917cd08d13dc41bf58409f SHA1 51ac1f9419bc2230a9ce2196e70b5ee4ba61be18 SHA256 991981059fdcd0a9c76d73ff2ce576e553f37ae7d3b378b92ead553963f7339a
 EBUILD gcc-config-1.3.16.ebuild 1527 RMD160 69365cd208813bb12bd862588108334d0b3ef084 SHA1 0c724faff5a919c723ada92e2069fc480ae3ee53 SHA256 5996ca2ce991811fd6a0989c6bcaeb41f154585a8176c3499f3ec5f727c8b4ed
 EBUILD gcc-config-1.4.0-r4.ebuild 1678 RMD160 479bb75080507a991c8bced82dc051be906eb4a5 SHA1 c7d5bd1d3770648c5757360c5be863b3cc178d45 SHA256 a7f98327b8fbd2d587e7bbefcdb86fcb6ba6571ab92de8d2e4764dbd6e0ab2e1
-EBUILD gcc-config-1.4.1.ebuild 1688 RMD160 049dd70840948fb4f74a28efca7a606a24ae11f9 SHA1 dcd7d91b5fdc63e8b227063e65c8baf4043539da SHA256 64e78ed796ca6ad3826e7db412acbb2bd8499f3cceb94216b0c71ccc43b0862d
-MISC ChangeLog 32185 RMD160 7a4c6ba9f262a235443a7243ee3074fa6eb1d55e SHA1 0e3985559c6584b14d6a37b60391b36435c039f5 SHA256 d51db57ce61bfd63c9e949de51b08fc67b2370f35ab8571d1f6237dfb150ccde
+EBUILD gcc-config-1.4.1.ebuild 1653 RMD160 e96df948c2c9167e27b76c04a1992303cf434d4e SHA1 02851f81d60d5d481f5e65d93ba50d12d0c59fcc SHA256 21f0ab15e1e06a6cdee4c9ca803efea1d81a5b123991d246c8c0668c79c8ab9d
+MISC ChangeLog 32389 RMD160 1188cbcf6409fe47137c70de20a460989c00ee39 SHA1 25abc8990fe56127432073f5b81627f4a729a6a4 SHA256 2c414812172b5bd0e5d08efbbe81a48934ecc39424c138e277cabff7ae2c9d26
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkldYzoACgkQn/5bYzqsSmE12gCfdYt9WkhhEman5kA5Frr7tW6d
-IpMAn3qO7hPxZT6//rorZtMB5m8gRvR2
-=hODT
+iEYEARECAAYFAkl/w9gACgkQn/5bYzqsSmGbegCfdC77y4YUmLuoxJ1LCcHPjKQu
+L1oAmwbc1nx5YcxhsvWCECbO9Dw1cnD0
+=GF/6
 -----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 081fbe0e174c..d487d85fe72d 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.7 2008/03/16 01:20:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.8 2009/01/28 02:32:50 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -19,6 +19,9 @@ umask 022
 SED=$(type -P gsed)
 SED=${SED:-$(type -P sed)}
 
+GENTOO_LIBDIR="@GENTOO_LIBDIR@"
+[[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib"
+
 usage() {
 cat << "USAGE_END"
 Usage: gcc-config [options] [CC Profile]
@@ -273,7 +276,7 @@ switch_profile() {
 
 	# Find the bin wrapper
 	local wrapper
-	for wrapper in GENTOO_LIBDIR lib lib64 lib32 lib ; do
+	for wrapper in ${GENTOO_LIBDIR} lib lib64 lib32 lib ; do
 		wrapper="${ROOT}usr/${wrapper}/misc/gcc-config"
 		[[ -e ${wrapper} ]] && break
 	done
@@ -320,6 +323,18 @@ switch_profile() {
 		cp -f "${wrapper}" "${ROOT}/lib/cpp"
 	fi
 
+	# Relocate random crap
+	if ! is_cross_compiler ; then
+		if [[ -e ${ROOT}/usr/${GENTOO_LIBDIR}/pkgconfig/libgcj-${CC_COMP_VERSION}.pc ]] ; then
+			local mver=${CC_COMP_VERSION:0:3}
+			for x in "" "-${mver}" ; do
+				x="${ROOT}/usr/lib/pkgconfig/libgcj${x}.pc"
+				rm -f "${x}"
+				ln -s libgcj-${CC_COMP_VERSION}.pc "${x}"
+			done
+		fi
+	fi
+
 	# We need to make sure that libgcc_s.so / libunwind.so make it into /lib.
 	# On many systems (x86/amd64/etc...), this will probably never matter, 
 	# but on other systems (arm/mips/etc...), this is quite critical.
@@ -477,7 +492,12 @@ print_environ() {
 			;;
 	esac
 
-	echo "${ENV_CMD} PATH${SET_ELEMENT}\"${GCC_PATH}:${PATH}\""
+	(
+	PATH=${GCC_PATH}:${PATH}
+	for var in PATH GCC_SPECS ; do
+		echo "${ENV_CMD} ${var}${SET_ELEMENT}\"${!var}\""
+	done
+	)
 }
 
 get_bin_path() {
@@ -670,7 +690,14 @@ for x in "$@" ; do
 			usage 0
 			;;
 		-V|--version)
-			echo "gcc-config-PORTAGE-VERSION"
+			rcsfile="$RCSfile: gcc-config-1.4.1,v $"
+			rcsfile=${rcsfile#: }
+			rcsfile=${rcsfile%,v*}
+			cvsrev="$Revision: 1.8 $"
+			cvsrev=${cvsrev#: }
+			cvsdate="$Date: 2009/01/28 02:32:50 $"
+			cvsdate=${cvsdate#: }
+			echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})"
 			exit 0
 			;;
 		-*)
diff --git a/sys-devel/gcc-config/gcc-config-1.4.1.ebuild b/sys-devel/gcc-config/gcc-config-1.4.1.ebuild
index 1f47fa467bd4..0b844eef1145 100644
--- a/sys-devel/gcc-config/gcc-config-1.4.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.4.1.ebuild,v 1.1 2008/03/16 01:20:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.4.1.ebuild,v 1.2 2009/01/28 02:32:51 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs multilib
 
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!app-admin/eselect-compiler"
@@ -32,8 +32,7 @@ src_compile() {
 src_install() {
 	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config"
 	sed -i \
-		-e "s:PORTAGE-VERSION:${PVR}:g" \
-		-e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+		-e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \
 		"${D}"/usr/bin/${PN}
 
 	exeinto /usr/$(get_libdir)/misc