punt 1.3.7 and fix ChangeLog

5 files changed, 9 insertions, 588 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 653d1001f0b2..1e836fcbe5c4 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,15 +1,16 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.72 2004/12/28 05:32:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.73 2004/12/29 01:09:22 vapier Exp $
 
-*gcc-config-1.3.8-r2 (27 Dec 2004)
+*gcc-config-1.3.9 (27 Dec 2004)
 
   27 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  files/gcc-config-1.3.8, -files/wrapper-1.4.3.c, +files/wrapper-1.4.4.c,
-  -gcc-config-1.3.8-r1.ebuild, +gcc-config-1.3.8-r2.ebuild:
+  files/gcc-config-1.3.9, +files/wrapper-1.4.4.c, +gcc-config-1.3.9.ebuild:
   Rolling in support for CFLAGS_${ABI}. Rolling g{cc,++}{32,64} support into
   the wrapper.
 
+*gcc-config-1.3.8-r3 (24 Dec 2004)
+*gcc-config-1.3.8-r2 (24 Dec 2004)
 *gcc-config-1.3.8-r1 (24 Dec 2004)
 
   24 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.8,
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index a86b9ca82b14..10e0c578e719 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -2,26 +2,23 @@
 Hash: SHA1
 
 MD5 0b8a51c11885531a2411c0ca751095f2 gcc-config-1.3.9.ebuild 1370
-MD5 236509b94e2d78bf9d6cba5820706867 ChangeLog 14600
+MD5 3e436a19e566d77e4ed9d9d97e1ed01d ChangeLog 14605
 MD5 0a250a07d02f1343f64fe7f7bbdbd820 gcc-config-1.3.6-r4.ebuild 2636
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 626c17691d48b229f5c619618bf365c0 gcc-config-1.3.7-r6.ebuild 1395
 MD5 84d0ca7a875fc1a7a353ab8f0f71792e gcc-config-1.3.8-r3.ebuild 1359
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r4 0
 MD5 11d24a6f5defba5a8a8bbc65f26e2215 files/wrapper-1.4.2.c 7439
 MD5 5f5ba2d67203ed8386ae76352f15000d files/gcc-config-1.3.6 10285
 MD5 e8a654e548e74887bcd99ed224a9efca files/gcc-config-1.3.9 12326
-MD5 0c96b0464e9cec87312b5fa06d8c138b files/gcc-config-1.3.7 11800
 MD5 7723c767ef3e4935c2299fb253412d7e files/wrapper-1.4.4.c 10132
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.9 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r6 0
 MD5 081d4327e878875cbebc11e8ebb0cbec files/gcc-config-1.3.8 12381
 MD5 e7c7a83406a374ee4262c97d6e5673b2 files/wrapper-1.4.3.c 7545
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r3 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB0gMProRuSHgZdywRAromAJ9YldSIf3aStVHRg+WUojlGK0weuQCdEZvJ
-BlVTyT89O+Y6gYCq1mk6Iek=
-=djGr
+iD8DBQFB0gPXroRuSHgZdywRAh+SAJ4pjd/bxPh75VY0BiNAw0rhtIaiMgCfVpHz
+EVnEHhWCu02pXwtOE+bw67o=
+=pelY
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r6 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r6
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r6
+++ /dev/null
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.7 b/sys-devel/gcc-config/files/gcc-config-1.3.7
deleted file mode 100755
index d881b3ca2c14..000000000000
--- a/sys-devel/gcc-config/files/gcc-config-1.3.7
+++ /dev/null
@@ -1,520 +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.7,v 1.10 2004/12/08 23:47:13 vapier Exp $
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-
-trap ":" INT QUIT TSTP
-
-source /etc/init.d/functions.sh || {
-	echo "$0: Could not source /etc/init.d/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.
-  -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
-
-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" -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)"
-}
-
-get_real_chost() {
-	[ -n "${REAL_CHOST}" ] && return 0
-
-	export REAL_CHOST="$(env -u CHOST portageq envvar CHOST)"
-
-	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}" -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
-	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"
-		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" -o "${x:${#x}-3}" = "g++" ] \
-			&& ${RM} -f "${ROOT}/usr/bin/${x}"{32,64}
-
-		# Only install a wrapper if the binary exists ...
-		# If installing one of the C++ binaries, check to see
-		# if g++ exists so we don't install crappy wrappers
-		if [ -x "${ROOT}/${GCC_BIN_PATH}/${x}" -o "${x}" = "cc" ] || \
-		   ([ "${x}" = "c++" -o "${x}" = "${CTARGET}-c++" -o "${x}" = "cpp" ] && \
-		    [ -x "${ROOT}/${GCC_BIN_PATH}/${CTARGET}-g++" ])
-		then
-			${CP} -f "${ROOT}/usr/lib/gcc-config/wrapper" \
-			         "${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" -o "${x:${#x}-3}" = "g++" ]
-			then
-				for bits in ${GCCBITS}
-				do
-					echo "#!/bin/sh"$'\n'"exec ${x} -m${bits} \"\$@\"" \
-						> "${ROOT}/usr/bin/${x}${bits}"
-					chmod 755 "${ROOT}/usr/bin/${x}${bits}"
-				done
-			fi
-		fi
-	done
-	# Only install cpp if switching to a native one
-	if ! is_cross_compiler
-	then
-		${RM} -f "${ROOT}/lib/cpp"
-		${CP} -f "${ROOT}/usr/lib/gcc-config/wrapper" "${ROOT}/lib/cpp"
-	fi
-
-	if [ "${ROOT}" = "/" ] && [ "${OLD_CC_COMP}" != "${CC_COMP}" ]
-	then
-		${ENV_UPDATE} &> /dev/null
-	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"
-	[ -n "${CTARGET}" ] && conf="${GCC_ENV_D}/config-${CTARGET}"
-
-	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}" -a "${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}\""
-#	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() {
-	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"
-
-CC_COMP=
-[ -z "${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
-			;;
-		-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 [ -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}" -eq "${i}" ]
-						then
-							CC_COMP="${y##*/}"
-							break
-						fi
-						i=$((i + 1))
-					done
-				else
-					# User gave us a full HOST-gccver
-					x="${x##*/}"
-					if [ ! -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" -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
-		list_profiles
-		exit 1
-	fi
-fi
-
-CC_COMP_NO_SPECS=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4"-"$5 }')
-
-GCC_LIB=$(source "${GCC_ENV_D}/${CC_COMP}" 
-	cmd_setup
-	echo ${LDPATH} | ${AWK} -F/ '{ print  "/"$2"/"$3"/"$4"/" }')
-
-if [ ! -d "${ROOT}/${GCC_LIB}/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-}" -o \
-     ! -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
-
-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.7-r6.ebuild b/sys-devel/gcc-config/gcc-config-1.3.7-r6.ebuild
deleted file mode 100644
index 5116058d2929..000000000000
--- a/sys-devel/gcc-config/gcc-config-1.3.7-r6.ebuild
+++ /dev/null
@@ -1,57 +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.7-r6.ebuild,v 1.1 2004/12/08 23:47:13 vapier Exp $
-
-inherit toolchain-funcs
-
-# Version of .c wrapper to use
-W_VER="1.4.2"
-
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=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/gcc-config
-	doexe wrapper || 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 ...
-		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
-			gcc-config $(/usr/bin/gcc-config --get-current-profile)
-		fi
-	fi
-}