| 1 |
commit: d34af90003a0140b1b01d8ad2807db2fb2f4aa60 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 12:02:15 2016 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 12:02:15 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=d34af900 |
| 7 |
|
| 8 |
sys-apps/portage: use os.path.join. |
| 9 |
|
| 10 |
sys-apps/portage/Manifest | 2 +- |
| 11 |
sys-apps/portage/files/portage-2.3.0-scanelf-path.patch | 2 +- |
| 12 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
| 15 |
index 0fb6639..fa2190a 100644 |
| 16 |
--- a/sys-apps/portage/Manifest |
| 17 |
+++ b/sys-apps/portage/Manifest |
| 18 |
@@ -1,6 +1,6 @@ |
| 19 |
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5 |
| 20 |
AUX portage-2.2.28-distcc-eprefix.patch 909 SHA256 b59a7e6a03a0d32d77900944befc4de0e311a4e1046c2188d123a696a39481c8 SHA512 f0264739185b6ec6ec9cd1353130832e7b53be694f34c8cc050df3c04e98dbdf3b861d6d961d2c04034f826ef456833a4990958c59e0524f5540edacc14c5f85 WHIRLPOOL 8beb2a0b9d929fdb8201d9ca3f502724f8ba6c9d176155b4a88d3ce18e58afd7bd4b0de2931457645ddbebb8ad7fdc3d032ddd8fed470de4d617d299433730b5 |
| 21 |
-AUX portage-2.3.0-scanelf-path.patch 805 SHA256 4b7f154acedfd1746ff994283272c2443721b47b7dfa3601cf1e2fab94b54272 SHA512 1e65c64eabb08b5052fef6ef4516ea09686720672fea759bb55a69f623b55ebd9a15cccb1bcdb953d86afc2dbe684323227e5000cf6e5732ff942cfcb1c57e9a WHIRLPOOL 31f47ca0c3a868c6be1211f94bf9ea01f89ab09ba58f85c54a076b5da49c231ec43386c8ac7a9731bb82782aeec91350d92719dc7282233a3ed088b7a171f4be |
| 22 |
+AUX portage-2.3.0-scanelf-path.patch 818 SHA256 37d7a5b2922a13b9840161320e87c26f38423b30ef05f2de393fd4a1b05e3d6b SHA512 76c0734f2604fc111984215b56f7d3acc2ef592835b17de08deef281f0d65a7f5b0306b3e468fd4ab3f2a522b8e5fc8ac3358dd15af3effd9eb12401c8712ee8 WHIRLPOOL 344c6ab6a99ce17b43f811b80638387b38f626e3a2b360113da37d78dd7545e312660560227e2f16357649c3b3d30c43300a1590c3373e051a6c8d11528d9893 |
| 23 |
AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928 |
| 24 |
DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d |
| 25 |
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe |
| 26 |
|
| 27 |
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 |
| 28 |
index ae5c0d6..48a1cf9 100644 |
| 29 |
--- a/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch |
| 30 |
+++ b/sys-apps/portage/files/portage-2.3.0-scanelf-path.patch |
| 31 |
@@ -13,7 +13,7 @@ |
| 32 |
plibs.update((x, cpv) for x in items) |
| 33 |
if plibs: |
| 34 |
- args = ["/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] |
| 35 |
-+ args = [EPREFIX + "/usr/bin/scanelf", "-qF", "%a;%F;%S;%r;%n"] |
| 36 |
++ args = [os.path.join(EPREFIX, "/usr/bin/scanelf"), "-qF", "%a;%F;%S;%r;%n"] |
| 37 |
args.extend(os.path.join(root, x.lstrip("." + os.sep)) \ |
| 38 |
for x in plibs) |
| 39 |
try: |
Archives