gentoo resync : 15.01.2020

8 files changed, 34 insertions, 261 deletions

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index be65e7241087..07f034bfb03c 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,11 +1,7 @@
-AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925
-AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5-5.13.2.tar.gz 3162810 BLAKE2B 383aaa3f1f51ed618a3b6475432a96f6a8f89ad4d97197fe87469e0a69e1db79c762965adfacdf92cc43d1bb2eb5e2790f6bdb7e8b288f0feade828bf8e30090 SHA512 9a16450d8fe2a7e94e182ebb03cc785c6de516e356251753abfb79af3958230043f2db59750cde0a6f1fd6cf5568eb8b7ae76d5a3fbcfe9f7807e02867973b55
-DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
+DIST PyQt5-5.14.1.tar.gz 3241571 BLAKE2B c4f6ab8b5c955186c71e0f6c1ac75fc559839c52374e8ce400c823a813c0c646ed60b5f496145114e5480bd2e4c057d52181b81d79fd01fe5dcd9e4c537118ff SHA512 10b6abb6fdac64233041b0ee91c9f25cfd2a759ec5bde239c87ca9df8176cdd4fcabf6deb8db2dd9bbd911a040d5c476744f1b55aded9c66eb8b5182f99ddc86
 DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
-DIST PyQt5_gpl-5.13.1.tar.gz 3162737 BLAKE2B 1242069b757ef7d9532375758ab29954f216f6d8b1fa18e433ab41cf56df13b7408547dd5c58eb0417a011d834ef9301aa090a4e88a9b10d48f15267eccbf6a3 SHA512 7b7001b16a8c730d7ff2d340fa1dd118868b53519e8f75e8c2ce00b44e3637ac6a31b41a7456fc610df11ff3928b924cb54c0c3712f22ed4df5058fd8bc77281
-EBUILD PyQt5-5.10.1-r1.ebuild 5812 BLAKE2B ceb731b308578c3d8dc511f3bb56b49656bca92bb8e4a89cd140d8044d7445bbb3f4e3a018b63cc29624d273bce1dd8976f7f848b8485d08db00022a293b9be8 SHA512 6f2169fb459bbe378db594edb9ae0e56a96b1bd0014c5855ef038229a8bfa4dd328fd7e7f0659469805b81d7c4589f3d306e1fb7a4cac21c4c2658e599d53f84
-EBUILD PyQt5-5.12.2.ebuild 5904 BLAKE2B 32191a4182088ea16548c68bd45a5081fea20bfd67789380e2150c9ed9c6f919fc6a3cd0620d4b181d393edf5cdfcba8110866f5c51f92e13504d64c4bd9478a SHA512 1ed8f4be78ea9ef0f140d32c5b4fafcb04440237a080a06d88bcac2d8f85a7715c554df4b23de57ba9f332ad7d4c0149dc5e6d831ed1fbf21bf76e8f46cc7ef3
-EBUILD PyQt5-5.13.1.ebuild 5908 BLAKE2B b71caa77bc38e19dcc4edd952aac100bfefae7cd5e77991a71175023eafb264a061bbfa57159e8c88a944e8e0d84732d523f6c85c9dc5d72e7ab2679bd1a15aa SHA512 6915af2b75a45d6d3eced09af924a084a41e5db64cdb2f58200bb87276fa86275702e12629647df6cc04a6503683616600f75b27f49459acbf7bce06f8a002bb
-EBUILD PyQt5-5.13.2.ebuild 5845 BLAKE2B b8999ceecbc39e7bd008a36067435e31a9c8518cff2cef1862dcd4849eb476e95abad98d3bac5f94263f01f469a835d2e0562ba10c33ce9d6935e537f2d517a7 SHA512 5a8d1ec8c52d960b13d173d7fb2b7c27505de5d492696a73a176fb6683b6330ca27f27542011fff9319187b26ef3c9706f1c28770734e60866cd7e5335c40e1e
-MISC metadata.xml 2501 BLAKE2B d7a5d2131b9eec75f488bb28583a99de49191bcd8dae4db3ad51395763bcc9be0433f74e6b732c6f585b0a7fbe3d18c1689aa9eaa65e32ec63dc85e0bace0b07 SHA512 8866f1f87d19e7b7ddb76fdeb0891d928dc4e6cf0561f53b6962fc3bbf7b50a03b0257463942804ddc2bed1e0367732cc74cbf9c3c7f4c2759b9bfa5e92e4af6
+EBUILD PyQt5-5.12.2.ebuild 5902 BLAKE2B 0c265494965e473adf1a1cd6c4ecb1d92bc4c3e0bea3143c2d01371f977b7b09705d9e95875e7fd9579efbeac45d6b7a42cb295d78835b4cb4f2292b35614fb2 SHA512 8d55d4964d019fb28f7c6e0eedaff01f66889f5ef39ff2c1a5ffefa8784b2a9527bfb82c2b2043873bece8872246e49d60c049f48e9f9fc90c5cbbd56df7beed
+EBUILD PyQt5-5.13.2.ebuild 6056 BLAKE2B 25e48fd4f3b806d77c9fca12b200bab855a46f104cce8fc95b5a1e081d5427770936da2e3eb94cfbd8f80cf0e372b2662fd368f8bda0de35318929a035514a33 SHA512 b95891a1438681168096e1a893819f3b7fc94e409207d2955681604c4830964aa3afb6e564dd98dc2234036c671d413be4fe33b7b1f82ad5894b578f348c1b3e
+EBUILD PyQt5-5.14.1.ebuild 6021 BLAKE2B 3a7aee40dda97ae9b6f322b1a03d34bf464edb38e046f936e77aecb134a888f15e175bf9fcbfa91a24b6fbb1337fe58a1730a62d3a6cf7c6a4005aee3c7997fe SHA512 6f47736c94ecbfe3a153cf4a591b558e8fd65718b659778371e84bef561d062ff95b3a2caf9c095fbfdbe49b43134644478fc09602d58dfa486a186ff8d9115c
+MISC metadata.xml 2427 BLAKE2B 38eb2e33dde7fe4877028975c6c4d9ffe53f1c9b7fe4697dbf4959ba0ad53226cd4c0e58c8c1de3c8fe4d9fe66b1423e1c1cae047b1894208e9069ce64e9c0e8 SHA512 bf47edf8c7e577d3851c5e40491cfb5f6eaf214ead58babe5c84c4cddbbbfc65e90fa31dd95701e5e5d1b3496a739dbc451640b70ad4f610648c19f810c6340f
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
deleted file mode 100644
index f636c196bc02..000000000000
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_PN=PyQt5
-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 ~ppc ~ppc64 x86"
-
-# TODO: QtNetworkAuth, QtNfc
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
-	multimedia network opengl positioning printsupport sensors serialport sql svg
-	testlib webchannel webengine 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 )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webengine? ( network widgets? ( printsupport webchannel ) )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.9.4:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19.6:=[${PYTHON_USEDEP}]
-	!dev-python/PyQt5-sip
-	>=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=] )
-	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} )
-	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} )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	webkit? ( >=dev-qt/qtwebkit-5.9: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}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS} )
-
-PATCHES=(
-	"${FILESDIR}/${P}-timeline.patch"
-	"${FILESDIR}/${P}-fix-testlib.patch"
-)
-
-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"
-			--destdir="$(python_get_sitedir)"
-			--sip-incdir="$(python_get_includedir)"
-			--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)
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && 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 opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
-			$(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
-
-		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() {
-		local tmp_root=${D%/}/${PN}_tmp_root
-		emake 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
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.12.2.ebuild b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
index 522cf5cdf410..b7946f867b2a 100644
--- a/dev-python/PyQt5/PyQt5-5.12.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/PyQt5-5.13.2.ebuild b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
index bf0d0d6170bc..e86afa7381c4 100644
--- a/dev-python/PyQt5/PyQt5-5.13.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
@@ -154,7 +154,13 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${PN}.pro || die
+		if python_is_python3; then
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+				${PN}.pro || die
+		else
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
+				${PN}.pro || die
+		fi
 
 		# Run eqmake to respect toolchain and build flags
 		eqmake5 -recursive ${PN}.pro
diff --git a/dev-python/PyQt5/PyQt5-5.13.1.ebuild b/dev-python/PyQt5/PyQt5-5.14.1.ebuild
index fdf60501f5b9..e600cf5bf0db 100644
--- a/dev-python/PyQt5/PyQt5-5.13.1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.14.1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
 
-MY_PN=PyQt5
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
+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="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
 LICENSE="GPL-3"
@@ -57,7 +56,7 @@ QT_PV="5.10:5"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.19:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	virtual/python-enum34[${PYTHON_USEDEP}]
@@ -90,7 +89,7 @@ RDEPEND="
 	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.19[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
 	dbus? ( virtual/pkgconfig )
 "
 
@@ -155,10 +154,16 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
+		if python_is_python3; then
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+				${PN}.pro || die
+		else
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
+				${PN}.pro || die
+		fi
 
 		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
+		eqmake5 -recursive ${PN}.pro
 	}
 	python_foreach_impl run_in_build_dir configuration
 }
@@ -169,7 +174,7 @@ src_compile() {
 
 src_install() {
 	installation() {
-		local tmp_root=${D}/${MY_PN}_tmp_root
+		local tmp_root=${D}/${PN}_tmp_root
 		emake INSTALL_ROOT="${tmp_root}" install
 
 		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
@@ -179,7 +184,7 @@ src_install() {
 			rm "${bin_dir}/${exe}" || die
 		done
 
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${MY_PN}/uic
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
 		if python_is_python3; then
 			rm -r "${uic_dir}"/port_v2 || die
 		else
@@ -194,7 +199,6 @@ src_install() {
 	einstalldocs
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
 	fi
 }
diff --git a/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch b/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch
deleted file mode 100644
index 38a20bc36d12..000000000000
--- a/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Subject: QTest::waitForEvents() is internal only
-
-Must not be used, got removed with Qt 5.11.
-
-Index: PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip
-===================================================================
---- a/sip/QtTest/qtestmouse.sip
-+++ b/sip/QtTest/qtestmouse.sip
-@@ -41,7 +41,6 @@ namespace QTest
-     void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
-     void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
-     void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
--    void waitForEvents() /ReleaseGIL/;
-     void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
-     void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
-     void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
diff --git a/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch b/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch
deleted file mode 100644
index 857492266e01..000000000000
--- a/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
-index e40d12c..4419f2b 100644
---- a/sip/QtCore/QtCoremod.sip
-+++ b/sip/QtCore/QtCoremod.sip
-@@ -22,7 +22,7 @@
- 
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
- 
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
- 
- %Platforms {WS_X11 WS_WIN WS_MACX}
- 
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index a69c270de40d..d337ce9c4697 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -26,7 +26,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="webengine">Build bindings for the QtWebEngine 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>