commit: f2225a34eaa02778907b77103bb920f2cd88a8de Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Dec 7 17:38:50 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Dec 7 17:38:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f2225a34
sys-apps/portage-3.0.12: version bump Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-apps/portage/Manifest | 2 +- .../portage-3.0.10-multiprocessing-no-spawn.patch | 32 ---------------------- ...ge-3.0.10.3-r1.ebuild => portage-3.0.12.ebuild} | 3 -- 3 files changed, 1 insertion(+), 36 deletions(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index a2010f89eb..32f96fef4f 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,2 +1,2 @@ DIST prefix-portage-2.3.100.tar.bz2 1331695 BLAKE2B 165f113041da8ad1150cc59d25a420effaa163a7694ba8ff36ce1e5fa75669b8fde31ad74594b28b987f9ec5685b9a31aa5228419afd476726ba17ec8f7575db SHA512 8163bfd4e83e48d560dd07150dd468d3b4a63d1507d23226107479bd5de9da3cd94308851b64c63851572288877cb2774f986f8c1a5163521a341ce4c72fbf0c -DIST prefix-portage-3.0.10.3.tar.bz2 1316420 BLAKE2B 296a26cd39f84f477434fc125a53ea0569b43c78f30d3aba6a59f07a112f7d55d6f1286f596c0cc4dcce5c1154cf20e78432fc50b04f7f5b92969c5f81cddc89 SHA512 1ebc43be3a6108bccc8bd8f3fa2c781402d0a73f18e012b341959fff5fc52603e27d5a8bd8fe08b82188d6694f041381654a0d3cd566e3f05b559d83ccbddbee +DIST prefix-portage-3.0.12.tar.bz2 1309809 BLAKE2B 04b037b7d2d5077845f7d37d8dcedc03758191804d2dd44af4d87b5bbd94c8108ea673f9e06fce45342a5f8c26890bf2aa2dd482103fecb774cb14e314351d4c SHA512 8fc179f571c6094b12fabca5e371e7d91d86d2799d282bc4ce2acf096950b18462a0c8dc766e7f4dc29ebba5f188c66375573f8539f8d1d0b1edf385a1d4078e diff --git a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch b/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch deleted file mode 100644 index e93d2fc046..0000000000 --- a/sys-apps/portage/files/portage-3.0.10-multiprocessing-no-spawn.patch +++ /dev/null @@ -1,32 +0,0 @@ -Alteration of the following patch to force fork mode iso spawn - -From f093da4a3a457d539e5682ccecdf91f254addd8c Mon Sep 17 00:00:00 2001 -From: Zac Medico <[email protected]> -Date: Thu, 3 Dec 2020 21:37:39 -0800 -Subject: [PATCH] runTests.py: multiprocessing.set_start_method('spawn') for - debugging bug 758230 - -Force fork mode because spawn mode requires all argument to be -pickle-able, which currently is not the case. This is an issue because -Python 3.8 changed the default from fork to spawn on macOS. - -diff --git a/bin/emerge b/bin/emerge -index 8f1db61a6..3731a9081 100755 ---- a/bin/emerge -+++ b/bin/emerge -@@ -2,6 +2,7 @@ - # Copyright 2006-2020 Gentoo Authors - # Distributed under the terms of the GNU General Public License v2 - -+import multiprocessing - import platform - import signal - import sys -@@ -44,6 +45,7 @@ try: - from _emerge.main import emerge_main - - if __name__ == "__main__": -+ multiprocessing.set_start_method('fork') - from portage.exception import IsADirectory, ParseError, \ - PermissionDenied - portage.process.sanitize_fds() diff --git a/sys-apps/portage/portage-3.0.10.3-r1.ebuild b/sys-apps/portage/portage-3.0.12.ebuild similarity index 98% rename from sys-apps/portage/portage-3.0.10.3-r1.ebuild rename to sys-apps/portage/portage-3.0.12.ebuild index c3bac2e8fc..cf3cc74f4b 100644 --- a/sys-apps/portage/portage-3.0.10.3-r1.ebuild +++ b/sys-apps/portage/portage-3.0.12.ebuild @@ -94,9 +94,6 @@ pkg_pretend() { python_prepare_all() { distutils-r1_python_prepare_all - # drop this patch when bug 758230 gets resolved - eapply "${FILESDIR}"/${PN}-3.0.10-multiprocessing-no-spawn.patch # 758230 - eapply "${FILESDIR}"/${PN}-2.3.62-prefix-stack.patch # 658572 eapply "${FILESDIR}"/${PN}-2.3.45-ebuildshell.patch # 155161 if use gentoo-dev; then
