Adding metadata

30 files changed, 31 insertions, 510 deletions

diff --git a/dev-python/bitarray/bitarray-3.0.0.ebuild b/dev-python/bitarray/bitarray-3.0.0.ebuild
index 8db0d2972da8..bc87c2d4f1e5 100644
--- a/dev-python/bitarray/bitarray-3.0.0.ebuild
+++ b/dev-python/bitarray/bitarray-3.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bottleneck/bottleneck-1.4.2.ebuild b/dev-python/bottleneck/bottleneck-1.4.2.ebuild
index 9492d6477338..6b3db9f1d6ca 100644
--- a/dev-python/bottleneck/bottleneck-1.4.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.4.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/coverage-7.6.3.ebuild b/dev-python/coverage/coverage-7.6.3.ebuild
index 49963d393bba..dd89a5e04310 100644
--- a/dev-python/coverage/coverage-7.6.3.ebuild
+++ b/dev-python/coverage/coverage-7.6.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/flask-caching/flask-caching-2.3.0.ebuild b/dev-python/flask-caching/flask-caching-2.3.0.ebuild
index ef2d741952b9..81e59143b7f6 100644
--- a/dev-python/flask-caching/flask-caching-2.3.0.ebuild
+++ b/dev-python/flask-caching/flask-caching-2.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/cachelib-0.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-compress/flask-compress-1.17.ebuild b/dev-python/flask-compress/flask-compress-1.17.ebuild
index 9d7e7bf08c52..080dca61f57e 100644
--- a/dev-python/flask-compress/flask-compress-1.17.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.17.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 # brotli on cpython, brotlicffi on pypy3
 RDEPEND="
diff --git a/dev-python/httptools/httptools-0.6.4.ebuild b/dev-python/httptools/httptools-0.6.4.ebuild
index 24b37a3a213c..c588ee8861a6 100644
--- a/dev-python/httptools/httptools-0.6.4.ebuild
+++ b/dev-python/httptools/httptools-0.6.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 # don't ask me why they use both
 DEPEND="
diff --git a/dev-python/markupsafe/markupsafe-3.0.2.ebuild b/dev-python/markupsafe/markupsafe-3.0.2.ebuild
index 49a2edb22e49..d69beff5aad8 100644
--- a/dev-python/markupsafe/markupsafe-3.0.2.ebuild
+++ b/dev-python/markupsafe/markupsafe-3.0.2.ebuild
@@ -19,7 +19,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 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="+native-extensions"
 
 distutils_enable_tests pytest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 4c4dba45e208..76e657920be3 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,4 +1,3 @@
 DIST moto-4.2.14.tar.gz 4933741 BLAKE2B 4c50a808dc8f27cfbcd0ba234d268084ee9a32f36cb5d6af61aacc4ee79f7bf5cf1045147c4642472129eee37bef8bc2c1953d140260d39d7f333ae0f5e5cf95 SHA512 d4079118ed1d2eef9134575e33dc0ed749bff0293d753baa63a630dbb987914b9933445027abdc344bb93fa1d6e483baf8a337a444c9dd055dda50b095ff9937
-DIST moto-5.0.16.tar.gz 5483357 BLAKE2B 7486a17627451494d09dcad8987da1ab456a9a8ad8fa6bca4650cf1c582e3babb39b502aec0b8c389415181af7e3c8f91ddde16715432a69ade0eb65c0e84ea2 SHA512 2201fe7b74eec9b2896afa5d7eba814c41ffae73b7becfc5e6c80523d51bf19d1de6713a5713758909c8d2343cc0ca1e0e238655153d91da161d043336c1e313
 DIST moto-5.0.17.tar.gz 5500632 BLAKE2B 9807388c0318a99635b0972f7d4d24489ddd37b0ec5272965d895c101ee924ef3915d8ef7546b6eab7574e87a5b3c650abce5dc07dda389a1fd9a0fc55d75cfb SHA512 8f17b4f0367f7068c0896d1db8766a2133dab027f107d742027ca936c3a2aaf13e4255ddc4801958e53197e3dd618bd6db7a7b21fef057662ba98e895c2e6bfc
 DIST moto-5.0.18.tar.gz 5509110 BLAKE2B 0e56aabc053184121608f08e9d0489fe20c51450d500cb35557d65222b60bb3b6e0aa5e3900a22fe8f6008c751524b1bd946e0994fcddf0e82c058ecf106e115 SHA512 805a100aaa0a1164fff3baf80baec868d12c7f94ec345640272ed284e2c982b6c0c092ffa5e0b28a26d547b9eb48485ed660e06170c1e26ec03590c35695e44f
diff --git a/dev-python/moto/moto-5.0.16.ebuild b/dev-python/moto/moto-5.0.16.ebuild
deleted file mode 100644
index 8065b5ec8ae5..000000000000
--- a/dev-python/moto/moto-5.0.16.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi toolchain-funcs
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="
-	https://github.com/getmoto/moto/
-	https://pypi.org/project/moto/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/jsonpath-ng[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.5.0[${PYTHON_USEDEP}]
-	dev-python/pyaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/sshpubkeys[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/antlr4-python3-runtime[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-: "${EPYTEST_TIMEOUT:=180}"
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_core/test_request_passthrough.py
-		tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_aws_and_http_requests
-		tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_http_requests
-		# broken code? (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# require py_partiql_parser
-		tests/test_s3/test_s3_select.py
-		tests/test_dynamodb/test_dynamodb_statements.py
-		# require joserfc
-		tests/test_apigateway/test_apigateway.py::test_update_authorizer_configuration
-		tests/test_apigateway/test_apigateway.py::test_create_authorizer
-		tests/test_apigateway/test_apigateway.py::test_delete_authorizer
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserDeleter::test_authenticate_with_signed_out_user
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserPoolDuplidateEmails::test_use_existing_email__when_email_is_
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserPoolDuplidateEmails::test_use_existing_email__when_username_
-		tests/test_cognitoidp/test_cognitoidp_replay.py::TestCreateUserPoolWithPredeterminedID::test_different_seed
-		tests/test_cognitoidp/test_cognitoidp_replay.py::TestCreateUserPoolWithPredeterminedID::test_same_seed
-		tests/test_cognitoidp/test_server.py::test_sign_up_user_without_authentication
-		tests/test_cognitoidp/test_server.py::test_admin_create_user_without_authentication
-		# TODO
-		tests/test_dynamodb/test_dynamodb_import_table.py
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_stepfunctions/parser/test_stepfunctions_dynamodb_integration.py::test_zero_retry
-	)
-	local EPYTEST_IGNORE=(
-		# require joserfc
-		tests/test_cognitoidp/test_cognitoidp.py
-	)
-
-	# test for 32-bit time_t
-	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
-		#include <sys/types.h>
-		int test[sizeof(time_t) >= 8 ? 1 : -1];
-	EOF
-
-	if [[ ${?} -eq 0 ]]; then
-		einfo "time_t is at least 64-bit long"
-	else
-		einfo "time_t is smaller than 64 bits, will skip broken tests"
-		EPYTEST_DESELECT+=(
-			tests/test_acm/test_acm.py::test_request_certificate_with_optional_arguments
-			tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
-			tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins
-		)
-		EPYTEST_IGNORE+=(
-			tests/test_route53domains/test_route53domains_domain.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-
-	rm -rf moto || die
-	epytest -m 'not network and not requires_docker' \
-		-p rerunfailures --reruns=5
-}
diff --git a/dev-python/moto/moto-5.0.17.ebuild b/dev-python/moto/moto-5.0.17.ebuild
index 5577c886551a..ad7e19df6cb8 100644
--- a/dev-python/moto/moto-5.0.17.ebuild
+++ b/dev-python/moto/moto-5.0.17.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 4378a1a09d79..c833853fb697 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,2 +1 @@
-DIST peewee-3.17.6.gh.tar.gz 929364 BLAKE2B f7add872316dae1210a4dec4a71cf0b5122010e3da854019887143111cca5ed7f53b48bdf68aaa215097bde8003878e4aae0ddf827fb3fd0ab635345815a0d7a SHA512 7250b931ebaab6f5e1fbc9461cb737e30eef794bbc6a15f6f1ba59e358bd9101c17d31112906d314a12f0a05b4c2112435f90053a866f3b91d0e5a1dc4aba2f8
 DIST peewee-3.17.7.gh.tar.gz 929522 BLAKE2B ebbde16c53b7fbc4295adb14e54d2df5b46f11e2aa00248fa753af30b1b029679641f0981c5b71070ea503c61c0658af0341970aa8a74f25f6155d1f94c2d1a0 SHA512 5952b7928432599ec2ec6d78023c762d9852e15bdc2e3411d5ea7f9618de107b2d9400d8e921047842a688b4f409d5ea4996651a74983e1ce92380e9f259151d
diff --git a/dev-python/peewee/peewee-3.17.6.ebuild b/dev-python/peewee/peewee-3.17.6.ebuild
deleted file mode 100644
index 40555fcb3bdd..000000000000
--- a/dev-python/peewee/peewee-3.17.6.ebuild
+++ /dev/null
@@ -1,81 +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_{9,10,11,12,13} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="
-	https://github.com/coleifer/peewee/
-	https://pypi.org/project/peewee/
-"
-SRC_URI="
-	https://github.com/coleifer/peewee/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples +native-extensions test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	native-extensions? ( dev-db/sqlite:3= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-db/postgresql
-		dev-python/psycopg:0[${PYTHON_USEDEP}]
-		sys-libs/timezone-data
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-
-src_prepare() {
-	# disable test failing on postgres 16
-	sed -e 's/test_timeout/_&/' -i tests/sqliteq.py || die
-
-	default
-}
-
-src_compile() {
-	if ! use native-extensions; then
-		local -x NO_SQLITE=1
-	fi
-
-	distutils-r1_src_compile
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	pg_ctl -w -D "${T}"/pgsql start -o "-h '' -k '${T}'" || die
-	createdb -h "${T}" peewee_test || die
-	psql -h "${T}" peewee_test -c 'create extension hstore;' || die
-
-	local -x PEEWEE_PSQL_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.17.7.ebuild b/dev-python/peewee/peewee-3.17.7.ebuild
index 8f489cbaa47c..40555fcb3bdd 100644
--- a/dev-python/peewee/peewee-3.17.7.ebuild
+++ b/dev-python/peewee/peewee-3.17.7.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples +native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pillow/pillow-11.0.0.ebuild b/dev-python/pillow/pillow-11.0.0.ebuild
index 11996dec55ca..cf3e94750f4e 100644
--- a/dev-python/pillow/pillow-11.0.0.ebuild
+++ b/dev-python/pillow/pillow-11.0.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/psutil/files/psutil-6.0.0-py313t.patch b/dev-python/psutil/files/psutil-6.0.0-py313t.patch
deleted file mode 100644
index 1cdc63ed406e..000000000000
--- a/dev-python/psutil/files/psutil-6.0.0-py313t.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 5c0c0893c7565a39f1ac3f9c286fd1e1c58a7cd6 Mon Sep 17 00:00:00 2001
-From: Sam Gross <colesbury@gmail.com>
-Date: Mon, 24 Jun 2024 17:51:07 +0000
-Subject: [PATCH 1/2] Fix GIL warnings and a few thread-safety issues in
- free-threaded CPython
-
-- The temporary `argv` C array is no longer global in OpenBSD's
-  proc_cmdline
-- The `maxcpus` variable is no longer global in FreeBSD's per_cpu_times.
-
-Signed-off-by: Sam Gross <colesbury@gmail.com>
----
- psutil/_psutil_aix.c       | 3 +++
- psutil/_psutil_bsd.c       | 4 ++++
- psutil/_psutil_linux.c     | 4 ++++
- psutil/_psutil_osx.c       | 4 ++++
- psutil/_psutil_posix.c     | 4 ++++
- psutil/_psutil_sunos.c     | 4 ++++
- psutil/_psutil_windows.c   | 4 ++++
- psutil/arch/freebsd/cpu.c  | 2 +-
- psutil/arch/openbsd/proc.c | 4 +++-
- 9 files changed, 31 insertions(+), 2 deletions(-)
-
-diff --git a/psutil/_psutil_aix.c b/psutil/_psutil_aix.c
-index ce89a7bd7c..42f921188e 100644
---- a/psutil/_psutil_aix.c
-+++ b/psutil/_psutil_aix.c
-@@ -1080,6 +1080,9 @@ void init_psutil_aix(void)
-     PyObject *module = PyModule_Create(&moduledef);
- #else
-     PyObject *module = Py_InitModule("_psutil_aix", PsutilMethods);
-+#endif
-+#ifdef Py_GIL_DISABLED
-+    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
- #endif
-     PyModule_AddIntConstant(module, "version", PSUTIL_VERSION);
- 
-diff --git a/psutil/_psutil_bsd.c b/psutil/_psutil_bsd.c
-index 6517d5800a..facaba831f 100644
---- a/psutil/_psutil_bsd.c
-+++ b/psutil/_psutil_bsd.c
-@@ -143,6 +143,10 @@ static PyMethodDef mod_methods[] = {
-     if (mod == NULL)
-         INITERR;
- 
-+#ifdef Py_GIL_DISABLED
-+    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
-+#endif
-+
-     if (PyModule_AddIntConstant(mod, "version", PSUTIL_VERSION)) INITERR;
-     // process status constants
- 
-diff --git a/psutil/_psutil_linux.c b/psutil/_psutil_linux.c
-index 292e1c5524..46244c5792 100644
---- a/psutil/_psutil_linux.c
-+++ b/psutil/_psutil_linux.c
-@@ -78,6 +78,10 @@ static PyMethodDef mod_methods[] = {
-     if (mod == NULL)
-         INITERR;
- 
-+#ifdef Py_GIL_DISABLED
-+    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
-+#endif
-+
-     if (PyModule_AddIntConstant(mod, "version", PSUTIL_VERSION)) INITERR;
-     if (PyModule_AddIntConstant(mod, "DUPLEX_HALF", DUPLEX_HALF)) INITERR;
-     if (PyModule_AddIntConstant(mod, "DUPLEX_FULL", DUPLEX_FULL)) INITERR;
-diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c
-index 4aa11d1700..09fa267a98 100644
---- a/psutil/_psutil_osx.c
-+++ b/psutil/_psutil_osx.c
-@@ -91,6 +91,10 @@ static PyMethodDef mod_methods[] = {
-     if (mod == NULL)
-         INITERR;
- 
-+#ifdef Py_GIL_DISABLED
-+    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
-+#endif
-+
-     if (psutil_setup() != 0)
-         INITERR;
- 
-diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c
-index 24628afc78..8ced7beaac 100644
---- a/psutil/_psutil_posix.c
-+++ b/psutil/_psutil_posix.c
-@@ -913,6 +913,10 @@ static PyMethodDef mod_methods[] = {
-     if (mod == NULL)
-         INITERR;
- 
-+#ifdef Py_GIL_DISABLED
-+    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
-+#endif
-+
- #if defined(PSUTIL_BSD) || \
-         defined(PSUTIL_OSX) || \
-         defined(PSUTIL_SUNOS) || \
-diff --git a/psutil/_psutil_sunos.c b/psutil/_psutil_sunos.c
-index 54f353c106..d21f59c618 100644
---- a/psutil/_psutil_sunos.c
-+++ b/psutil/_psutil_sunos.c
-@@ -1721,6 +1721,10 @@ void init_psutil_sunos(void)
-     if (module == NULL)
-         INITERROR;
- 
-+#ifdef Py_GIL_DISABLED
-+    PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);
-+#endif
-+
-     if (psutil_setup() != 0)
-         INITERROR;
- 
-diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
-index bb6e12ff80..0c221bdc23 100644
---- a/psutil/_psutil_windows.c
-+++ b/psutil/_psutil_windows.c
-@@ -165,6 +165,10 @@ void init_psutil_windows(void)
-     if (module == NULL)
-         INITERROR;
- 
-+#ifdef Py_GIL_DISABLED
-+    PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);
-+#endif
-+
-     if (psutil_setup() != 0)
-         INITERROR;
-     if (psutil_set_se_debug() != 0)
-diff --git a/psutil/arch/freebsd/cpu.c b/psutil/arch/freebsd/cpu.c
-index a15d96efc1..9fa1a7dbe6 100644
---- a/psutil/arch/freebsd/cpu.c
-+++ b/psutil/arch/freebsd/cpu.c
-@@ -26,7 +26,7 @@ For reference, here's the git history with original(ish) implementations:
- 
- PyObject *
- psutil_per_cpu_times(PyObject *self, PyObject *args) {
--    static int maxcpus;
-+    int maxcpus;
-     int mib[2];
-     int ncpu;
-     size_t len;
-diff --git a/psutil/arch/openbsd/proc.c b/psutil/arch/openbsd/proc.c
-index 96b85bc502..bec2c42ea7 100644
---- a/psutil/arch/openbsd/proc.c
-+++ b/psutil/arch/openbsd/proc.c
-@@ -147,7 +147,7 @@ PyObject *
- psutil_proc_cmdline(PyObject *self, PyObject *args) {
-     pid_t pid;
-     int mib[4];
--    static char **argv;
-+    char **argv = NULL;
-     char **p;
-     size_t argv_size = 128;
-     PyObject *py_retlist = PyList_New(0);
-@@ -189,9 +189,11 @@ psutil_proc_cmdline(PyObject *self, PyObject *args) {
-         Py_DECREF(py_arg);
-     }
- 
-+    free(argv);
-     return py_retlist;
- 
- error:
-+    free(argv);
-     Py_XDECREF(py_arg);
-     Py_DECREF(py_retlist);
-     return NULL;
-
-From 69c74c63a322fae4a763bf8347f9e5e3202d5ecf Mon Sep 17 00:00:00 2001
-From: Sam Gross <colesbury@gmail.com>
-Date: Mon, 24 Jun 2024 18:26:00 +0000
-Subject: [PATCH 2/2] Add `if (argv != NULL)` check
-
-Signed-off-by: Sam Gross <colesbury@gmail.com>
----
- psutil/arch/openbsd/proc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/psutil/arch/openbsd/proc.c b/psutil/arch/openbsd/proc.c
-index bec2c42ea7..0881ccd555 100644
---- a/psutil/arch/openbsd/proc.c
-+++ b/psutil/arch/openbsd/proc.c
-@@ -193,7 +193,8 @@ psutil_proc_cmdline(PyObject *self, PyObject *args) {
-     return py_retlist;
- 
- error:
--    free(argv);
-+    if (argv != NULL)
-+        free(argv);
-     Py_XDECREF(py_arg);
-     Py_DECREF(py_retlist);
-     return NULL;
diff --git a/dev-python/psutil/psutil-6.1.0.ebuild b/dev-python/psutil/psutil-6.1.0.ebuild
index 799ee98b3f2d..da980f9fabe3 100644
--- a/dev-python/psutil/psutil-6.1.0.ebuild
+++ b/dev-python/psutil/psutil-6.1.0.ebuild
@@ -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
 
@@ -27,6 +27,7 @@ python_test() {
 		tests/test_linux.py::TestRootFsDeviceFinder::test_disk_partitions_mocked
 		tests/test_linux.py::TestSystemDiskPartitions::test_zfs_fs
 		tests/test_linux.py::TestSystemNetIfAddrs::test_ips
+		tests/test_posix.py::TestProcess::test_nice
 		tests/test_process.py::TestProcess::test_ionice_linux
 		tests/test_system.py::TestDiskAPIs::test_disk_partitions
 
@@ -51,6 +52,8 @@ python_test() {
 		tests/test_linux.py::TestSystemCPUCountLogical::test_emulate_fallbacks
 		tests/test_linux.py::TestSystemCPUFrequency::test_emulate_use_cpuinfo
 		tests/test_linux.py::TestSystemCPUFrequency::test_emulate_use_second_file
+		tests/test_system.py::TestCpuAPIs::test_cpu_freq
+		tests/test_system.py::TestCpuAPIs::test_cpu_times_comparison
 
 		# broken in some setups
 		tests/test_linux.py::TestMisc::test_issue_687
@@ -61,6 +64,13 @@ python_test() {
 		tests/test_posix.py::TestSystemAPIs::test_users
 		tests/test_process.py::TestProcess::test_terminal
 		tests/test_unicode.py::TestFSAPIs::test_memory_maps
+
+		# fails on all AT containers
+		tests/test_system.py::TestMiscAPIs::test_users
+
+		# failing without /sys/class/power_supply?
+		tests/test_memleaks.py::TestModuleFunctionsLeaks::test_sensors_battery
+		tests/test_misc.py::TestMisc::test_serialization
 	)
 
 	# Since we are running in an environment a bit similar to CI,
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index f316b30cc1e8..f736cba9acfc 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,2 +1 @@
-DIST pyclipper-1.3.0.post5.gh.tar.gz 51150 BLAKE2B 2751dbc2ca6c8ad664a1185f00c644b084e13bbb4bb54895003799988b8d56542dd4d4b793bfa33391aece59097e1ca9ee159631b844f41ade862ed187ed5dae SHA512 24dd783449fdefb035627289680959ca4a74f737573518d14fe899ec015a7f8781b391df861e1f8986d6e71c8295743ef5fa048f5da22dd493f5940e25a7f185
 DIST pyclipper-1.3.0.post6.gh.tar.gz 51242 BLAKE2B d7102d293cb5ceb1b7da62c7dd607d6251b0d525034c1039413b0f17db34d3168908344ecdd999ec2ce6015bb61ab0ec7c80078ca632a6aa859de64cea861991 SHA512 0777e088347d2e8a97ae2f217a678159acc3f62b193bdfa11dab9385a1ee692d19d53c1d3934c5dfa510c9bc8b669e07fd8c6dcbf62d8bc1a9119935be445060
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild
deleted file mode 100644
index d9ce4faf22d0..000000000000
--- a/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild
+++ /dev/null
@@ -1,35 +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_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
-HOMEPAGE="
-	https://github.com/fonttools/pyclipper/
-	https://pypi.org/project/pyclipper/
-"
-SRC_URI="
-	https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p6.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p6.ebuild
index 86a0d93b0fd2..d9ce4faf22d0 100644
--- a/dev-python/pyclipper/pyclipper-1.3.0_p6.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0_p6.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/pylibmc/pylibmc-1.6.3-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.3-r1.ebuild
index 53cb25375e12..e228cd508686 100644
--- a/dev-python/pylibmc/pylibmc-1.6.3-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.3-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 x86"
 IUSE="sasl"
 
 DEPEND="
@@ -59,5 +59,6 @@ python_test() {
 		tests/test_autoconf.py
 	)
 
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest --doctest-modules --doctest-glob='doctests.txt' src/pylibmc tests
 }
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.4.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.4.3.ebuild
index 70f69a2e995b..b370aa190aac 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.4.3.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.4.3.ebuild
@@ -135,7 +135,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pysnmp/pysnmp-7.1.8.ebuild b/dev-python/pysnmp/pysnmp-7.1.8.ebuild
index 4ee8bc2aa50e..b1993e1b0d7c 100644
--- a/dev-python/pysnmp/pysnmp-7.1.8.ebuild
+++ b/dev-python/pysnmp/pysnmp-7.1.8.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
 PROPERTIES="test_network"
 RESTRICT="test"
 
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index a68b64fbe98b..5506561b8453 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,2 +1 @@
-DIST python-quantities-0.16.0.gh.tar.gz 92228 BLAKE2B 2570b50a983cf1e84fc6df0590a2de251f671d15af06191c4fbf673c7bb75ec419e04f7bcc1a1730f87ed2269b40d707aa6a1103d1238421c19b939f2bbc7f2b SHA512 592001add7201868844197e67ac3a200d4a82c11f02c0d2ce4f007bda5b8c66c29c0f30563da7fd214c3aede4564590b1de9e29b2e9dac0a77a1db0b410e750d
 DIST python-quantities-0.16.1.gh.tar.gz 92552 BLAKE2B b2a1b2b4945aa89f2b75f7e848ba01b0fd9180386efdbcfe2f257eec9cf1600143644d18b5cdf4ccc7442c5982036ac9b48cba2a25a3f208f809dad9cb3de795 SHA512 cba89192ad82b811bb3665cf0eaaaa933e7c5c7a0a02a4ef4895f3b0febadf7aafc71d42dc7c616cdac479fcb2703e25fa37a3e9e5ba06775faf7c1f04a3f884
diff --git a/dev-python/quantities/quantities-0.16.0.ebuild b/dev-python/quantities/quantities-0.16.0.ebuild
deleted file mode 100644
index 53f93e026a96..000000000000
--- a/dev-python/quantities/quantities-0.16.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-MY_P="python-quantities-${PV}"
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="
-	https://github.com/python-quantities/python-quantities/
-	https://pypi.org/project/quantities/
-"
-SRC_URI="
-	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.20[$PYTHON_USEDEP]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	epytest --pyargs quantities.tests
-}
diff --git a/dev-python/quantities/quantities-0.16.1.ebuild b/dev-python/quantities/quantities-0.16.1.ebuild
index e92d1480d3ad..53f93e026a96 100644
--- a/dev-python/quantities/quantities-0.16.1.ebuild
+++ b/dev-python/quantities/quantities-0.16.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/numpy-1.20[$PYTHON_USEDEP]
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.36.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.36.ebuild
index da37c5bbe017..9e20b7b57ed7 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.36.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.36.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~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 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch b/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch
deleted file mode 100644
index 69b50897d3aa..000000000000
--- a/dev-python/tree-sitter/files/tree-sitter-0.21.0-unbundle.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -14,13 +14,9 @@ setup(
-         Extension(
-             name="tree_sitter._binding",
-             sources=[
--                "tree_sitter/core/lib/src/lib.c",
-                 "tree_sitter/binding.c"
-             ],
--            include_dirs=[
--                "tree_sitter/core/lib/include",
--                "tree_sitter/core/lib/src"
--            ],
-+            libraries=["tree-sitter"],
-             define_macros=[
-                 ("PY_SSIZE_T_CLEAN", None),
-             ],
diff --git a/dev-python/uvicorn/uvicorn-0.32.0.ebuild b/dev-python/uvicorn/uvicorn-0.32.0.ebuild
index 08ffc4c1c97c..0d03277b9836 100644
--- a/dev-python/uvicorn/uvicorn-0.32.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.32.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/uvloop/uvloop-0.21.0.ebuild b/dev-python/uvloop/uvloop-0.21.0.ebuild
index 2b59d6b12236..1142217710ae 100644
--- a/dev-python/uvloop/uvloop-0.21.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.21.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.19.0-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ~ppc64 -riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 -riscv sparc x86"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/yarl/yarl-1.15.5.ebuild b/dev-python/yarl/yarl-1.15.5.ebuild
index fb11a09d52d1..bf97f7e2ba55 100644
--- a/dev-python/yarl/yarl-1.15.5.ebuild
+++ b/dev-python/yarl/yarl-1.15.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions"
 
 RDEPEND="