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

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/13742
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 0ff1bae4e4d824d6d387d40b71689fcb62399b76..f785d85e8c4a368f2a25cfbf655bd1a93528a371 100644 (file)
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -9,7 +9,6 @@
                <flag name="egl">Enable EGL integration</flag>
                <flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
                <flag name="evdev">Enable support for input devices via evdev</flag>
-               <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
                <flag name="ibus">Build the IBus input method plugin</flag>
                <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
                <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>

diff --git a/dev-qt/qtgui/qtgui-5.13.2.ebuild b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
similarity index 94%
rename from dev-qt/qtgui/qtgui-5.13.2.ebuild
rename to dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
index ec493f247cbc8e3a4b98e64c7050059065a29b8e..e296604eeff4009ba4fdd14ae319276c9eb52e99 100644 (file)
--- a/dev-qt/qtgui/qtgui-5.13.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
@@ -13,7 +13,7 @@ fi
 
 # TODO: linuxfb
 
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus
        jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
 REQUIRED_USE="
        || ( eglfs xcb )
@@ -21,7 +21,7 @@ REQUIRED_USE="
        eglfs? ( egl )
        ibus? ( dbus )
        libinput? ( udev )
-       xcb? ( gles2? ( egl ) )
+       xcb? ( gles2-only? ( egl ) )
 "
 
 RDEPEND="
@@ -40,7 +40,7 @@ RDEPEND="
                x11-libs/libdrm
        )
        evdev? ( sys-libs/mtdev )
-       gles2? ( media-libs/mesa[gles2] )
+       gles2-only? ( media-libs/mesa[gles2] )
        jpeg? ( virtual/jpeg:0 )
        libinput? (
                dev-libs/libinput:=
@@ -96,8 +96,8 @@ QT5_GENTOO_CONFIG=(
        :system-freetype:FREETYPE
        !:no-freetype:
        !gif:no-gif:
-       gles2::OPENGL_ES
-       gles2:opengles2:OPENGL_ES_2
+       gles2-only::OPENGL_ES
+       gles2-only:opengles2:OPENGL_ES_2
        !:no-gui:
        :system-harfbuzz:
        !:no-harfbuzz:
@@ -165,7 +165,7 @@ src_configure() {
                -system-harfbuzz
                $(qt_use jpeg libjpeg system)
                $(qt_use libinput)
-               -opengl $(usex gles2 es2 desktop)
+               -opengl $(usex gles2-only es2 desktop)
                $(qt_use png libpng system)
                $(qt_use tslib)
                $(qt_use udev libudev)

diff --git a/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
similarity index 94%
rename from dev-qt/qtgui/qtgui-5.14.1-r3.ebuild
rename to dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
index b0882bb75c582947c125ceff89db3f3624e9396c..59370d3b571514a8124c82af0dc1a53837606dc2 100644 (file)
--- a/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
@@ -15,7 +15,7 @@ fi
 
 # TODO: linuxfb
 
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
        +libinput +png tslib tuio +udev vnc vulkan wayland +X"
 REQUIRED_USE="
        || ( eglfs X )
@@ -23,7 +23,7 @@ REQUIRED_USE="
        eglfs? ( egl )
        ibus? ( dbus )
        libinput? ( udev )
-       X? ( gles2? ( egl ) )
+       X? ( gles2-only? ( egl ) )
 "
 
 COMMON_DEPEND="
@@ -42,7 +42,7 @@ COMMON_DEPEND="
                x11-libs/libdrm
        )
        evdev? ( sys-libs/mtdev )
-       gles2? ( media-libs/mesa[gles2] )
+       gles2-only? ( media-libs/mesa[gles2] )
        jpeg? ( virtual/jpeg:0 )
        libinput? (
                dev-libs/libinput:=
@@ -106,8 +106,8 @@ QT5_GENTOO_CONFIG=(
        :system-freetype:FREETYPE
        !:no-freetype:
        !gif:no-gif:
-       gles2::OPENGL_ES
-       gles2:opengles2:OPENGL_ES_2
+       gles2-only::OPENGL_ES
+       gles2-only:opengles2:OPENGL_ES_2
        !:no-gui:
        :system-harfbuzz:
        !:no-harfbuzz:
@@ -176,7 +176,7 @@ src_configure() {
                -system-harfbuzz
                $(qt_use jpeg libjpeg system)
                $(qt_use libinput)
-               -opengl $(usex gles2 es2 desktop)
+               -opengl $(usex gles2-only es2 desktop)
                $(qt_use png libpng system)
                $(qt_use tslib)
                $(qt_use vulkan)