Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

6 files changed, 12 insertions, 210 deletions

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index c3898bf8fd01..93bf31da17e0 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,11 +1,9 @@
 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_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
-DIST PyQt5_gpl-5.12.1.tar.gz 3147086 BLAKE2B d5a018f1fca401b9f70dd16e2a28ea380c8a83f5e18dc8577e317dae5904a7b95f8fe979bf7f574f95e71222c514565fbf051b1de87f97cd2ab70c09d04e86ac SHA512 f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67
 DIST PyQt5_gpl-5.12.dev1812231618.tar.gz 3120289 BLAKE2B 2d48eaa39090ed60f971b84c96d148fba05c58fe15196f9a99c7a6c8302f364623dd0e1f0cc16d6fb527606cabf6cb072316319252b65f44c9652c1d95ca9fa6 SHA512 6a95fb02fe1eea3e7fb9a03da457a036f92f5404074e7234eeb52e5941bd247343e3d34d4054dc5a604b380fc2a227f7fe5ae250fcd4449da4a3fe856ab8eba3
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
-EBUILD PyQt5-5.10.1-r1.ebuild 5732 BLAKE2B f4b7b84dc0ab1a5704fa169865ea0e06f3195a94200040d479940405b7ca2dd70c33f6242721d0b803e1d0e2eda84f1e4f8353b5aeaa16a94046cd617468a018 SHA512 06a7fee183d87a4f707584023983b35bbeb4b7ebcd07ef6c57e62cc151b8767a9d484c634c63e24bab70608844d26ab17e9f82f2fd939975dd92030aaaaa6b64
-EBUILD PyQt5-5.12.1.ebuild 5688 BLAKE2B 0c537a07f29b0c2979be9f224952ec6120e2cc8ca39fbeea07b8700513036be4ce41ac108c29fa63a13d1d8b7f2a4551c837637abf320730d7cf375c09e9727e SHA512 d1617fc93fcf20f52756c19797d4ffc38c1a116e0fe1da529552cd8557079bf08c14ee8b2d315f5864d376739c71bc1c9980ceda6389c6fc61ca1888d69809cf
-EBUILD PyQt5-5.12_pre1812231618.ebuild 5667 BLAKE2B b00ad4f8e3df66614016272d7cab47994b88c93249d567b17dbe7545d1bb7bed356be780e94be0cf050300de36761195a10581381451390a8be2fe20ad8fdd0a SHA512 0e8c0d847c7c0f899d6f215d95347f33c7b28dc34f488f41e400d35e584fb91e3e9b73091d3e163cfc9236a15d2b5925e57a7c2dcefa1dd801a441ecefd3334a
-EBUILD PyQt5-5.9.2.ebuild 5660 BLAKE2B 92c6ceb0c5332a6104828fed577d76f77e1c1b0d93d77ee28b83ae08e75f99c7475783ad24522dcd64e54e17b34a1b36dc2ead1f6967a986ccbefd26a9b7c432 SHA512 95831e63830e5a3962e36adca333784954c9b219a8bb818d04ce4a8212ebf14a5045e48822c8de48f4e381c8a8b26bd50164807855eb5dbf3cee2ce022b2b6d7
-MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
+EBUILD PyQt5-5.10.1-r1.ebuild 5734 BLAKE2B 4830d56f6c211d23c85b479504d93426382a2bc4531ebd383e9039189c9b894a23ac6c3ed3e6faeaea2eed8fa5da040b282b1661487b852a56e7285b71d1940e SHA512 e6015c904e41fc24508377cf9dd1dd72907d41f239211132805ffbd432b5dba7b1dbeeeab8d3c269e23f3a599a9ab60b1386d60060203f1f7afe4e83d3cfa458
+EBUILD PyQt5-5.12_pre1812231618.ebuild 5669 BLAKE2B 5dc7ddd6bf0d0df02fab060b50730d0d96c357e4157e7f7475bbf72c36803f5b55cc461355526ba7827d284fee1f3e28e1300e3cbfdfeeeeba683337cdf9e48c SHA512 a0c5ba28d3eb81e51ca408db1da1266848a4888e954919e38d542122820529806a28fbc23d5fa6d605e02cbca9a1a2795ba7a8c6d6ff0fe235723b4f6789b4c1
+EBUILD PyQt5-5.9.2.ebuild 5662 BLAKE2B 58bc9d3d91e3c7e8c8e49bb4095c37c8428eba4568b9136a16e72c1389dee408ea7a209f795e660200eccf530b7b4f285066d7b92d479cc37946f05b7d3eec85 SHA512 46118296b6ff41478121464896050e58e552f8e8e16de232f44211d86516a111dfd0bf02c10ee92f3dd19e9cea05f43982287b59ca1e16d4ba1125d21ebce010
+MISC metadata.xml 2525 BLAKE2B 86896a8756022dca6a547db2ab96c775abde3278ec815d277df048179ea4c5b2ae89e5162cb8b835accf398bbc36119a36e8a9a05cafe2a32d9dd11e67149f78 SHA512 2f47008d13004bfb56d30e08230c7142fb65968e09e1bbf0423d475c6236783e0197bba65670cd2358ea96a2f682004584607ab8f9c66ad22e7d92bb1f23408d
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
index d0f6fd5829f8..8b331f240fb1 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/PyQt5-5.12.1.ebuild b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
deleted file mode 100644
index 7098afbaeb71..000000000000
--- a/dev-python/PyQt5/PyQt5-5.12.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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_P=${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/PyQt5/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-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 network networkauth opengl positioning printsupport sensors
-	serialport sql 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.10:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	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} )
-	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.14[${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"
-			--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 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)
-			$(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
-
-		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
-		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_pre1812231618.ebuild b/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
index c4cd1a3276d0..7db840ce9df6 100644
--- a/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 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_{4,5,6,7} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/PyQt5-5.9.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
index a4aa37a0d7da..2a9f2c434ae8 100644
--- a/dev-python/PyQt5/PyQt5-5.9.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index 3ed574acb761..92725cf1722d 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -38,9 +38,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
-		<changelog>https://www.riverbankcomputing.com/static/Downloads/PyQt5/ChangeLog</changelog>
-		<doc>https://www.riverbankcomputing.com/static/Docs/PyQt5/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
+		<doc>https://pyqt.readthedocs.io/</doc>
 		<remote-id type="pypi">PyQt5</remote-id>
+		<remote-id type="sourceforge">pyqt</remote-id>
 	</upstream>
 </pkgmetadata>