Update wrapper to also treat symlinks as valid targets - this fixes a problem

where -gcc called the symlink, and not the proper binary. Also fix a few
issues where we used data->tmp as they can cause possible corruption when used
in recursive calls and child functions.  Closes bug #39162.

7 files changed, 1328 insertions, 15 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 4a876860c2ff..78c25337065d 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/gcc-config
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.39 2003/11/18 19:39:07 azarah Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.40 2004/02/08 16:52:01 azarah Exp $
+
+*gcc-config-1.3.5 (08 Feb 2004)
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.3.5.ebuild,
+  files/gcc-config-1.3.5, files/wrapper-1.4.2.c:
+  Update wrapper to also treat symlinks as valid targets - this fixes a problem
+  where $CHOST-gcc called the symlink, and not the proper binary. Also fix a few
+  issues where we used data->tmp as they can cause possible corruption when used
+  in recursive calls and child functions.  Closes bug #39162.
 
 *gcc-config-1.3.4 (18 Nov 2003)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 23dfb6269ece..30beaf1e6516 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,17 +1,21 @@
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.4 0
-MD5 98e773e0836193330f1f5e142b6070bf files/wrapper-1.4.1.c 7293
-MD5 44cb03b926702bd77bb7bbe84499348e files/gcc-config-1.4 11992
-MD5 27740a9a29d5fa3a86a48a49da0c6a5c files/wrapper-1.4.c 5643
-MD5 51c8a36290be038e2e0b428ab0935ad7 files/gcc-config-1.3.4-multi-ldpath 8862
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.3-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.3-r2 0
-MD5 75e41d204ac752b91f0d24ddaf486ee4 files/gcc-config-1.3.3 8821
-MD5 0039595dcce02f293f2d6016646cc56b files/gcc-config-1.3.4 8843
-MD5 38cdf2331e78ec65c5a18c6a73f2dc1a files/gcc-config-1.4.1 12952
-MD5 a4fe6c2cc89bb24276a53da0fb4def9e files/wrapper.c 3527
-MD5 af952c4f9df4a9fa7400ae12e4764b80 files/gcc-config-1.3.3-multi-ldpath 8843
 MD5 f57433fe803b4ca8fc0cc654d14e4b2d gcc-config-1.3.3-r2.ebuild 2214
+MD5 c07dcdf7c6867bc8970f2b720fd82e3a ChangeLog 8022
 MD5 4f6a2905766277384392f00e0fcbbce2 gcc-config-1.3.3-r1.ebuild 2233
 MD5 da6ab4a1126cc412a1bf451345ae00d2 gcc-config-1.3.4.ebuild 2337
-MD5 c07dcdf7c6867bc8970f2b720fd82e3a ChangeLog 8022
+MD5 7634502254159e2d40801868c10bfb86 .gcc-config-1.3.5.ebuild.swp 12288
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 7861121af337d73704fe6233a7d3e5ee gcc-config-1.3.5.ebuild 2345
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.5 0
+MD5 0039595dcce02f293f2d6016646cc56b files/gcc-config-1.3.4 8843
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.4 0
+MD5 38cdf2331e78ec65c5a18c6a73f2dc1a files/gcc-config-1.4.1 12952
+MD5 33b2741082a40db3bff98956037bc142 files/wrapper-1.4.2.c 7328
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.3-r2 0
+MD5 44cb03b926702bd77bb7bbe84499348e files/gcc-config-1.4 11992
+MD5 a4fe6c2cc89bb24276a53da0fb4def9e files/wrapper.c 3527
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.3-r1 0
+MD5 51c8a36290be038e2e0b428ab0935ad7 files/gcc-config-1.3.4-multi-ldpath 8862
+MD5 27740a9a29d5fa3a86a48a49da0c6a5c files/wrapper-1.4.c 5643
+MD5 98e773e0836193330f1f5e142b6070bf files/wrapper-1.4.1.c 7293
+MD5 af952c4f9df4a9fa7400ae12e4764b80 files/gcc-config-1.3.3-multi-ldpath 8843
+MD5 75e41d204ac752b91f0d24ddaf486ee4 files/gcc-config-1.3.3 8821
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.5 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.5
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.5
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.5 b/sys-devel/gcc-config/files/gcc-config-1.3.5
new file mode 100644
index 000000000000..f59202119ef1
--- /dev/null
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.5
@@ -0,0 +1,447 @@
+#!/bin/bash
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.5,v 1.1 2004/02/08 16:52:01 azarah Exp $
+
+
+source /etc/init.d/functions.sh || {
+	echo "$0: Could not source /etc/init.d/functions.sh!"
+	exit 1
+}
+
+usage() {
+cat << "USAGE_END"
+Usage: gcc-config [Option] [CC Profile]
+Change the current cc/gcc profile, or give info about profiles.
+
+Options:
+
+  -O, --use-old
+                         Use the old profile if one was selected.
+	
+  -P, --use-portage-chost
+                         Only set to given profile if its CHOST is the same
+                         as that set for portage in /etc/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.
+
+  -E, --print-environ
+                         Print environment that can be used to setup things
+                         for current gcc profile, or specified one ...
+	
+  -B, --get-bin-path
+                         Print path where binaries of given/current profile
+                         are located.
+	
+  -L, --get-lib-path
+                         Print path where libraries of given/current profile
+                         are located.
+
+  -X, --get-stdcxx-incdir
+                         Print path to g++ include files of given/current
+                         profile.
+	
+The profile name is in the form of:
+
+  <CHOST>-<gcc version>
+
+For example:
+
+  i686-pc-linux-gnu-3.2.1
+
+
+
+USAGE_END
+
+	exit 1
+}
+
+if [ "$#" -lt 1 ]
+then
+	usage
+fi
+
+HAVE_WHICH="no"
+if [ -n "$(which which 2> /dev/null)" ]
+then
+	HAVE_WHICH="yes"
+fi
+
+find_path() {
+	[ -z "$1" ] && return 0
+
+	if [ "${HAVE_WHICH}" = "yes" ]
+	then
+		local fullpath="$(which $1 2> /dev/null)"
+		
+		if [ -x "${fullpath}" ]
+		then
+			echo "${fullpath}"
+			return 0
+		fi
+	fi
+
+	for x in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin
+	do
+		if [ -x "${x}/$1" -a -r "${x}/$1" ]
+		then
+			echo "${x}/$1"
+			return 0
+		fi
+	done
+
+	return 0
+}
+
+cmd_setup() {
+
+	# Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
+	# PATH among things...
+	CP="$(find_path cp)"
+	RM="$(find_path rm)"
+	MV="$(find_path mv)"
+	LN="$(find_path ln)"
+	CAT="$(find_path cat)"
+	AWK="$(find_path gawk)"
+	GREP="$(find_path grep)"
+	FIND="$(find_path find)"
+	CHMOD="$(find_path chmod)"
+	TOUCH="$(find_path touch)"
+	ENV_UPDATE="$(find_path env-update)"
+}
+
+CC_COMP=""
+
+get_real_chost() {
+	[ -n "${REAL_CHOST}" ] && return 0
+
+	# Use absolute path until all protage versions have portageq in /usr/bin
+	export REAL_CHOST="$(/usr/lib/portage/bin/portageq envvar CHOST)"
+
+	if [ -z "${REAL_CHOST}" ]
+	then
+		eerror "$0:  Could not get portage CHOST!"
+		return 1
+	fi
+}
+
+switch_profile() {
+	local MY_LDPATH=""
+	local GCC_PROFILES=""
+	local OLD_CC_COMP=""
+
+	if [ -r /etc/env.d/gcc/config ]
+	then
+		source /etc/env.d/gcc/config
+
+		if [ -n "${CURRENT}" ]
+		then
+			OLD_CC_COMP="${CURRENT}"
+		fi
+	fi
+
+	if [ "$(id -u)" -ne 0 ]
+	then
+		eerror "$0: Must be root."
+		exit 1
+	fi
+
+	ebegin "Switching to ${CC_COMP} compiler"
+
+	# Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
+	# PATH among things...
+	cmd_setup
+
+	# Order our profiles to have the default first...
+	# We do this so that we can have them ordered with default
+	# first in /etc/ld.so.conf, as the logical is that all
+	# 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} /etc/env.d/gcc/ -name "${REAL_CHOST}-*")"
+	GCC_PROFILES="${GCC_PROFILES/\/etc\/env.d\/gcc\/${CC_COMP}}"
+	GCC_PROFILES="/etc/env.d/gcc/${CC_COMP} ${GCC_PROFILES}"
+
+	# Extract all LDPATH's for our CHOST
+	for x in ${GCC_PROFILES}
+	do
+		if [ -f "${x}" ]
+		then
+			source "${x}"
+
+			if [ -z "${MY_LDPATH}" ]
+			then
+				if [ -d "${LDPATH}" ]
+				then
+					MY_LDPATH="${LDPATH}"
+				fi
+			else
+				if [ -d "${LDPATH}" ]
+				then
+					MY_LDPATH="${MY_LDPATH}:${LDPATH}"
+				fi
+			fi
+		fi
+	done
+
+	# Setup things properly again for this profile
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	# Setup /etc/env.d/05gcc
+	${AWK} '!/^STDCXX_INCDIR=|^LDPATH=/ {print $0}' \
+		"/etc/env.d/gcc/${CC_COMP}" > /etc/env.d/05gcc
+
+	# Add our custom LDPATH
+	echo "LDPATH=\"${MY_LDPATH}\"" >> /etc/env.d/05gcc
+
+	# Make sure we do not recreate /lib/cpp and /usr/bin/cc ...
+#	echo "DISABLE_GEN_GCC_WRAPPERS=\"yes\"" >> /etc/env.d/05gcc
+	
+	echo "CURRENT=${CC_COMP}" > /etc/env.d/gcc/config
+
+	source /etc/profile
+
+	# These might not be installed, and we want to update the mtime
+	# for ccache and distcc anyhow ...
+	${RM} -f /lib/cpp
+	${CP} -f /usr/lib/gcc-config/wrapper /lib/cpp
+	for x in gcc cpp cc c++ g++ "${REAL_CHOST}-gcc" "${REAL_CHOST}-c++" "${REAL_CHOST}-g++"
+	do
+		${RM} -f "/usr/bin/${x}"
+		${CP} -f /usr/lib/gcc-config/wrapper "/usr/bin/${x}"
+
+		if [ "${OLD_CC_COMP}" != "${CC_COMP}" ]
+		then
+			${TOUCH} -m "/usr/bin/${x}"
+		fi
+	done
+
+
+	${ENV_UPDATE} &> /dev/null
+
+	eend 0
+
+	if [ "${OLD_CC_COMP}" != "${CC_COMP}" ]
+	then
+		echo
+		ewarn "If you intend to use the gcc from the new profile in an already"
+		ewarn "running shell, please remember to do:"
+		echo
+		ewarn "  # source /etc/profile"
+		echo
+	fi
+
+	return 0
+}
+
+get_current_profile() {
+	if [ ! -f /etc/env.d/gcc/config ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	source /etc/env.d/gcc/config
+
+	if [ -z "${CURRENT}" ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	echo "${CURRENT}"
+
+	return 0
+}
+
+list_profiles() {
+	i=1
+	
+	if [ ! -f /etc/env.d/gcc/config ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	for x in /etc/env.d/gcc/*
+	do
+		if [ -f "${x}" -a "${x}" != "/etc/env.d/gcc/config" ]
+		then
+			echo "[${i}] ${x##*/}"
+			i=$((i + 1))
+		fi
+	done
+}
+
+print_environ() {
+	local OLDPATH="${PATH}"
+
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	echo "export PATH=\"${PATH}:${OLDPATH}\""
+
+#	if [ -z "${LD_LIBRARY_PATH}" ]
+#	then
+#		echo "export LD_LIBRARY_PATH=\"${LDPATH}\""
+#	else
+#		echo "export LD_LIBRARY_PATH=\"${LDPATH}:${LD_LIBRARY_PATH}\""
+#	fi
+
+	echo "export CC=\"${CC}\""
+	echo "export CXX=\"${CXX}\""
+}
+
+get_bin_path() {
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	echo "${PATH}"
+
+	return 0
+}
+
+get_lib_path() {
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	echo "${LDPATH}"
+
+	return 0
+}
+
+get_stdcxx_incdir() {
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	echo "${LDPATH}/include/${STDCXX_INCDIR}"
+
+	return 0
+}
+
+NEED_ACTION="yes"
+DOIT="switch_profile"
+CHECK_CHOST="no"
+
+for x in $*
+do
+	case "${x}" in
+		# 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)"
+			fi
+			;;
+		-P|--use-portage-chost)
+			CHECK_CHOST="yes"
+			;;
+		-c|--get-current-profile)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_current_profile"
+			fi
+			;;
+		-l|--list-profiles)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="list_profiles"
+			fi
+			;;
+		-E|--print-environ)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="print_environ"
+			fi
+			;;
+		-B|--get-bin-path)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_bin_path"
+			fi
+			;;
+		-L|--get-lib-path)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_lib_path"
+			fi
+			;;
+		-X|--get-stdcxx-incdir)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_stdcxx_incdir"
+			fi
+			;;
+		-*)
+			eerror "$0: Invalid switch!  Run $0 without parameters for help."
+			exit 1
+			;;
+		*)
+			if [ -z "${CC_COMP}" ]
+			then
+				if [ -n "`echo ${x} | gawk '/^[[:digit:]]*$/ { print }'`" ]
+				then
+					i=1
+					for y in /etc/env.d/gcc/*
+					do
+						[ "${y}" = "/etc/env.d/gcc/config" ] && continue
+						
+						if [ -f "${y}" -a "${x}" -eq "${i}" ]
+						then
+							CC_COMP="${y##*/}"
+							break
+						else
+							i=$((i + 1))
+						fi
+					done
+				else
+					CC_COMP="${x}"
+				fi
+			fi
+			;;
+	esac
+done
+
+if [ "${DOIT}" = "switch_profile" -a -z "${CC_COMP}" ]
+then
+	usage
+fi
+
+if [ -z "${CC_COMP}" ]
+then
+	if get_current_profile &> /dev/null
+	then
+		CC_COMP="$(get_current_profile)"
+	else
+		eerror "$0: No default profile setup!"
+		exit 1
+	fi
+fi
+
+if [ ! -d "/usr/lib/gcc-lib/${CC_COMP%-*}/${CC_COMP##*-}" -o \
+     ! -f "/etc/env.d/gcc/${CC_COMP}" ]
+then
+	eerror "$0: Profile does not exist!"
+	exit 1
+fi
+
+if [ "${CHECK_CHOST}" = "yes" ]
+then
+	# Chosen CHOST are not the same as the real CHOST according to
+	# make.conf, and --use-portage-chost option was given, so do nothing
+	get_real_chost
+	[ "${CC_COMP%-*}" != "${REAL_CHOST}" ] && exit 0
+fi
+
+eval ${DOIT}
+
+
+# vim:ts=4
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.5-multi-ldpath b/sys-devel/gcc-config/files/gcc-config-1.3.5-multi-ldpath
new file mode 100644
index 000000000000..6ee8708c6a39
--- /dev/null
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.5-multi-ldpath
@@ -0,0 +1,447 @@
+#!/bin/bash
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.5-multi-ldpath,v 1.1 2004/02/08 16:52:01 azarah Exp $
+
+
+source /etc/init.d/functions.sh || {
+	echo "$0: Could not source /etc/init.d/functions.sh!"
+	exit 1
+}
+
+usage() {
+cat << "USAGE_END"
+Usage: gcc-config [Option] [CC Profile]
+Change the current cc/gcc profile, or give info about profiles.
+
+Options:
+
+  -O, --use-old
+                         Use the old profile if one was selected.
+	
+  -P, --use-portage-chost
+                         Only set to given profile if its CHOST is the same
+                         as that set for portage in /etc/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.
+
+  -E, --print-environ
+                         Print environment that can be used to setup things
+                         for current gcc profile, or specified one ...
+	
+  -B, --get-bin-path
+                         Print path where binaries of given/current profile
+                         are located.
+	
+  -L, --get-lib-path
+                         Print path where libraries of given/current profile
+                         are located.
+
+  -X, --get-stdcxx-incdir
+                         Print path to g++ include files of given/current
+                         profile.
+	
+The profile name is in the form of:
+
+  <CHOST>-<gcc version>
+
+For example:
+
+  i686-pc-linux-gnu-3.2.1
+
+
+
+USAGE_END
+
+	exit 1
+}
+
+if [ "$#" -lt 1 ]
+then
+	usage
+fi
+
+HAVE_WHICH="no"
+if [ -n "$(which which 2> /dev/null)" ]
+then
+	HAVE_WHICH="yes"
+fi
+
+find_path() {
+	[ -z "$1" ] && return 0
+
+	if [ "${HAVE_WHICH}" = "yes" ]
+	then
+		local fullpath="$(which $1 2> /dev/null)"
+		
+		if [ -x "${fullpath}" ]
+		then
+			echo "${fullpath}"
+			return 0
+		fi
+	fi
+
+	for x in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin
+	do
+		if [ -x "${x}/$1" -a -r "${x}/$1" ]
+		then
+			echo "${x}/$1"
+			return 0
+		fi
+	done
+
+	return 0
+}
+
+cmd_setup() {
+
+	# Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
+	# PATH among things...
+	CP="$(find_path cp)"
+	RM="$(find_path rm)"
+	MV="$(find_path mv)"
+	LN="$(find_path ln)"
+	CAT="$(find_path cat)"
+	AWK="$(find_path gawk)"
+	GREP="$(find_path grep)"
+	FIND="$(find_path find)"
+	CHMOD="$(find_path chmod)"
+	TOUCH="$(find_path touch)"
+	ENV_UPDATE="$(find_path env-update)"
+}
+
+CC_COMP=""
+
+get_real_chost() {
+	[ -n "${REAL_CHOST}" ] && return 0
+
+	# Use absolute path until all protage versions have portageq in /usr/bin
+	export REAL_CHOST="$(/usr/lib/portage/bin/portageq envvar CHOST)"
+
+	if [ -z "${REAL_CHOST}" ]
+	then
+		eerror "$0:  Could not get portage CHOST!"
+		return 1
+	fi
+}
+
+switch_profile() {
+	local MY_LDPATH=""
+	local GCC_PROFILES=""
+	local OLD_CC_COMP=""
+
+	if [ -r /etc/env.d/gcc/config ]
+	then
+		source /etc/env.d/gcc/config
+
+		if [ -n "${CURRENT}" ]
+		then
+			OLD_CC_COMP="${CURRENT}"
+		fi
+	fi
+
+	if [ "$(id -u)" -ne 0 ]
+	then
+		eerror "$0: Must be root."
+		exit 1
+	fi
+
+	ebegin "Switching to ${CC_COMP} compiler"
+
+	# Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
+	# PATH among things...
+	cmd_setup
+
+	# Order our profiles to have the default first...
+	# We do this so that we can have them ordered with default
+	# first in /etc/ld.so.conf, as the logical is that all
+	# 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} /etc/env.d/gcc/ -name "${REAL_CHOST}-*")"
+	GCC_PROFILES="${GCC_PROFILES/\/etc\/env.d\/gcc\/${CC_COMP}}"
+	GCC_PROFILES="/etc/env.d/gcc/${CC_COMP} ${GCC_PROFILES}"
+
+	# Extract all LDPATH's for our CHOST
+	for x in ${GCC_PROFILES}
+	do
+		if [ -f "${x}" ]
+		then
+			source "${x}"
+
+			if [ -z "${MY_LDPATH}" ]
+			then
+#				if [ -d "${LDPATH}" ]
+#				then
+					MY_LDPATH="${LDPATH}"
+#				fi
+			else
+#				if [ -d "${LDPATH}" ]
+#				then
+					MY_LDPATH="${MY_LDPATH}:${LDPATH}"
+#				fi
+			fi
+		fi
+	done
+
+	# Setup things properly again for this profile
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	# Setup /etc/env.d/05gcc
+	${AWK} '!/^STDCXX_INCDIR=|^LDPATH=/ {print $0}' \
+		"/etc/env.d/gcc/${CC_COMP}" > /etc/env.d/05gcc
+
+	# Add our custom LDPATH
+	echo "LDPATH=\"${MY_LDPATH}\"" >> /etc/env.d/05gcc
+
+	# Make sure we do not recreate /lib/cpp and /usr/bin/cc ...
+#	echo "DISABLE_GEN_GCC_WRAPPERS=\"yes\"" >> /etc/env.d/05gcc
+	
+	echo "CURRENT=${CC_COMP}" > /etc/env.d/gcc/config
+
+	source /etc/profile
+
+	# These might not be installed, and we want to update the mtime
+	# for ccache and distcc anyhow ...
+	${RM} -f /lib/cpp
+	${CP} -f /usr/lib/gcc-config/wrapper /lib/cpp
+	for x in gcc cpp cc c++ g++ "${REAL_CHOST}-gcc" "${REAL_CHOST}-c++" "${REAL_CHOST}-g++"
+	do
+		${RM} -f "/usr/bin/${x}"
+		${CP} -f /usr/lib/gcc-config/wrapper "/usr/bin/${x}"
+
+		if [ "${OLD_CC_COMP}" != "${CC_COMP}" ]
+		then
+			${TOUCH} -m "/usr/bin/${x}"
+		fi
+	done
+
+
+	${ENV_UPDATE} &> /dev/null
+
+	eend 0
+
+	if [ "${OLD_CC_COMP}" != "${CC_COMP}" ]
+	then
+		echo
+		ewarn "If you intend to use the gcc from the new profile in an already"
+		ewarn "running shell, please remember to do:"
+		echo
+		ewarn "  # source /etc/profile"
+		echo
+	fi
+
+	return 0
+}
+
+get_current_profile() {
+	if [ ! -f /etc/env.d/gcc/config ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	source /etc/env.d/gcc/config
+
+	if [ -z "${CURRENT}" ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	echo "${CURRENT}"
+
+	return 0
+}
+
+list_profiles() {
+	i=1
+	
+	if [ ! -f /etc/env.d/gcc/config ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	for x in /etc/env.d/gcc/*
+	do
+		if [ -f "${x}" -a "${x}" != "/etc/env.d/gcc/config" ]
+		then
+			echo "[${i}] ${x##*/}"
+			i=$((i + 1))
+		fi
+	done
+}
+
+print_environ() {
+	local OLDPATH="${PATH}"
+
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	echo "export PATH=\"${PATH}:${OLDPATH}\""
+
+#	if [ -z "${LD_LIBRARY_PATH}" ]
+#	then
+#		echo "export LD_LIBRARY_PATH=\"${LDPATH}\""
+#	else
+#		echo "export LD_LIBRARY_PATH=\"${LDPATH}:${LD_LIBRARY_PATH}\""
+#	fi
+
+	echo "export CC=\"${CC}\""
+	echo "export CXX=\"${CXX}\""
+}
+
+get_bin_path() {
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	echo "${PATH}"
+
+	return 0
+}
+
+get_lib_path() {
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	echo "${LDPATH}"
+
+	return 0
+}
+
+get_stdcxx_incdir() {
+	source "/etc/env.d/gcc/${CC_COMP}"
+
+	echo "${LDPATH}/include/${STDCXX_INCDIR}"
+
+	return 0
+}
+
+NEED_ACTION="yes"
+DOIT="switch_profile"
+CHECK_CHOST="no"
+
+for x in $*
+do
+	case "${x}" in
+		# 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)"
+			fi
+			;;
+		-P|--use-portage-chost)
+			CHECK_CHOST="yes"
+			;;
+		-c|--get-current-profile)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_current_profile"
+			fi
+			;;
+		-l|--list-profiles)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="list_profiles"
+			fi
+			;;
+		-E|--print-environ)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="print_environ"
+			fi
+			;;
+		-B|--get-bin-path)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_bin_path"
+			fi
+			;;
+		-L|--get-lib-path)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_lib_path"
+			fi
+			;;
+		-X|--get-stdcxx-incdir)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_stdcxx_incdir"
+			fi
+			;;
+		-*)
+			eerror "$0: Invalid switch!  Run $0 without parameters for help."
+			exit 1
+			;;
+		*)
+			if [ -z "${CC_COMP}" ]
+			then
+				if [ -n "`echo ${x} | gawk '/^[[:digit:]]*$/ { print }'`" ]
+				then
+					i=1
+					for y in /etc/env.d/gcc/*
+					do
+						[ "${y}" = "/etc/env.d/gcc/config" ] && continue
+						
+						if [ -f "${y}" -a "${x}" -eq "${i}" ]
+						then
+							CC_COMP="${y##*/}"
+							break
+						else
+							i=$((i + 1))
+						fi
+					done
+				else
+					CC_COMP="${x}"
+				fi
+			fi
+			;;
+	esac
+done
+
+if [ "${DOIT}" = "switch_profile" -a -z "${CC_COMP}" ]
+then
+	usage
+fi
+
+if [ -z "${CC_COMP}" ]
+then
+	if get_current_profile &> /dev/null
+	then
+		CC_COMP="$(get_current_profile)"
+	else
+		eerror "$0: No default profile setup!"
+		exit 1
+	fi
+fi
+
+if [ ! -d "/usr/lib/gcc-lib/${CC_COMP%-*}/${CC_COMP##*-}" -o \
+     ! -f "/etc/env.d/gcc/${CC_COMP}" ]
+then
+	eerror "$0: Profile does not exist!"
+	exit 1
+fi
+
+if [ "${CHECK_CHOST}" = "yes" ]
+then
+	# Chosen CHOST are not the same as the real CHOST according to
+	# make.conf, and --use-portage-chost option was given, so do nothing
+	get_real_chost
+	[ "${CC_COMP%-*}" != "${REAL_CHOST}" ] && exit 0
+fi
+
+eval ${DOIT}
+
+
+# vim:ts=4
diff --git a/sys-devel/gcc-config/files/wrapper-1.4.2.c b/sys-devel/gcc-config/files/wrapper-1.4.2.c
new file mode 100644
index 000000000000..6dd14a3f15e3
--- /dev/null
+++ b/sys-devel/gcc-config/files/wrapper-1.4.2.c
@@ -0,0 +1,314 @@
+/*
+ * Copyright 1999-2003 Gentoo Technologies, Inc.
+ * Distributed under the terms of the GNU General Public License v2
+ * Author: Martin Schlemmer <azarah@gentoo.org>
+ * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.4.2.c,v 1.1 2004/02/08 16:52:01 azarah Exp $
+ */
+
+#define _REENTRANT
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <unistd.h>
+#include <wait.h>
+#include <libgen.h>
+#include <string.h>
+#include <stdarg.h>
+#include <errno.h>
+
+#define GCC_CONFIG	"/usr/bin/gcc-config"
+
+#ifndef CC_PROFILE
+# define ENVD_FILE	"/etc/env.d/05gcc"
+#else
+# define ENVD_FILE	"/etc/env.d/gcc/" CC_PROFILE
+#endif
+
+struct wrapper_data {
+	char name[MAXPATHLEN + 1];
+	char fullname[MAXPATHLEN + 1];
+	char bin[MAXPATHLEN + 1];
+	char tmp[MAXPATHLEN + 1];
+	
+	char *path;
+};
+
+static const char *wrapper_strerror(int err, struct wrapper_data *data)
+{
+	strerror_r(err, data->tmp, sizeof(data->tmp));
+	return data->tmp;
+}
+
+static void wrapper_exit(char *msg, ...)
+{   
+	va_list args;
+	va_start(args, msg);
+	vfprintf(stderr, msg, args);
+	va_end(args);
+	exit(1);
+}
+
+/* check_for_target checks in path for the file we are seeking 
+ * it returns 1 if found (with data->bin setup), 0 if not and
+ * negative on error
+ */
+static int check_for_target(char *path, struct wrapper_data *data) 
+{
+	struct stat sbuf;
+	int result = 0;
+	char str[MAXPATHLEN + 1];
+	size_t len = strlen(path) + strlen(data->name) + 2;
+
+	snprintf(str, len, "%s/%s", path, data->name);
+
+	/* Stat possible file to check that
+	 * 1) it exist and is a regular file, and
+	 * 2) it is not the wrapper itself, and
+	 * 3) it is in a /gcc-bin/ directory tree
+	 */
+	result = stat(str, &sbuf);
+	if ((0 == result) &&
+	    ((sbuf.st_mode & S_IFREG) || (sbuf.st_mode & S_IFLNK)) && 
+	    (0 != strcmp(str, data->fullname)) && 
+	    (0 != strstr(str, "/gcc-bin/"))) {
+		
+		strncpy(data->bin, str, MAXPATHLEN);
+		data->bin[MAXPATHLEN] = 0;
+		result = 1;
+	}
+	else
+		result = 0;
+
+	return result;
+}
+
+static int find_target_in_path(struct wrapper_data *data)
+{
+	char *token = NULL, *state;
+	char str[MAXPATHLEN + 1];
+	
+	if (NULL == data->path) return 0;
+
+	/* Make a copy since strtok_r will modify path */
+	snprintf(str, MAXPATHLEN + 1, "%s", data->path);
+	
+	token = strtok_r(str, ":", &state);
+
+	/* Find the first file with suitable name in PATH.  The idea here is
+	 * that we do not want to bind ourselfs to something static like the
+	 * default profile, or some odd environment variable, but want to be
+	 * able to build something with a non default gcc by just tweaking
+	 * the PATH ... */
+	while ((NULL != token) && (strlen(token) > 0)) {
+		
+		if (check_for_target(token, data))
+			return 1;
+		
+		token = strtok_r(NULL, ":", &state);
+	}
+	
+	return 0;
+}
+
+/* find_target_in_envd parses /etc/env.d/05gcc, and tries to
+ * extract PATH, which is set to the current profile's bin
+ * directory ...
+ */
+static int find_target_in_envd(struct wrapper_data *data)
+{
+	FILE *envfile = NULL;
+	char *token = NULL, *state;
+	char str[MAXPATHLEN + 1];
+	char *strp = str;
+
+	if (NULL == data->path) return 0;
+
+	envfile = fopen(ENVD_FILE, "r");
+	if (NULL == envfile)
+		return 0;
+
+	while (0 != fgets(strp, MAXPATHLEN, envfile)) {
+		
+		/* Keep reading ENVD_FILE until we get a line that
+		 * starts with 'PATH='
+		 */
+		if (((strp) && (strlen(strp) > strlen("PATH=")) &&
+			0 == strncmp("PATH=", strp, strlen("PATH=")))) {
+			
+			token = strtok_r(strp, "=", &state);
+			if ((NULL != token) && (strlen(token) > 0))
+				/* The second token should be the value of PATH .. */
+				token = strtok_r(NULL, "=", &state);
+			else {
+				fclose(envfile);
+				return 0;
+			}
+			
+			if ((NULL != token) && (strlen(token) > 0)) {
+				
+				strp = token;
+				/* A bash variable may be unquoted, quoted with " or
+				 * quoted with ', so extract the value without those ..
+				 */
+				token = strsep(&strp, "\n\"\'");
+
+				while (NULL != token) {
+					
+					if (check_for_target(token, data)) {
+
+						fclose(envfile);
+						return 1;
+					}
+
+					token = strsep(&strp, "\n\"\'");
+				}
+			}
+			
+		}
+		strp = str;
+	}
+
+	fclose(envfile);
+
+	return 0;
+}
+
+static void find_wrapper_target(struct wrapper_data *data) 
+{
+	FILE *inpipe = NULL;
+	char str[MAXPATHLEN + 1];
+
+#ifndef CC_PROFILE
+	if (find_target_in_path(data))
+		return;
+#endif
+
+	if (find_target_in_envd(data))
+		return;
+
+	/* Only our wrapper is in PATH, so 
+	   get the CC path using gcc-config and 
+	   execute the real binary in there... */
+#ifndef CC_PROFILE
+	inpipe = popen(GCC_CONFIG " --get-bin-path", "r");
+#else
+	inpipe = popen(GCC_CONFIG " --get-bin-path " CC_PROFILE, "r");
+#endif
+	if (NULL == inpipe)
+		wrapper_exit(
+			"Could not open pipe for gcc-config: %s\n",
+			wrapper_strerror(errno, data));
+
+	if (0 == fgets(str, MAXPATHLEN, inpipe))
+		wrapper_exit(
+			"Could not get compiler binary path: %s\n",
+			wrapper_strerror(errno, data));
+
+	strncpy(data->bin, str, sizeof(data->bin) - 1);
+	data->bin[strlen(data->bin) - 1] = '/';
+	strncat(data->bin, data->name, sizeof(data->bin) - 1);
+	data->bin[MAXPATHLEN] = 0;
+
+	pclose(inpipe);
+}
+
+/* This function modifies PATH to have gcc's bin path appended */
+static void modify_path(struct wrapper_data *data)
+{
+	char *newpath = NULL, *token = NULL, *state;
+	char dname_data[MAXPATHLEN + 1], str[MAXPATHLEN + 1];
+	char *str2 = dname_data, *dname = dname_data;
+	size_t len = 0;
+
+	if (NULL == data->bin)
+		return;
+
+	snprintf(str2, MAXPATHLEN + 1, "%s", data->bin);
+
+	if (NULL == (dname = dirname(str2)))
+		return;
+
+	if (NULL == data->path)
+		return;
+
+	/* Make a copy since strtok_r will modify path */
+	snprintf(str, MAXPATHLEN + 1, "%s", data->path);
+
+	token = strtok_r(str, ":", &state);
+
+	/* Check if we already appended our bin location to PATH */
+	if ((NULL != token) && (strlen(token) > 0)) {
+		if (0 == strcmp(token, dname))
+			return;
+	}
+
+	len = strlen(dname) + strlen(data->path) + 2;
+
+	newpath = (char *)malloc(len);
+	if (NULL == newpath)
+		wrapper_exit("wrapper: out of memory\n");
+	memset(newpath, 0, len);
+
+	snprintf(newpath, len, "%s:%s", dname, data->path);
+	setenv("PATH", newpath, 1);
+
+	if (newpath)
+		free(newpath);
+	newpath = NULL;
+}
+
+int main(int argc, char **argv) 
+{
+	struct wrapper_data *data;
+	size_t size;
+	char *path;
+	int result = 0;
+
+	data = alloca(sizeof(*data));
+	if (NULL == data) 
+		wrapper_exit("%s wrapper: out of memory\n", argv[0]);
+	memset(data, 0, sizeof(*data));
+
+	path = getenv("PATH");
+	if (NULL != path) {
+		data->path = strdup(getenv("PATH"));
+		if (NULL == data->path) 
+			wrapper_exit("%s wrapper: out of memory\n", argv[0]);
+	}
+		
+	/* What should we find ? */
+	strcpy(data->name, basename(argv[0]));
+
+	/* cc calls "/full/path/to/gcc" ... */
+	if (0 == strcmp(data->name, "cc"))
+		strcpy(data->name, "gcc");
+
+	/* What is the full name of our wrapper? */
+	size = sizeof(data->fullname);
+	result = snprintf(data->fullname, size, "/usr/bin/%s", data->name);
+	if ((-1 == result) || (result > size))
+		wrapper_exit("invalid wrapper name: \"%s\"\n", data->name);
+
+	find_wrapper_target(data);
+
+	modify_path(data);
+
+	if (data->path)
+		free(data->path);
+	data->path = NULL;
+
+	/* Set argv[0] to the correct binary, else gcc do not find internal
+	 * headers, etc (bug #8132). */
+	argv[0] = data->bin;
+
+	/* Ok, do it ... */
+	if (execv(data->bin, argv) < 0)
+		wrapper_exit("Could not run/locate \"%s\"\n", data->name);
+	
+	return 0;
+}
+
diff --git a/sys-devel/gcc-config/gcc-config-1.3.5.ebuild b/sys-devel/gcc-config/gcc-config-1.3.5.ebuild
new file mode 100644
index 000000000000..12da40e3d1c5
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.3.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.5.ebuild,v 1.1 2004/02/08 16:52:01 azarah Exp $
+
+IUSE=
+
+W_VER="1.4.2"
+
+DISABLE_GEN_GCC_WRAPPERS="yes"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Utility to change the gcc compiler being used."
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64 ~ppc64"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=sys-apps/portage-2.0.47-r10" # We need portageq ...
+
+
+src_install() {
+
+	# Setup PATH just in case ...
+	if /usr/bin/gcc-config --get-current-profile &> /dev/null
+	then
+		if [ -x /usr/bin/gcc-config ]
+		then
+			export PATH="`/usr/bin/gcc-config --get-bin-path`:${PATH}"
+		else
+			export PATH="`/usr/sbin/gcc-config --get-bin-path`:${PATH}"
+		fi
+	fi
+
+	einfo "Compiling wrapper..."
+	${CC:-gcc} -O2 -Wall -o ${WORKDIR}/wrapper \
+		${FILESDIR}/wrapper-${W_VER}.c || die
+
+	exeinto /usr/lib/gcc-config
+	doexe ${WORKDIR}/wrapper || die
+
+	# Only setup this if we have a proper gcc version installed, else
+	# we will nuke the non gcc-config versions ...
+	if /usr/bin/gcc-config --get-current-profile &> /dev/null
+	then
+		einfo "Creating wrappers for compiler tools..."
+		exeinto /lib
+		newexe ${WORKDIR}/wrapper cpp
+
+		exeinto /usr/bin
+		for x in gcc cpp cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++
+		do
+			newexe ${WORKDIR}/wrapper ${x}
+		done
+	fi
+
+	einfo "Adding compat symlinks..."
+	into /usr
+	dodir /usr/sbin
+	if [ "${ARCH}" = "amd64" ]
+	then
+		newbin ${FILESDIR}/${PN}-${PV}-multi-ldpath ${PN}
+	else
+		newbin ${FILESDIR}/${PN}-${PV} ${PN}
+	fi
+}
+
+pkg_postinst() {
+
+	# Do we have a valid multi ver setup ?
+	if ${ROOT}/usr/bin/gcc-config --get-current-profile &> /dev/null
+	then
+		# We not longer use the /usr/include/g++-v3 hacks, as
+		# it is not needed ...
+		if [ -L ${ROOT}/usr/include/g++ ]
+		then
+			rm -f ${ROOT}/usr/include/g++
+		fi
+		if [ -L ${ROOT}/usr/include/g++-v3 ]
+		then
+			rm -f ${ROOT}/usr/include/g++-v3
+		fi
+
+		if [ ${ROOT} = "/" ]
+		then
+			/usr/bin/gcc-config $(/usr/bin/gcc-config --get-current-profile)
+		fi
+	fi
+}
+