glibc do not make ED EROOT variable

9 files changed, 9 insertions, 21 deletions

diff --git a/cross-armv5tel-softfloat-linux-gnueabi/binutils b/cross-armv5tel-softfloat-linux-gnueabi/binutils
index 65a0ebf..0f98435 120000
--- a/cross-armv5tel-softfloat-linux-gnueabi/binutils
+++ b/cross-armv5tel-softfloat-linux-gnueabi/binutils
@@ -1 +1 @@
-/home/benda/gentoo/usr/portage/sys-devel/binutils
\ No newline at end of file
+/usr/portage/sys-devel/binutils
\ No newline at end of file
diff --git a/cross-armv5tel-softfloat-linux-gnueabi/gcc b/cross-armv5tel-softfloat-linux-gnueabi/gcc
index 17b47e0..8e0883f 120000
--- a/cross-armv5tel-softfloat-linux-gnueabi/gcc
+++ b/cross-armv5tel-softfloat-linux-gnueabi/gcc
@@ -1 +1 @@
-/home/benda/gentoo/usr/portage/sys-devel/gcc
\ No newline at end of file
+/usr/portage/sys-devel/gcc
\ No newline at end of file
diff --git a/cross-armv5tel-softfloat-linux-gnueabi/linux-headers b/cross-armv5tel-softfloat-linux-gnueabi/linux-headers
index d7e9980..6523839 120000
--- a/cross-armv5tel-softfloat-linux-gnueabi/linux-headers
+++ b/cross-armv5tel-softfloat-linux-gnueabi/linux-headers
@@ -1 +1 @@
-/home/benda/gentoo/usr/portage/sys-kernel/linux-headers
\ No newline at end of file
+/usr/portage/sys-kernel/linux-headers
\ No newline at end of file
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9c4994c..bb0b7b9 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,17 +15,17 @@ 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 10974 SHA256 c26a12ed9e5c55d76244e5e0b0d5a389f2a2327272d98a7de079cc943f8dd16f SHA512 bc1203462f1c1fd2e05c6a3362c94cdf78041ef78429c9e06dfdf4c012468451e9f6f0e71a177f725ff894ccd1746dfa460f33fbb4f78625d62095e536c9c75b WHIRLPOOL 2b97a7cdc0d47885eb0d7284df4d9c998f9a1ac701b78d94ecce93637ba22ff5498825351ba2e83b7d2fa2c3c7276d92010bb05b3fb2e937ef85cfe3d85692bc
+AUX eblits/common.eblit 10901 SHA256 03f5cc0ec972f9367adf1843c00b4255f81e68df9223a2236fbc0bc994dfa629 SHA512 a7a33fde24775e4b1259c0f657798a295af0488d105e35a2f7534c05c17e0fc113fd3e5f9b0ca24aac1474aeabe9c139622a283ab5e7416824f5ff1f2ece9300 WHIRLPOOL 2f5797fd92bf9dc3ee9ac2c8cc095476c330e219c60b6bc7346ec52b212414b7600158bbcee51ce32417bce5c16dcbd837a6b50b02986da95c54300f7866aae8
 AUX eblits/common.eblit.rej 327 SHA256 fa1fd7723ab34b564ec8e1512c13c380e6ea3c85b08f3fc3f8a8eae7adddb94c SHA512 06ad7a43e850785ea53c1fcdafb680778c355fb072b89b4df61ac7de9c3ac2b2939185addfac841965ed0350eb00b7f5d113d47a2a22d85cb6f25c5a78f3aeba WHIRLPOOL b616f952040a60d8462fea91790f2365a01d73e1bf2c41ba95d18e6379490b31d91b389d0c395fa696c729f1a0e93a6be601df5bf4c7fe713eaa1eb333f734b8
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
-AUX eblits/pkg_preinst.eblit 2301 SHA256 1f62270b97616380953e1b18ba58c15e7a869df8d923896f7d5160095f4873bb SHA512 c4c35387e46026e72c1288f5d1882692e902480e5e214d21ba70ec601e5943a7cb7fbc107e9341e9e284f942b205ee9be3ce87c1494936ec4bd54ad849ae8968 WHIRLPOOL 3eb3c4a1e4f4f943fdb0835cfe956674a6864be7d435f6fdbfbe11b4f5de18581ccdcd9f8decb914fa3d4da5f12772f5a49b7d70142689c69cbc6b7b934dfbbb
+AUX eblits/pkg_preinst.eblit 2287 SHA256 5cc4ff72c7637e5f7a1534b805250ce69e4c5bdab211b39831068cbd8e7af678 SHA512 4ed0d857568f567f4d707d6d90b596371b6a75bf7ef78bc5d468e7e3e65458d4b8e3d8df3b63bd3616f1c239babc6594880f69856d6b83923d65d6281de5a5d5 WHIRLPOOL 189388d6f9162efe10492d74b691be4a977f5621453bf56f1ac99d1b5106ef15519ee495a71b8e0ce5b2f9a186de42b93468156eb8ac645ec357731262a6d097
 AUX eblits/pkg_setup.eblit 3897 SHA256 eb384c601e2a48edd1f2e3ad591847d65c88d9560ce24efa69502ad75fc7350c SHA512 7af588bfdf9ac0c7042ca96578b7c1c9f67abfbf7d653d9ec1a811addafc9a800cc89d250f44a0570f9c02e8294a28b330eb278c020de7eed4c181e44ecbe57e WHIRLPOOL 271229a58dd9498bcaab420f4d5ab2648122c81b39e6611551cbd3f693fddbc9ae44787c34b7b68644d8cab270147c716a362fbe414602d8938d0166f2b5a99b
 AUX eblits/src_compile.eblit 7177 SHA256 5ad914a83c00537e68dbad7b354d865346e6abb8a736359b30aa5e1203eba140 SHA512 d68bac6b896219f13e284065c6f2e5f8ad080981c98ac9794cd2612eaea74744b7c3914dc4b5a1c1d3416254d6caffa05227a33adbb82360dab07c775558d9fa WHIRLPOOL c61d9d68386ef54fe2c89939afc225b2c6d8fe72a0bc3d5e5d90b38a601cd4fcbcf1fd399cbece20d6933f4ccbe28b224bafaddef0098aa26be16d5d6c0d9196
 AUX eblits/src_compile.eblit.orig 6953 SHA256 7a2cab65ad5d253be9d41a23d74c10dd1131eb6c4b75a4811db3ab9ac36240d8 SHA512 b2e18ae52dfc40ed4b8a9042c66110f493238d944c596e1bb04079bd110a8dc876d66e78ef3aa0b557eaedbf06f4ade417c83ad7930b12dc103d6334c033f216 WHIRLPOOL ea66c74cb145af7b19e5c01bf3498ddf52ba378b5119aa7957f080c28adb9469c5726b1fdc22487fccdb676d6fffe0f477c76a1090c91ae21e622323f4c19240
-AUX eblits/src_install.eblit 8254 SHA256 2b70e51f93b6f86de753d47b7789eb17d17c199d73cda31bf3db40810e2e8181 SHA512 e82e9f6778deb701fd3f8d50fb1537a2d66f88f9e2c247888a7c4d400827b9cd0207159eadd99eb5131de8313fef019a34ccf88ab312d5afde59b96bda5696ef WHIRLPOOL bda2470137154c0ce2a128d7bdea83a3963715b429e70ddcd7c96fa17403ddbd2f0f4bec40929c2f8e4ce1a3fd19dca897307f0ac43641cd3f3eca5c0b10f378
+AUX eblits/src_install.eblit 8240 SHA256 da21623cf7e439b359aaf1c838b5ccddb7938e6c896abe2d2e65a1d0135e1354 SHA512 b2e0cc313e3d71f8ac72876ee9bc54487e1215bffb9bf9b8b258b827f232d3c1d7d81a6061828250f728a3096ca5767bbf1298c8e55e59cc43c5cda6c6cb965c WHIRLPOOL 2ca7df1e56dbf70cddcad71c7aeb13c16c87df2eee4012e3c0d9d8df140025652b50f556a4c5e1a755772ad13e6f80309fb761cc76abc0d2c238bf640a3be5b9
 AUX eblits/src_install.eblit.orig 8582 SHA256 03f6caf665249b7cf4db897a1984b76271152002411b49ff5876cac07916ab4e SHA512 070e2c0980f02734fbce86b1b2b625c7908f23174b4215bfdd83345ccaa5236ffaf15be84b8e43105c9fd64753a06777f46eae2e33ab374cf34dfc058bda3a61 WHIRLPOOL 69f46b24b98b0c755b035551abdfa57274f2462fc2c3755ab3c27c866502042794d15e3462c9f2d62cac2bd389d4ad941bc8443a9d5ad69c9df1252fe0123a58
 AUX eblits/src_test.eblit 1278 SHA256 4cc565c9688292f1a195b4d9a5ba2d1b90ccc505e62229fc21d9fdf67d9655d5 SHA512 b058884a9ec43f047f10b6d61338366388dfb58c920e3f55baa85a9795750af7b8eafba427bb8ec59b1269853a4e4135b86a951f6513f64304461364b6f36a6f WHIRLPOOL 50b798092b0a9734767a8f9b7d3e1dc087d76e60f1dc83d6d5dde8aba48b992fb1b6eb6f07a9259b6fc4dac9bb391ab8972fd705be91ca15033d4d4144044e93
-AUX eblits/src_unpack.eblit 5278 SHA256 296653a28e5aa6a5ab2270686a02b4a8fe61fe7e638d368b42a81ddc66f7c14c SHA512 b650623f7d5f6bc5c9e72f2503a62aca18f52f5e0f5e33a81491a34ed22d46dee37ce66990f7a6c3acd91d75736d5368dee56d0bb191d076e9bdeb92bc11bb74 WHIRLPOOL 8671430359bd8f8fc92d10459be2a7cc034441324217cce3d4ceb3aa184841f3bc273a74a5d8c99affc83c7a88dfe4fbdacfb7db017a8c6363fe3883c6ce80dd
+AUX eblits/src_unpack.eblit 5177 SHA256 c22b479fb56eed3c67fe03039ce6167f878d60e183814bbcd585ccf7154d8f2e SHA512 a348198ee078b28855b951a67cd645729ccb6560270b7fd3a4dd52a39e0d089c4067de7b286e060e021fb2cb67d65ea134a22b6d66b2d1980f4c183a4dd852c4 WHIRLPOOL 91f76ed06a3a8ece260901a357d73ba50aea9a67a41abb569c322e16c711770fa7983c9c4a603db68a99075d001390cfc68bc50cc21e5ab6148d62ebb55bea0f
 AUX nscd 1621 SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 SHA512 3e1255ab014b3806112120000c3d2189a7c1c69dcd6639d5ce55e96bec721683a22b141982f6a6c6d44b14481c33fbbaa470863bef04e9b9eab7ccad1ddd5d95 WHIRLPOOL b7152f8d888fca13a16ea403c44eadbf1da2249dae3add11f73999259061824460a5479aa7e58c012bd737b62ecc81814109832cee33638279d90d4c08bfdbdc
 AUX nsswitch.conf 503 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d SHA512 c13714110f3ccc9a2270f51d0da9293ab19b9df368092d19b1a84d5051d888297bd9439a322eca1ea60d6d5e58952797d803a368a295f2db6d5e97e173907373 WHIRLPOOL 0d37755ba5928ff894c355b3fdcf7079f19c1cb7a4f3676634084da89c74d7175823a4659b8c66d8dc1395d086991857162822ddf977dbe8dff9a59bccab821e
 DIST glibc-2.10.1-patches-7.tar.bz2 113612 SHA256 6c94493e08c13072c94c967f55b659e6c950ec470c9677c43cfab10e24a88370 SHA512 6f1d575273ee354e6b9fb85d1a25b660e52fc77ed50bbe0a2c25f60d4ad11ed4560b27358d1b7a5412d5f1fafac2dd83b7ce5b1420205ef2d4906e4c99b610ba WHIRLPOOL 70efe90ab258bf15cf6c0b2ec826aacf25d4cab0d0e09b8883ecfdc34bdc54072bcd3330dd622b8f12ee6a1c74928ecd022e844a351717b53397f056b376992a
@@ -77,7 +77,7 @@ EBUILD glibc-2.15-r1.ebuild 8143 SHA256 94c831d06eb6cd7c153db3267dfc7811739d90b8
 EBUILD glibc-2.15-r2.ebuild 7692 SHA256 1ee891da4bbb450ce16318877a9043773c34a7418eb49f7f684155e48ecc1b6b SHA512 4e0e5c7e85a514a0fed90a9e339eef8748e3a0f06211a93463db355b9b921337ead3f645a3fe8b99dbe2f12d1c03e2ffcad7e2dbe2909b5d97fa5486fe53215f WHIRLPOOL 84ab863b0f70cf8d40291a155f21c987e9b48dce005890e34e105bb3fed950d463f0b053fe2d7988a9b218dc3ccc9afb0c952845009b2e7e2569b28298f8e479
 EBUILD glibc-2.15-r3.ebuild 7696 SHA256 35f0d18bc55a9dc99208c7863e106964b12d3d5dac296f68abc021cb8ab53bb4 SHA512 7da5f054a6838937eaf442414379f2ec73527bd4d24b81d31f292eed3b38ed0f6eb34508da4c3b3ede53688f96d7cf87eef029e3650f8f4df3a5554e6ca93733 WHIRLPOOL 47a0f1ca3b6ae7ab0e2600110e003bba9aa5507b922f3a5a32e9e5f50d05c92a3e4b56d01e18fd71a03c9651d63ceee80a9ac89b3ecf8ffbfe0356ad8f84aaba
 EBUILD glibc-2.16.0.ebuild 7495 SHA256 3b9bbb21f548a2d53eadbaae9313d67eb324c75489b560726d9bd002da8ecd72 SHA512 6218c4d725afa0f26a6f89e947a54f48c44b48d00c12c390c42fe402dc1ac9bcc221f9bf13f50a6ae1cae40e5101e756ab05795d571f5ec549ea432fb51167fd WHIRLPOOL a84fca43836ddd7b3fb2a1b5cd2674b20c6f5d2012be3e2dd502137da85c35a63fa4c11bce668cb216c002aada79e2a5cdac0791e6c2ae2ddc5fc461e09a16f9
-EBUILD glibc-2.17.ebuild 6737 SHA256 6a0dd5050e760ecd766f268fa106a2d521f7a47bf5706c51508f525b62d98070 SHA512 fd97b34eca22d673e0606bf0cfb7746259c1e91a9e5e60ccaf5e5a447397756c19f89dbcfac31b8c9a8140141f21037870e9a135e13b3ef1f295df759e8e2134 WHIRLPOOL caba1ff6d6242f301ddfc821f9575570470185ff0a744c9ccae947815a25af159004d59997d11e573bf6f79d4a82f09fd56824cb2c2d649b9fea6f1136c86fc3
+EBUILD glibc-2.17.ebuild 6730 SHA256 5a6182b320287e27de47597bccd966f50dc4182fd5ae813f99053dbbf9f2dfdc SHA512 de380ce98a4cb9a934dfc6f2ff88c2b0a141843805a4db94ef01d9d892c3d8208734987c1014aea8a116b20d6cb3ef0fa915275a6767255798132c341d71b011 WHIRLPOOL 0aa4661253703802fa2046bb84aec46dfa82684231086df52c5a3f6f79a59acfbbff6498d5adf124bdd735f52dc16279da664433d8786d3d8401b1db9eae3147
 EBUILD glibc-2.9_p20081201-r3.ebuild 6770 SHA256 87e75b306b69d170c7fd6083c7a40303ea292616a810c3e5302eb13ff72932b8 SHA512 3dc0d6f0b99a1e83caa8a152bb7752b8b504324876bed83657b683c73f8a3432150cb5d3b42aea11d064ee9d1a4d1788dab6c9da11cfc5cf716c214ec145e177 WHIRLPOOL 9fec37815cd88eab81f4452e02e13b96e13b1ad8284b1be7f77213280da54a9de85275cf665307d3920e36c3bc02f6005acd5316f6f2ed3dac5b3b60a80690b0
 EBUILD glibc-9999.ebuild 6619 SHA256 523f30d0bd4fb9aef983b7e62e57239d089251d0f3907b6dfb70a00cbc0c2e6c SHA512 2d875c8434720b700bfc99836870e625b7c3010178a4a501e435832e826e7008764878d1e4f88d9f568d21f97de56589bff7984b37d3e9840f19492585cfe16f WHIRLPOOL 7da4b26e63d4f79592891ebd1cf1fb915d40049e8feeb61d9c55f7af601bfe2b7f1a03b1aed51f95be0451c90e93992920949c92ccd2401a0c129b600f5afdb9
 MISC ChangeLog 58596 SHA256 d4ee2e0a3dc53524703d8554972e43cee619161a607d889bdf38adba6c9ffa2b SHA512 17feffc9a76cd7530626a03082df32f84eb6af055b9afb7fb4ef482633b245b1c02f65ebb7817b9af4740ef58784505fdcd2e4b86193c432ae26e8af7714a375 WHIRLPOOL 7520bcc14696a0d4325a7fa29d1739004d412d45bde4c3bf18ae6930bb6916636eddf712be64c0c5a9e7a4e992d3f09e75d9d529a4c172dd5d4391aeeeb1f543
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 11ff68d..654694b 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -24,11 +24,6 @@ alt_prefix() {
 
 TPREFIX=$(is_crosscompile || echo "${EPREFIX}")
 
-eprefix_env() {
-	ED="${D%/}${EPREFIX}/"
-	EROOT="${ROOT%/}${EPREFIX}/"
-}
-
 # We need to be able to set alternative headers for
 # compiling for non-native platform
 # Will also become useful for testing kernel-headers without screwing up
diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index b572c20..b625bfd 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -34,8 +34,6 @@ eblit-glibc-pkg_preinst() {
 	# nothing to do if just installing headers
 	just_headers && return
 
-	eprefix_env
-
 	# prepare /etc/ld.so.conf.d/ for files
 	mkdir -p "${EROOT}"/etc/ld.so.conf.d
 
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 1394da3..f7eab49 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -221,8 +221,6 @@ src_strip() {
 }
 
 eblit-glibc-src_install() {
-	eprefix_env
-
 	if just_headers ; then
 		export ABI=default
 		toolchain-glibc_headers_install
diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit
index 352743c..f2f75a6 100644
--- a/sys-libs/glibc/files/eblits/src_unpack.eblit
+++ b/sys-libs/glibc/files/eblits/src_unpack.eblit
@@ -110,9 +110,6 @@ toolchain-glibc_src_unpack() {
 		done
 	fi
 
-	epatch "${FILESDIR}"/2.17/locale-gen_prefix.patch
-	eprefixify "${WORKDIR}"/extra/locale/locale-gen
-
 	# XXX: We should do the branchupdate, before extracting the manpages and
 	# infopages else it does not help much (mtimes change if there is a change
 	# to them with branchupdate)
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
index 98132b6..168ef72 100644
--- a/sys-libs/glibc/glibc-2.17.ebuild
+++ b/sys-libs/glibc/glibc-2.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.13 2013/04/28 04:00:36 vapier Exp $
 
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing prefix
+inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"