gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 79 deletions

diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index bdb32080f333..ded93da03991 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,7 +1,5 @@
 DIST PyQtWebEngine-5.13.2.tar.gz 45234 BLAKE2B 4ad3aa63856cf3627c2f4ba29d93394f13297deb5e54bdd200bd419f71322d541ae72e45d70cff09cc53808f0d2430f8922d44f18bbf177c42a6b9c827854d6e SHA512 778aff78ea731230029e8dd993f4bc59a32bf74d65f06a8b3d1467efdc67e3b3caf0d9a968682c6c275c8ffdb8d85d9c756cb51727769949656620e944c736d3
 DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
-DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
-EBUILD PyQtWebEngine-5.12.1.ebuild 1701 BLAKE2B 0d613d9c7104bdfbe0bcb354859bfc8a71152c34d85e3c63d1be6f3d63851c0f59093d1dffaf8757799db3f28ba5ffa226deaa2580591a40a8af3f303909fde6 SHA512 3e60e50baeb21cf8976046da49079a44f70d00c754b77d1e9da083f83faf33a47ef98f1369eb6ead5b98cff8f441d607dc179ba34743c6470400663adff58158
-EBUILD PyQtWebEngine-5.13.2.ebuild 1715 BLAKE2B dc59e5d1b132c7cb2abf7b46c43ba855dc0e13afd6ba880b448c0ed0b61deeaa559794323a0fe26ba7851314e426ebc30622428c0083445dbf9b9aa817103818 SHA512 b71319d1fb2ba2389c6e2278917b669d831f988c885d3a7fdfce149f39bb1de7dd1d2eeec1a9923fed37d9d943e31b8d3aa28c6a779a2dbedaecf4af63e889d0
-EBUILD PyQtWebEngine-5.14.0.ebuild 1681 BLAKE2B 1235a69a52bd9c9e2d2017aae1f25a5ae75b2b30208bba4785b4e4037c731ae96ebad577998b21c1a5746d76068080eba4df9fd7e14aefb124bad03339e70b9e SHA512 872e7c531a7f4acbfc18a1375616ad87e7f0898ac7a4b707eaf651a9146bceefb0a159c3323e4af2faf708aece5e174704cc13f8da30b504a2ffa6410d341c85
+EBUILD PyQtWebEngine-5.13.2.ebuild 1714 BLAKE2B 0205d2a1717508fd5050b44909edddb631b86d0884310785997fa083a1430ab5f209a65d9c925442033649c57b9f5736d6241427c6c862a9acf1a0ca0522a509 SHA512 75a6cc779d85306d33f56870f8b3fcc64177395fd74eaabfb942137044832f140e1ada0ef4484cb03c7844839ddd4b199a4d12f94c9f02b819c56e2ce21a8d4f
+EBUILD PyQtWebEngine-5.14.0.ebuild 1679 BLAKE2B 733195892c0094fd8103c05adaecec2a72b99024f81e8a54b350b846c8208d75199f595fedae308f3ef5eeee1438af03bc985bb4f20001b1b739764fe0d8124d SHA512 679ae17740b631925d8e7b3db64d8fa5d33febf4e73d8065cf20b1a3e777323f754629b7e9247c0943b3f1a3705a8c6e815b60c3a784428c9aaa4ca6b733b24b
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
deleted file mode 100644
index cb8c9bbbec36..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-MY_PN=PyQtWebEngine
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.12[gui,network,printsupport,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
index dea78427f27b..0353e48606a3 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
index dae102ae3cc8..20a3bd97ba2d 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="