gentoo Easter resync : 12.04.2020

6 files changed, 20 insertions, 66 deletions

diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 01b9ac53946f..0692df6422ca 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,9 +1,8 @@
 AUX qtprintsupport-5.13.2-no-cups.patch 2196 BLAKE2B c84c6db10bc05a349d910c3c74519b33a9e00cc616def388a2f77f62099215368a6d1715f8997ef9d9231e594c05122ec8c5ca5db0b59caff4c6d0946d01f8bd SHA512 7fb16775627a484c4c9c6cc184f3c73d898c6f3600fb5769623f311f504dc8723713815acb99be6d11026ae3a067a7587a94b282bed95e8747e47798a7efb977
-DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtprintsupport-5.12.3.ebuild 720 BLAKE2B 93461068b7161a9e40f191f7f4b3101cdb57c0db2e74c3177f3f524398459d4f0d6afbb8348a5d2d5d9c7947b62a978dafceac619ed3cb92a4fa96199e98cf97 SHA512 65eca54aee0e38ab9e5b02ef659da994013e18e84247a6ae0296f0ecf9ba85cf8c303988a699a7680f8f7ef42cbdac00eb5d7bdfd3c3c3665832b791dba35e25
-EBUILD qtprintsupport-5.13.2-r1.ebuild 837 BLAKE2B f6d15c065794319676e36764a995cf1c403c10bb6e02e2ffc3eab9ff083ec3e690facd1f86eda9c5b79f5c97ca8c7d32d36db5d251f9f6d0012ae41f588ffd83 SHA512 c4fdb4c530b04d918bb00da736bf63a198252345a585e65e9d97b18681e1578ea94948dbf9fab52c84c0d119081cbac33cdcc4e1d90f6e7630db492f3e718078
-EBUILD qtprintsupport-5.13.2.ebuild 761 BLAKE2B 6423f7e8124bd8391c9c15f5f37fd0b65fe47aecaec362dbd91d74b6d2909b8bfbeb361c66a043a866b6629af67e62cb0cb406c0f74f9de04afa8dde069ed398 SHA512 eaea2dd2bbb578971229091aadd66c27afbd1dbde99d36a15dba3a1c07109c91584bdae1ef800d1b3589d58e3bc8855b35e5bc549e5cb20a9a9c96ea0e03f5da
-EBUILD qtprintsupport-5.14.1.ebuild 765 BLAKE2B 3a1351e983b2e343c976f318ea55974a177572fd5b55c5085d9df8376922b2df44fdfe6d56985563d1230440fd6ad1e358773c6c9317eeb5d87e221b779ff2f5 SHA512 beee4079ea56b951af90cfd7c4945b10414c207a5f64a890602dcf7552d05d9f8b2f0acb612ceb7f580d74f4829387e9f157af0232011ed9273a49a2c0ed6e82
-MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
+DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
+EBUILD qtprintsupport-5.13.2-r2.ebuild 813 BLAKE2B 5e5572dbb950afece428f4d162431b4261fe4af59428c76e2d76252b07b386f760a9f59f8fbd22ee9b406f2731305cb6c8ab61cbc40223a260366cc9d43151c9 SHA512 86f0ec867d14ec8cba1b4a59d221182b62aea7e31264b84f58f76945c6fd2d1caf55c039f58c37d26b8ed5fc25df4659690b52bf224968b3eb61af1ed993a47d
+EBUILD qtprintsupport-5.14.1-r1.ebuild 780 BLAKE2B e7006172f947edfaa16620d4ec3b8f5d30f5b6eed00a765f41511e5bccd25a64ade0afb597269562a7ab66d3e7f0c64d09d387c544446f6754e3038e2e39751a SHA512 563a5bc47c4c329876758bb10772e6998acdf81510c7cc7cd9a6a6963d83c5a02bbf3036910bfa967b1d08eb2b89a799f9139033de0d4b37180e44611759b88d
+EBUILD qtprintsupport-5.14.2.ebuild 788 BLAKE2B d706d8e3afc1d8cb1d7b9c9af2320fcf5a6040fb7e53a268374c966274b9b10d6a4b66e44ebda267a5ab23c80566f8d690ed2fe97c9d4e829431b9e89839d3f6 SHA512 d42803cf2bc3d45c94bf454001fcb4a155121a230072e494acf03efaf85b3c35993fb20106ff966ad09026e8240a1371ea7e2616e7a63679b441d678341f079e
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtprintsupport/metadata.xml b/dev-qt/qtprintsupport/metadata.xml
index 17b1d11ac715..32568f62fb8e 100644
--- a/dev-qt/qtprintsupport/metadata.xml
+++ b/dev-qt/qtprintsupport/metadata.xml
@@ -5,9 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
deleted file mode 100644
index e8321b9e7c9f..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild
index fa1154995401..5c0100d98132 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild
@@ -9,15 +9,15 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="arm"
 fi
 
-IUSE="cups gles2"
+IUSE="cups gles2-only"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
+	~dev-qt/qtgui-${PV}[gles2-only=]
+	~dev-qt/qtwidgets-${PV}[gles2-only=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
@@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}/${P}-no-cups.patch" ) # bug #704936, QTBUG-80945
 src_configure() {
 	local myconf=(
 		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
+		-opengl $(usex gles2-only es2 desktop)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.14.1-r1.ebuild
index 42ff7bd6b26f..f23564573289 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.14.1-r1.ebuild
@@ -9,15 +9,15 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
-IUSE="cups gles2"
+IUSE="cups gles2-only"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
+	~dev-qt/qtgui-${PV}[gles2-only=]
+	~dev-qt/qtwidgets-${PV}[gles2-only=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
@@ -36,7 +36,7 @@ QT5_GENTOO_CONFIG=(
 src_configure() {
 	local myconf=(
 		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
+		-opengl $(usex gles2-only es2 desktop)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.14.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
index 4fdc401dafd5..5945c013cb24 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.14.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
@@ -12,12 +12,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="cups gles2"
+IUSE="cups gles2-only"
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
+	~dev-qt/qtcore-${PV}:5=
+	~dev-qt/qtgui-${PV}[gles2-only=]
+	~dev-qt/qtwidgets-${PV}[gles2-only=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
@@ -36,7 +36,7 @@ QT5_GENTOO_CONFIG=(
 src_configure() {
 	local myconf=(
 		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
+		-opengl $(usex gles2-only es2 desktop)
 	)
 	qt5-build_src_configure
 }