From b62381b18b4bf2e919cbfbae11ebcad391e38e77 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 16 Dec 2022 03:35:12 +0000
Subject: gentoo auto-resync : 16:12:2022 - 03:35:12

---
 dev-python/Manifest.gz                       | Bin 261656 -> 261660 bytes
 dev-python/imread/Manifest                   |   2 +-
 dev-python/imread/imread-0.7.3-r1.ebuild     |  28 ------
 dev-python/imread/imread-0.7.3-r3.ebuild     |  28 ++++++
 dev-python/pillow/Manifest                   |   2 +-
 dev-python/pillow/pillow-9.3.0-r1.ebuild     | 125 +++++++++++++++++++++++++++
 dev-python/pillow/pillow-9.3.0.ebuild        | 125 ---------------------------
 dev-python/wxpython/Manifest                 |   2 +-
 dev-python/wxpython/wxpython-4.0.7-r2.ebuild |  92 --------------------
 dev-python/wxpython/wxpython-4.0.7-r4.ebuild |  92 ++++++++++++++++++++
 10 files changed, 248 insertions(+), 248 deletions(-)
 delete mode 100644 dev-python/imread/imread-0.7.3-r1.ebuild
 create mode 100644 dev-python/imread/imread-0.7.3-r3.ebuild
 create mode 100644 dev-python/pillow/pillow-9.3.0-r1.ebuild
 delete mode 100644 dev-python/pillow/pillow-9.3.0.ebuild
 delete mode 100644 dev-python/wxpython/wxpython-4.0.7-r2.ebuild
 create mode 100644 dev-python/wxpython/wxpython-4.0.7-r4.ebuild

(limited to 'dev-python')

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 162a28fc931f..74a834d8c9d0 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/imread/Manifest b/dev-python/imread/Manifest
index 52c0561e2513..20fd301350ad 100644
--- a/dev-python/imread/Manifest
+++ b/dev-python/imread/Manifest
@@ -1,3 +1,3 @@
 DIST imread-0.7.3.tar.gz 131492 BLAKE2B 060bcd8312f24f2966f840a6403486a9a9a2f6b9d033e92f0268594711f4fa06530c2a825103683b1041570c43c3af584faf10acf45a95e693dc83c81da4190d SHA512 401ec64fd4a65fac1cf2e1bd929cad00a8d704c6c03b8a10256d1e9c27cbc83b47a11567731a42c731aca3df9a5101b7ff90bb51f869695b1405c642e16486e7
-EBUILD imread-0.7.3-r1.ebuild 678 BLAKE2B 1809209b3441601585bff76f0df52ac283314162db5996ad57c188e9bb91d984453c0d35703f622c88acbfdd88d4adcf334fb9d3cc44c948eab8d0f7d2fbb019 SHA512 3cf3d06a9fd05d87ae934c9451960b485842b7c38855a4bb30944c7273c281b8f07eae9c0bf4f13770d09e4128deba49bd998d7170505a355d439fb84b95d22a
+EBUILD imread-0.7.3-r3.ebuild 692 BLAKE2B d6a0455118272af30fd020c5afcc1808b175e7c353b64a182a2a8ee8b4f1c903375e5f1a1f13fb1dee7fe3a9bdd43654f626b6a06978bcf59fd667c4864b92ce SHA512 f93fee31e659a8cf4901c5577251670b3bb9cf26ec856e8d8e764844998e63af10f58f8913bdb280676a4c475837a86af526c5ff7e374b534a33e602125d29dc
 MISC metadata.xml 538 BLAKE2B 48d807d1f9e08aca0ffebca50db1ec165f2fbb6ba0f3d840dcebf194b5c1b8514c6f3af0c0fee90f30d776ba7438bbffe44d312203e927092971c24222cd563b SHA512 b0ec1797edc02bdde312b66afbf79930b7b438ed6987638202b373155ca6ae7439cc6b3d3976ab721f60a497313bcde53b60755a904f80a5b16c1c58c05f14ff
diff --git a/dev-python/imread/imread-0.7.3-r1.ebuild b/dev-python/imread/imread-0.7.3-r1.ebuild
deleted file mode 100644
index bc7b8753a584..000000000000
--- a/dev-python/imread/imread-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read Image Files"
-HOMEPAGE="http://luispedro.org/software/imread/ https://github.com/luispedro/imread"
-SRC_URI="https://github.com/luispedro/imread/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0
-	media-libs/libwebp:0
-	media-libs/tiff:0
-	virtual/jpeg
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests setup.py
diff --git a/dev-python/imread/imread-0.7.3-r3.ebuild b/dev-python/imread/imread-0.7.3-r3.ebuild
new file mode 100644
index 000000000000..f7884da9e5dc
--- /dev/null
+++ b/dev-python/imread/imread-0.7.3-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Read Image Files"
+HOMEPAGE="http://luispedro.org/software/imread/ https://github.com/luispedro/imread"
+SRC_URI="https://github.com/luispedro/imread/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libwebp:=
+	media-libs/tiff:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests setup.py
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index d6e407484072..681261159c53 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1,3 @@
 DIST pillow-9.3.0.gh.tar.gz 50370806 BLAKE2B d0d4775c8b60e40560328e4f1c14055743d1a826b0ab01353075f1f48a461bcd8bf5883f18713976399f9b0f688125f3a883ea5818a359db9e540aac8895f02a SHA512 60c529d8a222a521a0c3f4254917aa3f6c5a47c7cb8930b4b9a05ef442d1a7e776018dc4ac834a9effc1342f8457898cae79820531ff430728f6c39d6297b2d7
-EBUILD pillow-9.3.0.ebuild 3223 BLAKE2B 0b7a375dd5be3527823c2e1db9c1d09c48234ac76958d7184294108363fe39acf2f5b4d10b7a04754bed246eca804f3167d54bfcf5a6b8ed95f59227d49597d6 SHA512 08f06e5765374120642a3bcdcd61428b2dddd9ce3af6488107585dd43908d88c74f6134c0dae19da5c3cf639eb4fb7a3056dd34c073359f578da4c1c435ebd80
+EBUILD pillow-9.3.0-r1.ebuild 3222 BLAKE2B d07eb59a9058c2643d6c8230153d35a8cace1621d8d70521e844abc5a00138b81792ebd7196b4528e5a15098d6ec43d193f1d7c12c867a91978b2d0b81e4423f SHA512 588d765138ce5f9af85cc6271735e9c1e162b06d912b2e1a8442dd4b5c200b859707f7e0d2258a8645a40c8e82d01f9f8d096cc9f5fa9031b00c4ff45315b7c1
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.3.0-r1.ebuild b/dev-python/pillow/pillow-9.3.0-r1.ebuild
new file mode 100644
index 000000000000..78acbee2f840
--- /dev/null
+++ b/dev-python/pillow/pillow-9.3.0-r1.ebuild
@@ -0,0 +1,125 @@
+# 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_{8..11} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="
+	https://python-pillow.org/
+	https://github.com/python-pillow/
+	https://pypi.org/project/Pillow/
+"
+SRC_URI="
+	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+EPYTEST_DESELECT=(
+	# TODO; incompatible Qt version?
+	Tests/test_qt_image_qapplication.py::test_sanity
+)
+
+usepil() {
+	usex "${1}" enable disable
+}
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		disable_platform_guessing = True
+		$(usepil truetype)_freetype = True
+		$(usepil jpeg)_jpeg = True
+		$(usepil jpeg2k)_jpeg2000 = True
+		$(usepil lcms)_lcms = True
+		$(usepil tiff)_tiff = True
+		$(usepil imagequant)_imagequant = True
+		$(usepil webp)_webp = True
+		$(usepil webp)_webpmux = True
+		$(usepil xcb)_xcb = True
+		$(usepil zlib)_zlib = True
+	EOF
+
+	# setup.py won't let us add the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but it doesn't for this setup.py.
+	export \
+		INCLUDE="${ESYSROOT}"/usr/include \
+		LIB="${ESYSROOT}"/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-9.3.0.ebuild b/dev-python/pillow/pillow-9.3.0.ebuild
deleted file mode 100644
index b8c5d55f2897..000000000000
--- a/dev-python/pillow/pillow-9.3.0.ebuild
+++ /dev/null
@@ -1,125 +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_{8..11} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
-	https://python-pillow.org/
-	https://github.com/python-pillow/
-	https://pypi.org/project/Pillow/
-"
-SRC_URI="
-	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( media-libs/libjpeg-turbo )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:0= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# TODO; incompatible Qt version?
-	Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 8d576971a2bd..6f5cc80bc654 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -2,5 +2,5 @@ AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 AUX wxpython-4.0.7-ultimatelistctrl.patch 4121 BLAKE2B 0fdf74a0131c9d5c49dd867c3867ac212d26f4d877dc4f4e48680d90956c1027bbc776d19edd235d8f1e4b619d616c4ca1ab28b45a3b2dc79aa97a59c48adb2f SHA512 9d766d9724613e269215db81ecaad7d836b65c4d17f8b522bd688881bce1176241965d05539886da42755f0c7be65ef55c4ce340c21fddd512abb6577ece5482
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-EBUILD wxpython-4.0.7-r2.ebuild 2371 BLAKE2B 281d28ef2948f63880471f287dec0118ee46b5ee0f21a4fd59a07179b7ffe223620e897755d71e7af74fc25937d4df0c911fa74e1fe53664b5e6e8947b141e7e SHA512 5616e330cd1082bd6fed322ff41d0999028291ff3bd1301e4f994c1138f7be85f826d37f976cd42ef7c4e0b6e42a6e848a27e832b93546bdf3be50ab0726b3ad
+EBUILD wxpython-4.0.7-r4.ebuild 2370 BLAKE2B 5e2e0ba5e2c718c5778741352cd4f180414ec19db13531206072b490380b849d29a49157ff97278f1aa7272d60dec8bf96b0a46507a3ef7431fac4557334af76 SHA512 801125f3ff4dfd1d21b94b28dac7c46596e1b6e69ef104982e2d907ec442e8d25dfcbd7b052dfffe8524914fc75d242db5244a727513dcebf9c3a59f82ead736
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
deleted file mode 100644
index 2b091d7cf784..000000000000
--- a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..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 ~loong 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
-}
diff --git a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild b/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
new file mode 100644
index 000000000000..65bedbfbc328
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.0.7-r4.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_{8..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 ~loong 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:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:="
+
+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
+}
-- 
cgit v1.2.3