[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/

[Fabian Groffen]

commit:     8b753821d5e5b6bb59ddfb346bbbc304cfc083d8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 17 14:53:22 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 14:53:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8b753821

sys-apps/portage: bump to include fix for pycache problem

Package-Manager: Portage-2.3.40.2-prefix, Repoman-2.3.9

 sys-apps/portage/Manifest                                             | 2 +-
 sys-apps/portage/{portage-2.3.40.1.ebuild => portage-2.3.40.2.ebuild} | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5c7335169d..d89f09de53 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
 DIST prefix-portage-2.2.28.tar.bz2 1187416 BLAKE2B 
1ec27def0b427f60b38dc60178461c2395d388500b6f20d5f9dcd76090c5e68e6578da0073cb5cc3b5b2beb2c2c55ef12afef70d7562fba0a6f0cf90847624ea
 SHA512 
ea0661783d421d204272b9a210745aa2040a18ea347299b3d768588e10ca8dd2e24b46975249bf30010bf565514aea640f4edb9db2ca064312c899304a8c1f42
 DIST prefix-portage-2.3.13.tar.bz2 1205509 BLAKE2B 
851492dc1d3bd55721dfc1662af98a193c8071d87b6b64a09a736864031fa6482fe59a1662789ce8320b156241470688a9a815d79f7367b79500e590a41604f5
 SHA512 
4d59d04b9d6a896a545a40e04973a1c29f421b5d90f08012cb00a27ba1081eb914ddb625f543c26c93c8c75ba690f6ec72e4d9301f4f8e01a5fc68a3438cf46c
 DIST prefix-portage-2.3.18.tar.bz2 1230290 BLAKE2B 
9a7a290493293f166520931aab32a720519ebec15f4c74fe0b0dcd7cc930d591c24e3c87cae4722da119d57826b020b37092ec492bb4e12b774e51334eccf156
 SHA512 
508a5891fc28297e68baf031f4e99674a58c6268b16d50e094adc6676fb42f81bb81bd6f3dc70c24636be64ae015db51df86c49267c8c5a98129fe5e006310d7
-DIST prefix-portage-2.3.40.1.tar.bz2 1252690 BLAKE2B 
6ecc55c168e8617795df3c03130d2834d301d018ebb1efaac9ce953984d36e5a9a94e3b1f8ae02fa271652cf46c5b52a51a516cd2d8004a085b0ae71fa4a5cda
 SHA512 
4aa664d545048a3b7eb1504dd6245c839f3550de6bc3a02eceb7b0d31646424b5d09b56f12dc3a0a4a83cc3d1f2f7ac18aa1c1e104177902e7b258bef872229c
+DIST prefix-portage-2.3.40.2.tar.bz2 1216158 BLAKE2B 
d8806b4047ded791e8646ea64c568f9fe0354a5cf2a54a1616c1fc1050f0476b218522c56a9f06636e2a70f70571d762186ba30057efe213ffb7270bc7ef503c
 SHA512 
d85e3eea4149f2fe3ec8dc2fb15d1fd65c5d78c67828c36f064f0663b6305c5d06c1a29f3d62c777f0d1b619aa60178e5a3fbfbadb0a03bbde0570c5913b0675

diff --git a/sys-apps/portage/portage-2.3.40.1.ebuild 
b/sys-apps/portage/portage-2.3.40.2.ebuild
similarity index 98%
rename from sys-apps/portage/portage-2.3.40.1.ebuild
rename to sys-apps/portage/portage-2.3.40.2.ebuild
index 6987486d01..8e6b1c32a5 100644
--- a/sys-apps/portage/portage-2.3.40.1.ebuild
+++ b/sys-apps/portage/portage-2.3.40.2.ebuild
@@ -166,6 +166,10 @@ python_prepare_all() {
                sed -i -e 's/repo_name=gentoo/repo_name=gentoo_prefix/' \
                        bin/emerge-webrsync || die
 
+               einfo "Making absent gemato non-fatal"
+               sed -i -e '/exitcode = 127/d' \
+                       pym/portage/sync/modules/rsync/rsync.py || die
+
                if [[ ${CHOST} == powerpc*-darwin* ]] ; then
                        # asyncio triggers some python bug, not worth fixing on
                        # ppc-macos, bug #656830