gentoo resync : 31.12.2018

3 files changed, 17 insertions, 15 deletions

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index c15fc6bc4b34..93bf31da17e0 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,9 +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.11.3.tar.gz 3121036 BLAKE2B e7881fea18535ba55c0b6946718fd1eccdc6a4678b869678c9413c500daee0cbfb281116db40a13655c8cb5e778b605f141821e20bf3834f1434908f73fc22bd SHA512 6f4abb1866ce357263c208121607072e127c8853e9c6bf039b034fefdda4c40e38f917c3b313375f0d692d764ecf26ff3a6b12cda2a2eeb5237db8b5e9443548
+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 5734 BLAKE2B 4830d56f6c211d23c85b479504d93426382a2bc4531ebd383e9039189c9b894a23ac6c3ed3e6faeaea2eed8fa5da040b282b1661487b852a56e7285b71d1940e SHA512 e6015c904e41fc24508377cf9dd1dd72907d41f239211132805ffbd432b5dba7b1dbeeeab8d3c269e23f3a599a9ab60b1386d60060203f1f7afe4e83d3cfa458
-EBUILD PyQt5-5.11.3.ebuild 5686 BLAKE2B 0934879154a16e7aee58f17376887ca86d1ef535e589275e4f328c4ecbb0f1859f1974cbab9ce95b08c17d42564c6f2aee795c4c2d490fca7468baabac8115e0 SHA512 960d3ec9a7fe42657219d04cddb64be8acefae1dfd6bfb66ace98763b2468d8786446514c41ef918193fe8eea911be1de8e350059d087513bb0159e052301306
+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 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
+MISC metadata.xml 2525 BLAKE2B 86896a8756022dca6a547db2ab96c775abde3278ec815d277df048179ea4c5b2ae89e5162cb8b835accf398bbc36119a36e8a9a05cafe2a32d9dd11e67149f78 SHA512 2f47008d13004bfb56d30e08230c7142fb65968e09e1bbf0423d475c6236783e0197bba65670cd2358ea96a2f682004584607ab8f9c66ad22e7d92bb1f23408d
diff --git a/dev-python/PyQt5/PyQt5-5.11.3.ebuild b/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
index b072e6d3cd77..7db840ce9df6 100644
--- a/dev-python/PyQt5/PyQt5-5.11.3.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
@@ -11,7 +11,7 @@ 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.xz"
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 fi
@@ -20,10 +20,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-# TODO: QtNetworkAuth, QtNfc
+# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
 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"
+	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'
@@ -35,6 +36,7 @@ REQUIRED_USE="
 	help? ( gui widgets )
 	location? ( positioning )
 	multimedia? ( gui network )
+	networkauth? ( network )
 	opengl? ( gui widgets )
 	positioning? ( gui )
 	printsupport? ( gui widgets )
@@ -44,7 +46,6 @@ REQUIRED_USE="
 	svg? ( gui widgets )
 	testlib? ( widgets )
 	webchannel? ( network )
-	webengine? ( network widgets? ( printsupport webchannel ) )
 	webkit? ( gui network printsupport widgets )
 	websockets? ( network )
 	widgets? ( gui )
@@ -52,11 +53,11 @@ REQUIRED_USE="
 "
 
 # Minimal supported version of Qt.
-QT_PV="5.9.6:5"
+QT_PV="5.10:5"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/sip-4.19.11:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.14_pre:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	virtual/python-enum34[${PYTHON_USEDEP}]
@@ -72,6 +73,7 @@ RDEPEND="
 	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} )
@@ -81,7 +83,6 @@ RDEPEND="
 	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[printsupport] )
 	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
 	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
@@ -89,13 +90,12 @@ RDEPEND="
 	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.14_pre[${PYTHON_USEDEP}]
 	dbus? ( virtual/pkgconfig )
 "
 
 S=${WORKDIR}/${MY_P}
 
-DOCS=( "${S}"/{ChangeLog,NEWS} )
-
 pyqt_use_enable() {
 	use "$1" || return
 
@@ -116,6 +116,7 @@ src_configure() {
 			--verbose
 			--confirm-license
 			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
 			--sip-incdir="$(python_get_includedir)"
 			--qsci-api
 			--enable=QtCore
@@ -133,6 +134,7 @@ src_configure() {
 			$(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)
@@ -142,7 +144,6 @@ src_configure() {
 			$(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)
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index 6540bb21471f..92725cf1722d 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -16,6 +16,7 @@
 		<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>
@@ -38,7 +39,7 @@
 			<name>Phil Thompson</name>
 		</maintainer>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/PyQt5/</doc>
+		<doc>https://pyqt.readthedocs.io/</doc>
 		<remote-id type="pypi">PyQt5</remote-id>
 		<remote-id type="sourceforge">pyqt</remote-id>
 	</upstream>