7 files changed, 2 insertions, 661 deletions
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 243517b1f382..dfd82ac975ae 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,10 +1,4 @@
-AUX binutils-config-5.2 11716 BLAKE2B cff36d78c6d872c329cd63a9cb5c03e4c30a2dde8ae148b0392aba0157313daf9cf1772edc5a56a6ac633bdb9d677339fa6c3ad828b57902f5af27e7dd30eada SHA512 083352834377abac7cecd412f89ead22f132244241ec643272c14c74f458b5db0ddf5fd539024df29fe32b3e654058044158cb497290a77d5cc4a20c1a9bc2cc
-AUX binutils-config.8 2422 BLAKE2B 850b229c3c51c7687f303f723ed15f09d0d33730788aefefbb8840cee403dd287dae9380b3c60e22c0aa36ce519da8908f1d1b5e7bf4a79fc3c743a716086161 SHA512 d5f184c9a2178f94be216868afd79edf641fcc9c69a29ea2538ec93b03473199a2045edcf9f543c227de03ba986c48a61d86f0200b1a9d7defd393349ba79ad3
-AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
-DIST binutils-config-5.3.1.tar.xz 6688 BLAKE2B 3bc1b96a96b0c30e425f4ffd42f86a09e2a80cc3ad1dcf77d4b5d2d9eb3d6bc607f78dfff1ae888fe8abfe44405a1e4d1ab325aa92fc5889c18aa3187a506647 SHA512 c6d188b70935604a8a519c036dda210c20e5b6e916fab33e5026bd5c78adfff0a1aa85003759b751275576ff33471b25c920beb6b1c088115f28918389e09ce2
 DIST binutils-config-5.3.2.tar.xz 6840 BLAKE2B 4f02b8d1f3f8d4adca811772edba6167fc0e739f8ff1e895f30745eca45b559da6622bb76a0cac6016d6e864fe7ad6c921c64c7ec1c18c130b3a64a1dd7b9cbc SHA512 03dfecf46fee941b7b9fc35b63ffd22c795ab54f0444f16fc00ed44d27c81f6baaca33170fb700cfc4d767be469f305890882839536363bc466ad200d28d2228
-EBUILD binutils-config-5.2.ebuild 1092 BLAKE2B 453ed9f4ce103a56c0880fe2d08594b1734081ec933415d8d54d2376a0015d4e32e8555f5dd63356bb99ee917ea982ebfb75e92e9c58dfadf9c545fdbf82e863 SHA512 74fc1bafd272f17f94a1e5b6b27bfaa5fabc1cd45bcc5886bbc0856e304396afaed8a4f942f6ab578dca782ad62eb98c8852a21f39f9c6379e3a1b43b9df52a7
-EBUILD binutils-config-5.3.1.ebuild 1119 BLAKE2B 2be96df26f78c9468dd9bc2d1cf49b729edccd11af8b963529ad8eb166d0079fa02f3e6b760a316433cf35281caaf937cf99a92bc61c1a5ec1bf436298602686 SHA512 5c654ca23706ae482f23265487cef81d6bd691a727a5d3a1253f25a4ebab8556028054500ada387b09b34d7a9842cca274db25084556efb516eaebd2b4312a70
-EBUILD binutils-config-5.3.2.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
+EBUILD binutils-config-5.3.2.ebuild 1118 BLAKE2B 0d65e41631a4ddc28b2b6a446eba79f6e6e0b48706276d3dd057d300f0d097109ac637683343ea2e7a348b4c9768dbafa1343189a7a6c880b13afd296c7605c6 SHA512 2207b216e9c0a6ffd6bae19ad7f3c68d870882e4a69b0c1284a87ceb0368c086bc1dd4a682dc18d64da9a60824815d4c384f89f022bd3cd6d34e2182d986fceb
 EBUILD binutils-config-9999.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
 MISC metadata.xml 416 BLAKE2B 5ea7d7b0b0ca3767c8393d3ff5c7c51d190503d6dfea9f2146b7f8bdf1f6a91237e918e6b6b178d07a3de8affc936fbde215825ec33c5b334d67d36f66c30566 SHA512 256a0c0ec2d57c3ba75a27e7a810ec70d06cecdefc20f2f58cfcbb1ddbd195c2115661c4960ab6316d88b6db21210416a4eb5855488ddd5918888365a3a9d00b
diff --git a/sys-devel/binutils-config/binutils-config-5.2.ebuild b/sys-devel/binutils-config/binutils-config-5.2.ebuild
deleted file mode 100644
index 855d88b035e3..000000000000
--- a/sys-devel/binutils-config/binutils-config-5.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
-
-# We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin "${FILESDIR}"/${PN}-${PV} ${PN}
-	use prefix && eprefixify "${ED}"/usr/bin/${PN}
-	sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die
-	doman "${FILESDIR}"/${PN}.8
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/binutils.eselect
-}
-
-pkg_preinst() {
-	# Force a refresh when upgrading from an older version that symlinked
-	# in all the libs & includes that binutils-libs handles. #528088
-	if has_version "<${CATEGORY}/${PN}-5" ; then
-		local bc current
-		bc="${ED}/usr/bin/binutils-config"
-		if current=$("${bc}" -c) ; then
-			"${bc}" "${current}"
-		fi
-	fi
-}
diff --git a/sys-devel/binutils-config/binutils-config-5.3.1.ebuild b/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
deleted file mode 100644
index feb25428408e..000000000000
--- a/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+native-symlinks"
-
-# We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions"
-
-src_compile() {
-	emake DESTDIR="${D}" PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PV="${PV}" install
-
-	use prefix && eprefixify "${ED}"/usr/bin/${PN}
-}
-
-pkg_postinst() {
-	# Re-register all targets. USE flags or new versions can change
-	# installed symlinks.
-	local x
-	for x in $(binutils-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
-		binutils-config ${x}
-	done
-}
diff --git a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
index 5f9cd23da4a1..2a949b4fb174 100644
--- a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to change the binutils version being used"
diff --git a/sys-devel/binutils-config/files/binutils-config-5.2 b/sys-devel/binutils-config/files/binutils-config-5.2
deleted file mode 100644
index 69ca530a7045..000000000000
--- a/sys-devel/binutils-config/files/binutils-config-5.2
+++ /dev/null
@@ -1,456 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Format of /etc/env.d/binutils/:
-#  config-TARGET:	CURRENT=version for TARGET
-#  TARGET-VER:		has a TARGET and VER variable
-
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
-	EPREFIX=""
-fi
-
-: ${ROOT:=/}
-[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
-
-EROOT="${ROOT%/}${EPREFIX}/"
-
-cd "${EPREFIX}/"
-
-trap ":" INT QUIT TSTP
-
-argv0=${0##*/}
-FUNCTIONS_SH="${EPREFIX}/lib/gentoo/functions.sh"
-source ${FUNCTIONS_SH} || {
-	echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2
-	exit 1
-}
-esyslog() { :; }
-die() { eerror "${argv0}: $*"; exit 1; }
-umask 022
-
-usage() {
-cat << USAGE_END
-Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL}
-
-${HILITE}General Options:${NORMAL}
-  ${GOOD}-c, --get-current-profile${NORMAL}  Print current profile
-  ${GOOD}-l, --list-profiles${NORMAL}        Print a list of available profiles
-  ${GOOD}-u, --uninstall${NORMAL}            Remove all signs of specified target
-  ${GOOD}-d, --debug${NORMAL}                Execute with debug output
-
-Profile names are of the form:  ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
-For example:                    ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
-
-For more info, please see ${HILITE}binutils-config${NORMAL}(8).
-USAGE_END
-
-	exit ${1:-1}
-}
-
-mv_if_diff() {
-	if cmp -s "$1" "$2" ; then
-		rm -f "$1"
-	else
-		mv -f "$1" "$2"
-	fi
-}
-atomic_ln() {
-	local target=$1 linkdir=$2 linkname=$3 linktmp linkfull
-	linktmp="${linkdir}/.binutils-config.tmp.${linkname}"
-	linkfull="${linkdir}/${linkname}"
-	if [[ -d ${linkfull} ]] ; then
-		# if linking to a dir, we need a little magic to
-		# make it atomic since `mv -T` is not portable
-		rm -rf "${linktmp}"
-		mkdir -p "${linktmp}"
-		ln -sf "${target}" "${linktmp}/${linkname}"
-		mv "${linktmp}/${linkname}" "${linktmp}/../"
-		rmdir "${linktmp}"
-	else
-		# `ln` will expand into unlink();symlink(); which
-		# is not atomic for a small amount of time, but
-		# `mv` is a single rename() call
-		ln -sf "${target}" "${linktmp}"
-		mv "${linktmp}" "${linkfull}"
-	fi
-}
-
-setup_env() {
-	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
-
-	#
-	# Generate binary symlinks
-	#
-	BINPATH=""
-	BINPATH_LINKS=""
-	if [[ ${TARGET} != ${HOST} ]] ; then
-		#
-		# Newer paths: /usr/${HOST}/${TARGET}/...
-		# Older paths: /usr/${TARGET}/...
-		#
-		if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
-			BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER}
-			BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET}
-		fi
-	fi
-	if [[ -z ${BINPATH} ]] ; then
-		BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER}
-		BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin
-	fi
-}
-
-# Lists of headers that various versions have installed.
-HEADERS=(
-	ansidecl.h bfd.h bfdlink.h demangle.h dis-asm.h dyn-string.h
-	fibheap.h hashtab.h libiberty.h objalloc.h plugin-api.h
-	splay-tree.h symcat.h
-)
-
-switch_profile() {
-	local x
-
-	ebegin "Switching to ${PROFILE}"
-
-	setup_env || return 1
-
-	cd "${ROOT}/${BINPATH}" || exit 1
-	mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin"
-	for x in * ; do
-		atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
-		atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}"
-		if [[ ${TARGET} == ${HOST} ]] ; then
-			atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}"
-		fi
-	done
-
-	#
-	# Generate library / ldscripts symlinks
-	#
-	: ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}}
-	cd "${ROOT}/${LIBPATH}" || exit 1
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		dstlib=${EROOT}/usr/${HOST}/lib
-	else
-		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
-	fi
-	# When upgrading, we need to clean up ldscripts and libs.
-	# Don't symlink back in the libs -- the binutils-lib package handles
-	# these now.
-	# TODO: Stop requiring even the ldscripts symlink.
-	mkdir -p "${dstlib}"
-	rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
-	atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
-	find -L "${dstlib}" -xtype l -name 'lib*' -delete
-	# Detect older binutils w/broken rpaths. #562460
-	# We can hardcode the "/lib" part since that's what the binutils
-	# configure scripts have.  They did not include any other path.
-	if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then
-		ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)."
-		for x in lib* ; do
-			atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}"
-		done
-	fi
-
-	#
-	# Clean out old generated include symlinks
-	#
-	INCPATH=${LIBPATH}/include
-	if [[ -d ${ROOT}/${INCPATH} ]] ; then
-		cd "${ROOT}/${INCPATH}" || exit 1
-		if [[ ${HOST} != ${TARGET} ]] ; then
-			# Clean out old path -- cannot use '-exec {} +' syntax here
-			find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \;
-			rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null
-			rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null
-			rmdir "${EROOT}/usr/${TARGET}" >& /dev/null
-		fi
-	fi
-
-	#
-	# Make sure proper paths get updated
-	#
-	local env_update_flag="--no-ldconfig"
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		# Delete old config now that binutils-libs installs these files.
-		# Note: This skips ldconfig update if env.d had LDPATH, but meh.
-		# Most people have upgraded to ld.so.conf.d, and someone else will
-		# eventually re-run ldconfig for us.
-		x="${EROOT}"/etc/ld.so.conf.d/05binutils.conf
-		if [[ -e ${x} ]]; then
-			rm -f "${x}"
-			env_update_flag=""
-		fi
-
-		DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER}
-		local e="${EROOT}"/etc/env.d/05binutils
-		local ee="${e}.tmp"
-		rm -f "${ee}"
-		[[ -d ${ROOT}/${DATAPATH}/man  ]] && echo "MANPATH=${DATAPATH}/man"   >> "${ee}"
-		[[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
-		mv_if_diff "${ee}" "${e}"
-	fi
-
-	local c="${ENV_D}/config-${TARGET}"
-	local cc="${c}.tmp"
-	echo "CURRENT=${VER}" > "${cc}"
-	mv_if_diff "${cc}" "${c}"
-
-	eend 0
-
-	#
-	# Regen env.d if need/can be
-	#
-	if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then
-		env-update ${env_update_flag}
-		echo
-		ewarn "Please remember to run:"
-		echo
-		ewarn "  # . ${EPREFIX}/etc/profile"
-		echo
-	fi
-
-	return 0
-}
-
-uninstall_target() {
-	: ${TARGET:=${UARG}}
-
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		die "refusing to uninstall native binutils"
-	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} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
-		die "no profiles exist for '${TARGET}'"
-	fi
-
-	rm -f "${ENV_D}"/config-${TARGET}
-
-	local x
-	for x in \
-		addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \
-		ld ld.{bfd,gold,real} \
-		nm objcopy objdump ranlib readelf size strings strip
-	do
-		x=(
-			"${EROOT}"/usr/bin/${TARGET}-${x}
-			"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
-			"${EROOT}"/usr/libexec/gcc/${TARGET}/${x}
-		)
-		rm -f "${x[@]}"
-	done
-	for x in "${HEADERS[@]}" ; do
-		rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
-	done
-	for x in bfd iberty opcodes ; do
-		rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
-	done
-	# Delete broken symlinks
-	local destdir="${EROOT}/usr/${HOST}/${TARGET}"
-	rm -f "${destdir}"/lib/ldscripts
-	find -L "${destdir}"/lib -type l -exec rm {} +
-	rmdir \
-		"${destdir}"/{bin,include,lib,usr} \
-		"${destdir}" \
-		"${EROOT}"/var/db/pkg/cross-${TARGET} \
-		"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \
-		"${EROOT}"/usr/libexec/gcc/${TARGET} \
-		2>/dev/null
-
-	rm -f "${ENV_D}"/${TARGET}-*
-}
-
-set_current_profile() {
-	if [[ ! -f ${ENV_D}/config-${TARGET} ]] ; then
-		eerror "${argv0}: unable to locate a profile for target: ${TARGET}"
-		return 1
-	fi
-
-	source "${ENV_D}/config-${TARGET}"
-
-	if [[ -z ${CURRENT} ]] ; then
-		eerror "${argv0}: no binutils profile is active!"
-		return 1
-	fi
-
-	echo "${TARGET}-${CURRENT}"
-
-	return 0
-}
-get_current_profile() { echo "${PROFILE}" ; }
-
-list_profiles() {
-	local x i target
-
-	if [[ ${ROOT} != / ]] ; then
-		echo "Using binutils-config info in ${ROOT}"
-	fi
-
-	set -- "${ENV_D}"/*
-	target=
-	i=1
-
-	for x ; do
-		# skip broken links and config files
-		[[ -f ${x} ]] || continue
-		[[ ${x} == */config-* ]] && continue
-
-		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}"
-			if [[ ${VER} == ${CURRENT} ]] ; then
-				[[ ${TARGET} == ${HOST} ]] \
-					&& x="${x} ${GOOD}*${NORMAL}" \
-					|| x="${x} ${HILITE}*${NORMAL}"
-			fi
-		fi
-
-		# We would align the [...] field like so:
-		#printf ' [%*ss] %s\n' ${##} "${i}" "${x}"
-		# but this breaks simple scripting: `binutils -l | awk '{print $2}'`
-
-		# Or we could align the target col like so:
-		#printf ' [%s]%*s %s\n' "${i}" $(( ${##} - ${#i} )) "" "${x}"
-		# but i'm not sold that it looks better
-
-		# So keep it simple ... only makes a diff anyways for crazy people
-		# like me which have 100+ binutils packages installed ...
-		echo " [$i] ${x}"
-		((++i))
-	done
-}
-
-set_HOST() {
-	# Set HOST to CHOST if it isn't already set
-	: ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
-}
-
-ENV_D="${EROOT}etc/env.d/binutils"
-
-DEBUG="no"
-NEED_ACTION="yes"
-DOIT="switch_profile"
-PROFILE="current"
-HOST=""
-TARGET=""
-unset UARG
-
-select_action() {
-	if [[ ${NEED_ACTION} != "no" ]] ; then
-		NEED_ACTION="no"
-		DOIT=$1
-	else
-		die "one action at a time!"
-	fi
-}
-
-while [[ $# -gt 0 ]] ; do
-	x=$1
-	shift
-	case ${x} in
-		-c|--get-current-profile)  select_action get_current_profile ;;
-		-l|--list|--list-profiles) select_action list_profiles ;;
-		-u|--uninstall)            select_action uninstall_target ;;
-		-d|--debug)                DEBUG="yes" ;;
-		-h|--help)                 usage 0 ;;
-		-V|--version)
-			ver="@PV@"
-			echo "binutils-config-${ver/@'PV'@/git}"
-			exit 0
-			;;
-		-*)
-			die "invalid switch!  Try '--help'."
-			;;
-		*)
-			if [[ ${UARG+set} == "set" ]] ; then
-				die "only one profile/target at a time please"
-			fi
-			NEED_ACTION="maybe"
-			UARG=${x}
-			;;
-	esac
-done
-
-[[ ${NEED_ACTION} == "yes" ]] && usage 1
-[[ ${DEBUG} == "yes" ]] && set -x
-
-# All operations need to know the current HOST to figure out
-# what is a native target and what is a cross target
-set_HOST
-
-# All operations need to know the profile the user wants
-case ${DOIT} in
-switch_profile)
-	# decode user's profile choice
-	x=${UARG:-$(TARGET=${HOST} set_current_profile)}
-	PROFILE=""
-	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))
-		done
-	fi
-
-	if [[ -z ${PROFILE} ]] ; then
-		# User gave us a full HOST-ver
-		x=${x##*/}
-		if [[ -f ${ENV_D}/${x} ]] ; then
-			# Valid HOST-ver yeah!
-			PROFILE=${x}
-		else
-			# Not a valid HOST-ver ...
-			if [[ ! -f ${ENV_D}/config-${x} ]] ; then
-				# Maybe they just gave us a ver ...
-				if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
-					x=${HOST}-${x}
-				else
-					die "could not locate '$x' in '${ENV_D}/'!"
-				fi
-				PROFILE=${x}
-			else
-				# Maybe they just gave us a target ... pick active profile
-				PROFILE=$(TARGET=${x} set_current_profile)
-			fi
-		fi
-	fi
-	;;
-*)
-	# lookup current profile as the user gave us a target
-	PROFILE=$(TARGET=${UARG:-${HOST}} set_current_profile) || exit 1
-	;;
-esac
-
-eval ${DOIT}
-
-# vim:ts=4
diff --git a/sys-devel/binutils-config/files/binutils-config.8 b/sys-devel/binutils-config/files/binutils-config.8
deleted file mode 100644
index e8e64de58158..000000000000
--- a/sys-devel/binutils-config/files/binutils-config.8
+++ /dev/null
@@ -1,67 +0,0 @@
-.TH "BINUTILS-CONFIG" "8" "Jan 2005" "Gentoo" "Gentoo"
-.SH "NAME"
-binutils-config \- manage active versions of the binutils programs
-.SH "DESCRIPTION"
-The \fBbinutils-config\fR script allows you to switch between different 
-versions of binutils when you have installed multiple copies (see
-USE=multislot).  It also allows you to manage multiple cross-compiling
-targets simultaneously.
-
-Remember, you may have one version of binutils active per \fICTARGET\fR,
-and changing the version for one target has no bearing on any other.  So
-changing an active cross-compiler will not break your native compiler
-(i.e. \fICHOST\fR).
-.SH "SYNOPSIS"
-\fBbinutils-config\fR [\fIcrufty options\fR] \fIPROFILE\fR
-
-\fBbinutils-config\fR \fB--get-current-profile\fR \fI[TARGET]\fR
-
-\fBbinutils-config\fR \fB--list-profiles\fR
-
-\fBbinutils-config\fR \fB--uninstall\fR \fITARGET\fR
-.SH "GENERIC OPTIONS"
-.TP
-\fBPROFILE\fR
-Change the system to use the specified binutils version.  This may take the
-form of the list index number (the number shown on the left in the
-\fB\-\-list\-profiles\fR output), a full \fITARGET-VERSION\fR (useful when
-working with cross-compilers), just a \fITARGET\fR where the \fIVERSION\fR
-is picked from the active, or just a binutils \fIVERSION\fR where the
-\fITARGET\fR is assumed to be the native \fIHOST\fR value.
-.TP
-\fBTARGET\fR
-Similiar to \fBPROFILE\fR, but this is only the target and no version info
-(i.e. \fICTARGET\fR or \fICHOST\fR).
-.TP
-\fB\-c\fR, \fB\-\-get\-current\-profile\fR \fI[TARGET]\fR
-Display the active profile for \fITARGET\fR.  If none is specified, the 
-host system's \fITARGET\fR will be shown (i.e. \fICHOST\fR).
-.TP
-\fB\-l\fR, \fB\-\-list\-profiles\fR
-Show all the profiles that your system currently has installed and what
-versions are active.  The active native version is noted with a bright green
-asterisk while the active cross-compiler versions are noted with a light blue
-asterisk.
-.TP
-\fB-u\fR, \fB\-\-uninstall\fR \fITARGET\fR
-This is really for internal use only.  Used to remove all traces of the 
-\fITARGET\fR binutils from your system.
-.SH "REPORTING BUGS"
-Please report bugs via https://bugs.gentoo.org/
-.SH "SEE ALSO"
-.BR ar (1),
-.BR as (1),
-.BR ld (1),
-.BR nm (1),
-.BR objcopy (1),
-.BR ranlib (1),
-.BR readelf (1),
-.BR strings (1),
-.BR strip (1)
-.SH "FILES"
-.nf
-.BR /usr/bin/binutils-config
-.BR /etc/env.d/binutils/*
-.fi
-.SH "AUTHORS"
-Mike Frysinger <vapier@gentoo.org>
diff --git a/sys-devel/binutils-config/files/binutils.eselect b/sys-devel/binutils-config/files/binutils.eselect
deleted file mode 100644
index a89655aba145..000000000000
--- a/sys-devel/binutils-config/files/binutils.eselect
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2015 Gentoo Foundation
-# Distributed under the terms of the GNU GPL version 2 or later
-
-DESCRIPTION="Manage installed versions of sys-devel/binutils"
-MAINTAINER="toolchain@gentoo.org"
-
-### list action
-
-describe_list() {
-	echo "List all installed version of binutils"
-}
-
-do_list() {
-	binutils-config -l
-}
-
-### set action
-
-describe_set() {
-	echo "Activate one of the installed binutils"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-do_set() {
-	[[ $# -eq 1 ]] || die -q "Please specify exactly one version to activate!"
-	binutils-config "$1"
-}
-
-### show action
-
-describe_show() {
-	echo "Print the currently active binutils version"
-}
-
-do_show() {
-	binutils-config -c
-}