commit:     6413e0964cf0b75e3acc63bf60e7f323c25994e9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 06:10:31 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 06:34:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6413e096

x11-terms/kitty: don't check for unused GL with USE=-X

Thought had tested this, but apparently I didn't.

glfw uses libEGL.so with wayland, so there's no sense in checking
for libGL with -X. Unfortunately X11 (or anything) being optional
at build time is our invention, so needs more sed.

Closes: https://bugs.gentoo.org/857918
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-terms/kitty/kitty-0.25.2.ebuild | 1 +
 x11-terms/kitty/kitty-9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x11-terms/kitty/kitty-0.25.2.ebuild 
b/x11-terms/kitty/kitty-0.25.2.ebuild
index b8455230a169..2c71e5584d72 100644
--- a/x11-terms/kitty/kitty-0.25.2.ebuild
+++ b/x11-terms/kitty/kitty-0.25.2.ebuild
@@ -72,6 +72,7 @@ src_prepare() {
        default
 
        sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+               -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
                -e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
                -i setup.py || die
 

diff --git a/x11-terms/kitty/kitty-9999.ebuild 
b/x11-terms/kitty/kitty-9999.ebuild
index b915b34e33d7..92a0509aac27 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -68,6 +68,7 @@ src_prepare() {
        default
 
        sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+               -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
                -e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
                -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
                -i setup.py || die

Reply via email to