commit:     65a9d253fdf9c5d58af13e9f1cde8775ca1a432f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 23 03:33:49 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 23 03:33:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a9d253

app-editors/gvim: fix automagic Wayland (and X on gtk)

USE=X only presently does something if USE=-motif.

Bug: https://bugs.gentoo.org/966502
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gvim/{gvim-9.1.1652-r1.ebuild => gvim-9.1.1652-r2.ebuild}     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-editors/gvim/gvim-9.1.1652-r1.ebuild 
b/app-editors/gvim/gvim-9.1.1652-r2.ebuild
similarity index 97%
rename from app-editors/gvim/gvim-9.1.1652-r1.ebuild
rename to app-editors/gvim/gvim-9.1.1652-r2.ebuild
index 5b653e453b7a..03caf7a3b3a2 100644
--- a/app-editors/gvim/gvim-9.1.1652-r1.ebuild
+++ b/app-editors/gvim/gvim-9.1.1652-r2.ebuild
@@ -33,7 +33,7 @@ S="${WORKDIR}"/vim-${PV}
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket 
ruby selinux session sound tcl ${GENTOO_PERL_USESTRING}"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket 
ruby selinux session sound tcl wayland X ${GENTOO_PERL_USESTRING}"
 REQUIRED_USE="
        lua? ( ${LUA_REQUIRED_USE} )
        python? ( ${PYTHON_REQUIRED_USE} )
@@ -50,7 +50,7 @@ RDEPEND="
        acl? ( kernel_linux? ( sys-apps/acl ) )
        motif? ( >=x11-libs/motif-2.3:0 )
        !motif? (
-               x11-libs/gtk+:3
+               x11-libs/gtk+:3[X?]
                x11-libs/libXft
        )
        crypt? ( dev-libs/libsodium:= )
@@ -71,6 +71,7 @@ RDEPEND="
        session? ( x11-libs/libSM )
        sound? ( media-libs/libcanberra )
        tcl? ( dev-lang/tcl:0= )
+       wayland? ( dev-libs/wayland )
 "
 DEPEND="${RDEPEND}
        x11-base/xorg-proto"
@@ -206,6 +207,7 @@ src_configure() {
                $(use_enable selinux)
                $(use_enable session xsmp)
                $(use_enable tcl tclinterp)
+               $(use_with wayland)
        )
 
        if use lua; then
@@ -229,6 +231,8 @@ src_configure() {
                myconf+=( --enable-gtk3-check )
                einfo "Building gvim with the gtk+-3 GUI"
                myconf+=( --enable-gui=gtk3 )
+
+               use X || append-flags -DGENTOO_GTK_HIDE_X11
        fi
        echo ; echo
 

Reply via email to