[gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/files/, dev-python/wxpython/

["Virgil Dupras" <vdupras@gentoo.org>]

commit:     e8e14b564d7f9cc694a1a96031703be15b2d41bc
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 18:19:34 2019 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Fri May 24 18:19:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e14b56

dev-python/wxpython: bump to 4.0.6

Also, take over maintainership.

Closes: https://bugs.gentoo.org/632602
Closes: https://bugs.gentoo.org/667318
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-python/wxpython/Manifest                       |  1 +
 .../wxpython/files/wxpython-4.0.6-no-webkit.patch  | 27 +++++++
 .../files/wxpython-4.0.6-skip-broken-tests.patch   | 91 ++++++++++++++++++++++
 dev-python/wxpython/metadata.xml                   |  6 +-
 dev-python/wxpython/wxpython-4.0.6.ebuild          | 89 +++++++++++++++++++++
 5 files changed, 213 insertions(+), 1 deletion(-)

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 7c15b2e2009..1870b55b866 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,2 +1,3 @@
+DIST wxPython-4.0.6.tar.gz 68815031 BLAKE2B 49367f5d0867c28893c43d54c4ad6001807bdc95d81327082e3c88fd796e5e2daafcf6b70252828bdcfaaec8b42ba64e881575d209eb4f61a85f58ebd79e8ae4 SHA512 bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4

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
new file mode 100644
index 00000000000..795de3a933f
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 00000000000..22a56162726
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
@@ -0,0 +1,91 @@
+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/metadata.xml b/dev-python/wxpython/metadata.xml
index f6588d2f5c3..7012622a081 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>wxwidgets@gentoo.org</email>
 		<name>Gentoo wxWidgets Project</name>
@@ -13,6 +17,6 @@
 		<flag name="examples">Install interactive demo module browser and sample applets.</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">wxpython</remote-id>
+		<remote-id type="github">wxWidgets/Phoenix</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
new file mode 100644
index 00000000000..04e6a637c7d
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.0.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# wxPython 4 supports python 2.7, but because it's going EOL soon and to ease
+# transition from wxPython 3.x, we make this package py3-only.
+PYTHON_COMPAT=( python3_{5,6,7} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets
+
+MY_PN="wxPython"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="http://www.wxpython.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="test webkit"
+
+# 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
+	virtual/jpeg:0"
+
+DEPEND="${RDEPEND}
+	app-doc/doxygen
+	dev-python/pathlib2[${PYTHON_USEDEP}]
+	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}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.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 pytest -vv unittests || die "Test failed with ${EPYTHON}"
+}