[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/

[Ionen Wolkens]

commit:     431564a9344048b2aa898ba65b8a1748552327d0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 17:48:18 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 17:48:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431564a9

dev-qt/qtbase: use bit more correct libglvnd[X?] dep

Enabling X+opengl+gles2-only but wanting X off on libglvnd is a bit of
a stretch, but technically GLX is not used with gles2-only.

Not worth a revbump.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 5 ++++-
 dev-qt/qtbase/qtbase-6.5.9999.ebuild | 5 ++++-
 dev-qt/qtbase/qtbase-6.6.9999.ebuild | 5 ++++-
 dev-qt/qtbase/qtbase-6.9999.ebuild   | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild 
b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 23cf23a2b4ad..277567f58edf 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -86,7 +86,10 @@ RDEPEND="
                eglfs? ( media-libs/mesa[gbm(+)] )
                evdev? ( sys-libs/mtdev )
                libinput? ( dev-libs/libinput:= )
-               opengl? ( media-libs/libglvnd[X?] )
+               opengl? (
+                       gles2-only? ( media-libs/libglvnd )
+                       !gles2-only? ( media-libs/libglvnd[X?] )
+               )
                tslib? ( x11-libs/tslib )
                widgets? (
                        cups? ( net-print/cups )

diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 7b0f034f5934..9084a0b6223b 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -86,7 +86,10 @@ RDEPEND="
                eglfs? ( media-libs/mesa[gbm(+)] )
                evdev? ( sys-libs/mtdev )
                libinput? ( dev-libs/libinput:= )
-               opengl? ( media-libs/libglvnd[X?] )
+               opengl? (
+                       gles2-only? ( media-libs/libglvnd )
+                       !gles2-only? ( media-libs/libglvnd[X?] )
+               )
                tslib? ( x11-libs/tslib )
                widgets? (
                        cups? ( net-print/cups )

diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index 7b0f89e55b28..2d8d2a18c484 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -86,7 +86,10 @@ RDEPEND="
                eglfs? ( media-libs/mesa[gbm(+)] )
                evdev? ( sys-libs/mtdev )
                libinput? ( dev-libs/libinput:= )
-               opengl? ( media-libs/libglvnd[X?] )
+               opengl? (
+                       gles2-only? ( media-libs/libglvnd )
+                       !gles2-only? ( media-libs/libglvnd[X?] )
+               )
                tslib? ( x11-libs/tslib )
                widgets? (
                        cups? ( net-print/cups )

diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild 
b/dev-qt/qtbase/qtbase-6.9999.ebuild
index b10c8bdac9e9..a968789b80a3 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -87,7 +87,10 @@ RDEPEND="
                eglfs? ( media-libs/mesa[gbm(+)] )
                evdev? ( sys-libs/mtdev )
                libinput? ( dev-libs/libinput:= )
-               opengl? ( media-libs/libglvnd[X?] )
+               opengl? (
+                       gles2-only? ( media-libs/libglvnd )
+                       !gles2-only? ( media-libs/libglvnd[X?] )
+               )
                renderdoc? ( media-gfx/renderdoc )
                tslib? ( x11-libs/tslib )
                widgets? (