gentoo resync : 20.10.2021

5 files changed, 2 insertions, 122 deletions

diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index aedc41c81fea..4a1ab657b346 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,7 +1,3 @@
-AUX loky-2.9.0-fix-py3.10-tests.patch 1554 BLAKE2B de9edaf32d937cf15f38c40b1c35238eb23602aca47014af6eb8418e1acfc141a6baeb4021a48fede6ae12b31cfc6533ce7f0339dd51f7297ad244f1adbdb007 SHA512 2e236f8c9ffbfb24ce1e646bbee4ef62d9af7472b695beecb1926d20fb467e7a67d01f27cb4c6b8e08a91a93195d68a7b3b778ad5258390bb482ba70cfee5d2c
-AUX loky-2.9.0-libc.patch 956 BLAKE2B a03de811cb32e728c22b2637106ffd3c969e9fbbbd45deb180ac83d9c44e81b7b5eb0744816abd4a1083d9d47c817db5c02f5f5f6c448f944365299dbd97a044 SHA512 c2e74f96a8f70ec9817cc517fb13ecb8414d6a9157d882ba15af05a81ec70df0edcdb6a8a02c96e7ecc4731813cb86932832fe61b5e19653164af9f7c68dc25a
-DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
 DIST loky-3.0.0.tar.gz 152463 BLAKE2B 99f0a1fc85e879626d12402dd4fee4b92345eab9520b1afaf95bbf869d2dc9e429f1f9810554e10d97f0ecbc4add28b1cbaee0477de05aa366faeb335eaef7c8 SHA512 ad171bfac031ab4d6749bde416031e905eb29adb97dab9c3348791c9df78b17e1e3eab8a354954d7c16fb2095ccc03d26cf2153fe53a546007a7a89c6046cb36
-EBUILD loky-2.9.0.ebuild 1105 BLAKE2B 78305f2b8c7b8bcdb658f898e50fa24052303500e1139b4e73058677d7e57efc811767167f8fa02be93effc80a9ea07ba4853efb61b507742f576dc820dbb126 SHA512 de676cd867bd345b91aa89d1875b473a60999336cc4f8a7091b598f59bf35475b10746b2cd201908f8b99398f1080086690ce87d2881e1d126328c7539c18d7a
-EBUILD loky-3.0.0.ebuild 1021 BLAKE2B db54c572ced4abe8cbd403aecc9183abc1db9997515404a68a6055222685025e4cbd0f3bbdfa492358e46561bfc4e0fcd15016d247450f9e838f23b3be21b0a0 SHA512 3046e97af37d9e0ed1471822e7c3eefbb26df6861c0b09763146c13726788f6d109f78cd122bfd1c29de6bab4c92d4f690d387bf1e94a34f7421cd3dc8fce658
+EBUILD loky-3.0.0.ebuild 1018 BLAKE2B 83cdb4c6a4baabf372962df394342bf21454b8f399eef21162fe32e419f54dae00194b17797d9bbe3b14be2b0927a723060843ff6bf7f13c2ffff1265c2cca0c SHA512 8ac89a930e757fb6add9d719f0faa731cb7d86ba64bcec4980cf3f49bbc65dbe5714e732c26ce80b32f15911333257ca2f62cee839f797867a1942eef2a93f6b
 MISC metadata.xml 383 BLAKE2B 9d990e2f5b4fbf959925d9d7c1f03ecb3acddcc8564c9362f14741d531d79f3e4c6d98a8c84695d8b1f761fa11a80e768b8e8b48ff8be314732d7f574d767223 SHA512 89d9a1f5c253bf99992d16b974d81175d1ae0d17649ffe1a485430735bec38f45e8e1a35c9ba2d99cb1610db3b200adb5af847b2a161c348e29f0cfa89f8076f
diff --git a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
deleted file mode 100644
index 51cbfb348a51..000000000000
--- a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0d31dc24ca9688c11d1fe53fa1283728ecc50706 Mon Sep 17 00:00:00 2001
-From: Arthur Zamarin <arthurzam@gmail.com>
-Date: Mon, 2 Aug 2021 18:35:31 +0300
-Subject: [PATCH] Fix no attribute import_module for python 3.10
-
-In python 3.10, the `import_module` has moved from the
-`test.support` module to `test.support.import_helper`.
-
-As fix, try to import the from the new place and if unknown try from
-the old place.
----
- tests/_test_process_executor.py | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/tests/_test_process_executor.py b/tests/_test_process_executor.py
-index 65d9a2c9..3bd0b12d 100644
---- a/tests/_test_process_executor.py
-+++ b/tests/_test_process_executor.py
-@@ -1,15 +1,18 @@
- from __future__ import print_function
- try:
--    import test.support
-+    try:
-+        from test.support.import_helper import import_module
-+    except ImportError:
-+        from test.support import import_module
- 
-     # Skip tests if _multiprocessing wasn't built.
--    test.support.import_module('_multiprocessing')
-+    import_module('_multiprocessing')
-     # Skip tests if sem_open implementation is broken.
--    test.support.import_module('multiprocessing.synchronize')
-+    import_module('multiprocessing.synchronize')
-     # import threading after _multiprocessing to raise a more revelant error
-     # message: "No module named _multiprocessing" if multiprocessing is not
-     # compiled without thread support.
--    test.support.import_module('threading')
-+    import_module('threading')
- except ImportError:
-     pass
- 
diff --git a/dev-python/loky/files/loky-2.9.0-libc.patch b/dev-python/loky/files/loky-2.9.0-libc.patch
deleted file mode 100644
index 58cceab01eb2..000000000000
--- a/dev-python/loky/files/loky-2.9.0-libc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4100bb481dd1599be3deae8539ff9eac2d9b7104 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 8 Mar 2021 10:32:38 +0100
-Subject: [PATCH] FIX load libc correctly in test_reusable_executor
-
-Fix test_reusable_executor to load libc via "c" library rather than
-"libc".  The latter is incorrect, and does not work in the newest
-versions of Python anymore, see https://bugs.python.org/issue42580.
----
- tests/test_reusable_executor.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_reusable_executor.py b/tests/test_reusable_executor.py
-index 1ff5b8b..d24d2de 100644
---- a/tests/test_reusable_executor.py
-+++ b/tests/test_reusable_executor.py
-@@ -32,7 +32,7 @@ if sys.platform == "win32":
- else:
-     from signal import SIGKILL
-     from ctypes.util import find_library
--    libc = ctypes.CDLL(find_library("libc"))
-+    libc = ctypes.CDLL(find_library("c"))
- 
- 
- try:
--- 
-2.30.1
-
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
deleted file mode 100644
index d1db85d53e51..000000000000
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Robust and reusable Executor for joblib"
-HOMEPAGE="https://github.com/joblib/loky"
-SRC_URI="
-	https://github.com/joblib/loky/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libc.patch
-	"${FILESDIR}"/${P}-fix-py3.10-tests.patch
-)
-
-python_test() {
-	local args=(
-		# docker, seriously?
-		--deselect 'tests/test_loky_module.py::test_cpu_count_cfs_limit'
-		# hangs, and even pytest-timeout does not help
-		--deselect 'tests/test_reusable_executor.py::TestExecutorDeadLock::test_deadlock_kill'
-		# one test that uses a lot of memory, also broken on 32-bit
-		# platforms
-		--skip-high-memory
-		# breaks teardown
-		-p no:xvfb
-	)
-
-	epytest "${args[@]}"
-}
diff --git a/dev-python/loky/loky-3.0.0.ebuild b/dev-python/loky/loky-3.0.0.ebuild
index d1c230c8a53f..c7368a937698 100644
--- a/dev-python/loky/loky-3.0.0.ebuild
+++ b/dev-python/loky/loky-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]