Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-11-15 18:35:25 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-11-15 18:35:25 +0000
commit: d9672f8042de9e1d3a836c02ed1a44dfba57d8fc (patch)
tree: fae0eac476f36c3f40e906ac027479c4e8848d72 /dev-python
parent: bded20c123a549b248f6fd88e45db59d6bc1199d (diff)
download: baldeagleos-repo-d9672f8042de9e1d3a836c02ed1a44dfba57d8fc.tar.gz
baldeagleos-repo-d9672f8042de9e1d3a836c02ed1a44dfba57d8fc.tar.xz
baldeagleos-repo-d9672f8042de9e1d3a836c02ed1a44dfba57d8fc.zip
86 files changed, 639 insertions, 1486 deletions
diff --git a/dev-python/a2wsgi/a2wsgi-1.8.0.ebuild b/dev-python/a2wsgi/a2wsgi-1.8.0.ebuild
index 86c0c526682e..6da33d0b579b 100644
--- a/dev-python/a2wsgi/a2wsgi-1.8.0.ebuild
+++ b/dev-python/a2wsgi/a2wsgi-1.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/autopage/Manifest b/dev-python/autopage/Manifest
index 746b49f9bf13..1149a2b74668 100644
--- a/dev-python/autopage/Manifest
+++ b/dev-python/autopage/Manifest
@@ -1,2 +1 @@
-DIST autopage-0.5.1.gh.tar.gz 21406 BLAKE2B 45d67443fa882d6f824ea71a8f9d20eb1ae789a271d84dc566a2535de631b5ce644aa28f51c5be1db818194e39628b6526ac087cd6eccc425132f15fafda10e9 SHA512 3d6e10c222566fd5f5e07e3247ebe19ce7ffe3b4baf9948741ee9a8aaafbefb0fcfaf4b26f0a4a6392615e73c7e8539c9bcbff1112a291c193c0b653f33e8657
 DIST autopage-0.5.2.gh.tar.gz 21904 BLAKE2B 73597326f6d22d4cac9c9969edc0e6fc23f555d149947aa3aa81529347928a3f9112e9fb15a3ad65e17274ed308fb6fe20810d8364415fe7e59ab1bd47411361 SHA512 68e76dd4c4f049785e226eae499be85139bf57c59fd2161f5bb9df66878541e39a3edc1806f42382bd2d9a922cbdace0d05b60366f72d9a39c31fc39eae05883
diff --git a/dev-python/autopage/autopage-0.5.1.ebuild b/dev-python/autopage/autopage-0.5.1.ebuild
deleted file mode 100644
index b254cd8460ce..000000000000
--- a/dev-python/autopage/autopage-0.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to provide automatic paging for console output"
-HOMEPAGE="
-	https://github.com/zaneb/autopage/
-	https://pypi.org/project/autopage/
-"
-SRC_URI="
-	https://github.com/zaneb/autopage/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's/test_short_streaming_output/_&/' \
-		-e 's/test_interrupt_early/_&/' \
-		-i autopage/tests/test_end_to_end.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	unset LESS PAGER
-	eunittest
-}
diff --git a/dev-python/autopage/autopage-0.5.2.ebuild b/dev-python/autopage/autopage-0.5.2.ebuild
index a62126699622..b254cd8460ce 100644
--- a/dev-python/autopage/autopage-0.5.2.ebuild
+++ b/dev-python/autopage/autopage-0.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/aws-xray-sdk/Manifest b/dev-python/aws-xray-sdk/Manifest
index d2ee6c099032..8af6bc8c09c5 100644
--- a/dev-python/aws-xray-sdk/Manifest
+++ b/dev-python/aws-xray-sdk/Manifest
@@ -1,2 +1 @@
-DIST aws-xray-sdk-python-2.12.0.gh.tar.gz 275773 BLAKE2B a78ac201524e70a342100c2e76e93bb02ed76e183dfca2e8737230061182d94c9a7f4eba183bc731d2ed79a8e4dda486ea09cb304f4cd58da56d712b8e6c5749 SHA512 0616369f95bf0de710ab5fb868d1a84280bcc1180cc205e6a6e0c405eae131fb861de75fea00c9c1be4e163b9d292cc27e08f624c7b6981ba4a3b8d99dbbb63c
 DIST aws-xray-sdk-python-2.12.1.gh.tar.gz 275525 BLAKE2B 7aae0cc3d6b733ee80b553d087bd85d02329c7da3a8902cb428823af4a53d47a14089a274cfccdfb197a77370dcb71775e1d111bb76205a1f09f9b60a5c92967 SHA512 3c830cf81f353a2805b641bda3d38d72a1286d413e0cd087bfeac78bfe00e7853c19ddab96f18275e7fd95317c2a6650d5e4b287d63c1d3900b25414a525c3dc
diff --git a/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.0.ebuild b/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.0.ebuild
deleted file mode 100644
index 1e20f9cae3b8..000000000000
--- a/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-MY_P=aws-xray-sdk-python-${PV}
-DESCRIPTION="AWS X-Ray SDK for Python"
-HOMEPAGE="
-	https://github.com/aws/aws-xray-sdk-python/
-	https://pypi.org/project/aws-xray-sdk/
-"
-SRC_URI="
-	https://github.com/aws/aws-xray-sdk-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings
-	local -x AWS_SECRET_ACCESS_KEY=fake_key
-	local -x AWS_ACCESS_KEY_ID=fake_id
-
-	local EPYTEST_DESELECT=(
-		# Internet access
-		tests/test_patcher.py::test_external_file
-		tests/test_patcher.py::test_external_module
-		tests/test_patcher.py::test_external_submodules_full
-		tests/test_patcher.py::test_external_submodules_ignores_file
-		tests/test_patcher.py::test_external_submodules_ignores_module
-		# benchmark
-		tests/test_local_sampling_benchmark.py
-		# Fails, probably because above is ignored
-		tests/test_async_local_storage.py::test_localstorage_isolation
-		tests/test_async_recorder.py::test_capture
-		tests/test_async_recorder.py::test_concurrent_calls
-		tests/test_async_recorder.py::test_async_context_managers
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged deps
-		tests/ext/aiobotocore
-		tests/ext/pg8000
-		tests/ext/psycopg2
-		tests/ext/pymysql
-		tests/ext/pynamodb
-		tests/ext/sqlalchemy_core/test_postgres.py
-		tests/ext/django/test_db.py
-		# Internet access
-		tests/ext/httplib
-		tests/ext/httpx
-		tests/ext/requests
-		# requires old package vesions
-		tests/ext/aiohttp
-		tests/ext/django
-		tests/ext/flask_sqlalchemy
-		tests/ext/sqlalchemy
-	)
-
-	epytest -p no:django
-}
diff --git a/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.1.ebuild b/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.1.ebuild
index 4bf2c9aa8cc5..1e20f9cae3b8 100644
--- a/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.1.ebuild
+++ b/dev-python/aws-xray-sdk/aws-xray-sdk-2.12.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 408fe095cad5..a3c7b54ec5b2 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,3 +1,4 @@
 DIST boto3-1.28.78.gh.tar.gz 724185 BLAKE2B 5089a7d1eab11c23bd65699c41c3c6687f0666f10ebcc7fc4813f96225ceee5a10a008ae6969cd7927f43f09e0988178ea40386bcd91c473ac5fba1dedeeeef1 SHA512 e74f7348d369580e8d26f7c1f084276ec339d4bdd3ee628bdbe56cc6e4b1c0b22a759bb4ffe1075f0cb0d6f1692864db85a73d3cb884358dc97d6428f3fd9b0a
 DIST boto3-1.28.84.gh.tar.gz 728124 BLAKE2B 2fcc553a4a109b0bc92cdf0b08fe77fcef54792ee606b6b9ed7cde1ae92accabb9f9ce005d9ccd391601efac31eec407345471542c5b7298689ab1037ed8f41f SHA512 1b7f1fe951a9f3655a71bd51e9328f4474f9b320df82914b9ad0d64a32043aacf16fc5df1989304fd4d35430ddf6f58d0676fdb3985944d955c169a0ec58ce7b
 DIST boto3-1.28.85.gh.tar.gz 728751 BLAKE2B bfbc9b26b45e034949f13492987fdd43476d428d84da8b15e1ac67647acb410823bcc5e8710126a062a40779357ea49b5b4e1038831d38239515a793c6601dd4 SHA512 96165e6e5bd5673a364be445ab21916115e4f58c9e499f58bf0098d37fb7ba6ef28d5a6046f452e26618a305eb9713f5b5e5f10fd0c22868c499a9870fea4bef
+DIST boto3-1.29.0.gh.tar.gz 730038 BLAKE2B 3f6f853eaa18d66ffef1e159fb641e6e3d069b1cb8ca9df457a714b1682a210ccf52aca4900172812b195309a4cd1a179c4ff2dff2f0a3c519e73c1eb9380908 SHA512 d826bda41fcab62b9e868ad96e405d538f1af1b7bc31c96349330fce493c8efef282c1da1c47a45a4a0e0e3051c0ddb0847af1efc9e7e9a87419f3995db2a5ca
diff --git a/dev-python/boto3/boto3-1.29.0.ebuild b/dev-python/boto3/boto3-1.29.0.ebuild
new file mode 100644
index 000000000000..09d8c6679458
--- /dev/null
+++ b/dev-python/boto3/boto3-1.29.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7d897f82c240..db464279158c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,4 @@
 DIST botocore-1.31.78.gh.tar.gz 12035206 BLAKE2B 0dd1109d34a8cf99af76f1f615095776e75c0042717a573da3714d1e20efce5cf67bf38d5421c3c5558112821adb4307f7ca0791efc8e62c9ea2e9ba8c2ddc7a SHA512 68c0f68b699ff0c0276cc70f4d4843259a953511c9c2813a3101d7dc43c36a0a3bda68df66a7ab2c206977a96ce0d933830b4004898f03febf478c710beb5261
 DIST botocore-1.31.84.gh.tar.gz 12065719 BLAKE2B 2098241de47aa1f59c45287c2be66fa3562c2e549da081b1cd86626f1df5f3f175eebea1197396f39045aaebda241d37b1d47ebb378a0fb17e43c16215f89680 SHA512 097a25b4450513cf9c2722d7582cdfb969da8c083c05603f6a28eb65d1d69920106c745cb4f5e5b3bee1989eee64c89fe69c379f01df938edf2a92946c614cdf
 DIST botocore-1.31.85.gh.tar.gz 12070341 BLAKE2B b4867e351d209511db263654873f5a804f941c44d10af563eec656b041830c8543f2ec1f8d831a0aec2cce4d9b7dfc80bd3e73fd5fc456cf5e3ca00ab193b11d SHA512 0e26b6ad06e1075ec90f04d653873592fcc2ae4bdbec5bbbe4b38e368824bf000724551ac2598938b827ce81e3b327ffa9d5d23da0ccb915686a70e0f37ba161
+DIST botocore-1.32.0.gh.tar.gz 12086167 BLAKE2B 54e580c4d034b437d1e2e7748f1dd4785354db87459116565bc15d60bd73fe5d46cade212fd44fabd243614f3be55d9eeaef575ea6d6312ad83c0b6c1e741515 SHA512 9aba3cc3f823ba47ee7964517189d1227e5934c63ecdf1631ade59524594fb7cc20b9cfc7060dd8a69648d48e2d1ede0a377f204124d06ef843dd98a4cd1b11f
diff --git a/dev-python/botocore/botocore-1.32.0.ebuild b/dev-python/botocore/botocore-1.32.0.ebuild
new file mode 100644
index 000000000000..9a0240c45f2a
--- /dev/null
+++ b/dev-python/botocore/botocore-1.32.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/contourpy/contourpy-1.2.0.ebuild b/dev-python/contourpy/contourpy-1.2.0.ebuild
index f750e6dfa37d..aed2a8c80fd9 100644
--- a/dev-python/contourpy/contourpy-1.2.0.ebuild
+++ b/dev-python/contourpy/contourpy-1.2.0.ebuild
@@ -42,6 +42,11 @@ DISTUTILS_ARGS=(
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/contourpy/contourpy/pull/327
+	"${FILESDIR}/${P}-unicore.patch"
+)
+
 python_test() {
 	local EPYTEST_IGNORE=(
 		# linters
diff --git a/dev-python/contourpy/files/contourpy-1.2.0-unicore.patch b/dev-python/contourpy/files/contourpy-1.2.0-unicore.patch
new file mode 100644
index 000000000000..c25a1807dcd4
--- /dev/null
+++ b/dev-python/contourpy/files/contourpy-1.2.0-unicore.patch
@@ -0,0 +1,83 @@
+From f948f821c705329a98bbcdcba5b642fe6c6f0b74 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Wed, 15 Nov 2023 02:18:49 -0500
+Subject: [PATCH] Support running tests on unicore hosts
+
+All tests pass except those explicitly asserting that they are on a
+multicore system.  Adds a conditional skip to those which are only
+useful on multicore hosts.
+---
+ tests/test_filled.py | 7 +++++--
+ tests/test_lines.py  | 7 +++++--
+ tests/test_misc.py   | 8 +-------
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/tests/test_filled.py b/tests/test_filled.py
+index b239f3b..c41e0d1 100644
+--- a/tests/test_filled.py
++++ b/tests/test_filled.py
+@@ -8,7 +8,7 @@
+ from numpy.testing import assert_allclose, assert_array_equal
+ import pytest
+ 
+-from contourpy import FillType, contour_generator
++from contourpy import FillType, contour_generator, max_threads
+ from contourpy.util.data import random, simple
+ 
+ from . import util_test
+@@ -734,7 +734,10 @@ def assert_chunk_offsets(offsets_or_none: list[cpy.OffsetArray | None]) -> None:
+ @pytest.mark.threads
+ @pytest.mark.parametrize("fill_type", FillType.__members__.values())
+ @pytest.mark.parametrize("name, thread_count",
+-                         [("serial", 1), ("threaded", 1), ("threaded", 2)])
++                         [("serial", 1), ("threaded", 1),
++                         pytest.param("threaded", 2,
++                            marks = pytest.mark.skipif(
++                            max_threads() <= 1, reason = "executing on unicore host"))])
+ def test_return_by_fill_type_chunk(
+     xyz_chunk_test: tuple[cpy.CoordinateArray, ...],
+     name: str,
+diff --git a/tests/test_lines.py b/tests/test_lines.py
+index 9608591..0b0833b 100644
+--- a/tests/test_lines.py
++++ b/tests/test_lines.py
+@@ -6,7 +6,7 @@
+ from numpy.testing import assert_allclose, assert_array_equal
+ import pytest
+ 
+-from contourpy import LineType, contour_generator
++from contourpy import LineType, contour_generator, max_threads
+ from contourpy.util.data import random, simple
+ 
+ from . import util_test
+@@ -707,7 +707,10 @@ def test_return_by_line_type(
+ @pytest.mark.threads
+ @pytest.mark.parametrize("line_type", LineType.__members__.values())
+ @pytest.mark.parametrize("name, thread_count",
+-                         [("serial", 1), ("threaded", 1), ("threaded", 2)])
++                         [("serial", 1), ("threaded", 1),
++                         pytest.param("threaded", 2,
++                            marks = pytest.mark.skipif(
++                            max_threads() <= 1, reason = "executing on unicore host"))])
+ def test_return_by_line_type_chunk(
+     xyz_chunk_test: tuple[cpy.CoordinateArray, ...],
+     name: str,
+diff --git a/tests/test_misc.py b/tests/test_misc.py
+index 5e46e3f..acd558a 100644
+--- a/tests/test_misc.py
++++ b/tests/test_misc.py
+@@ -2,13 +2,7 @@
+ 
+ import numpy as np
+ 
+-from contourpy import _remove_z_mask, contour_generator, max_threads
+-
+-
+-def test_max_threads() -> None:
+-    n = max_threads()
+-    # Assume testing on machine with 2 or more cores.
+-    assert n > 1
++from contourpy import _remove_z_mask, contour_generator
+ 
+ 
+ def test_nan() -> None:
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 7305681e2953..327c6757a006 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,2 +1 @@
-DIST cssutils-2.7.1.tar.gz 724365 BLAKE2B 352525fbc782280dd026ffcd88152cd77ba2bbe0aa57b4dd41ff40f27b5256cc1ccecf038970da0b07d08b0780b5d161b18aecc4343972a335d1bafd97ee1f51 SHA512 719b1b0866dd51e9b464659d861caa5eadfb1821b902824064fbf7843b6a2f5cfceb33f1deb2b7aa5dfc3306c94e8e86441aa014ec0c5bf133d5b1c13463b2db
 DIST cssutils-2.9.0.tar.gz 723452 BLAKE2B fc3593dec7a61b1a23b346b5a77160248760a934f01e6135a6478eb1164333a910c6c3fb403e3e06c8c7c90214a7c30ddc481dc9623c26091d62c8d092d8cea3 SHA512 d13d53b3e4f133afb5b72faba1e41a95cf2b146efb075dd3b328fc424eccd371194e1e14fd9e607b207b5c7d473e64f1e4c63975173d8491fa8036a16dc94d38
diff --git a/dev-python/cssutils/cssutils-2.7.1.ebuild b/dev-python/cssutils/cssutils-2.7.1.ebuild
deleted file mode 100644
index 36dcb41a52fe..000000000000
--- a/dev-python/cssutils/cssutils-2.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="
-	https://pypi.org/project/cssutils/
-	https://github.com/jaraco/cssutils/
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		encutils/__init__.py::encutils
-		cssutils/tests/test_parse.py::TestCSSParser::test_parseUrl
-		examples/website.py::examples.website.logging
-	)
-	local EPYTEST_IGNORE=(
-		# path mismatch with "parse" package
-		examples/parse.py
-	)
-
-	epytest
-}
diff --git a/dev-python/cssutils/cssutils-2.9.0.ebuild b/dev-python/cssutils/cssutils-2.9.0.ebuild
index 395f606ba643..36dcb41a52fe 100644
--- a/dev-python/cssutils/cssutils-2.9.0.ebuild
+++ b/dev-python/cssutils/cssutils-2.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index b63090193f7c..0fb0383078c0 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,4 +1,2 @@
-DIST dask-2023.10.0.gh.tar.gz 8552850 BLAKE2B 407293d4f9eb385fc244d851c71fadfe3225af7953d59f5c9a2b7f3be6ee690557c6dad828fb64f444daa14c7a7db76b3a251169c01fa0b244784c1f5177bfdc SHA512 b4006414bd8e62c443729c49c1160fe002b93703b8f2f39708e6256d0013df02a72250edd5e038abd3760a704cce5349fb8cbcd76528c6b3f24b22161be20430
 DIST dask-2023.10.1.gh.tar.gz 8557525 BLAKE2B 7516285ec942ff8daf2cb964bbb25716f60a71715ce64d40d069d25a0522a761d83d3577baf2779a9228213ea30a799c58579f5f107e82b72b863d21df84274f SHA512 bf8e23d2d1d1057941b1c50a286d51d1dc83937973c57e7af6e6e66efbf29a3c87422d6ab3b2443e264a7a40c88bdad974e71534330d7939087fbb8afed1fa45
 DIST dask-2023.11.0.gh.tar.gz 8559592 BLAKE2B 3d9e2d049c4ef3a880caef56298dfe76033a79d60424554f9122e68354bd2be2c6c0aae3b833c84d5704c45167b050c65227a0b799a5131600a1417a09bd4d1f SHA512 1ebac9c9fb158682dc5063710fd11ccbe0f584cea26afad4b3fe01001f3f7d6888ddbb7653cfdaf2da4ca7acb2b88bc7b1d8b4055790e7036b419ae995346e8f
-DIST dask-2023.9.3.gh.tar.gz 8544054 BLAKE2B 4b1fc7d3b6f91fd6db0836a0fede0304e9c5e04e2aacd573eb06cf96ddf67ecbb198a185076ff94ca34216732673113e7e268482992b781777b3757d43a11773 SHA512 d91840f8a339ff0a21734726b1674c4dbc1332270fb160e01fd342b1ce1ba2fd5cea34c501c7a61e6b34e121da937701932a93ab85dc85618f5b5fc52cd960cd
diff --git a/dev-python/dask/dask-2023.10.0.ebuild b/dev-python/dask/dask-2023.10.0.ebuild
deleted file mode 100644
index 05f508c95b4a..000000000000
--- a/dev-python/dask/dask-2023.10.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-2021.9.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	>=dev-python/versioneer-0.28[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fails with sqlalchemy-2.0, even though we don't use it x_x
-	sed -i -e '/RemovedIn20Warning/d' pyproject.toml || die
-	sed -i -e 's:--cov-config=pyproject.toml::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# more tests relying on -Werror
-		"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-		dask/array/tests/test_random.py::test_RandomState_only_funcs
-		# TODO
-		dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-		dask/tests/test_config.py::test__get_paths
-		dask/array/tests/test_linalg.py::test_solve_assume_a
-		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-		dask/array/tests/test_image.py::test_preprocess
-		dask/tests/test_system.py::test_cpu_count_cgroups_v2
-		# require sqlalchemy<2.0
-		dask/dataframe/io/tests/test_sql.py
-	)
-
-	if ! has_version -b "dev-python/pyarrow[parquet,${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			# fails if pyarrow is installed without USE=parquet
-			# (optional dep, skipped if it's not installed at all)
-			dask/dataframe/io/tests/test_parquet.py::test_pyarrow_filter_divisions
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_rerunfailures -m "not network" \
-		-p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/dask/dask-2023.10.1.ebuild b/dev-python/dask/dask-2023.10.1.ebuild
index 50a5ccc8c370..6a63e438d288 100644
--- a/dev-python/dask/dask-2023.10.1.ebuild
+++ b/dev-python/dask/dask-2023.10.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/click-8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-2023.9.3.ebuild b/dev-python/dask/dask-2023.9.3.ebuild
deleted file mode 100644
index a003de1fcd12..000000000000
--- a/dev-python/dask/dask-2023.9.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-2021.9.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	>=dev-python/versioneer-0.28[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fails with sqlalchemy-2.0, even though we don't use it x_x
-	sed -i -e '/RemovedIn20Warning/d' pyproject.toml || die
-	sed -i -e 's:--cov-config=pyproject.toml::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# more tests relying on -Werror
-		"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-		dask/array/tests/test_random.py::test_RandomState_only_funcs
-		# TODO
-		dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-		dask/tests/test_config.py::test__get_paths
-		dask/array/tests/test_linalg.py::test_solve_assume_a
-		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-		dask/array/tests/test_image.py::test_preprocess
-		dask/tests/test_system.py::test_cpu_count_cgroups_v2
-		# require sqlalchemy<2.0
-		dask/dataframe/io/tests/test_sql.py
-	)
-
-	if ! has_version -b "dev-python/pyarrow[parquet,${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			# fails if pyarrow is installed without USE=parquet
-			# (optional dep, skipped if it's not installed at all)
-			dask/dataframe/io/tests/test_parquet.py::test_pyarrow_filter_divisions
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_rerunfailures -m "not network" \
-		-p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 4bf7308e00ef..9c9755081444 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1 +1,2 @@
 DIST fastjsonschema-2.18.1.tar.gz 371060 BLAKE2B fc77683215e9080d3a6f162336a7ed55550a310c9921f0e669d90bfaea659dd77ad27ed0c623b0355d5efafa3ca2e83f72edf228c42cca0fc4fa16f4f474aa6b SHA512 a08fce64a67c67a06a7c3c637047648e1b2cfa749291794b8accc6dcc1ccf744eb50c8db773734017b79612b2dc4e19730a5956807b2459928fb0b996b59711e
+DIST fastjsonschema-2.19.0.tar.gz 371202 BLAKE2B 56103ae94d52a337ceb830b7dfe68b3e1c3d5bdfbe46c8c042b5bc1a6d4e36201176a274135779cbf50a9ce939d95f5bd3c5bd88b7a6483db4cc438bff1d986a SHA512 d26c7f44acfeb4210fad188e3fe5486231a516fb0a4fa7d756dd9d1378b22afd7b4acb6b34085cabcfe31dac44a605de6f90a158a3af69de97f8926d59b3a105
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.19.0.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.19.0.ebuild
new file mode 100644
index 000000000000..9afd192a1578
--- /dev/null
+++ b/dev-python/fastjsonschema/fastjsonschema-2.19.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fast JSON schema validator for Python"
+HOMEPAGE="
+	https://github.com/horejsek/python-fastjsonschema/
+	https://pypi.org/project/fastjsonschema/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests/benchmarks
+)
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index f2f91267836c..ae57a094a696 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,2 +1 @@
-DIST googleapis-common-protos-1.60.0.tar.gz 119801 BLAKE2B 68d5940f7d5d9c9f45b715b3cb4e716fda06a727c9da0569802a6ac509c3227ae2f13104abfa6763317a89ec2e5875051deb7eec28ba71dbbb13c0239e5decd8 SHA512 ad20a4cb74308f22835cbc5c9dfd82153dd8265424ee7dc604b610bc6db6f46f154e4f5d8c74c01d4c503d3e2c9095a090d9548a5ec13b4b3044274f6b9b5a4b
 DIST googleapis-common-protos-1.61.0.tar.gz 121129 BLAKE2B f7fa2bc1061bd7cba5db4327925ac221fff859a1077b177dd9606cb1d85ef42796a3c2fd6b9834d195a1d3d0638f07a735f64a9e4abd4b95b602f8f53a36d77d SHA512 2aac51d0ea414532f1b5991ad8d484a48d44682e1354deec4d1bb5a96d401a9f9983e613beea91d49c058d95a2d289be932229765c66c1fee18df5d8e9e873f2
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.60.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.60.0.ebuild
deleted file mode 100644
index 1f22674dca4a..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.60.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-common-protos/
-	https://pypi.org/project/googleapis-common-protos/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.61.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.61.0.ebuild
index c7295030e119..1f22674dca4a 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.61.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.61.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema-path/Manifest b/dev-python/jsonschema-path/Manifest
index 025b4393a848..71c8d67f0913 100644
--- a/dev-python/jsonschema-path/Manifest
+++ b/dev-python/jsonschema-path/Manifest
@@ -1 +1,2 @@
 DIST jsonschema-path-0.3.1.gh.tar.gz 39698 BLAKE2B b56f3c6c591066781c01ab32674c8fdd6193352208fbe9a3b06cae6e345711532a4abfb3f4433481eeb02a4dc7e884cc280c1b6d247ee1e647d503cea434b4f6 SHA512 00aa61aacb92d3aa11be6b3f5f69f6cb70743559849c425549a6fcc0c8c6eeff9feaef5a07da70308cc03311ca48dda7e35d429fa2a5a1aba9099fe678594038
+DIST jsonschema-path-0.3.2.gh.tar.gz 39521 BLAKE2B 871bb33c7839a3b9bf66e145c239cd6715cfaa2ae782f28b77de83228136af5259e1757856e47f0ac26f46572911553510a153f4f48e3b1d2a813160eb65c143 SHA512 e49b32c4609238d2808938976bd0022f86837e9d7d296a137d42f8e8c80d20d20fdd23a07b898063536290b36bd72df0abef64b65997a66cb3fb9c403cc275d3
diff --git a/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild b/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
index a491f9855db0..8199cedfc440 100644
--- a/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
+++ b/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema-path/jsonschema-path-0.3.2.ebuild b/dev-python/jsonschema-path/jsonschema-path-0.3.2.ebuild
new file mode 100644
index 000000000000..a491f9855db0
--- /dev/null
+++ b/dev-python/jsonschema-path/jsonschema-path-0.3.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="JSONSchema Spec with object-oriented paths"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema-path/
+	https://github.com/p1c2u/jsonschema-path/
+"
+SRC_URI="
+	https://github.com/p1c2u/jsonschema-path/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/referencing-0.28.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	# remove random pins due to caret operator
+	sed -i -e 's:\^:>=:' -e 's:,<[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jsonschema-specifications/Manifest b/dev-python/jsonschema-specifications/Manifest
index f7a48d46446d..485ce148967c 100644
--- a/dev-python/jsonschema-specifications/Manifest
+++ b/dev-python/jsonschema-specifications/Manifest
@@ -1 +1,2 @@
+DIST jsonschema_specifications-2023.11.1.tar.gz 12935 BLAKE2B 317c6c937f0939ec59e25f2d84a6eea30ae4d8f14c4787e282dc9d6d4b74d84ab4985fde8f78f0cffa0fc61efe44493afe9d79182f4c02b0d6caff18f15dfd08 SHA512 a917226f5341c2a8913fa87a9640e1a5fdb34c857a8be1a0618db15cd09de0d45e82b294f759177de5fbe002f1ad9a04196c1c0976cc99ec685764b30e648b8d
 DIST jsonschema_specifications-2023.7.1.tar.gz 12689 BLAKE2B 421b0e94161c84c658a9af1ddef74fb98ca18332a2977e1ca983b04995bc0a65b3399edd4a2a52c741a4ffdbeeb4a0796371448f283ba328c72c1899f3f0b55a SHA512 78275fe6595151c611baeeebc17f08287f50a3636c3de515abfe8dc45075136874740dfa169aa3ebda004b5ead66ba93bc22b963ded14e4aa906e4b454356f7c
diff --git a/dev-python/jsonschema-specifications/jsonschema-specifications-2023.11.1.ebuild b/dev-python/jsonschema-specifications/jsonschema-specifications-2023.11.1.ebuild
new file mode 100644
index 000000000000..14c49862482e
--- /dev/null
+++ b/dev-python/jsonschema-specifications/jsonschema-specifications-2023.11.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="The JSON Schema meta-schemas and vocabularies, exposed as a Registry"
+HOMEPAGE="
+	https://github.com/python-jsonschema/jsonschema-specifications/
+	https://pypi.org/project/jsonschema-specifications/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/referencing-0.31.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter-events/Manifest b/dev-python/jupyter-events/Manifest
index 0ee3296c4755..28a0010b3cfb 100644
--- a/dev-python/jupyter-events/Manifest
+++ b/dev-python/jupyter-events/Manifest
@@ -1,3 +1,2 @@
-DIST jupyter_events-0.7.0.tar.gz 59717 BLAKE2B 80ff725f4a39495ef7bf447d3bf1dcd3d7c28875c16f082788d948efec8498f01d74bb59b771537e22be7c57c0e75dd9bba70e7802262d676b531318a18d93cb SHA512 ce5ddabc4f540bfa6808319b783ad8ffcb908bc26e7435293bda4ed88221126284dfda1aafc165c8a13bdd6056ec0477915b008f4788bc19730718d4a9e3f162
 DIST jupyter_events-0.8.0.tar.gz 60373 BLAKE2B dc58ae9a561f7ffd81758b116d5cb93e6ee5d4bdc5ee3d067103aefbe66e01e1809e7194617f541abec84efdd81b4311024b2b50f863bad62127218eafdfbd31 SHA512 9b43e1f0f5e390455fac52971f41695a7c0d853ac4a84493e31efdd61a183e4a41c7824f963b89ee369cac8945d6258857b864315bbafe8be15145eee7075afd
 DIST jupyter_events-0.9.0.tar.gz 60502 BLAKE2B faf2c7b1b1403c809e98673dc2600750d5c18ff2578b7f1f6f569fa5ac5e955384eda69f0d281a8aa504a1bbeba639931b0fc01bd117b1621fdeb64d4c6881bb SHA512 7b70edd79b80a3d73f0fedd21f0dba8060cb190b0dc8a6d7d9d11fdfd5b219c7a2f54438f0888c062e00b7def37fa0d7cfb0213bfa8d93737a83802079e4b103
diff --git a/dev-python/jupyter-events/jupyter-events-0.7.0.ebuild b/dev-python/jupyter-events/jupyter-events-0.7.0.ebuild
deleted file mode 100644
index a62d7239aaf2..000000000000
--- a/dev-python/jupyter-events/jupyter-events-0.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter Event System library"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_events/
-	https://pypi.org/project/jupyter-events/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# jsonschema[format-nongpl] deps are always on in our ebuild
-RDEPEND="
-	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-json-logger-2.0.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
-	dev-python/referencing[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-
-# TODO: package jupyterlite-sphinx
-# distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter-events/jupyter-events-0.8.0.ebuild b/dev-python/jupyter-events/jupyter-events-0.8.0.ebuild
index 55124f3c9a41..a62d7239aaf2 100644
--- a/dev-python/jupyter-events/jupyter-events-0.8.0.ebuild
+++ b/dev-python/jupyter-events/jupyter-events-0.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 # jsonschema[format-nongpl] deps are always on in our ebuild
 RDEPEND="
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index b89a5f18a0ba..fdac50d12ceb 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,5 +1,2 @@
-DIST jupyter_server-2.10.0.tar.gz 709151 BLAKE2B 6b5c41d00efbe06e47f1ee9146cfd5670774be84982fc24ed7c27bc420c9a9667ff193d272670fdd7d0a0b2dc1414fa271c0b08e2eeddd3dc08dc901e93594aa SHA512 8238dca7314303ffcf8424f9c997d68c06fc4cf05128146ffe0d3ce495b4c2a8cf260858da8ec0ceb138f0b6789f57fc740b0c5a0bdb977c1311460def0fbf8a
-DIST jupyter_server-2.7.3.tar.gz 705798 BLAKE2B d5655968f17b2a5536539858769124650f41985d5d99b782e70d99140a7e61820b913b525fc10041a56b6946ec4feb7e05015a10970786d024628e8c840fae94 SHA512 ad9be38208ef4196417561355a62889e34d657f3114b710f13f974f4b453b465b7d473ced46eba873ee980d631d2648e0d4b29267011ed444247a33325f959e9
-DIST jupyter_server-2.8.0.tar.gz 708394 BLAKE2B 2beaba510b0e841203c58316db8507c8c503fdeacfbe7de1287d1ecf0740334c02b430ad7111043e21da45669cc1bd13bb313b5cd45f999490fa07c9057b1bea SHA512 e2ec60994737a9979545aaba3de1f846eb68c809cb952bfba6ce22c061f1e644a712f4b7b069ebfc393e8dd7a7bf723b2c3530a7a1b103eb1dbf42a60a59e6e6
-DIST jupyter_server-2.9.0.tar.gz 709038 BLAKE2B 68569f323087c55427d2d0b5fe7df55082809a76b25102cf08f62393c1c943bf5527ed461e392f45751f6c4182fd6423056d3719aed6681cd85ca2f4e7fca0b7 SHA512 5d695f72cc02c73345a811739e2a7006313d37b5c05894b5da7792b0174537bfe962456d996605abc4f8ec2a4e1337b1d5817b667b4b5708c599e1a96452d597
+DIST jupyter_server-2.10.1.tar.gz 709933 BLAKE2B dd05748eb9e4a1af7adeb8a023c9e1336483f48d32e100f0e8dc8d80bf94afe1fb57343f168828a5856cfa0ccd0f4ffeaa6c0da50e6c98d5ed1f254a87878803 SHA512 15a65df22aa7908d3dd6d694306250e71ddc31b1e66969986ed59d9ed517c28ed474c530916b1de7eab25677f9cec29318798b0b7368c4b37ca92a1adbdfbc8d
 DIST jupyter_server-2.9.1.tar.gz 709013 BLAKE2B dee0de771bb8488cccaecb49e2b4a2003f2530243013cafa7f170384380423a7c190504baabf458c59ffece28c4f60662c0530f55535dae25699be269f159743 SHA512 148c3eaa4b6ca1147961c1188e0016a634e5adae350e762903bdde000acde7ab62507e71dbe1278c2b9358ce2cf1c28c17ea8b184f3d4a2d59277910b5b44965
diff --git a/dev-python/jupyter-server/jupyter-server-2.10.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.10.0.ebuild
deleted file mode 100644
index 212d96acc3cb..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.10.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	dev-python/overrides[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# This fails if your terminal is zsh (and maybe other non-bash as well?)
-		tests/test_terminal.py
-		# Fails because above is ignored
-		tests/auth/test_authorizer.py
-		# Fails with additional extensions installed
-		tests/extension/test_app.py::test_stop_extension
-	)
-
-	# FIXME: tests seem to be affected by previously installed version
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.10.0-r1.ebuild b/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild
index 79fd9b3724b5..3c55cc73bb0b 100644
--- a/dev-python/jupyter-server/jupyter-server-2.10.0-r1.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-events-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
 	dev-python/overrides[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.7.3.ebuild b/dev-python/jupyter-server/jupyter-server-2.7.3.ebuild
deleted file mode 100644
index 39f8121de4d7..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.7.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	dev-python/overrides[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py
-	# Fails because above is ignored
-	tests/auth/test_authorizer.py
-	# Fails with additional extensions installed
-	tests/extension/test_app.py::test_stop_extension
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1-skip-npm.patch"
-)
-
-python_test() {
-	# FIXME: tests seem to be affected by previously installed version
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.8.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.8.0.ebuild
deleted file mode 100644
index 2e97204a4ead..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.8.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	dev-python/overrides[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py
-	# Fails because above is ignored
-	tests/auth/test_authorizer.py
-	# Fails with additional extensions installed
-	tests/extension/test_app.py::test_stop_extension
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1-skip-npm.patch"
-)
-
-python_test() {
-	# FIXME: tests seem to be affected by previously installed version
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.9.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.9.0.ebuild
deleted file mode 100644
index 2e97204a4ead..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.9.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	dev-python/overrides[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py
-	# Fails because above is ignored
-	tests/auth/test_authorizer.py
-	# Fails with additional extensions installed
-	tests/extension/test_app.py::test_stop_extension
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1-skip-npm.patch"
-)
-
-python_test() {
-	# FIXME: tests seem to be affected by previously installed version
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.9.1.ebuild b/dev-python/jupyter-server/jupyter-server-2.9.1.ebuild
index 2e97204a4ead..39f8121de4d7 100644
--- a/dev-python/jupyter-server/jupyter-server-2.9.1.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.9.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 736a1167c898..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- 
- <origin>gentoo-guru-overlay</origin>
+ <maintainer type="person">
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 159ecc78fb8c..b656c00f49d4 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,3 +1 @@
-DIST notebook-7.0.4.tar.gz 3928907 BLAKE2B edd498636d35f348f520915d43686243a3ff4b2f8ad4984bc05766403a3bffcd699e1ba691b672ad3ab8f08983920f62a1c5b0308a94e4a7366eb30e049f5d43 SHA512 e174fcbb93fcaf67c086b2160d7875457681222e21c23efbf35d4c7503e528df3b368b4d122eebf199a86ea155cf3e6b7b15036587bb9b4260a8d22e7e4a9f0b
-DIST notebook-7.0.5.tar.gz 3929774 BLAKE2B 8e52bb73c29fb73b57a733f41c71392d08547df95f16bd1571e321c888a6399127b398214b333ec4fa713ce751b918c974486b5d2ba7d4d045ff43722e68b552 SHA512 3abc4fe2c017b1dc05f549a0397487cdfe66f40cd29e26b540942424b721ce985cf6e4196faa16f857ead5a1820dfcf4a2a92db3bb79553e8f288ceae042de79
 DIST notebook-7.0.6.tar.gz 3930144 BLAKE2B 488689b34b61c37f2233d57d6ef75b3bf843e2340846e88593a6b49d88fc52f908126d2e718808451df1f8cc6f9a5624adef47c1ae4984cd2ff5ed535d47cb37 SHA512 9f9ac4fae93af425a442c25c8a601578a76c802cc50018a6ff6ef99fbabfe3fb649094625dbdda2b7c526cb7262d2c463745b006d35cc1834d40712f3820895b
diff --git a/dev-python/notebook/notebook-7.0.4.ebuild b/dev-python/notebook/notebook-7.0.4.ebuild
deleted file mode 100644
index a8ce8a7e2389..000000000000
--- a/dev-python/notebook/notebook-7.0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/notebook/
-	https://pypi.org/project/notebook/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.0.2[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-5[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbval[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-7.0.5.ebuild b/dev-python/notebook/notebook-7.0.5.ebuild
deleted file mode 100644
index 5c2b088ac83e..000000000000
--- a/dev-python/notebook/notebook-7.0.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/notebook/
-	https://pypi.org/project/notebook/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.0.2[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-5[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbval[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-7.0.6.ebuild b/dev-python/notebook/notebook-7.0.6.ebuild
index 5c2b088ac83e..a8ce8a7e2389 100644
--- a/dev-python/notebook/notebook-7.0.6.ebuild
+++ b/dev-python/notebook/notebook-7.0.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/numpy-1.26.2.ebuild b/dev-python/numpy/numpy-1.26.2.ebuild
index 1cf392da09ce..af54280a95fd 100644
--- a/dev-python/numpy/numpy-1.26.2.ebuild
+++ b/dev-python/numpy/numpy-1.26.2.ebuild
@@ -95,7 +95,7 @@ python_test() {
 
 		# flaky
 		f2py/tests/test_crackfortran.py
-		f2py/tests/test_data.py::TestDataF77::test_crackedlines
+		f2py/tests/test_data.py::TestData{,F77}::test_crackedlines
 	)
 
 	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
index b2b0cba6a8a6..11ac586cdfce 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 34105b1d5a5f..9bb1bb7392eb 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1 +1,2 @@
 DIST oslo.i18n-6.1.0.tar.gz 48031 BLAKE2B da2a03eb382154be31dfc09636395cc5f1c816972e81829181b7745b5f35693069fbe68b6b6223d9188d08a0e1ba277a137290810da9aebf3af49a9b4f2069ea SHA512 6ac6a4c7ea5e43d57c04765f0b0ae90047042ead81c086aa3229d8ffe5402a836e82238f6689d6f6d1a503d8abf147605dc1aab8b8bb4d738e575fb7948fd7e3
+DIST oslo.i18n-6.2.0.tar.gz 48228 BLAKE2B bb65caff703e2bbc82f4fecd4b0d491f64ec7d863f848f8f79497df9471257dec25a77ad7f084c6d88ac14a4b1a1f44fd302297e1e13919e69ebaf27c5491d6f SHA512 725d814c7db35250e8ffe06c0021fc9147bcdaa300791f1d50b0eef2897abe609b415a12b6aa58d50925516fd9e6a1ad54e141f77e11856de3ab765b4e06939b
diff --git a/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch b/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch
new file mode 100644
index 000000000000..6c3c19be0644
--- /dev/null
+++ b/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch
@@ -0,0 +1,34 @@
+From 151fa09cf0248b2dfc8bb9e960e0383583985781 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Nov 2023 09:16:21 +0100
+Subject: [PATCH] Fix leftover `locale.getdefaultlocale` mock
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace the remaining `locale.getdefaultlocale` mock with
+`locale.getlocale`.  77a994a99385d33b1b2e626094cbd09fd0d85873 has
+replaced the `locale.getdefaultlocale()` call and updated all other
+mocks but this one remained, causing test failures on non-en_US locales.
+
+Closes-Bug: 2043539
+Change-Id: I5ab36a0ead05fa7a83fc1c64e440482f2cc8e675
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ oslo_i18n/fixture.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/oslo_i18n/fixture.py b/oslo_i18n/fixture.py
+index 5c5fddc..7a69aff 100644
+--- a/oslo_i18n/fixture.py
++++ b/oslo_i18n/fixture.py
+@@ -160,5 +160,5 @@ class PrefixLazyTranslation(fixtures.Fixture):
+             lambda *x, **y: self.languages))
+         self.useFixture(fixtures.MonkeyPatch('gettext.translation',
+                                              _prefix_translations))
+-        self.useFixture(fixtures.MonkeyPatch('locale.getdefaultlocale',
++        self.useFixture(fixtures.MonkeyPatch('locale.getlocale',
+                                              lambda *x, **y: self.locale))
+-- 
+2.42.1
+
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild
new file mode 100644
index 000000000000..928548198e5f
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.i18n/
+	https://github.com/openstack/oslo.i18n/
+	https://pypi.org/project/oslo.i18n/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+PATCHES=(
+	# https://review.opendev.org/c/openstack/oslo.i18n/+/901002
+	"${FILESDIR}/${P}-test.patch"
+)
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pdm-backend/Manifest b/dev-python/pdm-backend/Manifest
index 68dbd58ffe00..8c6aacc7d967 100644
--- a/dev-python/pdm-backend/Manifest
+++ b/dev-python/pdm-backend/Manifest
@@ -1,4 +1 @@
-DIST pdm-backend-2.1.4.gh.tar.gz 134278 BLAKE2B 38e52761d54cab96727d5015e41de76cd6d7eb6dbd02829ed2ddeeb2e2d64d42a0eb6bb09e055362e1dd181d9e7781ed9f9abcb2f96de342cd5780e1f21a8708 SHA512 4833819f8828f5e2ff204ca18478704d8d66c977c747f9b550dc1ecfee57a8adbfcddaea6dded8d8ea0c0e0c7745e0704e12acae30d183cb27cf4c1fad331791
-DIST pdm-backend-2.1.5.gh.tar.gz 134316 BLAKE2B 9337990b4ed009e506f0eee82e9f8d50fc281dbf917dc964daf75230a4c2b9cc5bf0748afe9aa7b5b6f9036249b87ec338b129136b2fd92619c12000e77a7663 SHA512 867c36a9381f4e6a2c81f2d987ce33953eaf78a43b4fa03df54f78b6c9cfe645a1ae4f3dd1a514e0d14208ad7fc75af954fa46be3c8b4b54c7ac7e16eead5aaf
-DIST pdm-backend-2.1.6.gh.tar.gz 134376 BLAKE2B 338ac4cd18d932d65e1ef123b81761707e8d602e8d0f171e26d849535a42e7f79f1b2828f8bedb775674d7a530329aa2dc3c5fe2f9c7e9042fc5ac36da5a0360 SHA512 c0f6278451efb242f0e9585d8298f8f73a0944cd462bac31d0528edf96f51b53ee7efbc58486daf8fdbcac8430e8bf6bc7869e9e455796a87e58d265789eb0de
 DIST pdm-backend-2.1.7.gh.tar.gz 134479 BLAKE2B e559792b53310d6c159ed0cfae6fd9332bbdebfe0efaa9aae7e149b4800b7231e1561723b6aebb4cd722bc47c5a8c9f13180dfe96607a08a9a5c0fba530c9098 SHA512 d47b814b427799d8b2d106b4721c770fd703143cac5de819d74c47d4808f9130bd5835d5fafe41ab3bb17abfedeb770c8863a9cb9a7c8aba0ef9315f5308e6b3
diff --git a/dev-python/pdm-backend/pdm-backend-2.1.4.ebuild b/dev-python/pdm-backend/pdm-backend-2.1.4.ebuild
deleted file mode 100644
index 63f48143958e..000000000000
--- a/dev-python/pdm-backend/pdm-backend-2.1.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-backend/
-	https://github.com/pdm-project/pdm-backend/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r src/pdm/backend/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.backend\._vendor\.:from :' \
-		-e 's:from pdm\.backend\._vendor ::' \
-		-e 's:import pdm\.backend\._vendor\.:import :' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# this must not be set during src_test()
-	local -x PDM_BUILD_SCM_VERSION=${PV}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-backend/pdm-backend-2.1.5.ebuild b/dev-python/pdm-backend/pdm-backend-2.1.5.ebuild
deleted file mode 100644
index 63f48143958e..000000000000
--- a/dev-python/pdm-backend/pdm-backend-2.1.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-backend/
-	https://github.com/pdm-project/pdm-backend/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r src/pdm/backend/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.backend\._vendor\.:from :' \
-		-e 's:from pdm\.backend\._vendor ::' \
-		-e 's:import pdm\.backend\._vendor\.:import :' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# this must not be set during src_test()
-	local -x PDM_BUILD_SCM_VERSION=${PV}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-backend/pdm-backend-2.1.6.ebuild b/dev-python/pdm-backend/pdm-backend-2.1.6.ebuild
deleted file mode 100644
index 63f48143958e..000000000000
--- a/dev-python/pdm-backend/pdm-backend-2.1.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-backend/
-	https://github.com/pdm-project/pdm-backend/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r src/pdm/backend/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.backend\._vendor\.:from :' \
-		-e 's:from pdm\.backend\._vendor ::' \
-		-e 's:import pdm\.backend\._vendor\.:import :' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# this must not be set during src_test()
-	local -x PDM_BUILD_SCM_VERSION=${PV}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-backend/pdm-backend-2.1.7.ebuild b/dev-python/pdm-backend/pdm-backend-2.1.7.ebuild
index 63f48143958e..e377e546ccb3 100644
--- a/dev-python/pdm-backend/pdm-backend-2.1.7.ebuild
+++ b/dev-python/pdm-backend/pdm-backend-2.1.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
diff --git a/dev-python/peewee/peewee-3.17.0.ebuild b/dev-python/peewee/peewee-3.17.0.ebuild
index f6a5322c6864..73abfb8c4fd9 100644
--- a/dev-python/peewee/peewee-3.17.0.ebuild
+++ b/dev-python/peewee/peewee-3.17.0.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-10.1.0.ebuild b/dev-python/pillow/pillow-10.1.0.ebuild
index 7b79aa374e2c..2bd8ed725d43 100644
--- a/dev-python/pillow/pillow-10.1.0.ebuild
+++ b/dev-python/pillow/pillow-10.1.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k 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/psutil-5.9.6.ebuild b/dev-python/psutil/psutil-5.9.6.ebuild
index 087110f05d76..afcedc88e4ed 100644
--- a/dev-python/psutil/psutil-5.9.6.ebuild
+++ b/dev-python/psutil/psutil-5.9.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ia64 ~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 )"
 
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 8412b144f986..63258f1d19f4 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -2,3 +2,4 @@ DIST pydantic-1.10.13.gh.tar.gz 766572 BLAKE2B 3d4f4453469f960467ddf3512be8e97f0
 DIST pydantic-2.3.0.tar.gz 623866 BLAKE2B 77fe2d9ce385946e13ffeb5827c29bc7473667af6b53b7b3ec2432380dc792f9ce54b1cb5af68f0a548880516c763ac8c29b129d821da074b63a9a50f9ebc5c3 SHA512 19c9c066a69c8406ccf5537e62b4b5112a5cf1c32bb68498bb73b739c4525fe115348c4c4e5ef9c074dc46fd2b51ca09bcb1d4fa792dbdd2387e51aadae9e528
 DIST pydantic-2.4.2.tar.gz 654020 BLAKE2B 2f91b6bf89f87230976a2e777541bb7418382fb3534f5e61e1dc74a18e5e939508a2440d6bee9a09030beb5f2b6a60fd62c3bf30ee0ee2c7d3f71575920a47f3 SHA512 f0e0d90ead4ba754974b38f8e3d24bc017696674ca1ed3300104389d149baa41c495218a118f5e7f98bf20d34b3c17439921eaff0ccd7bf76cac96a16e592b4e
 DIST pydantic-2.5.0.tar.gz 677119 BLAKE2B 5b53df61af19d64909313195a623cf30e3343fb5404853ec61ed56a87d9ba2b554a8c8f758c72f43f325fae75f64a1d3cc9489a67356fad28c2e4f4f4c95f222 SHA512 a31fd740e2272316cecb41477a1246d5555daa2897b13efbd79c002e46891283bb50a1fc653182e05039d5fbeb34f4a9b5d44c5c27c1ec60da3af30c333855bc
+DIST pydantic-2.5.1.tar.gz 651461 BLAKE2B 4c52abec0f1fc52fdaa0bd820bbb649ffdc348c1b1537ca31b73bf4c4477055841c0cd08df5336e0388974ebe20c384349c4233af20149317d79f51ee98208c6 SHA512 5a3ca05a57297cded56a21f37e13a61e7abce3faa34b1d2f4ad1abab0205aa8b7f753b6e0ac630336ea398b9c5ebd4c7cab55df4fa0f9e965e07b5a7e9d49f3c
diff --git a/dev-python/pydantic/pydantic-2.5.1.ebuild b/dev-python/pydantic/pydantic-2.5.1.ebuild
new file mode 100644
index 000000000000..b65592ac6631
--- /dev/null
+++ b/dev-python/pydantic/pydantic-2.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic/
+	https://pypi.org/project/pydantic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
+	~dev-python/pydantic-core-2.14.3[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
+		dev-python/dirty-equals[${PYTHON_USEDEP}]
+		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/Faker-18.13.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/benchmark/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=(
+		# require pytest-examples
+		tests/test_docs.py
+		# benchmarks
+		tests/benchmarks
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/pytest-localftpserver/Manifest b/dev-python/pytest-localftpserver/Manifest
index 23b361cf97bb..34c6c7822a26 100644
--- a/dev-python/pytest-localftpserver/Manifest
+++ b/dev-python/pytest-localftpserver/Manifest
@@ -1,2 +1 @@
-DIST pytest_localftpserver-1.1.4.tar.gz 44573 BLAKE2B 8c5bd0065d36d7c312944ce41747db141c90b7cbad134b6d3ce387cc9ef3f536882b27d1d0c23c67fb9e75546e62d0b1434faaa577c61f07a9915bf146b6a9e2 SHA512 67f7ca9d212f187f2e91d274523390438e07c52dc048b832e65012ef49d2843002806db1fbf2eba560bef671a0ef541bfb44f6b8226fe5d9d40acd08d53c4f48
 DIST pytest_localftpserver-1.2.0.tar.gz 48817 BLAKE2B ccccd0b2cdc2596fa12c8f082fd2fa3847541b731367abfccb7a57d3408d74c1637bfc644bb80482d9a1a25072d94b1f663b8ad8c0ad51c2d9dac65156a80638 SHA512 19e300c4ebb1d89ebfa4dce04296b8962014a139f82a409f6d46f748f653cfd1f4192a7fb65987015b2bf7237682507c4d6e42dab816c275ba7f8a302eb9a3e9
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
deleted file mode 100644
index 1db43db0ee70..000000000000
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="A PyTest plugin which provides an FTP fixture for your tests"
-HOMEPAGE="https://pypi.org/project/pytest-localserver/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-EPYTEST_IGNORE=(
-	# These tests require python wget module, but not in Portage
-	tests/test_pytest_localftpserver.py
-	tests/test_pytest_localftpserver_TLS.py
-	tests/test_pytest_localftpserver_with_env_var.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.2.0.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.2.0.ebuild
index 07d658f2df48..ec68f413ce19 100644
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.2.0.ebuild
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pyftpdlib[${PYTHON_USEDEP}]
diff --git a/dev-python/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
index bc1c8f3e602d..e7849ab75fd0 100644
--- a/dev-python/pytoolconfig/Manifest
+++ b/dev-python/pytoolconfig/Manifest
@@ -1,2 +1 @@
-DIST pytoolconfig-1.2.5.tar.gz 16322 BLAKE2B cdaab50765452ad93942c9a9ba546dc7ec5f61db8276992987a4539ad975578ee327464d93a1a64f09d67c4c872d99f42282183459e6987c1e4086218d15b032 SHA512 37753530a166d324ddef0c2e9f0c3d6b2f61252a18ff8037d530b339c8b817cde4087d14b6756690fe10002cbd3442776604ff064d7d16d34289ba859492c920
 DIST pytoolconfig-1.2.6.tar.gz 16425 BLAKE2B 669c3bc906b06ac48ecb5649f1bef8a6af53e85d8f8d23f4059b63e4d1e57e10b0a66d2e89e72e0b4afe7d00aa9d26b4ceb23cc49b8e46a891e7fae60d228686 SHA512 beade8cd1780eb986dab1d630c1583c9c75fea5067d399081a5b8361789fdec96087243d8d79291655c83aca481d5888b3414a1b445200a9d8c59703761a83b2
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.5.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.5.ebuild
deleted file mode 100644
index 2440fa5a6af2..000000000000
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python tool configuration"
-HOMEPAGE="
-	https://pypi.org/project/pytoolconfig/
-	https://github.com/bagel897/pytoolconfig/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-1.4.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.{8..10} )
-"
-BDEPEND="
-	test? (
-		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.6.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.6.ebuild
index 94f5c6d4680b..39424c7ea2c5 100644
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.6.ebuild
+++ b/dev-python/pytoolconfig/pytoolconfig-1.2.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 38e571fb6d57..60d57bcecc15 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1 +1,2 @@
 DIST responses-0.23.3.tar.gz 73737 BLAKE2B e246dc09832f996b085f84b4b90d58709dc283a51e6de6f67a50096f1550b9e11f2e8f809043e366d7dc1140511bc9be16aeeaa5218da6fc05b1b60a1c924800 SHA512 334beb4a0cdabce2bedd1e336c4af04a38818b8b90c9d0ffbbf3445f72f8c57cc03278e832c6442f9ecfec24723c567bfba76ad25c45cf2924e42d5108c51c7a
+DIST responses-0.24.1.tar.gz 77530 BLAKE2B 6f4482a0b7f7388506782286e35e716b4fcb746f6d562cba3e5b095163e380e0921f71f808c4729c2c6fb03c3efa1005ae6dbab9d3b61275af720b215b4e4181 SHA512 fd97f56055da4e31fc9866e4fdb7d68b2273cac25c6d882811268daf5f474d21897454b790122ed4c12e18032b9ae2c032b958402c6840b46ec38fdd7306033f
diff --git a/dev-python/responses/responses-0.24.1.ebuild b/dev-python/responses/responses-0.24.1.ebuild
new file mode 100644
index 000000000000..d64b3bec9c46
--- /dev/null
+++ b/dev-python/responses/responses-0.24.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="
+	https://pypi.org/project/responses/
+	https://github.com/getsentry/responses/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# tomli backend is optional now, with pyyaml being the new default.
+# However, keeping it unconditional here for backwards compatibility.
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_httpserver
+}
diff --git a/dev-python/scipy/scipy-1.11.3-r1.ebuild b/dev-python/scipy/scipy-1.11.3-r1.ebuild
index f901e53ec590..f0e1f477d9f3 100644
--- a/dev-python/scipy/scipy-1.11.3-r1.ebuild
+++ b/dev-python/scipy/scipy-1.11.3-r1.ebuild
@@ -38,7 +38,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
+		KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
 	fi
 fi
 
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 8ea2b264b4d5..2bf666f2bbf1 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,2 +1,3 @@
 DIST tomlkit-0.12.1.tar.gz 190535 BLAKE2B 461891b5f5dad93488d466560439e19865fcb315792418e24483c96f4c9387c67d9c322bcc4ba842861109ff3297e064cd38737769d97ad1f99dadd9c11f7b33 SHA512 1f82023cbb8168f847bfa0211ee5c4d6870973ee1f51f4b60deb34ae6e0e930fe299c939b6c157811d16a73c68225a468e8312ca2731e1bbdcc5541fde2e2360
 DIST tomlkit-0.12.2.tar.gz 190725 BLAKE2B f168f42e99cbd8ed5d958ec471fc824d3a89f72d0d68b8881c5c935d888f1b0464e6ca34e65741a9de9d98c093a1e23073378006693bbd6c85870f368291760a SHA512 c36405e95ab42e1e728b4344dd71d183c2e8c174b3524d3337af2456e141f5a54fed82c1f613d5493efef50170f2985f74b1e5859790e865379fab7f90f03c65
+DIST tomlkit-0.12.3.tar.gz 190967 BLAKE2B 82205c8e012d4584c60ce8d53a995a01fccd50e35330b8aaecd84dd348b79be1ec7cd9bbaf84dbdbcd904102b7dc4216551298657553606d4da8457f565e8945 SHA512 f89b1fdcbefcd511bbc5e22a1cc57d8c4593fc1353e901de31c69ac99ed3c685f042d71205c747bd5d20df246dd19b5402393df81231f12d18414d85c0a0000c
diff --git a/dev-python/tomlkit/tomlkit-0.12.3.ebuild b/dev-python/tomlkit/tomlkit-0.12.3.ebuild
new file mode 100644
index 000000000000..9d9acfb2c8f8
--- /dev/null
+++ b/dev-python/tomlkit/tomlkit-0.12.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Style preserving TOML library"
+HOMEPAGE="
+	https://github.com/sdispater/tomlkit/
+	https://pypi.org/project/tomlkit/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "poetry' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "tomlkit"
+		version = "${PV}"
+		description = "Style preserving TOML library"
+	EOF
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 71ff4d05f881..f41f017ac49f 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,6 +1,2 @@
-DIST trimesh-3.23.5.gh.tar.gz 12720153 BLAKE2B ef37eed712eb121529bf6bc724f96456a4dc86c7265b19d77a1bf578d2b5ffae043b5c3e0a03ad5be680125fcfced65ef933037defdc582e81d52b13ac11e9a9 SHA512 52783fe1c275aa121f412d5e2846d0d985e242a33e9c446e8bef538a53ba93b1f2e133e33e4f26390e1146ad8415c28fb146b2c74524c2aa20426819b1b875a0
-DIST trimesh-4.0.0.gh.tar.gz 12921048 BLAKE2B 7592ba10b57aa5cafd47311a430f881cc1ecc917f503e0cea75b38d350738d35c937e1006f80a0acc8a54a33e55f41af3d6cf280751b82a932bd2428af12e033 SHA512 1f5c1a3e92d6bda2ed37e5c6ece9fde798a2c2766c816cbb6a8bf9fdbf489f733ea3988429107eb92043f723bc222348ffe9286663a03562834ae83391793257
-DIST trimesh-4.0.1.gh.tar.gz 12922631 BLAKE2B 81cad4efea89c308f9cbb749b2515ed51f9fc87bbd37505ab94c08698f257c7f3a1b04e1b4a919bf529ee47d7531ecd605dd613c68b13fdaf853161811dfd1e6 SHA512 bfe56b3cfc94fcaa066b953e6df4c70da6fe9a99a6230d7201196a7df897a386c3425ad1da3cc7df75fa0d888fd05d07bf14e6b579a04dddab813c3858f904ef
 DIST trimesh-4.0.2.gh.tar.gz 13433444 BLAKE2B a466adc4708e7f59cb7a64f3872df89888ad21a4f78520c5f109c101ea5d42973705e59807dd800058f3925744a30cc6ddd88fa498533f7e69255ba0c5d652e2 SHA512 7c0c8cbf40f03f4fd92156306f0a0d4d0a1dbf774c9a1743d63d82be2264b50915f2f6ea2cdebd0e81390e7f96acb47eca9980f3829311ec027706ef1cc143c0
-DIST trimesh-4.0.3.gh.tar.gz 13434060 BLAKE2B 7777498fbf4fdfac221c6f6226e4c5554de593ff2c41877dd88df2e0f674dd4dcf8bb0e83fa4a9c81cc2ea0f970cc848ef1380b734231ba8965f61acde28678b SHA512 1eec21e3bcbc80f7ea939b16753ac24d45d750c176044d57a5c2217d46a1559478ab260147e82b1367df7dcb9ecf9aa11dda3a023ebb561f06578672bcc455d5
 DIST trimesh-4.0.4.gh.tar.gz 13434249 BLAKE2B 209ebbd8840e264bdde1aa6bf71b07910032ea3b577c4253cc66128761a2b1e1c9447c923d08108e36ddf5bf76ba67c90b728af4e18cea25882f78e4f252c18b SHA512 1135b626efc7559c2c127852f2947bf1d659b67a3bb16baf6d3fc795ab81baca1a57f035ce2ff0bdaa61709d0a21a160bbf425717037dd9662295e83894786bc
diff --git a/dev-python/trimesh/trimesh-3.23.5.ebuild b/dev-python/trimesh/trimesh-3.23.5.ebuild
deleted file mode 100644
index 8ac10ebf92e2..000000000000
--- a/dev-python/trimesh/trimesh-3.23.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-4.0.0.ebuild b/dev-python/trimesh/trimesh-4.0.0.ebuild
deleted file mode 100644
index 77990cd6c677..000000000000
--- a/dev-python/trimesh/trimesh-4.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-4.0.1.ebuild b/dev-python/trimesh/trimesh-4.0.1.ebuild
deleted file mode 100644
index 77990cd6c677..000000000000
--- a/dev-python/trimesh/trimesh-4.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-4.0.2.ebuild b/dev-python/trimesh/trimesh-4.0.2.ebuild
index 77990cd6c677..8ac10ebf92e2 100644
--- a/dev-python/trimesh/trimesh-4.0.2.ebuild
+++ b/dev-python/trimesh/trimesh-4.0.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/trimesh-4.0.3.ebuild b/dev-python/trimesh/trimesh-4.0.3.ebuild
deleted file mode 100644
index 08d2352e8a3f..000000000000
--- a/dev-python/trimesh/trimesh-4.0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/uvloop/uvloop-0.19.0.ebuild b/dev-python/uvloop/uvloop-0.19.0.ebuild
index 2fc810ede5f0..8c826c126374 100644
--- a/dev-python/uvloop/uvloop-0.19.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.19.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 	https://pypi.org/project/uvloop/
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 -riscv sparc ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/dev-python/watchfiles/watchfiles-0.21.0.ebuild b/dev-python/watchfiles/watchfiles-0.21.0.ebuild
index 78ac727dbaac..d0654817722a 100644
--- a/dev-python/watchfiles/watchfiles-0.21.0.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.21.0.ebuild
@@ -85,7 +85,7 @@ LICENSE+="
 	|| ( Artistic-2 CC0-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 0753bc0ed3c5..9ed51d455feb 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1 @@
-DIST XlsxWriter-RELEASE_3.1.7.gh.tar.gz 37369556 BLAKE2B e7eefd4fac6a791f917e19fd5559ac1fef436a0b304a1db9d436e21a2fc412b73de94a2a05a81acec5e297a07a11bdc953774947ec196fe666beb2ce85a2a21a SHA512 fd144eebbcb04e914aff1c2980353f0ddb88ef7841c70d1681561c86d925a201000931dba18bc15965fdb195bf3b2ea959b7c1ba21be8d1c7c6ed678c90c0fc7
-DIST XlsxWriter-RELEASE_3.1.8.gh.tar.gz 37375781 BLAKE2B 152546520391e3900cf00482b9008acc59051dc1a3c459f0d520d30101eeff3e8c999138738cc3fdfb054688f181f8326aae09642d01537f6383f14c34e55c6d SHA512 5d9c101d488d35ec57848bc9c96f397090340f039fb0b291dadb547fe933fecb3e7975d9ebf5b22f1dc4c0276c1357fa381db45bc2e77c223c71483c1db2a66a
 DIST XlsxWriter-RELEASE_3.1.9.gh.tar.gz 37377544 BLAKE2B f04e06ef75e80f9bb33ebf14f71aa42c30b9152295367877d83c20e62897985691e35288c6b7d4ff218cbf799fc5ddeda1d2b08bb91fbdeb3d48c5c27be95bec SHA512 1c7ea489182f1abe50fae5f1f387274f67e6043ef3fa909b015a340e38d8449f18ef1f40a64719982680371430a98bd0ac0d441b88daad655599f6eccae04a85
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.7.ebuild
deleted file mode 100644
index 60cee4a06910..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.1.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.8.ebuild
deleted file mode 100644
index 4b35800dce0e..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.1.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.9.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.9.ebuild
index 4b35800dce0e..3bd42a29ca51 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.1.9.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.1.9.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 19d837c08243..a6f7d77dbb15 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -6,3 +6,4 @@ DIST zeroconf-0.122.3.tar.gz 158519 BLAKE2B f62d36234c4f1cd988bbf8b1d1e6f706498b
 DIST zeroconf-0.123.0.tar.gz 158902 BLAKE2B d940e9558e781d614d623701e8baf3c9a2feb292bcb0ad8241fc28e1bdf103a154cf178b37dfc9f9ae1805ee6e6d1601cd41574755fe9849243832c3bd57821e SHA512 65947861a76776a1e34807ca5b0570f93c026b8fa36456ae6bfdec747c484107ba2c2e12712ce1a81a05c6c817215f7f72aa40a48e6634f1b1be886349f8c73f
 DIST zeroconf-0.125.0.tar.gz 160220 BLAKE2B aa84106acc07d19766a1ecdb4db36367ff9d80b1f88b81c665499c59dfc95cdb3123d5252f53fb488d4f632afdff862cf138a763106da652facb4e43bc404b8b SHA512 ba24b9dbcf91090404906df0127b0ba94fe3af65aae86788ff703b14b8f4dcffe9e08bc6be3b122a16036bc87df6307066ad291f74b02846a5b79279e24c150b
 DIST zeroconf-0.126.0.tar.gz 160628 BLAKE2B 09ff7d4ccde02d258b26f0a1e72ac7fbaf61a4a6513fa7c216e0015afa07107f52469a403cf8866aa38a55b7e96dbf1ef6cecd698e3b5b8902030e02cb7aa600 SHA512 7ceaeb39e292426fcfafd62d3a34bea40ba1ff2570489d6b9de2c3be9d8e27cbbbad90fbe6de45f0be1a0d769b0756c299a2c7358bb3689c163bca1373656bc5
+DIST zeroconf-0.127.0.tar.gz 161143 BLAKE2B ee560845016ab1de0b065aaae8cd6791ddc847417241c7f2477301948945e938a2ff68206d30166a6049a7ad5919d15bcc6acac9fd9d33d17d5e77154b9f9c0c SHA512 7c8aef766dcc0f3411c4230decd5a0af18ae795e0e4253be2dc69af6ba314271a336807ace1458bb0a081455afa8cc9d8769413bbc97f024e3d3e877cd1e6f2f
diff --git a/dev-python/zeroconf/zeroconf-0.127.0.ebuild b/dev-python/zeroconf/zeroconf-0.127.0.ebuild
new file mode 100644
index 000000000000..287607fcea05
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.127.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-11-15 18:35:25 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-11-15 18:35:25 +0000
commit	d9672f8042de9e1d3a836c02ed1a44dfba57d8fc (patch)
tree	fae0eac476f36c3f40e906ac027479c4e8848d72 /dev-python
parent	bded20c123a549b248f6fd88e45db59d6bc1199d (diff)
download	baldeagleos-repo-d9672f8042de9e1d3a836c02ed1a44dfba57d8fc.tar.gz baldeagleos-repo-d9672f8042de9e1d3a836c02ed1a44dfba57d8fc.tar.xz baldeagleos-repo-d9672f8042de9e1d3a836c02ed1a44dfba57d8fc.zip