4 files changed, 3 insertions, 101 deletions
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 43a95d2a4b84..f1a79dc74fe3 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,12 +1,8 @@
 DIST psutil-5.9.8-tests.patch.xz 3716 BLAKE2B cf33173a0d5c6537b0de1c4858beb9ec59c0361c6249f8a5cb3d55edc025578ddc0285a062083d28fcd4ece223728376dd64e9232aed1d761786b772a4cc7778 SHA512 5c9539a9716e25dc3cc5f2ce4373911a6c4524941838aff7aa08cc482d15aba6ec40b7904593723a785284410bcded2595c78a6c186d8af5b5f664c2d77e9220
 DIST psutil-5.9.8.tar.gz 503247 BLAKE2B 192812d9006b9eb1a856ff8d322e6cfb320462e5dc5ee7b88869ce7f4f2277050c4867b5e3f64468bb42de0b5bde85b715b84b37842bd3f605216acf89a62a4c SHA512 6ddeed937119a930bb7b9556ff329f054e9429b8457c9a15d99cb105271297117abba587a974d02760bb8b6b244734973a676bdff6b533a53ce587858e48f337
-DIST psutil-6.0.0-tests.patch.xz 3748 BLAKE2B 6e78418de8ee052e7e9f5d6bc74b8fc79e5216ed4d5fa8eb89532b19298955c388e158770b4af7b42fddc2a03b292e6d8ce9ed98c441179fb7c4a640014f2112 SHA512 3947337dbdddc29c85697d6140fc0fdcfb2b5ce7d84438e5763ad240ccd954e97fbf5dabf03ca17e959273a2c11794a41b2293434e85d2fe4d38d696c7de3900
-DIST psutil-6.0.0.tar.gz 508067 BLAKE2B a4c80d1cead17ab73c99a25c4e1712cc2dd0b4220521d8dacafb905ab27393c49a8ee20790a89ebfc6c1d53779e98fe126c50f9299db1ab9a9c3df6d0a99ec48 SHA512 78ef1abe109c985ad3dd3865de5b4a7682fbad0085e5ca5bc1f2f90f03853775554b6c810cd54543cb7a1238efe345b3dcc9f5191270e03bc6a2f4088dd007ba
 DIST psutil-6.1.0.tar.gz 508565 BLAKE2B 2b5095613854c8e77e5e5ac8bb67b3d631bb29515c8d958e7cedb81a56c03d639663602f01337e191084f1511a6cb921a85394ecc8ac64af2270cf75cdc44262 SHA512 76865df4fdb2a9df45e47589b76b34d0d9d9251491091683e47b4509863e32e46dc62ee2f760b983f0f762b8288d1ea7f32268a6857c049ad12f399908e19c82
 DIST psutil-6.1.1.tar.gz 508502 BLAKE2B ebd8ee40cd86fdbc1ed70e192228889dbae74295ba5b17baa629ca8c3d05945b61ad4b02a836af30886bbf78d65de842cd25486c292ed5b727f37645c6bde93b SHA512 db8a2f4b0b451ca46aaa21b1faae03c4328b1effd04f240a7c8efc94a1c8ca7fc080fc6d16f6ca2046b9232ec43e447be0c414b125f8f511131dc6dff95bd72c
 EBUILD psutil-5.9.8.ebuild 1186 BLAKE2B bd10c838505516d6f74da8349198d995ff263802d425c6a0c980672d49d1af5e2ca684965c113299e4d72e0af188147d0805ea6756d388f76a4e16c6f624892b SHA512 01888a1fa743bc209d3761dbf7e15062ff5e363469c739baa56e26eda4739a8dd915ec0067a67b750ec26959d90733dc379a73fe38ee0247bd778142598f82f7
-EBUILD psutil-6.0.0-r1.ebuild 1206 BLAKE2B fc0adabc31ab168c5db19eed87421d987250bd8f65f8901d933b7c8816b2a3c1dc8a7b6cd81771f45d19d042c917830e33420ee4c30c8587f9029b1b81a55c5e SHA512 337b59f975f9ce7b73c6889a5cd2d61452b667691c39cc26917d0b6095395d8599436e872a95b2bc748de022acefe17a2bb3a20d05a58b6572bb9fc874b07b70
-EBUILD psutil-6.0.0.ebuild 1190 BLAKE2B 5160ed9b7ca352df5ff2d2a597609ade0cf426846a1dbc5f26b3ecb7453ffcea837fe380c1c17c4d3dadfd195c46a40a32e3761f7f0530429221ca00a52e0fd5 SHA512 8aa7879db77c4071d54508bdd4a399647a09afe795eba626a4a87fbdef860f0ff6e41dd39de73a720c02cfcc3b67a4f0488f56c0091dcc5f28d9dde595a0e424
 EBUILD psutil-6.1.0.ebuild 3271 BLAKE2B 3832b446f5eb2faaf544e43c9b8d287e28bc539b521d7c2ed9cb387ada8d03b5836659e897410a00d386e5a4de634a24ad027e0c450d93e9c4b7781dea8f301a SHA512 1ef2f9472ccef06f4930dea4e8ea0a0b422c0db0a026c93555389abd8c08c7cca8c555b2752fc45bf38cb6341d31eb79917b17debb72bbba1251d8e7e36fe325
-EBUILD psutil-6.1.1.ebuild 3278 BLAKE2B 63b009e1c877e03fdaaf0c9173bbd314a67217db4ddad20f78c51ff2aa72b79d93dd450245b98d75e279802618d6766d748613c895b7fff6ef65851510194f4c SHA512 681aaedb0388491a77b1ee309785c71258720174266b06c4414842754d362dfb1a7f919a175e2d740bc0f9c0d65d67878c97be3f30972bb947d0fc1a21a28dce
+EBUILD psutil-6.1.1.ebuild 3271 BLAKE2B fb363f4cb2d298c96d8cec32f32370b59d79443f9592d83beeceb9f2dbff587142d8cbb43d4629503d39c4805ef950d76e9a90561769497c26ab0bb440fb4b02 SHA512 f01d4b18822e8e3d375e0536d01ad6121c210817f9fb72127435a9c68fd5f1fbbea9ab2138486969b722cc2e6dfdddcc0a5ff299c1e3bc4d4d5034e38f3941c7
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/psutil-6.0.0-r1.ebuild b/dev-python/psutil/psutil-6.0.0-r1.ebuild
deleted file mode 100644
index f8d6a5297af0..000000000000
--- a/dev-python/psutil/psutil-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 )
-
-inherit distutils-r1 pypi
-
-TEST_PATCH=psutil-6.0.0-tests.patch
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="
-	https://github.com/giampaolo/psutil/
-	https://pypi.org/project/psutil/
-"
-SRC_URI+="
-	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${WORKDIR}/${TEST_PATCH}"
-)
-
-python_test() {
-	# Since we are running in an environment a bit similar to CI,
-	# let's skip the tests that are disabled for CI
-	local -x TRAVIS=1
-	local -x APPVEYOR=1
-	local -x GITHUB_ACTIONS=1
-	local -x GENTOO_TESTING=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-6.0.0.ebuild b/dev-python/psutil/psutil-6.0.0.ebuild
deleted file mode 100644
index cfe57218cb2f..000000000000
--- a/dev-python/psutil/psutil-6.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-TEST_PATCH=psutil-6.0.0-tests.patch
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="
-	https://github.com/giampaolo/psutil/
-	https://pypi.org/project/psutil/
-"
-SRC_URI+="
-	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${WORKDIR}/${TEST_PATCH}"
-)
-
-python_test() {
-	# Since we are running in an environment a bit similar to CI,
-	# let's skip the tests that are disabled for CI
-	local -x TRAVIS=1
-	local -x APPVEYOR=1
-	local -x GITHUB_ACTIONS=1
-	local -x GENTOO_TESTING=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-6.1.1.ebuild b/dev-python/psutil/psutil-6.1.1.ebuild
index 361ba97d3525..78de51380249 100644
--- a/dev-python/psutil/psutil-6.1.1.ebuild
+++ b/dev-python/psutil/psutil-6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest