commit:     a425220505c4e94abe9df6c7d7f64a9ee71764d3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 11:44:02 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 11:44:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a4252205

sys-apps/portage-3.0.10.3-r1: use correct multiprocessing patch

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

 .../portage-3.0.10-multiprocessing-no-spawn.patch  | 32 +++++++++++-----------
 ...-3.0.10.3.ebuild => portage-3.0.10.3-r1.ebuild} |  0
 2 files changed, 16 insertions(+), 16 deletions(-)

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
index 19ae16b5ac..e93d2fc046 100644
--- 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
@@ -1,4 +1,4 @@
-Alteration of the original patch to force fork mode iso spawn
+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]>
@@ -10,23 +10,23 @@ 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/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py
-index 9514abebe0..6e33077aef 100755
---- a/lib/portage/tests/runTests.py
-+++ b/lib/portage/tests/runTests.py
-@@ -4,6 +4,7 @@
+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 grp
 +import multiprocessing
- import os
- import os.path as osp
  import platform
-@@ -60,6 +61,7 @@ def debug_signal(signum, frame):
-       os.environ["PATH"] = ":".join(path)
+ import signal
+ import sys
+@@ -44,6 +45,7 @@ try:
+       from _emerge.main import emerge_main
  
- if __name__ == "__main__":
-+      multiprocessing.set_start_method('fork')
-       try:
-               sys.exit(tests.main())
-       finally:
+       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.ebuild 
b/sys-apps/portage/portage-3.0.10.3-r1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.10.3.ebuild
rename to sys-apps/portage/portage-3.0.10.3-r1.ebuild

Reply via email to