Adding metadata

62 files changed, 933 insertions, 473 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.31.ebuild b/dev-python/GitPython/GitPython-3.1.31.ebuild
new file mode 100644
index 000000000000..e0d73203602d
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.31.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
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.10
+SMMAP_P=smmap-5.0.0_p1
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="
+	https://github.com/gitpython-developers/GitPython/
+	https://pypi.org/project/GitPython/
+"
+SRC_URI+="
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	git rev-parse HEAD > .git/refs/remotes/origin/master || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# performance tests are unreliable by design
+		test/performance
+		# unimpoortant and problematic
+		test/test_installation.py
+		# Internet
+		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
+		# requires which(1)
+		# https://github.com/gitpython-developers/GitPython/pull/1525
+		test/test_git.py::TestGit::test_refresh
+		# TODO
+		test/test_submodule.py::TestSubmodule::test_base_rw
+		test/test_submodule.py::TestSubmodule::test_git_submodules_and_add_sm_with_new_commit
+		test/test_submodule.py::TestSubmodule::test_list_only_valid_submodules
+		test/test_submodule.py::TestSubmodule::test_root_module
+	)
+
+	epytest -o addopts= test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 9fb67c6a59ad..aa98dd078a51 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,4 +1,7 @@
 DIST GitPython-3.1.30.gitbundle 9945082 BLAKE2B ac3e530509d459303c0c465668c92073d0532bb75c0635c9e5521857132c2d3c18f0e30b85830cf101fc0c79cde33a5eaf459cddbd66abeb6185453d90e4077d SHA512 e43275e8ffc3fb02e360503de3cd9d0b2c817f870361fe6bcfcd9dec30da077c4c685f57bce408ec670f2fb49d265abca34bf14d806a3ea54fd25f9eaf5019b3
 DIST GitPython-3.1.30.tar.gz 195508 BLAKE2B ba3dcb7c7aba8ec42842e6240777b8823e641139e6704641a7236ea07b2a82966638fb074c8fe3ff47b66e23aa526cfc899d8c28359f260f62fd1962a6de66de SHA512 067e64c801ca3882d70aca7706b3a57a51597817f0a3f03290a17e3ebb0fa0fd04cd1d72a32eae3bb72b6c486ffd26d1ede9cee5b17d99ffceb0f8dcc83081b9
+DIST GitPython-3.1.31.gitbundle 9820824 BLAKE2B 47becdf80c8047c3de74f3ad2308f2003629dac970df961e97ae455719690afa8ca4fc08c85fdd01d351980cac5b79265164b92c16e993efb964e4c5d6e62810 SHA512 2b73a9bbe11bf24c1f0cfbc817b1226ae49c52a898f233d23aa8512cb7709adaba57c76afce8aa4416dcc4f16775d0d4138f0059ede51f59a6ccdd27d0f08cd3
+DIST GitPython-3.1.31.tar.gz 195822 BLAKE2B c5644a811e33da4e2983d5b41dc5e223bff23bb817027485fd24598163dc515d1823e8abc5f871a9ad4334827f097dbe7856cf618940cd3ddbe507728253ea2c SHA512 80d5f73db589e239dead268c99092b2429c4d0602e4f9a1e77cce5c68f2eade1651e3da9de68fd485021565f3a2d9b980c286b0d302c58e60011a443b4361e71
 DIST gitdb-4.0.10.gitbundle 1485461 BLAKE2B 5a217c609a402cd7888da1502b25d217812503cd703cda8bce3c7159732c59d7f4bcd52688a5da457f43fde1645a6db79588a6fc8cc8dff5c58e9dcbaef79b9a SHA512 98dba48f75e28eaded791f91c611e07bef73c28a7f8ac58889b05d04f4b3699a85a5be1c829ea3e2f380507a9009f35bc552bb4260564127e2863807f9b4712a
 DIST smmap-5.0.0.gitbundle 338621 BLAKE2B 58c151245a1353d482e06313beb1cfbe7aa23d30733b284b1745b562da1da4e6f9b8acd7d4b967987e8c29a0cfbe6d3b27790f4683f6cbd86fc22a1416bc1c24 SHA512 94b827cdcfaf31b726b48b7b0a9036e852683046b07430b79e59a1339079ca078129d5eb02d9009979ce86892748b700d6cd281e401ddf6b0048252e2181fe1f
+DIST smmap-5.0.0_p1.gitbundle 324544 BLAKE2B 69098c7644abaec7f32226cad7ff3008e49d94c9f7349d0b815223249c20bfd2b51a50474e51864821f30c98f5982e5c35ce9217145a1e5d11326492c41faecc SHA512 4f36ca2c94ddfeb949c880fb52c3b1905d144dd59b95f2f05c93ed7b694dcb128218a2800ca23b721fbeff9a1920e8c3326675098e2ef0361ff6e90c8c2850ba
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index b5eae2faee2b..4a4a4be50199 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,2 +1,3 @@
 DIST alembic-1.9.2.tar.gz 1136929 BLAKE2B 26c4ad3185bc274aa4321a0860dc357566625abb51c951f2d0151bfd109f0e0bf7a37075d07ad2f0975127bdd327579f2d9a700f3cc130fbdd1c6458127b2e50 SHA512 d878d48d140be68facdaf0ec25f8582c9e10a369b23e9ee035ae63f8f2ad52d50464c5b8e9c666307edd1a797b6a2c495e56fa890f7dc8f46b3d75a726905ded
 DIST alembic-1.9.3.tar.gz 1137492 BLAKE2B 17dbc5513b7e15daa51f623bfa90febf356caad8d13e215c6007fd0330e569ea4ffddd374c1ab9b7954e38a136c27d2e5d0ff5db026a6c2ad04d242b3cfdbe7f SHA512 dcbde51c26a81f88b102979aa000c17d0af065e96c51484c94c138fc08099e229deb06f5934d499058f25ef87eb5a5de765225fb890a76eb030d1ad6649e57a4
+DIST alembic-1.9.4.tar.gz 1139210 BLAKE2B 5b740803b6bf5b715e9572a91d87d5403d64e665647776d28511704fa17ed81825fe6f5cdab2cec77a0806abb02ef2a7acf5f9702ff87639b90e74d9e22a4b1a SHA512 76e6f86e789cecff78f8e86c34d22a70615158833bc24a26f38fe2d0d5ccd098920e0fe4cbebaadd2c9a4a2e63152720945645000d46a2b6b8b6696ce873f899
diff --git a/dev-python/alembic/alembic-1.9.4.ebuild b/dev-python/alembic/alembic-1.9.4.ebuild
new file mode 100644
index 000000000000..595ef73bb812
--- /dev/null
+++ b/dev-python/alembic/alembic-1.9.4.ebuild
@@ -0,0 +1,34 @@
+# 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 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}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-prometheus/django-prometheus-2.2.0-r1.ebuild b/dev-python/django-prometheus/django-prometheus-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..4970ee119d13
--- /dev/null
+++ b/dev-python/django-prometheus/django-prometheus-2.2.0-r1.ebuild
@@ -0,0 +1,32 @@
+# 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="Library to export Django metrics for Prometheus"
+HOMEPAGE="
+	https://github.com/korfuri/django-prometheus/
+	https://pypi.org/project/django-prometheus/
+"
+
+LICENSE="Apache-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i "/pytest-runner/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
index fc4f4bfc247b..3ea8911b102b 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1 optfeature
 
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
index f45c3fbd7fb1..5421f5685cf6 100644
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@@ -1 +1,2 @@
+DIST dockerpty-0.4.1.gh.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
 DIST dockerpty-0.4.1.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
diff --git a/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild b/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild
new file mode 100644
index 000000000000..e06c28d36989
--- /dev/null
+++ b/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild
@@ -0,0 +1,26 @@
+# 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="Python library to use the pseudo-tty of a docker container"
+HOMEPAGE="https://github.com/d11wtq/dockerpty"
+SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="
+	test? (
+		>=dev-python/docker-py-0.7.0_rc2[${PYTHON_USEDEP}]
+		>=dev-python/expects-0.4[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=">=dev-python/six-1.3.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/frozendict/files/frozendict-2.3.4-optional-extension.patch b/dev-python/frozendict/files/frozendict-2.3.4-optional-extension.patch
new file mode 100644
index 000000000000..f64402b023e3
--- /dev/null
+++ b/dev-python/frozendict/files/frozendict-2.3.4-optional-extension.patch
@@ -0,0 +1,20 @@
+Autodetect availability of C extension. Taken from upstream PR.
+
+Upstream-PR: https://github.com/Marco-Sulla/python-frozendict/pull/69
+
+diff --git a/setup.py b/setup.py
+index 0325383..0667b59 100755
+--- a/setup.py
++++ b/setup.py
+@@ -163,7 +163,7 @@ if len(argv) > 1 and argv[1] in custom_args:
+ impl = python_implementation()
+ 
+ if custom_arg == None:
+-    if impl == "PyPy":
++    if impl == "PyPy" or not src_path.exists():
+         custom_arg = "py"
+     else:
+         custom_arg = "c"
+-- 
+2.39.1
+
diff --git a/dev-python/frozendict/frozendict-2.3.4-r1.ebuild b/dev-python/frozendict/frozendict-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..fb56d7c907d6
--- /dev/null
+++ b/dev-python/frozendict/frozendict-2.3.4-r1.ebuild
@@ -0,0 +1,42 @@
+# 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="A simple immutable mapping for python"
+HOMEPAGE="
+	https://github.com/Marco-Sulla/python-frozendict/
+	https://pypi.org/project/frozendict/
+"
+SRC_URI="
+	https://github.com/Marco-Sulla/python-frozendict/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-optional-extension.patch"
+)
+
+python_test() {
+	local EPYTEST_IGNORE=()
+	# skip tests of native extension for python versions where it is not available
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_IGNORE+=(
+		test/test_frozendict_c.py
+		test/test_frozendict_c_subclass.py
+	)
+
+	rm -rf frozendict || die
+	epytest
+}
diff --git a/dev-python/github3-py/Manifest b/dev-python/github3-py/Manifest
new file mode 100644
index 000000000000..47e7127271fb
--- /dev/null
+++ b/dev-python/github3-py/Manifest
@@ -0,0 +1 @@
+DIST github3.py-3.2.0.gh.tar.gz 35522134 BLAKE2B ef263dc7e97bb7acccddc538cf812abc8554395865832ac993fbd7f965fd008607d0a682b35be5bdfc1b46618dcb3391e924f57d841a30ab732df9b3c76774b3 SHA512 2b15524df9289d2139178b4a92914458276cf347ff7e41c55eb6b7b9ad705ced4a9f64eb025aa9334a38611b87147a8ed118a6958a9924f75ad272fc868d196f
diff --git a/dev-python/github3/github3-3.2.0.ebuild b/dev-python/github3-py/github3-py-3.2.0.ebuild
index 3388d132dd88..1c21471d7f7c 100644
--- a/dev-python/github3/github3-3.2.0.ebuild
+++ b/dev-python/github3-py/github3-py-3.2.0.ebuild
@@ -8,13 +8,17 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
 inherit distutils-r1
 
+MY_P=github3.py-${PV}
 DESCRIPTION="A wrapper for the GitHub API written in python"
-HOMEPAGE="https://github3py.readthedocs.io/en/master/"
+HOMEPAGE="
+	https://github.com/sigmavirus24/github3.py/
+	https://pypi.org/project/github3.py/
+"
 SRC_URI="
-	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+	https://github.com/sigmavirus24/github3.py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
-S="${WORKDIR}/${PN}.py-${PV}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
@@ -35,7 +39,8 @@ BDEPEND="
 	test? (
 		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
 		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/github3/metadata.xml b/dev-python/github3-py/metadata.xml
index 361fab0728ef..361fab0728ef 100644
--- a/dev-python/github3/metadata.xml
+++ b/dev-python/github3-py/metadata.xml
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
deleted file mode 100644
index ebb2d475fd52..000000000000
--- a/dev-python/github3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST github3-3.2.0.gh.tar.gz 35522134 BLAKE2B ef263dc7e97bb7acccddc538cf812abc8554395865832ac993fbd7f965fd008607d0a682b35be5bdfc1b46618dcb3391e924f57d841a30ab732df9b3c76774b3 SHA512 2b15524df9289d2139178b4a92914458276cf347ff7e41c55eb6b7b9ad705ced4a9f64eb025aa9334a38611b87147a8ed118a6958a9924f75ad272fc868d196f
diff --git a/dev-python/ioflo/ioflo-2.0.2-r3.ebuild b/dev-python/ioflo/ioflo-2.0.2-r3.ebuild
index 817361dd21c5..1e07c879a3c0 100644
--- a/dev-python/ioflo/ioflo-2.0.2-r3.ebuild
+++ b/dev-python/ioflo/ioflo-2.0.2-r3.ebuild
@@ -14,15 +14,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="test"
 
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-lang/python-3.7.4' python3_7)
-"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
 		app-admin/salt[${PYTHON_USEDEP}]
+		dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/ioflo/ioflo-2.0.2-r4.ebuild b/dev-python/ioflo/ioflo-2.0.2-r4.ebuild
new file mode 100644
index 000000000000..5ad220e1519b
--- /dev/null
+++ b/dev-python/ioflo/ioflo-2.0.2-r4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
+HOMEPAGE="https://github.com/ioflo/ioflo/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/ioflo-1.7.8-network-test.patch"
+	"${FILESDIR}/ioflo-2.0.2-python39.patch"
+	"${FILESDIR}/ioflo-2.0.2-tests.patch"
+	"${FILESDIR}/ioflo-2.0.2-py310.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
index 35b101deebc0..efe8bf73351f 100644
--- a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
 inherit distutils-r1
@@ -10,16 +12,38 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/tcalmant/jsonrpclib.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
+	SRC_URI="
+		https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
-HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
+HOMEPAGE="
+	https://github.com/tcalmant/jsonrpclib/
+	https://pypi.org/project/jsonrpclib/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
 
-distutils_enable_tests setup.py
+	# NB: we need to run this test separately as it breaks
+	# tests/test_server.py::PooledServerTests
+	# see jsonlib.py, get_handler()
+	# the most preferred (first) lib that's in test deps
+	local -x JSONRPCLIB_TEST_EXPECTED_LIB=ujson
+	epytest tests/test_jsonlib.py::TestJsonLibLoading
+}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 9fc11e30837f..b914f02a577b 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter_client-7.4.9.tar.gz 329115 BLAKE2B 8b43b237ac79bc51e40e403cf4a3ada18d03437094dc1dd9b9988adb1bcfbc56ba4b2373d3dd858df583b723723127f934c01544f3d6a576886b012364674f0f SHA512 0de91309ffddd2da50ae69bff4f7ecd741398171982f66488e6367d78388c6844b353bed1834684fa4af890364120ce09f2fa6b3ed7778c501058ae558439969
 DIST jupyter_client-8.0.2.tar.gz 333904 BLAKE2B e5a6ba4d2190150bed94b4f6ed80d7b043643341e925851ad073d65d78984ba37bf9ca2563d5fdd6cd79aa104b271ef0585d5e478ae3394b5ef478060ae71d4e SHA512 80944e5727a41299e2e05807460c399f6186409817e53b9385cae15e0f6ea5c5d85b76940157195f5b2bd1fbf4b6a38614ab4efe7aefb13744eb9fde5836d70b
+DIST jupyter_client-8.0.3.tar.gz 334366 BLAKE2B 04ea6e8206fe0b741da1ba0d17cb559657824c20f4fcff48fd0ce4287dce7da9a151000e7a0f08cbf3fa6b1868d8d7e424d49d70a258283466350946f4ce5220 SHA512 27eca49e44c13d819624c6ab596b24b9b469f82a788920eb4db02cee43c2efdf22ea68bf282f5f4ca28d38c9238d51d70d7aa214f2c3b8f6c2a7ebcaf12d567c
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
new file mode 100644
index 000000000000..a1f917b98cb7
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-8.0.3.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=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_client/
+	https://pypi.org/project/jupyter-client/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_core-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.{8,9})
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
+		>=dev-python/pytest_jupyter-0.4.1[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO: times out
+	tests/test_client.py::TestAsyncKernelClient::test_input_request
+	# TODO
+	tests/test_multikernelmanager.py::TestKernelManager::test_tcp_cinfo
+)
diff --git a/dev-python/loguru/loguru-0.6.0.ebuild b/dev-python/loguru/loguru-0.6.0.ebuild
index f596904f4bdc..6e54866ddfaf 100644
--- a/dev-python/loguru/loguru-0.6.0.ebuild
+++ b/dev-python/loguru/loguru-0.6.0.ebuild
@@ -15,10 +15,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND="$(python_gen_cond_dep 'dev-python/aiocontextvars[${PYTHON_USEDEP}]' 'python3_6')"
 BDEPEND="test? ( >=dev-python/colorama-0.3.4[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/0.6.0-typos.patch" )
+
 # filesystem buffering tests may fail
 # on tmpfs with 64k PAGESZ, but pass fine on ext4
 distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/0.6.0-typos.patch" )
diff --git a/dev-python/prov/prov-2.0.0.ebuild b/dev-python/prov/prov-2.0.0.ebuild
index ff4b8854a4b2..1b7d4b499882 100644
--- a/dev-python/prov/prov-2.0.0.ebuild
+++ b/dev-python/prov/prov-2.0.0.ebuild
@@ -4,11 +4,10 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="W3C provenance data dodel library"
 HOMEPAGE="https://pypi.org/project/prov/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyalsa/pyalsa-1.2.7.ebuild b/dev-python/pyalsa/pyalsa-1.2.7.ebuild
index 2bc7f484b23c..0aa7057a25f4 100644
--- a/dev-python/pyalsa/pyalsa-1.2.7.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.2.7.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1
 
 DESCRIPTION="Python bindings for ALSA library"
 HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
@@ -14,7 +14,8 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
+# Needs access to system's alsa configuration/devices
+RESTRICT="test"
 
 RDEPEND="media-libs/alsa-lib"
 DEPEND="${RDEPEND}
@@ -22,4 +23,22 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/${PN}-1.1.6-no-build-symlinks.patch" )
 
-# Testsuite appears to require installed state
+python_test() {
+	cd "${T}" || die
+
+	shopt -s nullglob
+	local test
+	local failed
+	for test in "${S}"/test/*.py ; do
+		${EPYTHON} "${test}" || {
+			eerror "${test} failed with ${EPYTHON}"
+			failed=1
+			break
+		}
+	done
+	shopt -u nullglob
+
+	if [[ ${failed} -eq 1 ]] ; then
+		die "${test} failed with ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 59b18c487eee..0cce48528328 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,2 @@
-DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
 DIST pydocstyle-6.2.3.gh.tar.gz 77612 BLAKE2B f94b9c8232a3e96dad1d84d37bf7cc53f114edfddbd0dad725ff3bb79f39576a5fceff5a2b962e284e9d0d96ac8d71e5aa0406322af4bf8fdc73910348ff9190 SHA512 b275bd2367a3a6d4636a2879f503da15b9965bffe2750db87cbd3ca09fc3353a481a9c38e1b35b3b2aeeba019e9dd393d2cb65db2820d6343fb4c9881f7e6deb
 DIST pydocstyle-6.3.0.gh.tar.gz 78058 BLAKE2B 551da9af8baebcba4f1053e0d9495bff039a98c96ad229219cd37ac8ba9e3002fff8a136c5148144a5f84ed94a1414364d7c827ad010038f63961ce17a260ee3 SHA512 f8473b19ab6ef0b61787875558f9dd6f9f7f1954e1baa0010942af6d4de8dbca30c8c08be6acbf24aadd1c0a601ba9467b747026a6cd22379f0c4b84a38b57c7
diff --git a/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch b/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch
deleted file mode 100644
index 8be2adca5ba1..000000000000
--- a/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 4c9ed77d3629a69febdaa14d153d3db869b58e4f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 12 Oct 2022 16:37:40 +0200
-Subject: [PATCH] Use tomllib/tomli for reading .toml configs
-
-Use the built-in `tomllib` module in Python 3.11 and the modern `tomli`
-package in older Python versions to read .toml configs instead of
-the unmaintained and broken `toml` package.
-
-Fixes #599
-Fixes #600
----
- docs/release_notes.rst   |  1 +
- requirements/runtime.txt |  2 +-
- requirements/tests.txt   |  1 -
- setup.py                 |  2 +-
- src/pydocstyle/config.py | 20 ++++++++++++--------
- 5 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/requirements/runtime.txt b/requirements/runtime.txt
-index 80302751..b4e9ca76 100644
---- a/requirements/runtime.txt
-+++ b/requirements/runtime.txt
-@@ -1,2 +1,2 @@
- snowballstemmer==1.2.1
--toml==0.10.2
-+tomli==2.0.1; python_version < "3.11"
-diff --git a/setup.py b/setup.py
-index a9c5df1c..6c0671c7 100644
---- a/setup.py
-+++ b/setup.py
-@@ -8,7 +8,7 @@
-     'snowballstemmer',
- ]
- extra_requirements = {
--    'toml': ['toml'],
-+    'toml': ['tomli; python_version < "3.11"'],
- }
- 
- 
-diff --git a/src/pydocstyle/config.py b/src/pydocstyle/config.py
-index ed00c874..db7ed1b6 100644
---- a/src/pydocstyle/config.py
-+++ b/src/pydocstyle/config.py
-@@ -4,6 +4,7 @@
- import itertools
- import operator
- import os
-+import sys
- from collections import namedtuple
- from collections.abc import Set
- from configparser import NoOptionError, NoSectionError, RawConfigParser
-@@ -13,10 +14,13 @@
- from .utils import __version__, log
- from .violations import ErrorRegistry, conventions
- 
--try:
--    import toml
--except ImportError:  # pragma: no cover
--    toml = None  # type: ignore
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    try:
-+        import tomli as tomllib
-+    except ImportError:  # pragma: no cover
-+        tomllib = None  # type: ignore
- 
- 
- def check_initialized(method):
-@@ -59,15 +63,15 @@ def read(self, filenames, encoding=None):
-         read_ok = []
-         for filename in filenames:
-             try:
--                with open(filename, encoding=encoding) as fp:
--                    if not toml:
-+                with open(filename, "rb") as fp:
-+                    if not tomllib:
-                         log.warning(
-                             "The %s configuration file was ignored, "
--                            "because the `toml` package is not installed.",
-+                            "because the `tomli` package is not installed.",
-                             filename,
-                         )
-                         continue
--                    self._config.update(toml.load(fp))
-+                    self._config.update(tomllib.load(fp))
-             except OSError:
-                 continue
-             if isinstance(filename, os.PathLike):
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild
deleted file mode 100644
index 31bf1ff2576f..000000000000
--- a/dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python docstring style checker"
-HOMEPAGE="
-	https://github.com/PyCQA/pydocstyle/
-	https://pypi.org/project/pydocstyle/
-"
-SRC_URI="
-	https://github.com/PyCQA/pydocstyle/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/snowballstemmer[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.{8..10})
-	)
-"
-
-distutils_enable_tests pytest
-# Requires network to lookup github issues
-#distutils_enable_sphinx docs dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-issuetracker
-
-PATCHES=(
-	"${FILESDIR}"/pydocstyle-6.1.1-disarm-pip-install.patch
-	"${FILESDIR}"/${P}-tomli.patch
-)
diff --git a/dev-python/pygccxml/Manifest b/dev-python/pygccxml/Manifest
index b0d2cad0006b..59bfbde61d7c 100644
--- a/dev-python/pygccxml/Manifest
+++ b/dev-python/pygccxml/Manifest
@@ -1 +1,2 @@
+DIST pygccxml-2.2.1.gh.tar.gz 3170283 BLAKE2B b53123c59d098f56d97841225d10ffd4156b993244e48c4ad30e2f62b6d95d69e0ae4bbfc86bb492e88e8f52d916401f29a6ec7024277d1e32b3af691a12e919 SHA512 32013617d4d632617b616d3787631c5b09da441a87bb15b88e3b287f17b85e1388308e85dd385276966ac09114536a5863edd5fbb96539547783fd2d41c6e8ce
 DIST pygccxml-2.2.1.tar.gz 3170283 BLAKE2B b53123c59d098f56d97841225d10ffd4156b993244e48c4ad30e2f62b6d95d69e0ae4bbfc86bb492e88e8f52d916401f29a6ec7024277d1e32b3af691a12e919 SHA512 32013617d4d632617b616d3787631c5b09da441a87bb15b88e3b287f17b85e1388308e85dd385276966ac09114536a5863edd5fbb96539547783fd2d41c6e8ce
diff --git a/dev-python/pygccxml/pygccxml-2.2.1-r1.ebuild b/dev-python/pygccxml/pygccxml-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..a4592ef132f5
--- /dev/null
+++ b/dev-python/pygccxml/pygccxml-2.2.1-r1.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_{7,8,9,10,11} )
+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() {
+	# We're not interested in linter tests in Gentoo, needs pycodestyle
+	rm unittests/pep8_tester.py || die
+	sed -i -e '/pep8_tester/d' unittests/test_all.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 27f9ef1a15ec..6585e53ce2f9 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1 +1,2 @@
 DIST pyspnego-0.7.0.tar.gz 219295 BLAKE2B 43a31b468ac52750858c74c676c29611f5294d64efe3b0b4ac31acbd0d3c8fb346fea0c396de98908ea7d03040e0d4b5e3e2adacc911413bfafad8e295fd3bb3 SHA512 0c3eeab267bc43fbc3836d2a804e25304ed245ae3f0bf7926cdfd1edd4815c6f25580c655218857ea117e63b13e0ea3e343614580096151d4d720ff6c79ab844
+DIST pyspnego-0.8.0.tar.gz 222900 BLAKE2B aa526c6506f680008ded0a86e938629ccc9ca89454d7987017903e9e5fe26204346bd4eefae3a35c641309391a4784c23e1a3e51d8a03f5ab517516e1a3a4965 SHA512 d9d6356cf9d78fde6669606df7b56f0004957ed58f94cd3965d63827df702ffc10299296153f8c089853f3b22a684e08129d607b4eaedfd332b8b82652119e89
diff --git a/dev-python/pyspnego/pyspnego-0.8.0.ebuild b/dev-python/pyspnego/pyspnego-0.8.0.ebuild
new file mode 100644
index 000000000000..f01f99424f94
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.8.0.ebuild
@@ -0,0 +1,39 @@
+# 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 optfeature pypi
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
index eb50a18d0b70..8e0288b51d46 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
@@ -22,10 +22,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
 "
-# block pytest plugins that will be broken by the upgrade
-RDEPEND+="
-	!<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)]
-"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools-git[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
index b94c9f35f6c4..60decb7a59fd 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
@@ -27,11 +27,6 @@ RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 "
-# block pytest plugins that will be broken by the upgrade
-RDEPEND+="
-	!<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)]
-"
-
 BDEPEND="
 	${RDEPEND}
 	dev-python/setuptools-git[${PYTHON_USEDEP}]
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index 14c8b56d5cb8..21796eedb129 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1 +1,2 @@
 DIST python-linux-procfs-0.6.3.tar.xz 18808 BLAKE2B 02fdc0349dd456819f67f82d6836a44e3285e16d9654dd52b58ac7d86e48bc559feda18f105db7911ac5f670fd0e6cfd5c6cc69a958a3e8494813ff244f8b06f SHA512 18e42bf12456893740c5ec950ffcca86945b1ff202a6ea3ae6ac800145771a39b4ab7e8bbb440210d48d0fe9de646e334095afd0b20060e2e28ab3fa844f6140
+DIST python-linux-procfs-0.7.1.tar.xz 19104 BLAKE2B e6e495ecce77c1ea4c1580c2534e87f769a0057702648ee75bf89f5cbaa944012ba17e69c231977889b9b18d8e9b8d67261361b499ef8a567bed978a207d61ec SHA512 532613cd0feab1317131a3ec30e0730ed48415de333f1430573b7bf0eb5525222dc92db38dab6ff76c27ff10ac0a381975c329441b9ca6011e79bd637482056d
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.7.1.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.7.1.ebuild
new file mode 100644
index 000000000000..e84c93528b38
--- /dev/null
+++ b/dev-python/python-linux-procfs/python-linux-procfs-0.7.1.ebuild
@@ -0,0 +1,26 @@
+# 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="Python classes to extract information from the Linux kernel /proc files"
+HOMEPAGE="
+	https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/
+	https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/
+"
+SRC_URI="https://cdn.kernel.org/pub/software/libs/python/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} ./bitmasklist_test.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index e5cd37ba75c4..2aa1448333c8 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,3 +1 @@
-DIST python-lsp-server-1.6.0.tar.gz 85242 BLAKE2B 52fcca5a93035a6ec8179908b2139e9392220cad082afb4c31b18284cdd53050c68fca4bcc9d852fa9acb49200487431fec37dc840e61ab9320fd6c3a86189ee SHA512 e4ab52f334fb1eece3458258ed39bf66eeb6056ed7e243be9c69ce2bac92792786df2fbc1d316133ac5523b44a57e7d89d4d6f18120c748e78ef20570a325c9b
-DIST python-lsp-server-1.7.0.tar.gz 95085 BLAKE2B 8cce5a01588d44efbc19f8ceec67e61580835814f403d6bda4ca2f82f56dc35c85fc3176f8ebc1eea720aa92710379f87a5e98f443f71a5d16e5bfe48702da1b SHA512 2ef31bdd4451b4b282469223ff5cc5799f4487d3dfc593dfc58483b939802754e0e375461723bf7a90d0fd71f945c927106c5d929621a70f83c3f30bddf68250
 DIST python-lsp-server-1.7.1.tar.gz 95731 BLAKE2B 0cdcda04ef849cb0c5fa83f1f701e986e22fb1228112eaf355bfedc52cca4fcc5927352c71b74fa3903526d8a1fc80fa57ac3e6ee7bcc2609556c2398dd2bbb8 SHA512 36c90f45071f35d0aeb0a57795eb6e9fb531baf9e8b468031b0d3e9eb2d53bee439893a333c6bf5f9d5b0818ec53675a3824850abef3e866e8ebdcd4a6142c48
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.6.0-unpin-all-the-deps.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.6.0-unpin-all-the-deps.patch
deleted file mode 100644
index 28bc0f84c6a8..000000000000
--- a/dev-python/python-lsp-server/files/python-lsp-server-1.6.0-unpin-all-the-deps.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 8cce90e..18cf2db 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -13,7 +13,7 @@ readme = "README.md"
- license = {text = "MIT"}
- requires-python = ">=3.7"
- dependencies = [
--    "jedi>=0.17.2,<0.19.0",
-+    "jedi>=0.17.2",
-     "python-lsp-jsonrpc>=1.0.0",
-     "pluggy>=1.0.0",
-     "docstring-to-markdown",
-@@ -27,26 +27,26 @@ Homepage = "https://github.com/python-lsp/python-lsp-server"
- 
- [project.optional-dependencies]
- all = [
--    "autopep8>=1.6.0,<1.7.0",
--    "flake8>=5.0.0,<5.1.0",
--    "mccabe>=0.7.0,<0.8.0",
--    "pycodestyle>=2.9.0,<2.10.0",
-+    "autopep8>=1.6.0",
-+    "flake8>=5.0.0",
-+    "mccabe>=0.7.0",
-+    "pycodestyle>=2.9.0",
-     "pydocstyle>=2.0.0",
--    "pyflakes>=2.5.0,<2.6.0",
-+    "pyflakes>=2.5.0",
-     "pylint>=2.5.0",
-     "rope>=0.10.5",
-     "yapf",
-     "whatthepatch"
- ]
--autopep8 = ["autopep8>=1.6.0,<1.7.0"]
--flake8 = ["flake8>=5.0.0,<5.1.0"]
--mccabe = ["mccabe>=0.7.0,<0.8.0"]
--pycodestyle = ["pycodestyle>=2.9.0,<2.10.0"]
-+autopep8 = ["autopep8>=1.6.0"]
-+flake8 = ["flake8>=5.0.0"]
-+mccabe = ["mccabe>=0.7.0"]
-+pycodestyle = ["pycodestyle>=2.9.0"]
- pydocstyle = ["pydocstyle>=2.0.0"]
--pyflakes = ["pyflakes>=2.5.0,<2.6.0"]
-+pyflakes = ["pyflakes>=2.5.0"]
- pylint = ["pylint>=2.5.0"]
- rope = ["rope>0.10.5"]
--yapf = ["yapf", "whatthepatch>=1.0.2,<2.0.0"]
-+yapf = ["yapf", "whatthepatch>=1.0.2"]
- websockets = ["websockets>=10.3"]
- test = [
-     "pylint>=2.5.0",
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.7.0-unpin-all-the-deps.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.7.0-unpin-all-the-deps.patch
deleted file mode 100644
index 7bc98e1eb2c8..000000000000
--- a/dev-python/python-lsp-server/files/python-lsp-server-1.7.0-unpin-all-the-deps.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 1422313..4e1ecad 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -13,7 +13,7 @@ readme = "README.md"
- license = {text = "MIT"}
- requires-python = ">=3.7"
- dependencies = [
--    "jedi>=0.17.2,<0.19.0",
-+    "jedi>=0.17.2",
-     "python-lsp-jsonrpc>=1.0.0",
-     "pluggy>=1.0.0",
-     "docstring-to-markdown",
-@@ -27,26 +27,26 @@ Homepage = "https://github.com/python-lsp/python-lsp-server"
- 
- [project.optional-dependencies]
- all = [
--    "autopep8>=1.6.0,<1.7.0",
--    "flake8>=5.0.0,<7",
--    "mccabe>=0.7.0,<0.8.0",
--    "pycodestyle>=2.9.0,<2.11.0",
-+    "autopep8>=1.6.0",
-+    "flake8>=5.0.0",
-+    "mccabe>=0.7.0",
-+    "pycodestyle>=2.9.0",
-     "pydocstyle>=2.0.0",
--    "pyflakes>=2.5.0,<3.1.0",
-+    "pyflakes>=2.5.0",
-     "pylint>=2.5.0",
-     "rope>1.2.0",
-     "yapf",
-     "whatthepatch"
- ]
--autopep8 = ["autopep8>=1.6.0,<1.7.0"]
--flake8 = ["flake8>=5.0.0,<7"]
--mccabe = ["mccabe>=0.7.0,<0.8.0"]
--pycodestyle = ["pycodestyle>=2.9.0,<2.11.0"]
-+autopep8 = ["autopep8>=1.6.0"]
-+flake8 = ["flake8>=5.0.0"]
-+mccabe = ["mccabe>=0.7.0"]
-+pycodestyle = ["pycodestyle>=2.9.0"]
- pydocstyle = ["pydocstyle>=2.0.0"]
--pyflakes = ["pyflakes>=2.5.0,<3.1.0"]
-+pyflakes = ["pyflakes>=2.5.0"]
- pylint = ["pylint>=2.5.0"]
- rope = ["rope>1.2.0"]
--yapf = ["yapf", "whatthepatch>=1.0.2,<2.0.0"]
-+yapf = ["yapf", "whatthepatch>=1.0.2"]
- websockets = ["websockets>=10.3"]
- test = [
-     "pylint>=2.5.0",
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.6.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.6.0-r1.ebuild
deleted file mode 100644
index ccf559d0623b..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,89 +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_{7,8,9,10,11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
-	test? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/pydocstyle-6.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	dev-python/docstring-to-markdown[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/pydocstyle-6.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Upstream is overly cautious, insists on pinning
-# dependencies to versions required by other dependencies.
-# i.e. pin to <dev-python/pycodestyle-2.9.0 because
-# dev-python/autopep8-1.6.0 requires that version.
-# This causes way more problems then it solves.
-PATCHES=(
-	"${FILESDIR}/${P}-unpin-all-the-deps.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '/addopts =/d' pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.7.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.7.0-r1.ebuild
deleted file mode 100644
index 138358013acf..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,89 +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_{7,8,9,10,11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
-	test? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/pydocstyle-6.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-1.2.0[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	dev-python/docstring-to-markdown[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/pydocstyle-6.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-1.2.0[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Upstream is overly cautious, insists on pinning
-# dependencies to versions required by other dependencies.
-# i.e. pin to <dev-python/pycodestyle-2.9.0 because
-# dev-python/autopep8-1.6.0 requires that version.
-# This causes way more problems then it solves.
-PATCHES=(
-	"${FILESDIR}/${P}-unpin-all-the-deps.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '/addopts =/d' pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-stdnum/python-stdnum-1.18.ebuild b/dev-python/python-stdnum/python-stdnum-1.18.ebuild
index ef53dd353e9f..ff7a2d0382c4 100644
--- a/dev-python/python-stdnum/python-stdnum-1.18.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.18.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A module to handle standardized numbers and codes"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/arthurdejong/python-stdnum/
 	https://pypi.org/project/python-stdnum/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
deleted file mode 100644
index 741cd6ebaccf..000000000000
--- a/dev-python/python-xmlsec/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-xmlsec-1.3.12.tar.gz 77722 BLAKE2B b5ecece8063b823cdbe4d58967d10026bdc6f3774954021a3739d579ba3c5a08130af1792921c7892e6bc3d00f88ac83ab30e862775e419e0dad40b990b10cbe SHA512 19c5e3bf58b4b0f8a1cca3e60c08348b02ae298620f8c02b8cfb325aecf0313cb2bd1af89507b754ebe4c35af3b031e232d15ddcd42deae0821c9c0d7571aa7c
diff --git a/dev-python/python3-saml/python3-saml-1.15.0.ebuild b/dev-python/python3-saml/python3-saml-1.15.0.ebuild
index 10d24ff79e2e..1917d986fc2a 100644
--- a/dev-python/python3-saml/python3-saml-1.15.0.ebuild
+++ b/dev-python/python3-saml/python3-saml-1.15.0.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 RDEPEND="
 	>=dev-python/isodate-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-xmlsec-1.3.9[${PYTHON_USEDEP}]
+	>=dev-python/xmlsec-1.3.9[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/qpageview/qpageview-0.6.2.ebuild b/dev-python/qpageview/qpageview-0.6.2.ebuild
index 943e4474c1ff..820e5a47437a 100644
--- a/dev-python/qpageview/qpageview-0.6.2.ebuild
+++ b/dev-python/qpageview/qpageview-0.6.2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
@@ -16,8 +17,10 @@ LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="dev-python/PyQt5[gui,printsupport,svg,widgets,${PYTHON_USEDEP}]
-	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/PyQt5[gui,printsupport,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+"
 
 pkg_postinst() {
 	optfeature "Printing support" dev-python/pycups
diff --git a/dev-python/reno/reno-3.5.0-r1.ebuild b/dev-python/reno/reno-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..a4ffdd7dcff9
--- /dev/null
+++ b/dev-python/reno/reno-3.5.0-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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="
+	https://opendev.org/openstack/reno/
+	https://github.com/openstack/reno/
+	https://pypi.org/project/reno/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-2.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+# The doc needs to be built from a git repository
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Some tests need to be run from a git repository
+	rm reno/tests/test_{cache,semver}.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/requests-ntlm/Manifest b/dev-python/requests-ntlm/Manifest
index 61c7a4bc33ad..1a1d3cb85fbb 100644
--- a/dev-python/requests-ntlm/Manifest
+++ b/dev-python/requests-ntlm/Manifest
@@ -1 +1,2 @@
+DIST requests-ntlm-1.2.0.gh.tar.gz 14540 BLAKE2B 0b9dd72680c6e67dc6e4f0a3eef3b9fa0cc03c71010238a0e7ef8a48b59c57e12846040975f7eef7710113f372cd1e1628e5a9be0eca8e7a287a9cfd0765ebf0 SHA512 230eb6c8a90e8745a3c969114f81d2559aa0f411b79b54747d21c6c28572f7d61c024c47a831777c2d85fb8b09af7fee667d3a3abf318473c97e727c5f2d7943
 DIST requests_ntlm-1.1.0.tar.gz 5183 BLAKE2B 190a75d3f82ae2216e05295f855aa072f98908ef8a0d4dda68d6e39239655ccf175c707af137290cd78cf622c0a3d1741a0afbb1363f8b170f408c34a2682fa6 SHA512 9a74ecd6e4ed5c5e4381d2ee3fb9ff233352b49baa5fae4e0ecc30aaad12fc7a5c1b9dd936f35d4a3815ae7f6ec5bb8581e84128d63ff0e961181408daddb807
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.2.0.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.2.0.ebuild
new file mode 100644
index 000000000000..37034120f9ab
--- /dev/null
+++ b/dev-python/requests-ntlm/requests-ntlm-1.2.0.ebuild
@@ -0,0 +1,50 @@
+# 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="HTTP NTLM authentication using the requests library"
+HOMEPAGE="
+	https://github.com/requests/requests-ntlm/
+	https://pypi.org/project/requests-ntlm/
+"
+SRC_URI="
+	https://github.com/requests/requests-ntlm/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}]
+	>=dev-python/pyspnego-0.1.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local ts_pid test_ret
+
+	"${EPYTHON}" -m tests.test_server &> "${T}"/test-server.log &
+	ts_pid=${!}
+
+	nonfatal epytest tests/unit
+	test_ret=${?}
+
+	kill "${ts_pid}"
+	[[ ${test_ret} -ne 0 ]] && die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index a2f01023d623..0e6a704e6b14 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,3 +1,4 @@
 DIST scikit-build-0.16.4.tar.gz 271037 BLAKE2B 6cca8a3c4f4b37228b77ac098650a5eca4ad0f525ca7dcba178f4cffabb7e60e9a7bbba244e64c1a598ab5916f2f47788198eb2a19803d8d0cf7b9792f4e06e2 SHA512 90315ceac4c372e4d7248b4b56b6092362c2c43fbdc180d1a234e057209c508a05d2c6e0a3d0c2587c3adb8957e4c66d5c171a2a2bc3dbf9874a0de58d97d976
 DIST scikit-build-0.16.5.tar.gz 271974 BLAKE2B e34d44fb27975720adc4ca57a0fabc9b05260a13043b546d19bfb44fa1c60e6490c5d7bbd41494481da470e24c05c4da3eb41b26c78160a35be1e3c29f9a4ef4 SHA512 37e50b3a1fc04b6758b65a58f5d5239effbc0ab38a4a2024098b6a69eea1d7a9a388e41696176469e9c55a7c8b73ace9d7eee2daf5d0fbaefe2a3e09880ee600
 DIST scikit-build-0.16.6.tar.gz 272201 BLAKE2B bb14b0db52d0c04b9630fa27ccbc58c7af72eb8640c4dc82e920acdbc815e2eb8f7662684b23aa42765966ae1ad4e046dead3d7090a263d79f69bfd955ab0f24 SHA512 f36a46845420b441ca158ea05bc20023238afdf81b2108554a52a4a2be0cb19ef6b2729997199d9a9d18841c8470df8f7e7a986a86e1172328f0963f3a015f3d
+DIST scikit-build-0.16.7.tar.gz 274287 BLAKE2B 8a5064c021d904312ccf89a396ab794b89b73ad1b6238767ca74eeb394f0f1514eedd3c746353ee3e9e7b825988b3c52c563e1f19d0acfbe69213c5a306f1dcc SHA512 5bba94214c249f891b2972301b0e37b5f10938151e37a04b845dfc9e11ae85edc7e3880984f9fbbd1c037257fc8baa3ba7b006b1f1b7abb941d1a54e049f3cbc
diff --git a/dev-python/scikit-build/scikit-build-0.16.7.ebuild b/dev-python/scikit-build/scikit-build-0.16.7.ebuild
new file mode 100644
index 000000000000..6446ff1d3a64
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.16.7.ebuild
@@ -0,0 +1,70 @@
+# 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="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# sandbox violations
+		tests/test_hello_cpp.py::test_hello_develop
+		tests/test_issue274_support_default_package_dir.py
+		tests/test_issue274_support_one_package_without_package_dir.py
+		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+		tests/test_pep518.py
+		# This fails because of additional item setup.py in sources
+		tests/test_include_exclude_data.py::test_hello_sdist
+		tests/test_include_exclude_data.py::test_hello_sdist_with_base
+		tests/test_issue401_sdist_with_symlinks.py::test_sdist_with_symlinks
+		tests/test_manifest_in.py::test_manifest_in_sdist
+		# Wants internet to install things with pip
+		tests/test_numpy.py::test_pep518_findpython
+		# TODO
+		"tests/test_command_line.py::test_hide_listing[True-bdist_wheel]"
+	)
+	epytest
+	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg} || die
+}
diff --git a/dev-python/snaketrace/Manifest b/dev-python/snaketrace/Manifest
index 216ca3dc3dc7..5af01fa44ed9 100644
--- a/dev-python/snaketrace/Manifest
+++ b/dev-python/snaketrace/Manifest
@@ -1 +1 @@
-DIST snaketrace-0.3.1.tar.gz 6885 BLAKE2B 19201532a3189e981c88343c67920c9275e41c23cd42ac416d6deda037de6dcdee0346a3ea487cd32311aa97596803b907266a3c1d643bdb679206e64d45b078 SHA512 9efb16309e638b9472a6b7fd8415ca5c40b3b498ba0676767ffea4bcd07cfdba23345b5cd53a0b9d88f7d81f454035f126cdcbf2a51f9a04e1e7aa6e833a20fc
+DIST snaketrace-0.3.1.gh.tar.gz 6885 BLAKE2B 19201532a3189e981c88343c67920c9275e41c23cd42ac416d6deda037de6dcdee0346a3ea487cd32311aa97596803b907266a3c1d643bdb679206e64d45b078 SHA512 9efb16309e638b9472a6b7fd8415ca5c40b3b498ba0676767ffea4bcd07cfdba23345b5cd53a0b9d88f7d81f454035f126cdcbf2a51f9a04e1e7aa6e833a20fc
diff --git a/dev-python/snaketrace/snaketrace-0.3.1.ebuild b/dev-python/snaketrace/snaketrace-0.3.1-r1.ebuild
index 14cd656f7e30..7a2ead5cfb38 100644
--- a/dev-python/snaketrace/snaketrace-0.3.1.ebuild
+++ b/dev-python/snaketrace/snaketrace-0.3.1-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 inherit distutils-r1
 
 DESCRIPTION="An strace-like tool for Python audit events"
 HOMEPAGE="https://github.com/dcoles/snaketrace https://pypi.org/project/snaketrace/"
-SRC_URI="https://github.com/dcoles/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/dcoles/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 3b505fe0be91..a43373fd4058 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1 +1 @@
-DIST tikzplotlib-0.10.1.tar.gz 98265 BLAKE2B 7664e702afb38580af78f2b0887000215a5a0c2ef57e4f9ca5d1100bcba257365b89aee805e800e3a9b5a992487c1ee9733088dadc53941405c0055336478130 SHA512 13a750d9929db1d4ce4608a296523be55878c702846b0b339c6c002cbdf4e8f7b1ffea84db612d8932a379fafce9b4fe6ab6ce4325bf780f211cc0b885a15818
+DIST tikzplotlib-0.10.1.gh.tar.gz 98265 BLAKE2B 7664e702afb38580af78f2b0887000215a5a0c2ef57e4f9ca5d1100bcba257365b89aee805e800e3a9b5a992487c1ee9733088dadc53941405c0055336478130 SHA512 13a750d9929db1d4ce4608a296523be55878c702846b0b339c6c002cbdf4e8f7b1ffea84db612d8932a379fafce9b4fe6ab6ce4325bf780f211cc0b885a15818
diff --git a/dev-python/tikzplotlib/files/tikzplotlib-0.10.1-matplotlib-3.6.0.patch b/dev-python/tikzplotlib/files/tikzplotlib-0.10.1-matplotlib-3.6.0.patch
new file mode 100644
index 000000000000..2c3a0e506cc6
--- /dev/null
+++ b/dev-python/tikzplotlib/files/tikzplotlib-0.10.1-matplotlib-3.6.0.patch
@@ -0,0 +1,48 @@
+https://github.com/texworld/tikzplotlib/issues/567
+https://github.com/texworld/tikzplotlib/pull/558
+
+From f9988eb6aa7cc7d55c0bb528c53e7a8408308939 Mon Sep 17 00:00:00 2001
+From: Paul Kim <44695374+thekpaul@users.noreply.github.com>
+Date: Mon, 3 Oct 2022 01:15:21 +0900
+Subject: [PATCH 1/2] Legend Compatibility Issue in texworld#557
+
+.
+
+.
+--- a/src/tikzplotlib/_legend.py
++++ b/src/tikzplotlib/_legend.py
+@@ -78,7 +78,7 @@ def draw_legend(data, obj):
+     if alignment:
+         data["current axes"].axis_options.append(f"legend cell align={{{alignment}}}")
+ 
+-    if obj._ncol != 1:
++    if obj._ncols != 1:
+         data["current axes"].axis_options.append(f"legend columns={obj._ncol}")
+ 
+     # Write styles to data
+
+From 61f7ea2fb2633f1c0de48f8da1f90a5f9ba078c1 Mon Sep 17 00:00:00 2001
+From: Paul Kim <44695374+thekpaul@users.noreply.github.com>
+Date: Wed, 5 Oct 2022 11:30:48 +0900
+Subject: [PATCH 2/2] Backwards Compat for `ncol`
+
+Co-authored-by: st-- <st--@users.noreply.github.com>
+--- a/src/tikzplotlib/_legend.py
++++ b/src/tikzplotlib/_legend.py
+@@ -78,8 +78,13 @@ def draw_legend(data, obj):
+     if alignment:
+         data["current axes"].axis_options.append(f"legend cell align={{{alignment}}}")
+ 
+-    if obj._ncols != 1:
+-        data["current axes"].axis_options.append(f"legend columns={obj._ncol}")
++    try:
++        ncols = obj._ncols
++    except AttributeError:
++        # backwards-compatibility with matplotlib < 3.6.0
++        ncols = obj._ncol
++    if ncols != 1:
++        data["current axes"].axis_options.append(f"legend columns={ncols}")
+ 
+     # Write styles to data
+     if legend_style:
+
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.10.1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.10.1-r1.ebuild
index 6dbda6823f48..060cdc701e05 100644
--- a/dev-python/tikzplotlib/tikzplotlib-0.10.1.ebuild
+++ b/dev-python/tikzplotlib/tikzplotlib-0.10.1-r1.ebuild
@@ -13,26 +13,31 @@ HOMEPAGE="
 	https://github.com/texworld/tikzplotlib/
 	https://pypi.org/project/tikzplotlib/
 "
-SRC_URI="https://github.com/texworld/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/texworld/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# https://github.com/texworld/tikzplotlib/issues/567 for mpl-3.6.0 dep
 RDEPEND="
 	app-text/texlive[extra]
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
+	<dev-python/matplotlib-3.6.0[latex,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/webcolors[${PYTHON_USEDEP}]
 "
-
 BDEPEND="
 	test? (
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/pytest-codeblocks[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
-	)"
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.1-matplotlib-3.6.0.patch
+)
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc dev-python/mock
@@ -41,3 +46,7 @@ src_test() {
 	local -x MPLBACKEND=Agg
 	virtx distutils-r1_src_test
 }
+
+python_test() {
+	epytest || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index c68723eb916e..197729320098 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1 +1,2 @@
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
+DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-flags.patch b/dev-python/wxpython/files/wxpython-4.2.0-flags.patch
new file mode 100644
index 000000000000..12af1e211b4a
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-flags.patch
@@ -0,0 +1,16 @@
+--- a/buildtools/config.py
++++ b/buildtools/config.py
+@@ -236,9 +236,12 @@ class Configuration(object):
+                 for lst in [self.cflags, self.cxxflags]:
+                     lst.append('-O3')
+ 
++            self.cflags += os.environ.get('CFLAGS', '').split()
++            self.cxxflags += os.environ.get('CXXFLAGS', '').split()
++
+             lflags = self.getWxConfigValue('--libs')
+             self.MONOLITHIC = (lflags.find("_xrc") == -1)
+-            self.lflags = lflags.split()
++            self.lflags = lflags.split() + os.environ.get('LDFLAGS', '').split()
+ 
+             self.WXBASENAME = self.getWxConfigValue('--basename')
+             self.WXRELEASE  = self.getWxConfigValue('--release')
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch b/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch
new file mode 100644
index 000000000000..b3e4beff2cfe
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch
@@ -0,0 +1,13 @@
+As in https://src.fedoraproject.org/rpms/python-wxpython4/raw/rawhide/f/no-attrdict.patch.
+--- a/buildtools/config.py
++++ b/buildtools/config.py
+@@ -27,8 +27,6 @@ from distutils.dep_util  import newer
+ 
+ import distutils.sysconfig
+ 
+-from attrdict import AttrDict
+-
+ runSilently = False
+ 
+ #----------------------------------------------------------------------
+
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch
new file mode 100644
index 000000000000..5ab48cef727d
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch
@@ -0,0 +1,27 @@
+--- a/wscript
++++ b/wscript
+@@ -244,15 +244,6 @@
+                        uselib_store='WXGL', mandatory=True,
+                        msg='Finding libs for WXGL')
+ 
+-        if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'):
+-            wv_libs = '--libs webview,core,net'
+-        else:
+-            wv_libs = '--libs core,net'
+-        conf.check_cfg(path=conf.options.wx_config, package='',
+-                       args='--cxxflags ' + wv_libs + rpath,
+-                       uselib_store='WXWEBVIEW', mandatory=True,
+-                       msg='Finding libs for WXWEBVIEW')
+-
+         conf.check_cfg(path=conf.options.wx_config, package='',
+                        args='--cxxflags --libs xml,core,net' + rpath,
+                        uselib_store='WXXML', mandatory=True,
+@@ -600,7 +591,6 @@
+     makeETGRule(bld, 'etg/_stc.py',        '_stc',       'WXSTC')
+     makeETGRule(bld, 'etg/_html.py',       '_html',      'WXHTML')
+     makeETGRule(bld, 'etg/_glcanvas.py',   '_glcanvas',  'WXGL')
+-    makeETGRule(bld, 'etg/_html2.py',      '_html2',     'WXWEBVIEW')
+     makeETGRule(bld, 'etg/_xml.py',        '_xml',       'WXXML')
+     makeETGRule(bld, 'etg/_xrc.py',        '_xrc',       'WXXRC')
+     makeETGRule(bld, 'etg/_richtext.py',   '_richtext',  'WXHTML WXRICHTEXT')
+
diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild
new file mode 100644
index 000000000000..5881aef2c7ee
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.2.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_IN_SOURCE_BUILD="1"
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets
+
+MY_PN="wxPython"
+MY_PV="${PV/_p/.post}"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="https://www.wxpython.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test webkit"
+# Tests broken: #726812, #722716
+# Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures)
+RESTRICT="!test? ( test ) test"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+RDEPEND="
+	>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-doc/doxygen
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		${VIRTUALX_DEPEND}
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+	#"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
+	"${FILESDIR}/${PN}-4.2.0-no-attrdict.patch"
+	"${FILESDIR}/${PN}-4.2.0-flags.patch"
+)
+
+python_prepare_all() {
+	if ! use webkit; then
+		eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
+		rm unittests/test_webview.py || die
+	fi
+
+	# Most of these tests disabled below fail because of the virtx/portage
+	# environment, but some fail for unknown reasons.
+	rm unittests/test_uiaction.py \
+		unittests/test_notifmsg.py \
+		unittests/test_mousemanager.py \
+		unittests/test_display.py \
+		unittests/test_pi_import.py \
+		unittests/test_lib_agw_thumbnailctrl.py \
+		unittests/test_sound.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	setup-wxwidgets
+}
+
+python_compile() {
+	DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
+
+	# Refresh the bundled/pregenerated sip files
+	${PYTHON} build.py sip || die
+
+	# Build the bindings
+	${PYTHON} build.py build_py \
+		--use_syswx \
+		--no_magic \
+		--jobs="$(makeopts_jobs)" \
+		--verbose \
+		--release || die
+}
+
+python_test() {
+	EPYTEST_DESELECT=(
+		# Aborts, needs investigation
+		unittests/test_utils.py::utils_Tests::test_utilsSomeOtherStuff
+
+		# Failures, need investigation
+		unittests/test_frame.py::frame_Tests::test_frameRestore
+		unittests/test_fswatcher.py::fswatcher_Tests::test_fswatcher1
+		unittests/test_intl.py::intl_Tests::test_intlGetString
+		unittests/test_lib_busy.py::lib_busy_Tests::test_lib_busy5
+		unittests/test_lib_mixins_inspection.py::wit_TestCase::test_App_OnInit
+		unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
+		unittests/test_lib_pubsub_topicmgr.py::lib_pubsub_TopicMgr2_GetOrCreate_DefnProv::test20_UseProvider
+		unittests/test_windowid.py::IdManagerTest::test_newIdRef03
+		unittests/test_auibook.py::auibook_Tests::test_auibook02
+		unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerPersistValue
+		unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
+		unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
+		unittests/test_auiframemanager.py::auiframemanager_Tests::test_auiframemanager02
+	)
+
+	# We use pytest-forked as opensuse does to avoid tests corrupting each
+	# other.
+	virtx epytest --forked -n "$(makeopts_jobs)" unittests
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/xmlsec/Manifest b/dev-python/xmlsec/Manifest
new file mode 100644
index 000000000000..8bd1049057d4
--- /dev/null
+++ b/dev-python/xmlsec/Manifest
@@ -0,0 +1 @@
+DIST python-xmlsec-1.3.12.gh.tar.gz 77722 BLAKE2B b5ecece8063b823cdbe4d58967d10026bdc6f3774954021a3739d579ba3c5a08130af1792921c7892e6bc3d00f88ac83ab30e862775e419e0dad40b990b10cbe SHA512 19c5e3bf58b4b0f8a1cca3e60c08348b02ae298620f8c02b8cfb325aecf0313cb2bd1af89507b754ebe4c35af3b031e232d15ddcd42deae0821c9c0d7571aa7c
diff --git a/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch b/dev-python/xmlsec/files/xmlsec-1.3.11-fix-xml-testfail.patch
index 3e7ab8829c2f..3e7ab8829c2f 100644
--- a/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
+++ b/dev-python/xmlsec/files/xmlsec-1.3.11-fix-xml-testfail.patch
diff --git a/dev-python/python-xmlsec/metadata.xml b/dev-python/xmlsec/metadata.xml
index e21c7fc3a720..e21c7fc3a720 100644
--- a/dev-python/python-xmlsec/metadata.xml
+++ b/dev-python/xmlsec/metadata.xml
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.12-r1.ebuild b/dev-python/xmlsec/xmlsec-1.3.12-r1.ebuild
index 9af134475b09..101f531080b0 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.12-r1.ebuild
+++ b/dev-python/xmlsec/xmlsec-1.3.12-r1.ebuild
@@ -8,16 +8,24 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
 inherit distutils-r1
 
+MY_P=python-xmlsec-${PV}
 DESCRIPTION="Python bindings for the XML Security Library"
-HOMEPAGE="https://github.com/mehcode/python-xmlsec"
-SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/xmlsec/python-xmlsec/
+	https://pypi.org/project/xmlsec/
+"
+SRC_URI="
+	https://github.com/xmlsec/python-xmlsec/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="
-	dev-libs/xmlsec:=
+	dev-libs/xmlsec:=[openssl]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
@@ -37,6 +45,10 @@ PATCHES=(
 EPYTEST_DESELECT=(
 	# Fragile based on black version?
 	tests/test_type_stubs.py::test_xmlsec_constants_stub
+
+	# Broken with xmlsec-1.2.36+.
+	# https://github.com/xmlsec/python-xmlsec/issues/244
+	tests/test_ds.py::TestSignContext::test_sign_case5
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/zeep/zeep-4.2.1.ebuild b/dev-python/zeep/zeep-4.2.1.ebuild
index dc3f80091cf2..f8c51591d632 100644
--- a/dev-python/zeep/zeep-4.2.1.ebuild
+++ b/dev-python/zeep/zeep-4.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/mvantellingen/python-zeep/
 	https://pypi.org/project/zeep/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -39,10 +38,10 @@ BDEPEND="
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/python-xmlsec[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-httpx[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/xmlsec[${PYTHON_USEDEP}]
 	)
 "