5 files changed, 209 insertions, 0 deletions
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 86468fc4ed9a..01381e2b520b 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -6,8 +6,13 @@ AUX wxpython-4.2.1-doxygen-1.9.7.patch 1870 BLAKE2B 383266a9dcd1dd87c6772b082964
 AUX wxpython-4.2.1-integer-division-for-randint.patch 939 BLAKE2B 4386cab3372bd8fe56979f2bdfc25bfb0d6ebc4aa80568f0bcda8c0a36a31deff454fba9e4452c62401f5c2f5a7bc94370d16aad557b00ff176fc5d4139a5ce1 SHA512 0686f0f50cd2222709cdbd336186b3bec7d5d5293bcb9dcc24c6682863ff31f94c89fd38da154373dea6eccee376cc2437ada6eaf015c1be7467f96e95b717c3
 AUX wxpython-4.2.1-sip-6.10.0.patch 851 BLAKE2B d5f87190b9a107422349c204a0998eb1fead809846946f0210c7eab6f2dda8ef06062e223c2c5c108fe6acf06b8b555c862c934444688a21f649f67c1e54ecdb SHA512 444e7f7ce562d44e621a1768f7fcae027cdcfcedd2a0c04bb885824c28212f9dbda89cf2ef36d84b80fefb0e60047ffbcffc3477338273babe96f0f61ae1ab6d
 AUX wxpython-4.2.1-x86-time.patch 1920 BLAKE2B 82d82530740b3618edac30d8d13bb1418444312ca6d82f98fd4102468b246f1f9f0510144fe07fd6597f1f5394213849ce3d195d6a94b0c0b66e308d98f54b58 SHA512 596f784a5b1b49c8f7aa2dad044f9abf03a7bdda4feb77a4e50e2573edb1b5c57996711583c92e09dbc7b29eb07a2aa152a27b379af9fb4123414f75d14737e8
+AUX wxpython-4.2.2-no-stacktrace.patch 471 BLAKE2B 21e67d7ed69e9aba2f9e1202ae5776c623ddfb038e1e78a1db87f0809d8f062d53eabbbc7fcf09053ec370b452235d5c10158b3b3c4537dbacdcbee41a07d19e SHA512 f7a00f9a9d9416b05c069ca5e0d2421b15f04a81e7f6ff94ec255f4e79083408f766449f50bd68efe0f6ff76bdb2eab26e31900387ad5bfe9b43b72d8617d28d
+AUX wxpython-4.2.2-setuppy.patch 1324 BLAKE2B 37788ac445e23cbe81ccd4b08bc7bec08326ed2ee1b3a3c362623704d3644196be121bf0c91f1bcd6b1174247ca1341bd64d7457c83269c57d6fc515f8fb0d2d SHA512 6e201c23f6604ac4d3af81e6af8071820bf5655ceaebea227b5b8868c9310c5c901613a43fe3cf28cb037d56263ef0783fbde58450b58ac3a0c12f0913d7b5d8
+AUX wxpython-4.2.2-sip-6.10.0.patch 401 BLAKE2B f5353dab8bbc3dfd067d1e29c3ec794d2edd362ab0dc50a4d0ff22e9b3a54943d1c10c1fd46aa204e27ed469df8a6910b407323a4da13f491f062b8923f3cc59 SHA512 1a6afdea035e3cd5bf2ae07f2b48a6ac98a890127ba441e1771739c1fe83e2556d8e5d07f4cd39e413daae74bf5ea281d6c5854bca458237beceec6dafe1d89e
 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
 DIST wxPython-4.2.1.tar.gz 73724359 BLAKE2B d9569ea172c7279e0b2cfcb3cdcd5d1faab5324e2648c9b0f8c8b838fb2355dc6af28c4593e5dd0cfa02573133bf15a58a6ffa9711d854925a9cada0985dc7f8 SHA512 ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438
+DIST wxPython-4.2.2.tar.gz 57358880 BLAKE2B 325256e0d57f868453ed48ea4580a1ea6763acffacb7cd937cf440c55f43fc540dab867a947fb2c9eb353855888aaa370d85103b888bd1339cf5abe7302aba19 SHA512 08b74285b94f21ebf30fef8c9ebf8cfd074dd3976209372bb5b704b0b792038f9af484dd1378894052eedb0ce603af6935b7d00d695da4e4a15e1ea3bdb3520f
 EBUILD wxpython-4.2.0.ebuild 3924 BLAKE2B 5f72d886f806375ee130a7170f239bf406961760cfd30e00e5fb3ca9d1eca9c1971e058046612636b3a574ff48f8fbc48e5a8c6044cf518ccdf3aa57871ad530 SHA512 936f595d4adeabd48c040dafd371b98a30927c73f955ff4fb29de9ea210fc67a3efd51686389e791f2ed6a384f59b8c45eab57f2e01c42d52f716e97110bd07d
 EBUILD wxpython-4.2.1-r2.ebuild 4021 BLAKE2B d5ae34fe1dc137b1e0075091c25ab8a91dad8a4069b954b589b5732ae69bced4cd22f346ece9b84e5733505058b8f79ae9a5d60d98a9fdd96bf8726879003ed0 SHA512 e8f79de70a1808130b8c4963e3f18a458ae2841585065c9ab9a845438deb160b274fa0a734a2e4e24ae814d0f0c6405a4469f3004aebb770ed188e35e0d21f83
+EBUILD wxpython-4.2.2.ebuild 4098 BLAKE2B dc7f9820270dc51a3b82a3c7d75b76fb5dbf94fa427169a01abeebfaee6040eb21da4895dd20d1c991bbc50f8390091705af4c2747766d1a7e97663eea2c24da SHA512 1a56a6ed2ac70d9342873d1008541bd6afb7e43d39d60833de18c213a7038429b91f1e27af17663729ad665ec4bf0b513f0f019abae23b6aa1a774c923cf8eed
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/files/wxpython-4.2.2-no-stacktrace.patch b/dev-python/wxpython/files/wxpython-4.2.2-no-stacktrace.patch
new file mode 100644
index 000000000000..f387612522bd
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.2-no-stacktrace.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/924057
+
+--- a/sip/cpp/sip_corewxAppTraits.cpp
++++ b/sip/cpp/sip_corewxAppTraits.cpp
+@@ -471,7 +471,11 @@
+             PyErr_Clear();
+ 
+             Py_BEGIN_ALLOW_THREADS
++	#ifdef __GLIBC__
+             sipRes = new ::wxString((sipSelfWasArg ? sipCpp->::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
++	#else
++	    sipRes = new ::wxString("");
++	#endif
+             Py_END_ALLOW_THREADS
+ 
+             if (PyErr_Occurred())
diff --git a/dev-python/wxpython/files/wxpython-4.2.2-setuppy.patch b/dev-python/wxpython/files/wxpython-4.2.2-setuppy.patch
new file mode 100644
index 000000000000..229d372aa5af
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.2-setuppy.patch
@@ -0,0 +1,38 @@
+Created by Quincy Fleming
+https://bugs.gentoo.org/909973
+
+--- a/setup.py
++++ b/setup.py
+@@ -113,6 +113,7 @@
+     """
+     user_options = [
+         ('skip-build', None, 'skip building the C/C++ code (assumes it has already been done)'),
++        ('buildpy-options=', None, 'string of commands and options passed to build.py'),
+         ]
+     boolean_options = ['skip-build']
+ 
+@@ -120,6 +121,7 @@
+     def initialize_options(self):
+         orig_build.initialize_options(self)
+         self.skip_build = '--skip-build' in sys.argv
++        self.buildpy_options = 'build'
+ 
+     def finalize_options(self):
+         orig_build.finalize_options(self)
+@@ -135,7 +137,7 @@
+                 'message and the wxWidgets and Phoenix build steps in the future.\n')
+ 
+             # Use the same Python that is running this script.
+-            cmd = ['"{}"'.format(sys.executable), '-u', 'build.py', 'build']
++            cmd = ['"{}"'.format(sys.executable), '-u', 'build.py',self.buildpy_options]
+             cmd = ' '.join(cmd)
+             runcmd(cmd)
+ 
+@@ -143,7 +145,6 @@
+         # build/lib folder like normal.
+         orig_build.run(self)
+ 
+-
+ def _cleanup_symlinks(cmd):
+     # Clean out any libwx* symlinks in the build_lib folder, as they will
+     # turn into copies in the egg since zip files can't handle symlinks.
diff --git a/dev-python/wxpython/files/wxpython-4.2.2-sip-6.10.0.patch b/dev-python/wxpython/files/wxpython-4.2.2-sip-6.10.0.patch
new file mode 100644
index 000000000000..7f15661b601f
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.2-sip-6.10.0.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/949510#c4
+https://github.com/wxWidgets/Phoenix/commit/de9aa4be5bb49adf82991c7582ea3c42ed505bf7.patch
+
+--- a/buildtools/config.py
++++ b/buildtools/config.py
+@@ -85,7 +85,7 @@
+     PKGDIR = 'wx'
+     # The name of the top-level package
+ 
+-    SIP_ABI = '12.9'
++    SIP_ABI = '12.14'
+     SIP_TRACE = False
+ 
+     # ---------------------------------------------------------------
diff --git a/dev-python/wxpython/wxpython-4.2.2.ebuild b/dev-python/wxpython/wxpython-4.2.2.ebuild
new file mode 100644
index 000000000000..7a5261f7e9f3
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.2.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="wxPython"
+WX_GTK_VER="3.2-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="
+	https://www.wxpython.org/
+	https://github.com/wxWidgets/Phoenix/
+	https://pypi.org/project/wxPython/
+"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test webkit"
+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
+DEPEND="
+	>=x11-libs/wxGTK-3.2.6:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-text/doxygen
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.8.5[${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}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-flags.patch"
+	"${FILESDIR}/${PN}-4.2.1-x86-time.patch"
+	"${FILESDIR}/${P}-sip-6.10.0.patch"
+	"${FILESDIR}/${P}-setuppy.patch"
+)
+
+python_prepare_all() {
+	if ! use webkit; then
+		eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
+	fi
+
+	# sip assumes unconditional C99 support since 6.8.4
+	# which breaks when trying to use "sip/siplib/bool.cpp"
+	# https://github.com/Python-SIP/sip/commit/29fb3df49ff37df7aab9d5666fd72de95ac9e7f8
+	if has_version ">=dev-python/sip-6.8.4"; then
+		sed -i '\|sip/siplib/bool\.cpp|d' wscript || die
+	fi
+
+	local build_options="build_py --use_syswx --no_magic --jobs="$(makeopts_jobs)" --verbose --release"
+
+	DISTUTILS_ARGS=(
+		--verbose
+		build
+		--buildpy-options="${build_options}"
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	setup-wxwidgets
+}
+
+python_compile() {
+	#Patch will fail if copy of refreshed sip file is not restored if using multiple
+	#python implementations
+	DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg sip --nodoc || die
+	cp "${S}/sip/cpp/sip_corewxAppTraits.cpp" "${S}" || die
+
+	eapply "${FILESDIR}/${P}-no-stacktrace.patch" || die
+
+	distutils-r1_python_compile
+
+	cp "${S}/sip_corewxAppTraits.cpp" "${S}/sip/cpp/" || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# virtx probably
+		unittests/test_display.py::display_Tests::test_display
+		unittests/test_frame.py::frame_Tests::test_frameRestore
+		unittests/test_mousemanager.py::mousemanager_Tests::test_mousemanager1
+		unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardChar
+		unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardKeyDownUp
+		unittests/test_uiaction.py::uiaction_MouseTests
+
+		# assertion (TODO)
+		unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
+		unittests/test_lib_agw_piectrl.py::lib_agw_piectrl_Tests::test_lib_agw_piectrlCtor
+
+		# seems to rely on state from a previous test (sigh)
+		unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
+
+		# requires Spanish localization
+		unittests/test_intl.py::intl_Tests::test_intlGetString
+
+		# TODO
+		unittests/test_tipwin.py::tipwin_Tests::test_tipwinCtor
+		unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
+		unittests/test_windowid.py::IdManagerTest::test_newIdRef03
+	)
+	local EPYTEST_IGNORE=()
+	if ! use webkit; then
+		EPYTEST_IGNORE+=( unittests/test_webview.py )
+	fi
+
+	# We use pytest-forked as opensuse does to avoid tests corrupting each
+	# other.
+	virtx epytest --forked -n "$(makeopts_jobs)" unittests
+}