gentoo resync : 30.05.2020

3 files changed, 48 insertions, 4 deletions

diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 52c352ee9b67..ef49e69c8db7 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,5 +1,5 @@
 AUX psutil-5.6.7-tests.patch 4286 BLAKE2B c0170138af6e1dac482f4c3589c2311186916a4a6150fa8679df01bba7fe99925f97bdaab61cac7ffa19341ea33c7a68260d644fea09a4774b795e813e12c4a4 SHA512 e33a7d375b72b3d43169adb493d8ad0684a2ce88159fdeb2e92ed966b2de1a6381a023f2e226b8d91194c66eeee4ce2b936cc08a9a84152a7119fecd8679723e
-AUX psutil-5.7.0-tests.patch 4420 BLAKE2B a3daf702d70c2a945a7373e34d7ddbb730f884eb99716605f3d202a4bcb271d899330de9a96d7666ebf743157604721f5ee76136559f33ac34d8a0ecab4368a5 SHA512 89315123d1de4c5f1601b56bbaa200a180419865ba2e303b8470c56ea36d7eba251bcc2592b61659762c04f02e4ccea20a4774a11b4936c03efbbd42f58c4a51
+AUX psutil-5.7.0-tests.patch 6018 BLAKE2B ac419a11d5caabd4184ece7a1b969e23125c122fe9a52277a7bc4af8006818b2328507e929584b464aa9ff94521c4d882819c45719dc4fb387a24c7171d5caba SHA512 3b8c901c101c56be207b008437fb0aa2f6095986e9dbdfb3f0ca5f3417ec2ee3a120d9b66f091ed9ac697d80bc17e2eb215b57bbde5b093b5b3b64ca4dae4b3b
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
-EBUILD psutil-5.7.0.ebuild 1334 BLAKE2B c1195f150389c8398c24e327e5092af08c58bcaa19c6a26c395f55e2603c6adf2642b445dbb576b1c05d015a5c13f44e31049f6dc054e7a44b01fb18c590a0bb SHA512 32446d683a8ee619c7170b7777996a6b7400fc276584274f0ee1c7db18b1284a9282bfed2f93c035d80a81dc3ec3ec25ffb22c039d77ad00f74e7f84cefa8119
+EBUILD psutil-5.7.0.ebuild 1295 BLAKE2B ac185c61234ac07cb4fa62d8afcd4546dd7eb882a0c96928ea4c64c743519f7f2f589547b849dbda6998f0c8869466cbcb82591f2fee66eb69546fa9f1475c17 SHA512 27ebe9f0471435c11e987f6b7a67ea627882faa0f379a3b2b6a493421a39b11ccf2fd3ffb21a6e637f73599be3f3616e31b6d39472d41aff6b3cd9d20e516310
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/files/psutil-5.7.0-tests.patch b/dev-python/psutil/files/psutil-5.7.0-tests.patch
index 2def4979faf4..9097e90535a5 100644
--- a/dev-python/psutil/files/psutil-5.7.0-tests.patch
+++ b/dev-python/psutil/files/psutil-5.7.0-tests.patch
@@ -111,3 +111,48 @@ index 3834209f..b07b5883 100755
 -- 
 2.25.1
 
+From 026e4b0076a352fcb1e8de71f1393ae0d50ac06d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 26 May 2020 12:28:59 +0200
+Subject: [PATCH] Sort results in test_cpu_affinity_all_combinations
+
+Fix test_cpu_affinity_all_combinations to permit any CPU order
+in results.  This fixes test failure due to affinity being reported
+out of order:
+
+    ======================================================================
+    FAIL: psutil.tests.test_process.TestProcess.test_cpu_affinity_all_combinations
+    ----------------------------------------------------------------------
+    Traceback (most recent call last):
+      File "/tmp/psutil/psutil/tests/test_process.py", line 940, in test_cpu_affinity_all_combinations
+        self.assertEqual(p.cpu_affinity(), combo)
+    AssertionError: Lists differ: [8, 1] != [1, 8]
+
+    First differing element 0:
+    8
+    1
+
+    - [8, 1]
+    + [1, 8]
+
+    ----------------------------------------------------------------------
+---
+ psutil/tests/test_process.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
+index a0b21c6e..e3394799 100755
+--- a/psutil/tests/test_process.py
++++ b/psutil/tests/test_process.py
+@@ -937,7 +937,7 @@ class TestProcess(PsutilTestCase):
+ 
+         for combo in combos:
+             p.cpu_affinity(combo)
+-            self.assertEqual(p.cpu_affinity(), combo)
++            self.assertEqual(sorted(p.cpu_affinity()), sorted(combo))
+ 
+     # TODO: #595
+     @unittest.skipIf(BSD, "broken on BSD")
+-- 
+2.26.2
+
diff --git a/dev-python/psutil/psutil-5.7.0.ebuild b/dev-python/psutil/psutil-5.7.0.ebuild
index affbb558aa45..2160825ab228 100644
--- a/dev-python/psutil/psutil-5.7.0.ebuild
+++ b/dev-python/psutil/psutil-5.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/mock[${PYTHON_USEDEP}]