From: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sat, 23 Nov 2019 09:37:27 +0000 (+0100)
Subject: dev-qt/qtwidgets: rename USE=gles2 to USE=gles2-only
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=490bb9d8ad5cd3ab4a61cc190f4ae731795fa14b;p=gentoo.git

dev-qt/qtwidgets: rename USE=gles2 to USE=gles2-only

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

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.13.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
similarity index 88%
rename from dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
index f7e4091ffcce..7df5bdeef388 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
@@ -12,11 +12,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 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.14.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.1-r1.ebuild
similarity index 89%
rename from dev-qt/qtwidgets/qtwidgets-5.14.1.ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.14.1-r1.ebuild
index ea359ad328f4..d1a1706e59ad 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.14.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14.1-r1.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/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)