Adding metadata

39 files changed, 254 insertions, 542 deletions

diff --git a/dev-python/aionotify/Manifest b/dev-python/aionotify/Manifest
deleted file mode 100644
index 58d0b4a940c1..000000000000
--- a/dev-python/aionotify/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aionotify-0.2.0.tar.gz 9567 BLAKE2B a4b32519c2cfeb9dd87cb94e9363335cc39e3060631c7085825289183a94f2f5b073e4b0f737fe592f967c83ea05741b0b956fbd956d61ac4289dfde0bdc777a SHA512 23c1a6f86076c069346721cdce89f2aea656ad6afa8c89cbb96ae31bdd478592c9ca475c764da91762dd615454005f82b8666644a3121eb8dfc4b875060d51df
diff --git a/dev-python/aionotify/aionotify-0.2.0.ebuild b/dev-python/aionotify/aionotify-0.2.0.ebuild
deleted file mode 100644
index fc1dbcdaec85..000000000000
--- a/dev-python/aionotify/aionotify-0.2.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple, asyncio-based inotify library for Python"
-HOMEPAGE="https://github.com/rbarrois/aionotify"
-SRC_URI="https://github.com/rbarrois/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/aionotify/metadata.xml b/dev-python/aionotify/metadata.xml
deleted file mode 100644
index 5e5b4b197e07..000000000000
--- a/dev-python/aionotify/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>piotr.staroszczyk@get24.org</email>
-  <name>Piotr Staroszczyk</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/beziers/beziers-0.4.0.ebuild b/dev-python/beziers/beziers-0.4.0.ebuild
index 8142e878addf..74b0d6c36123 100644
--- a/dev-python/beziers/beziers-0.4.0.ebuild
+++ b/dev-python/beziers/beziers-0.4.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pyclipper[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
+	dev-python/shapely[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-python/databases/databases-0.5.3.ebuild b/dev-python/databases/databases-0.5.3.ebuild
index 74c5fc71889b..2cb58fdf90fb 100644
--- a/dev-python/databases/databases-0.5.3.ebuild
+++ b/dev-python/databases/databases-0.5.3.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 BDEPEND="test? (
 	dev-python/aiopg[${PYTHON_USEDEP}]
 	dev-python/aiosqlite[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/async-timeout[${PYTHON_USEDEP}]
 	dev-python/asyncpg[${PYTHON_USEDEP}]
 	dev-python/psycopg[${PYTHON_USEDEP}]
 	dev-python/pymysql[${PYTHON_USEDEP}]
diff --git a/dev-python/dateparser/Manifest b/dev-python/dateparser/Manifest
deleted file mode 100644
index e71ed270ea85..000000000000
--- a/dev-python/dateparser/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dateparser-1.1.0.tar.gz 483853 BLAKE2B d754bef57b7a062063fe35480d5c5b8cfdd8144b32d4b0c92c949e31b1bfb7bb388e5eff68981dd20a3bd51328dd48f1f650477efa80b5004337b2ab3fdb53d3 SHA512 019fa8fcc00ba298d38d166fb17bca3cb3ea34934cc59d05d7e47924a4caf1a640a628ee29552b72fc53e7a005109ec227c3a09c52e46d1094565db0a6daed2a
-DIST dateparser-1.1.1.tar.gz 484365 BLAKE2B c4044a4b00370439eee452ee90503c0fef7f7462c4a5de028af911ee312fb672dff139303fe1b8231fd737408ebf5bf46e3655dfa9b0819d740374574af70cdf SHA512 184307023306bc91c80c70a7cabb64bab8589b0e45db719c7f65f7edaad910daa76e5f3c46faf5591db15b170c0d72a0f84ea4b2ad5009fd89adba596beacfba
diff --git a/dev-python/dateparser/dateparser-1.1.0.ebuild b/dev-python/dateparser/dateparser-1.1.0.ebuild
deleted file mode 100644
index e3a0bc1eb725..000000000000
--- a/dev-python/dateparser/dateparser-1.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Date parsing library designed to parse dates from HTML pages"
-HOMEPAGE="https://github.com/scrapinghub/dateparser"
-SRC_URI="https://github.com/scrapinghub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/convertdate[${PYTHON_USEDEP}]
-	dev-python/hijri-converter[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-"
-BDEPEND="test? (
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/parameterized[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/ordered-set[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs
diff --git a/dev-python/dateparser/dateparser-1.1.1.ebuild b/dev-python/dateparser/dateparser-1.1.1.ebuild
deleted file mode 100644
index f64048936711..000000000000
--- a/dev-python/dateparser/dateparser-1.1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Date parsing library designed to parse dates from HTML pages"
-HOMEPAGE="https://github.com/scrapinghub/dateparser"
-SRC_URI="https://github.com/scrapinghub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/convertdate[${PYTHON_USEDEP}]
-	dev-python/hijri-converter[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	<dev-python/regex-2022.3.15[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-"
-BDEPEND="test? (
-	dev-libs/fastText[python,${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/langdetect[${PYTHON_USEDEP}]
-	dev-python/ordered-set[${PYTHON_USEDEP}]
-	dev-python/parameterized[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	<dev-python/pytest-7.1.0[${PYTHON_USEDEP}]
-)"
-
-EPYTEST_DESELECT=(
-	dateparser/date.py
-	dateparser/search/__init__.py
-)
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	rm tests/test_search.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/easyprocess/easyprocess-1.1-r1.ebuild b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
index 9ff58ac824cb..d1452c3688c6 100644
--- a/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
+++ b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/EasyProcess-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/easyprocess/easyprocess-1.1.ebuild b/dev-python/easyprocess/easyprocess-1.1.ebuild
deleted file mode 100644
index 33a4e6beaa7f..000000000000
--- a/dev-python/easyprocess/easyprocess-1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use Python subprocess interface"
-HOMEPAGE="https://github.com/ponty/EasyProcess"
-SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/EasyProcess-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# looks like a problem within imagemagick itself
-	tests/test_fast/test_deadlock.py::test_has_imagemagick
-	# TODO
-	tests/test_fast/test_deadlock.py::test_deadlock_pipe
-)
diff --git a/dev-python/grpclib/grpclib-0.4.2.ebuild b/dev-python/grpclib/grpclib-0.4.2.ebuild
index 66dbc83a20fe..f8dc8e9f24bf 100644
--- a/dev-python/grpclib/grpclib-0.4.2.ebuild
+++ b/dev-python/grpclib/grpclib-0.4.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
 		dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
 		dev-python/Faker[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild b/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
index 009cb2fd88c1..c239b3a83533 100644
--- a/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
+++ b/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
 		dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
 		dev-python/Faker[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/insipid-sphinx-theme/Manifest b/dev-python/insipid-sphinx-theme/Manifest
new file mode 100644
index 000000000000..0d1a7f47d440
--- /dev/null
+++ b/dev-python/insipid-sphinx-theme/Manifest
@@ -0,0 +1 @@
+DIST insipid-sphinx-theme-0.3.2.tar.gz 70081 BLAKE2B c932b403a5c2daa733c521a3b69248827cfcbcc8dbf379eef7f92f1414ce264185a50c55c863d322f3bd9e0c153faaefa2fb19b2ca3615679af7e34579f8e66c SHA512 f8aa876950e81c0341de79447e4702f1e79f4db9bab75bcb2b616db9e74fbe9c86bbd43e5bf27c846a478ac4d4cb9e08b1ddabde2464f5b9fcc19789ac834aba
diff --git a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.3.2.ebuild b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.3.2.ebuild
new file mode 100644
index 000000000000..027b97352d80
--- /dev/null
+++ b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An insipid Sphinx theme"
+HOMEPAGE="
+	https://pypi.org/project/insipid-sphinx-theme/
+	https://github.com/mgeier/insipid-sphinx-theme
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CONTRIBUTING,NEWS,README}.rst )
+
+# needs sphinx_last_updated_by_git
+distutils_enable_sphinx 'doc'
diff --git a/dev-python/dateparser/metadata.xml b/dev-python/insipid-sphinx-theme/metadata.xml
index ddb5b0f1787e..ddb5b0f1787e 100644
--- a/dev-python/dateparser/metadata.xml
+++ b/dev-python/insipid-sphinx-theme/metadata.xml
diff --git a/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild b/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
index 0f2831877085..1068fd4bf6da 100644
--- a/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
+++ b/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
@@ -27,9 +27,10 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/rst-linker \
-	dev-python/jaraco-packaging
+# dev-python/jaraco-packaging removed
+# distutils_enable_sphinx docs \
+# 	dev-python/rst-linker \
+# 	dev-python/jaraco-packaging
 
 pkg_setup() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
deleted file mode 100644
index 936e8f58b3e1..000000000000
--- a/dev-python/kitchen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kitchen-1.2.6.tar.gz 258124 BLAKE2B 7fbe5cd65cd01783fd7802a205fca3a8cd2ee724614ed012f5978fe0302fdb0453453249b95a6c9303413ae7daa284888fa0cdab4fba6e5318e606ee579c25cf SHA512 d2ebefece3131333594aa8f914f34336615ee1121aa73707c252e501ebab1361ab96071395ff6ebcfb0f1241e1ed6f396d62e1ba37e4c00f0ec81b85474523c7
diff --git a/dev-python/kitchen/kitchen-1.2.6.ebuild b/dev-python/kitchen/kitchen-1.2.6.ebuild
deleted file mode 100644
index 1d885ed650ec..000000000000
--- a/dev-python/kitchen/kitchen-1.2.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Kitchen contains a cornucopia of useful code"
-HOMEPAGE="https://github.com/fedora-infra/kitchen"
-SRC_URI="https://github.com/fedora-infra/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( HACKING.rst NEWS.rst README.rst )
-
-distutils_enable_tests nose
-
-# Could not import extension sphinx.ext.pngmath
-#distutils_enable_sphinx kitchen3/docs
-
-python_test() {
-	local noseopts=(
-		--exclude=test_invalid_fallback_no_raise
-		--exclude=test_lgettext
-		--exclude=test_lngettext
-		--exclude=test_easy_gettext_setup_non_unicode
-		# fail with python 3.9
-		--exclude=test_internal_generate_combining_table
-		# fail with python 3.10
-		#--exclude=check__all__is_complete
-	)
-	nosetests -w kitchen3 -v "${noseopts[@]}" || die
-}
diff --git a/dev-python/kitchen/metadata.xml b/dev-python/kitchen/metadata.xml
deleted file mode 100644
index 076fb3fd0fbf..000000000000
--- a/dev-python/kitchen/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>svdm-gentoo@protonmail.com</email>
-  <name>Simon van der Maas</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/logutils/logutils-0.3.5-r1.ebuild b/dev-python/logutils/logutils-0.3.5-r1.ebuild
index 8f6280ae8e86..58dd65030973 100644
--- a/dev-python/logutils/logutils-0.3.5-r1.ebuild
+++ b/dev-python/logutils/logutils-0.3.5-r1.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
+		dev-db/redis
 		dev-python/redis-py[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/lxml/lxml-4.9.0-r1.ebuild b/dev-python/lxml/lxml-4.9.0-r1.ebuild
index 4008f02bb143..f26f4cc3a748 100644
--- a/dev-python/lxml/lxml-4.9.0-r1.ebuild
+++ b/dev-python/lxml/lxml-4.9.0-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
index c0bc507dbb3e..a5038546c334 100644
--- a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
@@ -80,7 +80,9 @@ RDEPEND="
 		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{8..10})
 	)
 "
 
@@ -247,6 +249,11 @@ python_test() {
 		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
 		tests/test_testing.py::test_warn_to_fail
 	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/matplotlib/matplotlib/issues/23384
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
+	)
 
 	# we need to rebuild mpl against bundled freetype, otherwise
 	# over 1000 tests will fail because of mismatched font rendering
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 6b09e27caaab..0771e66b560f 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-git-authors-plugin-0.6.3.tar.gz 27644 BLAKE2B a8778baeb504db5d0571aa20603e8d60e04d8c315c096b5b3f89bb6a3b433a11b04a510d7f80ae86a9bb54259c6a2b0f2e1cb5cdade4220d4dfa1f06612e4aea SHA512 ab1f6984da002b72af2a53131222a3ff7b6b50a7a57f5d1986bca9e7d34365eaa5bfdf7d920e4dbc555e332587607480eef4134d847faf866a3b4750db3747eb
 DIST mkdocs-git-authors-plugin-0.6.4.tar.gz 27799 BLAKE2B 02456df969fac72fc29906ed6faa34ead8d04dcd005fdc39bf72393e5252934c398995cb07133107af99672328d03b96e9a19625a7a83ee438278cf4f8587f50 SHA512 948b59bed123acc4b02a01248b831ac27fd98a24653fbae315424a1da33573d109667ff8b836be454e7c9b56a6f68f45200effe8649fd4fe6d5551d1b93a6cd5
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.3.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.3.ebuild
deleted file mode 100644
index 2127bfd74e31..000000000000
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Mkdocs plugin to display git authors of a page"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-authors-plugin/
-	https://pypi.org/project/mkdocs-git-authors-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-authors tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
index ae8d29287886..7a0db67af20c 100644
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/GitPython[${PYTHON_USEDEP}]
diff --git a/dev-python/persist-queue/persist-queue-0.8.0.ebuild b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
index 91f9ca160713..bf1cb6fffe9c 100644
--- a/dev-python/persist-queue/persist-queue-0.8.0.ebuild
+++ b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 RESTRICT="test"
 
 DEPEND="
-	dev-python/dbutils[${PYTHON_USEDEP}]
+	dev-python/DBUtils[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/pymysql[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild b/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
index d8e1f5907539..126bc4a8ff1a 100644
--- a/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
+++ b/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/easyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild b/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
deleted file mode 100644
index 3f858fdb6cc0..000000000000
--- a/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python screenshot library"
-HOMEPAGE="https://github.com/ponty/pyscreenshot"
-SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/easyprocess[${PYTHON_USEDEP}]
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/mss[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/python-xlib[${PYTHON_USEDEP}]
-		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-		media-gfx/imagemagick
-		media-gfx/pqiv
-		x11-apps/xdpyinfo
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# skip GNOME/KDE tests that require D-BUS
-	local -x XDG_CURRENT_DESKTOP=none
-	virtx epytest --deselect tests/test_check.py::test_speedtest
-}
diff --git a/dev-python/sphinx-argparse-cli/Manifest b/dev-python/sphinx-argparse-cli/Manifest
index 43655ceb31c7..aa4446872412 100644
--- a/dev-python/sphinx-argparse-cli/Manifest
+++ b/dev-python/sphinx-argparse-cli/Manifest
@@ -1 +1,2 @@
 DIST sphinx_argparse_cli-1.8.2.tar.gz 21990 BLAKE2B fda2e87902fa8682a183aa4a16fd80f686a6f0144c4b61d2f8e3840c857b937e27422d2e2c3f346296ef79cc4624ad535ab892409d1633c782343c256d08a763 SHA512 bbc26b0171b20e62a17e130a91b962785ec9edad98b9e838e7a82fe9d464397ac4b12b33c4556253a47320aae2c3e695f938bee04e6583cfbabfe0383955a2d5
+DIST sphinx_argparse_cli-1.9.0.tar.gz 23389 BLAKE2B 790db176b789945ebe786ef38cc35a516d8422d0139e5f2b9070acd4a64504d6f0f58793608259bde053cda99e0cad774971cc9c972602b104d3714f48543322 SHA512 effc9c107c184b91c4f13b0c4ce3c3d7559007373e1851bc7802a1832f3056a7d4c715520184392aa49c615a23f000f0c50639bcb8b82e3f98bdb1741e60e935
diff --git a/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild b/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild
new file mode 100644
index 000000000000..2398f069ecc1
--- /dev/null
+++ b/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 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} ) # no pypy3 support
+inherit distutils-r1
+
+MY_PN="${PN//-/_}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Render CLI arguments (sub-commands friendly) defined by argparse module"
+HOMEPAGE="https://github.com/tox-dev/sphinx-argparse-cli https://pypi.org/project/sphinx-argparse-cli/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index a56e1d2b1fcd..d23411b82865 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,4 +1,2 @@
-DIST SQLAlchemy-1.4.36.tar.gz 8146415 BLAKE2B 62560ac2f2c542d60588a24eef225d39f1b6c4cf6feddfac4631e06731206a837cc0f76b88b40c73600361243857e9e1768b4b4ac0bf5ee8e28736d81028ae58 SHA512 c9bb38ce5eeb7817727e93695f10cf5c247710b809f3298b233ed8be4e2cc08e5a14581d0c5aa2af02d7a49f036fe3a0bb7a88120b58bdce0f115016bdaf2c77
 DIST SQLAlchemy-1.4.37.tar.gz 8155965 BLAKE2B cf21c2ab73a5ba2576a857a12f30ea516265af946e25c1b137e57019d862bf04f4757b4755cee28e6f53642d1f1b58f43c99cd1c69f87640e47ac8a1d1ff8d28 SHA512 3f8a814f9bb6fa273f7b210c4567bf7411d0cf2e5caf010a5387fb946063704c342072145a858fb906545dfb1b959155d041e6073273674e51715356fc1f39e6
-DIST SQLAlchemy-1.4.38.tar.gz 8211925 BLAKE2B c65a8bddfc77bb6262e24a9b191344da312641dcd759de8541439e13cc532d9c2ef92da50c0b46ace60f2fd8582dfa6ea37b2f393fd979b3f122d962c688ede8 SHA512 4f54873fe2ba14b00cfa900251bc81d4fbbd62ed2b0f5f35bd3d5157796b869a3b7a9acf162f65da3f05b4b43cfc8bba437600f7fb81887a1839043a6ad516b4
 DIST SQLAlchemy-1.4.39.tar.gz 8212369 BLAKE2B d65993c4342c2cb5bc76ea4ecc986d0ec521a6eb785604ceeca0c9c22187e4af29fc8bd940a130162ca9dd5c30d58b5d0999472285382c6f6bed3863ff9f20cd SHA512 a7c6b73250044289add492b2d7df9010f3b9a3a5126c8b3448d7339cf743c4be3f1c08d238107bb12c579b2bbd7d20e216e331d3ee10dcf79c0f23ca44d496af
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
deleted file mode 100644
index a12d5a94283d..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 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} pypy3 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_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 ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# https://github.com/sqlalchemy/sqlalchemy/issues/8019
-		test/engine/test_logging.py::TransactionContextLoggingTest::test_log_messages_have_correct_metadata_echo
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
index 1eca91c1bddb..a12d5a94283d 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
deleted file mode 100644
index 6e9d2ad0a598..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 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} pypy3 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_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 ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/threadloop/Manifest b/dev-python/threadloop/Manifest
deleted file mode 100644
index 6adfe8f0e5da..000000000000
--- a/dev-python/threadloop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST threadloop-1.0.2.tar.gz 4905 BLAKE2B a3a569dd1353fc32277bab59649666c8fe79b3aeee3f04926b3b29fe4d12c771c5d59fbf9bae5eb4eeb70baf0d4c80a2a62b8f1fb54a96b7abaa9dca340aea02 SHA512 63dc84e26d697e6489b4fc1bf035749c8e77af039528a9b1d1df87258654db993ef9c33abce7e04403ac5d5a3e56ed102ce4510193eb31f1f681e642cb1a9614
diff --git a/dev-python/threadloop/metadata.xml b/dev-python/threadloop/metadata.xml
deleted file mode 100644
index ea85375034aa..000000000000
--- a/dev-python/threadloop/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
- </maintainer>
- <upstream>
-  <maintainer>
-   <email>breerly@gmail.com</email>
-   <name>Grayson Koonce</name>
-  </maintainer>
-  <bugs-to>https://github.com/breerly/threadloop/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/threadloop/threadloop-1.0.2.ebuild b/dev-python/threadloop/threadloop-1.0.2.ebuild
deleted file mode 100644
index 5e81f2962f6a..000000000000
--- a/dev-python/threadloop/threadloop-1.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Run Tornado Coroutines from Synchronous Python"
-HOMEPAGE="https://github.com/GoodPete/threadloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/ipdb[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch
new file mode 100644
index 000000000000..9d1cc7649e1f
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch
@@ -0,0 +1,85 @@
+From https://github.com/wxWidgets/Phoenix/commit/3eb9eb32dc3285435039f6c420c398665372a1ad
+From 3eb9eb32dc3285435039f6c420c398665372a1ad Mon Sep 17 00:00:00 2001
+From: Glen Whitney <glen@studioinfinity.org>
+Date: Tue, 31 Aug 2021 11:06:27 -0700
+Subject: [PATCH] fix: Correct types of arguments to
+ ScrolledWindow.SetScrollbars
+
+---
+ demo/Mask.py                   |  2 +-
+ demo/OGL.py                    |  2 +-
+ wx/lib/agw/ultimatelistctrl.py | 14 +++++++-------
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/demo/Mask.py b/demo/Mask.py
+index 5f0c2cdde..109b8f30b 100644
+--- a/demo/Mask.py
++++ b/demo/Mask.py
+@@ -56,7 +56,7 @@ def __init__(self, parent):
+         mask = wx.Mask(self.bmp_withcolourmask, wx.WHITE)
+         self.bmp_withcolourmask.SetMask(mask)
+ 
+-        self.SetScrollbars(20, 20, 700/20, 460/20)
++        self.SetScrollbars(20, 20, 700//20, 460//20)
+ 
+         self.Bind(wx.EVT_PAINT, self.OnPaint)
+ 
+diff --git a/demo/OGL.py b/demo/OGL.py
+index 72ca543dd..d475e5011 100644
+--- a/demo/OGL.py
++++ b/demo/OGL.py
+@@ -272,7 +272,7 @@ def __init__(self, parent, log, frame):
+ 
+         maxWidth  = 1000
+         maxHeight = 1000
+-        self.SetScrollbars(20, 20, maxWidth/20, maxHeight/20)
++        self.SetScrollbars(20, 20, maxWidth//20, maxHeight//20)
+ 
+         self.log = log
+         self.frame = frame
+diff --git a/wx/lib/agw/ultimatelistctrl.py b/wx/lib/agw/ultimatelistctrl.py
+index c60867684..14fc41f86 100644
+--- a/wx/lib/agw/ultimatelistctrl.py
++++ b/wx/lib/agw/ultimatelistctrl.py
+@@ -9654,8 +9654,8 @@ def RecalculatePositions(self, noRefresh=False):
+                 self._linesPerPage = clientHeight//lineHeight
+ 
+                 self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
+-                                   (self.GetHeaderWidth()-decrement)/SCROLL_UNIT_X,
+-                                   (entireHeight + lineHeight - 1)/lineHeight,
++                                   (self.GetHeaderWidth()-decrement)//SCROLL_UNIT_X,
++                                   (entireHeight + lineHeight - 1)//lineHeight,
+                                    self.GetScrollPos(wx.HORIZONTAL),
+                                    self.GetScrollPos(wx.VERTICAL),
+                                    True)
+@@ -9676,8 +9676,8 @@ def RecalculatePositions(self, noRefresh=False):
+                     decrement = SCROLL_UNIT_X
+ 
+                 self.SetScrollbars(SCROLL_UNIT_X, SCROLL_UNIT_Y,
+-                                   (self.GetHeaderWidth()-decrement)/SCROLL_UNIT_X,
+-                                   (entireHeight + SCROLL_UNIT_Y - 1)/SCROLL_UNIT_Y,
++                                   (self.GetHeaderWidth()-decrement)//SCROLL_UNIT_X,
++                                   (entireHeight + SCROLL_UNIT_Y - 1)//SCROLL_UNIT_Y,
+                                    self.GetScrollPos(wx.HORIZONTAL),
+                                    self.GetScrollPos(wx.VERTICAL),
+                                    True)
+@@ -9728,8 +9728,8 @@ def RecalculatePositions(self, noRefresh=False):
+                         line._gi.ExtendWidth(widthMax)
+ 
+                 self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
+-                                   (x + SCROLL_UNIT_X)/SCROLL_UNIT_X,
+-                                   (y + lineHeight)/lineHeight,
++                                   (x + SCROLL_UNIT_X)//SCROLL_UNIT_X,
++                                   (y + lineHeight)//lineHeight,
+                                    self.GetScrollPos(wx.HORIZONTAL),
+                                    self.GetScrollPos(wx.VERTICAL),
+                                    True)
+@@ -9797,7 +9797,7 @@ def RecalculatePositions(self, noRefresh=False):
+                             break  # Everything fits, no second try required.
+ 
+                 self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
+-                                   (entireWidth + SCROLL_UNIT_X)/SCROLL_UNIT_X,
++                                   (entireWidth + SCROLL_UNIT_X)//SCROLL_UNIT_X,
+                                    0,
+                                    self.GetScrollPos(wx.HORIZONTAL),
+                                    0,
diff --git a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
new file mode 100644
index 000000000000..0be9635b95bd
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+WX_GTK_VER="3.0-gtk3"
+
+DISTUTILS_IN_SOURCE_BUILD="1"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets
+
+MY_PN="wxPython"
+MY_PV="${PV}.post2"
+
+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
+RESTRICT="test"
+#RESTRICT="!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:0=
+	media-libs/tiff:0
+	media-libs/libjpeg-turbo:0"
+
+BDEPEND="${RDEPEND}
+	app-doc/doxygen
+	dev-python/setuptools[${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}/${P}-ultimatelistctrl.patch"
+)
+
+python_prepare_all() {
+	if ! use webkit; then
+		eapply "${FILESDIR}/${PN}-4.0.6-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
+	${PYTHON} build.py build_py \
+		--use_syswx \
+		--no_magic \
+		--jobs=$(makeopts_jobs) \
+		--release || die
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
+
+python_test() {
+	virtx epytest unittests
+}