gentoo auto-resync : 24:07:2023 - 14:55:44

5 files changed, 0 insertions, 299 deletions

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 21b5b2d56fef..c16c9d21dd4c 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,11 +1,6 @@
-AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
-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
 AUX wxpython-4.2.0-flags.patch 711 BLAKE2B d05ee176b010199f32ba4325452d7eddb60b78e80e2d80421223c061f33f3edf2d84528eac4d50acbf85af532f6fdfd6fb3cda2c8d97525cce5f66a0dd5c6891 SHA512 ac9c04b086af69d1bd7ce7ff6d9b87b8f6cf5c5273ada18089247f1f951f32009d181ff24758c01f1954183dcbf20fb0bce7501346cc615a18b4f43f2831c7bb
 AUX wxpython-4.2.0-no-attrdict.patch 363 BLAKE2B 2ab3735103574959e069ecd647dc003ad6362760214a67632c91a7d216a372b4bf13450a7420bb8415bd744cac23a514726bf6feb09302b775a2a4c580094599 SHA512 b410023d186db3b07b3780fad2e1037d5a854f10771a5e1c8cd98da91a36e727931bf75944ff1a56e0730ff78a4ec8c9a3d81dec02efa3fe91191ad0a1639859
 AUX wxpython-4.2.0-no-webkit.patch 1285 BLAKE2B 19fdee2293da214b8ae318b2670298b34b745cfefd3938be1f22c810cb1bc4273d628aa34cf427c1023d90739784d8e5c8d381e6084689876bdc336a86a3d0db SHA512 fbe6825f266443b9dec68786e26d6e3842d4dec3b9927420ecaca45a834798c8ef83a95398ea498db386e7d1c659a6a3779a5b62867296cc7244401b06db9586
-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
-EBUILD wxpython-4.0.7-r4.ebuild 2384 BLAKE2B b6f725a9c16e5a0ff0b80f6ea404a274e4b814fe91beb106c1ce90aeddf10f9c948446ec3ed1891e367ee77edaedf25518b8dadaf74bc7da15516be65a6ea194 SHA512 a2ae7848592ef501ea7eff59cef4c79cf2adae6a922913598cc9cb66dfd9c3fb665495707b7fd102da1cae915e9ed633e0572decb5f659d2087f958a125db6ab
 EBUILD wxpython-4.2.0.ebuild 3876 BLAKE2B cb7ed755149dff3baa7d70ae5fa4c1321005c0a5821725356f0a9bf3e604bc7a7254c0496cbeca6de1317391829ab7c9c7755a7e9064d3d9f04eb8044703fc6d SHA512 879176e29a4a97c569416f862363660e085a18d878e008c2e7283d58e59bd2cca27deeb0a331790403e591a2e41dcc5febf0e0293efa35de59adef53737dbbb1
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
deleted file mode 100644
index 795de3a933ff..000000000000
--- a/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru wxPython-4.0.5-orig/wscript wxPython-4.0.5/wscript
---- wxPython-4.0.5-orig/wscript	2019-05-18 22:03:12.000000000 -0400
-+++ wxPython-4.0.5/wscript	2019-05-22 07:59:46.522966555 -0400
-@@ -230,15 +230,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')
--
-         if isDarwin:
-             conf.check_cfg(path=conf.options.wx_config, package='',
-                            args='--cxxflags --libs core,net' + rpath,
-@@ -591,7 +582,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/files/wxpython-4.0.6-skip-broken-tests.patch b/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
deleted file mode 100644
index 22a56162726b..000000000000
--- a/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ru wxPython-4.0.6-orig/unittests/test_frame.py wxPython-4.0.6/unittests/test_frame.py
---- wxPython-4.0.6-orig/unittests/test_frame.py	2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_frame.py	2019-05-24 10:15:51.350004356 -0400
-@@ -50,7 +50,7 @@
-         f.Close()
- 
- 
--    def test_frameRestore(self):
-+    def xtest_frameRestore(self):
-         f = wx.Frame(self.frame, title="Title", pos=(50,50), size=(100,100))
-         f.Show()
-         f.Maximize()
-diff -ru wxPython-4.0.6-orig/unittests/test_graphics.py wxPython-4.0.6/unittests/test_graphics.py
---- wxPython-4.0.6-orig/unittests/test_graphics.py	2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_graphics.py	2019-05-24 10:16:06.520256643 -0400
-@@ -23,7 +23,7 @@
-         gc = wx.GraphicsContext.Create(img)
-         self.assertTrue(gc.IsOk())
- 
--    def test_gcCreate4(self):
-+    def xtest_gcCreate4(self):
-         class MyPanel(wx.Panel):
-             def __init__(self, parent):
-                 super(MyPanel, self).__init__(parent)
-diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py wxPython-4.0.6/unittests/test_lib_pubsub_provider.py
---- wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py	2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_lib_pubsub_provider.py	2019-05-24 10:16:49.649969339 -0400
-@@ -49,7 +49,7 @@
- 
- class lib_pubsub_Except(wtc.PubsubTestCase):
- 
--    def test1(self):
-+    def xtest1(self):
- 
-         self.pub.addTopicDefnProvider(my_topics, self.pub.TOPIC_TREE_FROM_CLASS)
- 
-diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py
---- wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py	2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py	2019-05-24 10:17:18.276438743 -0400
-@@ -215,7 +215,7 @@
-         assert 1 == topicMgr.getNumDefnProviders()
-         topicMgr.clearDefnProviders()
- 
--    def test20_UseProvider(self):
-+    def xtest20_UseProvider(self):
-         #
-         # Test the use of definition providers for topics. We create
-         # two so we can check that more than one can work together.
-diff -ru wxPython-4.0.6-orig/unittests/test_sizer.py wxPython-4.0.6/unittests/test_sizer.py
---- wxPython-4.0.6-orig/unittests/test_sizer.py	2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_sizer.py	2019-05-24 10:18:03.937181671 -0400
-@@ -71,7 +71,7 @@
-         self.assertTrue(items[1].IsSpacer())
-         self.assertTrue(items[2].Border == 5)
- 
--    def test_iter(self):
-+    def xtest_iter(self):
-         bs = wx.BoxSizer()
-         widgetlist = [wx.Panel(self.frame) for _ in range(5)]
- 
-diff -ru wxPython-4.0.6-orig/unittests/test_utils.py wxPython-4.0.6/unittests/test_utils.py
---- wxPython-4.0.6-orig/unittests/test_utils.py	2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_utils.py	2019-05-24 11:14:09.399035368 -0400
-@@ -34,7 +34,7 @@
-         with wx.BusyCursor():
-             self.myYield()
- 
--    def test_utilsSomeOtherStuff(self):
-+    def xtest_utilsSomeOtherStuff(self):
-         wx.GetBatteryState()
-         wx.GetPowerType()
-         wx.GetKeyState(wx.WXK_F1)
-diff -ru wxPython-4.0.6-orig/unittests/test_windowid.py wxPython-4.0.6/unittests/test_windowid.py
---- wxPython-4.0.6-orig/unittests/test_windowid.py	2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_windowid.py	2019-05-24 10:18:24.158508491 -0400
-@@ -28,12 +28,12 @@
-             assert isinstance(ref, wx.WindowIDRef)
- 
- 
--    def test_newIdRef03(self):
-+    def xtest_newIdRef03(self):
-         """Check that Auto ID Management is enabled (--enable-autoidman)"""
-         # This test is expected to fail if autoID mangagement is turned on
--        # because a reference to the ID is not being saved, so it will be 
-+        # because a reference to the ID is not being saved, so it will be
-         # unreserved when the first widget is destroyed.
--        
-+
-         id = wx.Window.NewControlId()
-         b = wx.Button(self.frame, id, 'button')
-         b.Destroy()
diff --git a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch
deleted file mode 100644
index 9d1cc7649e1f..000000000000
--- a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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-r4.ebuild b/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
deleted file mode 100644
index 7b34ac3aec81..000000000000
--- a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_{9..10} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="wxPython"
-WX_GTK_VER="3.0-gtk3"
-
-inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="https://www.wxpython.org/"
-SRC_URI="$(pypi_sdist_url --no-normalize "${PYPI_PN}" "${PV}.post2")"
-
-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}/${PYPI_PN}-${PV}.post2"
-
-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
-}