fix syntax error

10 files changed, 13 insertions, 611 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 67c814cf2c3a..9f7518ea9957 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for sys-devel/binutils-config
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.7 2004/12/31 10:24:58 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.8 2005/01/01 21:47:03 vapier Exp $
+
+*binutils-config-1.5-r1 (31 Dec 2004)
 
   31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   files/binutils-config-1.5:
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 0b7d3c08f2a9..ae037645b330 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,21 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a83c841e56d09ea67eb90a0ac4bb77e1 ChangeLog 1548
+MD5 49d16c967ee58e744e8fe70df7a95772 ChangeLog 1583
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 bd539973a95279630df011bdfe24f552 binutils-config-1.4.ebuild 599
-MD5 49a247840f0a18838720a65c7750a226 binutils-config-1.5.ebuild 599
-MD5 13cac863aa2be230b24efa45d6eec904 binutils-config-1.3.ebuild 599
-MD5 1166a8d4a5379f21f219178f9a6176cc files/binutils-config-1.4 6605
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.4 0
+MD5 6e7f6a4cb7c00c84049f7a819d5662e2 binutils-config-1.5-r1.ebuild 602
 MD5 e46b2b4d8cc5664342ecd81d8079fd52 files/binutils-config-1.5 6845
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.5 0
-MD5 194c77e52d3e896888220e8ccd985ae1 files/binutils-config-1.3 6057
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.5-r1 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB1SkTArHZZzCEUG0RApX9AJ9mT9URW6a7H2JNudTz/0NktfomcQCfSlu9
-YSWuJQ3lFIlgOR+x53ubblM=
-=S89c
+iD8DBQFB1xpkroRuSHgZdywRAtuAAJ9YKqOz/hQyorosazwAFSy8v8w5UQCfWbLM
+zNH2Hh7+mLMaDR3Jvg+ZHik=
+=U1Ac
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-1.4.ebuild b/sys-devel/binutils-config/binutils-config-1.4.ebuild
deleted file mode 100644
index c1b9277a0d3f..000000000000
--- a/sys-devel/binutils-config/binutils-config-1.4.ebuild
+++ /dev/null
@@ -1,19 +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/binutils-config/binutils-config-1.4.ebuild,v 1.1 2004/12/26 08:30:13 vapier Exp $
-
-DESCRIPTION="Utility to change the binutils version 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="app-shells/bash"
-
-src_install() {
-	newbin ${FILESDIR}/${PN}-${PV} ${PN} || die
-	dosed "s:PORTAGE-VERSION:${PV}:" /usr/bin/${PN}
-}
diff --git a/sys-devel/binutils-config/binutils-config-1.3.ebuild b/sys-devel/binutils-config/binutils-config-1.5-r1.ebuild
index 75844dac6d5b..8fcace86b7dd 100644
--- a/sys-devel/binutils-config/binutils-config-1.3.ebuild
+++ b/sys-devel/binutils-config/binutils-config-1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.3.ebuild,v 1.1 2004/12/16 02:30:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.5-r1.ebuild,v 1.1 2005/01/01 21:47:03 vapier Exp $
 
 DESCRIPTION="Utility to change the binutils version being used"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-devel/binutils-config/binutils-config-1.5.ebuild b/sys-devel/binutils-config/binutils-config-1.5.ebuild
deleted file mode 100644
index 77602ea74467..000000000000
--- a/sys-devel/binutils-config/binutils-config-1.5.ebuild
+++ /dev/null
@@ -1,19 +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/binutils-config/binutils-config-1.5.ebuild,v 1.1 2004/12/30 22:18:54 vapier Exp $
-
-DESCRIPTION="Utility to change the binutils version 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="app-shells/bash"
-
-src_install() {
-	newbin ${FILESDIR}/${PN}-${PV} ${PN} || die
-	dosed "s:PORTAGE-VERSION:${PV}:" /usr/bin/${PN}
-}
diff --git a/sys-devel/binutils-config/files/binutils-config-1.3 b/sys-devel/binutils-config/files/binutils-config-1.3
deleted file mode 100755
index 51281e5fb00c..000000000000
--- a/sys-devel/binutils-config/files/binutils-config-1.3
+++ /dev/null
@@ -1,267 +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/binutils-config/files/binutils-config-1.3,v 1.1 2004/12/16 02:30:56 vapier Exp $
-
-# Format of /etc/env.d/binutils/:
-#  config-TARGET:	CURRENT=version for TARGET
-#  TARGET-VER:		has a TARGET and VER variable
-
-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: binutils-config [options] [binutils profile]
-Change the current binutils profile, or give info about profiles.
-
-Options:
-  -c, --get-current-profile  Print current profile
-  -l, --list-profiles        Print a list of available profiles
-  -u, --uninstall            Remove all signs of specified target
-
-Profile names are of the form:  <CHOST>-<binutils version>
-For example:                    x86_64-pc-linux-gnu-2.15.92.0.2
-USAGE_END
-}
-
-[[ $# -lt 1 ]] && usage && exit 1
-
-switch_profile() {
-	unset TARGET VER LIBPATH
-	source "${ENV_D}/${PROFILE}"
-	if [[ -z ${TARGET} ]] ; then
-		eerror "${PROFILE} is invalid (no \$TARGET defined) :("
-		return 1
-	fi
-	if [[ -z ${VER} ]] ; then
-		eerror "${PROFILE} is invalid (no \$VER defined) :("
-		return 1
-	fi
-
-	ebegin "Switching to ${PROFILE}"
-
-	#
-	# Generate binary symlinks
-	#
-	BINPATH="/usr/${TARGET}/binutils-bin/${VER}"
-	cd "${ROOT}/${BINPATH}" || exit 1
-	mkdir -p "${ROOT}"/usr/${TARGET}/bin
-	for x in * ; do
-		ln -sf "${BINPATH}/${x}" "${ROOT}"/usr/${TARGET}/bin/${x}
-		ln -sf ../${TARGET}/bin/${x} "${ROOT}"/usr/bin/${TARGET}-${x}
-		if [[ ${TARGET} == ${HOST} ]] ; then
-			ln -sf ${TARGET}-${x} "${ROOT}"/usr/bin/${x}
-		fi
-	done
-
-	#
-	# Generate library / ldscripts symlinks
-	#
-	LIBPATH="${LIBPATH:-/usr/lib/binutils/${TARGET}/${VER}}"
-	cd "${ROOT}/${LIBPATH}" || exit 1
-	mkdir -p "${ROOT}"/usr/${TARGET}/lib
-	if [[ -d ${ROOT}/usr/${TARGET}/lib/ldscripts ]] ; then
-		# When upgrading, we need to clean up ldscripts
-		rm -r "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	else
-		rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	fi
-	ln -sf "${LIBPATH}/ldscripts" "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	if [[ ${TARGET} = ${HOST} ]] ; then
-		dstlib="${ROOT}"/usr/${HOST}/lib
-	else
-		dstlib="${ROOT}"/usr/${HOST}/${TARGET}/lib
-	fi
-	mkdir -p "${dstlib}"
-	for x in lib* ; do
-		ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
-	done
-
-	#
-	# Generate include symlinks
-	#
-	INCPATH="${LIBPATH}/include"
-	cd "${ROOT}/${INCPATH}" || exit 1
-	if [[ ${TARGET} = ${HOST} ]] ; then
-		dstinc="${ROOT}"/usr/include
-	else
-		dstinc="${ROOT}"/usr/${TARGET}/include
-	fi
-	mkdir -p "${dstinc}"
-	for x in * ; do
-		ln -sf "${INCPATH}/${x}" "${dstinc}/${x}"
-	done
-
-	eend 0
-
-	echo "CURRENT=${VER}" > "${ENV_D}/config-${TARGET}"
-
-	return 0
-}
-
-uninstall_target() {
-	if [[ ${TARGET} = ${HOST} ]] ; then
-		eerror "$0: Refusing to uninstall native binutils"
-		exit 1
-	fi
-
-	shopt -s nullglob
-	PROFILE=""
-
-	for PROFILE in "${ENV_D}"/${TARGET}-* ; do
-		ewarn "Removing all signs of ${PROFILE##*/}"
-		rm -f "${ENV_D}"/${PROFILE}
-	done
-	if [[ -z ${PROFILE} ]] ; then
-		eerror "$0: No profiles exist for '${TARGET}'"
-		exit 1
-	fi
-
-	rm -f "${ENV_D}"/config-${TARGET}
-
-	for x in addr2line ar as c++filt ld nm objcopy \
-	         objdump ranlib readelf size strings strip ; do
-		rm -f "${ROOT}"/usr/bin/${TARGET}-${x}
-		rm -f "${ROOT}"/usr/${TARGET}/bin/${x}
-	done
-	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
-		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
-	done
-	rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
-}
-
-get_current_profile() {
-	if [[ ! -f ${ENV_D}/config-${PROFILE} ]] ; then
-		eerror "$0: No binutils profile is active!"
-		return 1
-	fi
-
-	source "${ENV_D}/config-${PROFILE}"
-
-	if [[ -z ${CURRENT} ]] ; then
-		eerror "$0: No binutils profile is active!"
-		return 1
-	fi
-
-	echo "${PROFILE}-${CURRENT}"
-
-	return 0
-}
-
-list_profiles() {
-	local i=1
-
-	if [[ ${ROOT} != / ]] ; then
-		echo "Using binutils-config info in ${ROOT}"
-	fi
-	target=
-	for x in "${ENV_D}"/* ; do
-		if [[ -f ${x} ]] && [[ ${x/\/config-} = ${x} ]] ; then
-			source "${x}"
-			if [[ ${target} != ${TARGET} ]] ; then
-				[[ -n ${target} ]] && echo
-				target="${TARGET}"
-			fi
-
-			x="${x##*/}"
-			if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
-				source "${ENV_D}/config-${TARGET}"
-				[ "${VER}" == "${CURRENT}" ] && x="${x} *"
-			fi
-			echo " [${i}] ${x}"
-			i=$((i + 1))
-		fi
-	done
-}
-
-[[ -z ${ROOT} ]] && ROOT="/"
-ENV_D="${ROOT}etc/env.d/binutils"
-
-NEED_ACTION="yes"
-DOIT="switch_profile"
-PROFILE=""
-
-while [[ $# -gt 0 ]] ; do
-	x=$1
-	shift
-	case "${x}" in
-		-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
-			;;
-		-u|--uninstall)
-			if [[ ${NEED_ACTION} = "yes" ]] ; then
-				NEED_ACTION="no"
-				DOIT="uninstall_target"
-				TARGET="$1"
-				shift
-			fi
-			;;
-		-h|--help)
-			usage
-			exit 0
-			;;
-		-v|--version)
-			echo "binutils-config-1.0"
-			exit 0
-			;;
-		-*)
-			eerror "$0: Invalid switch!  Run $0 without parameters for help."
-			exit 1
-			;;
-		*)
-			if [[ -n ${PROFILE} ]] ; then
-				eerror "$0: Too many arguments!  Run $0 without parameters for help."
-				exit 1
-			fi
-
-			if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
-				# User gave us a # representing the profile
-				i=1
-				for y in "${ENV_D}"/* ; do
-					[[ ${y/config-} != ${y} ]] && continue
-
-					if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then
-						PROFILE="${y##*/}"
-						break
-					fi
-					i=$((i + 1))
-				done
-			else
-				# User gave us a full HOST-ver
-				x="${x##*/}"
-				if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f ${ENV_D}/config-${x} ]] ; then
-					eerror "$0: Could not locate '$x' in '${ENV_D}/'!"
-					exit 1
-				fi
-				PROFILE="${x}"
-			fi
-			;;
-	esac
-done
-
-if [[ ${DOIT} != "list_profiles" ]] ; then
-	if [[ -z ${CHOST} ]] ; then
-		HOST="$(portageq envvar CHOST)"
-	else
-		HOST="${CHOST}"
-	fi
-fi
-[ -z "${PROFILE}" ] && PROFILE="${HOST}"
-eval ${DOIT}
-
-# vim:ts=4
diff --git a/sys-devel/binutils-config/files/binutils-config-1.4 b/sys-devel/binutils-config/files/binutils-config-1.4
deleted file mode 100755
index 779f737ab657..000000000000
--- a/sys-devel/binutils-config/files/binutils-config-1.4
+++ /dev/null
@@ -1,289 +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/binutils-config/files/binutils-config-1.4,v 1.1 2004/12/26 08:30:13 vapier Exp $
-
-# Format of /etc/env.d/binutils/:
-#  config-TARGET:	CURRENT=version for TARGET
-#  TARGET-VER:		has a TARGET and VER variable
-
-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: binutils-config [options] [binutils profile]
-Change the current binutils profile, or give info about profiles.
-
-Options:
-  -c, --get-current-profile  Print current profile
-  -l, --list-profiles        Print a list of available profiles
-  -u, --uninstall            Remove all signs of specified target
-
-Profile names are of the form:  <CHOST>-<binutils version>
-For example:                    x86_64-pc-linux-gnu-2.15.92.0.2
-USAGE_END
-}
-
-[[ $# -lt 1 ]] && usage && exit 1
-
-switch_profile() {
-	unset TARGET VER LIBPATH
-	source "${ENV_D}/${PROFILE}"
-	if [[ -z ${TARGET} ]] ; then
-		eerror "${PROFILE} is invalid (no \$TARGET defined) :("
-		return 1
-	fi
-	if [[ -z ${VER} ]] ; then
-		eerror "${PROFILE} is invalid (no \$VER defined) :("
-		return 1
-	fi
-
-	ebegin "Switching to ${PROFILE}"
-
-	#
-	# Generate binary symlinks
-	#
-	BINPATH="/usr/${TARGET}/binutils-bin/${VER}"
-	cd "${ROOT}/${BINPATH}" || exit 1
-	mkdir -p "${ROOT}"/usr/${TARGET}/bin
-	for x in * ; do
-		ln -sf "${BINPATH}/${x}" "${ROOT}"/usr/${TARGET}/bin/${x}
-		ln -sf ../${TARGET}/bin/${x} "${ROOT}"/usr/bin/${TARGET}-${x}
-		if [[ ${TARGET} == ${HOST} ]] ; then
-			ln -sf ${TARGET}-${x} "${ROOT}"/usr/bin/${x}
-		fi
-	done
-
-	#
-	# Generate library / ldscripts symlinks
-	#
-	LIBPATH="${LIBPATH:-/usr/lib/binutils/${TARGET}/${VER}}"
-	cd "${ROOT}/${LIBPATH}" || exit 1
-	mkdir -p "${ROOT}"/usr/${TARGET}/lib
-	if [[ -d ${ROOT}/usr/${TARGET}/lib/ldscripts ]] ; then
-		# When upgrading, we need to clean up ldscripts
-		rm -r "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	else
-		rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	fi
-	ln -sf "${LIBPATH}/ldscripts" "${ROOT}"/usr/${TARGET}/lib/ldscripts
-	if [[ ${TARGET} = ${HOST} ]] ; then
-		dstlib="${ROOT}"/usr/${HOST}/lib
-	else
-		dstlib="${ROOT}"/usr/${HOST}/${TARGET}/lib
-	fi
-	mkdir -p "${dstlib}"
-	for x in lib* ; do
-		ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
-	done
-
-	#
-	# Generate include symlinks
-	#
-	INCPATH="${LIBPATH}/include"
-	cd "${ROOT}/${INCPATH}" || exit 1
-	if [[ ${TARGET} = ${HOST} ]] ; then
-		dstinc="${ROOT}"/usr/include
-	else
-		dstinc="${ROOT}"/usr/${TARGET}/include
-	fi
-	mkdir -p "${dstinc}"
-	for x in * ; do
-		ln -sf "${INCPATH}/${x}" "${dstinc}/${x}"
-	done
-
-	#
-	# Make sure proper paths get updated
-	#
-	if [[ ${TARGET} = ${HOST} ]] ; then
-		DATAPATH="/usr/share/binutils-data/${TARGET}/${VER}"
-		echo "MANPATH=${DATAPATH}/man" > "${ROOT}"/etc/env.d/05binutils
-		echo "INFOPATH=${DATAPATH}/info" >> "${ROOT}"/etc/env.d/05binutils
-		echo "LDPATH=/usr/${TARGET}/lib" >> "${ROOT}"/etc/env.d/05binutils
-	fi
-
-	eend 0
-
-	echo "CURRENT=${VER}" > "${ENV_D}/config-${TARGET}"
-
-	#
-	# Regen env.d if need/can be
-	#
-	if [[ ${ROOT} = "/" ]] && [[ ${TARGET} = ${HOST} ]] ; then
-		env-update
-		echo
-		ewarn "Please remember to run:"
-		echo
-		ewarn "  # source /etc/profile"
-		echo
-	fi
-
-	return 0
-}
-
-uninstall_target() {
-	if [[ ${TARGET} = ${HOST} ]] ; then
-		eerror "$0: Refusing to uninstall native binutils"
-		exit 1
-	fi
-
-	shopt -s nullglob
-	PROFILE=""
-
-	for PROFILE in "${ENV_D}"/${TARGET}-* ; do
-		ewarn "Removing all signs of ${PROFILE##*/}"
-		rm -f "${ENV_D}"/${PROFILE}
-	done
-	if [[ -z ${PROFILE} ]] ; then
-		eerror "$0: No profiles exist for '${TARGET}'"
-		exit 1
-	fi
-
-	rm -f "${ENV_D}"/config-${TARGET}
-
-	for x in addr2line ar as c++filt ld nm objcopy \
-	         objdump ranlib readelf size strings strip ; do
-		rm -f "${ROOT}"/usr/bin/${TARGET}-${x}
-		rm -f "${ROOT}"/usr/${TARGET}/bin/${x}
-	done
-	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
-		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
-	done
-	rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
-}
-
-get_current_profile() {
-	if [[ ! -f ${ENV_D}/config-${PROFILE} ]] ; then
-		eerror "$0: No binutils profile is active!"
-		return 1
-	fi
-
-	source "${ENV_D}/config-${PROFILE}"
-
-	if [[ -z ${CURRENT} ]] ; then
-		eerror "$0: No binutils profile is active!"
-		return 1
-	fi
-
-	echo "${PROFILE}-${CURRENT}"
-
-	return 0
-}
-
-list_profiles() {
-	local i=1
-
-	if [[ ${ROOT} != / ]] ; then
-		echo "Using binutils-config info in ${ROOT}"
-	fi
-	target=
-	for x in "${ENV_D}"/* ; do
-		if [[ -f ${x} ]] && [[ ${x/\/config-} = ${x} ]] ; then
-			source "${x}"
-			if [[ ${target} != ${TARGET} ]] ; then
-				[[ -n ${target} ]] && echo
-				target="${TARGET}"
-			fi
-
-			x="${x##*/}"
-			if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
-				source "${ENV_D}/config-${TARGET}"
-				[ "${VER}" == "${CURRENT}" ] && x="${x} *"
-			fi
-			echo " [${i}] ${x}"
-			i=$((i + 1))
-		fi
-	done
-}
-
-[[ -z ${ROOT} ]] && ROOT="/"
-ENV_D="${ROOT}etc/env.d/binutils"
-
-NEED_ACTION="yes"
-DOIT="switch_profile"
-PROFILE=""
-
-while [[ $# -gt 0 ]] ; do
-	x=$1
-	shift
-	case "${x}" in
-		-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
-			;;
-		-u|--uninstall)
-			if [[ ${NEED_ACTION} = "yes" ]] ; then
-				NEED_ACTION="no"
-				DOIT="uninstall_target"
-				TARGET="$1"
-				shift
-			fi
-			;;
-		-h|--help)
-			usage
-			exit 0
-			;;
-		-v|--version)
-			echo "binutils-config-1.0"
-			exit 0
-			;;
-		-*)
-			eerror "$0: Invalid switch!  Run $0 without parameters for help."
-			exit 1
-			;;
-		*)
-			if [[ -n ${PROFILE} ]] ; then
-				eerror "$0: Too many arguments!  Run $0 without parameters for help."
-				exit 1
-			fi
-
-			if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
-				# User gave us a # representing the profile
-				i=1
-				for y in "${ENV_D}"/* ; do
-					[[ ${y/config-} != ${y} ]] && continue
-
-					if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then
-						PROFILE="${y##*/}"
-						break
-					fi
-					i=$((i + 1))
-				done
-			else
-				# User gave us a full HOST-ver
-				x="${x##*/}"
-				if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f ${ENV_D}/config-${x} ]] ; then
-					eerror "$0: Could not locate '$x' in '${ENV_D}/'!"
-					exit 1
-				fi
-				PROFILE="${x}"
-			fi
-			;;
-	esac
-done
-
-if [[ ${DOIT} != "list_profiles" ]] ; then
-	if [[ -z ${CHOST} ]] ; then
-		HOST="$(portageq envvar CHOST)"
-	else
-		HOST="${CHOST}"
-	fi
-fi
-[ -z "${PROFILE}" ] && PROFILE="${HOST}"
-eval ${DOIT}
-
-# vim:ts=4
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.4 b/sys-devel/binutils-config/files/digest-binutils-config-1.4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-devel/binutils-config/files/digest-binutils-config-1.4
+++ /dev/null
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.5 b/sys-devel/binutils-config/files/digest-binutils-config-1.5
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-devel/binutils-config/files/digest-binutils-config-1.5
+++ /dev/null
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.3 b/sys-devel/binutils-config/files/digest-binutils-config-1.5-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/binutils-config/files/digest-binutils-config-1.3
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.5-r1