Push out accumulated fixes.

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 89 insertions, 31 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 9321c28df08f..d3354a53055e 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.129 2006/06/15 19:10:43 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.130 2006/07/03 18:57:51 vapier Exp $
+
+*gcc-config-1.3.13-r3 (03 Jul 2006)
+
+  03 Jul 2006; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.13,
+  +gcc-config-1.3.13-r3.ebuild:
+  Push out accumulated fixes.
 
   16 Jun 2006; Joshua Kinard <kumba@gentoo.org> gcc-config-2.0.0_rc1.ebuild:
   De-keywording for now on mips. Will stay with gcc-config-1.3.x and see how
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index c3bc6b72d20a..ed85efe35edb 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,41 +1,41 @@
 -----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 gcc-config-1.3.13 18404 RMD160 89c9f18c3caf9de8939dd5bdc4a8b3841761d4f6 SHA1 168055b03bd37b1a82c8182c0d875aae92dd2e55 SHA256 55d3105bd4d8e6bea79142c55c4b3cbcf4c0aa74442b099a2aac69796656f4c6
+MD5 a930d9e04934a636845d5f2772fa794b files/gcc-config-1.3.13 18404
+RMD160 89c9f18c3caf9de8939dd5bdc4a8b3841761d4f6 files/gcc-config-1.3.13 18404
+SHA256 55d3105bd4d8e6bea79142c55c4b3cbcf4c0aa74442b099a2aac69796656f4c6 files/gcc-config-1.3.13 18404
 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
 SHA256 f462c49721d291ce3b91c46e5fb8e567d6344f0e359e788301bac07065987744 files/wrapper-1.4.7.c 9837
 DIST compiler-config-2.0.0_rc1.tar.gz 117180 RMD160 dbcd8120139c75f40ae2405746ab2a5f26e810b4 SHA1 3a1a1605dd0e8b59ba5d796c4583244f46f97a03 SHA256 a911a7b0a1184c576500df8530e77823f976dce387001c581ba89ac8edfe30c2
-EBUILD gcc-config-1.3.13-r2.ebuild 1468 RMD160 25506a9890f93371dd41f93e9348496dee4cccc6 SHA1 6804f0f1d4cab112ada14d4e6a6ff57d1eaf676f SHA256 5ad228a66aac8a1581df6ec44448f4de776480233fc741d6827e33aa6944fddf
-MD5 df98c534043def871c565512a9ecccd9 gcc-config-1.3.13-r2.ebuild 1468
-RMD160 25506a9890f93371dd41f93e9348496dee4cccc6 gcc-config-1.3.13-r2.ebuild 1468
-SHA256 5ad228a66aac8a1581df6ec44448f4de776480233fc741d6827e33aa6944fddf gcc-config-1.3.13-r2.ebuild 1468
+EBUILD gcc-config-1.3.13-r3.ebuild 1468 RMD160 f7e2104c5a6935238ffbe39a752676b4f4851f65 SHA1 7576618b04b4ddba92da5fa5bb36d2943ba2ed65 SHA256 01576cd72994f520956357d1dee43e039b86b8d0c74ec2cc3bdb848a378a805d
+MD5 7230bf99dcc7d1fc0c0b9b2a8a475e1b gcc-config-1.3.13-r3.ebuild 1468
+RMD160 f7e2104c5a6935238ffbe39a752676b4f4851f65 gcc-config-1.3.13-r3.ebuild 1468
+SHA256 01576cd72994f520956357d1dee43e039b86b8d0c74ec2cc3bdb848a378a805d gcc-config-1.3.13-r3.ebuild 1468
 EBUILD gcc-config-2.0.0_rc1.ebuild 775 RMD160 a41c99cba464ed16040552f329c067326094174d SHA1 4a7a816e8e3d596369a53e127ac8933bb5fe2aa2 SHA256 5be5dcd340934282c6147d8e90dd47a36b9af54416a301855e5f767f021f0a7a
 MD5 d7781cb8103fd03712bf341e79153ed0 gcc-config-2.0.0_rc1.ebuild 775
 RMD160 a41c99cba464ed16040552f329c067326094174d gcc-config-2.0.0_rc1.ebuild 775
 SHA256 5be5dcd340934282c6147d8e90dd47a36b9af54416a301855e5f767f021f0a7a gcc-config-2.0.0_rc1.ebuild 775
-MISC ChangeLog 25377 RMD160 20b2c07a47c6f4ae7afbba944564fe18e49a1452 SHA1 67f59459786340e74c1b5570b3153fb350dc080d SHA256 f876c79bbd5a77f8c88b42fd341da87ca5ac92d1fc3dbb091b23bd1f13a74a84
-MD5 7cd77cf898024d24f7a4e12b85196ed4 ChangeLog 25377
-RMD160 20b2c07a47c6f4ae7afbba944564fe18e49a1452 ChangeLog 25377
-SHA256 f876c79bbd5a77f8c88b42fd341da87ca5ac92d1fc3dbb091b23bd1f13a74a84 ChangeLog 25377
+MISC ChangeLog 25553 RMD160 53c7d7fba4fbf65913539d71b907e723e92d8349 SHA1 a7128da0edac1252a68138155624aedc970f3052 SHA256 93488cb55cd5478111820575744f324109bdd52935c5452eb5c35e19a1e2548b
+MD5 0b6a29abd1f86965cce47000359e589c ChangeLog 25553
+RMD160 53c7d7fba4fbf65913539d71b907e723e92d8349 ChangeLog 25553
+SHA256 93488cb55cd5478111820575744f324109bdd52935c5452eb5c35e19a1e2548b ChangeLog 25553
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gcc-config-1.3.13-r2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gcc-config-1.3.13-r2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gcc-config-1.3.13-r2 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gcc-config-1.3.13-r3 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gcc-config-1.3.13-r3 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gcc-config-1.3.13-r3 1
 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)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFElwXRamhnQswr0vIRAl5AAKC9YeJyx9ZMWX2VlsUEBBfBjbXYWQCfW4C4
-+PhTQzjleW+PrffAVLzT6JA=
-=5Er4
+iD8DBQFEqWi4amhnQswr0vIRAulWAJ9kbOh0UB30k03/PY4yR5yiAtzi9wCgrAtz
+HKoEeBnvtQV7e2OMOFvWqO0=
+=/G5B
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r3 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r3
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.13-r3
@@ -0,0 +1 @@
+
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 3b56952da529..c014087f27ec 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.8 2006/06/19 20:10:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v 1.9 2006/07/03 18:57:51 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -45,7 +45,7 @@ USAGE_END
 find_path() {
 	[[ -z $1 ]] && return 0
 
-	local fullpath="$(type -P $1)"
+	local fullpath=$(type -P $1)
 	
 	if [[ -x ${fullpath} ]] ; then
 		echo "${fullpath}"
@@ -94,7 +94,7 @@ try_real_hard_to_find_CHOST() {
 		# newer portage supports spaces between the var and =
 		# CHOST     =  "this-is-retarded"
 		ret=$(eval $(
-			${SED} -n \
+			${SED:-sed} -n \
 				-e 's:[[:space:]]::g' \
 				-e '/^CHOST=/p' \
 				"${conf}"
@@ -111,7 +111,7 @@ try_real_hard_to_find_CHOST() {
 	# 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))
+		ret=$(split_gcc_ver $(eval $(<"${ROOT}"/etc/env.d/gcc/config) ; echo ${CURRENT}))
 		echo ${ret% *}
 	fi
 }
@@ -174,7 +174,7 @@ switch_profile() {
 		# compilers for default CHOST will be used to compile stuff,
 		# and thus we want all their lib paths in /etc/ld.so.conf ...
 		get_real_chost
-		GCC_PROFILES="$(${FIND} "${GCC_ENV_D}" -maxdepth 1 -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}")"
+		GCC_PROFILES=$(${FIND} "${GCC_ENV_D}" -maxdepth 1 -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}")
 		GCC_PROFILES="${GCC_ENV_D}/${CC_COMP} ${GCC_PROFILES}"
 
 		# Extract all LDPATH's for our CHOST
@@ -184,7 +184,7 @@ switch_profile() {
 				source "${x}"
 
 				# Handle LDPATH's that have multiple directories
-				local old_IFS="${IFS}"
+				local old_IFS=${IFS}
 				export IFS=":"
 				local sub_ldpath=
 				for sub_ldpath in ${LDPATH} ; do
@@ -194,7 +194,7 @@ switch_profile() {
 						fi
 					fi
 				done
-				export IFS="${old_IFS}"
+				export IFS=${old_IFS}
 			fi
 		done
 		MY_LDPATH="${MY_LDPATH:1}" # trim leading :
@@ -204,7 +204,7 @@ switch_profile() {
 	unset GCC_SPECS LDPATH
 	source "${GCC_ENV_D}/${CC_COMP}"
 	OLD_CC_COMP=$(get_current_profile)
-	CTARGET="${CTARGET:-${REAL_CHOST}}"
+	CTARGET=${CTARGET:-${REAL_CHOST}}
 
 	# What kind of env.d entry are we going to generate ?
 	if is_cross_compiler ; then
@@ -242,7 +242,7 @@ switch_profile() {
 	fi
 
 	# Save PATH
-	GCC_BIN_PATH="${PATH}"
+	GCC_BIN_PATH=${PATH}
 	# Fix environment
 	source /etc/profile
 	umask 022
@@ -418,7 +418,7 @@ list_profiles() {
 }
 
 print_environ() {
-	local OLDPATH="${PATH}"
+	local OLDPATH=${PATH}
 	local ENV_CMD=
 	local SET_ELEMENT=
 
@@ -549,7 +549,7 @@ for x in "$@" ; do
 		# Only use specified compiler if one is not already selected.
 		-O|--use-old)
 			if get_current_profile &>/dev/null ; then
-				CC_COMP="$(get_current_profile)"
+				CC_COMP=$(get_current_profile)
 			else
 				eerror "No profile selected, unable to utilize --use-old"
 				exit 1
diff --git a/sys-devel/gcc-config/gcc-config-1.3.13-r3.ebuild b/sys-devel/gcc-config/gcc-config-1.3.13-r3.ebuild
new file mode 100644
index 000000000000..dcfe872581c1
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.3.13-r3.ebuild
@@ -0,0 +1,51 @@
+# 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/gcc-config-1.3.13-r3.ebuild,v 1.1 2006/07/03 18:57:51 vapier Exp $
+
+inherit toolchain-funcs multilib
+
+# Version of .c wrapper to use
+W_VER="1.4.7"
+
+DESCRIPTION="Utility to change the gcc compiler being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}
+
+src_compile() {
+	$(tc-getCC) -O2 -Wall -o wrapper \
+		"${FILESDIR}"/wrapper-${W_VER}.c || die "compile wrapper"
+}
+
+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" \
+		"${D}"/usr/bin/${PN}
+
+	exeinto /usr/$(get_libdir)/misc
+	newexe wrapper gcc-config || die "install wrapper"
+}
+
+pkg_postinst() {
+	# Do we have a valid multi ver setup ?
+	if gcc-config --get-current-profile &>/dev/null ; then
+		# We not longer use the /usr/include/g++-v3 hacks, as
+		# it is not needed ...
+		[[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++
+		[[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3
+		[[ ${ROOT} = "/" ]] && gcc-config $(/usr/bin/gcc-config --get-current-profile)
+	fi
+
+	# Make sure old versions dont exist #79062
+	rm -f "${ROOT}"/usr/sbin/gcc-config
+}