Fix relative ROOT handling #431104 by Greg Turner.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 24 insertions, 11 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index ed37f71798a9..949b67108995 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.61 2012/07/29 18:36:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.62 2012/08/18 03:57:51 vapier Exp $
+
+  18 Aug 2012; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3:
+  Fix relative ROOT handling #431104 by Greg Turner.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> binutils-config-3-r3.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #420355
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 2a00ff921148..42d825ab9c6b 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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 13493 SHA256 13d996691f18ff23e08a84f0b1c927cf0e278c91289c5968f28308b4842c3483 SHA512 4ecb376317abdaef29c5327cb62a166643a11d88ff72c4117e90abd025df2a5c5ffcf9691c0f53c24d362597c3931e9d8bbfe9f91173aafeb66def02a4e92ee5 WHIRLPOOL 7a1df99bfd4f9d7ccfbc2dfaf1f7e9004a57b96dd767ca799fa7e4c5b17768f3f826ca980e42391171b975f551e582375356c995d85dd2d3aecec368544b4e87
+AUX binutils-config-3 13496 SHA256 c44dd302b84b04f3373edc46e0fff4f1880fdd999e9dbba750416f0850993009 SHA512 368afe0fc93a89ebb53338a63b11d22e1897521c818e77111a1d2f1a260c2ad0f9abe90d21aa98b1b7913447876b34a14fcf5ffb4d80762a3c22fc8616a838d6 WHIRLPOOL b6b1df4bdb36baf76ac7ef06519d2c73678d5fd441dba0f8d7a24259333b66a883c2008c8fb962faefdec1ac13fed525360b2e4767b12bd588c785d5e1abfd2e
 AUX binutils-config.8 4113 SHA256 ec7cb82331c80e15581e0936a5bf5edb3cde78bec3c3ede647926821086a1e6f SHA512 608e32ca64a82e0975cb247d30914db25668f637e30fd486f7322566065cc420470d237415da53ba7eb12daf4389b049b5ec8b2f8af598bf03803f48fd77f933 WHIRLPOOL d1ec82404f639718c51a1f983c1d60212ee6e943c6225c16bf4a2a24a8e7aa22093cce0fefa0f331ae7480b7b03ef10931d516e7ecf0a051415565eb583145a0
 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 639 SHA256 ee1def37b292183e65fc0d8af7148dc6d345ef3331e06bafd5384678538610ea SHA512 fa7171c4e9628cee0c3864e74403ca63654fac63b85159194d828678ae80c49ab8051eac90c7026d8da6fa08e2ffc3415a65c7dcb2664cbf03a6ad2fde1f43ad WHIRLPOOL 788570ed0381d82a4e1ce99aae91c13db941b3c679d6a74909b79b016d5041d2205a591d06a8544b5400b61a8b4230c47007c25c1e855dd246e753590d7096d0
-MISC ChangeLog 10244 SHA256 25c2f768648a284a3bebdb52f1a7be15cbee9c43bf435597ab817068df4c7b26 SHA512 f55096ede3fbc515e39a0fed59468880b90d6100163f22d64efc3d11b498c2804d0689adb415a0dcb2d0fa2415ff0242f088a83df904093862fb9c39e14e215e WHIRLPOOL 3b63de6172e20fb63dd43095791e758eeb2523ee09ea36e7b1bda6ed48d68fe92abd44ca30a5c01b5d8e8137509a7a6791b18e6405aff86c526ba03d384afc91
+MISC ChangeLog 10372 SHA256 fd3f84a10a2c628376d9c9527feba9417d3a432f8fa7ba8628468220f832782c SHA512 0574ab65d33a4bb4f1784f594aa19e3f1e679a5f90a2d3f2b487d7a8ad467de25d37e0ac875c2861c4796b35a22172f0925a2d856e0399581a201a733a800e7f WHIRLPOOL 8e5d92c2822369d44a6c61ea908bc28215cb44dd37218aa98d59dbad04bb3399395408d2677307e6aa0b70ab9b2a54b5d54fa914d796cd493919fb961e9426e1
 MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVgqMACgkQuQc30/atMkDDBACdG4FVKeOT2HocIXZ4VQegj27+
-Gl4An0uyzDKkFBZs6FOLoy2N/bjVZ9ic
-=X9+a
+iQIcBAEBCAAGBQJQLxLIAAoJELEHsLL7fEFWj84P/3V3qkLeI855HaWS9QqJWcZ0
+JjxAViTcFqhJA6SkklfqX7/Joq+F8IB3arrAiHZrHcWMo3or6bq1bfagKRHyqphE
+XkUHEcG04cRmWFjc0BgBOzwI8+ZVeS3N1Prx/iJ2IsrkSXUMGpgy+bZ1SqJkBZHm
+LWIJWfJLmWtnYBN+V6BqBtcHQMQUDaFLmicadS0+qcO0flpQdaZ938GIRvpzL3kg
+yq6ufzgHdSlW+O/Ywk79eg2BQYbQPFRjrmfjb75oEiGoS1ztSbtsZsNBIt2Vx9n7
+M6lpsqcjiMEIqOgcpHcHZoG+28Vl9K7ba0HJrAKw9iBCOD/Hbu2wBoV8IHUHuKav
+r9EUpvLdNqEK/1l21TfnPqHn7cNFyL1RpR4/PpohU+EXUOFEhTaqxE91Pq35RAC6
+/wn3t3yHO/DuWCNotptzlZt021SQv5HHbYx6hCEAMbVNxzMSDFKft9Ivq4hymKTg
+pNpxBDKq39PpK7ifUMdwJpn088MUdOdiSOw3n+Qj+zTGARTkmeyZHUlCbipL+ce9
+MXEU0sHZgrDab4AjKHWJG71ECevsVn6MbEpOXMaKbfjHNsfwa5FIr1xa9kXDoOGG
+cax/bLTHqzFIH3k+8UdTp/Xl3HmHazAjCeyu5qEs/qauEolXamYJ3aeX+NADupEF
+jJwrMAKzJAjC5CgFt0ev
+=QgV4
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index 78972bb09cfd..e84cf2796b3f 100755
--- a/sys-devel/binutils-config/files/binutils-config-3
+++ b/sys-devel/binutils-config/files/binutils-config-3
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2012 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-3,v 1.8 2012/03/02 23:12:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.9 2012/08/18 03:57:50 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -9,7 +9,7 @@
 
 : ${ROOT:=/}
 [[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
+[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
 
 cd /
 
@@ -411,7 +411,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-3,v 1.8 2012/03/02 23:12:09 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.9 2012/08/18 03:57:50 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }