commit: 6c29e48cfaa97db69fafe0e5c6bd9235c76df920
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 23 03:36:35 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 23 03:36:35 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c29e48c
app-editors/gvim: sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/gvim/gvim-9.1.1652-r2.ebuild | 7 +++--
app-editors/gvim/gvim-9999.ebuild | 51 +++++++++++++++++---------------
2 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/app-editors/gvim/gvim-9.1.1652-r2.ebuild
b/app-editors/gvim/gvim-9.1.1652-r2.ebuild
index 03caf7a3b3a2..1019c87ac39a 100644
--- a/app-editors/gvim/gvim-9.1.1652-r2.ebuild
+++ b/app-editors/gvim/gvim-9.1.1652-r2.ebuild
@@ -21,9 +21,10 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/vim/vim.git";
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
else
- SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz ->
vim-${PV}.tar.gz
-
https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2";
- #
https://github.com/douglarek/gentoo-vim-patches/releases/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.gz";
+ SRC_URI="
+ https://github.com/vim/vim/archive/v${PV}.tar.gz ->
vim-${PV}.tar.gz
+
https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2
+ "
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
fi
diff --git a/app-editors/gvim/gvim-9999.ebuild
b/app-editors/gvim/gvim-9999.ebuild
index def63e9eadfd..755536452910 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Please bump with app-editors/vim-core and app-editors/vim
VIM_VERSION="9.1"
-VIM_PATCHES_VERSION="9.0.2092"
+VIM_PATCHES_VERSION="9.1.1432"
LUA_COMPAT=( lua5-{1..4} luajit )
PYTHON_COMPAT=( python3_{11..14} )
@@ -21,9 +21,11 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/vim/vim.git";
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
else
- SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz ->
vim-${PV}.tar.gz
-
https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86"
+ SRC_URI="
+ https://github.com/vim/vim/archive/v${PV}.tar.gz ->
vim-${PV}.tar.gz
+
https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2
+ "
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="GUI version of the Vim text editor"
@@ -32,7 +34,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} )
@@ -49,7 +51,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:= )
@@ -70,10 +72,10 @@ RDEPEND="
session? ( x11-libs/libSM )
sound? ( media-libs/libcanberra )
tcl? ( dev-lang/tcl:0= )
+ wayland? ( dev-libs/wayland )
"
DEPEND="${RDEPEND}
- x11-base/xorg-proto
-"
+ x11-base/xorg-proto"
# configure runs the Lua interpreter
BDEPEND="
dev-build/autoconf
@@ -86,7 +88,7 @@ PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
if [[ ${PV} != 9999* ]]; then
# Gentoo patches to fix runtime issues, cross-compile errors, etc
PATCHES=(
- "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches"
+ "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
)
fi
@@ -126,7 +128,7 @@ src_prepare() {
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
# Hopefully this pattern won't break for a while at least.
- # This fixes bug #29398 (27 Sep 2003 agriffis)
+ # This fixes bug 29398 (27 Sep 2003 agriffis)
sed -i -e \
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
"${S}"/runtime/doc/syntax.txt \
@@ -147,7 +149,7 @@ src_prepare() {
if [[ -d "${S}"/src/po ]]; then
sed -i -e \
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \;
./testvim -X,' \
- "${S}"/src/po/Makefile || die "sed failed"
+ "${S}"/src/po/Makefile || die
fi
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp
failed"
@@ -159,7 +161,7 @@ src_prepare() {
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i -e \
's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed
failed"
- rm src/auto/configure || die "rm failed"
+ rm -v src/auto/configure || die "rm failed"
# --with-features=huge forces on cscope even if we --disable it. We need
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
@@ -177,8 +179,8 @@ src_prepare() {
src_configure() {
emake -j1 -C src autoconf
- # This should fix a sandbox violation (see bug #24447). The hvc
- # things are for ppc64, see bug #86433.
+ # This should fix a sandbox violation (see bug 24447). The hvc
+ # things are for ppc64, see bug 86433.
local file
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
if [[ -e ${file} ]]; then
@@ -186,15 +188,9 @@ src_configure() {
fi
done
- local myconf=(
- --with-modified-by="Gentoo-${PVR} (RIP Bram)"
- --with-vim-name=gvim
- --with-x
- )
-
use debug && append-flags "-DDEBUG"
- myconf+=(
+ local myconf=(
--with-features=huge
--disable-gpm
--with-gnome=no
@@ -212,6 +208,7 @@ src_configure() {
$(use_enable selinux)
$(use_enable session xsmp)
$(use_enable tcl tclinterp)
+ $(use_with wayland)
)
if use lua; then
@@ -235,6 +232,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
@@ -252,7 +251,11 @@ src_configure() {
vim_cv_toupper_broken=no
fi
- econf "${myconf[@]}"
+ econf \
+ --with-modified-by="Gentoo-${PVR} (RIP Bram)" \
+ --with-vim-name=gvim \
+ --with-x \
+ "${myconf[@]}"
}
src_compile() {
@@ -328,7 +331,7 @@ pkg_postinst() {
# update documentation tags (from vim-doc.eclass)
update_vim_helptags
- # update desktop file mime cache
+ # update fdo mime stuff, bug #78394
xdg_desktop_database_update
# update icon cache
@@ -342,7 +345,7 @@ pkg_postrm() {
# update documentation tags (from vim-doc.eclass)
update_vim_helptags
- # update desktop file mime cache
+ # update fdo mime stuff, bug #78394
xdg_desktop_database_update
# update icon cache
