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

[Fabian Groffen]

commit:     01a971d7d2853ec7602e08639f973b3ad9aec1b3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  1 13:27:04 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 13:27:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=01a971d7

sys-apps/portage: version bump

Package-Manager: Portage-2.3.68-prefix, Repoman-2.3.15
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-apps/portage/Manifest                                      |  2 +-
 .../portage/{portage-2.3.55.1.ebuild => portage-2.3.68.ebuild} | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ca034b9231..e8fd3704e3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,3 @@
-DIST prefix-portage-2.3.55.1.tar.bz2 1240409 BLAKE2B 
db6d62768382f93fbe933ba1dcbe8ac203529d3fcbe3e53063bdd9e5b67ec7ab10e99fcd8a2ad0d83494fa838b8b2e17f16ad16f45cc9dc4cf9801793babffe7
 SHA512 
11a6c80edd9e4a22e2996ad02ea7d9c5e88f074526d0350d0944d70c31087db11a1357026b2e2987e40e6f9d155524e5cae63aff7348a5692c5e7dcf16ac7a1b
 DIST prefix-portage-2.3.62.tar.bz2 1274936 BLAKE2B 
e6e9af5626b1d75b5ff56cbd33324eae2f3d8bbc0aa9c1fe8a7b622b85770234b73d8394aa26af90f96bd9ff0906edb97814effdc6263b3d1f9c1e7ad8241b3c
 SHA512 
ebc6ccd07daed60a620cd7fe68227d7ac9d48c65dafed5e4285f30c5c25ce43e8c5683ffa87cbf863a2fcfb547cd9cd34b1fe1aec875a6416cad7f19a135ef20
 DIST prefix-portage-2.3.67.tar.bz2 1264791 BLAKE2B 
3df7fa5d0698128c7bf57df6924ebeadcc07f6d7427376ba44750faffc25d32095d48d9bd0760a02c0b8a8a913383d5119987f3e24bfe7b2ef23f711ea8ced2f
 SHA512 
06126db6dbf5669ad0b1d367d563fc6015f8dbfcc6ec32c625037596c649bf3755ca63efc8f8ca9fe352a435d3e679580d41fe830b624028047f52b648d209dd
+DIST prefix-portage-2.3.68.tar.bz2 1283044 BLAKE2B 
81a9462c2b34b64baff78bc046676abf147a6840f7fb2872c9e26eef5a110e2c53b550ac213f734f7c4e70e4b220ea62d885cd99652d9093448f6e5c4633a115
 SHA512 
7c6124e0b01fd1fdba68a5cb68882baa2301945faf559bb61afd6b632128ca435d7e9a596b1079bd744ed4155041399ba0a3779190c9fa891b5dc815ccb46813

diff --git a/sys-apps/portage/portage-2.3.55.1.ebuild 
b/sys-apps/portage/portage-2.3.68.ebuild
similarity index 96%
rename from sys-apps/portage/portage-2.3.55.1.ebuild
rename to sys-apps/portage/portage-2.3.68.ebuild
index e2ca476f68..2adb83959c 100644
--- a/sys-apps/portage/portage-2.3.55.1.ebuild
+++ b/sys-apps/portage/portage-2.3.68.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
        pypy
-       python3_4 python3_5 python3_6 python3_7
+       python3_5 python3_6 python3_7
        python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -91,6 +91,7 @@ pkg_setup() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       epatch "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572
        epatch "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161
 
        if use native-extensions; then
@@ -165,13 +166,6 @@ python_prepare_all() {
                einfo "Making absent gemato non-fatal"
                sed -i -e '/exitcode = 127/d' \
                        lib/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
-                       sed -i -e '/^_asyncio_enabled/s/=.*$/= False/' \
-                               
lib/portage/util/_eventloop/global_event_loop.py || die
-               fi
                # END PREFIX LOCAL
        fi