gentoo resync : 12.05.2022

5 files changed, 128 insertions, 177 deletions

diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index cc5a535c7b35..b7ee3d49025f 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,7 +1,4 @@
-AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ceb88538d9abef454724d298225ba3f65f735fd8528d3ed22d4f463e8025677144442ac471aeeea44bbe7c607d55 SHA512 46145825084b5d09e2dfa7f7b765757a8d5ac7ff2379ae66bb628ea30f010daff2fe9d389f7846a1f63f9b03c4b7bd8ac4f4d07a4ed977e06a68b63a4e27231b
-AUX psutil-5.9.0-tests.patch 8186 BLAKE2B d94b5fb91bbe0f05d5452a95aa855d9c3fd50b6cb1e2fbd5e0403be6ac381574676fa0479356e0b22c5a08936040d6e4e52f684112d509749edd7c38473e413b SHA512 13939d4b03a9cc9387c48dd5a1e4f756ed77eb86ec10cee7733c8f3afb307aa7e5b89016a36e8022f912bd920274168da42f3b2c0d742d8afb2cc7528f643ecc
-DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d
+AUX psutil-5.9.0-tests.patch 12930 BLAKE2B 486e8b5316cda0aa7b03f803a76d800a6c40fe1188de1dcf334710fc4e1a53b759759956af0397ccd2afe75cb476b76f0b84675b517b74505b0889e512a593a7 SHA512 b9b67f5adfcd64693e5492ed6c03c0af8faf926a4091c0728e5f409bc3d8bcc1bf7eea76168bda5c6b4b9d69a850597cf26f5b87a4d0f1abdbd60cafcdf3104e
 DIST psutil-5.9.0.tar.gz 478322 BLAKE2B 763c8ae14ae546bed64a360047d2ce38783e9e7e939160f751c4ccc94b8e023aaa4cdca426f584e05dae8b1326333660e216d7cb3edd820e24a931dddfa5160f SHA512 b521cfce51e90fdf87ba19bf8069877e3210aede92c17460ea0b00324a36e133168e4bff550462d07ab6d93c597c6560d68954340031ff43168d54a8e5d4c4e7
-EBUILD psutil-5.7.3.ebuild 1159 BLAKE2B 4fa7f8b093a37f710ce13ef630afa8086774d7a2b01bafd38c73f423480bf44ac8bffcaae38af7f2ffb5e7e4115d1703adabeeba3de454f5fe420b9cac404928 SHA512 6303bce4bfeab4a1aded7dc91ef498a4beb4a92d48484421c650f92909d29964bd63e105f6ba96621ad9e80b79c87b5cc77f32bae9a268e71bf5b72dda738a70
-EBUILD psutil-5.9.0.ebuild 1269 BLAKE2B 9ccf68953b8e25149b0f3239fa79e2e7d5759158ed81225b3281c20dde01a1f477ef3a8ce459d7fd9f9decef7b4d7e21771bbf5f42177feb40f6624f4bb91c2b SHA512 c8de8f33b3ab09ad937ccb40616ec681564b45541fb2264a8df937807e42bfd26a5665209169652df48e7d778257f6b5945d93c4e3d5718d9e4650edbf3a13f5
+EBUILD psutil-5.9.0.ebuild 1157 BLAKE2B 10236f0cfb2e5b2f58e6c79e029edebd7e5d8e9ebc53f12b8620b6eb649db6ac7198cb0abdd18e0a17df6e3a86fe84a642ed202f09742a3b93e2f91e29f73297 SHA512 77ff144ed2f3c70555ec8c92b6feb73350a8ee97e96b1e92719a7847a4fd3014b26df9cc608813f45b63e0e4ef5ad3ea091774fb2e753522ec01a7c6a588b950
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/files/psutil-5.7.2-tests.patch b/dev-python/psutil/files/psutil-5.7.2-tests.patch
deleted file mode 100644
index 3faaedad6661..000000000000
--- a/dev-python/psutil/files/psutil-5.7.2-tests.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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/files/psutil-5.9.0-tests.patch b/dev-python/psutil/files/psutil-5.9.0-tests.patch
index 56a5e1168733..6dcf6f240e41 100644
--- a/dev-python/psutil/files/psutil-5.9.0-tests.patch
+++ b/dev-python/psutil/files/psutil-5.9.0-tests.patch
@@ -19,10 +19,18 @@ index 21bb3e61..6c45c9e0 100644
  IS_64BIT = sys.maxsize > 2 ** 32
  
 diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index 20e28d29..ce5d10a0 100755
+index 20e28d29..c21d0aec 100755
 --- a/psutil/tests/test_linux.py
 +++ b/psutil/tests/test_linux.py
-@@ -28,6 +28,7 @@ from psutil._compat import PY3
+@@ -14,6 +14,7 @@ import errno
+ import glob
+ import io
+ import os
++import platform
+ import re
+ import shutil
+ import socket
+@@ -28,6 +29,7 @@ from psutil._compat import PY3
  from psutil._compat import FileNotFoundError
  from psutil._compat import basestring
  from psutil._compat import u
@@ -30,7 +38,53 @@ index 20e28d29..ce5d10a0 100755
  from psutil.tests import GITHUB_ACTIONS
  from psutil.tests import GLOBAL_TIMEOUT
  from psutil.tests import HAS_BATTERY
-@@ -929,6 +930,7 @@ class TestLoadAvg(PsutilTestCase):
+@@ -688,6 +690,7 @@ class TestSystemCPUCountLogical(PsutilTestCase):
+         num = len([x for x in out.split('\n') if not x.startswith('#')])
+         self.assertEqual(psutil.cpu_count(logical=True), num)
+ 
++    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
+     def test_emulate_fallbacks(self):
+         import psutil._pslinux
+         original = psutil._pslinux.cpu_count_logical()
+@@ -735,6 +738,7 @@ class TestSystemCPUCountCores(PsutilTestCase):
+                 core_ids.add(fields[1])
+         self.assertEqual(psutil.cpu_count(logical=False), len(core_ids))
+ 
++    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
+     def test_method_2(self):
+         meth_1 = psutil._pslinux.cpu_count_cores()
+         with mock.patch('glob.glob', return_value=[]) as m:
+@@ -755,6 +759,7 @@ class TestSystemCPUCountCores(PsutilTestCase):
+ class TestSystemCPUFrequency(PsutilTestCase):
+ 
+     @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
++    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
+     def test_emulate_use_second_file(self):
+         # https://github.com/giampaolo/psutil/issues/981
+         def path_exists_mock(path):
+@@ -769,6 +774,7 @@ class TestSystemCPUFrequency(PsutilTestCase):
+             assert psutil.cpu_freq()
+ 
+     @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
++    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
+     def test_emulate_use_cpuinfo(self):
+         # Emulate a case where /sys/devices/system/cpu/cpufreq* does not
+         # exist and /proc/cpuinfo is used instead.
+@@ -896,11 +902,13 @@ class TestSystemCPUFrequency(PsutilTestCase):
+ @unittest.skipIf(not LINUX, "LINUX only")
+ class TestSystemCPUStats(PsutilTestCase):
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_ctx_switches(self):
+         vmstat_value = vmstat("context switches")
+         psutil_value = psutil.cpu_stats().ctx_switches
+         self.assertAlmostEqual(vmstat_value, psutil_value, delta=500)
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_interrupts(self):
+         vmstat_value = vmstat("interrupts")
+         psutil_value = psutil.cpu_stats().interrupts
+@@ -929,6 +937,7 @@ class TestLoadAvg(PsutilTestCase):
  @unittest.skipIf(not LINUX, "LINUX only")
  class TestSystemNetIfAddrs(PsutilTestCase):
  
@@ -38,7 +92,15 @@ index 20e28d29..ce5d10a0 100755
      def test_ips(self):
          for name, addrs in psutil.net_if_addrs().items():
              for addr in addrs:
-@@ -1491,6 +1493,7 @@ class TestMisc(PsutilTestCase):
+@@ -1316,6 +1325,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
+         findmnt_value = sh("findmnt -o SOURCE -rn /")
+         self.assertEqual(psutil_value, findmnt_value)
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_disk_partitions_mocked(self):
+         with mock.patch(
+                 'psutil._pslinux.cext.disk_partitions',
+@@ -1491,6 +1501,7 @@ class TestMisc(PsutilTestCase):
              psutil.PROCFS_PATH = "/proc"
  
      @retry_on_failure()
@@ -46,7 +108,7 @@ index 20e28d29..ce5d10a0 100755
      def test_issue_687(self):
          # In case of thread ID:
          # - pid_exists() is supposed to return False
-@@ -1596,6 +1599,8 @@ class TestSensorsBattery(PsutilTestCase):
+@@ -1596,6 +1607,8 @@ class TestSensorsBattery(PsutilTestCase):
              self.assertEqual(psutil.sensors_battery().power_plugged, False)
              assert m.called
  
@@ -55,7 +117,7 @@ index 20e28d29..ce5d10a0 100755
      def test_emulate_power_undetermined(self):
          # Pretend we can't know whether the AC power cable not
          # connected (assert fallback to False).
-@@ -1614,6 +1619,8 @@ class TestSensorsBattery(PsutilTestCase):
+@@ -1614,6 +1627,8 @@ class TestSensorsBattery(PsutilTestCase):
              self.assertIsNone(psutil.sensors_battery().power_plugged)
              assert m.called
  
@@ -64,7 +126,7 @@ index 20e28d29..ce5d10a0 100755
      def test_emulate_energy_full_0(self):
          # Emulate a case where energy_full files returns 0.
          with mock_open_content(
-@@ -1621,6 +1628,8 @@ class TestSensorsBattery(PsutilTestCase):
+@@ -1621,6 +1636,8 @@ class TestSensorsBattery(PsutilTestCase):
              self.assertEqual(psutil.sensors_battery().percent, 0)
              assert m.called
  
@@ -73,7 +135,7 @@ index 20e28d29..ce5d10a0 100755
      def test_emulate_energy_full_not_avail(self):
          # Emulate a case where energy_full file does not exist.
          # Expected fallback on /capacity.
-@@ -1634,6 +1643,8 @@ class TestSensorsBattery(PsutilTestCase):
+@@ -1634,6 +1651,8 @@ class TestSensorsBattery(PsutilTestCase):
                          "/sys/class/power_supply/BAT0/capacity", b"88"):
                      self.assertEqual(psutil.sensors_battery().percent, 88)
  
@@ -82,7 +144,7 @@ index 20e28d29..ce5d10a0 100755
      def test_emulate_no_power(self):
          # Emulate a case where /AC0/online file nor /BAT0/status exist.
          with mock_open_exception(
-@@ -2220,6 +2231,7 @@ class TestProcessAgainstStatus(PsutilTestCase):
+@@ -2220,6 +2239,7 @@ class TestProcessAgainstStatus(PsutilTestCase):
          value = self.read_status_file("nonvoluntary_ctxt_switches:")
          self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
  
@@ -111,7 +173,7 @@ index d946eb62..a53de565 100755
          if PY3:
              from io import StringIO
 diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
-index 31b81926..7eb9bac5 100755
+index 31b81926..53b17953 100755
 --- a/psutil/tests/test_posix.py
 +++ b/psutil/tests/test_posix.py
 @@ -23,6 +23,7 @@ from psutil import OPENBSD
@@ -122,7 +184,23 @@ index 31b81926..7eb9bac5 100755
  from psutil.tests import HAS_NET_IO_COUNTERS
  from psutil.tests import PYTHON_EXE
  from psutil.tests import PsutilTestCase
-@@ -326,6 +327,7 @@ class TestSystemAPIs(PsutilTestCase):
+@@ -193,6 +194,7 @@ class TestProcess(PsutilTestCase):
+         vsz_psutil = psutil.Process(self.pid).memory_info()[1] / 1024
+         self.assertEqual(vsz_ps, vsz_psutil)
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_name(self):
+         name_ps = ps_name(self.pid)
+         # remove path if there is any, from the command
+@@ -271,6 +273,7 @@ class TestProcess(PsutilTestCase):
+             adjusted_ps_pathname = ps_pathname[:len(ps_pathname)]
+             self.assertEqual(ps_pathname, adjusted_ps_pathname)
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_cmdline(self):
+         ps_cmdline = ps_args(self.pid)
+         psutil_cmdline = " ".join(psutil.Process(self.pid).cmdline())
+@@ -326,6 +329,7 @@ class TestSystemAPIs(PsutilTestCase):
                      "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
                          nic, output))
  
@@ -167,10 +245,18 @@ index c9059e33..0050c42a 100755
      @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 db2cb348..b1faa154 100755
+index db2cb348..d719c59e 100755
 --- a/psutil/tests/test_system.py
 +++ b/psutil/tests/test_system.py
-@@ -33,6 +33,7 @@ from psutil._compat import long
+@@ -10,6 +10,7 @@ import contextlib
+ import datetime
+ import errno
+ import os
++import platform
+ import pprint
+ import shutil
+ import signal
+@@ -33,6 +34,7 @@ from psutil._compat import long
  from psutil.tests import ASCII_FS
  from psutil.tests import CI_TESTING
  from psutil.tests import DEVNULL
@@ -178,7 +264,7 @@ index db2cb348..b1faa154 100755
  from psutil.tests import GITHUB_ACTIONS
  from psutil.tests import GLOBAL_TIMEOUT
  from psutil.tests import HAS_BATTERY
-@@ -199,6 +200,7 @@ class TestMiscAPIs(PsutilTestCase):
+@@ -199,6 +201,7 @@ class TestMiscAPIs(PsutilTestCase):
          self.assertGreater(bt, 0)
          self.assertLess(bt, time.time())
  
@@ -186,3 +272,27 @@ index db2cb348..b1faa154 100755
      @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
      def test_users(self):
          users = psutil.users()
+@@ -426,6 +429,7 @@ class TestCpuAPIs(PsutilTestCase):
+                 if difference >= 0.05:
+                     return
+ 
++    @unittest.skipIf(GENTOO_TESTING, "flaky")
+     def test_cpu_times_comparison(self):
+         # Make sure the sum of all per cpu times is almost equal to
+         # base "one cpu" times.
+@@ -512,6 +516,7 @@ class TestCpuAPIs(PsutilTestCase):
+                 self.assertGreater(value, 0)
+ 
+     @unittest.skipIf(not HAS_CPU_FREQ, "not suported")
++    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
+     def test_cpu_freq(self):
+         def check_ls(ls):
+             for nt in ls:
+@@ -580,6 +585,7 @@ class TestDiskAPIs(PsutilTestCase):
+     def test_disk_usage_bytes(self):
+         psutil.disk_usage(b'.')
+ 
++    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
+     def test_disk_partitions(self):
+         def check_ntuple(nt):
+             self.assertIsInstance(nt.device, str)
diff --git a/dev-python/psutil/psutil-5.7.3.ebuild b/dev-python/psutil/psutil-5.7.3.ebuild
deleted file mode 100644
index ddf8240254b4..000000000000
--- a/dev-python/psutil/psutil-5.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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
-}
diff --git a/dev-python/psutil/psutil-5.9.0.ebuild b/dev-python/psutil/psutil-5.9.0.ebuild
index 81fdca4442bf..ddb9962ebb08 100644
--- a/dev-python/psutil/psutil-5.9.0.ebuild
+++ b/dev-python/psutil/psutil-5.9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -23,11 +23,6 @@ PATCHES=(
 )
 
 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
 	local -x TRAVIS=1