gentoo resync : 03.09.2021

4 files changed, 3 insertions, 197 deletions

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 309aa080a08c..4cd1d966ec4d 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,7 +1,5 @@
-DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
 DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853 SHA512 5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5
-EBUILD PyQt5-5.15.2.ebuild 5645 BLAKE2B bcb40684f9eba4b134884b3d73da969e923e7c1fcd788162ebdb2ff2b47633d2ee60cc3571fe673e05c76fb33926d83cbeee66e7d50e8c240cd35bede1b20191 SHA512 24e491d79e9ce3d9fc2190792e2b7c370ec3816f3bf99bf21448123180dfe4747ffa57bb4ad3efbecd1865eb165de47df9744f5d57ba0eb16972d1882df7a09d
-EBUILD PyQt5-5.15.4-r1.ebuild 5442 BLAKE2B aa9575172104cd3a8a7d0776c011d805806e7aa0832ca058bec2ce278fde669fd72a24a24bea91fa50f57c6235e940735c66c8eb00cd07f06e092ecae04336f3 SHA512 9cb1815bfca0b4e7330d4a98922ae7475fc142f079508d88abf45b11544ef9b42a205ec7485ad3d8cf95cf5f0c9d14f2c6b0b81542278bd3c0458bd672b79889
+EBUILD PyQt5-5.15.4-r1.ebuild 5441 BLAKE2B 90338bd83e4cefbca3f207be293dfa17ce05f4058522da44129607d1949107c0794c06a8d4e2d79450c5f969520d6d982d4282385d1cc439c6d737144739887f SHA512 5da215138c6c2fbfbd23d3206f69fde4c805725f6a7787186f2306c7cd3daa92a4458c6fdf38b40d640c00a9cb357b00db96a18cd4bb7d30bd8e29f7b82745fb
 EBUILD PyQt5-5.15.5_pre2107091435.ebuild 5401 BLAKE2B 5feec52e824c809419d0591b97359feea3d099c7ca919f1373674165f1168eadc436d7d4d2f6ee9b09a2107a62eb688031ae3f7391d6f26d02c2ddeb712b2232 SHA512 39a09886fc3bcf4adc8cf9c6f90119c52c3ecb3f15e8d676b1ac4e2aca7859acfed19962f7cdbb0d8693d6ba3af156d0d4a30f1aaa78146d55279ec9f1c6db3a
-MISC metadata.xml 2432 BLAKE2B 56cd4edfd99449ed4d837edec6952e85d0fa13bdca2189451b7c43645b39a7a7a810f4e206f7aba6690d65529a5f629db532d4ab056374952b34834d2d68fbc3 SHA512 acb9f52dbeed59158c5ef83ffef67e51e4362191210b6addfd5c3e4aa1d17f208ab5ce316d7a8d5116dabe3dba5b58d28ac6f197ebaa832f3b33f4a13a881a62
+MISC metadata.xml 2286 BLAKE2B a58f3a588af7fcb544326e9d4f95e5d2fbd5b5f099b8e12d4000a4f20e83f4c941b3ac86c795eef009fe1878ee37bbf7e27be35804eb74d85c435af3975b4f76 SHA512 ab0a9a75897febd1a60b89b3854574c0e47d78cce3262f5a466edcf51e29bf7da7a5b53ff24c0ede6791b51b805c7f3bb7c4a881d6163caa238f18b116fd94b4
diff --git a/dev-python/PyQt5/PyQt5-5.15.2.ebuild b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
deleted file mode 100644
index 69434bfb6142..000000000000
--- a/dev-python/PyQt5/PyQt5-5.15.2.ebuild
+++ /dev/null
@@ -1,190 +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 multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/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 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
-	multimedia network networkauth opengl positioning printsupport sensors serialport
-	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.15:5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.23[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || 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() {
-		local tmp_root=${D}/${PN}_tmp_root
-		# parallel install fails because mk_distinfo.py runs too early
-		emake -j1 INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		rm -r "${uic_dir}"/port_v2 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
index 1e016c72565e..0543f12fff09 100644
--- a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index c75a05796139..f61d5ad8017a 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="location">Build bindings for the QtLocation module</flag>
 		<flag name="multimedia">Build bindings for the QtMultimedia module</flag>
 		<flag name="network">Build bindings for the QtNetwork module</flag>
-		<flag name="networkauth">Build bindings for the QtNetworkAuth module</flag>
 		<flag name="opengl">Build bindings for the QtOpenGL module</flag>
 		<flag name="positioning">Build bindings for the QtPositioning module</flag>
 		<flag name="printsupport">Build bindings for the QtPrintSupport module</flag>
@@ -26,7 +25,6 @@
 		<flag name="svg">Build bindings for the QtSvg module</flag>
 		<flag name="testlib">Build bindings for the QtTest module</flag>
 		<flag name="webchannel">Build bindings for the QtWebChannel module</flag>
-		<flag name="webkit">Build bindings for the QtWebKit module</flag>
 		<flag name="websockets">Build bindings for the QtWebSockets module</flag>
 		<flag name="widgets">Build bindings for the QtWidgets module</flag>
 		<flag name="x11extras">Build bindings for the QtX11Extras module</flag>