Adding metadata

39 files changed, 735 insertions, 56 deletions

diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 6262ace17b25..7178a4f43652 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1 +1,2 @@
 DIST PyGithub-1.57.gh.tar.gz 3159952 BLAKE2B e753a72c0fe20f0697ff3246fd2c3445571079ae18bee50abf6543da51d9e889c67cafa0bf36a980223f3423cf880c36d24ce74a6bf245117a080186a209ddcb SHA512 6c8880d21c5134581be6bc5549184c3f13cef8f360a46a459234f22f3dd4fc5f8b573cc3a5d870bba6c6129ff7b670e739d87e42f2e34ddcdf357a3fe2b3cadc
+DIST PyGithub-1.58.0.gh.tar.gz 3172006 BLAKE2B a1d71c11a359d296fbf895a1fc3c9f60490b7c63fd65c92a3a025c2b306ca281a03cf65d49a1dcca5bb0a9c537b130f5ef7bd9ab594f1521a106857f83669f65 SHA512 cbaca0d116be56f6d44084892e52b7073378743178342a480c2b3990542e476bee52947d56f8be950d05d5c06fb8eaeb32acb35285c79e0cbbd8b24239af6cba
diff --git a/dev-python/PyGithub/PyGithub-1.58.0.ebuild b/dev-python/PyGithub/PyGithub-1.58.0.ebuild
new file mode 100644
index 000000000000..5ad78d5f92e7
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.58.0.ebuild
@@ -0,0 +1,39 @@
+# 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_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="
+	https://github.com/PyGithub/PyGithub/
+	https://pypi.org/project/PyGithub/
+"
+SRC_URI="
+	https://github.com/PyGithub/PyGithub/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/deprecated[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/antlr4-python3-runtime/Manifest b/dev-python/antlr4-python3-runtime/Manifest
index c99f021c0595..8cba64bedde7 100644
--- a/dev-python/antlr4-python3-runtime/Manifest
+++ b/dev-python/antlr4-python3-runtime/Manifest
@@ -1 +1,2 @@
 DIST antlr-4.11.1.gh.tar.gz 4383139 BLAKE2B ac6e49ae8d4d44923e40eba98fa2c850cb594929ae1a29223678377aabe6f35d57f95e125393aa6b7145828c876442608883356b594ab43346c891ca932d9fd5 SHA512 a81f2ebcbcb6e63eb651731ceafab55f66401a3da0a6b2688cfe96d3bda299542dab5b05aaf4c8a8520ba32891b23adbf912011a4e45afae492a2a350d333ae9
+DIST antlr-4.12.0.gh.tar.gz 4408352 BLAKE2B 9a7ba9149c459e5b6a7eec750d1623f10be4aa119479d93dbf7f3955176013ac3e56d3a95399460ed5170cf2bf01fff586852a84d2cb86fe04e89846211e39cd SHA512 2217509e8766ceee7b9e5fdee3a9972b1f42fb442bdf3e3c0a8027f88bc49508386adb5ea8a02c982ef2176e2b5e60669746a387ec426682d7f43bca28aa4b6f
diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.12.0.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.12.0.ebuild
new file mode 100644
index 000000000000..8fdbbcbef085
--- /dev/null
+++ b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.12.0.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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 runtime for ANTLR"
+HOMEPAGE="
+	https://www.antlr.org/
+	https://github.com/antlr/antlr4/
+	https://pypi.org/project/antlr4-python3-runtime/
+"
+SRC_URI="
+	https://github.com/antlr/antlr4/archive/${PV}.tar.gz
+		-> antlr-${PV}.gh.tar.gz
+"
+S="${WORKDIR}/antlr4-${PV}/runtime/Python3"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/async-lru/Manifest b/dev-python/async-lru/Manifest
index 27d0fdc15813..73ca055194b4 100644
--- a/dev-python/async-lru/Manifest
+++ b/dev-python/async-lru/Manifest
@@ -1 +1,2 @@
 DIST async-lru-1.0.3.gh.tar.gz 10709 BLAKE2B 437880c419d0d8df5c790ff9b93d0b608dacba1847fc0974d35f89ff97bdd07589edc5371c729889791cb05cd8ec684764ecedc6d0d36b05ee930f885570095c SHA512 530c6e1f7a1ecc8a78cac927ccb9dfc2e394498a6ed3f54e73e4e9af48ef26ddeaad56a056a50b3c3974324af69b393cd94b1f4d20e3a2944b217c03a6bd6394
+DIST async-lru-2.0.0.gh.tar.gz 11119 BLAKE2B 7bfc174ec68ce8a3ad7de94c6eb555aa53be5561c7376bf8149e91f9d8f08361f4b51ba45cecaa77cc89c5c7fc4a225f71fd56878cf64647f7cc82a06ec76b02 SHA512 dbbd4f63d488bde8d4e15b205bca2850c8992d67491c5c0d2c245ed2bc1005df523f837c736db96b6cdcad22c9cf409111040e9d3a86a38c5b627aa256a6b5a6
diff --git a/dev-python/async-lru/async-lru-2.0.0.ebuild b/dev-python/async-lru/async-lru-2.0.0.ebuild
new file mode 100644
index 000000000000..42ea497ac184
--- /dev/null
+++ b/dev-python/async-lru/async-lru-2.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple lru_cache for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/async-lru/
+	https://pypi.org/project/async-lru/
+"
+SRC_URI="
+	https://github.com/aio-libs/async-lru/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6.2.4[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cache-clear::' \
+		-e 's:--no-cov-on-fail --cov=async_lru --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cppy/cppy-1.2.1-r1.ebuild b/dev-python/cppy/cppy-1.2.1-r1.ebuild
index dfa08f334e2e..350d16c4055f 100644
--- a/dev-python/cppy/cppy-1.2.1-r1.ebuild
+++ b/dev-python/cppy/cppy-1.2.1-r1.ebuild
@@ -4,13 +4,12 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="C++ header library which makes it easier to write Python extension modules"
 HOMEPAGE="https://pypi.org/project/cppy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/cycler/cycler-0.11.0-r1.ebuild b/dev-python/cycler/cycler-0.11.0-r1.ebuild
index cdff7d2ac1eb..ec68f4f6d74b 100644
--- a/dev-python/cycler/cycler-0.11.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.11.0-r1.ebuild
@@ -4,17 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Composable style cycles"
 HOMEPAGE="
 	https://matplotlib.org/cycler/
 	https://pypi.org/project/cycler/
-	https://github.com/matplotlib/cycler"
+	https://github.com/matplotlib/cycler/
+"
 SRC_URI="
 	https://github.com/matplotlib/cycler/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 2956ec32876b..c0ba4fe175eb 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1 +1,2 @@
 DIST jaraco.functools-3.5.2.tar.gz 14650 BLAKE2B 63db54c5f3dea7b0ce939ad51fc4c4f5831a620a37a47d416079d4c9ad30cb3d401567a8da036178122431cafd8dc18e4a9b59241cd1fc0b8bd1c057dfb8a034 SHA512 3f67d151f4f6553b3e560b0e6ab71cf726d6c8f36ef5e9f69b6325605547797e19a3f9eb1331cf332db498538953ccaeb75820528e6599fd7cf125abdc073e69
+DIST jaraco.functools-3.6.0.tar.gz 16054 BLAKE2B dad26dc73b696dfc62d21f1807a8340e770b35881f3877fdcf6e7e95080f0cd1a81339500c306f4afb2dda896a19ffffcc1715cfc4d37f36594d59af3fd58ac0 SHA512 f249e6cdcbd88e5c89663bcc0467687ea533dc70b7c9260880da8099380b5c925f05933527de6043aa0786709a0ca4d4b183cc18acab69d8e88f63a3360e9efb
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild
new file mode 100644
index 000000000000..7100a1699dbd
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.functools/
+	https://pypi.org/project/jaraco.functools/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
+S=${WORKDIR}/${P/-/.}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "jaraco.functools"
+		version = "${PV}"
+		description = "Functools like those found in stdlib"
+	EOF
+}
+
+python_install() {
+	distutils-r1_python_install
+	# rename to workaround a bug in pkg_resources
+	# https://bugs.gentoo.org/834522
+	mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die
+}
diff --git a/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch
new file mode 100644
index 000000000000..705855f02f61
--- /dev/null
+++ b/dev-python/kiwisolver/files/kiwisolver-1.4.4-pypy3-tests.patch
@@ -0,0 +1,30 @@
+Patch provided upstream as https://github.com/nucleic/kiwi/pull/158
+from issue created at https://github.com/nucleic/kiwi/issues/157
+
+commit ad1c62f046dc14c1e85e4e1c1b8e175eda08838e
+Author: Jérôme Carretero <cJ-kiwisolver@zougloub.eu>
+Date:   Fri Feb 17 18:40:45 2023 -0500
+
+    py: tests: make tests run under PyPy
+
+diff --git a/py/tests/test_expression.py b/py/tests/test_expression.py
+index 671dd7f..6b5d8e5 100644
+--- a/py/tests/test_expression.py
++++ b/py/tests/test_expression.py
+@@ -8,6 +8,7 @@
+ import gc
+ import math
+ import operator
++import sys
+ from typing import Tuple
+ 
+ import pytest
+@@ -264,4 +265,7 @@ def test_expression_rich_compare_operations(op, symbol) -> None:
+     else:
+         with pytest.raises(TypeError) as excinfo:
+             op(e1, e2)
+-        assert "kiwisolver.Expression" in excinfo.exconly()
++        if "PyPy" in sys.version:
++            assert "Expression" in excinfo.exconly()
++        else:
++            assert "kiwisolver.Expression" in excinfo.exconly()
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..98cdf2cbdc28
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
@@ -0,0 +1,44 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="
+	https://github.com/nucleic/kiwi/
+	https://pypi.org/project/kiwisolver/
+"
+SRC_URI="
+	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.4-pypy3-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/krb5/Manifest b/dev-python/krb5/Manifest
index ee776095b26e..4840ba5d57df 100644
--- a/dev-python/krb5/Manifest
+++ b/dev-python/krb5/Manifest
@@ -1 +1,2 @@
 DIST krb5-0.4.1.tar.gz 218745 BLAKE2B 8b7e6ab921462ec03c4ca23d83dcfbb8f03b2538edac1a920e68bc3f53c518c942a5f54a96c201a11667e0f4d82882d321808683efa0e5ed1d00df569aa73f2f SHA512 089b3abf3a9402248ed04ab4b47672e0de88c5c73c0c705ac129e499ff53931ffcf7fc6a6bdf9b0f9e03e9010f25dcc61b9a2d33c6b67f5b741a477fb5199265
+DIST krb5-0.5.0.tar.gz 220969 BLAKE2B e492220906afff138a35e0545a9fec4d802e37e17d776fa5448361f1d62a93500063f783e638bbf903165a1998f9d2eaa1444d3bf5ce8446b781c69596c53080 SHA512 a5e8dc16026602373a00aae9188256b586a9f02cee7a413b7bc8ff0525660c416256179b56795cb9a69ca9dab0afff258f803a810220472e086c1c497d044567
diff --git a/dev-python/krb5/krb5-0.5.0.ebuild b/dev-python/krb5/krb5-0.5.0.ebuild
new file mode 100644
index 000000000000..379fe10ed828
--- /dev/null
+++ b/dev-python/krb5/krb5-0.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Kerberos API bindings for Python"
+HOMEPAGE="
+	https://github.com/jborean93/pykrb5/
+	https://pypi.org/project/krb5/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	virtual/krb5
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/k5test[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 26e2fe2b886e..d50e9290e035 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -3,3 +3,4 @@ DIST moto-4.0.13.tar.gz 2563514 BLAKE2B 1d2f01ff0af7c1ab4bc8670015eeefddf70970aa
 DIST moto-4.1.0.tar.gz 2561695 BLAKE2B ce95abe8d49bee64d5323988526e251c52cd5ee5df95fc058240336a2eb580bf7eafbef6b594328a4a5ef34d047a293656c8ec9cdbf9c41bf3c7df05fdfb33c5 SHA512 c5b234c7d7057922880ad9ba09bb4e0453ca09d9f2b58ffce1990092e5d5cb070954e9d6cca307730ecb5540509792d0dbb4135289137fc12469354a91f326b8
 DIST moto-4.1.1.tar.gz 2581128 BLAKE2B a4af36e5f87633a8b3f0dcfc5b786d95925dc787acf4b6a7698262637208a1fa0344e734a4a5c8073643e5d92740ee52d3b37f305b1afbf81e3a2f8496b5ecf1 SHA512 1b7ec2cd1a2a7273a22cc8fe3ddf64b9e4447cdf7d4fd966dee1cbde6b95c1a51d1e5870530eee1f19dbdaa196bff5c283a2df08462ab9ffac3b683f789bca25
 DIST moto-4.1.2.tar.gz 2593920 BLAKE2B c07ed5169fa24318e5ea081c470b07d93071c7d6e2242643e770aa3c3f59afa5f808855c47e053265aa51ad12b041d962282387a800d619309fc37ba7a360122 SHA512 73975b95b8d2caaede4f1c32ff72da68d57d28ce5c2354a2582d7501ee5be7ea6b643437234739ea81e090c611e265e54bd2b137fd8146e12d99346497cf6da6
+DIST moto-4.1.3.tar.gz 2612972 BLAKE2B 50bfb84f83258a87815d41c370d69275a2a0ca375b9f9298fc39daf93cb490c1da0a0ad74db1aaa21fb38cee13a363f49f1a444ee916f936ac565334d5973760 SHA512 bc7a9d6ec0759ffebbc8ec5813952d63e859ca8e686c552d314cc398c6ec04420c11fc24783d965e87bd7e1f4dbd61ef522c438c22c590ec164d215355fc9133
diff --git a/dev-python/moto/moto-4.1.3.ebuild b/dev-python/moto/moto-4.1.3.ebuild
new file mode 100644
index 000000000000..6be9a3602674
--- /dev/null
+++ b/dev-python/moto/moto-4.1.3.ebuild
@@ -0,0 +1,98 @@
+# 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_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="
+	https://github.com/getmoto/moto/
+	https://pypi.org/project/moto/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
+		tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+		# TODO
+		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_job
+		tests/test_batch_simple/test_batch_jobs.py::test_submit_job_by_name
+		tests/test_core/test_environ_patching.py::test_aws_keys_can_be_none
+		tests/test_core/test_mock_all.py::test_context_manager
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m 'not network'
+}
diff --git a/dev-python/numpy/numpy-1.24.2.ebuild b/dev-python/numpy/numpy-1.24.2.ebuild
index 63c0a5e24868..34274e14c894 100644
--- a/dev-python/numpy/numpy-1.24.2.ebuild
+++ b/dev-python/numpy/numpy-1.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
@@ -36,7 +36,9 @@ BDEPEND="
 		virtual/pkgconfig
 	)
 	test? (
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		' 'python*')
 		dev-python/charset_normalizer[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
 		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/pip-23.0.1.ebuild b/dev-python/pip/pip-23.0.1.ebuild
index 9e674ad245a7..c5f28735be29 100644
--- a/dev-python/pip/pip-23.0.1.ebuild
+++ b/dev-python/pip/pip-23.0.1.ebuild
@@ -12,10 +12,6 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
 
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
 DESCRIPTION="The PyPA recommended tool for installing Python packages"
 HOMEPAGE="
 	https://pip.pypa.io/en/stable/
@@ -23,11 +19,7 @@ HOMEPAGE="
 	https://github.com/pypa/pip/
 "
 SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
+	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 "
 
 LICENSE="MIT"
@@ -51,6 +43,7 @@ BDEPEND="
 			dev-python/pytest-xdist[${PYTHON_USEDEP}]
 			dev-python/scripttest[${PYTHON_USEDEP}]
 			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
 			dev-python/werkzeug[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
 			test-rust? (
@@ -89,22 +82,17 @@ python_compile_all() {
 
 python_test() {
 	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
+		einfo "Skipping tests on ${EPYTHON}"
 		return 0
 	fi
 
 	local EPYTEST_DESELECT=(
 		tests/functional/test_inspect.py::test_inspect_basic
 		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
 		# Internet
 		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
 		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
 		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		# git: fatal: transport 'file' not allowed
-		tests/functional/test_install_vcs_git.py::test_check_submodule_addition
 		# TODO
 		tests/unit/test_network_auth.py::test_keyring_cli_get_password
 		tests/unit/test_network_auth.py::test_keyring_cli_set_password
@@ -119,7 +107,6 @@ python_test() {
 		)
 	fi
 
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
 	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
 	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
 	epytest -m "not network" -n "$(makeopts_jobs)"
diff --git a/dev-python/pkgcraft/Manifest b/dev-python/pkgcraft/Manifest
index 251c85478708..c3b0a862a650 100644
--- a/dev-python/pkgcraft/Manifest
+++ b/dev-python/pkgcraft/Manifest
@@ -1,2 +1,3 @@
 DIST pkgcraft-0.0.3.tar.gz 1239742 BLAKE2B c9148d3ac34d80c47db5d1080b3806e6b64fffa226d595a11499215626342286efc19b86fd1e158a8ca0021ab8946d35e4393fceaf8a318c258114a6c2e1ffdf SHA512 53ae196d073271654807ef5587c38d83e10b606f59baf63e3c8da7ce1b1d80d7acd1e3e201ebba1346c14d101eded666d6ad9bdf972b36c574c9b494147baa4a
 DIST pkgcraft-0.0.4.tar.gz 397121 BLAKE2B 72b24d34b6c3b6114a5d182b4fe562078aa258a21271b33d8858c85cca480a932afab5933978295fd44d531146d58688391efe8e23f358332de83ae5195d68fb SHA512 04996bcbe6d9a8ae6082ea84a63358f42d3a503f1e0d188b627b033b8379cf6e22f5ae8ff764b7213fe6d801a1eeb6321b02967e77d98575125e16781d9b917c
+DIST pkgcraft-0.0.5.tar.gz 400237 BLAKE2B de78c1570ce8080742d3afbff2c9078b56fb14e7b097bd09b47c5b21a5de1062989835c9c12e4efd9d4be4aef7e9dec1350606700d80c5482cf81d1d2c4febc0 SHA512 2366180189314cafa4be8a180eed62a8c994bfd862ebc5292e01d9cd2585b9eca082535e405924ad758d6f89309c5e64727242a52f95f6e71aa6aff3495edd57
diff --git a/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild b/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
new file mode 100644
index 000000000000..be43bfffaec1
--- /dev/null
+++ b/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for pkgcraft"
+HOMEPAGE="
+	https://pypi.org/project/pkgcraft/
+	https://github.com/pkgcraft/pkgcraft-python
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft-python"
+	inherit git-r3
+
+	PKGCRAFT_VERSION_MIN="9999"
+	PKGCRAFT_VERSION_MAX="9999"
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft-python/releases/download/v${PV}/${P/-python}.tar.gz"
+	S="${WORKDIR}"/${P/-python}
+
+	KEYWORDS="~amd64"
+
+	PKGCRAFT_VERSION_MIN="0.0.6"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+examples"
+
+RDEPEND="
+	>=sys-libs/pkgcraft-${PKGCRAFT_VERSION_MIN}:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/cython
+	dev-python/setuptools_scm
+	virtual/pkgconfig
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	if [[ ${PV} != 9999 ]] ; then
+		local actual_pkgcraft_min=$(sed -En '/^MIN_VERSION =/{s/[^0-9.]//gp}' setup.py || die)
+		if [[ ${actual_pkgcraft_min} != ${PKGCRAFT_VERSION_MIN} ]] ; then
+			eerror "Expected minimum pkgcraft-c version: ${PKGCRAFT_VERSION_MIN}"
+			eerror "Actual minimum pkgcraft-c version: ${actual_pkgcraft_min}"
+			die "Mismatch between setup.py's MIN_VERSION and ebuild!"
+		fi
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install() {
+	# Conditional because these aren't installed officially right now
+	# and the naming is just for convenience.
+	if use examples ; then
+		while IFS= read -r -d '' file ; do
+			python_newexe "${S}"/examples/${file##*/} pkgcraft-${file##*/}
+		done < <(find "${S}"/examples -type f -executable -print0 || die)
+	fi
+
+	distutils-r1_python_install
+}
diff --git a/dev-python/pkgcraft/pkgcraft-9999.ebuild b/dev-python/pkgcraft/pkgcraft-9999.ebuild
index a9b364218f73..be43bfffaec1 100644
--- a/dev-python/pkgcraft/pkgcraft-9999.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-9999.ebuild
@@ -26,7 +26,7 @@ else
 
 	KEYWORDS="~amd64"
 
-	PKGCRAFT_VERSION_MIN="0.0.5"
+	PKGCRAFT_VERSION_MIN="0.0.6"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/pybind11/pybind11-2.10.3.ebuild b/dev-python/pybind11/pybind11-2.10.3.ebuild
index 3e60d5f197cd..d92e20e7ca25 100644
--- a/dev-python/pybind11/pybind11-2.10.3.ebuild
+++ b/dev-python/pybind11/pybind11-2.10.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit cmake distutils-r1
 
diff --git a/dev-python/pygame/pygame-2.1.3.ebuild b/dev-python/pygame/pygame-2.1.3.ebuild
index 9c8fb01387a8..f49e9ae2fa35 100644
--- a/dev-python/pygame/pygame-2.1.3.ebuild
+++ b/dev-python/pygame/pygame-2.1.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
index f3d4d59c0c3a..e396bb194685 100644
--- a/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
@@ -7,10 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="tk?"
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1 virtualx
-
-MY_PN="PyOpenGL"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1 pypi virtualx
 
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="
@@ -19,11 +16,11 @@ HOMEPAGE="
 	https://pypi.org/project/PyOpenGL/
 "
 SRC_URI="
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	$(pypi_sdist_url --no-normalize PyOpenGL)
 	https://github.com/mcfletch/pyopengl/commit/2d2457b4d565bce1c58b76b427e1f9027e8b4bcc.patch
 		-> ${P}-glut-font-egl.patch
 "
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/PyOpenGL-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild b/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
index 85b41cac6272..7ead7c0d0adf 100644
--- a/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="pytest plugin for coverage reporting"
 HOMEPAGE="
 	https://github.com/pytest-dev/pytest-cov/
 	https://pypi.org/project/pytest-cov/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -61,7 +61,10 @@ python_test() {
 	ln -s "${src}/coverage" \
 		"${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
 
-	epytest
+	nonfatal epytest foo
+	local ret=${?}
 
 	rm "${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
+
+	[[ ${ret} -ne 0 ]] && die "epytest failed on ${EPYTHON}"
 }
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 09b2601445f8..75ea05c62281 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,2 +1,3 @@
 DIST rq-1.11.1.gh.tar.gz 604043 BLAKE2B 57169a50fe9c2724c4e61a23e4d73d23af6aae241276dac414d2a065675e64bdd1fd35500903e7c276345a0a713a87dc7642894cdb887f019e82606fa668eba3 SHA512 ce5a2bf1fb2757d248704461ef9b631443610a11fa1c832e8aad62e68812d478c51e7bbd0d1ed4a9af678d3a9c85067e1cf16547653851ffb8c19e36b97ba945
 DIST rq-1.12.0.gh.tar.gz 611434 BLAKE2B 8e13d7c02a56fe71cb3e492654c124f8b0cdbda298687bfc57b3037ff85a6416d7356125e48ae723225739dd0ef0eab49fbb2ed5b2e424c93d1a177c85f00800 SHA512 32d10a96213bd23f21f3dada53771047f9d66a73590a0f1cc0086981f1f9276e0bc9d51b8fd3ba12a140ea71b004c995a82aa6746e1a793374f8fea762602c18
+DIST rq-1.13.0.gh.tar.gz 616679 BLAKE2B 026914ab01f769797e1f7fabc944b5ccdeb1ce1957c7acc72d067e0bdd113ebb30f0060ea5adbceaac5e69b40e176c09a0b1f216cffb02132772e72151b79986 SHA512 6c3b4bb868cae6ffd07718b3f517350eba2effc1b3ae70ef601984cc525ecfb3f82f8569a2b0f333c5f248d3befbe3d4953f5058f8e9cb2f08ce6dadae963902
diff --git a/dev-python/rq/rq-1.13.0.ebuild b/dev-python/rq/rq-1.13.0.ebuild
new file mode 100644
index 000000000000..d3f8230dcf81
--- /dev/null
+++ b/dev-python/rq/rq-1.13.0.ebuild
@@ -0,0 +1,60 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="
+	https://python-rq.org/
+	https://github.com/rq/rq/
+	https://pypi.org/project/rq/
+"
+SRC_URI="
+	https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-3.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 0ad24744d78f..bf48763a7d9e 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,6 +1,8 @@
 DIST scipy-1.10.0.tar.gz 42398693 BLAKE2B fc2c1ef997fb14716453d94a6d12f8cbdfb742c99bec2c5c504a70248217e44d84b3326304e7bfafd3a52b968de3404b0a084d1e8043295842d01f4337732d91 SHA512 13fec0a2c24b90617ad4701c43c54757c91d2c62ca4b9ea5e5c5d130177ba4d2bb8687aae9057b58c26d1a77e4291164bad7ba9e21352669c07ba18bf539ad32
+DIST scipy-1.10.1.tar.gz 42407997 BLAKE2B 807dceb1e056a1a2c0ec354e4e21f64e59cdab9eaf286cec3783bb93bf80efa00a71e7bd8d1898e8a2fdf86b614f035a0a97436dc4515574d73d9d4521824316 SHA512 767e1dee6285d98e4d58d8d8d1e3654b00e3216e9ad55455fc9473f1d044bef80ecce749bcd24d8f331367b882c9c3e6b652a6e901bb4296ddc7cc44699215b6
 DIST scipy-1.9.2.tar.gz 42068300 BLAKE2B 0962115990a12339d8b87eabbee02d52a52e57259fbe2e74884fa2f08d66d8b7505f84561f643b539603bc8bf4ef3bf73c3d908453fbb0c99f732c3a81f8a328 SHA512 5f8667aa66aa0b5fad689d960f742874ce09f830bfd5aa241917526f153fbc09c7f709bc84113f83283fcbb8a47113eb215478d9c3473f76d8f7dbf0989429a2
 DIST scipy-1.9.3.tar.gz 42075414 BLAKE2B f19e829d26a5673cccb69bce43a9142637f42a9ec462a3fd2ea44b62564cff6fb27a4deaccc59e0e738cc0c997b0a7de948bf9f2db6fa7896323405a072e0111 SHA512 119f9a5e1ce3b4268ba38a0eb82dff78837593d9a5c5e464663925a4b3b1de060201fe568236e19ed0996a045754333c580e181c4cdec2cc707e57060f59364e
 DIST scipy-html-1.10.0.zip 65656379 BLAKE2B 4a4f1e428bc2355f32be05e35634e5aaccb0938f170ee247931a892cf7ab59b3a9ab952060e98936e153bed752c29c01ed34eba02188b3514de7607285c01d08 SHA512 3bda526f209905355b3f87ba1529b9f45c3580ce7d9b80a63931871dab1542347f243c9f688854cb67d575e9a645ec89105775accdc746fc290113f28978b73b
+DIST scipy-html-1.10.1.zip 49191107 BLAKE2B 5163ae3a62745992bcf94ab02ca2bb13fcf6d2ae0eb2a113ba29bc37a8e8f40ec70e39fe16e6371ce0bc31d4c8f0f46746be91b4fe2ad41c68a985c6f00fb8e7 SHA512 f3252452d3bfd400890f29460de2f97bf72732e0fc864582e906b78808e856ead5b1bf97cba531f2150e396408e585499d127004231421d20108e96040316232
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
diff --git a/dev-python/scipy/scipy-1.10.1.ebuild b/dev-python/scipy/scipy-1.10.1.ebuild
new file mode 100644
index 000000000000..ea011dc9dbcb
--- /dev/null
+++ b/dev-python/scipy/scipy-1.10.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	inherit pypi
+
+	# Upstream is often behind with doc updates
+	DOC_PV=${PV}
+
+	SRC_URI+="
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		)"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +fortran test-rust"
+
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.19.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	>=dev-python/meson-python-0.11[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	fortran? ( dev-python/pythran[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	test-rust? (
+		dev-python/pooch[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+	optimize/tests/test_milp.py::test_milp_timeout_16545
+
+	# Network
+	datasets/tests/test_data.py::TestDatasets::test_existence_all
+	datasets/tests/test_data.py::TestDatasets::test_ascent
+	datasets/tests/test_data.py::TestDatasets::test_face
+	datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_configure_all() {
+	export SCIPY_USE_PYTHRAN=$(usex fortran 1 0)
+	DISTUTILS_ARGS=(
+		-Dblas=blas
+		-Dlapack=lapack
+	)
+}
+
+python_test() {
+	cd "${T}" || die
+
+	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
+		EPYTEST_IGNORE+=(
+			datasets/tests/test_data.py
+		)
+	fi
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sounddevice/Manifest b/dev-python/sounddevice/Manifest
index 07c626ac6142..48098c76ce49 100644
--- a/dev-python/sounddevice/Manifest
+++ b/dev-python/sounddevice/Manifest
@@ -1,2 +1,2 @@
-DIST sounddevice-0.4.4.tar.gz 54300 BLAKE2B f93d30d136c5f47929fccf8923009130ae8287d5706e107c5281393889c2cf1c4c23e483c919a7d75b997bee4327ff86b477f07b6a9809f16608aa5e08deed86 SHA512 01e1ad06fd8d1f42f5ad6bd1785f248eb90a27b7bc5648e48aa20a2c31f2b0fbce80392ccfa04c2ebcf7056f8c04cf9623767ee620be1043ad48404a849d48ac
 DIST sounddevice-0.4.5.tar.gz 51403 BLAKE2B 2288faa23280fd0a82fb239eac632e8a3e681ad9f681f7508312bad8be64b57a86de8e7384f168e362ae7c39a118fe9aeeaf40d16502b5aee3d25c7d1df48cfb SHA512 3343a1df57fadbfa1182171b3449ff513a6aab635aff2d6eafda505dd7bb5336f27d9931c87d947be9cba8ace9b3f9a9e9284e2f1b7023ff020ec9ea2e93123f
+DIST sounddevice-0.4.6.tar.gz 51300 BLAKE2B 27d8d0414f3fffa7aedc69a9795a905ab753829d7ea5f7a6baa34f32e0e8e015bd053aa7cbd56423083feb3481ad3843ff7e3da473635a6a742081a3ef765b1b SHA512 aaef01219d41b578c0dc11dc98891a896c674d87b13fb7e6a886d48a44c02646cd6ef4eadfa50f70957335adb39252c9edced5feaff3090a38db8ea8a7154df4
diff --git a/dev-python/sounddevice/sounddevice-0.4.4.ebuild b/dev-python/sounddevice/sounddevice-0.4.6.ebuild
index c6f666ddb723..5ac79a9d8d19 100644
--- a/dev-python/sounddevice/sounddevice-0.4.4.ebuild
+++ b/dev-python/sounddevice/sounddevice-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Liguros Authors
+# Copyright 2021-2023 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 9306ae49bbd6..c1e796b4b7ba 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1 +1,2 @@
 DIST sphinxcontrib-spelling-7.7.0.tar.gz 57444 BLAKE2B 22491369888d632cf158013cb3634e110f3c6a34c59e410a10081f5d1857b85b66f62caf8987058c133f80a8230733fc6e749404207503f0b2441a152fdd5118 SHA512 3599e2d0bcb9bf908b3e6f41184256114e4ab5378543be8bfdd4f55dca249c4feb4fbfda8db4495acfa72fd9ac6c416a0c988f5d30f530eb8deebbcee5833245
+DIST sphinxcontrib-spelling-8.0.0.tar.gz 37610 BLAKE2B 8ae9fb62a5a7d35194884ce075b27b0e54f54c18d55f9573bc53ef7b2f953011655631e37ac3bb7c988df470c8cdf1cb576e4830c61fddc068e50d382d067751 SHA512 0d8c21ea660516238c43fabb505666dfee15abb39f538c40c6b61f91e20c246b16aa170cd444263507dd51913a27fc7719cddb28f30eab26825b565f70dd3ab6
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild
new file mode 100644
index 000000000000..166a8c27c728
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild
@@ -0,0 +1,49 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="
+	https://github.com/sphinx-contrib/spelling/
+	https://pypi.org/project/sphinxcontrib-spelling/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/pyenchant-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		app-dicts/myspell-en
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires the git repo
+	tests/test_filter.py::test_contributors
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	rm -rf sphinxcontrib || die
+	epytest tests
+}
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 60ee3df7c39f..eaf72c4c8021 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1 +1,2 @@
+DIST symengine.py-0.9.2.gh.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 DIST symengine.py-0.9.2.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
diff --git a/dev-python/symengine/symengine-0.9.2-r2.ebuild b/dev-python/symengine/symengine-0.9.2-r2.ebuild
index ec3ce7c5d3b4..3c3e0d493ba6 100644
--- a/dev-python/symengine/symengine-0.9.2-r2.ebuild
+++ b/dev-python/symengine/symengine-0.9.2-r2.ebuild
@@ -10,11 +10,15 @@ inherit distutils-r1
 
 MY_P=${PN}.py-${PV}
 DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py/"
+HOMEPAGE="
+	https://github.com/symengine/symengine.py/
+	https://pypi.org/project/symengine/
+"
 SRC_URI="
 	https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
@@ -29,11 +33,13 @@ BDEPEND="
 "
 # See bug #786582 for symengine constraint
 # See also https://github.com/symengine/symengine.py/blob/master/symengine_version.txt
-RDEPEND="
+DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=sci-libs/symengine-$(ver_cut 1-2):=
 "
-DEPEND="${RDEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 
 # the C library installs the same docs
 DOCS=()
@@ -49,8 +55,3 @@ python_test() {
 	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
 	epytest
 }
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/sympy/sympy-1.11.1-r1.ebuild b/dev-python/sympy/sympy-1.11.1-r2.ebuild
index 442e7867c012..516265b773d7 100644
--- a/dev-python/sympy/sympy-1.11.1-r1.ebuild
+++ b/dev-python/sympy/sympy-1.11.1-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 		png? ( app-text/dvipng )
 		pdf? ( app-text/ghostscript-gpl )
 	)
-	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
+	mathml? ( dev-python/lxml[${PYTHON_USEDEP}] )
 	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
 	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
 	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
diff --git a/dev-python/untangle/untangle-1.2.1-r1.ebuild b/dev-python/untangle/untangle-1.2.1-r1.ebuild
index 71ed789b07cb..3f58574e08b4 100644
--- a/dev-python/untangle/untangle-1.2.1-r1.ebuild
+++ b/dev-python/untangle/untangle-1.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xcffib/xcffib-1.2.0.ebuild b/dev-python/xcffib/xcffib-1.2.0.ebuild
index ad6c9750f26e..aaa058b64d03 100644
--- a/dev-python/xcffib/xcffib-1.2.0.ebuild
+++ b/dev-python/xcffib/xcffib-1.2.0.ebuild
@@ -3,17 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
 HOMEPAGE="
 	https://github.com/tych0/xcffib/
 	https://pypi.org/project/xcffib/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
index a2531c4e4645..3596d3af8166 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/python-excel/xlwt/
 	https://pypi.org/project/xlwt/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"