gentoo Easter resync : 12.04.2020

4 files changed, 94 insertions, 4 deletions

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index dbdf74b68223..0b4fe41a1908 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -6,8 +6,10 @@ AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 BLAKE2B 07601322f2e71fb6af4017
 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
 DIST wxPython-4.0.6.tar.gz 68815031 BLAKE2B 49367f5d0867c28893c43d54c4ad6001807bdc95d81327082e3c88fd796e5e2daafcf6b70252828bdcfaaec8b42ba64e881575d209eb4f61a85f58ebd79e8ae4 SHA512 bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301
+DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 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
-EBUILD wxpython-3.0.2.0.ebuild 4590 BLAKE2B 14f0f055727c590d4dd2787678899050330923f8eb5f3e3ea3c37052cd6bbb9dede1538698452538beaa4caf61b483ba7343a0328613168664d3a83e0b5cf55b SHA512 bade7cd16261fd2562e3d559af75f80ffa5ec77b1db1b55b13b859746548e2a6d58b7812685694b332f6f0a7d59fbe951925b2e16ca0cc6daef2a01949fd8a48
-EBUILD wxpython-4.0.6.ebuild 2384 BLAKE2B 216752a5fbc867c15d57e806a05f782ca765ca4c65a1540cf9c4ed4d44f7553cee0f89bd72fb73ced7f5ad9ae9c167009c29f639e8435f335620c46b0abd54c5 SHA512 6e633ae4fb2c0ca5a7fa81e62b3cb71068eebdc47f6afde1415db226d8fecae12ca93d25b66a36f2208613c4eeb069659b2da4fc427dfebd6794a536c13e226c
+EBUILD wxpython-3.0.2.0.ebuild 4586 BLAKE2B 5c6651e3c0b0c40cd623583469fd0ba0a3c950bf8f7f5dd0cc81e17629988a16218bc748e2b7df0be0045e088f0e25c61abef34a87329024df978fe8d34acaae SHA512 7bf242603883a98ecb3f9d784087ba1276a5162777b6e84ad6545a77c499f93f9b6374ec5fc6dcb6b13165c4a3650e0a821d5089fe7f3d0c4a1582394c337ba3
+EBUILD wxpython-4.0.6.ebuild 2380 BLAKE2B 12eb1774a5686c8381d5bf93a1426d3e044b34077c439a042ccce811c78e0545add69e3be31cbd3170d863cc084c1a65b04b804a7ffc26915e1f0df0aa297327 SHA512 4975b96c2d920d8af45cdf430027251d4ee14f65fd012b57dfbd103944257ced309971a21b0da580f50243a03fddcfef9a8a6c06b41774acc528683634f9c638
+EBUILD wxpython-4.0.7.ebuild 2266 BLAKE2B ff114922c256f3835a77b7ad7107b2823d3aafc211e731e8a3d00eec71fe77c6f301277995961afa914304ea4582b5291886abe8754d10ff13033f5199b05752 SHA512 7010a3d621a4e7dba3e08787c406f74e5b41b941748fa01a8e9c98132bcd3ef899341f3c861d358070201969650827265203156efbd50148cf040217bca51d57
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index bc451a8634cc..11b707ab110a 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="wxWinLL-3"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="cairo examples libnotify opengl"
 
 RDEPEND="
diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
index 00b70ee2261c..37342ff62d45 100644
--- a/dev-python/wxpython/wxpython-4.0.6.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.6.ebuild
@@ -18,7 +18,7 @@ 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 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test webkit"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
new file mode 100644
index 000000000000..9028e5005ccd
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+WX_GTK_VER="3.0-gtk3"
+
+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="http://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 ~hppa ~ppc ~ppc64 ~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
+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}-${MY_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
+}