sys-devel/binutils-config: import -5 and revert -4.

9 files changed, 745 insertions, 61 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 8fb2d57..1eac8c7 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,57 @@
 # ChangeLog for sys-devel/binutils-config
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.66 2014/07/29 11:15:38 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.79 2015/05/25 06:07:20 vapier Exp $
+
+*binutils-config-4-r3 (25 May 2015)
+
+  25 May 2015; Mike Frysinger <vapier@gentoo.org> +binutils-config-4-r3.ebuild,
+  files/binutils-config-4:
+  Do not delete native ld.so.conf.d fragment when uninstalling cross binutils
+  #549708 by Alexander Tsoy.
+
+  25 May 2015; Mike Frysinger <vapier@gentoo.org> binutils-config-4-r2.ebuild:
+  Mark arm64/m68k/s390/sh stable.
+
+  26 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> binutils-config-4-r2.ebuild:
+  ia64 stable wrt bug #547330
+
+  26 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> binutils-config-4-r2.ebuild:
+  alpha stable wrt bug #547330
+
+  26 Apr 2015; Pacho Ramos <pacho@gentoo.org> binutils-config-4-r2.ebuild:
+  ppc stable wrt bug #547330
+
+  24 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> binutils-config-4-r2.ebuild:
+  arm stable wrt bug #547330
+
+  23 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> binutils-config-4-r2.ebuild:
+  sparc stable wrt bug #547330
+
+  23 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> binutils-config-4-r2.ebuild:
+  x86 stable wrt bug #547330
+
+  22 Apr 2015; Jeroen Roovers <jer@gentoo.org> binutils-config-4-r2.ebuild:
+  Stable for PPC64 (bug #547330).
+
+  22 Apr 2015; Jeroen Roovers <jer@gentoo.org> binutils-config-4-r2.ebuild:
+  Stable for HPPA (bug #547330).
+
+  22 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> binutils-config-4-r2.ebuild:
+  amd64 stable wrt bug #547330
+
+*binutils-config-4-r2 (09 Feb 2015)
+
+  09 Feb 2015; Mike Frysinger <vapier@gentoo.org> +binutils-config-4-r2.ebuild,
+  files/binutils-config-4:
+  Fix by Ruud Koolen for ROOT handling with man/info paths #532610 by Ruud
+  Koolen.
+
+*binutils-config-4-r1 (30 Dec 2014)
+
+  30 Dec 2014; Anthony G. Basile <blueness@gentoo.org>
+  +binutils-config-4-r1.ebuild, -binutils-config-4.ebuild,
+  files/binutils-config-4:
+  Address bug #504120
 
 *binutils-config-4 (29 Jul 2014)
 
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 1c31866..39d38f2 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,11 +1,10 @@
-AUX binutils-config-1.9 11043 SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373 SHA512 d0366bd547d7c2adddf30975a361b2f25d008f0203db9e53cd81e635fd081e0ce13940a1df511f6edc7a11d6c4e641567cb750006cbbaa7b5bfd118bf6f87464 WHIRLPOOL d2c06206ffb351226db6db89e305042c03cf3cfa628c440fd3fd7274bf0c62c8ba61599f4997714075dc9f61b57a46709824eded2a31678bc2668e43c982ce91
-AUX binutils-config-2 11440 SHA256 5e923d1445910b9b9d1e455e52313087098689359846db0dc3fa52d33b63b192 SHA512 16b8bc2277bb50fb803377b192368a7abf7c97b5959bdd0d67fcf508220164d29ee2cfc1526ecfce7125b7492a0a5e4f094e948fa5ba9af44487229af3d91197 WHIRLPOOL 3acedb96e6c0c97e2223aa5fffcfb59f7e7b311c883e1557191db14b166a01d14ecd6eafbd4a4dbd33ceb2ca388fa7bf54d8291a24bb5e26a5634e2c8fb2a2df
-AUX binutils-config-3 13874 SHA256 d4395a6480a179165098433235726f416aea4029474ecf93534c4ec844422788 SHA512 8c486629109fd67bebc248a629d38bc2ad0546c70fe42e82ccb609932ec2cdbe32545486f437bb15c81318ad7d9f962fdd63fe1156ea844c31ba2812362a792c WHIRLPOOL 8555808ff549955ba93b9331ccf5424056817339745309b6f5b3064f594f22ae44eeab0cd3b9724b67fe1860cfb5048b8c95792075b6b4423659a75ef6633783
-AUX binutils-config-4 12111 SHA256 1d6cf0d1e26e928c5a8c77f98fd8414b21b7b407fcce8621fb10c90820676b1d SHA512 a3d91417e46bd17b911e205469d665632c5ab7f222f3759736302fd72734ef350973412f1f4876abe796248818594037f8a17c3d5fa1f8f30afb974bc7d7bd39 WHIRLPOOL f5f8345e3a4bae9f5f92f9dfa1decbdd9ff15efcae923a41bfc6f2a0f09767a3b229351c6509175a2bbecedc26e8e26f3f4f70028e03096e5c8b0941629d436b
+AUX binutils-config-4 11570 SHA256 09ca8e043c07da03ea247bb8cff2777d989f8d435421299de59307c78db1cd8b SHA512 cd987bada67cc222230c3592edf5391caa6c5fcb15081f9acb40befdd351f8a539bde8b9d921cb5c13d6f246b5eecf4fdda9f49bf899f086c966ff6fe558c12e WHIRLPOOL e840e7c1137c4598bdd7989f584d18cefa820c86d74d8755718f5aa5e572e79e669cecff23ba6bfc0027110991e5f72c457cb15c910c4bb1e60b8d1e6f660b86
+AUX binutils-config-5 12023 SHA256 261c32814ec804961bb919a53db58618e765784bd646d635455c8ca96c5ed7df SHA512 61d8b1849661ff8424635abc06c14e92cbbe7c8f23ce1d96d0297d3f569ddc5cf52f29aab18be276b70dc85d320b0699c960631dfffc583ba5e232a6731df14f WHIRLPOOL cc07c5e9deec78a053d44b79cd714c43815d73e93fbae795335c688bc14cdc71fbc232c9c1b47e2f73f2f0b65e8c0a3a83aec5747d89a52096eab302315dbe4b
 AUX binutils-config.8 2837 SHA256 20817cd2e6e3a8ace12ada7b73ada556d597527adcad02876e522e0b6396d4a3 SHA512 66a260499c1100dc71469e4ca1e2b0f71410382138c381e6a6ed4e4aa19520607407ffa6a28e0388e0abe5ee86769b662cec29cdb2ff02cc6c05af64314db5d9 WHIRLPOOL 8bbc5c525b1c7a3ec147458569d570a3312034da2c75c1f31c4cd888db5205aa0a8c8ec061b2354d8ac80b43bdbdf1559a92e904dae5f681345fe758794c2535
-EBUILD binutils-config-1.9-r4.ebuild 626 SHA256 4445f3282acda5b7c96146974adefc47315c437b5eb008daab9ac5f87a18d99d SHA512 82089adb1b63b386280f512a096836189bcd42995f7058cb211c7b01860788be24a4112c3345dd4042ed7b2311bc7b5a40248e55ad2e958519d6b8fd7e341d5e WHIRLPOOL b4409b6e396e42bf0dea54a1cc8aa912d7f1f215d7143d955ead38b1dea883d95b0b518fe198df72f21af8a954b148b7d18d292d6965a82417856fffccaa0ac7
-EBUILD binutils-config-2-r1.ebuild 627 SHA256 06d97c5306e671ccf55fcad8eec8dcd20e1c6c3bb8e4646771d62af5f1e1754f SHA512 856c552643f31f3df0218442c0290f7cb090c5088e0796ad03e5e07f5bdf0f8d3233b1659556e5768909a557971e5e5ebc702ba4a39658c7a862c4d5336364e6 WHIRLPOOL e5af63fd41361217f60dcfa84a605616a7bb0037fb986f00f3f866dff19bfa3fb96365b10be4854b6a27d643ccb2d682910644df5941e7f4d88f341ae2e6ad3c
-EBUILD binutils-config-3-r3.ebuild 645 SHA256 f06ca4397099677760eca41ef1ea3fc4cc3f55d755ff1cd51d607e60bf850af9 SHA512 73a592d324d7d537c3d67ad7402f13fe2b165fc241db373dd982015ada8b92d0bf961dd01e705cd3e77f704811535053f7a360fa24437bf25f5305f3f9713702 WHIRLPOOL 75f57d9150498c247589500945f09b07f83d12e86e4f7c213f86ffa6c8af51b28c60e18ea85b51cc02fd9fa1c30bd969c366aba2d81c7690d2a09be0eac8d413
-EBUILD binutils-config-4.ebuild 694 SHA256 c3d1239293d5b9202bca8ad676589f8fc4765b2f2f020a444013d802205efb5c SHA512 642fc5e12d4f2ff18d9344e43ab8a921230374df8e3c532e01368753053d084ef95fc93bfe5c6dbfdfce6ef8eeed86e3cdcece287ccf4330b0f74581537f2a47 WHIRLPOOL 342d7c82e29142a42bacc90a5a70167b17b339a1957ecd441b866227249009959f0bcdf66ac1fff38b3f0e450e7fc322fe787ecedfb95a2717215785b08a3b63
-MISC ChangeLog 10973 SHA256 ccd4960beebcbc858597c6a2fcc518804f496c580dcd60614f8eadc21237defc SHA512 d0ca8953ac9b086e22d658d7c81657461f31d30da13cf9125819fe0f937ad185d8667e8b55d68c82ec71a00c70bc18683cfbc5df40b8118af6beb27ce977329e WHIRLPOOL 512320d1ded539d35cbd8b2a1240bdd871841c1727a9de91b6aa7e0b8f498da19c572816ad1211546a5818b8ecb1ee32f2037964ade786e2cc970184c86e26b9
+AUX binutils.eselect 810 SHA256 e579d3bffc645730f396ebc01d9f9f1043ee8db5edb1f41d5aeadeedcf6aa295 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203 WHIRLPOOL 5ae5fd07213e2be381824aea237aa2cc47a987a2ee6508fcd8f18424f8e3de89be71f1de781240af45b98f7525048be2ab7cb60893384efbcde8f8a92a32c73a
+EBUILD binutils-config-4-r2.ebuild 589 SHA256 2ed036c4de98c14f8529cda7f20053fc46afa4f2d284a91c6dc2509f09823c5c SHA512 f4b5a3836a3e02a3c27ed30efe365feff8ace91c22fc9b53bce5e434b358067e2f6cdd5229c65df25794a1188327610423a76a216da96ea2a710e6c7c0e39e56 WHIRLPOOL ea5d882beb17908182762ac0159045b647858dbd73c535babfb82d67d4fd14da3c017e9ba729435ca6317175aaf5de896feecf52ba0e7e76cb47b5c3eeb02223
+EBUILD binutils-config-4-r3.ebuild 602 SHA256 15ce445a5ff179785bc453db3284387c9c4131adc49a7ac1552842ed41a6a3f0 SHA512 e53331878b1ac1b9c748ec167965f02769f46a6fae9cc24bed3237c9e593b3eca67b25d49ab8c1d2a8b9cd5bd9aae0b33c445b4c0c3e4e62b05f7594a79af104 WHIRLPOOL 8694df18f030fd023ac79a5df65da7920bbdd4db4f80bba3bc7dbb072b90dcc641d1efca5aaea33b056bd077e3ac2479d027a16a1530884605480b9cd162ee34
+EBUILD binutils-config-4-r4.ebuild 704 SHA256 fc57abc3f09896a2f89fa0ed0bf5be6160adf077c3d42d9af274d278f55e3687 SHA512 3df81f0b9d2a8257352239778bc7e153d03e081636eb5772d8e67625308ee2636cd9a1525df07ac44c743e80ccd285d060646e86c5656ace33ec04bbc1cf437b WHIRLPOOL fa222755455f5c7e93b592d641f29f7eb700c3158172bd4fc62452c2fdc1fa0fbb7dd08652ce550b1328750f9fc6386ac49a42a21450843c6872e4d4b1a32d5d
+EBUILD binutils-config-5.ebuild 1029 SHA256 9232e53f25ca5c17669b91007767c7ffb70374cfe85cb8702792e07483128011 SHA512 099451164d3704b8025eccb3135ce5988012072e746eaf284589d1371f11df4db7f7c26bd109d1e646cd574b66fbadf83993da77b84c144e9378bb2ea2f256ea WHIRLPOOL 523ea50fef3c3d5727704b05ad139031b21dd2aeadb5b1fae7a38253514508fb7f5e7ddaac83a25bae3257e36b06932315267528e62a740734b666d5dbc7384d
+MISC ChangeLog 12757 SHA256 996edd94d7f8b82e690fa028e8e729ba1aafff0e2e8dd2fa358718ee990546df SHA512 bf644ca23b2dcd20d8a7279377711d976211e91bf4c41f10638383dc1a3e2c215864e3328984f50f0d2137474a9d07dcd499eca16a8e2df757f54295a52b5ac3 WHIRLPOOL 5de7f1e57ca53bca17deef27b6a2c52b816d7df586fbbfc92304d8a518a2fd6ef31911f4b2012fb9b8b10210038fcfab05a3871a67545b7f4dfd6eab04c85c4e
 MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
diff --git a/sys-devel/binutils-config/binutils-config-4-r2.ebuild b/sys-devel/binutils-config/binutils-config-4-r2.ebuild
new file mode 100644
index 0000000..ed29997
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-4-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+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}
+	doman "${FILESDIR}"/${PN}.8
+}
diff --git a/sys-devel/binutils-config/binutils-config-4-r3.ebuild b/sys-devel/binutils-config/binutils-config-4-r3.ebuild
new file mode 100644
index 0000000..58ade48
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-4-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+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}
+	doman "${FILESDIR}"/${PN}.8
+}
diff --git a/sys-devel/binutils-config/binutils-config-4-r4.ebuild b/sys-devel/binutils-config/binutils-config-4-r4.ebuild
new file mode 100644
index 0000000..c70e4bb
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-4-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+# We also RDEPEND on sys-apps/findutils which is in base @system
+RDEPEND="sys-apps/gentoo-functions
+	!<app-admin/eselect-1.4.5"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN}
+	doman "${FILESDIR}"/${PN}.8
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/binutils.eselect
+}
diff --git a/sys-devel/binutils-config/binutils-config-5.ebuild b/sys-devel/binutils-config/binutils-config-5.ebuild
new file mode 100644
index 0000000..f3a4c32
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+# We also RDEPEND on sys-apps/findutils which is in base @system
+RDEPEND="sys-apps/gentoo-functions
+	!<app-admin/eselect-1.4.5"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN}
+	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/files/binutils-config-4 b/sys-devel/binutils-config/files/binutils-config-4
index 3bf84fe..18fc00d 100755..100644
--- a/sys-devel/binutils-config/files/binutils-config-4
+++ b/sys-devel/binutils-config/files/binutils-config-4
@@ -1,30 +1,24 @@
 #!/bin/bash
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-4,v 1.1 2014/07/29 11:15:38 vapier Exp $
+# $Id$
 
 # 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}/"
+cd /
 
 trap ":" INT QUIT TSTP
 
 argv0=${0##*/}
-source "${EPREFIX}"/etc/init.d/functions.sh || {
-	echo "${argv0}: Could not source ${EPREFIX}/etc/init.d/functions.sh!" 1>&2
+FUNCTIONS_SH="/lib/gentoo/functions.sh"
+source ${FUNCTIONS_SH} || {
+	echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2
 	exit 1
 }
 esyslog() { :; }
@@ -103,14 +97,14 @@ setup_env() {
 		# 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}
+		if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
+			BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER}
+			BINPATH_LINKS=/usr/libexec/gcc/${TARGET}
 		fi
 	fi
 	if [[ -z ${BINPATH} ]] ; then
-		BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER}
-		BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin
+		BINPATH=/usr/${TARGET}/binutils-bin/${VER}
+		BINPATH_LINKS=/usr/${TARGET}/bin
 	fi
 }
 
@@ -120,24 +114,24 @@ switch_profile() {
 	setup_env || return 1
 
 	cd "${ROOT}/${BINPATH}" || exit 1
-	mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin"
+	mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin"
 	for x in * ; do
 		atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
-		atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}"
+		atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin" "${TARGET}-${x}"
 		if [[ ${TARGET} == ${HOST} ]] ; then
-			atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}"
+			atomic_ln "${TARGET}-${x}" "${ROOT}/usr/bin" "${x}"
 		fi
 	done
 
 	#
 	# Generate library / ldscripts symlinks
 	#
-	: ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}}
+	: ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}}
 	cd "${ROOT}/${LIBPATH}" || exit 1
 	if [[ ${TARGET} == ${HOST} ]] ; then
-		dstlib=${EROOT}/usr/${HOST}/lib
+		dstlib=${ROOT}/usr/${HOST}/lib
 	else
-		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
+		dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
 	fi
 	# When upgrading, we need to clean up ldscripts and libs
 	mkdir -p "${dstlib}"
@@ -155,16 +149,16 @@ switch_profile() {
 	if [[ -d ${ROOT}/${INCPATH} ]] ; then
 		cd "${ROOT}/${INCPATH}" || exit 1
 		if [[ ${HOST} == ${TARGET} ]] ; then
-			mkdir -p "${EROOT}/usr/include"
+			mkdir -p "${ROOT}/usr/include"
 			for x in * ; do
-				atomic_ln "${INCPATH}/${x}" "${EROOT}/usr/include" "${x}"
+				atomic_ln "${INCPATH}/${x}" "${ROOT}/usr/include" "${x}"
 			done
 		else
 			# 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
+			find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" \;
+			rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null
+			rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null
+			rmdir "${ROOT}/usr/${TARGET}" >& /dev/null
 		fi
 	fi
 
@@ -172,20 +166,20 @@ switch_profile() {
 	# Make sure proper paths get updated
 	#
 	if [[ ${TARGET} == ${HOST} ]] ; then
-		DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER}
-		local e="${EROOT}"/etc/env.d/05binutils
+		DATAPATH=/usr/share/binutils-data/${TARGET}/${VER}
+		local e="${ROOT}"/etc/env.d/05binutils
 		local ee="${e}.tmp"
 		rm -f "${ee}"
-		[[ -d ${DATAPATH}/man  ]] && echo "MANPATH=${DATAPATH}/man"   >> "${ee}"
-		[[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
+		[[ -d ${ROOT}/${DATAPATH}/man  ]] && echo "MANPATH=${DATAPATH}/man"   >> "${ee}"
+		[[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
 		# hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ...
-		if [[ -d ${EROOT}/etc/ld.so.conf.d ]] ; then
-			local l="${EROOT}"/etc/ld.so.conf.d/05binutils.conf
+		if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then
+			local l="${ROOT}"/etc/ld.so.conf.d/05binutils.conf
 			local ll="${l}.tmp"
-			echo "${EPREFIX}/usr/${TARGET}/lib" > "${ll}"
+			echo "/usr/${TARGET}/lib" > "${ll}"
 			mv_if_diff "${ll}" "${l}"
 		else
-			echo "LDPATH=${EPREFIX}/usr/${TARGET}/lib" >> "${ee}"
+			echo "LDPATH=/usr/${TARGET}/lib" >> "${ee}"
 		fi
 		mv_if_diff "${ee}" "${e}"
 	fi
@@ -205,7 +199,7 @@ switch_profile() {
 		echo
 		ewarn "Please remember to run:"
 		echo
-		ewarn "  # . ${EPREFIX}/etc/profile"
+		ewarn "  # . /etc/profile"
 		echo
 	fi
 
@@ -230,7 +224,7 @@ uninstall_target() {
 		die "no profiles exist for '${TARGET}'"
 	fi
 
-	rm -f "${ENV_D}"/config-${TARGET} "${EROOT}"/etc/ld.so.conf.d/05binutils.conf
+	rm -f "${ENV_D}"/config-${TARGET}
 
 	local x
 	for x in \
@@ -239,28 +233,28 @@ uninstall_target() {
 		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}
+			"${ROOT}"/usr/bin/${TARGET}-${x}
+			"${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
+			"${ROOT}"/usr/libexec/gcc/${TARGET}/${x}
 		)
 		rm -f "${x[@]}"
 	done
 	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
-		rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
+		rm -f "${ROOT}"/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}
+		rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
 	done
 	# Delete broken symlinks
-	local destdir="${EROOT}/usr/${HOST}/${TARGET}"
+	local destdir="${ROOT}/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} \
+		"${ROOT}"/var/db/pkg/cross-${TARGET} \
+		"${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \
+		"${ROOT}"/usr/libexec/gcc/${TARGET} \
 		2>/dev/null
 
 	rm -f "${ENV_D}"/${TARGET}-*
@@ -359,7 +353,7 @@ set_HOST() {
 	: ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
 }
 
-ENV_D="${EROOT}etc/env.d/binutils"
+ENV_D="${ROOT}etc/env.d/binutils"
 
 DEBUG="no"
 NEED_ACTION="yes"
@@ -390,7 +384,7 @@ while [[ $# -gt 0 ]] ; do
 		-h|--help)                 usage 0 ;;
 		-V|--version)
 			unset Header
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.1 2014/07/29 11:15:38 vapier Exp $"
+			cvsver="$Id$"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }
diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5
new file mode 100755
index 0000000..3afc963
--- /dev/null
+++ b/sys-devel/binutils-config/files/binutils-config-5
@@ -0,0 +1,479 @@
+#!/bin/bash
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Format of /etc/env.d/binutils/:
+#  config-TARGET:	CURRENT=version for TARGET
+#  TARGET-VER:		has a TARGET and VER variable
+
+: ${ROOT:=/}
+[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
+[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
+
+cd /
+
+trap ":" INT QUIT TSTP
+
+argv0=${0##*/}
+FUNCTIONS_SH="/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
+
+${HILITE}General Cruft:${NORMAL}
+  ${GOOD}--linker${NORMAL} <linker>          Switch to specified linker (if supported)
+
+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 ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
+			BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER}
+			BINPATH_LINKS=/usr/libexec/gcc/${TARGET}
+		fi
+	fi
+	if [[ -z ${BINPATH} ]] ; then
+		BINPATH=/usr/${TARGET}/binutils-bin/${VER}
+		BINPATH_LINKS=/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}" "${ROOT}/usr/bin"
+	for x in * ; do
+		atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
+		atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin" "${TARGET}-${x}"
+		if [[ ${TARGET} == ${HOST} ]] ; then
+			atomic_ln "${TARGET}-${x}" "${ROOT}/usr/bin" "${x}"
+		fi
+	done
+
+	#
+	# Generate library / ldscripts symlinks
+	#
+	: ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}}
+	cd "${ROOT}/${LIBPATH}" || exit 1
+	if [[ ${TARGET} == ${HOST} ]] ; then
+		dstlib=${ROOT}/usr/${HOST}/lib
+	else
+		dstlib=${ROOT}/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*' -exec rm -f {} +
+
+	#
+	# Clean out old generated include symlinks
+	#
+	INCPATH=${LIBPATH}/include
+	if [[ -d ${ROOT}/${INCPATH} ]] ; then
+		cd "${ROOT}/${INCPATH}" || exit 1
+		if [[ ${HOST} == ${TARGET} ]] ; then
+			# The binutils-lib package handles these files now.
+			for x in libiberty "${HEADERS[@]}" ; do
+				x="${ROOT}/usr/include/${x}"
+				if [[ -L ${x} ]] ; then
+					rm "${x}"
+				fi
+			done
+		else
+			# Clean out old path -- cannot use '-exec {} +' syntax here
+			find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" \;
+			rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null
+			rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null
+			rmdir "${ROOT}/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="${ROOT}"/etc/ld.so.conf.d/05binutils.conf
+		if [[ -e ${x} ]]; then
+			rm -f "${x}"
+			env_update_flag=""
+		fi
+
+		DATAPATH=/usr/share/binutils-data/${TARGET}/${VER}
+		local e="${ROOT}"/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 "  # . /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 elf2flt elfedit flthdr gprof \
+		ld ld.{bfd,gold,real} \
+		nm objcopy objdump ranlib readelf size strings strip
+	do
+		x=(
+			"${ROOT}"/usr/bin/${TARGET}-${x}
+			"${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
+			"${ROOT}"/usr/libexec/gcc/${TARGET}/${x}
+		)
+		rm -f "${x[@]}"
+	done
+	for x in "${HEADERS[@]}" ; do
+		rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
+	done
+	for x in bfd iberty opcodes ; do
+		rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
+	done
+	# Delete broken symlinks
+	local destdir="${ROOT}/usr/${HOST}/${TARGET}"
+	rm -f "${destdir}"/lib/ldscripts
+	find -L "${destdir}"/lib -type l -exec rm {} +
+	rmdir \
+		"${destdir}"/{bin,include,lib,usr} \
+		"${destdir}" \
+		"${ROOT}"/var/db/pkg/cross-${TARGET} \
+		"${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \
+		"${ROOT}"/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
+}
+
+switch_linker() {
+	local bpath ld=$1
+
+	case ${ld} in
+	ld.*) ;;
+	*) die "not supported: linker must start with 'ld.'" ;;
+	esac
+
+	setup_env || return 1
+	bpath="${ROOT}/${BINPATH}"
+
+	# does this binutils even support the requested linker ?
+	if [[ ! -e ${bpath}/${ld} ]] ; then
+		die "sorry, but ${PROFILE} doesn't support the ${ld} linker"
+	fi
+
+	# switch it up
+	ebegin "Setting default linker to ${ld} for ${PROFILE}"
+	atomic_ln ${ld} "${bpath}" ld
+	eend $?
+}
+
+set_HOST() {
+	# Set HOST to CHOST if it isn't already set
+	: ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
+}
+
+ENV_D="${ROOT}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 ;;
+		--linker)                  select_action "switch_linker $1"; shift ;;
+		-d|--debug)                DEBUG="yes" ;;
+		-h|--help)                 usage 0 ;;
+		-V|--version)
+			unset Header
+			cvsver="$Id$"
+			cvsver=${cvsver##*binutils-config-}
+			bver=${cvsver%%,v *}
+			cvsver=${cvsver#* }
+			echo "binutils-config-${bver} (r${cvsver%% *})"
+			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|switch_linker_*)
+	# 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.eselect b/sys-devel/binutils-config/files/binutils.eselect
new file mode 100644
index 0000000..a89655a
--- /dev/null
+++ b/sys-devel/binutils-config/files/binutils.eselect
@@ -0,0 +1,45 @@
+# -*-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
+}