gentoo resync : 03.09.2021

3 files changed, 2 insertions, 79 deletions

diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 893f6ea36844..3c348b6198ed 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,7 +1,5 @@
-DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b SHA512 25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 DIST PyQtWebEngine-5.15.5.dev2108100905.tar.gz 49043 BLAKE2B 01b75db0d9fa973ccd0a85f9336e16b7c1fb2a303a0d004d247f91744dc642edb836597877fce6c4f038afa6f87ba066eeaca1e3d467bc15689dbe82e8a9809e SHA512 1ea407832f062dc9b9a6c6312feb4c8f3553b55972e5a32c70c9d1c278918d32934791d60c022a56ab507b6215d5f78e1b4244b9fffa3256aad1f5f4afebd47a
-EBUILD PyQtWebEngine-5.15.2.ebuild 1665 BLAKE2B 54f976b7e747e2d50aabf99728fc79c1efc49d782d806782677b00c5d32780abc206265760cdb06184ff188c289213c795cb3f65f947f439c69621424192a258 SHA512 3679084254b292ad8b7f51ee80cd9ccbb2e6015965abce43f8c27edcd84ab7e15e83ae40d731404c42805dce598e5dca3a4f665354a3244b86f4e6cd4b573742
-EBUILD PyQtWebEngine-5.15.4.ebuild 1705 BLAKE2B 61c47b552ce438e3e4429ed7b6230559b3f2143bad5c2daebff9bbc17f179464183157c8e723b4889b20c8e22b8e43af72ee4ce5c9cc854118830a053070714e SHA512 0c331528212847f92712d7e1c3c0a1d41d354fb84827f588f3270d5f2664d39ca974c6cda3b028cb1e0e504951df288ed2fbce5bf106799437e10a3e58ebcd2a
+EBUILD PyQtWebEngine-5.15.4.ebuild 1704 BLAKE2B fb1021ada58ea969b39bd795ad4b901baac3895ef7cb7b5feabad867fd27fd030da0ef7774a18afcd94431fdc1ec40c5a883bd914184d6c37d84f9dccc012c0f SHA512 190d4c1ad8798fb574cdbeacf83e5c5de9e5550fbecd4ad7a9db079f1beea16fb58f1e00adabc59cb0cb37eac9cef37d7f3b0a40777be2b4d751a3a67a07e117
 EBUILD PyQtWebEngine-5.15.5_pre2108100905.ebuild 1723 BLAKE2B 59b5e5ed4da36243f0ca04c2375db236327e59caae7100773edff786f7e9a651f0ee98539e9fdb7a8fdc149889f04798448831b2d87ecfe6d1596a34159a72d1 SHA512 62e51e300cf3a833bf3d7e88b108a42d447f1f582d3894cba2c5c152d80405050c1792988fa498281f03af3ab2ced5f7e0effc55488bf68095288bcaff828e60
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
deleted file mode 100644
index 3e2edbd11476..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${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 install_pep484_stubs install_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${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.15.4.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
index fad00a88922c..91ec0ba948d2 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="