Adding metadata

60 files changed, 1172 insertions, 414 deletions

diff --git a/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild
new file mode 100644
index 000000000000..ed7fffaa201c
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild
@@ -0,0 +1,111 @@
+# 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} pypy3 )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	<dev-python/charset-normalizer-4[${PYTHON_USEDEP}]
+	>=dev-python/charset-normalizer-2.0[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-brotlicffi.patch"
+	)
+
+	# increase the timeout a little
+	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
+
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+
+	# which(1)... also -Werror, sigh
+	sed -i -e 's:which:command -v:' -e 's:-Werror::' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# workaround missing files
+	mkdir requirements tools || die
+	> requirements/cython.txt || die
+	> tools/gen.py || die
+	chmod +x tools/gen.py || die
+	# force rehashing first
+	emake requirements/.hash/cython.txt.hash
+	> .update-pip || die
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+		# broken by irrelevant deprecation warnings
+		tests/test_circular_imports.py::test_no_warnings
+		# TODO
+		tests/test_client_session.py::test_request_tracing_url_params
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			# upstream unconditionally blocks building C extensions
+			# on PyPy3 but the test suite needs an explicit switch,
+			# sigh
+			local -x AIOHTTP_NO_EXTENSIONS=1
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
+	rm -rf aiohttp || die
+	epytest -n "$(makeopts_jobs)" --forked
+}
diff --git a/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch b/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch
new file mode 100644
index 000000000000..20e3c7ea0e5d
--- /dev/null
+++ b/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch
@@ -0,0 +1,46 @@
+From 4d60891531637aed2fdc50a5dff4809d7d9b3f32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 20 Sep 2023 15:28:37 +0200
+Subject: [PATCH] [3.9] Support brotlicffi alternatively to brotli (#7611)
+ (#7620)
+
+---
+ aiohttp/http_parser.py    | 5 ++++-
+ tests/test_http_parser.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/aiohttp/http_parser.py b/aiohttp/http_parser.py
+index 91e01f43..521ff5db 100644
+--- a/aiohttp/http_parser.py
++++ b/aiohttp/http_parser.py
+@@ -49,7 +49,10 @@ else:
+     from typing_extensions import Literal
+ 
+ try:
+-    import brotli
++    try:
++        import brotlicffi as brotli
++    except ImportError:
++        import brotli
+ 
+     HAS_BROTLI = True
+ except ImportError:  # pragma: no cover
+diff --git a/tests/test_http_parser.py b/tests/test_http_parser.py
+index 4b185c9e..dc373ea8 100644
+--- a/tests/test_http_parser.py
++++ b/tests/test_http_parser.py
+@@ -21,7 +21,10 @@ from aiohttp.http_parser import (
+ )
+ 
+ try:
+-    import brotli
++    try:
++        import brotlicffi as brotli
++    except ImportError:
++        import brotli
+ except ImportError:
+     brotli = None
+ 
+-- 
+2.42.0
+
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index c265cf2a38d7..810dddeff139 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.12.0.tar.gz 1196597 BLAKE2B ff4bc1b94a32ab510b617befb039cb373f266fc891d355a1166a5559d4c053c57a834d9509a05bd5fbcb53a6ac0348038b2314907249ea9139a00c378b293bcb SHA512 170031efe7864835234f55123bff7496337ed1ce666fdaaa8a5040353dc23f98a0e2e6eaf95791f8be052b675015acb7e59b58436a470df9b4ce803c1ac5296b
+DIST alembic-1.12.1.tar.gz 1200204 BLAKE2B 640435e09ee7d33c7fa375b6fa784e2ef4097b50074753341717bc21fa8bd838ca00ced6c5cc9e3d82eca494270ffe84bc4b74dc96ed01cb9aded77f21e33520 SHA512 c76bae8f22dcbb4b2d235a17059a756c33bf40d4ea62b937373a29dab7c4f6e36eef0030a721222663c191eba565530299d28726f06e0c40d74daec1d3e03b33
diff --git a/dev-python/alembic/alembic-1.12.1.ebuild b/dev-python/alembic/alembic-1.12.1.ebuild
new file mode 100644
index 000000000000..3bd2162dc719
--- /dev/null
+++ b/dev-python/alembic/alembic-1.12.1.ebuild
@@ -0,0 +1,41 @@
+# 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="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# setup.cfg contains -p no:warnings in addopts which triggers
+	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
+	epytest -o addopts=
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 89bf53413632..68b6c211b24f 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,5 +1,2 @@
-DIST black-23.10.0.tar.gz 595880 BLAKE2B 978f0334abd1085ae9d6b085510c938235fb4b94ac0ecc4f13754f36d3d3152d4c5075d0177c5492a50cc45e8feb4af8d8eb023516d2fe85c0c61fa4b1eb8fb4 SHA512 2d24a269e66e07473afb0eeb0e25472ed53b20a4dad3622319cafd2f90f2615b4eba39971269c75208c439bfc430ca9b4922e7cce6ec9bd28e648cd62b75aea4
 DIST black-23.10.1.tar.gz 597307 BLAKE2B 1f7522653e6eb537bd57826c8f4efc0520bab6a62b4ba5718fbd841bad046cd0a62edd5a87e8d5884e80b5882c712304e48f2af75770bd6b25e85dc7b262dc71 SHA512 493c46e01411ba6fc4ed81362dc056fb6171a9ec4d85142e5018e610b887b4ed674a09b6b0ede7cd53504904400adbf8b914b37cf0e73a0abaa2eef469a9ec02
-DIST black-23.7.0.tar.gz 586177 BLAKE2B 4bb50b6c7409a97aa277f1048c17101a1c91368b9269cf4c08d3052c036887d2ed6e5f1f2e044c14f41bf2d969d65183413c2a9810f12d96cbf09778c9b1310e SHA512 78d5e87bfef4dcaff007455e8c72dcd45f9374c09da6f4ba45ae7caa980005d1bc984c68fa44d4abf7969a376a4039546e7e8f537c3aa1331d213e13dcbe3941
-DIST black-23.9.0.tar.gz 588540 BLAKE2B f3c94acb1af6c4bf1ada948d4ea7b7cd243184b920fab7e741d9e5ee4a82e163e5570ca1451424ea379362ae1755907e4b5e63b517a4e420d6cbe9d69655a10f SHA512 4d1ae51353c7a0a4113796fcc10824228d5bd9a0f19474efc8c5e3a9b929433a586f058521fd1dae35301e9e33e6d231b0584f81514104ac5c787f8e55cb9fa8
 DIST black-23.9.1.tar.gz 589529 BLAKE2B 642e1bb7b83653d879b3cbf1e618472a3106c1d9c918cbb57e5f517a96a8838a501f0e49f0fa1822d87600b4a8cecaac8da2bc9f08d5bc4131a611a90099f60a SHA512 0732409800a131fee69fffa8e7be8c128d26f0f75038235ba6f8c7451901199eed4118a2cb640ec0a5e6b40238bf41991c4a0559534f3a9f13d29f118e5b4aaa
diff --git a/dev-python/black/black-23.10.0.ebuild b/dev-python/black/black-23.10.0.ebuild
deleted file mode 100644
index 492cc6bcaffd..000000000000
--- a/dev-python/black/black-23.10.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-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 multiprocessing optfeature pypi
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" \
-		"dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-23.7.0.ebuild b/dev-python/black/black-23.7.0.ebuild
deleted file mode 100644
index a18cb4e2d895..000000000000
--- a/dev-python/black/black-23.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-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 multiprocessing optfeature pypi
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" \
-		"dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-23.9.0.ebuild b/dev-python/black/black-23.9.0.ebuild
deleted file mode 100644
index 492cc6bcaffd..000000000000
--- a/dev-python/black/black-23.9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-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 multiprocessing optfeature pypi
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" \
-		"dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-23.9.1.ebuild b/dev-python/black/black-23.9.1.ebuild
index 0a50947932ae..a18cb4e2d895 100644
--- a/dev-python/black/black-23.9.1.ebuild
+++ b/dev-python/black/black-23.9.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 7239e90f5e59..ad573ae523d0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.28.68.gh.tar.gz 717553 BLAKE2B dd8ba562613456e30c0f8bfe2f3befa9601b
 DIST boto3-1.28.69.gh.tar.gz 717978 BLAKE2B d7339e73fec81a8c8eb013b4136ab3961bb7c27cbf2b479abf12d814bb49f959dad91cc091b5ceabc01de9205b732b7df6c7fb7c37dfacc72a7d862f3e54a3f7 SHA512 2f6fa2192115367f8a899fe16308365509f543146c00be4e04c2aa323a188dedfe3e531b8d2a8b80fe9a143d101039a8a34babf5c3b1073f306f7946a45ec976
 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
diff --git a/dev-python/boto3/boto3-1.28.72.ebuild b/dev-python/boto3/boto3-1.28.72.ebuild
new file mode 100644
index 000000000000..fc1e40c08394
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.72.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 683f204ea942..f62d631e9f4f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.31.68.gh.tar.gz 11989788 BLAKE2B d8d34511e3ef65f54e1b305cf60cdb9
 DIST botocore-1.31.69.gh.tar.gz 11993410 BLAKE2B 3bb478c0d0bb8add09f3659739000ca5df6a2aead9ae51a44adb1d409d700fd27005cf9a96bffd679a70058125396761c2d654a93009cf660d9b7864567eeb7c SHA512 334aa763eed79a479d8e8ca64eaf44919f3d9af7b637577e12eecc162c79235255ab6bd19ca9edd0698215fb11e198f38bf924db1590b6da3121ef5f7aa7f00e
 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
diff --git a/dev-python/botocore/botocore-1.31.72.ebuild b/dev-python/botocore/botocore-1.31.72.ebuild
new file mode 100644
index 000000000000..9588357367ec
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.72.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/contourpy/contourpy-1.1.1.ebuild b/dev-python/contourpy/contourpy-1.1.1.ebuild
index ccbc572beaea..6d64e88bb354 100644
--- a/dev-python/contourpy/contourpy-1.1.1.ebuild
+++ b/dev-python/contourpy/contourpy-1.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
diff --git a/dev-python/cypari2/cypari2-2.1.4.ebuild b/dev-python/cypari2/cypari2-2.1.4-r1.ebuild
index 5be22dc6a916..f8eee2ceaab4 100644
--- a/dev-python/cypari2/cypari2-2.1.4.ebuild
+++ b/dev-python/cypari2/cypari2-2.1.4-r1.ebuild
@@ -24,7 +24,7 @@ IUSE=""
 DEPEND="sci-mathematics/pari[gmp,doc]
 	dev-python/cysignals[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/cython-3[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}/${P}-regen-bindings-for-each-python.patch" )
 
diff --git a/dev-python/dparse/Manifest b/dev-python/dparse/Manifest
new file mode 100644
index 000000000000..f44e340fd614
--- /dev/null
+++ b/dev-python/dparse/Manifest
@@ -0,0 +1 @@
+DIST dparse-0.6.3.tar.gz 20316 BLAKE2B 6da05ddd01b059f8c7473be99f80d0b870c61f5417b3957a7ba55077e2e4757c0a7438b64abde042ea9d4d4a8faa0024752e735c02136f8274ba3ad120324a02 SHA512 b73623fee7add7bf7d5f453c96f602a28ceca8552bba14f938ad3102da38f23e9a93469cf716beeb0a2f2a578562e3ab843c1e86b7615c315b100c0c32108a7b
diff --git a/dev-python/dparse/dparse-0.6.3.ebuild b/dev-python/dparse/dparse-0.6.3.ebuild
new file mode 100644
index 000000000000..bddecd05386b
--- /dev/null
+++ b/dev-python/dparse/dparse-0.6.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022-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="A parser for Python dependency files"
+HOMEPAGE="
+	https://github.com/pyupio/dparse
+	https://pypi.org/project/dparse/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dparse/metadata.xml b/dev-python/dparse/metadata.xml
new file mode 100644
index 000000000000..ed0f1dc95764
--- /dev/null
+++ b/dev-python/dparse/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>oz.tiram@gmail.com</email>
+  <name>Oz Tiram</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/fpylll/fpylll-0.6.0.ebuild b/dev-python/fpylll/fpylll-0.6.0-r1.ebuild
index 3cf8ef853f80..52377fb7e03c 100644
--- a/dev-python/fpylll/fpylll-0.6.0.ebuild
+++ b/dev-python/fpylll/fpylll-0.6.0-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="sci-libs/fplll
 	dev-python/cysignals[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/cython-3[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/graphviz/files/graphviz-0.20.1_fix_python3_12_test_deprecated_escape.patch b/dev-python/graphviz/files/graphviz-0.20.1_fix_python3_12_test_deprecated_escape.patch
new file mode 100644
index 000000000000..0193ef928775
--- /dev/null
+++ b/dev-python/graphviz/files/graphviz-0.20.1_fix_python3_12_test_deprecated_escape.patch
@@ -0,0 +1,30 @@
+From 5ce9fc5de4f2284baa27d7a8d68ab0885d032868 Mon Sep 17 00:00:00 2001
+From: Sebastian Bank <sebastian.bank@uni-leipzig.de>
+Date: Tue, 24 Oct 2023 20:39:52 +0200
+Subject: [PATCH] expect SyntaxWarning in test_deprecated_escape() under Python
+ 3.12
+
+https://docs.python.org/3.12/whatsnew/3.12.html#other-language-changes
+---
+ tests/test_quoting.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_quoting.py b/tests/test_quoting.py
+index e4ece573bd..3692d38a12 100644
+--- a/tests/test_quoting.py
++++ b/tests/test_quoting.py
+@@ -1,3 +1,4 @@
++import sys
+ import warnings
+ 
+ import pytest
+@@ -14,7 +15,8 @@ def test_deprecated_escape(recwarn, char):
+     escape = eval(rf'"\{char}"')
+ 
+     assert len(recwarn) == 1
+-    w = recwarn.pop(DeprecationWarning)
++    w = recwarn.pop(DeprecationWarning if sys.version_info < (3, 12)
++                    else SyntaxWarning)
+     assert str(w.message).startswith('invalid escape sequence')
+ 
+     assert escape == f'\\{char}'
diff --git a/dev-python/graphviz/graphviz-0.20.1-r1.ebuild b/dev-python/graphviz/graphviz-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..7f78f62505a4
--- /dev/null
+++ b/dev-python/graphviz/graphviz-0.20.1-r1.ebuild
@@ -0,0 +1,53 @@
+# 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="Simple Python interface for Graphviz"
+HOMEPAGE="
+	https://graphviz.readthedocs.io/
+	https://github.com/xflr6/graphviz/
+	https://pypi.org/project/graphviz/
+"
+SRC_URI="
+	https://github.com/xflr6/graphviz/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	media-gfx/graphviz
+"
+BDEPEND="
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
+		media-gfx/graphviz[gts,pdf]
+	)
+"
+
+PATCHES="
+	${FILESDIR}/${P}_fix_python3_12_test_deprecated_escape.patch
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:license_file:license_files:' \
+		-e 's:--cov --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" run-tests.py -vv -ra -l -Wdefault -p no:xdoctest ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index 7a0c1c0c9e84..51c632e4156e 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,2 +1,3 @@
 DIST griffe-0.36.4.gh.tar.gz 192823 BLAKE2B 42815673835bffebf97ab3bd436997329229596d24f4cd6fcd0b57f137b113bd42461cf9b8a33472ef6887dc7efdb4d88f31b6f503abb365f101311ff89fb5f3 SHA512 76d672f91643d347d15e97eb29bd1cdb24f843d396777287d5f5c28259f4f25dc7a89d53a83189e84572fcbed5201144d2b15f1bbc0864799c7703ce90b1cc7a
 DIST griffe-0.36.8.gh.tar.gz 194133 BLAKE2B 6fb1f38e3f9da452ba79253ed3786ec29d96bf208bd17f3920fcfff6dd0bc0fda39c26dca28ab07736dd64481137b0f4aa7d058b94d0815fddff0bcf8cf6cfc9 SHA512 bde9bd8313f4c5ff4617cc1f6edcb754a445366e2f03cb8b1126e13ab644c700ccab4fe6ebfed163a4da046ec729d3b2fe79b89d6d17b8c5446c198535795294
+DIST griffe-0.36.9.gh.tar.gz 197054 BLAKE2B 0351e72bf119bd98c392c56f254bf632552077d340c0c27b51780934c8baff1e6d33712f65bf31fefd2a8864d110790a78de3d77e2f5cf19429c9b68a5a01b9c SHA512 1b4cdfcfe6c1946183d3445e16b6f689cecec259842c97793af7fb60be3b885da82fddcfba74bed3ba82a8f475fb0321c2ebb03fe02feca80888c244cc4493df
diff --git a/dev-python/griffe/griffe-0.36.9.ebuild b/dev-python/griffe/griffe-0.36.9.ebuild
new file mode 100644
index 000000000000..433504b03ba8
--- /dev/null
+++ b/dev-python/griffe/griffe-0.36.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Signature generator for Python programs"
+HOMEPAGE="
+	https://mkdocstrings.github.io/griffe/
+	https://github.com/mkdocstrings/griffe/
+	https://pypi.org/project/griffe/
+"
+# Tests need files absent from the PyPI tarballs
+SRC_URI="
+	https://github.com/mkdocstrings/griffe/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# fragile to installed packages
+	# (failed on PySide2 for me)
+	tests/test_stdlib.py::test_fuzzing_on_stdlib
+)
diff --git a/dev-python/httpx/httpx-0.25.0.ebuild b/dev-python/httpx/httpx-0.25.0.ebuild
index ce6af05c7266..7752839d116f 100644
--- a/dev-python/httpx/httpx-0.25.0.ebuild
+++ b/dev-python/httpx/httpx-0.25.0.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 BDEPEND="
 	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
 	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
 		dev-python/anyio[${PYTHON_USEDEP}]
 		dev-python/brotlicffi[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
@@ -60,6 +59,11 @@ src_prepare() {
 		sed -i -e '/^httpx =/d' pyproject.toml || die
 	fi
 	sed -i -e '/rich/s:,<14::' pyproject.toml || die
+
+	# use brotlicffi instead of brotli in tests
+	sed -i -e 's:import brotli:import brotlicffi as brotli:' \
+		tests/test_decoders.py || die
+
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest
index 12bc0962ad5c..507e3bd820f6 100644
--- a/dev-python/leechcorepyc/Manifest
+++ b/dev-python/leechcorepyc/Manifest
@@ -1,2 +1,2 @@
-DIST leechcorepyc-2.14.3.tar.gz 126511 BLAKE2B a15b593144685d1f44dc1b580c8146f57d6c784e39d2a4aad8b4221ea718ee79dffe24877ac74198a2f8baeaca30a37d3fe1e6680265b94bcc30dc7117002706 SHA512 06c4c66cc92c2c55e2dd2e57e5488a1864dc21a1667b4b39237372e95fcd6b99b569754a44eea7afdae32207245016b096939c0edf11a4133fc24a343c892ba8
 DIST leechcorepyc-2.15.0.tar.gz 176764 BLAKE2B d0e4aa14d0cc1ce1ad3c14e704949c3b872b0889449ca81c9ac8642340b301ce52baf638ce58a6c3d1262f0cfe5cc5ec8eb26f80d01d87933c33a0f87ac46338 SHA512 d1d5f775d4166b510dd110dfe3e28179464170682d3092e7887fd7464fef21c2e2d1bb6d2294eb8ab45cb2566df15f0bf3254d098afd8bcb6b36186517496bd2
+DIST leechcorepyc-2.16.5.tar.gz 177365 BLAKE2B a5193e6e6c3fc2dc63358f62a2240b3a186b2acb37968597c5b5c690fbc94487c17bef55e8123bfdc55df2aa8668f667750a850fe4480b08d85bc311b1d2a95d SHA512 8d9b556d7ebc7de474dc853f9dfa005f91a19e6f7672d4021bc83c48b7d3ab0b6617bdbaf79e79b2fc930b64f448e3b8849d83c735077fd98776b026cff57a30
diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch
deleted file mode 100644
index 945f4e41e1c1..000000000000
--- a/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/893824
---- a/leechcore/Makefile
-+++ b/leechcore/Makefile
-@@ -6,7 +6,8 @@
- # CFLAGS  += -fsanitize=address -fsanitize=leak -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=bounds-strict -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow

- # CFLAGS  += -fsanitize=pointer-compare -fsanitize=pointer-subtract -fanalyzer

- # DEBUG FLAGS ABOVE

--CFLAGS  += -fPIE -fPIC -pie -fstack-protector -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,noexecstack

-+CFLAGS  := -D_FORTIFY_SOURCE=2 ${CFLAGS}

-+CFLAGS  += -fPIE -fPIC -pie -Wl,-z,noexecstack

- CFLAGS  += -Wall -Wno-unused-result -Wno-unused-variable -Wno-unused-value -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast

- LDFLAGS += -g -ldl -shared

- DEPS = leechcore.h

diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.16.0-respect-CC.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.16.0-respect-CC.patch
new file mode 100644
index 000000000000..ce29c885512b
--- /dev/null
+++ b/dev-python/leechcorepyc/files/leechcorepyc-2.16.0-respect-CC.patch
@@ -0,0 +1,30 @@
+--- a/leechcore/Makefile
++++ b/leechcore/Makefile
+@@ -1,5 +1,6 @@
+-CC=gcc

+-CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `pkg-config libusb-1.0 --libs --cflags`

++CC?=gcc

++PKG_CONFIG ?= pkg-config

++CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `$(PKG_CONFIG) libusb-1.0 --libs --cflags`

+ # DEBUG FLAGS BELOW

+ # export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_invalid_pointer_pairs=2

+ # CFLAGS  += -g -O0 -Wextra -Wno-unused-parameter -Wno-cast-function-type

+--- a/leechcore_device_rawtcp/Makefile
++++ b/leechcore_device_rawtcp/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ CFLAGS  += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden
+ LDFLAGS += -g -shared
+ DEPS = 
+--- a/leechcore_ft601_driver_linux/Makefile
++++ b/leechcore_ft601_driver_linux/Makefile
+@@ -1,5 +1,6 @@
+-CC=gcc
+-CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `pkg-config libusb-1.0 --libs --cflags`
++CC?=gcc
++PKG_CONFIG ?= pkg-config
++CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `$(PKG_CONFIG) libusb-1.0 --libs --cflags`
+ LDFLAGS += -g -shared
+ DEPS = leechcore_ft601_driver_linux.h
+ OBJ = fpga_libusb.o leechcore_ft601_driver_linux.o
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.16.5.ebuild
index 201cda7a3a13..62989aa65334 100644
--- a/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild
+++ b/dev-python/leechcorepyc/leechcorepyc-2.16.5.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
@@ -13,7 +14,7 @@ HOMEPAGE="https://github.com/ufrisk/LeechCore"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # leechcorepyc ships with a bundled version of the LeechCore library. So we
 # don't depend on the library here. But we must be aware this module doesn't
@@ -23,10 +24,16 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-respect-CC.patch"
-	"${FILESDIR}/${PN}-2.14.0-cflags.patch"
+	"${FILESDIR}/${PN}-2.16.0-respect-CC.patch"
 )
 
+src_prepare() {
+	default
+
+	# Avoid redefining _FORTIFY_SOURCE. See #893824, #906715.
+	sed -i -e 's/ -D_FORTIFY_SOURCE=2 / /g' leechcore/Makefile || die
+}
+
 src_configure() {
 	tc-export CC
 
diff --git a/dev-python/mkdocs/mkdocs-1.5.3-r1.ebuild b/dev-python/mkdocs/mkdocs-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..1e489d762255
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.5.3-r1.ebuild
@@ -0,0 +1,85 @@
+# 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
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="
+	https://www.mkdocs.org/
+	https://github.com/mkdocs/mkdocs/
+	https://pypi.org/project/mkdocs/
+"
+SRC_URI="
+	https://github.com/mkdocs/mkdocs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+# https://bugs.gentoo.org/873349
+# Building documentation requires packaging: callouts and mkdocs-autorefs
+#
+# IUSE="doc"
+#
+# BDEPEND="
+# 	doc? (
+# 		$(python_gen_any_dep '
+# 			dev-python/mdx-gh-links[${PYTHON_USEDEP}]
+# 			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+# 		')
+# 	)
+# "
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.3.3[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.11.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Tests fails if additional themes are installed
+	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes
+	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes_error
+	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes_warning
+
+	# Does not work in emerge env
+	mkdocs/tests/config/config_options_tests.py::ListOfPathsTest::test_paths_localized_to_config
+
+	# TODO
+	mkdocs/tests/build_tests.py::testing_server
+	mkdocs/tests/livereload_tests.py::testing_server
+)
+
+python_compile_all() {
+	default
+# 	if use doc; then
+# 		# cannot just do mkdocs build, because that fails if
+# 		# the package isn't already installed
+# 		python -m mkdocs build || die "Failed to make docs"
+# 		# Colliding files found by ecompress:
+# 		rm site/sitemap.xml.gz || die
+# 		HTML_DOCS=( "site/." )
+# 	fi
+}
+
+python_test() {
+	epytest '-opython_files=*tests.py' mkdocs/tests
+}
diff --git a/dev-python/numpy/numpy-1.26.0.ebuild b/dev-python/numpy/numpy-1.26.0.ebuild
index 4d0a7fc30420..004999c00789 100644
--- a/dev-python/numpy/numpy-1.26.0.ebuild
+++ b/dev-python/numpy/numpy-1.26.0.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 # is barely supported anyway, see bug #914358.
 IUSE="+lapack"
 if [[ ${PV} != *_[rab]* ]] ; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-python/openstacksdk/openstacksdk-1.5.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..1db1ded3268e
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-1.5.0-r1.ebuild
@@ -0,0 +1,83 @@
+# 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 collection of libraries for building applications to work with OpenStack"
+HOMEPAGE="
+	https://opendev.org/openstack/openstacksdk/
+	https://github.com/openstack/openstacksdk/
+	https://pypi.org/project/openstacksdk/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Internet?
+	sed -e 's:test_create_dynamic_large_object:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..5761def1cadc
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild
@@ -0,0 +1,83 @@
+# 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 collection of libraries for building applications to work with OpenStack"
+HOMEPAGE="
+	https://opendev.org/openstack/openstacksdk/
+	https://github.com/openstack/openstacksdk/
+	https://pypi.org/project/openstacksdk/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Internet?
+	sed -e 's:test_create_dynamic_large_object:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/oslo-config/oslo-config-9.2.0-r1.ebuild b/dev-python/oslo-config/oslo-config-9.2.0-r1.ebuild
new file mode 100644
index 000000000000..a4e2ad8272e3
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-9.2.0-r1.ebuild
@@ -0,0 +1,58 @@
+# 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 Configuration API"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.config/
+	https://github.com/openstack/oslo.config/
+	https://pypi.org/project/oslo.config/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken by some dep upgrade
+	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
+		oslo_config/tests/test_cfg.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x COLUMNS=80
+	eunittest -b
+}
diff --git a/dev-python/pefile/pefile-2023.2.7.ebuild b/dev-python/pefile/pefile-2023.2.7.ebuild
index 68b5960a4996..aed1349c7efc 100644
--- a/dev-python/pefile/pefile-2023.2.7.ebuild
+++ b/dev-python/pefile/pefile-2023.2.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/pipdeptree/Manifest b/dev-python/pipdeptree/Manifest
new file mode 100644
index 000000000000..3257b50c00fb
--- /dev/null
+++ b/dev-python/pipdeptree/Manifest
@@ -0,0 +1 @@
+DIST pipdeptree-2.13.0.tar.gz 32980 BLAKE2B 37a7ecf2cef1fb2533655b1b911216ed5d069ce639198896517a49be010b1697df2a81aecba001dfbcd9b67618411754a97ad198f2e2c32d73d2104020d5eb01 SHA512 eccc41e1428d2f7146386a6aa0e1c5833302b9eaaa810250cb8029f8cf7f8f8173477553f143835b4dfac318331b9b7467493a3fcae15569d7d371d58b27963f
diff --git a/dev-python/pipdeptree/metadata.xml b/dev-python/pipdeptree/metadata.xml
new file mode 100644
index 000000000000..ed0f1dc95764
--- /dev/null
+++ b/dev-python/pipdeptree/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>oz.tiram@gmail.com</email>
+  <name>Oz Tiram</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pipdeptree/pipdeptree-2.13.0.ebuild b/dev-python/pipdeptree/pipdeptree-2.13.0.ebuild
new file mode 100644
index 000000000000..f72df3a9008b
--- /dev/null
+++ b/dev-python/pipdeptree/pipdeptree-2.13.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022-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="Utility for displaying installed packages in a dependency tree"
+HOMEPAGE="
+	https://github.com/tox-dev/pipdeptree
+	https://pypi.org/project/pipdeptree/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index f0b6618dab16..55f477212328 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,2 @@
-DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1 SHA512 870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff
 DIST pipenv-2023.7.11.gh.tar.gz 10828051 BLAKE2B 3eeab9c5328dc5914e7e024f07bf105241ca777187ce50d5765f0ca1bb7270d8c6bda6a842b188fcacb57ba8bf5d0ed5f7b29b9edce5d45e485c8079691ac991 SHA512 d37cf030f4f77d4c95d0f0883140b1e829d4473b43fdc3f61c3d39827fdf9c98ecfc794d3eacf3ebedb55dadb018416c1250938a193a6382ac61ce859d19e193
+DIST pipenv-2023.9.8.gh.tar.gz 10819425 BLAKE2B 3fd67d5aa7022251660c09d47e6d2487eabca507dbac8ebb2c298ef46cae452e6f2330615053d80a404f98ce523e5ff15ef89adbc85779305633b45e6b989423 SHA512 328cab44cea16bb685f745f80804e2a8b951e93a24379d5b61faeae4730e58d48cff663652f785800dd1dffc7a05f398ca54eb5118cd4fcfa43c35dad86f60eb
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
deleted file mode 100644
index eeae85039e12..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/pipenv/project.py b/pipenv/project.py
-index 75ee7d401..ed43cf2bc 100644
---- a/pipenv/project.py
-+++ b/pipenv/project.py
-@@ -40,9 +40,11 @@ from pipenv.utils.shell import (
-     system_which,
- )
- from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
--from pipenv.vendor import click, plette, toml, tomlkit
-+from pipenv.vendor import plette
- from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
- 
-+import click, toml, tomlkit
-+
- try:
-     # this is only in Python3.8 and later
-     from functools import cached_property
-diff --git a/pipenv/utils/environment.py b/pipenv/utils/environment.py
-index 2e066eef2..9385689bf 100644
---- a/pipenv/utils/environment.py
-+++ b/pipenv/utils/environment.py
-@@ -1,7 +1,8 @@
- import os
-+import dotenv
-+import click
- 
- from pipenv import environments
--from pipenv.vendor import click, dotenv
- 
- 
- def load_dot_env(project, as_dict=False, quiet=False):
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch
deleted file mode 100644
index 8218d0f59e1c..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/pipenv/project.py b/pipenv/project.py
-index 55251bc5f..9fd46f089 100644
---- a/pipenv/project.py
-+++ b/pipenv/project.py
-@@ -183,9 +183,9 @@ class Project:
-                 "name": "pypi",
-             }
- 
--        default_sources_toml = f"[[source]]\n{toml.dumps(self.default_source)}"
-+        default_sources_toml = f"[[source]]\n{tomlkit.dumps(self.default_source)}"
-         for pip_conf_index in pip_conf_indexes:
--            default_sources_toml += f"\n\n[[source]]\n{toml.dumps(pip_conf_index)}"
-+            default_sources_toml += f"\n\n[[source]]\n{tomlkit.dumps(pip_conf_index)}"
-         plette.pipfiles.DEFAULT_SOURCE_TOML = default_sources_toml
- 
-         # Hack to skip this during pipenv run, or -r.
-
-
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
deleted file mode 100644
index e23a42e46b59..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/pipenv/project.py b/pipenv/project.py
-index ed43cf2bc..55251bc5f 100644
---- a/pipenv/project.py
-+++ b/pipenv/project.py
-@@ -13,6 +13,13 @@ import urllib.parse
- from json.decoder import JSONDecodeError
- from pathlib import Path
- 
-+import click, tomlkit
-+
-+try:
-+    import tomllib as toml
-+except ImportError:
-+    import tomli as toml
-+
- from pipenv.cmdparse import Script
- from pipenv.environment import Environment
- from pipenv.environments import Setting, is_in_virtualenv, normalize_pipfile_path
-@@ -43,8 +50,6 @@ from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
- from pipenv.vendor import plette
- from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
- 
--import click, toml, tomlkit
--
- try:
-     # this is only in Python3.8 and later
-     from functools import cached_property
-diff --git a/pipenv/utils/toml.py b/pipenv/utils/toml.py
-index d4157d01c..27d9975ae 100644
---- a/pipenv/utils/toml.py
-+++ b/pipenv/utils/toml.py
-@@ -1,4 +1,9 @@
--from pipenv.vendor import toml, tomlkit
-+try:
-+    import tomllib as toml
-+except ImportError:
-+    import tomli as toml
-+
-+import tomlkit
- 
- 
- def cleanup_toml(tml):
-diff --git a/pipenv/vendor/dparse/parser.py b/pipenv/vendor/dparse/parser.py
-index faaad2e8e..4c59474e9 100644
---- a/pipenv/vendor/dparse/parser.py
-+++ b/pipenv/vendor/dparse/parser.py
-@@ -10,6 +10,11 @@ from io import StringIO
- from configparser import ConfigParser, NoOptionError
- from pathlib import PurePath
- 
-+try:
-+    import tomllib as toml
-+except ImportError:
-+    import tomli as toml
-+
- from .errors import MalformedDependencyFileError
- from .regex import HASH_REGEX
- 
-@@ -17,7 +22,6 @@ from .dependencies import DependencyFile, Dependency
- from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement,\
-     InvalidRequirement
- from . import filetypes
--import pipenv.vendor.toml as toml
- from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet
- from pipenv.patched.pip._vendor.packaging.version import Version, InvalidVersion
- import json
-diff --git a/pipenv/vendor/dparse/updater.py b/pipenv/vendor/dparse/updater.py
-index 7b7ba9a53..fe20a213f 100644
---- a/pipenv/vendor/dparse/updater.py
-+++ b/pipenv/vendor/dparse/updater.py
-@@ -3,9 +3,13 @@ from __future__ import absolute_import, print_function, unicode_literals
- import re
- import json
- import tempfile
--import pipenv.vendor.toml as toml
- import os
- 
-+try:
-+    import tomllib as toml
-+except ImportError:
-+    import tomli as toml
-+
- 
- class RequirementsTXTUpdater(object):
-     SUB_REGEX = r"^{}(?=\s*\r?\n?$)"
diff --git a/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch b/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch
new file mode 100644
index 000000000000..d97987fd0db3
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch
@@ -0,0 +1,34 @@
+From 8ee76835b2d615156bb6d329417d6ce8d19bfa3a Mon Sep 17 00:00:00 2001
+From: Oz Tiram <oz.tiram@gmail.com>
+Date: Wed, 20 Sep 2023 23:11:27 +0200
+Subject: [PATCH 2/4] Append always install to pip extra args
+
+---
+ pipenv/routines/install.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py
+index 2f135b435..e30f2da52 100644
+--- a/pipenv/routines/install.py
++++ b/pipenv/routines/install.py
+@@ -459,6 +459,17 @@ def batch_install_iteration(
+     allow_global=False,
+     extra_pip_args=None,
+ ):
++    # Gentoo patch:
++    # Install dependencies into the venv even if they exist
++    # in the system.
++    # This is needed because pipenv imports the system packages to run.
++    # It does not change your system's packages.
++
++    if (extra_pip_args is not None) and ("-I" not in extra_pip_args):
++        extra_pip_args.append("-I")
++
++    # End of Gentoo patch
++
+     with temp_environ():
+         if not allow_global:
+             os.environ["PIP_USER"] = "0"
+-- 
+2.41.0
+
diff --git a/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch b/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch
new file mode 100644
index 000000000000..cf211f1ab846
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch
@@ -0,0 +1,53 @@
+From b6b25911c050f0bec192e5ccb09ddc6dc3d5fa7d Mon Sep 17 00:00:00 2001
+From: Oz Tiram <oz.tiram@gmail.com>
+Date: Wed, 20 Sep 2023 23:03:57 +0200
+Subject: [PATCH 1/4] Inject system packages
+
+---
+ pipenv/patched/pip/__main__.py | 8 ++++++++
+ pipenv/resolver.py             | 6 ++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py
+index 032297163..59f7ad19e 100644
+--- a/pipenv/patched/pip/__main__.py
++++ b/pipenv/patched/pip/__main__.py
+@@ -21,10 +21,18 @@ if __package__ == "":
+ if __name__ == "__main__":
+     import importlib.util
+     import sys
++
++    SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
++
++    # Inject site directory into system path.
++    sys.path.insert(-1, SITE_PACKAGES_ROOT)
++
+     spec = importlib.util.spec_from_file_location(
+         "pipenv", location=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "__init__.py"))
+     pipenv = importlib.util.module_from_spec(spec)
+     sys.modules["pipenv"] = pipenv
++
++
+     spec.loader.exec_module(pipenv)
+     from pipenv.patched.pip._internal.cli.main import main as _main
+ 
+diff --git a/pipenv/resolver.py b/pipenv/resolver.py
+index 82e01ca39..29461b878 100644
+--- a/pipenv/resolver.py
++++ b/pipenv/resolver.py
+@@ -10,6 +10,12 @@ except ImportError:
+     cached_property = property
+ 
+ 
++SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(__file__))
++
++# Inject site directory into system path.
++sys.path.insert(-1, SITE_PACKAGES_ROOT)
++
++
+ def _ensure_modules():
+     spec = importlib.util.spec_from_file_location(
+         "typing_extensions",
+-- 
+2.41.0
+
diff --git a/dev-python/pipenv/pipenv-2023.4.29-r1.ebuild b/dev-python/pipenv/pipenv-2023.9.8.ebuild
index 146553b71716..b124e46c2a49 100644
--- a/dev-python/pipenv/pipenv-2023.4.29-r1.ebuild
+++ b/dev-python/pipenv/pipenv-2023.9.8.ebuild
@@ -16,25 +16,27 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64"
 
 PATCHES=(
-	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
-	"${FILESDIR}/pipenv-2023.4.29-append-always-install.patch"
-	"${FILESDIR}/pipenv-2023.4.29-fix-imports.patch"
-	"${FILESDIR}/pipenv-2023.4.29-fix-toml-in-vendor.patch"
-	"${FILESDIR}/pipenv-2023.4.29-fix-toml-dump.patch"
+	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
+	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
 )
 
 RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-didyoumean[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	dev-python/dparse[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	dev-python/pipdeptree[${PYTHON_USEDEP}]
+	dev-python/plette[${PYTHON_USEDEP}]
 	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2.0.0[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pythonfinder[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
@@ -42,6 +44,8 @@ RDEPEND="
 	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
 	dev-python/tomlkit[${PYTHON_USEDEP}]
 "
 
@@ -62,10 +66,13 @@ distutils_enable_tests pytest
 # The vendored packages should eventually all be removed
 # see: https://bugs.gentoo.org/717666
 src_prepare() {
+	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
+
 	local pkgName
 	local jobs=$(makeopts_jobs)
-	local packages=( attr attrs cerberus colorama dotenv markupsafe \
-					 pexpect ptyprocess pyparsing requests urllib3 tomlkit )
+	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
+					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
+					 requests urllib3 shellingham tomli tomlkit )
 	for pkgName in ${packages[@]}; do
 		find ./ -type f -print0 | \
 			xargs --max-procs="${jobs}" --null \
@@ -93,15 +100,23 @@ src_prepare() {
 			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
 
 	# remove python ruaml yaml
-	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
+	sed --in-place -e \
+		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
+		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
+	sed --in-place -e \
+		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
+		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
 
 	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
 
-	for fname in Makefile README.md README.rst ruamel.*.LICENSE vendor.txt; do
-		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/$fname"
+	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
+		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
 	done
 
+	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
+
+	rm -Rfv pipenv/vendor || die "Could not vendor"
+	rm -Rfv examples || die "Could not remove examples"
 }
 
 python_test() {
diff --git a/dev-python/plette/Manifest b/dev-python/plette/Manifest
new file mode 100644
index 000000000000..1f6c9dbd5706
--- /dev/null
+++ b/dev-python/plette/Manifest
@@ -0,0 +1 @@
+DIST plette-0.4.4.tar.gz 10684 BLAKE2B e0ff780fdd3d2bcaefadce528310389e7a796e9d3b13f458aa4313365ef8b15a3188bf50a602eac0cebd857d9dc747c7c637d958d61964ada42ab1873676263b SHA512 a7eb51546523c1b0159286cb6a2f1c248a383c33a41f19e2d62af9371bcf5d8042a953b28f2b9aea1ed568d93464b3dabd3e4fb6f4b37c3c0e73b84f26a01f6d
diff --git a/dev-python/plette/metadata.xml b/dev-python/plette/metadata.xml
new file mode 100644
index 000000000000..ed0f1dc95764
--- /dev/null
+++ b/dev-python/plette/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>oz.tiram@gmail.com</email>
+  <name>Oz Tiram</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/plette/plette-0.4.4.ebuild b/dev-python/plette/plette-0.4.4.ebuild
new file mode 100644
index 000000000000..c4537f625a03
--- /dev/null
+++ b/dev-python/plette/plette-0.4.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022-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="PythonFinder: Cross Platform Search Tool for Finding Pythons"
+HOMEPAGE="
+	https://github.com/sarugaku/plette
+	https://pypi.org/project/plette/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cerberus[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 0adf713b5f32..1f10a1c7784c 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,2 +1,2 @@
-DIST pyOpenSSL-23.1.1.tar.gz 183402 BLAKE2B c0339203bb1794da67a0c2fe2e20b5736b3e0628d01b13805e3c30771d60fe07df22a7c090260cf1fad80abb1e566e2efd1e8e184a142e335189fa3bd885e7ac SHA512 581f907ac9acf71c3340bbd413ecf161dafeac1cb406649c683fc770f8bcfcc1630a977defa9b3ee218631959ed14ea62d0a02cdf74af9fdce5ddec34ad1e1ea
 DIST pyOpenSSL-23.2.0.tar.gz 185132 BLAKE2B 06330623bf5934b89cf88dee508c2c4bdd170f805a111f082624b2f8c59fd56e48d5954ef7d9f98768e88aaabaa9e04594ea717784a86401e6e64433e699c9b8 SHA512 a467801bf94959a067d9d3551b47d17d4798bf0b87d253d41a89cac9cdb1731a967a98bda3e83ab8a560ed5fdc0a17f34604f3c6e0f6789bc4c920bc49f520c9
+DIST pyOpenSSL-23.3.0.tar.gz 183043 BLAKE2B 63ef42c63ec96db320e85b8aae8441ff8378b3ed3b5ad780d7d7f4b07bd70649da2d1f0d433bee7c162c6c8b6c430e9547b695af0851cd38f8b1d14649577da5 SHA512 e75ffd9922798d7bb08be50782a2185aaf69cdc41e4c83e0c904d7b7b3b5da3bbfe73abe965eb0bfe1b325de79eb9f72f16a05444f0310ebfaf8f5bf8ce1fe87
diff --git a/dev-python/pyopenssl/pyopenssl-23.1.1.ebuild b/dev-python/pyopenssl/pyopenssl-23.3.0.ebuild
index 8172e4e406b1..34241fe04bed 100644
--- a/dev-python/pyopenssl/pyopenssl-23.1.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-23.3.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 2023 Liguros 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 )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 PYTHON_REQ_USE="threads(+)"
 
 PYPI_NO_NORMALIZE=1
@@ -24,7 +23,6 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	<dev-python/cryptography-41[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-38.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index 4d519779c8fe..1f68e931145e 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,4 +1,4 @@
 DIST pypy3.10-gentoo-patches-7.3.12_p5.tar.xz 15404 BLAKE2B d9aa579b82f6bfafc3bdbd1f818d9cc85e3d33e6e72ec8dd65486e6239184dbd6720af1819493016c03e0898dec0c4f4fe361ef4ecdc63a365bc37a9452f1d2a SHA512 a705dd608d2a0027979d20301ec23aebc4a1ff20a826f2572fbdd702b079303797926e3908fd2afd7d4b0d165ffc1f4988a1c5181dd0f8ce7a7a2cc725630e23
-DIST pypy3.10-gentoo-patches-7.3.13.tar.xz 4776 BLAKE2B 9f0ef159c8aa2d3edb5ee0e14be694c4a7c1165d70b16e9b13b6e59da7334354cc8593186a2ff47d4a0ce8c76abdf4a3c12ec3ffdd7a90cc4f30b39c259c3ee7 SHA512 86bfbf7f26f259c0850074c9062544ee091f7a65359cb17dae3ec287841e7a812d7185cb552f3546acdde3965efe0e6c0fb728c30b64779fca10be2f7c4d634f
+DIST pypy3.10-gentoo-patches-7.3.13_p1.tar.xz 5068 BLAKE2B 2dd739a0ec9fc358a1fa1c278d06ed30f63f01565a593abc8b6f6bc14a5210ae3b6d541558b61ec97aad4f520e362310b825409ac46698846e66adbabcc805e7 SHA512 4ba5b2aa173b70ace6ee01ba4b870ab7baceea0b2fc6b0592787f80493c3f76ed0c662e0c86e9043c1bff981aec0268c7122d5a59d592bdb99cd8224953c8b2f
 DIST pypy3.10-v7.3.12-src.tar.bz2 23009064 BLAKE2B ad45d90de9ae51803ebcfa202763889f92f7e5c2939331433a496e53ca67dd6eeaf9c61e16cb648945409dff3c6dd6b8a2a01dfe1bed6cd6a9df98f112bff181 SHA512 080520c7de267e17a2823f06cd0a15c108a2c32fc296d6e24782050eb546fa74852d948ede2c381dba110774121b20efc3a07b553acd0ac0db4a844dfc09069e
 DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.13-r1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.13_p1.ebuild
index eadc6fd3034c..eadc6fd3034c 100644
--- a/dev-python/pypy3_10/pypy3_10-7.3.13-r1.ebuild
+++ b/dev-python/pypy3_10/pypy3_10-7.3.13_p1.ebuild
diff --git a/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild b/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
deleted file mode 100644
index 248d4bde0e8f..000000000000
--- a/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
+++ /dev/null
@@ -1,32 +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
-
-DESCRIPTION="A Python binding of ptrace library"
-HOMEPAGE="https://github.com/vstinner/python-ptrace"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vstinner/python-ptrace"
-else
-	SRC_URI="https://github.com/vstinner/python-ptrace/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	./runtests.py --tests tests/ || die
-}
diff --git a/dev-python/pythonfinder/Manifest b/dev-python/pythonfinder/Manifest
new file mode 100644
index 000000000000..6c59aafc1289
--- /dev/null
+++ b/dev-python/pythonfinder/Manifest
@@ -0,0 +1 @@
+DIST pythonfinder-2.0.5.tar.gz 718776 BLAKE2B 32a49dbff143042554d5328b61b612e3bde7a870d53a229303b6bdd2c2ce76457bf6aadcdb215efa332407003c1319215292f3278a2808b669b5b7819af08902 SHA512 4d205c66d7ae36f4f2b8ddab9cce00f4efd5548a41d251470a515b88f8be2dcede75372b9301223822031ae663c6ccf77156531b0dd5d8972424f90641255c5b
diff --git a/dev-python/pythonfinder/files/2.0.5-fix-import-cached-property.patch b/dev-python/pythonfinder/files/2.0.5-fix-import-cached-property.patch
new file mode 100644
index 000000000000..ce1af3244fbd
--- /dev/null
+++ b/dev-python/pythonfinder/files/2.0.5-fix-import-cached-property.patch
@@ -0,0 +1,13 @@
+diff --git a/src/pythonfinder/models/path.py b/src/pythonfinder/models/path.py
+index a8fb807..a933a91 100644
+--- a/src/pythonfinder/models/path.py
++++ b/src/pythonfinder/models/path.py
+@@ -19,7 +19,7 @@ from typing import (
+     Union,
+ )
+ 
+-from cached_property import cached_property
++from functools import cached_property
+ from pydantic import Field, root_validator
+ 
+ from ..environment import (
diff --git a/dev-python/pythonfinder/metadata.xml b/dev-python/pythonfinder/metadata.xml
new file mode 100644
index 000000000000..ed0f1dc95764
--- /dev/null
+++ b/dev-python/pythonfinder/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>oz.tiram@gmail.com</email>
+  <name>Oz Tiram</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pythonfinder/pythonfinder-2.0.5.ebuild b/dev-python/pythonfinder/pythonfinder-2.0.5.ebuild
new file mode 100644
index 000000000000..3494a5c6b092
--- /dev/null
+++ b/dev-python/pythonfinder/pythonfinder-2.0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022-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="PythonFinder: Cross Platform Search Tool for Finding Pythons"
+HOMEPAGE="
+	https://github.com/sarugaku/pythonfinder
+	https://pypi.org/project/pythonfinder/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}/2.0.5-fix-import-cached-property.patch"
+)
+
+RDEPEND="
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild b/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild
index bd04eaa23e09..da5132dbc384 100644
--- a/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild
+++ b/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="https://github.com/schettino72/sphinx_press_theme"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.6.1-r1.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..008820836928
--- /dev/null
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.6.1-r1.ebuild
@@ -0,0 +1,51 @@
+# 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="Sphinx extensions for BibTeX style citations"
+HOMEPAGE="
+	https://github.com/mcmtroffaes/sphinxcontrib-bibtex/
+	https://pypi.org/project/sphinxcontrib-bibtex/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pybtex-0.24[${PYTHON_USEDEP}]
+	>=dev-python/pybtex-docutils-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-3.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# rinoh not packaged
+	test/test_citation_rinoh.py::test_citation_rinoh
+	test/test_citation_rinoh.py::test_citation_rinoh_multidoc
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	epytest
+}
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index 4915913f7eb2..0cd5706592a1 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,2 +1 @@
-DIST yara-python-4.3.1.gh.tar.gz 37871 BLAKE2B d8b8eac6b12dc4c5c3362e8b5396fe9ff5a0b0557488ed94257ec2b7be813c870d39f78b53b3312b6b1100f4bdc81375ebf27cd21a569c5688503b81934c3881 SHA512 78cd53f756967ef79cc742acffaeea53631ee475c07efd1506eba7e0630b2e570ba03686da1fa3247c9339faa67daf6c372913731b73233626661c0a9f575e41
 DIST yara-python-4.4.0.gh.tar.gz 38072 BLAKE2B 748dab52e99e264c7d9eb0d7d4482fb76b29f8463f031cf20687e30ae792141633d12e6b3f20303c8ee99bcdaafa01a3df9f73aaf3dd722ad5da9820e6a4d39e SHA512 bc72c2f65e3fe3d7f94728565143b787df6cc63313a3e8b9f159a5cfc3c947f5233674a1213fd2c6454f6165b676da366319794f9fa7c695c43e5523c29a1432
diff --git a/dev-python/yara-python/yara-python-4.3.1.ebuild b/dev-python/yara-python/yara-python-4.3.1.ebuild
deleted file mode 100644
index 284d0702f53e..000000000000
--- a/dev-python/yara-python/yara-python-4.3.1.ebuild
+++ /dev/null
@@ -1,40 +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
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/VirusTotal/yara-python.git"
-else
-	SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	=app-forensics/yara-$(ver_cut 1-2)*
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF
-	[build_ext]
-	dynamic_linking = True
-	EOF
-}
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}