Fix from James Le Cuirot for handling of $ROOT in ldscript cleanup #156118.

(Portage version: 2.1.2_rc2-r2)
 (Signed Manifest commit)

3 files changed, 21 insertions, 41 deletions

diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 974c38cc8b77..13980efae916 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -5,10 +5,10 @@ AUX binutils-config-1.8 10258 RMD160 fbad5dc6fd7a86793edcd960e90e8fab20d8de31 SH
 MD5 1ee464741f34882a1c46c188af729bc1 files/binutils-config-1.8 10258
 RMD160 fbad5dc6fd7a86793edcd960e90e8fab20d8de31 files/binutils-config-1.8 10258
 SHA256 4b39cd5ca2fce451a2abd13e03ed516db21981bb82d15fe29f6a0cb415f07a25 files/binutils-config-1.8 10258
-AUX binutils-config-1.9 10975 RMD160 90ccfc58f4f7d14a37192071d07f111354cab287 SHA1 ce004e8dfc97f84798cfffca5099a76cd485cd37 SHA256 d5332236fb5f3154bc9608f655929909d52910997e8f9cd6602535c8d3f5f51c
-MD5 2d46c243c05f8bf445e692983f92e080 files/binutils-config-1.9 10975
-RMD160 90ccfc58f4f7d14a37192071d07f111354cab287 files/binutils-config-1.9 10975
-SHA256 d5332236fb5f3154bc9608f655929909d52910997e8f9cd6602535c8d3f5f51c files/binutils-config-1.9 10975
+AUX binutils-config-1.9 10991 RMD160 31ddec59e7915df0a55e03fd20192ca63dd09a5a SHA1 36b6880d078a49a31ea0265bd5170c9bc35672ac SHA256 b788f7b4faff09e3cf0fb2bd0662299bea125f27b5560fc20dd04a3a350ebd43
+MD5 5665f7fe2048846c811964d579c341e6 files/binutils-config-1.9 10991
+RMD160 31ddec59e7915df0a55e03fd20192ca63dd09a5a files/binutils-config-1.9 10991
+SHA256 b788f7b4faff09e3cf0fb2bd0662299bea125f27b5560fc20dd04a3a350ebd43 files/binutils-config-1.9 10991
 AUX binutils-config.8 2989 RMD160 afb26717c9466456bbbdf6a3d6b93aeb63ff9416 SHA1 ea27aae69a152491c9e96f756b6265f68aac6849 SHA256 ffc462de3eaa865f77f00e36275a0a9b0b51782d9d4d5fcfad18583a13adf6e5
 MD5 953efbc2a688428dfb75ecfa3c2d3d43 files/binutils-config.8 2989
 RMD160 afb26717c9466456bbbdf6a3d6b93aeb63ff9416 files/binutils-config.8 2989
@@ -17,28 +17,28 @@ EBUILD binutils-config-1.8-r7.ebuild 572 RMD160 ad5b5a729de7841ff268e1e88a945440
 MD5 5c065fbfad62f4fa969c3ade59bea58a binutils-config-1.8-r7.ebuild 572
 RMD160 ad5b5a729de7841ff268e1e88a945440ccbe3b71 binutils-config-1.8-r7.ebuild 572
 SHA256 cf8484c6f46b796de428dd5ce081aa14f1babf6247430517e5d796c0c26382b3 binutils-config-1.8-r7.ebuild 572
-EBUILD binutils-config-1.9-r2.ebuild 631 RMD160 e75e9a9fdfc626df20e2b3d34165e0a8afd8164e SHA1 2d06e3a197ea21738f3da7d74b00f726f2cb49e1 SHA256 5a09c50aecadb8e1db4f0635c2f7724b633de2c11ae4ca418152873992a99bf0
-MD5 d554ebef292a43a6b0099bd1ddc37d60 binutils-config-1.9-r2.ebuild 631
-RMD160 e75e9a9fdfc626df20e2b3d34165e0a8afd8164e binutils-config-1.9-r2.ebuild 631
-SHA256 5a09c50aecadb8e1db4f0635c2f7724b633de2c11ae4ca418152873992a99bf0 binutils-config-1.9-r2.ebuild 631
-MISC ChangeLog 5752 RMD160 fd772ee7dde4c98eb405f277047c9967434842de SHA1 6c241970f1849ed136ebebc9d21d3756b08e5b7d SHA256 460430401ce9dacdccab6395ab2f9c41b38089629a149be7fa3cb751d08269fe
-MD5 a6dcfdfee6c27a219fd00174dffacea9 ChangeLog 5752
-RMD160 fd772ee7dde4c98eb405f277047c9967434842de ChangeLog 5752
-SHA256 460430401ce9dacdccab6395ab2f9c41b38089629a149be7fa3cb751d08269fe ChangeLog 5752
+EBUILD binutils-config-1.9-r3.ebuild 627 RMD160 2f1aabd66fe03cbab9ea8a5415a54a018b45fa1c SHA1 ff73eacbbcbbce53685a7dd042631e9556942414 SHA256 318abdbec46fff635a742cd8ad826607f91c2edda7935cd3f3be3efa6b9732dc
+MD5 4cfb73cc3d3081b91f3281ef47bea0d2 binutils-config-1.9-r3.ebuild 627
+RMD160 2f1aabd66fe03cbab9ea8a5415a54a018b45fa1c binutils-config-1.9-r3.ebuild 627
+SHA256 318abdbec46fff635a742cd8ad826607f91c2edda7935cd3f3be3efa6b9732dc binutils-config-1.9-r3.ebuild 627
+MISC ChangeLog 5978 RMD160 7c622682085764f7bf4fa62da77f21b1d6ce61f6 SHA1 e3efbda65ae9d66a777c19d6bd78c3bbaede35fc SHA256 78c5eb23c2e6699637cc373c7f888bc1809d90ab86cc6aa1c55404da9175f9a7
+MD5 bd75600f6f56d463ab6220b7bbcfdf6d ChangeLog 5978
+RMD160 7c622682085764f7bf4fa62da77f21b1d6ce61f6 ChangeLog 5978
+SHA256 78c5eb23c2e6699637cc373c7f888bc1809d90ab86cc6aa1c55404da9175f9a7 ChangeLog 5978
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-binutils-config-1.8-r7 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-binutils-config-1.8-r7 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-binutils-config-1.8-r7 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-binutils-config-1.9-r2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-binutils-config-1.9-r2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-binutils-config-1.9-r2 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.8-r7 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-binutils-config-1.8-r7 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-binutils-config-1.8-r7 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.9-r3 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-binutils-config-1.9-r3 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-binutils-config-1.9-r3 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNvopAiZjviIA2XgRAlFoAKC+7W747DR6Oday+pxJk4m7sEdQLgCcCktO
-5HFdH88R5ehS2JXxQvpEx60=
-=FV6S
+iD8DBQFFaZpNamhnQswr0vIRAo0tAKCW5CPzgrO1PA1kqi1hM3Z3YI1vcQCgnQKv
+TPoyfroY9LQ13+hZBT+Am9s=
+=D5lj
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild b/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild
deleted file mode 100644
index 5a1813df3f2f..000000000000
--- a/sys-devel/binutils-config/binutils-config-1.9-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 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.9-r2.ebuild,v 1.13 2006/10/19 04:07:49 flameeyes 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 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="userland_GNU? ( >=sys-apps/findutils-4.2 )"
-
-src_install() {
-	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
-	doman "${FILESDIR}"/${PN}.8
-}
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.9-r2 b/sys-devel/binutils-config/files/digest-binutils-config-1.9-r2
deleted file mode 100644
index 8b137891791f..000000000000
--- a/sys-devel/binutils-config/files/digest-binutils-config-1.9-r2
+++ /dev/null
@@ -1 +0,0 @@
-