fix distcc/cross-compile builds; fix return bug in gcc-config script

10 files changed, 727 insertions, 10 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 7ddae850a336..d548729c37d7 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,17 @@
 # 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.31 2003/03/28 02:21:36 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.32 2003/04/06 22:18:42 zwelch Exp $
+
+*gcc-config-1.3.1-r1 (06 Apr 2003)
+
+  06 Apr 2003; Zach Welch <zwelch@gentoo.org> gcc-config-1.3.1-r1.ebuild,
+  gcc-config-1.3.1.ebuild, files/gcc-config-1.3.1, files/gcc-config-1.4.1 :
+  change return to exit in gcc-config script, and minor fix for distcc
+   and cross-compiling compatibility.
+  Note: The latest gcc-config-1.4 is almost ready for production, but
+   these changes are still too experimental to commit an ebuild.  Even
+   so, I am also updating the gcc-config script to reflect the latest
+   status.  Still no ebuild for now.
 
   23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.4,
                                                     wrapper-1.4.c :
@@ -9,9 +20,9 @@
     on this, so not adding a ebuild for now.
   - Add wrapper-1.4.c that is borken up in functions.  This is also
     thanks to Zach Welch <zwelch@gentoo.org>.  I also tweaked it to
-	modify PATH by appending gcc's bin path to it ... this should
-	speed up calls gcc does to its tools.  I also fixed a few possible
-	memory leaks.
+    modify PATH by appending gcc's bin path to it ... this should
+    speed up calls gcc does to its tools.  I also fixed a few possible
+    memory leaks.
 
   19 Feb 2003; Guy Martin <gmsoft@gneoot.org> gcc-config-1.3.1.ebuild :
   Changed ~hppa to hppa.
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.2.7 b/sys-devel/gcc-config/files/digest-gcc-config-1.2.7
index e69de29bb2d1..491dca53e50d 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.2.7
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.2.7
@@ -0,0 +1,9 @@
+MD5 40100df067977032972172e4eb5cab05 /files/gcc-config-1.2.7 8674
+MD5 8fe8bc98220d370e07b824abb03a1431 /files/gcc-config-1.2.9 7131
+MD5 9b87bd79f5c7f42b0a93e944c79a89b2 /files/gcc-config-1.3.0 7131
+MD5 98ae7460e20ff7907863052a863ab8ff /files/gcc-config-1.3.1 8106
+MD5 a4fe6c2cc89bb24276a53da0fb4def9e /files/wrapper.c 3527
+MD5 c9faae7544a6b69641dcaf2fccc9b7e5 /files/gcc-config-1.4.1 12749
+MD5 44cb03b926702bd77bb7bbe84499348e /files/gcc-config-1.4 11992
+MD5 27740a9a29d5fa3a86a48a49da0c6a5c /files/wrapper-1.4.c 5643
+MD5 237a7e0aff8c90471ebe138056a1bf39 /gcc-config-1.2.7.ebuild 1151
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.2.9 b/sys-devel/gcc-config/files/digest-gcc-config-1.2.9
index e69de29bb2d1..d6f93707146a 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.2.9
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.2.9
@@ -0,0 +1,9 @@
+MD5 40100df067977032972172e4eb5cab05 /files/gcc-config-1.2.7 8674
+MD5 8fe8bc98220d370e07b824abb03a1431 /files/gcc-config-1.2.9 7131
+MD5 9b87bd79f5c7f42b0a93e944c79a89b2 /files/gcc-config-1.3.0 7131
+MD5 98ae7460e20ff7907863052a863ab8ff /files/gcc-config-1.3.1 8106
+MD5 a4fe6c2cc89bb24276a53da0fb4def9e /files/wrapper.c 3527
+MD5 c9faae7544a6b69641dcaf2fccc9b7e5 /files/gcc-config-1.4.1 12749
+MD5 44cb03b926702bd77bb7bbe84499348e /files/gcc-config-1.4 11992
+MD5 27740a9a29d5fa3a86a48a49da0c6a5c /files/wrapper-1.4.c 5643
+MD5 6452b1b7e2965406699a68f155e2f09e /gcc-config-1.2.9.ebuild 2110
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.0 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.0
index e69de29bb2d1..c9002cb50c3f 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.0
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.0
@@ -0,0 +1,9 @@
+MD5 40100df067977032972172e4eb5cab05 /files/gcc-config-1.2.7 8674
+MD5 8fe8bc98220d370e07b824abb03a1431 /files/gcc-config-1.2.9 7131
+MD5 9b87bd79f5c7f42b0a93e944c79a89b2 /files/gcc-config-1.3.0 7131
+MD5 98ae7460e20ff7907863052a863ab8ff /files/gcc-config-1.3.1 8106
+MD5 a4fe6c2cc89bb24276a53da0fb4def9e /files/wrapper.c 3527
+MD5 c9faae7544a6b69641dcaf2fccc9b7e5 /files/gcc-config-1.4.1 12749
+MD5 44cb03b926702bd77bb7bbe84499348e /files/gcc-config-1.4 11992
+MD5 27740a9a29d5fa3a86a48a49da0c6a5c /files/wrapper-1.4.c 5643
+MD5 0933e6187cc0f10fa79b8504e7a3bd0e /gcc-config-1.3.0.ebuild 2110
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.1 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.1
index e69de29bb2d1..8e6b39836058 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.1
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.1
@@ -0,0 +1,9 @@
+MD5 40100df067977032972172e4eb5cab05 /files/gcc-config-1.2.7 8674
+MD5 8fe8bc98220d370e07b824abb03a1431 /files/gcc-config-1.2.9 7131
+MD5 9b87bd79f5c7f42b0a93e944c79a89b2 /files/gcc-config-1.3.0 7131
+MD5 98ae7460e20ff7907863052a863ab8ff /files/gcc-config-1.3.1 8106
+MD5 a4fe6c2cc89bb24276a53da0fb4def9e /files/wrapper.c 3527
+MD5 c9faae7544a6b69641dcaf2fccc9b7e5 /files/gcc-config-1.4.1 12749
+MD5 44cb03b926702bd77bb7bbe84499348e /files/gcc-config-1.4 11992
+MD5 27740a9a29d5fa3a86a48a49da0c6a5c /files/wrapper-1.4.c 5643
+MD5 bd5d1a41047e3190e7f3697af110a4ca /gcc-config-1.3.1.ebuild 2116
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.1-r1 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.1-r1
index 5b21653f1d5c..5b9e5d8f124c 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.1-r1
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.1-r1
@@ -1,8 +1,9 @@
 MD5 40100df067977032972172e4eb5cab05 /files/gcc-config-1.2.7 8674
 MD5 8fe8bc98220d370e07b824abb03a1431 /files/gcc-config-1.2.9 7131
 MD5 9b87bd79f5c7f42b0a93e944c79a89b2 /files/gcc-config-1.3.0 7131
-MD5 4dd016bcb8632681bf1105cf4a2fffb2 /files/gcc-config-1.3.1 8106
+MD5 98ae7460e20ff7907863052a863ab8ff /files/gcc-config-1.3.1 8106
 MD5 a4fe6c2cc89bb24276a53da0fb4def9e /files/wrapper.c 3527
+MD5 c9faae7544a6b69641dcaf2fccc9b7e5 /files/gcc-config-1.4.1 12749
 MD5 44cb03b926702bd77bb7bbe84499348e /files/gcc-config-1.4 11992
 MD5 27740a9a29d5fa3a86a48a49da0c6a5c /files/wrapper-1.4.c 5643
-MD5 6d0775b60bad5a0f5ac062480a713c7e /gcc-config-1.3.1-r1.ebuild 2115
+MD5 089a5bea5fb05ee899513e43703d1013 /gcc-config-1.3.1-r1.ebuild 2118
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.1 b/sys-devel/gcc-config/files/gcc-config-1.3.1
index 2dc711a72783..648e79283857 100644
--- a/sys-devel/gcc-config/files/gcc-config-1.3.1
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.1
@@ -2,7 +2,7 @@
 # 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.1,v 1.2 2003/02/19 23:23:26 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.1,v 1.3 2003/04/06 22:18:42 zwelch Exp $
 
 
 source /etc/init.d/functions.sh || {
@@ -113,7 +113,7 @@ REAL_CHOST="$(/usr/bin/python -c 'import portage; print portage.settings["CHOST"
 if [ -z "${REAL_CHOST}" ]
 then
 	eerror "$0:  Could not get portage CHOST!"
-	return 1
+	exit 1
 fi
 
 switch_profile() {
diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.1 b/sys-devel/gcc-config/files/gcc-config-1.4.1
new file mode 100644
index 000000000000..955959eb23eb
--- /dev/null
+++ b/sys-devel/gcc-config/files/gcc-config-1.4.1
@@ -0,0 +1,585 @@
+#!/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>
+# Cross-compiling toolchain contributions by: 
+#   Zach Welch <zwelch@gentoo.org> and James Boddington <aiken@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.1 2003/04/06 22:18:42 zwelch Exp $
+
+# handle not ROOT installs
+[ -z "${ROOT}" ] && ROOT="/"
+
+source /etc/init.d/functions.sh || {
+	echo "$0: Could not source /etc/init.d/functions.sh!"
+	exit 1
+}
+
+die() {
+	echo "$*"
+	exit 1
+}
+
+usage() {
+cat << "USAGE_END"
+Usage: gcc-config [Option] [CC Profile]
+Change the current cc/gcc profile, or give info about profiles.
+
+Options:
+
+  --use-old              Use the old profile if one was selected.
+	
+  --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...).
+	
+  --get-current-profile  Print current used gcc profile.
+
+  --list-profiles        Print a list of available profiles.
+
+  --print-environ        Print environment that can be used to setup things
+                         for current gcc profile, or specified one ...
+	
+  --get-bin-path         Print path where binaries of given/current profile
+                         are located.
+	
+  --get-lib-path         Print path where libraries of given/current profile
+                         are located.
+
+  --get-stdcxx-incdir    Print path to g++ include files of given/current
+                         profile.
+  
+  --install-toolchain    Install a new cross-compiling toolchain (that does
+                         not appear in the list of available profiles)
+                         and create the specified profile.
+  --remove-toolchain     Remove a cross-compiling tollchain.
+
+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=""
+REAL_CHOST="$(portageq envvar CHOST)"
+PORTDIR="$(portageq portdir)"
+PORTDIR_OVERLAY="$(portageq portdir_overlay)"
+
+switch_profile() {
+	local MY_LDPATH=""
+	local GCC_PROFILES=""
+	local OLD_CC_COMP=""
+
+	if [ -r ${ROOT}etc/env.d/gcc/config ]
+	then
+		source ${ROOT}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 ${ROOT}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 ...
+	GCC_PROFILES="$(${FIND} ${ROOT}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 "${ROOT}etc/env.d/gcc/${CC_COMP}"
+
+	# Setup ${ROOT}etc/env.d/05gcc
+	${AWK} '!/^STDCXX_INCDIR=|^LDPATH=/ {print $0}' \
+		"/etc/env.d/gcc/${CC_COMP}" > ${ROOT}etc/env.d/05gcc
+
+	# Add our custom LDPATH
+	echo "LDPATH=\"${MY_LDPATH}\"" >> ${ROOT}etc/env.d/05gcc
+
+	# Make sure we do not recreate /lib/cpp and /usr/bin/cc ...
+#	echo "DISABLE_GEN_GCC_WRAPPERS=\"yes\"" >> ${ROOT}etc/env.d/05gcc
+	
+	echo "CURRENT=${CC_COMP}" > ${ROOT}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 ${ROOT}lib/cpp
+	${CP} -f ${ROOT}usr/lib/gcc-config/wrapper ${ROOT}lib/cpp
+	for x in gcc cpp cc c++ g++ "${CHOST}-gcc" "${CHOST}-c++" "${CHOST}-g++"
+	do
+		${RM} -f "${ROOT}usr/bin/${x}"
+		${CP} -f ${ROOT}usr/lib/gcc-config/wrapper "${ROOT}usr/bin/${x}"
+
+		if [ "${OLD_CC_COMP}" != "${CC_COMP}" ]
+		then
+			${TOUCH} -m "${ROOT}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 ${ROOT}etc/env.d/gcc/config ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	source ${ROOT}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() {
+	if [ ! -f ${ROOT}etc/env.d/gcc/config ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	for x in ${ROOT}etc/env.d/gcc/*
+	do
+		if [ -f "${x}" -a "${x}" != "${ROOT}etc/env.d/gcc/config" ]
+		then
+			echo "${x##*/}"
+		fi
+	done
+}
+
+print_environ() {
+	local OLDPATH="${PATH}"
+
+	source "${ROOT}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 "${ROOT}etc/env.d/gcc/${CC_COMP}"
+
+	echo "${PATH}"
+
+	return 0
+}
+
+get_lib_path() {
+	source "${ROOT}etc/env.d/gcc/${CC_COMP}"
+
+	echo "${LDPATH}"
+
+	return 0
+}
+
+get_stdcxx_incdir() {
+	source "${ROOT}etc/env.d/gcc/${CC_COMP}"
+
+	eerror "${LDPATH}/include/${STDCXX_INCDIR}"
+
+	return 0
+}
+
+# ===============================================================
+#  cross-compiler install portions
+
+get_arch()
+
+{
+	echo $1 | \
+	awk -F '-' '{print $1}' \
+	sed -e 's/arm.*/arm/'
+	return	
+
+	# this might work....
+#	case ${ACCHOST} in
+#		i[3456]86-*)	ADIR="arch-x86" ;;
+#		alpha-*)	ADIR="arch-alpha" ;;
+#		arm*-*)		ADIR="arch-arm" ;;
+#		hppa-*)		ADIR="arch-hppa" ;;
+#		mips-*)		ADIR="arch-mips" ;;
+#		powerpc-*)	ADIR="arch-powerpc" ;;
+#		sparc-*)	ADIR="arch-sparc" ;;
+#		*) echo "bad CHOST spec"; exit 0 ;;
+#	esac
+
+	# and this might give better substring matching
+	if [ $(expr "${ACCHOST}" : 'i[3456]86') -eq 4 ]; then
+		# x86
+		echo "x86"
+	elif [ $(expr "${ACCHOST}" : alpha) -eq 5 ]; then
+		# Alpha
+		echo "alpha"
+	elif [ $(expr "${ACCHOST}" : arm) -eq 3 ]; then
+		# ARM
+		echo "arm"
+	elif [ $(expr "${ACCHOST}" : hppa) -eq 4 ]; then
+		# HP PA-Risc
+		echo "hppa"
+	elif [ $(expr "${ACCHOST}" : mips) -eq 4 ]; then
+		# MIPS
+		echo "mips"
+	elif [ $(expr "${ACCHOST}" : powerpc) -eq 7 ]; then
+		# PowerPC
+		echo "ppc"
+	elif [ $(expr "${ACCHOST}" : sparc) -eq 5 ]; then
+		# sparc
+		echo "sparc"
+	else
+		echo "unknown CHOST=${ACCHOST} - time to hack on gcc-config"
+		exit 1
+	fi
+}
+
+EMERGE="/usr/bin/emerge"
+
+install_toolchain() {
+	local ADIR PADIR x
+	local ACCHOST="${CC_COMP%-*}"
+	local AGCCVERS="${CC_COMP##*-}"
+	local AROOT="${ROOT}usr/${ACCHOST}/"
+	local PORTDIR="$(portage_setting PORTDIR)"
+
+	[ -z "${ACCHOST}" -o -z "${AGCCVERS}" ] && \
+		die "Invalid profile specification"
+
+	[ -f "${ROOT}etc/env.d/gcc/${CC_COMP}" ] && \
+		die "Toolchain is already installed, use --force"
+
+	[ "${ACCHOST}" = "${REAL_CHOST}" ] && \
+		echo "gcc-config should not be used to build a native toolchain"
+
+	ebegin "Installing cross-compiling toolchain for ${ACCHOST}-${AGCCVERS}"
+
+	[ -n "${ROOT}" ] && AROOT="${ROOT}${AROOT}"
+
+	einfo "Creating ${AROOT}..."
+	mkdir -p "${AROOT}" || die "Unable to create ${AROOT}"
+
+	AARCH="$(get-arch ${ACCHOST})"
+	ADIR="arch-${AARCH}"
+	einfo "Looking for ${AARCH}-headers..."
+	if ! emerge --pretend "sys-kernel/${AARCH}-headers"
+	then
+		einfo "Using default linux-headers..."
+		AHDRS="linux"
+	else
+		einfo "Using arch specific ${AARCH}-headers..."
+		AHDRS="${AARCH}"
+	fi
+
+	# create the portage arch directory, if it doesn't exist
+	PADIR="${PORTDIR}/${ADIR}"
+	if [ ! -d "${PADIR}" ]; then
+		einfo "Creating ${PADIR} symlinks..."
+		mkdir "${PADIR}" || die "Can't create ${PADIR}"
+		( cd "${PADIR}" && 
+		  for x in sys-devel/binutils sys-devel/gcc sys-libs/glibc \
+			"sys-kernel/${AHDRS}-headers"
+		  do
+			ln -s ../$x
+		  done 
+		  ) || die "Unable to create symlinks in ${PADIR}"
+	fi
+
+	ACCEPT_KEYWORDS="${AARCH}" ARCH="${AARCH}" CCHOST="${ACCHOST}" \
+		USE="build ${AARCH}" ${EMERGE} \
+			${ADIR}/binutils ${ADIR}/${AHDRS}-headers \
+			">=${ADIR}/gcc-${AGCCVERS}*" "${ADIR}/glibc" || \
+			die "Unable to merge cross toolchain for ${ACCHOST}"
+
+	ACCEPT_KEYWORDS="${AARCH}" CCHOST="${ACCHOST}" ARCH="${AARCH}" \
+		USE="${AARCH}" ${EMERGE} \
+			">=${ADIR}/gcc-${AGCCVERS}*" || \
+			die "Unable to merge cross toolchain for ${ACCHOST}"
+
+	eend 0
+
+}
+
+#
+# Unmerge the cross compiler.
+#
+
+remove_toolchain()
+
+{
+	local AARCH="$(get_arch $1)"
+	local ADIR="arch-${AARCH}"
+	local AHDRS APKGS
+
+	if [ ! -d ${PORTDIR}/arch-${ARCH} ]; then
+		echo A compiler for $1 is not installed
+		return
+	fi
+
+	[ -d "${PORTDIR}/sys-kernel/${AARCH}-headers" ]
+		AHDRS="${AARCH}" || AHDRS="linux"
+
+	APKGS="${ADIR}/binutils ${ADIR}/${AARCH}-headers ${ADIR}/glibc ${ADIR}/gcc"
+
+	ACCEPT_KEYWORDS="${AARCH}" \
+	ARCH="${AARCH}" \
+	CCHOST=${1} \
+		${EMERGE} unmerge ${APKGS} || \
+			ewarn "Errors unmerging parts of the toolchain..."
+}
+
+# ===============================================================
+#  Main program begins here
+
+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.
+		--use-old)
+			if get_current_profile &> /dev/null
+			then
+				CC_COMP="$(get_current_profile)"
+			fi
+			;;
+		--use-portage-chost)
+			CHECK_CHOST="yes"
+			;;
+		--get-current-profile)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_current_profile"
+			fi
+			;;
+		--list-profiles)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="list_profiles"
+			fi
+			;;
+		--print-environ)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="print_environ"
+			fi
+			;;
+		--get-bin-path)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_bin_path"
+			fi
+			;;
+		--get-lib-path)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_lib_path"
+			fi
+			;;
+		--get-stdcxx-incdir)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_stdcxx_incdir"
+			fi
+			;;
+		--install-toolchain)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="install_toolchain"
+			fi
+			;;
+		--remove-toolchain)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="remove_toolchain"
+			fi
+			;;
+		--*)
+			eerror "$0: Invalid switch!  Run $0 without parameters for help."
+			exit 1
+			;;
+		*)
+			if [ -z "${CC_COMP}" ]
+			then
+				CC_COMP="${x}"
+			fi
+			;;
+	esac
+done
+
+if [ \( "${DOIT}" = "install_toolchain" -o \
+        "${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 [ "${DOIT}" != "install_toolchain" -a \
+     \( ! -d "${ROOT}usr/lib/gcc-lib/${CC_COMP%-*}/${CC_COMP##*-}" -o \
+        ! -f "${ROOT}etc/env.d/gcc/${CC_COMP}" \) ]
+then
+	eerror "$0: Profile does not exist!"
+	exit 1
+fi
+
+# Chosen CHOST are not the same as the real CHOST according to make.conf,
+# and --use-portage-chost option was given, so do nothing ...
+if [ "${CHECK_CHOST}" = "yes" -a "${CC_COMP%-*}" != "${REAL_CHOST}" ]
+then
+	exit 0
+fi
+
+eval ${DOIT}
+
+
+# vim:ts=4
diff --git a/sys-devel/gcc-config/gcc-config-1.3.1-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..26b86c731923
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.3.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2003 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.1-r1.ebuild,v 1.1 2003/04/06 22:18:42 zwelch Exp $
+
+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="x86 ppc sparc alpha mips hppa arm"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc"
+
+
+src_install() {
+
+	# Setup PATH just in case ...
+	if /usr/bin/gcc-config --get-current-profile &> /dev/null || \
+	   /usr/sbin/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.c
+
+	exeinto /usr/lib/gcc-config
+	doexe ${WORKDIR}/wrapper
+
+	# 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 || \
+	   /usr/sbin/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
+	newbin ${FILESDIR}/${PN}-${PV} ${PN}
+	dosym ../bin/${PN} /usr/sbin/${PN}
+}
+
+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
+}
+
diff --git a/sys-devel/gcc-config/gcc-config-1.3.1.ebuild b/sys-devel/gcc-config/gcc-config-1.3.1.ebuild
index 73db870c5f04..e98785fc73c0 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.1.ebuild,v 1.10 2003/03/28 02:21:36 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.1.ebuild,v 1.11 2003/04/06 22:18:42 zwelch Exp $
 
 DISABLE_GEN_GCC_WRAPPERS="yes"
 
@@ -31,7 +31,7 @@ src_install() {
 	fi
 
 	einfo "Compiling wrapper..."
-	gcc -O2 -Wall -o ${WORKDIR}/wrapper ${FILESDIR}/wrapper.c
+	${CC:-gcc} -O2 -Wall -o ${WORKDIR}/wrapper ${FILESDIR}/wrapper.c
 
 	exeinto /usr/lib/gcc-config
 	doexe ${WORKDIR}/wrapper