Adding metadata

59 files changed, 426 insertions, 86 deletions

diff --git a/dev-python/cattrs/cattrs-23.2.1.ebuild b/dev-python/cattrs/cattrs-23.2.1.ebuild
index 0560d7d4cb1f..e2be26b5db3e 100644
--- a/dev-python/cattrs/cattrs-23.2.1.ebuild
+++ b/dev-python/cattrs/cattrs-23.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
@@ -42,7 +42,9 @@ BDEPEND="
 		>=dev-python/tomlkit-0.11.4[${PYTHON_USEDEP}]
 		>=dev-python/ujson-5.4.0[${PYTHON_USEDEP}]
 		test-rust? (
-			>=dev-python/orjson-3.5.2[${PYTHON_USEDEP}]
+			$(python_gen_cond_dep '
+				>=dev-python/orjson-3.5.2[${PYTHON_USEDEP}]
+			' 'python*')
 		)
 	)
 "
diff --git a/dev-python/cleo/cleo-2.1.0.ebuild b/dev-python/cleo/cleo-2.1.0.ebuild
index 001105778d68..baf61640af7f 100644
--- a/dev-python/cleo/cleo-2.1.0.ebuild
+++ b/dev-python/cleo/cleo-2.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
@@ -41,6 +41,16 @@ src_prepare() {
 }
 
 python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/ui/test_exception_trace.py::test_render_debug_better_error_message_recursion_error
+			)
+			;;
+	esac
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x PYTEST_PLUGINS=pytest_mock
 	epytest
diff --git a/dev-python/contourpy/contourpy-1.2.0.ebuild b/dev-python/contourpy/contourpy-1.2.0.ebuild
index 7a66f5c98864..4606ba621d80 100644
--- a/dev-python/contourpy/contourpy-1.2.0.ebuild
+++ b/dev-python/contourpy/contourpy-1.2.0.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
index bee3123ba451..cd9d6e50e80b 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index bbdbdf476767..ffa13bcb558c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,3 +2,4 @@ DIST hypothesis-6.88.1.gh.tar.gz 9391389 BLAKE2B 0d258ff3e662bdef1c8321119c49ae4
 DIST hypothesis-6.88.3.gh.tar.gz 9391730 BLAKE2B 439b5d4aca9f8163bebb7b0ba632fc1d7eb49a61e656c3849287b700bb92c5aea02a30d816029152243c03050e67351a8a6c4dd87ed6eaadd5a81f5a72c8c139 SHA512 780a83928ffdc976c581df43874a1d1e4ec82d9c27f6bc151e5a4103dd9e4d18de0609af8964136cc041ebec258b1fd2c6438b66636e9cd8e7f81a88381bf5ce
 DIST hypothesis-6.88.4.gh.tar.gz 9392092 BLAKE2B d33e764fc02111f37efa678927d48f1de7097156c401ab85c7a3fc16f22ff3582bfaec8fef60e010d9a9953bcdbbd8f212b5a7765a7967b93d6dd4bb1d6e5915 SHA512 420dd525abb56dad8983b16767cb4d7f4b411ee68439e2317d7be5582fcf9a8735929b4746bbfc37b286d389dcd36c38da797466bd6c4c555d108a56b30511ad
 DIST hypothesis-6.89.0.gh.tar.gz 9393601 BLAKE2B e289c0a77493eed00373dfd91048d46f4030b3728b0d7adf2c6e46fa5749931a4c0077645d94a2ddb737a42cc4ed9213c4112f850f69bf888e82f1c033eab9cc SHA512 9439a39fcdf4acb530871248d9e673bbc657875d5d1f6d2fd9f9a8f45b8a58de8e6cf418ec86025aa959d6db7dd40538d2d4c2a9aaf762a013dc715246a12533
+DIST hypothesis-6.90.0.gh.tar.gz 9395761 BLAKE2B fb910f8f885355d6045f1f218dedf35e6713fbed8d9d247310ec7a8b7aa4549b30715a50ebb0daa5e48f863b6c582a8cbc8910f26ab0da0476bc423f942534fc SHA512 02ca4f5b4c0c6cc2b949d46ac221a3c06a9d05fb89fc17c1a8e42813172b914822ba484970a20d1be1900e5396bf020ba1e274344aa8bf16253f18a6f11c6ac1
diff --git a/dev-python/hypothesis/hypothesis-6.90.0.ebuild b/dev-python/hypothesis/hypothesis-6.90.0.ebuild
new file mode 100644
index 000000000000..f0d092b67f0b
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.90.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 5a5d08f6b00b..aea1c401d9c1 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,4 +1,5 @@
 DIST imageio-2.31.6.gh.tar.gz 412220 BLAKE2B b8eb95d8bf4fd1f8a0873581f401667e5ad4bb1a4cc43527e163e292cac6177e095c140857e8acdd483029f8d155a7e7bde33b41fc53d5945ff42e2685f74d03 SHA512 10f9fc7ac7ef1c3352659ec29c66684133c51350e33f16c617806f75b6137aeb8a580975ae430afab16f06843efa3e41b7e4ab042fb183d44f1a3e5c1d68efeb
 DIST imageio-2.32.0.gh.tar.gz 412403 BLAKE2B 7e29d7e8008caeecbc4c76293da77fe85b0d3d4e6cd12b7ab8f5d0ab895bb22ff6d29bf70469ff848a8bc8449d5211d96f5a2fd9a31ec88beb93d1568ab78f50 SHA512 b2a1accdf48e23f1b3813fae5f68afa4501fad47968e20f91af2ba433c629748d6cec5a914c4b2288ce527c81aadea296bf1b2d877ef39b3ac99f85a60aa854d
+DIST imageio-2.33.0.gh.tar.gz 412609 BLAKE2B 4219199e7ba4810299f66b6d4870875e822d1db87dbfd3eb1e9cea2e74edc3c8f17625d7fdb7a8761db9127e85ccac090a68d01fb4bdf458474823f87cd1d55b SHA512 2dfbddf9489748a3d15851a711bbce9da039a8f3b81638124c51b3b96f06ea83de257132043113b8f5431c987d0701794fe341a17a4623a00c2fa827e6e5e4a1
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
diff --git a/dev-python/imageio/imageio-2.33.0.ebuild b/dev-python/imageio/imageio-2.33.0.ebuild
new file mode 100644
index 000000000000..c1df6e0cbd4a
--- /dev/null
+++ b/dev-python/imageio/imageio-2.33.0.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=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# known broken
+	# https://github.com/imageio/imageio/issues/890
+	tests/test_freeimage.py::test_exr_write
+	# requires pillow-heif, also possibly Internet
+	tests/test_pillow.py::test_avif_remote
+	tests/test_pillow.py::test_heif_remote
+)
diff --git a/dev-python/ipykernel/ipykernel-6.26.0.ebuild b/dev-python/ipykernel/ipykernel-6.26.0.ebuild
index 63cfc525d417..7ed231f3ccae 100644
--- a/dev-python/ipykernel/ipykernel-6.26.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.26.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi virtualx
@@ -21,7 +21,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
-	!elibc_Darwin? ( >=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}] )
+	!elibc_Darwin? (
+		$(python_gen_cond_dep '
+			>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
+		' 'python*')
+	)
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/files/ipyparallel-8.6.1-pypy310.patch b/dev-python/ipyparallel/files/ipyparallel-8.6.1-pypy310.patch
new file mode 100644
index 000000000000..fae998d51972
--- /dev/null
+++ b/dev-python/ipyparallel/files/ipyparallel-8.6.1-pypy310.patch
@@ -0,0 +1,32 @@
+From 401980b2a79ef15cc3b35fad51163339c8654751 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 20 Nov 2023 15:45:04 +0100
+Subject: [PATCH] Use pre-3.10 serialization code on PyPy3.10
+
+The new serialization code for Python 3.10+ does not seem to work
+on PyPy3.10 7.3.13, as it causes:
+
+    ValueError: no signature found for builtin type <class 'code'>
+
+Switch back to the old code if PyPy is used, at least for the time
+being.  With this change, the test suite passes on PyPy3.10.
+
+Fixes #845
+---
+ ipyparallel/serialize/codeutil.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ipyparallel/serialize/codeutil.py b/ipyparallel/serialize/codeutil.py
+index 2d3acfa2a..80d107765 100644
+--- a/ipyparallel/serialize/codeutil.py
++++ b/ipyparallel/serialize/codeutil.py
+@@ -27,7 +27,8 @@ def code_ctor(*args):
+ }
+ # pass every supported arg to the code constructor
+ # this should be more forward-compatible
+-if sys.version_info >= (3, 10):
++# (broken on pypy: https://github.com/ipython/ipyparallel/issues/845)
++if sys.version_info >= (3, 10) and not hasattr(sys, "pypy_version_info"):
+     _code_attr_names = tuple(
+         _code_attr_map.get(name, name)
+         for name, param in inspect.signature(types.CodeType).parameters.items()
diff --git a/dev-python/ipyparallel/ipyparallel-8.6.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.6.1.ebuild
index 97aa8434a3d0..f3da7da55874 100644
--- a/dev-python/ipyparallel/ipyparallel-8.6.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 optfeature pypi
@@ -51,6 +51,8 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch
+	# https://github.com/ipython/ipyparallel/pull/846
+	"${FILESDIR}"/${P}-pypy310.patch
 )
 
 src_configure() {
diff --git a/dev-python/ipython/ipython-8.17.2.ebuild b/dev-python/ipython/ipython-8.17.2.ebuild
index 8d1acdec19fe..ca6bd129d281 100644
--- a/dev-python/ipython/ipython-8.17.2.ebuild
+++ b/dev-python/ipython/ipython-8.17.2.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_FULL=( python3_{10..12} )
 PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 PYTHON_REQ_USE='readline(+),sqlite,threads(+)'
 
@@ -41,11 +40,9 @@ RDEPEND="
 BDEPEND="
 	test? (
 		app-text/dvipng[truetype]
-		$(python_gen_cond_dep '
-			>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-			dev-python/nbformat[${PYTHON_USEDEP}]
-		' "${PYTHON_FULL[@]}")
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
 		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 		dev-python/pickleshare[${PYTHON_USEDEP}]
@@ -53,12 +50,10 @@ BDEPEND="
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	doc? (
-		$(python_gen_cond_dep '
-			>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		' "${PYTHON_FULL[@]}")
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
 	)
 "
 
@@ -66,9 +61,7 @@ distutils_enable_tests pytest
 
 RDEPEND+="
 	nbconvert? (
-		$(python_gen_cond_dep '
-			dev-python/nbconvert[${PYTHON_USEDEP}]
-		' "${PYTHON_FULL[@]}")
+		dev-python/nbconvert[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
@@ -79,11 +72,11 @@ PDEPEND="
 			dev-python/widgetsnbextension[${PYTHON_USEDEP}]
 		)
 		qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-		smp? (
-			>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-			>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-		)
-	' "${PYTHON_FULL[@]}")
+	' 'python*')
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)
 "
 
 PATCHES=(
@@ -108,7 +101,7 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	if use doc && has "${EPYTHON/./_}" "${PYTHON_FULL[@]}"; then
+	if use doc; then
 		emake -C docs html_noapi
 		HTML_DOCS=( docs/build/html/. )
 	fi
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r4.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r4.ebuild
index 2b44c1689d81..dbb6f267cf03 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r4.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.1.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.1.ebuild
index 524e933f48d2..41f1e3b48a32 100644
--- a/dev-python/ipywidgets/ipywidgets-8.1.1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-8.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
diff --git a/dev-python/json5/json5-0.9.11.ebuild b/dev-python/json5/json5-0.9.11.ebuild
index bc12dd764cbf..6ca5a6b4fcec 100644
--- a/dev-python/json5/json5-0.9.11.ebuild
+++ b/dev-python/json5/json5-0.9.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter-client/jupyter-client-8.6.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.6.0.ebuild
index e875d945cd45..e0d2febbda4b 100644
--- a/dev-python/jupyter-client/jupyter-client-8.6.0.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
diff --git a/dev-python/jupyter-core/jupyter-core-5.5.0.ebuild b/dev-python/jupyter-core/jupyter-core-5.5.0.ebuild
index e20ce9db9bbc..fd1a2c6167f8 100644
--- a/dev-python/jupyter-core/jupyter-core-5.5.0.ebuild
+++ b/dev-python/jupyter-core/jupyter-core-5.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
index c5faabcbdd17..36e1d761b7ff 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYPI_NO_NORMALIZE=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 optfeature pypi
 
diff --git a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
index bf2c5a5eb557..7c758257a1bd 100644
--- a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
+++ b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild b/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild
index 3c55cc73bb0b..83db03a72059 100644
--- a/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.2.2.ebuild b/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.2.2.ebuild
index bbb0b8012ee5..8824350bada7 100644
--- a/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.2.2.ebuild
+++ b/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=jupyter
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.25.2.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.25.2.ebuild
index 619021d169f4..28bb6ea5a5d6 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.25.2.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.25.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.9.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.9.ebuild
index 5eb97854b550..db53f3e9869e 100644
--- a/dev-python/jupyterlab/jupyterlab-4.0.9.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.0.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi xdg
 
diff --git a/dev-python/kerberos/kerberos-1.3.1-r2.ebuild b/dev-python/kerberos/kerberos-1.3.1-r2.ebuild
index 8f1907ae48c3..9730839deba0 100644
--- a/dev-python/kerberos/kerberos-1.3.1-r2.ebuild
+++ b/dev-python/kerberos/kerberos-1.3.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbclient/nbclient-0.9.0.ebuild b/dev-python/nbclient/nbclient-0.9.0.ebuild
index 133f8f69b1ac..c3b5c78351c8 100644
--- a/dev-python/nbclient/nbclient-0.9.0.ebuild
+++ b/dev-python/nbclient/nbclient-0.9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
@@ -38,17 +38,10 @@ BDEPEND="
 	)
 "
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(
-	nbclient/tests/test_client.py::test_many_parallel_notebooks
-	'nbclient/tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
+	# hangs?
+	'tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
 )
-
-python_test() {
-	# The tests run the pydevd debugger, the debugger prints a warning
-	# in python3.11 when frozen modules are being used.
-	# This warning makes the tests fail, silence it.
-	local -x PYDEVD_DISABLE_FILE_VALIDATION=1
-	epytest
-}
diff --git a/dev-python/nbconvert/nbconvert-7.11.0.ebuild b/dev-python/nbconvert/nbconvert-7.11.0.ebuild
index 5ce372ffc342..9f46a712cd87 100644
--- a/dev-python/nbconvert/nbconvert-7.11.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.11.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi virtualx
 
diff --git a/dev-python/nbformat/nbformat-5.9.2.ebuild b/dev-python/nbformat/nbformat-5.9.2.ebuild
index 1422fe963b8a..6ba0d28d872c 100644
--- a/dev-python/nbformat/nbformat-5.9.2.ebuild
+++ b/dev-python/nbformat/nbformat-5.9.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1 pypi
diff --git a/dev-python/notebook-shim/notebook-shim-0.2.3.ebuild b/dev-python/notebook-shim/notebook-shim-0.2.3.ebuild
index cb728de15a6c..4f3963592e97 100644
--- a/dev-python/notebook-shim/notebook-shim-0.2.3.ebuild
+++ b/dev-python/notebook-shim/notebook-shim-0.2.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/openapi-core/openapi-core-0.18.2.ebuild b/dev-python/openapi-core/openapi-core-0.18.2.ebuild
index 9a4f45a4b5dc..5bb0c3c0ba3f 100644
--- a/dev-python/openapi-core/openapi-core-0.18.2.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.18.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/openpyxl/openpyxl-3.1.2.ebuild b/dev-python/openpyxl/openpyxl-3.1.2.ebuild
index aeeae6bc7857..15e9ae108972 100644
--- a/dev-python/openpyxl/openpyxl-3.1.2.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
index 6e73cc6b1e45..50fe299defa1 100644
--- a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/parse/parse-1.19.1.ebuild b/dev-python/parse/parse-1.19.1.ebuild
index 9c94672ae02e..f28a45cf01e5 100644
--- a/dev-python/parse/parse-1.19.1.ebuild
+++ b/dev-python/parse/parse-1.19.1.ebuild
@@ -4,12 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Parse strings using a specification based on the Python format() syntax"
-HOMEPAGE="https://pypi.org/project/parse/"
-SRC_URI="https://github.com/r1chardj0n3s/parse/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/r1chardj0n3s/parse/
+	https://pypi.org/project/parse/
+"
+SRC_URI="
+	https://github.com/r1chardj0n3s/parse/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pendulum/pendulum-2.1.2-r2.ebuild b/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
index b4c5ad6da3a1..e68c8ec52a88 100644
--- a/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
+++ b/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/picobox/Manifest b/dev-python/picobox/Manifest
index 8a65ac80232b..3acbd4ef327c 100644
--- a/dev-python/picobox/Manifest
+++ b/dev-python/picobox/Manifest
@@ -1 +1,2 @@
 DIST picobox-3.0.0.tar.gz 28599 BLAKE2B e29dd7b0b5b23175a21f8fe6efe83adc6edfb0302c7a27f92f518deeba8f74f8e2d481a8eef6a1363fa0fb02ffc00b462181bab09872f6da5c1c9063c4d274e6 SHA512 ac8cecba10527e7dc096eb66f3b6743b523c305bd9725d5be8ec2822857a65ef8e9cc0ddcb85b8c656c557e7dc6cf0903035753bf8fe8cc2616b463e0a82bb5d
+DIST picobox-4.0.0.tar.gz 22666 BLAKE2B ea447ea63ce5b9e964e61b2a16f781dbb911dc8c763243a412cff7e63e4e6fec9b1cfe5b9ca3933140c6f0eaee8dd797de5690243e0e2a0dacea04b9466f2a02 SHA512 c9554048b1bcd504647f26c67dd17822ad3069f738bd9e71704a89b68478683e8bf641c3b08a86cdde95d56ba7073b14c41801ba70657cc3fec4b6ec6c312089
diff --git a/dev-python/picobox/picobox-4.0.0.ebuild b/dev-python/picobox/picobox-4.0.0.ebuild
new file mode 100644
index 000000000000..c54a1f700f5b
--- /dev/null
+++ b/dev-python/picobox/picobox-4.0.0.ebuild
@@ -0,0 +1,28 @@
+# 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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Dependency injection framework designed with Python in mind"
+HOMEPAGE="
+	https://github.com/ikalnytskyi/picobox/
+	https://pypi.org/project/picobox/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index c7ff605c4fef..02d933036402 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1 +1,2 @@
+DIST pivy-0.6.8-python312-unittests.patch 39874 BLAKE2B e63be84da3b852c89e04cf7baa61b44e175414245dc20799a6463fecb6896082dfb03a365540880e37b30cde99c0124bd5b2aacf9d011d580cda2c1add917922 SHA512 3cb3980b31b2d6ff957a38b028319c32bfc0398cd08048171f1fe7a0b3e25a6a6096960fdfc2ada1b4adf184c381537214a7110569e91e75ede7b951a4e3ac98
 DIST pivy-0.6.8.tar.gz 6618458 BLAKE2B 08c57f0d7bff15a7f9d49b56b75b44c587416eb0feb2b237db48d7e2edd478f9212d7e898f4dd102b9d5dd10046dd652f37a9974861598c7ba91d7fdb1145c91 SHA512 723b09028f2e3075056b9588cebad0ddccbc98d0c15552b9565c177b0de764b9645f88ea2bc534ccf606f2e0b59f91e1d03551b55ece66c0654ce9cdf09a1a7c
diff --git a/dev-python/pivy/files/pivy-0.6.8-python312.patch b/dev-python/pivy/files/pivy-0.6.8-python312.patch
new file mode 100644
index 000000000000..6742d7579521
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.8-python312.patch
@@ -0,0 +1,23 @@
+From d3faf04b8770c60ca9b2186059ee82201e3620ad Mon Sep 17 00:00:00 2001
+From: lorenz <looooo@users.noreply.github.com>
+Date: Thu, 13 Jul 2023 23:59:17 +0200
+Subject: [PATCH] python 3.12 support
+
+PyUnicode_GET_SIZE -> PyUnicode_GET_LENGTH
+---
+ Inventor/SoInput.i | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Inventor/SoInput.i b/Inventor/SoInput.i
+index 0925ab50..f0be6383 100644
+--- a/Inventor/SoInput.i
++++ b/Inventor/SoInput.i
+@@ -10,7 +10,7 @@
+   if (PyUnicode_Check($input))
+   {
+     $1 = (void *) PyUnicode_AsUTF8($input);
+-    $2 = PyUnicode_GET_SIZE($input);
++    $2 = PyUnicode_GET_LENGTH($input);
+   }
+   else if (PyBytes_Check($input))
+   { 
diff --git a/dev-python/pivy/pivy-0.6.8.ebuild b/dev-python/pivy/pivy-0.6.8.ebuild
index cb699991cd99..a62f277a7447 100644
--- a/dev-python/pivy/pivy-0.6.8.ebuild
+++ b/dev-python/pivy/pivy-0.6.8.ebuild
@@ -16,7 +16,10 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
 else
-	SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~andrewammerlaan/${P}-python312-unittests.patch
+	"
 	KEYWORDS="amd64 x86"
 fi
 
@@ -46,6 +49,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
 	"${FILESDIR}"/${PN}-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
 	"${FILESDIR}"/${PN}-0.6.7-find-qmake.patch
+	# https://github.com/coin3d/pivy/issues/105
+	"${FILESDIR}"/${PN}-0.6.8-python312.patch
+	# https://github.com/coin3d/pivy/pull/109
+	"${DISTDIR}"/${PN}-0.6.8-python312-unittests.patch
 )
 
 DOCS=( AUTHORS HACKING NEWS README.md THANKS )
diff --git a/dev-python/pycountry/pycountry-22.3.5.ebuild b/dev-python/pycountry/pycountry-22.3.5.ebuild
index 25d11644b32a..68610b1e57d0 100644
--- a/dev-python/pycountry/pycountry-22.3.5.ebuild
+++ b/dev-python/pycountry/pycountry-22.3.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~riscv ~sparc x86"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/pygccxml/Manifest b/dev-python/pygccxml/Manifest
index c98076c800aa..c3d47e08d233 100644
--- a/dev-python/pygccxml/Manifest
+++ b/dev-python/pygccxml/Manifest
@@ -1,2 +1,3 @@
 DIST pygccxml-2.2.1.gh.tar.gz 3170283 BLAKE2B b53123c59d098f56d97841225d10ffd4156b993244e48c4ad30e2f62b6d95d69e0ae4bbfc86bb492e88e8f52d916401f29a6ec7024277d1e32b3af691a12e919 SHA512 32013617d4d632617b616d3787631c5b09da441a87bb15b88e3b287f17b85e1388308e85dd385276966ac09114536a5863edd5fbb96539547783fd2d41c6e8ce
 DIST pygccxml-2.3.0.gh.tar.gz 3165248 BLAKE2B 177591d818f3ff91b7981ee1b1af9d03f79869508cddd03ece8f3b5e447982dc2d9434fa42db290c98d8c5fb4f4ee4ae7ef86e2b065dc28ba4b7843a36cad4e1 SHA512 6c5710c842c8e6101af73335ea66dc18ae86861f9cd5c59b4aa1037f60914934ba22a821d7f35cf954f5c40800433bacfc0d4bd0ae1bb5946a4dd950c606ceea
+DIST pygccxml-2.4.0.gh.tar.gz 3165189 BLAKE2B 855b0b6313be29e7719abe4cc6e654904657c11bfd7310d647227ce9d7760821eeb348dcd9892afbcc3d467db96daaf3010e92803fe28962db9a255cf81eae46 SHA512 48bf4887344c68d0a93a3908cc0a744f3d6a74dce92be88527e85cf7ba1a46f88560730dce0b858f31523cada836aad40461de935c5c2a041de0fa2ae5e38c30
diff --git a/dev-python/pygccxml/files/pygccxml-2.4.0-pyproject.patch b/dev-python/pygccxml/files/pygccxml-2.4.0-pyproject.patch
new file mode 100644
index 000000000000..ba00ed45ad34
--- /dev/null
+++ b/dev-python/pygccxml/files/pygccxml-2.4.0-pyproject.patch
@@ -0,0 +1,10 @@
+--- pyproject.toml.orig	2023-11-20 13:59:55.807461669 +0100
++++ pyproject.toml	2023-11-20 14:00:37.335886130 +0100
+@@ -1,5 +1,6 @@
+ [build-system]
+-requires = ["setuptools", "wheel"]
++requires = ["setuptools"]
++build-backend = "setuptools.build_meta"
+ 
+ [project]
+ name = "pygccxml"
diff --git a/dev-python/pygccxml/pygccxml-2.4.0.ebuild b/dev-python/pygccxml/pygccxml-2.4.0.ebuild
new file mode 100644
index 000000000000..1eeef48d7973
--- /dev/null
+++ b/dev-python/pygccxml/pygccxml-2.4.0.ebuild
@@ -0,0 +1,33 @@
+# 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 specialized XML reader to navigate C++ declarations"
+HOMEPAGE="https://github.com/CastXML/pygccxml"
+SRC_URI="https://github.com/CastXML/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/castxml
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+
+python_prepare_all() {
+	eapply -p0 "${FILESDIR}/${PN}-2.4.0-pyproject.patch"
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pymongo/pymongo-4.6.0.ebuild b/dev-python/pymongo/pymongo-4.6.0.ebuild
index 3a09bc89fcda..f057c24fa2a5 100644
--- a/dev-python/pymongo/pymongo-4.6.0.ebuild
+++ b/dev-python/pymongo/pymongo-4.6.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit check-reqs distutils-r1
 
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
index 068465ce61ca..e4c9dc550efb 100644
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pytest-tornado/pytest-tornado-0.8.1-r1.ebuild b/dev-python/pytest-tornado/pytest-tornado-0.8.1-r1.ebuild
index 63870b4e24e8..385593c668bc 100644
--- a/dev-python/pytest-tornado/pytest-tornado-0.8.1-r1.ebuild
+++ b/dev-python/pytest-tornado/pytest-tornado-0.8.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2-r1.ebuild b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2-r1.ebuild
index 3cf1cad138d2..1da07f24c9e0 100644
--- a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2-r1.ebuild
+++ b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild b/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild
index 37fbbf640813..a949a61d9644 100644
--- a/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild
+++ b/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rapidfuzz-capi/rapidfuzz-capi-1.0.5.ebuild b/dev-python/rapidfuzz-capi/rapidfuzz-capi-1.0.5.ebuild
index dc69bc76445a..14cf6e50e2a9 100644
--- a/dev-python/rapidfuzz-capi/rapidfuzz-capi-1.0.5.ebuild
+++ b/dev-python/rapidfuzz-capi/rapidfuzz-capi-1.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.5.2.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.5.2.ebuild
index d16dae15a97d..9e204061f7f8 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.5.2.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.5.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_EXT=1
 # custom wrapper over setuptools
 DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 multiprocessing pypi
 
diff --git a/dev-python/requests-cache/requests-cache-1.1.1.ebuild b/dev-python/requests-cache/requests-cache-1.1.1.ebuild
index e705484ad768..ed38b04c6495 100644
--- a/dev-python/requests-cache/requests-cache-1.1.1.ebuild
+++ b/dev-python/requests-cache/requests-cache-1.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 optfeature
@@ -62,6 +62,13 @@ python_test() {
 	)
 
 	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# "database is locked", upstream probably relies on GC
+				# too much
+				tests/integration/test_sqlite.py
+			)
+			;;
 		python3.12)
 			# https://github.com/requests-cache/requests-cache/issues/845
 			EPYTEST_DESELECT+=(
diff --git a/dev-python/scikit-build/scikit-build-0.17.6.ebuild b/dev-python/scikit-build/scikit-build-0.17.6.ebuild
index a5a9dd59978c..5a84a5a95494 100644
--- a/dev-python/scikit-build/scikit-build-0.17.6.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.17.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
@@ -52,6 +52,17 @@ src_prepare() {
 }
 
 python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# no "library" in (our install of) pypy3
+				tests/test_cmaker.py::test_get_python_library
+			)
+			;;
+	esac
+
 	epytest -m "not isolated and not nosetuptoolsscm"
 	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
 }
diff --git a/dev-python/scipy/scipy-1.11.3-r1.ebuild b/dev-python/scipy/scipy-1.11.3-r1.ebuild
index fd201edd0bbf..273c26126483 100644
--- a/dev-python/scipy/scipy-1.11.3-r1.ebuild
+++ b/dev-python/scipy/scipy-1.11.3-r1.ebuild
@@ -38,7 +38,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
diff --git a/dev-python/sqlparse/sqlparse-0.4.4.ebuild b/dev-python/sqlparse/sqlparse-0.4.4.ebuild
index 358da96d158c..3c2455993387 100644
--- a/dev-python/sqlparse/sqlparse-0.4.4.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/tblib/tblib-3.0.0.ebuild b/dev-python/tblib/tblib-3.0.0.ebuild
index 8bdc3030d111..22e16a7ea796 100644
--- a/dev-python/tblib/tblib-3.0.0.ebuild
+++ b/dev-python/tblib/tblib-3.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/timeout-decorator/timeout-decorator-0.5.0-r1.ebuild b/dev-python/timeout-decorator/timeout-decorator-0.5.0-r1.ebuild
index 4d62143bb12a..b05507ef24a6 100644
--- a/dev-python/timeout-decorator/timeout-decorator-0.5.0-r1.ebuild
+++ b/dev-python/timeout-decorator/timeout-decorator-0.5.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild b/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
index 4047af96c84c..984393a41541 100644
--- a/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
+++ b/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
@@ -22,7 +22,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.9.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.9.ebuild
index d99ec369a05c..eb5d1b1aecc6 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.9.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
@@ -23,10 +23,6 @@ BDEPEND="
 	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
 "
 
-RDEPEND="
-	dev-python/notebook[${PYTHON_USEDEP}]
-"
-
 src_install() {
 	distutils-r1_src_install
 
diff --git a/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild b/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
index a5bcb2a8d9b8..e4ae040fb8ba 100644
--- a/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/xlrd/xlrd-2.0.1-r1.ebuild b/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
index 253ffe4ae912..128f00f4fe69 100644
--- a/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
+++ b/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1