commit: bd1af908818cc8c8ca6f7f9dac2615c29ac95c42
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 03:17:09 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 03:17:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=bd1af908
sys-apps/portage: update patches.
sys-apps/portage/Manifest | 4 ++--
.../files/portage-2.2.28-distcc-eprefix.patch | 20 ++++++++++++++------
.../portage/files/portage-2.3.0-scanelf-path.patch | 6 ++++--
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fa2190a..b9432dc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,6 @@
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
-AUX portage-2.3.0-scanelf-path.patch 818 SHA256
37d7a5b2922a13b9840161320e87c26f38423b30ef05f2de393fd4a1b05e3d6b SHA512
76c0734f2604fc111984215b56f7d3acc2ef592835b17de08deef281f0d65a7f5b0306b3e468fd4ab3f2a522b8e5fc8ac3358dd15af3effd9eb12401c8712ee8
WHIRLPOOL
344c6ab6a99ce17b43f811b80638387b38f626e3a2b360113da37d78dd7545e312660560227e2f16357649c3b3d30c43300a1590c3373e051a6c8d11528d9893
+AUX portage-2.2.28-distcc-eprefix.patch 1215 SHA256
15de29f5b8bf9b3f49c730bbeaa4414b55866a82874a54f0ecbbb0f58a16d781 SHA512
bb630624d61d546d2ecfaad18274ae66139d3e0848293c64c69806ae13d380dc979ff658b517801ba407062270a49ca525b62ee89c47b83c324b664b364e37b6
WHIRLPOOL
ccc5c5aff1d2b426e9603a16ef455a81ee5ae0cd03043adf704b7b091b536543018a8f32e995c0668fe02fdfc7bec5a6c6b1060162c424061375458fd0e820c8
+AUX portage-2.3.0-scanelf-path.patch 948 SHA256
b87d80dcdb9588ae92ab8824ad64df43351b89142a9a2f0a0a20dbd3f0b8a8f5 SHA512
fef3ae7a5f6ee4d6a2469670a2ec04b697d4a5cd1950c638fdd3ab4f290f8b45f26f3c521c614140ea22d05be60080bb7c685f3b167a7554a17f51903278a25d
WHIRLPOOL
a2b6287f7f367e599a70df50cfd541b9d2ddf9f7c72140055cc1674b22997bdacb1a6b414765db63ebdb98f6d8231f59c8e3e223369d8f386c001fd5c6cd2db4
AUX portage-2.3.0_rc1.patch 2278 SHA256
5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512
0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151
WHIRLPOOL
3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
DIST portage-2.2.28.tar.bz2 969138 SHA256
da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512
d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b
WHIRLPOOL
1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256
52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512
d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13
WHIRLPOOL
c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
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
index 58f701b..728eb8c 100644
--- a/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch
+++ b/sys-apps/portage/files/portage-2.2.28-distcc-eprefix.patch
@@ -1,19 +1,27 @@
-Index: portage-2.2.28/pym/portage/package/ebuild/prepare_build_dirs.py
+Index: portage-2.3.0_rc1/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):
+--- portage-2.3.0_rc1.orig/pym/portage/package/ebuild/prepare_build_dirs.py
++++ portage-2.3.0_rc1/pym/portage/package/ebuild/prepare_build_dirs.py
+@@ -19,6 +19,7 @@ from portage.localization import _
+ from portage.output import colorize
+ from portage.util import apply_recursive_permissions, \
+ apply_secpass_permissions, ensure_dirs, normalize_path, writemsg
++from portage.const import EPREFIX
+
+ def prepare_build_dirs(myroot=None, settings=None, cleanup=False):
+ """
+@@ -153,12 +154,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),
++ "path_dir": "%s/usr/%s/ccache/bin" % (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),
++ "path_dir": "%s/usr/%s/distcc/bin" % (EPREFIX, libdir),
"basedir_var":"DISTCC_DIR",
"default_dir":os.path.join(mysettings["BUILD_PREFIX"],
".distcc"),
"subdirs":("lock", "state"),
diff --git a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
index 48a1cf9..9e47448 100644
--- a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
+++ b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch
@@ -1,4 +1,6 @@
---- pym/portage/util/_dyn_libs/LinkageMapELF.py
+Index: pym/portage/util/_dyn_libs/LinkageMapELF.py
+===================================================================
+--- pym/portage/util/_dyn_libs/LinkageMapELF.py.orig
+++ pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -19,6 +19,7 @@ from portage.util import normalize_path
from portage.util import varexpand
@@ -13,7 +15,7 @@
plibs.update((x, cpv) for x in items)
if plibs:
- args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"]
-+ args = [os.path.join(EPREFIX, "/usr/bin/scanelf"),
"-qF", "%a;%F;%S;%r;%n"]
++ args = [os.path.join(EPREFIX or "/",
"usr/bin/scanelf"), "-qF", "%a;%F;%S;%r;%n"]
args.extend(os.path.join(root, x.lstrip("." + os.sep)) \
for x in plibs)
try:
