gentoo resync : 25.08.2020

3 files changed, 163 insertions, 0 deletions

diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index cff75861d33a..4984711d91b4 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,7 @@
 AUX psutil-5.7.0-tests.patch 6018 BLAKE2B ac419a11d5caabd4184ece7a1b969e23125c122fe9a52277a7bc4af8006818b2328507e929584b464aa9ff94521c4d882819c45719dc4fb387a24c7171d5caba SHA512 3b8c901c101c56be207b008437fb0aa2f6095986e9dbdfb3f0ca5f3417ec2ee3a120d9b66f091ed9ac697d80bc17e2eb215b57bbde5b093b5b3b64ca4dae4b3b
+AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ceb88538d9abef454724d298225ba3f65f735fd8528d3ed22d4f463e8025677144442ac471aeeea44bbe7c607d55 SHA512 46145825084b5d09e2dfa7f7b765757a8d5ac7ff2379ae66bb628ea30f010daff2fe9d389f7846a1f63f9b03c4b7bd8ac4f4d07a4ed977e06a68b63a4e27231b
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
+DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320
 EBUILD psutil-5.7.0.ebuild 1295 BLAKE2B ac185c61234ac07cb4fa62d8afcd4546dd7eb882a0c96928ea4c64c743519f7f2f589547b849dbda6998f0c8869466cbcb82591f2fee66eb69546fa9f1475c17 SHA512 27ebe9f0471435c11e987f6b7a67ea627882faa0f379a3b2b6a493421a39b11ccf2fd3ffb21a6e637f73599be3f3616e31b6d39472d41aff6b3cd9d20e516310
+EBUILD psutil-5.7.2.ebuild 1304 BLAKE2B 850eb9dee1c36230987f69683545c48410e71d81ee48c768248cbe828241c768998032dc31d7ab29a64abc333fee1c57655a50e450199eb23d7ccad2fcbf720f SHA512 fd3f9267611bb3c4e270e1938ffab8ee09e169324e2ab64e7ef682598418574735d40241a21e34047d7bf93d80fec9ec5c46b960391625b5925255143c9761ef
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/files/psutil-5.7.2-tests.patch b/dev-python/psutil/files/psutil-5.7.2-tests.patch
new file mode 100644
index 000000000000..3faaedad6661
--- /dev/null
+++ b/dev-python/psutil/files/psutil-5.7.2-tests.patch
@@ -0,0 +1,112 @@
+From e910d08976e00bc12b5a516daa9e6a6d42d48354 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 19 Feb 2020 07:27:32 +0100
+Subject: [PATCH] Skip broken tests on Gentoo
+
+---
+ psutil/tests/test_linux.py   | 8 ++++++++
+ psutil/tests/test_posix.py   | 1 +
+ psutil/tests/test_process.py | 2 ++
+ psutil/tests/test_system.py  | 1 +
+ 4 files changed, 12 insertions(+)
+
+diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
+index e51f8bd5..48527ccb 100755
+--- a/psutil/tests/test_linux.py
++++ b/psutil/tests/test_linux.py
+@@ -17,5 +17,6 @@ import re
+ import shutil
+ import socket
+ import struct
++import sys
+ import textwrap
+ import time
+@@ -381,6 +382,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
+                 ret = psutil.virtual_memory()
+             assert m.called
+             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
++            if sys.version_info < (3,):
++                return
+             w = ws[0]
+             self.assertIn(
+                 "inactive memory stats couldn't be determined", str(w.message))
+@@ -411,6 +414,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
+                     ret = psutil.virtual_memory()
+                     self.assertEqual(
+                         ret.available, 2057400 * 1024 + 4818144 * 1024)
++                    if sys.version_info < (3,):
++                        return
+                     w = ws[0]
+                     self.assertIn(
+                         "inactive memory stats couldn't be determined",
+@@ -882,6 +887,7 @@ class TestLoadAvg(unittest.TestCase):
+ @unittest.skipIf(not LINUX, "LINUX only")
+ class TestSystemNetIfAddrs(unittest.TestCase):
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_ips(self):
+         for name, addrs in psutil.net_if_addrs().items():
+             for addr in addrs:
+@@ -1364,7 +1370,8 @@ class TestMisc(unittest.TestCase):
+             psutil.PROCFS_PATH = "/proc"
+             os.rmdir(tdir)
+ 
+     @retry_on_failure()
++    @unittest.skip("broken on Gentoo")
+     def test_issue_687(self):
+         # In case of thread ID:
+         # - pid_exists() is supposed to return False
+@@ -2073,6 +2080,7 @@ class TestProcessAgainstStatus(unittest.TestCase):
+         value = self.read_status_file("nonvoluntary_ctxt_switches:")
+         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_cpu_affinity(self):
+         value = self.read_status_file("Cpus_allowed_list:")
+         if '-' in str(value):
+diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
+index a96b310f..70199203 100755
+--- a/psutil/tests/test_posix.py
++++ b/psutil/tests/test_posix.py
+@@ -364,6 +364,7 @@ class TestSystemAPIs(unittest.TestCase):
+                     "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
+                         nic, output))
+ 
++    @unittest.skip("broken on Gentoo")
+     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
+     @retry_on_failure()
+     def test_users(self):
+diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
+index 987bdf38..cb04f3ef 100755
+--- a/psutil/tests/test_process.py
++++ b/psutil/tests/test_process.py
+@@ -350,6 +350,7 @@ class TestProcess(unittest.TestCase):
+             self.assertGreaterEqual(io2[i], 0)
+             self.assertGreaterEqual(io2[i], 0)
+ 
++    @unittest.skip("fails if builder is ioniced already")
+     @unittest.skipIf(not HAS_IONICE, "not supported")
+     @unittest.skipIf(not LINUX, "linux only")
+     def test_ionice_linux(self):
+@@ -1495,6 +1496,7 @@ class TestProcess(unittest.TestCase):
+         d2 = clean_dict(os.environ.copy())
+         self.assertEqual(d1, d2)
+ 
++    @unittest.skip("broken by sandbox")
+     @unittest.skipIf(not HAS_ENVIRON, "not supported")
+     @unittest.skipIf(not POSIX, "POSIX only")
+     def test_weird_environ(self):
+diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
+index 3834209f..b07b5883 100755
+--- a/psutil/tests/test_system.py
++++ b/psutil/tests/test_system.py
+@@ -215,6 +215,7 @@ class TestMiscAPIs(unittest.TestCase):
+         self.assertGreater(bt, 0)
+         self.assertLess(bt, time.time())
+ 
++    @unittest.skip("broken on Gentoo")
+     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
+     def test_users(self):
+         users = psutil.users()
+-- 
+2.25.1
diff --git a/dev-python/psutil/psutil-5.7.2.ebuild b/dev-python/psutil/psutil-5.7.2.ebuild
new file mode 100644
index 000000000000..9fd49a5a2ae5
--- /dev/null
+++ b/dev-python/psutil/psutil-5.7.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/ipaddress[${PYTHON_USEDEP}]
+		' -2)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/psutil-5.7.2-tests.patch"
+)
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Not running tests on ${EPYTHON} since they are broken"
+		return 0
+	fi
+
+	# since we are running in an environment a bit similar to CI,
+	# let's skip the tests that are disable for CI
+	TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_compile() {
+	# force -j1 to avoid .o linking race conditions
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}