Fix by Ruud Koolen for ROOT handling with man/info paths #532610 by Ruud Koolen.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 54 insertions, 22 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 7b04b8fe2638..38aeb1a8ef29 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,13 @@
 # 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.67 2014/12/30 15:10:36 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.68 2015/02/09 15:14:52 vapier Exp $
+
+*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)
 
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 5e89861c726b..d6cafddf8851 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -4,28 +4,29 @@ Hash: SHA256
 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 13599 SHA256 babf8d17c82f9ffdad83d9ddde0cf2897a21dc0d79233cf9110019ece06c321f SHA512 8ba2cf49933152bd3a8178349d691ed59c675fc8d05d6ef798d62da2cc07dd05e69ff29c07676f5bed279fa8c425c7a4260dee33d30f482911c2b3b732eaa7d8 WHIRLPOOL f639a12c04222e134fa5ae32442f4817b8b0d16cfbce8157a6143d9d0309277c8712f7704f38bb975f233b95b5ebaa0fe193a89beb5dd3f53b47851f325c70bb
-AUX binutils-config-4 11835 SHA256 0d79f8aba04b4f5b617a8653d6aa7c9ece0a31537870796f7335933b9c88ace5 SHA512 2b2812ecd2c44c2e8d2c807e95a25d839a528f645dc9d4359dca740a7296b96666be13d7b098bd421c29af3a7064a915c925c16db7c0055a8a91c81bc7cab71f WHIRLPOOL 4cc942ad9c4608188deb0f0c8c366dad7ac2cb750727a975941f51ec1ac86e878f449d1ac4453a81cd35005fe305eb9e736a7b5c1067b4e0cc308da53ed117c8
+AUX binutils-config-4 11847 SHA256 f9a886916afb4e47400b1ad3c1ab9d03a735dac2258f948a77ea66a837b932b0 SHA512 6168a2931bddf89c22faf0d1612a516af76c897f1b23ae72caf3883551d940e91670bf2dc11995145bb6e25996d6f6f002e35f562930f9e0d5c3baea1fb7761a WHIRLPOOL e702c2d110d2ba2b84a98b4f9c83bd8150e0dcce14db06e2454cf598cd2e141af61c38c897ed1d82eb7b60185e63ad606a915367fe6e403ef7a8454012441f4b
 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-r1.ebuild 724 SHA256 5f8d5163cb8260cb6b584b65e5c939f72490da852aa9462ed958cdc80762068a SHA512 4caca999f4361cfa90300518ff2efe01fb612dbfd3f20375439b1a00fb322875bd5c8b3a7cb502bbce4073d2cd1a86006c128451d28e2f3b43bc9a48257c936e WHIRLPOOL f456307381c9151fe5ce0d079b901d656ea2b58529a84c9b0d9e270979725f5b4953e8218129d33c87986773ec4eb55d94711e330ec1f5cc956108c275a8b38c
-MISC ChangeLog 11176 SHA256 53aca094cb3ee52b677710d44205fcaad89bb6c03bd96dba02b644cf6a6e91c2 SHA512 c7394ae1c7f9b8b1a4cc27fb411a38ccdbc639b46f1120c0315fce3580deb1a8605b678cf266597e15c511d84e20ed13523fb3567e0216329e9ec9bc08d6ac26 WHIRLPOOL db7fa6fc008c4168635cd641fa56feeabd076721187a73689048eb8d16ebc0860e3f8414036ae250000a9eaf6cfea75d1cad6a00c84e92139ba33a3702147b94
+EBUILD binutils-config-4-r2.ebuild 722 SHA256 e12485e8192ac7f33def5aff2de8f2dcf64f8f0e3d0e3abb4ca0c2ece805aa0b SHA512 873b85344bc26adc75ac2510644eaa40ce46648f165bd33fb066a200f6d49a5aab1ccee55625222bbe333adc5b819e548787128c9cf9fc5ee0ef80f88cf1377d WHIRLPOOL e118a38f3b16e9c363a3f9a7f5092aa8822df859f224b791e16e05883aae8dfd5b05f8541f1281ffade111abde62c566ec786e967e52ef12b44a2585a4c9e9b8
+MISC ChangeLog 11404 SHA256 ce739a6e54969080cb157b5a6a77434eaedd8f4138e967bf44de75a4a95a3132 SHA512 6855ea198b5c8c16ba7c593b82999c71853960b96951865b510fc3b94502cf87382a5adb7ba156e1081648f7bbe1e9181c6ce92cca169af2093faa80e917a3b8 WHIRLPOOL ad42a439ae5f7296925fc360f7480cebd5715eb9efee4033862e1e1b112387051a77c645487fe2b5b6608cdae9e4f6063a7099c0c963c3b421d01d82d3e6b2e0
 MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUosCoAAoJEJOE+m71LUu6SdcP/Awo66d7g3xqq8lPcrMukbvM
-OHsNtgPQ8k1TfEme7dYCHoG7OEiiiR5WYXtLo9Lvd5gH1swqiOMYrKiDNljJcbxx
-sgcfsjn3ddUr7xErXcOY6SLUa1xvmLez1lGtDq2hcdXono91fQZfwo19s6x2OyMM
-F/RvFiP6O5y8EV2SRHiD8tNXgDK3BjLKAcDcs8STh6VJjgKax5Rb94IJ9TwPfPpP
-2qpkFXozBbn+4+7oWfBZa13uatKCKeUV74elFFHVxRgul24oIoOjCj2nbYclm9Bk
-mEDuQ17e75oAq8wS3ccWSoiF3rwk3JmmNnFW8DQOStz1BZpuNzgaY4FqGeSPCD/d
-dCM3CFyVmiiZpeJwLuVC0Rax4i0IAQ8fHNsLJvaUOL8xGlNCg4I6hncJ2jEkazC1
-t52De4TLZR/7wjFE3Esbab8lvevJxSkhBT3YNGS2ItplkZoVdW6EwpApH2cPKR8s
-aKZ1V85YD1deNCK2pmdXo34FyYRbJz9DCyp4y8+N2S4M0XWk4bQ9WAJbjXbFc15J
-5eMpJl5tk4Y9F0Q1Jveh/6BZspveM4dPNpigbz0bZp6h0LANTFbBIQ8dFLWcTolx
-Nb2Qyns7gKrO7TVjPLLlMcv8ZwXo64padr8Yq2tGuYFe3ga7aLZTzYhs4/3qQqCp
-Ike5CiHm3uAlmB3vsbVx
-=TiI6
+iQIcBAEBCAAGBQJU2M8DAAoJEPGu1DbS6WIAyMsP/iNmeiP9A7G6t11y7Jy2inNr
+rBsoAWqJYXBOYScN3ajKCoAf7JmuXHfRS0hJVR3lgYCqVy0LeQRLnpAW714Lu4v/
+EbeT6aOYQ0e1+fIbL9OYN6lVT4axv9Jm+9WALF+uyGbAZZ0hHEORPkasklqNQEJo
+qkBLjwIhzdHh3VEsjX7sNlTFXUUOB9hbejM34Jx7/IRIrvJIaswA1IJ935H2N9oP
+apcWBlAZEuLW8ohXD3EiasQr3JeF4bW1OjgXqxOY5DDxbjoptLDdl+yKiCQvP/qA
+rt0GWpm3X563Nz/ChCW/cai6LwqTbTrERIjeYY3xdjLN3cE428SHA/yRemJJIf0d
+RKd28jSRumv4MQI7JYqJt1lFwMXMlLajS7Moa0TZLQJcwZvFYEZnP86Hu1glG4lA
+1OqZpcqC50t5ynAr3wPVccsXALxEarJkwkpOEoDvlJX6fK9skd0+UFPqm42EOU6Y
+PwvyHWAiYN5XVuE23OaF811GXu06HRJyfTsfBdDIXXjdD7+A/fJ9aV2YdF9v/oqd
+5AYVp3ANgG3PbsD5tzbsj3g8+XOP1dCM9gqCRbRhZBWbuNzqtWTg3tyh5z3uhs6s
+fer0mw0ubdEbme9tuIgAAb0yeXR+6aNBD9+rOrbKx5d89wAkZzAlaeW+xQyQRE15
+9C8Rnyxw2CR1sx1FruQU
+=2sqo
 -----END PGP SIGNATURE-----
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 000000000000..feddfc0bdf41
--- /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
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-4-r2.ebuild,v 1.1 2015/02/09 15:14:52 vapier Exp $
+
+EAPI="4"
+
+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 ~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/files/binutils-config-4 b/sys-devel/binutils-config/files/binutils-config-4
index b860b291b78d..4ddc94b9ea85 100755
--- a/sys-devel/binutils-config/files/binutils-config-4
+++ b/sys-devel/binutils-config/files/binutils-config-4
@@ -1,7 +1,7 @@
 #!/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.2 2014/12/30 15:10:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.3 2015/02/09 15:14:52 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -170,8 +170,8 @@ switch_profile() {
 		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 ${ROOT}/etc/ld.so.conf.d ]] ; then
 			local l="${ROOT}"/etc/ld.so.conf.d/05binutils.conf
@@ -384,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.2 2014/12/30 15:10:36 blueness Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.3 2015/02/09 15:14:52 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }