[gentoo-commits] dev/heroxbd:master commit in: sys-apps/portage/files/, sys-apps/portage/

[Benda XU]

commit:     511a3525d02531f66422ac618af05dfcfbd55521
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 04:50:17 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu May 12 04:50:17 2016 +0000
URL:        https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=511a3525

sys-apps/portage: eprefixify distcc paths.

 sys-apps/portage/Manifest                             |  9 ++++-----
 .../portage/files/portage-2.2.28-distcc-eprefix.patch | 19 +++++++++++++++++++
 sys-apps/portage/portage-2.2.28.ebuild                |  4 +++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ae961fa..ae9158f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,5 @@
-DIST portage-2.2.20.1.tar.bz2 950298 SHA256 
84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 
5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e
 WHIRLPOOL 
99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328
-DIST portage-2.2.24.tar.bz2 972610 SHA256 
c2dbd53dd474c6fe455ffa5920514a6afe467abf02959c33ddb7a7e363939550 SHA512 
9dc00410de604db66843bdf62cf0ee7e93ff2c4d562390172c4f0c55ab98b2712078b0eb02c9f35d52633b0fff0b024736e25a1c66cf40ad61a6bf99a7cee4a6
 WHIRLPOOL 
3227c61662acf69abd843344d0fb1b7cc2cfa91c1bae48b08e1da8fdf42cda15834994852d42dfc089f189e318c657e12fd6b1c19885279e0bb5cfd2349235f8
-DIST portage-2.2.26.tar.bz2 977277 SHA256 
7f57aa704c58ea47f031f177203dc7b335e01e7ec1e809437ea9e46e3f9263e5 SHA512 
fd1a5e5d028d52ba82bbeb7f87bf331d0c1d8c7f5a3bd450c668dd742e99185b6d2b21944f5d7788fe941c99736744b08157ca30145f0964ea60a7c2c435d601
 WHIRLPOOL 
0469f4c5609146c57eae4baeb8488b95c04f336a5511460ee44d15746339fd43a7c2d61b58528845d77a6a0b21e46c2afad19a9f05e94ac8dc6180032d71f298
-DIST portage-2.2.27.tar.bz2 977125 SHA256 
3126b59456d2f0a1c9b2c03df15154b2fb29e462abbbe1b8898fa7bc291421af SHA512 
8f16a7c9ce33bd34d60f0b06d3e4e0bd4e2c27e6bdc0756e6d3b59108b5438e92f5ca9e981bbfe4ebe9b64f1afe9442d72c52c02fe456e0d36daffae6f77d694
 WHIRLPOOL 
e467c6d9e4e1c177667389a4ce134fabc8676ff5baf9403d73de241086c7d5bab4d11bfe84be749cf9f9781cadc1dd8d173e03e9fba4c926e24131c261a28d1e
+AUX README.RESCUE 137 SHA256 
69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 
dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
 WHIRLPOOL 
713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
+AUX portage-2.2.28-distcc-eprefix.patch 909 SHA256 
b59a7e6a03a0d32d77900944befc4de0e311a4e1046c2188d123a696a39481c8 SHA512 
f0264739185b6ec6ec9cd1353130832e7b53be694f34c8cc050df3c04e98dbdf3b861d6d961d2c04034f826ef456833a4990958c59e0524f5540edacc14c5f85
 WHIRLPOOL 
8beb2a0b9d929fdb8201d9ca3f502724f8ba6c9d176155b4a88d3ce18e58afd7bd4b0de2931457645ddbebb8ad7fdc3d032ddd8fed470de4d617d299433730b5
 DIST portage-2.2.28.tar.bz2 969138 SHA256 
da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 
d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b
 WHIRLPOOL 
1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
-DIST portage-2.2.8.tar.bz2 874672 SHA256 
c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 
acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257
 WHIRLPOOL 
d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
+EBUILD portage-2.2.28.ebuild 11798 SHA256 
167af8bf2aaa76fa2b36dce1b3396f81f1bd5af2b0daffc710402780eeb823b3 SHA512 
a7500e828da21775412b655eae1f7dac49eab7cd55c18f774ddbec501d4f2c2364cdff94b6d2faa4b230ff9ca63084dd3c8c8d28234c3f40150bb9a02d6e3935
 WHIRLPOOL 
9267f3f7ecd8aecf126dd4d92b9412dedf0335365798dc411f51d062f0328f852b387b5594f797ee49603fe0355670eb6ff401b71fcf736a944b4e2970da01c5
+MISC metadata.xml 1017 SHA256 
78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 
40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35
 WHIRLPOOL 
c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166

diff --git a/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch 
b/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch
new file mode 100644
index 0000000..58f701b
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch
@@ -0,0 +1,19 @@
+Index: portage-2.2.28/pym/portage/package/ebuild/prepare_build_dirs.py
+===================================================================
+--- portage-2.2.28.orig/pym/portage/package/ebuild/prepare_build_dirs.py
++++ portage-2.2.28/pym/portage/package/ebuild/prepare_build_dirs.py
+@@ -153,12 +153,12 @@ def _prepare_features_dirs(mysettings):
+ 
+       features_dirs = {
+               "ccache":{
+-                      "path_dir": "/usr/%s/ccache/bin" % (libdir,),
++                      "path_dir": "%s/usr/%s/ccache/bin" % 
(mysettings["EPREFIX"], libdir),
+                       "basedir_var":"CCACHE_DIR",
+                       
"default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"),
+                       "always_recurse":False},
+               "distcc":{
+-                      "path_dir": "/usr/%s/distcc/bin" % (libdir,),
++                      "path_dir": "%s/usr/%s/distcc/bin" % 
(mysettings["EPREFIX"], libdir),
+                       "basedir_var":"DISTCC_DIR",
+                       "default_dir":os.path.join(mysettings["BUILD_PREFIX"], 
".distcc"),
+                       "subdirs":("lock", "state"),

diff --git a/sys-apps/portage/portage-2.2.28.ebuild 
b/sys-apps/portage/portage-2.2.28.ebuild
index c53616c..77293b6 100644
--- a/sys-apps/portage/portage-2.2.28.ebuild
+++ b/sys-apps/portage/portage-2.2.28.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+)'
 
-inherit distutils-r1 multilib
+inherit eutils distutils-r1 multilib
 
 DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
@@ -85,6 +85,8 @@ pkg_setup() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       epatch "${FILESDIR}"/${PN}-2.2.28-distcc-eprefix.patch
+
        if ! use ipc ; then
                einfo "Disabling ipc..."
                sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = 
False:" \