gentoo resync : 14.05.2020

3 files changed, 2 insertions, 94 deletions

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index ba6096dbe61c..6bc94f6f2778 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -5,11 +5,9 @@ AUX wxpython-3.0-wxversion-demo.patch 147 BLAKE2B a02fcf87c8b153b3a3fd7abfda117f
 AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 BLAKE2B 07601322f2e71fb6af40172ed64efe5e0b0d32d30556ce821b0a835ae545c016df5974c5aadf6e8810ffc651b5ca8bda47729b1f7589947d5dfc0ad0dfd21771 SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6
 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 4581 BLAKE2B 02226950f5f18aad9261b59c0310c88427cd91362d97c30e8226551ce038a42ce054092418a26a64f878cc3317a524d8ecf67135597fb0db1ca4ae00f6251aaa SHA512 c1edff5306233fd830b847a3c7475c5e7822b501ff117022ec572a02d1cbfcfc003e717705d3d5fd0cbdcea783e2471d47e98296b9d83a52eb9c83dd9b94231a
-EBUILD wxpython-4.0.6.ebuild 2374 BLAKE2B 1cb0f4600ffa1869a92ed6595a7d4d2ae511ba5d53e1da304962a1e6d691849d2feac600784d307fdbb406a8150a4438e61f3b57e381a2ec702ed124f80e362d SHA512 2a77ab74956a8a6553ec68cdc6c1a286e5954d1cce937dbb16d5e0c7b2c01f3d110e4dd3de8ac5fa9922235800267a7e7406aea094280d5087cc9aa2e1118054
-EBUILD wxpython-4.0.7.ebuild 2260 BLAKE2B 39d06a6889900e194576fc8301a16a6872650335090cb5af7aa0da7944144f04c10332dedd3ef537baee7042f332ff83bf0fb3ede0dbfd736f99db1fb118179c SHA512 cba89df2b28b44073c1b88609879f049f1c2df64e15b34ec6af975c1c3c25350846965264bacf8ff4c36f1d790aca431581827b5ee88a3d1462ffa3894a2e012
+EBUILD wxpython-4.0.7.ebuild 2267 BLAKE2B e450f866f7f000d56599fe61ded194159a5cf96e1dd496c6209f9938c8310e38dc016d42295ee55d04a108e3657c5ad8943e1d5d0a44c9409b3bb299f0ff7bd4 SHA512 6a60acc465c823c5e3b2755d7103372aa64191bdb6526e0d062ecd6b17455897e5a297b7e52ec46bf01ae769148f627cb62f52f9eb7e04b3134a4f20fd017626
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
deleted file mode 100644
index b0dffbe57520..000000000000
--- a/dev-python/wxpython/wxpython-4.0.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 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_{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 ~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}-${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
-}
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index 6bc32c9b1904..6d49fa8e3eba 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -16,7 +16,7 @@ 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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test webkit"
 RESTRICT="!test? ( test )"