clean

8 files changed, 13 insertions, 1071 deletions

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 35b3309dde3e..76392d198cac 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,17 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 cf7f580c452575f36ec20e702145ad1b ChangeLog 11271
-MD5 8ed93317247eeea87db0c493f1788956 gcc-config-1.3.6-r3.ebuild 2611
+MD5 39c5ae73589a762c88b6e689f54b8831 gcc-config-1.3.6-r3.ebuild 2611
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 9eb40c0112df24e7899358bd77a61f1e gcc-config-1.3.5.ebuild 2191
-MD5 0220f9bd49959356ec0ed4670b71e7d8 gcc-config-1.3.5-r1.ebuild 2076
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r3 0
 MD5 6fb6357ea1e81976c54079bbac2b5953 files/gcc-config-1.4 12017
 MD5 b2f6742e0556986c6c1f1de8e737fd6c files/gcc-config-1.4.1 12978
 MD5 44763c26bd5bb1303d5be8b5f4309c29 files/wrapper-1.4.1.c 7299
 MD5 843435f640a4b76d12f8faee16f685f3 files/wrapper-1.4.c 5636
 MD5 d9c2c81252d15436663ce61abcb87e19 files/wrapper.c 3520
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.5 0
-MD5 654c9238fad29b2bf0954df0a0f3fbe0 files/gcc-config-1.3.5 9302
-MD5 15a653aa8910781945ce9ffa08c3d0de files/gcc-config-1.3.5-multi-ldpath 8846
 MD5 e64a89abafa7f6f7d16c2540fb0edcf4 files/wrapper-1.4.2.c 7381
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.5-r1 0
 MD5 f9ac19eaceaad00963038bc3d3d11b98 files/gcc-config-1.3.6 10163
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBbS7tHTu7gpaalycRAq4+AKDui76HGz51kN/KeoJfYK5LKN0rVQCg1FDR
+GAZu7RIXBxAFiWa8o5U8N4M=
+=sJi5
+-----END PGP SIGNATURE-----
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
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.5
+++ /dev/null
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.5-r1 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.5-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.5-r1
+++ /dev/null
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.5 b/sys-devel/gcc-config/files/gcc-config-1.3.5
deleted file mode 100644
index fc70904f9ea0..000000000000
--- a/sys-devel/gcc-config/files/gcc-config-1.3.5
+++ /dev/null
@@ -1,457 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 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.5,v 1.5 2004/07/15 00:59:42 agriffis Exp $
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-
-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 [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.
-
-  -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
-}
-
-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}"
-
-			# Handle LDPATH's that have multiple directories
-			local old_IFS="${IFS}"
-			export IFS=":"
-			local sub_ldpath
-			for sub_ldpath in ${LDPATH}
-			do
-				if [ -z "${MY_LDPATH}" ]
-				then
-					if [ -d "${sub_ldpath}" ]
-					then
-						MY_LDPATH="${sub_ldpath}"
-					fi
-				else
-					if [ -d "${sub_ldpath}" ]
-					then
-						MY_LDPATH="${MY_LDPATH}:${sub_ldpath}"
-					fi
-				fi
-			done
-			export IFS="${old_IFS}"
-		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}"
-	local ENV_CMD=""
-	local SET_ELEMENT=""
-
-	source "/etc/env.d/gcc/${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}\""
-#	if [ -z "${LD_LIBRARY_PATH}" ]
-#	then
-#		echo "${ENV_CMD} LD_LIBRARY_PATH${SET_ELEMENT}\"${LDPATH}\""
-#	else
-#		echo "${ENV_CMD} LD_LIBRARY_PATH${SET_ELEMENT}\"${LDPATH}:${LD_LIBRARY_PATH}\""
-#	fi
-	echo "${ENV_CMD} CC${SET_ELEMENT}\"${CC}\""
-	echo "${ENV_CMD} CXX${SET_ELEMENT}\"${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
-			;;
-		-h|--help)
-			usage
-			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 [ -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
deleted file mode 100644
index 249233a121af..000000000000
--- a/sys-devel/gcc-config/files/gcc-config-1.3.5-multi-ldpath
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 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.5-multi-ldpath,v 1.4 2004/07/15 00:59:42 agriffis Exp $
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-
-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 [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.
-
-  -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
-}
-
-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
-			;;
-		-h|--help)
-			usage
-			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 [ -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/gcc-config-1.3.5-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.3.5-r1.ebuild
deleted file mode 100644
index 17b386c42e8d..000000000000
--- a/sys-devel/gcc-config/gcc-config-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2004 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.5-r1.ebuild,v 1.6 2004/07/02 09:32:25 eradicator Exp $
-
-W_VER="1.4.2"
-
-DISABLE_GEN_GCC_WRAPPERS="yes"
-
-DESCRIPTION="Utility to change the gcc compiler being used."
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips alpha ~arm ~hppa amd64 ~ia64 ~ppc64 s390"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=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 "Installing gcc-config..."
-	newbin ${FILESDIR}/${PN}-${PV} ${PN}
-	dosed "s:PORTAGE-VERSION:${PV}:" /usr/bin/${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.5.ebuild b/sys-devel/gcc-config/gcc-config-1.3.5.ebuild
deleted file mode 100644
index be8ce3672186..000000000000
--- a/sys-devel/gcc-config/gcc-config-1.3.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 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.5.ebuild,v 1.8 2004/07/02 09:32:25 eradicator Exp $
-
-W_VER="1.4.2"
-
-DISABLE_GEN_GCC_WRAPPERS="yes"
-
-DESCRIPTION="Utility to change the gcc compiler being used."
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ppc64 sparc mips alpha arm hppa amd64 ia64 s390"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=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
-	dosed "s:PORTAGE-VERSION:${PV}:" /usr/bin/${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.6-r3.ebuild b/sys-devel/gcc-config/gcc-config-1.3.6-r3.ebuild
index 5a57d057413b..d4d3890c40e9 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.6-r3.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6-r3.ebuild,v 1.2 2004/10/11 02:40:21 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.6-r3.ebuild,v 1.3 2004/10/13 13:34:25 vapier Exp $
 
 # Version of .c wrapper to use
 W_VER="1.4.2"
@@ -14,7 +14,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc