gentoo auto-resync : 20:06:2024 - 00:10:56

4 files changed, 2 insertions, 257 deletions

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 9b16190a28db..fd6c45a027a8 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -8,7 +8,5 @@ AUX wxpython-4.2.1-x86-time.patch 1920 BLAKE2B 82d82530740b3618edac30d8d13bb1418
 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
 DIST wxPython-4.2.1.tar.gz 73724359 BLAKE2B d9569ea172c7279e0b2cfcb3cdcd5d1faab5324e2648c9b0f8c8b838fb2355dc6af28c4593e5dd0cfa02573133bf15a58a6ffa9711d854925a9cada0985dc7f8 SHA512 ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438
 EBUILD wxpython-4.2.0.ebuild 3924 BLAKE2B 5f72d886f806375ee130a7170f239bf406961760cfd30e00e5fb3ca9d1eca9c1971e058046612636b3a574ff48f8fbc48e5a8c6044cf518ccdf3aa57871ad530 SHA512 936f595d4adeabd48c040dafd371b98a30927c73f955ff4fb29de9ea210fc67a3efd51686389e791f2ed6a384f59b8c45eab57f2e01c42d52f716e97110bd07d
-EBUILD wxpython-4.2.1-r1.ebuild 3596 BLAKE2B e2b11bf86caff255eeb6c33855581c531114ff141694523b0dae25a7bb2f5849f75632a205cfc0f441ec544ed7ca9f0810b27b78a172aaae8b4fb9dab035adb3 SHA512 b3a4a47d74bc4e1b9fddbce86503364d51da4a0d6337c9074abbba168844e64fff5927831d6ee8cd494b4d62d8c3b22f62725c281dba89985615579844037c2b
-EBUILD wxpython-4.2.1-r2.ebuild 3684 BLAKE2B eb97759c56dc1bd180ff45b8a52453754ae80355dd1c59de2b3274329066d9b4cc941262807ec6a24d8b661f4b79b1122fe41d9e0f92bfaeda0872ff74f1c5d9 SHA512 bca8d09b81fa59ea80719f0c4a8d71ec6b25e935ff6a9957a04904c91149b92ae12a5cf0e79b5dcac61367f1a6858d2c59463b1e70db2295ddf89c7f180cb420
-EBUILD wxpython-4.2.1.ebuild 3531 BLAKE2B 77f9a8c0a60818dcf2c055ac2a2db7f8213d1031be40a48d660324b87e5ea2f6572cf6da2f85e71fca9848e311378f073982dddcca048d0cb18676349666b87f SHA512 3513965eb8ffd03061f93827869100ae2fb8e2aae0401416bf5140bb4d8b39cdd59e398756974e8857c645d03ecf0b0f914d825d11fc3408d4d995c5c3358c21
+EBUILD wxpython-4.2.1-r2.ebuild 3679 BLAKE2B 13b7f4362c162a7220082df11ea7a5a919d991b2b0d1e77a18759a8a0270fcbdc907146499aad6ffcaf028db7a6b3fc6d2a3b23f1052df8f0c506475f50ebfc4 SHA512 a9509b515c9c958125a40eea4545bb126eb56a04c41906b48f14a8666f17a0056faded5e69fc241ef8704e476370d0e5dd4267fb802fc58b21516cd2cf88e199
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.2.1-r1.ebuild b/dev-python/wxpython/wxpython-4.2.1-r1.ebuild
deleted file mode 100644
index 5364e1b56160..000000000000
--- a/dev-python/wxpython/wxpython-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_IN_SOURCE_BUILD="1"
-PYTHON_COMPAT=( python3_{10..12} )
-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.0.4-r301:${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.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}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-flags.patch"
-	"${FILESDIR}/${PN}-4.2.0-cython-3.patch"
-	"${FILESDIR}/${PN}-4.2.1-integer-division-for-randint.patch"
-)
-
-python_prepare_all() {
-	if ! use webkit; then
-		eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	setup-wxwidgets
-}
-
-python_compile() {
-	DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg --nodoc || die
-
-	# Refresh the bundled/pregenerated sip files
-	"${EPYTHON}" build.py sip || die
-
-	# Build the bindings
-	"${EPYTHON}" build.py build_py \
-		--use_syswx \
-		--no_magic \
-		--jobs="$(makeopts_jobs)" \
-		--verbose \
-		--release || 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
-}
-
-python_install() {
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
index 2e58fca2a380..ffdc1114156b 100644
--- a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wxpython/wxpython-4.2.1.ebuild b/dev-python/wxpython/wxpython-4.2.1.ebuild
deleted file mode 100644
index 494ce3d38f4c..000000000000
--- a/dev-python/wxpython/wxpython-4.2.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_IN_SOURCE_BUILD="1"
-PYTHON_COMPAT=( python3_{10..11} )
-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.0.4-r301:${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.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}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-flags.patch"
-	"${FILESDIR}/${PN}-4.2.0-cython-3.patch"
-)
-
-python_prepare_all() {
-	if ! use webkit; then
-		eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	setup-wxwidgets
-}
-
-python_compile() {
-	DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg --nodoc || die
-
-	# Refresh the bundled/pregenerated sip files
-	"${EPYTHON}" build.py sip || die
-
-	# Build the bindings
-	"${EPYTHON}" build.py build_py \
-		--use_syswx \
-		--no_magic \
-		--jobs="$(makeopts_jobs)" \
-		--verbose \
-		--release || 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
-}
-
-python_install() {
-	distutils-r1_python_install --skip-build
-}