Use SYSROOT when looking for source rather than ROOT #473728 by Benda Xu.

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

3 files changed, 21 insertions, 18 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 03e7a9344c6b..ec5a8e2635d7 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1021 2014/09/10 18:57:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1022 2014/09/10 19:15:42 vapier Exp $
+
+  10 Sep 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
+  Use SYSROOT when looking for source rather than ROOT #473728 by Benda Xu.
 
   10 Sep 2014; Mike Frysinger <vapier@gentoo.org> glibc-2.20.ebuild:
   Upgrade EAPI to 4 #473728 by Benda Xu.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index f52a5c647fbd..09e0f87bd6d9 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -23,7 +23,7 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 SHA256 ff9cde8857c5da89faa4039e2a81748
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf WHIRLPOOL 44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf SHA512 094b24474e42a9714f5298b0768d44f2c0e01b7d8c3b0a754bb16caa6c024106e8c0b1acbce670bacec1ead6653f8365397173d62cb8168b946c8f521ca155d2 WHIRLPOOL 9fa16256f9d3bd2f38023549c0bd4c932d3173b6c3f4ef66e19cdb3eff5cb2def6ec02fa72a7e57ba74da6d5f29b82ddb9692d59f6c694d45b5989fa0bfa6057
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f WHIRLPOOL 2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43
-AUX eblits/common.eblit 10655 SHA256 904998749e90cae011c589badef12201f6133db2c2573d1cd09b22b931c140cc SHA512 753861d1bae381d2fc88ecf995a7b06c29c9fd255666bf8f376de0632ec2a2091c0247b5c4569152a364ae17825d5792fd392a93cdc7bf76ed5e27c3d8a47e65 WHIRLPOOL c50a66cb4597ad986621f18d56c4db2b3adf62ef8d21a7e579f8ae576dbcc3294bc760d138f5df64f632791fc455e79704394a807721d8c6202fff9d56fe567f
+AUX eblits/common.eblit 10658 SHA256 5ef11b73a6dc0eecd475ec6ec3efe6ab7f3ce57d8640221ddd0bcb9bbb51781c SHA512 ab990de30556d020560a27bd40c225321fb244c71d4e77981d608f7f05bb9eaecec943d39299ce07abeb2c898a61cfc93c5f60700a7c5b7ee1628a5d6aa94c35 WHIRLPOOL 202fda00eff0d4c578a162f3c8a0a8e88baba3cf8c16028ca0697c2ce7b1b19db15f533a1b2477993b0f3229411c59c6c1ff4e606f9f8643e00923f8766aa06a
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
 AUX eblits/pkg_preinst.eblit 2608 SHA256 e49f274efe309b4bfed88195d413afa3363f40fb6c2caf50b4ab8ce5ab548864 SHA512 debfe0679d51eff7a154f7772179cf6bfe01beacf63fe101370c172e71b0524da0ceb7b0571e69a8050e5b75953b1d4c8968e1982ff4bc7362caeedde0be595e WHIRLPOOL 7b5c69c319651d860b3495d658b7275308f69504050699aada21ce5ecdd3114c1ea50ee7eac4436ee33738d02a0eb4bc6fff41484ff840aa2400bdd484ae3e93
 AUX eblits/pkg_setup.eblit 3953 SHA256 b062a64b9206da83f36260e6f99d812014c826df06d339b32ac5f6975986c6ef SHA512 c4dd7e73c335bba90d2c3788f4a9b35e0ff0e9cb1ab91a2ccf72fba9fc466b72fcd3e21e6f2e2c0b479a6dd55770824160a7e0288a84e7282d7d9241c087eccd WHIRLPOOL 7c1379d190de749871fef339b3eb8789b82e65a417e90bb04075ae34d0c999c5516918a3894782b3bc632ef2b772b206aad61afb18222cc438c13fa4c263d75f
@@ -101,23 +101,23 @@ EBUILD glibc-2.19.ebuild 6912 SHA256 3a11e60bed77cc2dad678ad97ed7a959a59a91a94ca
 EBUILD glibc-2.20.ebuild 6272 SHA256 eccf4df863cc02f7278b8275ff178e224ce26aab33d195b4f00f107805e030e9 SHA512 190049ef5d253b23dd97b2ab8f44d356dc4f00d93990c0e668caf722122740b8b4e1e14bfb78d841c3c9ce2011f3fa144289ae7e151a7c5e736f422f2f37ec9f WHIRLPOOL 24d3c2f36404f37e4d37ba52690ed9a27062ed9f08fb041d5741b0495e608a693d511765da97f042d1a4a1887de1ee94ce6042cc21ea868ad22ad30428bcab6d
 EBUILD glibc-2.9_p20081201-r3.ebuild 6787 SHA256 3d9ff2b86df088b8e8cc082c5ddef164b48cffcccfa2ea001306e79a6d52a52c SHA512 7070020105a777bbf6d846fab291b238d7861472c737031e8c52b6d5c2a0524e228b724751325448ce94a42ee39112088b91d0597cd2cdbcc68c51248d2d5a11 WHIRLPOOL aa0e2d11377c3a30478afbef0fa3daa12aa9711d68dc92ab08fca999e599c613648644da2e6f81c38dc98192ed26934c4a35418a97d3146650cd4c82e39a7fed
 EBUILD glibc-9999.ebuild 6839 SHA256 3d51b4a03932748b6716fdb1c63f6c083651f3d1bae585c989adf0c106c86d58 SHA512 14339b49e597d744e488ccecb17eef69ee22f2a49cf69a280377816cde522e56abf690c487a9cdcb396ef8084b165dd716956c02ee16bea45f39a0875ef2ffcd WHIRLPOOL f52e905e4f29d7d3e9da861028eae695160d1aff250060748e5ee5da2eb4b39a895ddf0a5fa3995f844631cc89f114e58ff9ac603b4c76f6bc36ed6855f037cd
-MISC ChangeLog 70675 SHA256 cf347a45b6d20dcd142098cf4a18f210e71faa7281721ceca7eceee9ff96c068 SHA512 93eb8f8f47ac58e8625452be7b969485a6414203cb2a115356be3639d03b720e1ca153a79bd29cfd5661b50551a584218c81842537c4905306ce5bbe2d6f0930 WHIRLPOOL 878ea39a90fd2a8cf5a20770dc2975314c18e89059ebf0612e304919c21c4b3df75ce458954e3b0f9dabcd5a3bf77151483d29f451a9cca80d08c7667180c461
+MISC ChangeLog 70829 SHA256 1873f80b4e3186dc33334aaf3fb507cb97be878f1453eb3b5ea23c8b17135dbc SHA512 c0de31f82568d3a6cc63f1177c850de7afa97c45ee8c9efe3fcb34e4d537e238044a32c36c9870d80264d78af03c0f7d17119c204f8bfb629533fd98b01e2e75 WHIRLPOOL ebddba1066e6d6d095f0014e4e1c8f7def005ee214a39669351257a0ab7e58b30e3f7c511c0bc83b1f1f8b7cbe9d3a1a33c5037d153172c31c3d3db8f36a6b8b
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 724 SHA256 b9d8df62b36ae314b29a3177c534495036ef97a819c152247383e907004fe4dc SHA512 8c215338bbf47de95f40f9f24c50d107ec0bbe4a47282d3cbc253d4003db85a88c542aee33756dd9d2d2ec4c70992009261d821a8c145c24c24d2ad448595b77 WHIRLPOOL 954f5d080c7219ffe85e128eddd05c74a32a457219d423441bb58d54a7de1786da6a2efb541861b3bfc93a9acf2ae6f79168d1ccc37385f84af0eb439fff2954
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUEJ84AAoJEPGu1DbS6WIA7gAP/1Ph0d75QhqLKHonrv8bl06I
-svaB6+mYn58lpwCtMKLVDaBB159Twmlx0/mTvWTk6Lh2KfSG4gprTrlJjK/y0ihd
-TuCTXby86a+zDZFm2lIUNwjMM+PkyyEl4zrPg/Rv6Fyxv0QSPpyl+LGIl0rLjpu1
-Q+ic50bCGLIbm9nzm4qPnGQWNcnrEgRkSGNwxqTwiGwCdY+pUjko1GyPKxS3KWtt
-OOnkHrOzF6TCHsDEi5vu2IAAf4rDHx9P5zWE3jhvu8qJIKC5jHT4yBNP4mjkOqcP
-x0bprK+3VXuDyk1h5dvcieEngWatd7WEpmXHJ5+A8/g+4i3AfcDr6INHqkVDlSVm
-jhsiW9Y1OpJJbZIcMIfb3cCt0hgiwI73qQm4VpxXmlFTSqQiXZ5gWNa/vqgaDd9l
-G9+J5866fnx824eI50feYtrTDQVFE94sSnDjAGufL55kllP1OkWYegDUJxFujioz
-fTDaq90sFwegwndL7B35py7ARTFgq9G3mwEoDntr1DXTYKgxlTuMdLELmdJNv6Bu
-UZodcS+KtWcNUbu4tg8gSBjQs14EcAAh522sqwrpb6z7GAyfUAPWXcDdru0GYdwI
-PPnjF1BvuJKQMb9l5699K4WFMmy7WC5aLNeWfbQjiNKc+btDW9ETpPcLuKAtC42o
-9zrKNPsLUcFTU5x/cpzP
-=j5/l
+iQIcBAEBCAAGBQJUEKNjAAoJEPGu1DbS6WIAw6MP/RVsxWgHeldVIuTClWvZFa75
+1Ky08rWnXxgdLbwCYsj7VNaoFA8QuJV0AAwpUCLVgmgeZ4YQJai1ggYWwGSLc1/0
+tvnXyaFoIuBu6Vd/Sa74kizmhH133KE1ckEpjB/dOpQrWbHRymBf/lq4eyJ2zzxf
++M4tU1DWkO/BNSv6SufLQBoWZ48lIH4+QCigF5hKMuPKZYf9RsUUyqClZIMuPEmp
+8tghoK7YDJQUurq2USUzGPvl4FJGUIsu2vrf4jGDAydeDt9xyRa6YdzJYxtRQcga
+/2YqBxb25rtv7cL8jmaVsM/oAGfPvirZYEBWYDccFNSurr5ntnKNz/24356WHHTk
+3kdEn7bckoQPRLsMUnYmxGdbRk1m0S7vhAEtbvyDHujag+fz7SaEsIAwbpfB31UM
+9ceDl8gWNN3aRD5zkAqeugNQSncv8Jt6oaAg2i+lMi+JJorpoKQahx7UGuoVw9Sr
+XI+FXXU5yalBx4KyW9ZU5eu65TU1qhduB40wJOH+7onLJDbpZF7ZiAd5XbHast92
+C9P0XQOd5bWFcTUql/GSU6u4Mmxu7WHfeacl7HLpU2bHNpOQZIomDclGReWe/a6j
+JMEpsDqBAMbU2PGZcZXmbrAaorqpGeoF43lsPFXsbOX21qbBs/qKpOYeKS+Jwe7/
+CSCqkBI7hVWoTUmpYFL/
+=LRRy
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 2b0c1c96f952..89c145da562d 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.40 2014/09/10 18:15:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.41 2014/09/10 19:15:42 vapier Exp $
 
 alt_prefix() {
 	is_crosscompile && echo /usr/${CTARGET}
@@ -23,7 +23,7 @@ alt_build_headers() {
 	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
 		ALT_BUILD_HEADERS=$(alt_headers)
 		if tc-is-cross-compiler ; then
-			ALT_BUILD_HEADERS=${ROOT}$(alt_headers)
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
 			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
 				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
 				ALT_BUILD_HEADERS=${header_path%/linux/version.h}