Adding metadata

73 files changed, 518 insertions, 499 deletions

diff --git a/dev-python/Levenshtein/Levenshtein-0.23.0.ebuild b/dev-python/Levenshtein/Levenshtein-0.23.0.ebuild
index 544a703c5d9d..759de152bf85 100644
--- a/dev-python/Levenshtein/Levenshtein-0.23.0.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.23.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	>=dev-cpp/rapidfuzz-cpp-2.0.0
diff --git a/dev-python/astroid/astroid-3.0.1.ebuild b/dev-python/astroid/astroid-3.0.1.ebuild
index 4260e40b17d3..5c1cb5f7a1ba 100644
--- a/dev-python/astroid/astroid-3.0.1.ebuild
+++ b/dev-python/astroid/astroid-3.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ad573ae523d0..24666cbea06a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,3 +5,4 @@ DIST boto3-1.28.69.gh.tar.gz 717978 BLAKE2B d7339e73fec81a8c8eb013b4136ab3961bb7
 DIST boto3-1.28.70.gh.tar.gz 718741 BLAKE2B 0d8c0f8e4ceda65f223a6b5151015182905e4c76dc34ceede2af78ee8e71bbda95a70add771cdb313f4f63d7ae83fdbcb1c505a0157219c06a4d2dbcac584b27 SHA512 aea9a1c957c3a184ed8f8472f245b822b27185aa9427b14fd5cd380282a5c6f4dbb831940b4b39b147093448d8889910a52e26fb790b1e3e18ae24d9b2ddca15
 DIST boto3-1.28.71.gh.tar.gz 719518 BLAKE2B 0ed15aaf3c340ebb492ec58b7a4b7754a4e5ca7c3fa3e71c6940c99c13eba0e46d24fbfbcdd6a6c6ebc57fec98499f9478ac4f531730b226d2534042ff282b89 SHA512 88ec46e9051bb963db8c3123548337910fae92aa0dd39668665db6a94c0f59ce14a1bf98630e92a5e736d539fe470d8e4ff8395e600e1b8166a8fe47ad89f4e8
 DIST boto3-1.28.72.gh.tar.gz 720666 BLAKE2B bbce0af7cba130ba30d4a319fc05fd0e7749fba2056136b5874fe18a70478f52c2c4e25ba89fc56b71831d48d3f95b6bc2b2e9fd5318c1ff259cb6789ece0d0b SHA512 38ed50770c0bd355d462f7a4eb824b14bf01cc6772392f5eb79df2bb5dd96f3cbc843456256646f8e2ad9335c2de1465c4a9d68d8a66e9895e7280404218671f
+DIST boto3-1.28.73.gh.tar.gz 720995 BLAKE2B 1ac1c85be9e095ebab3394c5b7bdc48e0ba05e97bc3e463c3fab5d6a3f46e14078f05466042cdf58250c901a42b4b80149874ee0a157b47616da8f9e65a1dbe1 SHA512 2a5f4c9e4cf86bc1b7d285d034873cedf2ada05a65ca64be3c449de8e33a351b813e4f939543cba11c183f0adb127728f20f9b769bdb2802712b47ccaa135dcb
diff --git a/dev-python/boto3/boto3-1.28.63.ebuild b/dev-python/boto3/boto3-1.28.63.ebuild
index fc1e40c08394..f63c002a6083 100644
--- a/dev-python/boto3/boto3-1.28.63.ebuild
+++ b/dev-python/boto3/boto3-1.28.63.ebuild
@@ -25,7 +25,7 @@ else
 		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"
+	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-)"
diff --git a/dev-python/boto3/boto3-1.28.73.ebuild b/dev-python/boto3/boto3-1.28.73.ebuild
new file mode 100644
index 000000000000..fc1e40c08394
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.73.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 multiprocessing
+
+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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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} \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index f62d631e9f4f..4a0f5b37f717 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,3 +5,4 @@ DIST botocore-1.31.69.gh.tar.gz 11993410 BLAKE2B 3bb478c0d0bb8add09f3659739000ca
 DIST botocore-1.31.70.gh.tar.gz 11998773 BLAKE2B 1843caf6976d066b1898a3721303c05a1075acd4cb59393adfa31542647d85d6b9fb3dc06e7710ff0249126bc464eea3bf47e3e484a242100facce7c545ef2d3 SHA512 4b2f0548cd3b223e30537b2ec6d3de2f417b2df0e5c9af00e9cee295483a50f66abcc2ca1d449aa4e85917f0157b249e594f8be7fb919069b97e49b174d53960
 DIST botocore-1.31.71.gh.tar.gz 12000913 BLAKE2B 1cb78a9da73deacb302023f785d70645d3e5ecb8f828ebffb32f05f4d4f3343b5a9edf1fb0dd1c353c5bb38e094500ec2e1578c342312dca94ca64928c4d8b28 SHA512 6aa3a66c90cde16decf8b4dd678496d82d69388533105c3c785dca54d73736d2c3bb017ca57a39ea2dd59925ddc09dcd0ef600e8efd85c057356c29d2ce4013a
 DIST botocore-1.31.72.gh.tar.gz 12007238 BLAKE2B 3eca25ae134849aebd4d51d6f9c06c5606b9612ef55f46eaa545f1d7e978bb9d8d6a260615500c57d7efec8bc744a01ec4fc290fceaa48d6186847732b3b4a2b SHA512 8a31ab6ac3ba2d5fd565449ea424a482c31a586fec7601c84e64b5cc209d30d16279ccec64e7c2971bbce141b9011103b87b034a807f7d5a875eb0d9f6254050
+DIST botocore-1.31.73.gh.tar.gz 12009409 BLAKE2B 949ecb6e85141ca8e3c01e05f996e47f63e0967ec85dde5772f27d564abca001c642ca1991f45b8fec05f7c105f22f713c5e3a8b5e8a8ea3a1a2026abc92fdac SHA512 cd9f77aad6f17d06a04206abc2ae34285423581f6ae5d1c70635d43dc22d73d46842048f0a0f955147c8fb5e5a071e8d4d597a3f9c28146c74957f4b18c8cd22
diff --git a/dev-python/botocore/botocore-1.31.63.ebuild b/dev-python/botocore/botocore-1.31.63.ebuild
index 9588357367ec..93c55a006738 100644
--- a/dev-python/botocore/botocore-1.31.63.ebuild
+++ b/dev-python/botocore/botocore-1.31.63.ebuild
@@ -24,7 +24,7 @@ else
 		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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.31.73.ebuild b/dev-python/botocore/botocore-1.31.73.ebuild
new file mode 100644
index 000000000000..9588357367ec
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.73.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 multiprocessing
+
+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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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} -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cffi/cffi-1.16.0.ebuild b/dev-python/cffi/cffi-1.16.0.ebuild
index a440accccb1a..4eb32f478653 100644
--- a/dev-python/cffi/cffi-1.16.0.ebuild
+++ b/dev-python/cffi/cffi-1.16.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-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"
 
 # Needs recent libffi for HPPA fixes
 DEPEND="
diff --git a/dev-python/chameleon/chameleon-4.2.0.ebuild b/dev-python/chameleon/chameleon-4.2.0.ebuild
index 12f341d74a39..527e3ccf822c 100644
--- a/dev-python/chameleon/chameleon-4.2.0.ebuild
+++ b/dev-python/chameleon/chameleon-4.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/cstruct/Manifest
index 7f1125c92a58..7f1125c92a58 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/cstruct/Manifest
diff --git a/dev-python/python-cstruct/python-cstruct-5.2.ebuild b/dev-python/cstruct/cstruct-5.2.ebuild
index 6aca4b0b9897..77cffb8a466d 100644
--- a/dev-python/python-cstruct/python-cstruct-5.2.ebuild
+++ b/dev-python/cstruct/cstruct-5.2.ebuild
@@ -8,15 +8,17 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
+MY_P=python-cstruct-${PV}
 DESCRIPTION="C-style structs for Python"
 HOMEPAGE="
 	https://github.com/andreax79/python-cstruct/
 	https://pypi.org/project/cstruct/
 "
 SRC_URI="
-	https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+	https://github.com/andreax79/python-cstruct/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-cstruct/metadata.xml b/dev-python/cstruct/metadata.xml
index 3b39e33fc13c..3b39e33fc13c 100644
--- a/dev-python/python-cstruct/metadata.xml
+++ b/dev-python/cstruct/metadata.xml
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 710e7551af2f..276fc352e7dd 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,2 +1,3 @@
 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.9.3.gh.tar.gz 8544054 BLAKE2B 4b1fc7d3b6f91fd6db0836a0fede0304e9c5e04e2aacd573eb06cf96ddf67ecbb198a185076ff94ca34216732673113e7e268482992b781777b3757d43a11773 SHA512 d91840f8a339ff0a21734726b1674c4dbc1332270fb160e01fd342b1ce1ba2fd5cea34c501c7a61e6b34e121da937701932a93ab85dc85618f5b5fc52cd960cd
diff --git a/dev-python/dask/dask-2023.10.1.ebuild b/dev-python/dask/dask-2023.10.1.ebuild
new file mode 100644
index 000000000000..50a5ccc8c370
--- /dev/null
+++ b/dev-python/dask/dask-2023.10.1.ebuild
@@ -0,0 +1,89 @@
+# 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
+		# crashes
+		dask/tests/test_base.py::test_tokenize_object_with_recursion_error
+	)
+
+	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/deepdiff/Manifest b/dev-python/deepdiff/Manifest
index d6e5ead9febe..87b1db94a22f 100644
--- a/dev-python/deepdiff/Manifest
+++ b/dev-python/deepdiff/Manifest
@@ -1,6 +1 @@
-DIST deepdiff-6.3.1.tar.gz 392651 BLAKE2B 605dddc7c9d5895388141cbd3ed1a566c0631050719f3bd849578d40497323c0e9c117a8b4c73b21010600caec775f7c226818d0f15f4f1a8f4c3829414323ce SHA512 13d9edf42eb50b6e63e038a2c17d7d54e82e5e6b5ddc3420cc457d91e220da92391b17c238ed3a49d0f69168cad887c2278182734be23265d5c53928b28c4c42
-DIST deepdiff-6.4.0.tar.gz 394464 BLAKE2B dce005461b4ce1c4b84b9093ba445b11a96b91bf4aab302ae76fc98066c9c3d9871fe79de5f0254451e4bd9b7dc623268d375b681fea69988392e04385777818 SHA512 af4fb42180959df2dbd7708d87d8b1cd49e8cde058a705e45e78da188668cb42e65e9ddabb120fa9ab71bb8f45d3e8a9293c5e3568b9d49af6b326d4a21e27e4
-DIST deepdiff-6.4.1.tar.gz 394531 BLAKE2B a95b18bf335e88beb2ee19209fa9166fe2c0c65a5312ee4283b03e745c0469913ccf3b132042c7173a518416f8d227da24f8c3aa3dd91d916ac67fb190b9bf54 SHA512 3e54313b4681b75d607ad2eb2485245f43d78f0a80adf2f50847fd9a241cb1752cf66028a3cb5dc2980786e1c9de35fa9da52df8ed434ca2f889d99250088f66
-DIST deepdiff-6.5.0.tar.gz 395348 BLAKE2B e7a509ac1950da7ba2c3d12c85eb80d03b8f78229c5a041d14aee8368d8a2a071a0afc8cad0425f23eda82d3f5038d9340c8ed2870f637fd9bb2665cd15be67f SHA512 857d1e0e34ab85c67c5b655fe245f4aba4de3620ad39e1f044bf6329b0ecd0afeeb9511a318badadb21daac03594844d6c6357c91a8056e44e67e83e4635f26b
-DIST deepdiff-6.6.0.tar.gz 400645 BLAKE2B 4210c050bf94d974561270ea9b6884d3c1004a9ebfadb1edcae361a1a15765dd7314418a4455b8ddb548100774f048df0aefea9d880179979eefcfb8f8d5906a SHA512 81b31ab52a23928746cc890439e7733b8ca6c5df390cf866977420cbd08f9d93b49d938e663e4d6e46f4b19741cbb52bc1f631b3cb733a7390535adf0fb432f2
 DIST deepdiff-6.6.1.tar.gz 402840 BLAKE2B 78fa059644d068fb0e6f16a81ba91d0e776f91eda6f049f73d57bd176a9bbca5fc60f301e8ac652ba1339be2474c9eb6912ce532d720328d2b017bfcc52196dc SHA512 5a18bdb5d5dbc7b6de39d90fc3a740ddeeddd0742953f8618eefafbd0c086138219dbb3a515ead40b315c28590b642721b9350d2b9cc9e4a1e9ea8a8dbb25712
diff --git a/dev-python/deepdiff/deepdiff-6.3.1-r1.ebuild b/dev-python/deepdiff/deepdiff-6.3.1-r1.ebuild
deleted file mode 100644
index f25cbf63a388..000000000000
--- a/dev-python/deepdiff/deepdiff-6.3.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 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 library for comparing dictionaries, iterables, strings and other objects"
-HOMEPAGE="
-	https://github.com/seperman/deepdiff/
-	https://pypi.org/project/deepdiff/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? (
-		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23.5[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/deepdiff/deepdiff-6.4.0.ebuild b/dev-python/deepdiff/deepdiff-6.4.0.ebuild
deleted file mode 100644
index f25cbf63a388..000000000000
--- a/dev-python/deepdiff/deepdiff-6.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 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 library for comparing dictionaries, iterables, strings and other objects"
-HOMEPAGE="
-	https://github.com/seperman/deepdiff/
-	https://pypi.org/project/deepdiff/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? (
-		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23.5[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/deepdiff/deepdiff-6.4.1.ebuild b/dev-python/deepdiff/deepdiff-6.4.1.ebuild
deleted file mode 100644
index f25cbf63a388..000000000000
--- a/dev-python/deepdiff/deepdiff-6.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 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 library for comparing dictionaries, iterables, strings and other objects"
-HOMEPAGE="
-	https://github.com/seperman/deepdiff/
-	https://pypi.org/project/deepdiff/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? (
-		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23.5[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/deepdiff/deepdiff-6.5.0.ebuild b/dev-python/deepdiff/deepdiff-6.5.0.ebuild
deleted file mode 100644
index f25cbf63a388..000000000000
--- a/dev-python/deepdiff/deepdiff-6.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 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 library for comparing dictionaries, iterables, strings and other objects"
-HOMEPAGE="
-	https://github.com/seperman/deepdiff/
-	https://pypi.org/project/deepdiff/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? (
-		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23.5[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/deepdiff/deepdiff-6.6.0.ebuild b/dev-python/deepdiff/deepdiff-6.6.0.ebuild
deleted file mode 100644
index f25cbf63a388..000000000000
--- a/dev-python/deepdiff/deepdiff-6.6.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 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 library for comparing dictionaries, iterables, strings and other objects"
-HOMEPAGE="
-	https://github.com/seperman/deepdiff/
-	https://pypi.org/project/deepdiff/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? (
-		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23.5[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 83d5b3dd2a50..a500e3683d3b 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,3 +1 @@
-DIST django-timezone-field-5.1.gh.tar.gz 37449 BLAKE2B 9676bd686f7a1bfb2d7e5ee53db5ca3818a9bc20c4c759c09c6d602bcb1937098c40b9c07b3db1d7ca8af2f8882d6aaa333f325e422725e3ea7303fc60e9b59c SHA512 518e16b092af00edae9b2488fd4e9380a661864e9f2d2d3ed8ffc6d9188831d4a7b79ed81d553bc41089ac8cb6fab760339af668ce7c2c0218d991b77306c50f
 DIST django-timezone-field-6.0.1.gh.tar.gz 35800 BLAKE2B f3b46970bbe234f786988d8c71a016c382ea3d82b798eaf78e685f86a80b3ebd3ee495d0f0230afb84f594b443548d9bc1e8891ea37c08be478bab388edfd70b SHA512 e6d1631af6a4d93f2fae236cf12d8fda15dfd6d70ee01c496364c3e5e141fff2bb5982f607adf474617a86b9f0f611306a17d1d892556a087424110ee3de541d
-DIST django-timezone-field-6.0.gh.tar.gz 35628 BLAKE2B 3df5b07f4dc2d16ba71b0eacac90dd173f559322b14dba5ac62f5e336ccaeae3538b4464ad708ebadef92d317b1bc7ef859cde3a8005c9e4c31a2af3cd1d6e69 SHA512 efa15bf819e9a9fd35b4c373883f12aedd262c5223561bd3158acc3ebb9e4d72821153b5a48d544eebfe65342f8d33ce07b0b37bd847b1ec8d83d345e022c17c
diff --git a/dev-python/django-timezone-field/django-timezone-field-5.1.ebuild b/dev-python/django-timezone-field/django-timezone-field-5.1.ebuild
deleted file mode 100644
index d14d29006b75..000000000000
--- a/dev-python/django-timezone-field/django-timezone-field-5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django app providing database and form fields for pytz timezone objects"
-HOMEPAGE="
-	https://github.com/mfogel/django-timezone-field/
-	https://pypi.org/project/django-timezone-field/
-"
-SRC_URI="
-	https://github.com/mfogel/django-timezone-field/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	<dev-python/django-5[${PYTHON_USEDEP}]
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/djangorestframework[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x DB_ENGINE=sqlite
-	epytest
-}
diff --git a/dev-python/django-timezone-field/django-timezone-field-6.0.ebuild b/dev-python/django-timezone-field/django-timezone-field-6.0.ebuild
deleted file mode 100644
index a673cb717370..000000000000
--- a/dev-python/django-timezone-field/django-timezone-field-6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django app providing database and form fields for timezone objects"
-HOMEPAGE="
-	https://github.com/mfogel/django-timezone-field/
-	https://pypi.org/project/django-timezone-field/
-"
-SRC_URI="
-	https://github.com/mfogel/django-timezone-field/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	<dev-python/django-5[${PYTHON_USEDEP}]
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/djangorestframework[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x DB_ENGINE=sqlite
-	epytest
-}
diff --git a/dev-python/enzyme/enzyme-0.4.1-r3.ebuild b/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
index 0cf3e2003637..c6ac8c14ec21 100644
--- a/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
@@ -10,7 +10,10 @@ PYTHON_REQ_USE='xml(+)'
 inherit distutils-r1 pypi
 
 DESCRIPTION="Python video metadata parser"
-HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme/"
+HOMEPAGE="
+	https://github.com/Diaoul/enzyme/
+	https://pypi.org/project/enzyme/
+"
 SRC_URI+="
 	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
 "
@@ -29,7 +32,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
 
 python_prepare_all() {
 	if use test; then
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 48f4527fe3f6..161cf01ecd95 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1 +1,2 @@
 DIST filelock-3.12.4.tar.gz 13758 BLAKE2B b1898870928fcc40055274ef2cbe58b818f5aca30dc3864bd8b00c1f88b50050e1aac4380c5b0ba850b52aed4862a3c5ad2090f1d786df3cfe70d10116e4f1b2 SHA512 1ea0769afdbddc030f078a87a669b17425389526a6ba7f7577b350e0206efa6a54b284f1dbd7dfba0bda6e2450a181f5e4ab7cec2ca6ba09830bafad52128e86
+DIST filelock-3.13.0.tar.gz 14347 BLAKE2B fc25c99e894c85810a65998bdd9a26adc99c74596e050f37e5f5ea3b0bedd30a306cac7deebc5f1b0b9ac22b5ee8219d9b8078f651e91f1ae8e63dd1479b57de SHA512 bf876f5b4f1dc736c39defe32f747f75948f48c7962a559124028d234ccda75f0c7b89c1cd81ce008abb50c458e98969838ee337a32f40d6f8f672b8e368b51a
diff --git a/dev-python/filelock/filelock-3.13.0.ebuild b/dev-python/filelock/filelock-3.13.0.ebuild
new file mode 100644
index 000000000000..6157956e7ebe
--- /dev/null
+++ b/dev-python/filelock/filelock-3.13.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2018-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="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/filelock/
+	https://pypi.org/project/filelock/
+"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-api-core/google-api-core-2.12.0.ebuild b/dev-python/google-api-core/google-api-core-2.12.0.ebuild
index 00aa2fc2d7aa..d8aeabd50ebc 100644
--- a/dev-python/google-api-core/google-api-core-2.12.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.12.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.103.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.103.0.ebuild
index f004eac09849..6a6ec1df4956 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.103.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.103.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/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/hcloud/hcloud-1.30.0.ebuild b/dev-python/hcloud/hcloud-1.30.0.ebuild
index d1cbad81b34f..f788a178cb7f 100644
--- a/dev-python/hcloud/hcloud-1.30.0.ebuild
+++ b/dev-python/hcloud/hcloud-1.30.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/indexed-gzip/Manifest b/dev-python/indexed-gzip/Manifest
index 8cd174bfec91..bf3218699d0b 100644
--- a/dev-python/indexed-gzip/Manifest
+++ b/dev-python/indexed-gzip/Manifest
@@ -1,3 +1 @@
-DIST indexed_gzip-1.7.1.tar.gz 74457 BLAKE2B b22d2120adac59e64f5bcf38c831bb54ce5d6c3dd1e959eece9a454908d9ce2aa5dc10557bd63823616bedfe9d0c039a3f1c0512ef1d22a54437353c57e15158 SHA512 fa27e476f115eca1d1d3892c3480de97cb407bd489737bebc44eb28e92be91e14312cde33a67af145b44c7d93ccc706498c2cbfe6cbff5b9b091dd083cde0f7e
-DIST indexed_gzip-1.8.3.tar.gz 74621 BLAKE2B e8092eea93235b7e6a154b34d12194ffbd3ecb88f2891b8b60ab526fa6a9247c78afded19b284b8143981a83333f376e82b65003ada61ce2efe7378fe84749a4 SHA512 f33fb19938ae39e4ede71f3f2a328f56e7fad5ee4872b25c0977ded1819541e9e63d64a1379b022cd82af79a5c0967d8fdde589d2276841a4b0e9d3179229035
 DIST indexed_gzip-1.8.5.tar.gz 74696 BLAKE2B 5db7a9c372950e60f4e6f5905a6bf5b01c76007174a77393176d969e87197beefc81d72e5280ac057fcfd3c752e5f8b2923326e3ed2e825fd34315dd23a179b0 SHA512 617b7406ff2e579c41ceafcfb64bd9ba33599f9f810afb5b3abad49825ae274265b8f8eeaf54285d8df11dd9c498a13752455263a51817be11301ed73aeb0230
diff --git a/dev-python/indexed-gzip/indexed-gzip-1.7.1.ebuild b/dev-python/indexed-gzip/indexed-gzip-1.7.1.ebuild
deleted file mode 100644
index 9aa8cc9bf436..000000000000
--- a/dev-python/indexed-gzip/indexed-gzip-1.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="
-	https://pypi.org/project/indexed-gzip/
-	https://github.com/pauldmccarthy/indexed_gzip/
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip custom "clean" command that doesn't support "-a"
-	# https://bugs.gentoo.org/838955
-	# TODO: this can be removed once distutils-r1 stops using clean
-	sed -e '/cmdclass/d' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	if use test; then
-		export INDEXED_GZIP_TESTING=1
-	fi
-	distutils-r1_src_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)/indexed_gzip/tests" || die
-	epytest
-}
diff --git a/dev-python/indexed-gzip/indexed-gzip-1.8.3.ebuild b/dev-python/indexed-gzip/indexed-gzip-1.8.3.ebuild
deleted file mode 100644
index 05920081a776..000000000000
--- a/dev-python/indexed-gzip/indexed-gzip-1.8.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="
-	https://pypi.org/project/indexed-gzip/
-	https://github.com/pauldmccarthy/indexed_gzip/
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip custom "clean" command that doesn't support "-a"
-	# https://bugs.gentoo.org/838955
-	# TODO: this can be removed once distutils-r1 stops using clean
-	sed -e '/cmdclass/d' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	if use test; then
-		export INDEXED_GZIP_TESTING=1
-	fi
-	distutils-r1_src_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)/indexed_gzip/tests" || die
-	epytest -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/indexed-gzip/indexed-gzip-1.8.5-r1.ebuild b/dev-python/indexed-gzip/indexed-gzip-1.8.5-r1.ebuild
index b8c9d1eab9c5..1d12102bfac5 100644
--- a/dev-python/indexed-gzip/indexed-gzip-1.8.5-r1.ebuild
+++ b/dev-python/indexed-gzip/indexed-gzip-1.8.5-r1.ebuild
@@ -35,14 +35,6 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# strip custom "clean" command that doesn't support "-a"
-	# https://bugs.gentoo.org/838955
-	# TODO: this can be removed once distutils-r1 stops using clean
-	sed -e '/cmdclass/d' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
 src_compile() {
 	# This actually enables line tracing, so it fits USE=debug more.
 	if use debug; then
diff --git a/dev-python/jsonpath-ng/Manifest b/dev-python/jsonpath-ng/Manifest
index dc1741b93b09..739fddd28291 100644
--- a/dev-python/jsonpath-ng/Manifest
+++ b/dev-python/jsonpath-ng/Manifest
@@ -1,2 +1 @@
-DIST jsonpath-ng-1.5.3.tar.gz 32819 BLAKE2B 2f217638a5f4b76d0fe2bd8d0655794281d437983abe9fda96a40440bc97ba0ad13875b7cf83d06386258c43e66732b8a9d799ccaecf5034a9d01d120f403cb6 SHA512 adf501d0db74f76216476700dce342d7a92641ecb451bdce43d0c6abce59a278dc1696b959205030de256b456ae67a554ea35a5dec272f0a4fc84c4d2b76a5c1
 DIST jsonpath-ng-1.6.0.tar.gz 37132 BLAKE2B 5af13db8ab85482656d5c1501edfb2c61dc62a08a2c90a12a7ba7b141b538b5ebfca86c856b9f65ef1c1b82329eb0ed7db5c1890d881e4cb968cb6ca31ddeb6f SHA512 46eefe57330887143b98ef4deb97c5d7242f0cfbd923dffc17bd4147326ea4333c76df2451fbbb27933ada872628ad1ec04bdb9fc8e2c288c89bf37ec3783c43
diff --git a/dev-python/jsonpath-ng/jsonpath-ng-1.5.3.ebuild b/dev-python/jsonpath-ng/jsonpath-ng-1.5.3.ebuild
deleted file mode 100644
index 340967074c76..000000000000
--- a/dev-python/jsonpath-ng/jsonpath-ng-1.5.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python JSONPath Next-Generation"
-HOMEPAGE="
-	https://github.com/h2non/jsonpath-ng
-	https://pypi.org/project/jsonpath-ng/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		  dev-python/oslotest[${PYTHON_USEDEP}]
-		  dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_jsonpath_rw_ext.py::Testjsonpath_ng_ext::test_fields_value
-)
diff --git a/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.6.0.ebuild b/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.6.0.ebuild
index 21e10ebbf4bd..b0bc1517d11c 100644
--- a/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.6.0.ebuild
+++ b/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1 pypi
 
-DESCRIPTION="Jupyter kernel for octave"
+DESCRIPTION="A tool for testing Jupyter kernels"
 HOMEPAGE="
 	https://github.com/jupyter/jupyter_kernel_test/
 	https://pypi.org/project/jupyter-kernel-test/
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/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 4b4f4a67b43a..9bde4579d797 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,3 +2,4 @@ DIST mkdocs-material-9.4.2.gh.tar.gz 14501913 BLAKE2B a822b1bb54ffffccca7d3f41b1
 DIST mkdocs-material-9.4.4.gh.tar.gz 14508575 BLAKE2B a7c3440cfa26d6654d56a3cfe39ba1b301b2f3166b6b5f26518ef568d5bdafce45f791539d2f1e7518a73fd94cc105b88745c054dbc1c82769346aa07cbdf525 SHA512 7241680a3bccd22d355993e4d23af384ec6304722430560311ce74c5786566c64cd9cfd65d80b515b4795e550e9b165e8f207a62468b3a0eb35c7fa7ca8e85e4
 DIST mkdocs-material-9.4.5.gh.tar.gz 14526442 BLAKE2B 40ec29db7d072ee11ff8468c4780548c26dab59baa1616cf0f4ae260d1feefa2764e895cde83c7e66e27ec758991f518633a0f743dd9996acddff795099f5fc2 SHA512 69f0f019ba0de019e5f0d895ed4adb07bd4d9c57d64e54bbe055be98571755b94d3fcaed8bd0c5dc1e025deb0e5620c096a1250aeebf5443f6a26ba1d8e5eed6
 DIST mkdocs-material-9.4.6.gh.tar.gz 14534310 BLAKE2B 0d3c5d09c13840c4e7aff328b4545e8d84a8903fb43590de3e9b8527f16d9deaef2bd899542f29d950d0ee38e6b8e54b35313d0a5b3481194f0c0cf41245bdf1 SHA512 184d765163b19806e2018997878cd1212b288030464b1e418e5b6e2849400a81be6bdc3bac24ca34b63b521d63a650f8541e85caa8131d11246c26c4ff07bb4a
+DIST mkdocs-material-9.4.7.gh.tar.gz 14556029 BLAKE2B a3f0289afcd38dc9af2bb18205e19e78565fbe4230ed5a730736945d6b12edbcf598b337ad0715b96184059d434b6589d133bc93cec7624a72bc89ce4c30c352 SHA512 31feb4bdb5ad54fdfbe0cc054fce76e2af3b2c87424c1f3ffbda7500852074994a09de94c51b87fa40145afce6e82911b3e7399691a6c736e8c0858cc094107b
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.4.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.4.7.ebuild
new file mode 100644
index 000000000000..31c55fa06872
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.4.7.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=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="social"
+
+RDEPEND="
+	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
+	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
+	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
+	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
+	social? (
+		>=dev-python/pillow-9.0[${PYTHON_USEDEP}]
+		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
+"
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mmtf-python/mmtf-python-1.1.3.ebuild b/dev-python/mmtf-python/mmtf-python-1.1.3.ebuild
index 088374371f65..5e2ace64b4df 100644
--- a/dev-python/mmtf-python/mmtf-python-1.1.3.ebuild
+++ b/dev-python/mmtf-python/mmtf-python-1.1.3.ebuild
@@ -6,10 +6,15 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="The python implementation of the MMTF API, decoder and encoder"
-HOMEPAGE="https://mmtf.rcsb.org/"
+HOMEPAGE="
+	https://mmtf.rcsb.org/
+	https://github.com/rcsb/mmtf-python/
+	https://pypi.org/project/mmtf-python/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/numexpr/numexpr-2.8.7.ebuild b/dev-python/numexpr/numexpr-2.8.7.ebuild
index 97078eb03bc0..da032ffb1b12 100644
--- a/dev-python/numexpr/numexpr-2.8.7.ebuild
+++ b/dev-python/numexpr/numexpr-2.8.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
diff --git a/dev-python/numpydoc/numpydoc-1.6.0.ebuild b/dev-python/numpydoc/numpydoc-1.6.0.ebuild
index 632532b13b98..9c70a852e97f 100644
--- a/dev-python/numpydoc/numpydoc-1.6.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.6.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
diff --git a/dev-python/partd/partd-1.4.1.ebuild b/dev-python/partd/partd-1.4.1.ebuild
index 66a2049a74be..f678c137de75 100644
--- a/dev-python/partd/partd-1.4.1.ebuild
+++ b/dev-python/partd/partd-1.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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/locket[${PYTHON_USEDEP}]
diff --git a/dev-python/psycopg/psycopg-2.9.9.ebuild b/dev-python/psycopg/psycopg-2.9.9.ebuild
index 21a0dd37b66e..4b1daaf97c93 100644
--- a/dev-python/psycopg/psycopg-2.9.9.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.9.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/psycopg-3.1.12.ebuild b/dev-python/psycopg/psycopg-3.1.12.ebuild
index 5edca04b17a7..8f6603bd2115 100644
--- a/dev-python/psycopg/psycopg-3.1.12.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.12.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pydyf/pydyf-0.8.0.ebuild b/dev-python/pydyf/pydyf-0.8.0.ebuild
index ed90152dee11..1a85d9b81522 100644
--- a/dev-python/pydyf/pydyf-0.8.0.ebuild
+++ b/dev-python/pydyf/pydyf-0.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pylint/pylint-2.17.7.ebuild b/dev-python/pylint/pylint-2.17.7.ebuild
index 97e133aa3096..ffb0183d946a 100644
--- a/dev-python/pylint/pylint-2.17.7.ebuild
+++ b/dev-python/pylint/pylint-2.17.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/pylint-dev/pylint/blob/main/pyproject.toml#L34 on bumps
diff --git a/dev-python/pypdf/pypdf-3.16.4.ebuild b/dev-python/pypdf/pypdf-3.16.4.ebuild
index 37e71f48900f..35a323de249c 100644
--- a/dev-python/pypdf/pypdf-3.16.4.ebuild
+++ b/dev-python/pypdf/pypdf-3.16.4.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-utils/python-utils-3.8.1.ebuild b/dev-python/python-utils/python-utils-3.8.1.ebuild
index aa93d4447fb5..afb03e1a93ab 100644
--- a/dev-python/python-utils/python-utils-3.8.1.ebuild
+++ b/dev-python/python-utils/python-utils-3.8.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pywinrm/pywinrm-0.4.3.ebuild b/dev-python/pywinrm/pywinrm-0.4.3.ebuild
index 3b9c6351ef84..9f44dae75be3 100644
--- a/dev-python/pywinrm/pywinrm-0.4.3.ebuild
+++ b/dev-python/pywinrm/pywinrm-0.4.3.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Python client for the Windows Remote Management (WinRM) service"
-HOMEPAGE="https://github.com/diyan/pywinrm/"
+HOMEPAGE="
+	https://github.com/diyan/pywinrm/
+	https://pypi.org/project/pywinrm/
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.3.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.3.ebuild
index 41db74e52435..c95bce9b89e9 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.3.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/redis/redis-5.0.1.ebuild b/dev-python/redis/redis-5.0.1.ebuild
index b7331392d901..abb1d9377097 100644
--- a/dev-python/redis/redis-5.0.1.ebuild
+++ b/dev-python/redis/redis-5.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index ae583634e3d7..8bb5414afd6f 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1 +1 @@
-DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
+DIST rencode-1.0.6.gh.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
diff --git a/dev-python/rencode/rencode-1.0.6-r3.ebuild b/dev-python/rencode/rencode-1.0.6-r3.ebuild
index 9f1ab76eb499..2d3cadbad0cd 100644
--- a/dev-python/rencode/rencode-1.0.6-r3.ebuild
+++ b/dev-python/rencode/rencode-1.0.6-r3.ebuild
@@ -3,20 +3,29 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
 DESCRIPTION="similar to bencode from the BitTorrent project"
-HOMEPAGE="https://github.com/aresch/rencode"
-SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/aresch/rencode/
+	https://pypi.org/project/rencode/
+"
+SRC_URI="
+	https://github.com/aresch/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
@@ -28,9 +37,6 @@ PATCHES=(
 )
 
 python_test() {
-	# The C extension ("_rencode") can't be imported from "${S}/rencode"
-	# so we need to cd somewhere else to make sure "rencode" is imported
-	# from ${BUILD_DIR}/lib (thanks to PYTHONPATH).
-	cd "${T}" || die
-	epytest "${S}"
+	rm -rf rencode || die
+	epytest
 }
diff --git a/dev-python/reportlab/reportlab-4.0.6.ebuild b/dev-python/reportlab/reportlab-4.0.6.ebuild
index 574e081b45ea..9ec0510a09d2 100644
--- a/dev-python/reportlab/reportlab-4.0.6.ebuild
+++ b/dev-python/reportlab/reportlab-4.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-celery/files/sphinx-celery-2.0.0-extlinks.patch b/dev-python/sphinx-celery/files/sphinx-celery-2.0.0-extlinks.patch
new file mode 100644
index 000000000000..c01e8dde882d
--- /dev/null
+++ b/dev-python/sphinx-celery/files/sphinx-celery-2.0.0-extlinks.patch
@@ -0,0 +1,30 @@
+From 46d3ea167e7b6eab24f35354f44822981bc76767 Mon Sep 17 00:00:00 2001
+From: Oleg Hoefling <oleg.hoefling@ionos.com>
+Date: Tue, 23 Aug 2022 15:56:17 +0200
+Subject: [PATCH] add placeholder to each extlinks caption
+
+https://github.com/celery/sphinx_celery/pull/40
+Signed-off-by: Oleg Hoefling <oleg.hoefling@ionos.com>
+---
+ sphinx_celery/conf.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/sphinx_celery/conf.py b/sphinx_celery/conf.py
+index b35bc2b..8a6895b 100644
+--- a/sphinx_celery/conf.py
++++ b/sphinx_celery/conf.py
+@@ -161 +161 @@
+-        'GitHub SHA@',
++        'GitHub SHA@%s',
+@@ -165 +165 @@
+-        'GitHub branch',
++        'GitHub branch %s',
+@@ -168 +168 @@
+-        'https://github.com/%s/', '@',
++        'https://github.com/%s/', '@%s',
+@@ -171 +171 @@
+-        'https://pypi.python.org/pypi/%s/', '',
++        'https://pypi.python.org/pypi/%s/', None,
+@@ -174 +174 @@
+-        'https://en.wikipedia.org/wiki/%s', '',
++        'https://en.wikipedia.org/wiki/%s', None,
diff --git a/dev-python/sphinx-celery/sphinx-celery-2.0.0-r3.ebuild b/dev-python/sphinx-celery/sphinx-celery-2.0.0-r4.ebuild
index 957480c5db9d..02d695f55195 100644
--- a/dev-python/sphinx-celery/sphinx-celery-2.0.0-r3.ebuild
+++ b/dev-python/sphinx-celery/sphinx-celery-2.0.0-r4.ebuild
@@ -22,3 +22,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
 "
+
+# https://bugs.gentoo.org/show_bug.cgi?id=911637
+PATCHES=( "${FILESDIR}/${P}-extlinks.patch" )
diff --git a/dev-python/spur/spur-0.3.23.ebuild b/dev-python/spur/spur-0.3.23.ebuild
index b7865a24677f..f38420df2813 100644
--- a/dev-python/spur/spur-0.3.23.ebuild
+++ b/dev-python/spur/spur-0.3.23.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/swagger_spec_validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index 302dfaf890c7..302dfaf890c7 100644
--- a/dev-python/swagger_spec_validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
diff --git a/dev-python/swagger_spec_validator/metadata.xml b/dev-python/swagger-spec-validator/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/swagger_spec_validator/metadata.xml
+++ b/dev-python/swagger-spec-validator/metadata.xml
diff --git a/dev-python/swagger_spec_validator/swagger_spec_validator-3.0.3.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-3.0.3.ebuild
index be25bd7923e0..2a0082e238ec 100644
--- a/dev-python/swagger_spec_validator/swagger_spec_validator-3.0.3.ebuild
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-3.0.3.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
+MY_P=swagger_spec_validator-${PV}
 DESCRIPTION="Validate Swagger specs against Swagger 1.1 or 2.0 specification"
 HOMEPAGE="
 	https://github.com/Yelp/swagger_spec_validator/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/Yelp/swagger_spec_validator/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index eb45f1bce5a9..e7d4a8b1e4e0 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1 +1 @@
-DIST terminaltables-3.1.10.tar.gz 282122 BLAKE2B 53d5ecde38370f5b05d3eaae4b618ada6991214feadc7e826467dafede5baaf8292e47e6b2be903eb8ae6d46e3066314fe7950d7330056cd3053e0d643ad1a9e SHA512 84fa403cee4206b6b19de0206d89535bd2965a0796e1890dd9b0a9c6593c5f41d0d24b88ee9db426067c777712a4e810d67d4d0246496239a7a96b53a24e8174
+DIST terminaltables-3.1.10.gh.tar.gz 282122 BLAKE2B 53d5ecde38370f5b05d3eaae4b618ada6991214feadc7e826467dafede5baaf8292e47e6b2be903eb8ae6d46e3066314fe7950d7330056cd3053e0d643ad1a9e SHA512 84fa403cee4206b6b19de0206d89535bd2965a0796e1890dd9b0a9c6593c5f41d0d24b88ee9db426067c777712a4e810d67d4d0246496239a7a96b53a24e8174
diff --git a/dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild b/dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild
index db343fa808c2..65b59037625e 100644
--- a/dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild
@@ -9,10 +9,15 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
-HOMEPAGE="https://robpol86.github.io/terminaltables/"
+HOMEPAGE="
+	https://robpol86.github.io/terminaltables/
+	https://github.com/matthewdeanmartin/terminaltables/
+	https://pypi.org/project/terminaltables/
+"
 SRC_URI="
 	https://github.com/matthewdeanmartin/terminaltables/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index 07b895b14e18..1188869f00fa 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -14,7 +14,6 @@ EGIT_REPO_URI="https://github.com/matthewdeanmartin/${PN}.git"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 
 BDEPEND="
 	test? (
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 619251565c37..20873e088ae6 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1 +1,2 @@
 DIST ubelt-1.3.3.gh.tar.gz 348746 BLAKE2B e537b699a2f04efea9c2477437b7100bf9b736cb69c73ebc06bc639c8d9794c513447552e8c34430fce92b5c757369b447422ee9841ac1c6d2f47e292282d816 SHA512 77e03e06c03b6d8c8004b06f5bc843cbb4b1ad21c8c35d4801d5695c2556c707572a5f188a5774013c5ee0eda4005b593cc8548a3c025d460a21fbd996e41abb
+DIST ubelt-1.3.4.gh.tar.gz 353041 BLAKE2B 1de8ad1fc69554570f62c17fa537918b93d913e09db1d7c9b94ac9fa5f7b60a4a408f4c562718b9bbcf13e4307c091cf4ac24caa952233974d37cc6651e4786e SHA512 b3afc832832b28e7ca884c68188d34da9a1c3d5e38b5431cc40d8215fd43875f02cf71068e8b242feca0891f9421d3fba745d4236865beb5cb4f40482a777e13
diff --git a/dev-python/ubelt/ubelt-1.3.4.ebuild b/dev-python/ubelt/ubelt-1.3.4.ebuild
new file mode 100644
index 000000000000..dbe57fe816d4
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.3.4.ebuild
@@ -0,0 +1,42 @@
+# 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="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="
+	https://github.com/Erotemic/ubelt/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_editable_modules.py::test_import_of_editable_install
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/unidecode/unidecode-1.3.7.ebuild b/dev-python/unidecode/unidecode-1.3.7.ebuild
index 4d3d023e475d..db76b648c646 100644
--- a/dev-python/unidecode/unidecode-1.3.7.ebuild
+++ b/dev-python/unidecode/unidecode-1.3.7.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="https://pypi.org/project/Unidecode/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/vecrec/vecrec-0.3.1-r1.ebuild b/dev-python/vecrec/vecrec-0.3.1-r1.ebuild
index 88b83f44c71c..1ddbe516ce30 100644
--- a/dev-python/vecrec/vecrec-0.3.1-r1.ebuild
+++ b/dev-python/vecrec/vecrec-0.3.1-r1.ebuild
@@ -9,24 +9,27 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="2D vector and rectangle classes"
-HOMEPAGE="https://github.com/kxgames/vecrec
-	https://pypi.org/project/vecrec/"
+HOMEPAGE="
+	https://github.com/kxgames/vecrec/
+	https://pypi.org/project/vecrec/
+"
 
 LICENSE="MIT"
 KEYWORDS="~amd64"
 SLOT="0"
 
-RDEPEND="dev-python/autoprop[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/autoprop[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
 src_prepare() {
-	sed -e '/addopts/d' -i tests/pytest.ini || die
 	sed -e '/build-backend/s/flit.buildapi/flit_core.buildapi/' \
 		-e '/requires/s/flit/flit_core/' -i pyproject.toml || die
 	distutils-r1_src_prepare
 }
 
 python_test() {
-	epytest tests
+	epytest -o addopts= tests
 }
diff --git a/dev-python/xarray/xarray-2023.9.0.ebuild b/dev-python/xarray/xarray-2023.9.0.ebuild
index f3f9804df3d3..27ba3092c3f6 100644
--- a/dev-python/xarray/xarray-2023.9.0.ebuild
+++ b/dev-python/xarray/xarray-2023.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
diff --git a/dev-python/yattag/Manifest b/dev-python/yattag/Manifest
index df0f79209334..b24683a04e1d 100644
--- a/dev-python/yattag/Manifest
+++ b/dev-python/yattag/Manifest
@@ -1 +1,2 @@
 DIST yattag-1.15.1.tar.gz 28568 BLAKE2B 1e05274de46151089f4f16c1f9636f2cd837ddbfa03050d6d9f08ae6b961061c3bb610d1eca8ddfb58bdfeb1f2348a91de11c90c935f142944c7f82821425cad SHA512 78225d99f12d5373615e25741e5546a482800daa2724dabcab154d41c42f501d4ec523a7d5a6b0313a5c9faa1ba789280d29b46898a211ab975c669e67f0e605
+DIST yattag-1.15.2.tar.gz 28653 BLAKE2B c567390d204e6edc9b90ffdc5b406f9e4bdcf568148ed44dd202176ba31943c32154c4560e8c421c341fcd5fc1fc223451e15edebd249c369b1d779270e00034 SHA512 224fa56f3604bb65513f589ad449b98e00ef19c8503e7f57484e12de1c916d44d56b057d093af899bcc1d9aa1c77ca3a64c4facd97adf4ef2b7e99a5ff19f910
diff --git a/dev-python/yattag/yattag-1.15.2.ebuild b/dev-python/yattag/yattag-1.15.2.ebuild
new file mode 100644
index 000000000000..69721974e99c
--- /dev/null
+++ b/dev-python/yattag/yattag-1.15.2.ebuild
@@ -0,0 +1,27 @@
+# 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="Python library to generate HTML or XML in a readable, concise and pythonic way"
+HOMEPAGE="
+	https://www.yattag.org/
+	https://github.com/leforestier/yattag/
+	https://pypi.org/project/yattag/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+distutils_enable_tests unittest
+
+python_test() {
+	cd test || die
+	eunittest
+}