[dev-qt] Make opengl support mandatory in qtgui:5, adjust reverse deps.

This helps to avoid a whole class of nasty bugs similar to #532140.

30 files changed, 80 insertions, 140 deletions

diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild
index 32eadebb..1dc75d1b 100644
--- a/dev-qt/qt3d/qt3d-5.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-5.9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index 0327c6d0..f96540a4 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -5,7 +5,7 @@
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild
index 8c3b8265..c98c15cf 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild
@@ -16,11 +16,11 @@ IUSE="gles2 localstorage +widgets xml"
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=,gles2=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
 	>=dev-qt/qttest-${PV}:5[debug=]
 	localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=,gles2=] )
 	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
index 8c3b8265..c98c15cf 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
@@ -16,11 +16,11 @@ IUSE="gles2 localstorage +widgets xml"
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=,gles2=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
 	>=dev-qt/qttest-${PV}:5[debug=]
 	localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=,gles2=] )
 	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
index 8c3b8265..c98c15cf 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
@@ -16,11 +16,11 @@ IUSE="gles2 localstorage +widgets xml"
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=,gles2=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
 	>=dev-qt/qttest-${PV}:5[debug=]
 	localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=,gles2=] )
 	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdiag/qtdiag-5.4.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.4.9999.ebuild
index 2931d9fd..e46bdf42 100644
--- a/dev-qt/qtdiag/qtdiag-5.4.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.4.9999.ebuild
@@ -12,11 +12,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="+opengl +ssl"
+IUSE="+ssl"
 
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=,ssl=]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdiag/qtdiag-5.5.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.5.9999.ebuild
index 2931d9fd..e46bdf42 100644
--- a/dev-qt/qtdiag/qtdiag-5.5.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.5.9999.ebuild
@@ -12,11 +12,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="+opengl +ssl"
+IUSE="+ssl"
 
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=,ssl=]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdiag/qtdiag-5.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.9999.ebuild
index 2931d9fd..e46bdf42 100644
--- a/dev-qt/qtdiag/qtdiag-5.9999.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.9999.ebuild
@@ -12,11 +12,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="+opengl +ssl"
+IUSE="+ssl"
 
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=,ssl=]
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 88b6e722..ce6b0b53 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -8,7 +8,7 @@
 		<flag name="evdev">Enable evdev input support</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
diff --git a/dev-qt/qtgui/qtgui-5.4.9999.ebuild b/dev-qt/qtgui/qtgui-5.4.9999.ebuild
index 3700b08c..9db4a882 100644
--- a/dev-qt/qtgui/qtgui-5.4.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.4.9999.ebuild
@@ -14,11 +14,10 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
 REQUIRED_USE="
-	egl? ( evdev opengl )
+	egl? ( evdev )
 	eglfs? ( egl )
-	gles2? ( opengl )
 	kms? ( egl gles2 )
 "
 
@@ -28,6 +27,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	>=sys-libs/zlib-1.2.5
+	virtual/opengl
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gtkstyle? (
@@ -44,7 +44,6 @@ RDEPEND="
 		virtual/libudev:=
 		x11-libs/libdrm
 	)
-	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0= )
 	udev? ( virtual/libudev:= )
 	xcb? (
@@ -72,6 +71,7 @@ PDEPEND="
 
 QT5_TARGET_SUBDIRS=(
 	src/gui
+	src/openglextensions
 	src/platformheaders
 	src/platformsupport
 	src/plugins/generic
@@ -99,7 +99,7 @@ QT5_GENTOO_CONFIG=(
 	jpeg:system-jpeg:IMAGEFORMAT_JPEG
 	!jpeg:no-jpeg:
 	kms:kms:
-	opengl
+	:opengl
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
@@ -115,7 +115,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-	use opengl   && QT5_TARGET_SUBDIRS+=(src/openglextensions)
 	use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
 	use ibus     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
 	use xcb	     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
@@ -125,28 +124,21 @@ pkg_setup() {
 }
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		$(use accessibility && use xcb && echo -dbus-linked)
-		$(use ibus && echo -dbus-linked)
+		$(use accessibility && usex xcb -dbus-linked '')
+		$(usex ibus -dbus-linked '')
 		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
 		$(qt_use evdev mtdev)
 		-fontconfig
 		-system-freetype
-		$(use gif || echo -no-gif)
-		${gl}
+		$(usex gif '' -no-gif)
 		$(qt_use gtkstyle)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
index 501d785c..1d6cd430 100644
--- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
@@ -14,11 +14,10 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
 REQUIRED_USE="
-	egl? ( evdev opengl )
+	egl? ( evdev )
 	eglfs? ( egl )
-	gles2? ( opengl )
 	kms? ( egl gles2 )
 "
 
@@ -28,6 +27,7 @@ RDEPEND="
 	media-libs/fontconfig
 	>=media-libs/freetype-2.5.5:2
 	>=sys-libs/zlib-1.2.5
+	virtual/opengl
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gtkstyle? (
@@ -44,7 +44,6 @@ RDEPEND="
 		virtual/libudev:=
 		x11-libs/libdrm
 	)
-	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0= )
 	udev? ( virtual/libudev:= )
 	xcb? (
@@ -72,6 +71,7 @@ PDEPEND="
 
 QT5_TARGET_SUBDIRS=(
 	src/gui
+	src/openglextensions
 	src/platformheaders
 	src/platformsupport
 	src/plugins/generic
@@ -99,7 +99,7 @@ QT5_GENTOO_CONFIG=(
 	jpeg:system-jpeg:IMAGEFORMAT_JPEG
 	!jpeg:no-jpeg:
 	kms:kms:
-	opengl
+	:opengl
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
@@ -115,7 +115,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-	use opengl   && QT5_TARGET_SUBDIRS+=(src/openglextensions)
 	use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
 	use ibus     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
 	use xcb	     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
@@ -125,28 +124,21 @@ pkg_setup() {
 }
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		$(use accessibility && use xcb && echo -dbus-linked)
-		$(use ibus && echo -dbus-linked)
+		$(use accessibility && usex xcb -dbus-linked '')
+		$(usex ibus -dbus-linked '')
 		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
 		$(qt_use evdev mtdev)
 		-fontconfig
 		-system-freetype
-		$(use gif || echo -no-gif)
-		${gl}
+		$(usex gif '' -no-gif)
 		$(qt_use gtkstyle)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 501d785c..1d6cd430 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -14,11 +14,10 @@ fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
 REQUIRED_USE="
-	egl? ( evdev opengl )
+	egl? ( evdev )
 	eglfs? ( egl )
-	gles2? ( opengl )
 	kms? ( egl gles2 )
 "
 
@@ -28,6 +27,7 @@ RDEPEND="
 	media-libs/fontconfig
 	>=media-libs/freetype-2.5.5:2
 	>=sys-libs/zlib-1.2.5
+	virtual/opengl
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gtkstyle? (
@@ -44,7 +44,6 @@ RDEPEND="
 		virtual/libudev:=
 		x11-libs/libdrm
 	)
-	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0= )
 	udev? ( virtual/libudev:= )
 	xcb? (
@@ -72,6 +71,7 @@ PDEPEND="
 
 QT5_TARGET_SUBDIRS=(
 	src/gui
+	src/openglextensions
 	src/platformheaders
 	src/platformsupport
 	src/plugins/generic
@@ -99,7 +99,7 @@ QT5_GENTOO_CONFIG=(
 	jpeg:system-jpeg:IMAGEFORMAT_JPEG
 	!jpeg:no-jpeg:
 	kms:kms:
-	opengl
+	:opengl
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
@@ -115,7 +115,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-	use opengl   && QT5_TARGET_SUBDIRS+=(src/openglextensions)
 	use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
 	use ibus     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
 	use xcb	     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
@@ -125,28 +124,21 @@ pkg_setup() {
 }
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		$(use accessibility && use xcb && echo -dbus-linked)
-		$(use ibus && echo -dbus-linked)
+		$(use accessibility && usex xcb -dbus-linked '')
+		$(usex ibus -dbus-linked '')
 		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
 		$(qt_use evdev mtdev)
 		-fontconfig
 		-system-freetype
-		$(use gif || echo -no-gif)
-		${gl}
+		$(usex gif '' -no-gif)
 		$(qt_use gtkstyle)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
index 09c0f8a9..270c9ce6 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
@@ -13,7 +13,6 @@ fi
 
 IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
 
-# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
 	>=dev-qt/qtgui-${PV}:5[debug=]
@@ -30,8 +29,7 @@ RDEPEND="
 		openal? ( media-libs/openal )
 	)
 	widgets? (
-		>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
-		>=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
+		>=dev-qt/qtwidgets-${PV}:5[debug=]
 		opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	)
 "
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
index 09c0f8a9..270c9ce6 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
@@ -13,7 +13,6 @@ fi
 
 IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
 
-# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
 	>=dev-qt/qtgui-${PV}:5[debug=]
@@ -30,8 +29,7 @@ RDEPEND="
 		openal? ( media-libs/openal )
 	)
 	widgets? (
-		>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
-		>=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
+		>=dev-qt/qtwidgets-${PV}:5[debug=]
 		opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	)
 "
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index 09c0f8a9..270c9ce6 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -13,7 +13,6 @@ fi
 
 IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
 
-# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
 	>=dev-qt/qtgui-${PV}:5[debug=]
@@ -30,8 +29,7 @@ RDEPEND="
 		openal? ( media-libs/openal )
 	)
 	widgets? (
-		>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
-		>=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
+		>=dev-qt/qtwidgets-${PV}:5[debug=]
 		opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	)
 "
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index 8c0140bb..34cefc30 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -7,7 +7,7 @@
 			contexts on the desktop</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild
index 39db0e10..a1d46c19 100644
--- a/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="gles2"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
-	~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
+	~dev-qt/qtgui-${PV}[debug=,gles2=]
+	~dev-qt/qtwidgets-${PV}[debug=,gles2=]
 	virtual/opengl
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/qtopengl-5.5.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.5.9999.ebuild
index 39db0e10..a1d46c19 100644
--- a/dev-qt/qtopengl/qtopengl-5.5.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.5.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="gles2"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
-	~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
+	~dev-qt/qtgui-${PV}[debug=,gles2=]
+	~dev-qt/qtwidgets-${PV}[debug=,gles2=]
 	virtual/opengl
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/qtopengl-5.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.9999.ebuild
index 39db0e10..a1d46c19 100644
--- a/dev-qt/qtopengl/qtopengl-5.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.9999.ebuild
@@ -17,8 +17,8 @@ IUSE="gles2"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
-	~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
+	~dev-qt/qtgui-${PV}[debug=,gles2=]
+	~dev-qt/qtwidgets-${PV}[debug=,gles2=]
 	virtual/opengl
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtprintsupport/metadata.xml b/dev-qt/qtprintsupport/metadata.xml
index afb3b434..8090c86c 100644
--- a/dev-qt/qtprintsupport/metadata.xml
+++ b/dev-qt/qtprintsupport/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<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>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild
index 143e976b..12fafab0 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild
@@ -13,13 +13,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-# keep IUSE defaults in sync with qtgui
-IUSE="cups +opengl"
+IUSE="cups gles2"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,opengl=]
-	~dev-qt/qtwidgets-${PV}[debug=,opengl=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=]
+	~dev-qt/qtwidgets-${PV}[debug=,gles2=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
@@ -38,6 +37,7 @@ QT5_GENTOO_CONFIG=(
 src_configure() {
 	local myconf=(
 		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild
index 143e976b..12fafab0 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild
@@ -13,13 +13,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-# keep IUSE defaults in sync with qtgui
-IUSE="cups +opengl"
+IUSE="cups gles2"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,opengl=]
-	~dev-qt/qtwidgets-${PV}[debug=,opengl=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=]
+	~dev-qt/qtwidgets-${PV}[debug=,gles2=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
@@ -38,6 +37,7 @@ QT5_GENTOO_CONFIG=(
 src_configure() {
 	local myconf=(
 		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild
index 143e976b..12fafab0 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild
@@ -13,13 +13,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-# keep IUSE defaults in sync with qtgui
-IUSE="cups +opengl"
+IUSE="cups gles2"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,opengl=]
-	~dev-qt/qtwidgets-${PV}[debug=,opengl=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=]
+	~dev-qt/qtwidgets-${PV}[debug=,gles2=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
@@ -38,6 +37,7 @@ QT5_GENTOO_CONFIG=(
 src_configure() {
 	local myconf=(
 		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtwayland/qtwayland-5.4.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.4.9999.ebuild
index b59e1212..2673e1d4 100644
--- a/dev-qt/qtwayland/qtwayland-5.4.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.4.9999.ebuild
@@ -16,7 +16,7 @@ IUSE="egl qml wayland-compositor xcomposite"
 DEPEND="
 	>=dev-libs/wayland-1.3.0
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=,egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
diff --git a/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild
index b59e1212..2673e1d4 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild
@@ -16,7 +16,7 @@ IUSE="egl qml wayland-compositor xcomposite"
 DEPEND="
 	>=dev-libs/wayland-1.3.0
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=,egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
index b59e1212..2673e1d4 100644
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
@@ -16,7 +16,7 @@ IUSE="egl qml wayland-compositor xcomposite"
 DEPEND="
 	>=dev-libs/wayland-1.3.0
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=,egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 87f5b740..4727795a 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
 	</use>
diff --git a/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild
index b96b9bed..3f852737 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild
@@ -13,14 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +opengl +png +xcb"
-REQUIRED_USE="
-	gles2? ( opengl )
-"
+IUSE="gles2 gtkstyle +png +xcb"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -34,17 +31,9 @@ QT5_GENTOO_CONFIG=(
 )
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		# copied from qtgui
-		${gl}
 		$(qt_use gtkstyle)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon system)
diff --git a/dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild
index b96b9bed..3f852737 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild
@@ -13,14 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +opengl +png +xcb"
-REQUIRED_USE="
-	gles2? ( opengl )
-"
+IUSE="gles2 gtkstyle +png +xcb"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -34,17 +31,9 @@ QT5_GENTOO_CONFIG=(
 )
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		# copied from qtgui
-		${gl}
 		$(qt_use gtkstyle)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon system)
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
index b96b9bed..3f852737 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
@@ -13,14 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +opengl +png +xcb"
-REQUIRED_USE="
-	gles2? ( opengl )
-"
+IUSE="gles2 gtkstyle +png +xcb"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -34,17 +31,9 @@ QT5_GENTOO_CONFIG=(
 )
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		# copied from qtgui
-		${gl}
 		$(qt_use gtkstyle)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon system)