If python is broken due to libstdc++ changes or whatever, make sure gcc-config still works somewhat sanely.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 609 insertions, 3 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index b7aa58d8bbb3..43571bda2fef 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc-config
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.89 2005/04/10 13:44:54 josejx Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.90 2005/06/06 03:58:39 vapier Exp $
+
+*gcc-config-1.3.11 (06 Jun 2005)
+
+  06 Jun 2005; Mike Frysinger <vapier@gentoo.org> +files/gcc-config-1.3.11,
+  +gcc-config-1.3.11.ebuild:
+  If python is broken due to libstdc++ changes or whatever, make sure
+  gcc-config still works somewhat sanely.
 
   10 Apr 2005; Joseph Jezak <josejx@gentoo.org> gcc-config-1.3.10-r2.ebuild:
   Marked ppc stable.
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 49e5efc55d68..a6079eaef638 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,8 +1,11 @@
 MD5 a1e5f8b8fb9566f795d36754e8075eb8 gcc-config-1.3.10-r2.ebuild 1428
-MD5 725a521f55a7cd15204c51bed9f29da5 ChangeLog 18100
+MD5 25e9c7daea2f5ec79f223251f80c35cd ChangeLog 18352
+MD5 222626fe530d50f950df787d77867b68 gcc-config-1.3.11.ebuild 1425
 MD5 856d159682acb2dca11e43b8bbe42b70 gcc-config-1.4.0.ebuild 1896
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 106edaabe4dcbc34c50e9f5e4c18e2bf gcc-config-1.3.10-r1.ebuild 1431
+MD5 c8b4ba4abf6072f45fbeed5a3ce2168d files/gcc-config-1.3.11 14294
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.11 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0 0
 MD5 35bfdc34bf7a621fc41de516b13cb4ea files/gcc-config-1.4.0 14923
 MD5 4c31f7f5f8723588a4401dd102061301 files/gcc-config-1.3.10 13549
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.11 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.11
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.11
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.11 b/sys-devel/gcc-config/files/gcc-config-1.3.11
new file mode 100755
index 000000000000..b94f9887e52e
--- /dev/null
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.11
@@ -0,0 +1,548 @@
+#!/bin/bash
+# Copyright 1999-2005 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.11,v 1.1 2005/06/06 03:58:40 vapier Exp $
+
+trap ":" INT QUIT TSTP
+
+source /sbin/functions.sh || {
+	echo "$0: Could not source /sbin/functions.sh!"
+	exit 1
+}
+umask 022
+
+usage() {
+cat << "USAGE_END"
+Usage: gcc-config [options] [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.
+  -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
+                             (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 the
+                             current gcc profile, or a specified one.
+  -B, --get-bin-path         Print path where binaries of the given/current
+                             profile are located.
+  -L, --get-lib-path         Print path where libraries of the given/current
+                             profile are located.
+  -X, --get-stdcxx-incdir    Print path where g++ include files of the
+                             given/current profile are located.
+
+Profile names are of the form:  <CHOST>-<gcc version>
+For example:                    i686-pc-linux-gnu-3.2.1
+USAGE_END
+	exit $1
+}
+[[ $# -lt 1 ]] && usage 1
+
+find_path() {
+	[[ -z $1 ]] && return 0
+
+	local fullpath="$(type -P $1)"
+	
+	if [[ -x ${fullpath} ]] ; then
+		echo "${fullpath}"
+		return 0
+	fi
+
+	for x in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin ; do
+		if [[ -x ${x}/$1 ]] && [[ -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)
+	ENV=$(find_path env)
+	SED=$(find_path sed)
+	AWK=$(find_path gawk)
+	GREP=$(find_path grep)
+	FIND=$(find_path find)
+	CHMOD=$(find_path chmod)
+	TOUCH=$(find_path touch)
+	PYTHON=$(find_path python)
+	PORTAGEQ=$(find_path portageq)
+	ENV_UPDATE=$(find_path env-update)
+}
+
+get_real_chost() {
+	[[ -n ${REAL_CHOST} ]] && return 0
+
+	# make sure portage isnt broken
+	if ${PYTHON} -V &>/dev/null ; then
+		export REAL_CHOST=$(${ENV} -i ${PORTAGEQ} envvar CHOST 2>/dev/null)
+	else
+		export REAL_CHOST=$(source "${ROOT}"/etc/make.conf ; echo ${CHOST})
+	fi
+
+	if [[ -z ${REAL_CHOST} ]] ; then
+		eerror "$0: Could not get portage CHOST!"
+		return 1
+	fi
+}
+
+is_cross_compiler() {
+	get_real_chost
+	[[ ${CC_COMP/${REAL_CHOST}} == ${CC_COMP} ]]
+}
+
+switch_profile() {
+	local MY_LDPATH=
+	local GCC_PROFILES=
+	local OLD_CC_COMP=
+	local GCC_BIN_PATH=
+
+	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
+
+	if ! is_cross_compiler ; then
+		# 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} "${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
+		MY_LDPATH=""
+		for x in ${GCC_PROFILES} ; do
+			if [[ -f ${x} ]] ; then
+				source "${x}"
+
+				# Handle LDPATH's that have multiple directories
+				local old_IFS="${IFS}"
+				export IFS=":"
+				local sub_ldpath=
+				for sub_ldpath in ${LDPATH} ; do
+					if [[ -d ${sub_ldpath} ]] ; then
+						if [[ ${MY_LDPATH/:${sub_ldpath}} == ${MY_LDPATH} ]] ; then
+							MY_LDPATH="${MY_LDPATH}:${sub_ldpath}"
+						fi
+					fi
+				done
+				export IFS="${old_IFS}"
+			fi
+		done
+		MY_LDPATH="${MY_LDPATH:1}" # trim leading :
+	fi
+
+	# Setup things properly again for this profile
+	unset GCC_SPECS LDPATH
+	source "${GCC_ENV_D}/${CC_COMP}"
+	OLD_CC_COMP=$(get_current_profile)
+	CTARGET="${CTARGET:-${REAL_CHOST}}"
+
+	# What kind of env.d entry are we going to generate ?
+	if is_cross_compiler ; then
+		# Only keep PATH/ROOTPATH
+		${AWK} '/^(PATH|ROOTPATH)=/ {print $0}' \
+			"${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc-${CTARGET}"
+
+		echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}"
+	else
+		# Pass all by default
+		${AWK} '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS)=/ {print $0}' \
+			"${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc"
+		echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_D}/05gcc"
+		if [[ -n ${GCC_SPECS} ]] && [[ -e ${ROOT}/${GCC_SPECS} ]] ; then
+			echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc"
+		else
+			# People need to rebuild their gcc or setting GCC_SPECS to
+			# "" will cause issues again :(
+			if [[ ${ROOT} != "/" ]] ; then
+				echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+			else
+				if ! GCC_SPECS="" /usr/bin/gcc -v &>/dev/null ; then
+					echo
+					ewarn "Your gcc has a bug with GCC_SPECS."
+					ewarn "Please re-emerge gcc."
+					ewarn "http://bugs.gentoo.org/show_bug.cgi?id=68395"
+					echo
+				else
+					echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+				fi
+			fi
+		fi
+
+		echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config"
+	fi
+
+	# Save PATH
+	GCC_BIN_PATH="${PATH}"
+	# Fix environment
+	source /etc/profile
+	umask 022
+
+	# Update the wrappers for this profile
+	local native="gcc cpp cc c++ g++ f77 g77 gcj"
+	is_cross_compiler && native=""
+	for x in ${native} ${CTARGET}-{gcc,c++,g++,f77,g77,gcj} ; do
+		# Make sure we have no stale wrappers
+		${RM} -f "${ROOT}/usr/bin/${x}"
+		[[ ${x:${#x}-3} == "gcc" || ${x:${#x}-3} == "g++" ]] \
+			&& ${RM} -f "${ROOT}/usr/bin/${x}"{32,64}
+
+		# Only install a wrapper if the binary exists ...
+		# We want to figure out the 'reference file' for each 
+		# wrapper (the binary we're 'wrapping') so that we can 
+		# sync mtimes together.  This makes things like ccache
+		# happy.  See Bug #70548 for more info.
+		local ref=${ROOT}/${GCC_BIN_PATH}/${x}
+		[[ ${x} == "cc" ]] && ref=${ROOT}/${GCC_BIN_PATH}/gcc
+		if [[ -x ${ref} ]] ; then
+			${CP} -f "${ROOT}/usr/lib/misc/gcc-config" \
+			         "${ROOT}/usr/bin/${x}"
+			${TOUCH} -r "${ref}" "${ROOT}/usr/bin/${x}"
+
+			# Install 32bit and 64bit wrappers if need be
+			# This should probably get folded back into the wrapper ...
+			if [[ ${x:${#x}-3} == "gcc" ]] || [[ ${x:${#x}-3} == "g++" ]] ; then
+				for bits in ${GCCBITS} ; do
+					${CP} -f "${ROOT}/usr/lib/misc/gcc-config" \
+						"${ROOT}/usr/bin/${x}${bits}"
+				done
+			fi
+		fi
+	done
+	# Only install cpp if switching to a native one
+	if ! is_cross_compiler && [[ ${CTARGET} != *-solaris* ]] ; then
+		${RM} -f "${ROOT}/lib/cpp"
+		${CP} -f "${ROOT}/usr/lib/misc/gcc-config" "${ROOT}/lib/cpp"
+	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.
+	# http://bugs.gentoo.org/show_bug.cgi?id=60190
+	#
+	# Don't copy the library if we're being called by portage because 
+	# this may cause python to start segfaulting all over the place 
+	# since on many arches, it uses libgcc_s.so.
+	if [[ -z ${PORTAGE_CALLER} ]] && ! is_cross_compiler; then
+		for multilib in $(${ROOT}/${GCC_BIN_PATH}/gcc -print-multi-lib); do
+			multiarg=${multilib#*;}
+			multiarg=${multiarg/@/-}
+			multilibdir=${multilib%;*}
+			libdir="lib/$(${ROOT}/${GCC_BIN_PATH}/gcc ${multiarg} -print-multi-os-directory)"
+			for gcclib in gcc_s unwind ; do
+				if [[ -e ${ROOT}/${LDPATH}/${multildir}/lib${gcclib}.so ]]; then
+					${RM} -f "${ROOT}/${libdir}"/lib${gcclib}.so*
+					${CP} -pP "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so* "${ROOT}/${libdir}"/
+				fi
+			done
+		done
+		unset multilib
+		unset multilibdir
+		unset multiarg
+		unset libdir
+	fi
+
+	if [[ ${ROOT} == "/" ]] && [[ ${OLD_CC_COMP} != ${CC_COMP} || ${FORCE} == "yes" ]] ; then
+		# in case python is broken ...
+		if ! ${ENV_UPDATE} &>/dev/null ; then
+			echo ""
+			ewarn "env-update failed to work properly; making sure ld.so.conf paths"
+			ewarn "are setup properly.  Please rerun gcc-config with the -f option."
+			echo ""
+			${GREP} -h ^LDPATH= "${ROOT}"/etc/env.d/05gcc \
+				| ${SED} -e 's:^LDPATH=::' -e 's:"::g' -e 's|:|\n|g' \
+				>> /etc/ld.so.conf
+			ldconfig
+		fi
+	fi
+
+	eend 0
+
+	if [[ ${ROOT} == "/" ]] && [[ ${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() {
+	local conf="${GCC_ENV_D}/config"
+	if [[ -n ${CTARGET} ]] ; then
+		conf="${conf}-${CTARGET}"
+	elif [[ -f ${GCC_ENV_D}/config-${CC_COMP} ]] ; then
+		conf="${conf}-${CC_COMP}"
+	fi
+
+	if [[ ! -f ${conf} ]] ; then
+		eerror "$0: No gcc profile is active!"
+		return 1
+	fi
+
+	source "${conf}"
+
+	if [[ -z ${CURRENT} ]] ; then
+		eerror "$0: No gcc profile is active!"
+		return 1
+	fi
+
+	echo "${CURRENT}"
+
+	return 0
+}
+
+list_profiles() {
+	local i=1
+
+	if [[ ! -f ${GCC_ENV_D}/config ]] ; then
+		eerror "$0: No gcc profile is active; please select one!"
+	else
+		get_current_profile >/dev/null
+	fi
+
+	if [[ ${ROOT} != "/" ]] ; then
+		echo "Using gcc-config info in ${ROOT}"
+	fi
+	for x in "${GCC_ENV_D}"/* ; do
+		if [[ -f ${x} ]] && [[ ${x/\/config} == ${x} ]] ; then
+			x=${x##*/}
+			[[ ${x} == ${CURRENT} ]] && x="${x} *"
+			echo "[${i}] ${x}"
+			i=$((i + 1))
+		fi
+	done
+}
+
+print_environ() {
+	local OLDPATH="${PATH}"
+	local ENV_CMD=
+	local SET_ELEMENT=
+
+	source "${GCC_ENV_D}/${CC_COMP}"
+
+	case ${SHELL} in
+		*/csh|*/tsch)
+			ENV_CMD="setenv"
+			SET_ELEMENT=" "
+			;;
+		*)
+			ENV_CMD="export"
+			SET_ELEMENT="="
+			;;
+	esac
+
+	echo "${ENV_CMD} PATH${SET_ELEMENT}\"${PATH}:${OLDPATH}\""
+}
+
+get_bin_path() {
+	if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then
+		source "${GCC_ENV_D}/${CC_COMP}"
+		echo "${PATH}"
+	else
+		echo "no-config"
+		echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2
+	fi
+
+	return 0
+}
+
+get_lib_path() {
+	if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then
+		source "${GCC_ENV_D}/${CC_COMP}"
+		echo "${LDPATH}"
+	else
+		echo "no-config"
+		echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2
+	fi
+
+	return 0
+}
+
+get_stdcxx_incdir() {
+	if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then
+		source "${GCC_ENV_D}/${CC_COMP}"
+		echo "${LDPATH}/include/${STDCXX_INCDIR}"
+	else
+		echo "no-config"
+		echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2
+	fi
+
+	return 0
+}
+
+NEED_ACTION="yes"
+DOIT="switch_profile"
+CHECK_CHOST="no"
+FORCE="no"
+
+CC_COMP=
+[[ -z ${ROOT} ]] && ROOT="/"
+[[ ${ROOT:-1} != "/" ]] && ROOT="${ROOT}/"
+ENV_D="${ROOT}etc/env.d"
+GCC_ENV_D="${ENV_D}/gcc"
+
+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
+			;;
+		-f|--force)
+			FORCE="yes"
+			;;
+		-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
+			;;
+		-h|--help)
+			usage 0
+			exit 0
+			;;
+		-v|--version)
+			echo "gcc-config-PORTAGE-VERSION"
+			exit 0
+			;;
+		-*)
+			eerror "$0: Invalid switch!  Run $0 without parameters for help."
+			exit 1
+			;;
+		*)
+			if [[ -z ${CC_COMP} ]] ; then
+				if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
+					# User gave us a # representing the profile
+					i=1
+					for y in "${GCC_ENV_D}"/* ; do
+						[[ ${y/\/config} != ${y} ]] && continue
+
+						if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then
+							CC_COMP="${y##*/}"
+							break
+						fi
+						i=$((i + 1))
+					done
+				else
+					# User gave us a full HOST-gccver
+					x=${x##*/}
+					if [[ ${DOIT} != "get_current_profile" ]] && \
+					   [[ ! -f ${GCC_ENV_D}/${x} ]]
+					then
+						eerror "$0: Could not locate '$x' in '${GCC_ENV_D}/'!"
+						exit 1
+					fi
+					CC_COMP="${x}"
+				fi
+			else
+				eerror "$0: Too many arguments!  Run $0 without parameters for help."
+				exit 1
+			fi
+			;;
+	esac
+done
+
+if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then
+	usage 1
+fi
+
+if [[ -z ${CC_COMP} ]] ; then
+	if get_current_profile &>/dev/null
+	then
+		CC_COMP="$(get_current_profile)"
+	else
+		list_profiles
+		exit 1
+	fi
+fi
+
+if [[ ${DOIT} != "get_current_profile" ]] ; then
+	GCC_LIB=$(source "${GCC_ENV_D}/${CC_COMP}"
+		cmd_setup
+		echo ${LDPATH} | ${AWK} -F/ '{ print  "/"$2"/"$3"/"$4"/" }')
+
+	CC_COMP_TARGET=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4 }')
+	CC_COMP_VERSION=${CC_COMP/${CC_COMP_TARGET}-/}
+
+	if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]]; then
+		CC_COMP_VERSION=${CC_COMP_VERSION%-*}
+	fi
+
+	if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]] || \
+	   [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]]
+	then
+		eerror "$0: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2
+		#exit 1
+	fi
+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_TARGET=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4 }')
+	[[ ${CC_COMP_TARGET} != ${REAL_CHOST} ]] && exit 0
+fi
+
+eval ${DOIT}
+
+
+# vim:ts=4
diff --git a/sys-devel/gcc-config/gcc-config-1.3.11.ebuild b/sys-devel/gcc-config/gcc-config-1.3.11.ebuild
new file mode 100644
index 000000000000..ea39eed07493
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.3.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 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.11.ebuild,v 1.1 2005/06/06 03:58:40 vapier Exp $
+
+inherit toolchain-funcs
+
+# Version of .c wrapper to use
+W_VER="1.4.6"
+
+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"
+IUSE=""
+
+DEPEND=">=sys-apps/portage-2.0.47-r10" # We need portageq ...
+
+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"
+	dosed "s:PORTAGE-VERSION:${PVR}:" /usr/bin/${PN}
+
+	exeinto /usr/lib/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
+}