gentoo Easter resync : 12.04.2020

5 files changed, 21 insertions, 23 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 8c43b535a512..9f4410c21483 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,7 @@
-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 qtwidgets-5.12.3.ebuild 991 BLAKE2B c4b7ed1122b057e892aa09ae304a15384e30e4af816059eac30e45d4fff0a2ba9822fa7de94a0cd547e87202c2dba6c068170ea26cbb124bbb229b7121060bed SHA512 3860d9d600545d30aec8ec05307dd16108815b5e9ae04175f2c6cac5b8b801c4d3f312f40b4946be473d794d6ba9f260790a21de844db7b0fd4c5b66184e54f5
-EBUILD qtwidgets-5.13.2.ebuild 1031 BLAKE2B 51d8f2b49f2b76148a5bfe032e08ca31396e3104c9796db363ea68b8b3be9329ad4e643706943022ed7cb6c496804772320a67fda3eb7abb9f790e47fc5d0a0e SHA512 db0366d3af0db13bdcbae882d1deb3e444c06daf7724106846a58494dba73d49e082dd33b312c72326e35e7cf7c4ba222cb870b0efa09cccb1bafe92df84f81a
-EBUILD qtwidgets-5.14.1.ebuild 1029 BLAKE2B 8f85af38196a44593a0455dc9e965792dd13b663148cbfafa25cfab025f49332b49cd7f7ed57fd8fbb9d1c007a2fdd32c5e1e5b3e5970bda180d8512b8b2299e SHA512 3c0a9ba1db1e2976d1aed6e940ac28867472c3e376a2a2c6cba45f826a5cdedea4dd7b7d64ccbe7e52aebcb4d5b8a91c113ac63a7a7ec870d2d10a029e7af948
-MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
+DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
+EBUILD qtwidgets-5.13.2-r1.ebuild 1006 BLAKE2B d34843531e4c93e02a155f59e7761a57b4f6ebab6de7016f535069ede742b11deb521f3b011aa6b47fe1345a20176d10785265e0743292c6fd2ba377e8a3c5f5 SHA512 0cea2656e06802d1a6709485c13ec42b2a4b32eefd93d022390afd6b38e711af9381509ebaced15a2c37b0356276ffad1faff66277e0f42932830dd85a606d55
+EBUILD qtwidgets-5.14.1-r1.ebuild 1039 BLAKE2B 714f6d303c4f87e2ca3b265de66beba491691ffdc7367bc624109baf8e2c424b35c8d6a38a0ad9a1de827376b6abd720c00ed606f6c454e545150269e1775a48 SHA512 854c6e5c399d921e30485de86f86e8d654cd6ddefa6808f085d39a08b925bc818e0114dcd7c38fbd4b3a36ec9da4e23b0908770c07d69e5a013ba3a693ef166c
+EBUILD qtwidgets-5.14.2.ebuild 1047 BLAKE2B 14d8eea560a3e59880f6cf26be68b8b998e98b5736ab029f5ba19ed9e8ea84d70f32f5ec7bc59513caabbf1ebf1062e5298c1255dcf4311375ad7e054c6ded2f SHA512 845222cd336cf00009a003f914c4cb06a34eb2954b2d3950597132d65fa7825b9959c115eeb582f1a173e1f7472ac10c2724f599a589d48366bc29997b91fde1
+MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 17b1d11ac715..32568f62fb8e 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/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/qtwidgets/qtwidgets-5.12.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
index dbaebf311870..7df5bdeef388 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="arm"
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
+IUSE="gles2-only gtk +png +xcb"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	~dev-qt/qtgui-${PV}[gles2-only=,png=,xcb?]
 	gtk? (
 		~dev-qt/qtgui-${PV}[dbus]
 		x11-libs/gtk+:3
@@ -44,7 +44,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 src_configure() {
 	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
+		-opengl $(usex gles2-only es2 desktop)
 		$(qt_use gtk)
 		-gui
 		$(qt_use png libpng system)
diff --git a/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.1-r1.ebuild
index 52905175b0bc..d1a1706e59ad 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14.1-r1.ebuild
@@ -2,21 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Set of components for creating classic desktop-style UIs 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
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
+IUSE="gles2-only gtk +png +X"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
 	gtk? (
 		~dev-qt/qtgui-${PV}[dbus]
 		x11-libs/gtk+:3
@@ -44,13 +45,13 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 src_configure() {
 	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
+		-opengl $(usex gles2-only es2 desktop)
 		$(qt_use gtk)
 		-gui
 		$(qt_use png libpng system)
 		-widgets
-		$(qt_use xcb xcb system)
-		$(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
+		$(qt_use X xcb system)
+		$(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
index 3d14a9cd5446..26bc4f95f022 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.14.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
@@ -13,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +X"
+IUSE="gles2-only gtk +png +X"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=,png=,X?]
+	~dev-qt/qtcore-${PV}:5=
+	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
 	gtk? (
 		~dev-qt/qtgui-${PV}[dbus]
 		x11-libs/gtk+:3
@@ -45,7 +45,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 src_configure() {
 	local myconf=(
-		-opengl $(usex gles2 es2 desktop)
+		-opengl $(usex gles2-only es2 desktop)
 		$(qt_use gtk)
 		-gui
 		$(qt_use png libpng system)