commit:     49db04cc6125c5ce27e9a049f17e0929605a1c03
Author:     Leo Douglas <douglarek <AT> gmail <DOT> com>
AuthorDate: Sat Aug  9 11:06:52 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 23 08:37:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49db04cc

app-editors/gvim: add 9.1.1652

Signed-off-by: Leo Douglas <douglarek <AT> gmail.com>
Bug: https://bugs.gentoo.org/961498
Part-of: https://github.com/gentoo/gentoo/pull/43396
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/gvim/Manifest             |   1 +
 app-editors/gvim/gvim-9.1.1652.ebuild | 347 ++++++++++++++++++++++++++++++++++
 2 files changed, 348 insertions(+)

diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 16da5ddee6f7..b538ca863bc2 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -2,4 +2,5 @@ DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 
3a4b2bc57712de3b92b0e8d9b2d428e4d5
 DIST vim-9.1.0794.tar.gz 18235753 BLAKE2B 
6ab377e6e0661ff8d4f0de2526b29b1c58c128babff662144425665582d390f772b9ded38ec21db4c32c4d68441b566500c434139f23f1ea79af8b7ecd693953
 SHA512 
38106d56c774b8f1dfed16953c07ff09c411bba5c7ab69e696ee9423dabdec9b0b405665fbd2411122f9963d3af8f9a259cc56b2954443ab41a14a8f2476624a
 DIST vim-9.1.1436.tar.gz 18860692 BLAKE2B 
ae0471654446ff4101f2df698f46c59c9d634336a6dd762732e46238e97bb6fd00a42b56cad3ae5cce572da2fc3cc65490cd10a024419940352fddd285bd6e23
 SHA512 
c6007fecf7e8ba2134246b0072ebfa8ce0f85666ac96a6ccc1a81e23a4e46a6b75c136823cdf6dccb6dfdf703affaede9ce83988cf8fe7e5542087a769e61961
 DIST vim-9.1.1500.tar.gz 18567738 BLAKE2B 
9222c3245eed55b71b228562ee768857207b3198d738dddfab0fdbb3bb8e497a906fedc497f55a416d4e05c5dda4cd0d373298557fe05c554a03c28732c06bba
 SHA512 
f36a80bf76ea2813aba64d5ce7c6d60241609409bdb70d3a1a622fdcab826d9c8d61a611379125428136afc64b309ca92c33c265dfc276a1bebfc0d4f5d71253
+DIST vim-9.1.1652.tar.gz 18776578 BLAKE2B 
c4cc711ee996d6b7268c243c1fae01600d104763f6eee2abbe342f2cf9ee90fb6ee3f0b44fe4814ff47ae13c5a391510c3b711c92acbee591e290da621289029
 SHA512 
f1dfb1dc0fd834fa3ffb40c31f48de78b48225c9d67667f069ff8b23a6a76d534f3e228b936141616a33a0d73445626dcd2ff52a8571e9f4370a8fbcad9771d7
 DIST vim-patches-vim-9.1.1432-patches.tar.bz2 2618 BLAKE2B 
fe7c302c71fbf66f1921e1b55e2f67914ed104ab86e2a6cf2e6bf67c98214f13f1d8ff1ed7015ec41a5665c692946e20ec5bdf4806e789a70e34c0c888472739
 SHA512 
a794a7e4d9014d5508db7b205404f5a4b44748a82c5599a26c1ec6b06d3105f6cebf9a93a058f65ad853bbadf432034fc8257a7c77b4f3446331b9d66c19b3af

diff --git a/app-editors/gvim/gvim-9.1.1652.ebuild 
b/app-editors/gvim/gvim-9.1.1652.ebuild
new file mode 100644
index 000000000000..1d3237051421
--- /dev/null
+++ b/app-editors/gvim/gvim-9.1.1652.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim-core and app-editors/vim
+
+VIM_VERSION="9.1"
+VIM_PATCHES_VERSION="9.1.1432"
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{10..14} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby31 ruby32"
+
+inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 
ruby-single toolchain-funcs vim-doc xdg-utils
+
+if [[ ${PV} == 9999* ]]; then
+       inherit git-r3
+       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";
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://www.vim.org https://github.com/vim/vim";
+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"
+REQUIRED_USE="
+       lua? ( ${LUA_REQUIRED_USE} )
+       python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+       ~app-editors/vim-core-${PV}
+       >=app-eselect/eselect-vi-1.1
+       >=sys-libs/ncurses-5.2-r2:0=
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libXext
+       x11-libs/libXt
+       acl? ( kernel_linux? ( sys-apps/acl ) )
+       motif? ( >=x11-libs/motif-2.3:0 )
+       !motif? (
+               x11-libs/gtk+:3
+               x11-libs/libXft
+       )
+       crypt? ( dev-libs/libsodium:= )
+       cscope? ( dev-util/cscope )
+       lua? (
+               ${LUA_DEPS}
+               $(lua_gen_impl_dep 'deprecated' lua5-1)
+       )
+       nls? ( virtual/libintl )
+       perl? ( dev-lang/perl:= )
+       python? ( ${PYTHON_DEPS} )
+       racket? ( dev-scheme/racket )
+       ruby? ( ${RUBY_DEPS} )
+       selinux? ( sys-libs/libselinux )
+       session? ( x11-libs/libSM )
+       sound? ( media-libs/libcanberra )
+       tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto"
+# configure runs the Lua interpreter
+BDEPEND="
+       dev-build/autoconf
+       virtual/pkgconfig
+       lua? ( ${LUA_DEPS} )
+       nls? ( sys-devel/gettext )
+"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+if [[ ${PV} != 9999* ]]; then
+       # Gentoo patches to fix runtime issues, cross-compile errors, etc
+       PATCHES=(
+               "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+       )
+fi
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+# platform-specific checks (bug #898450):
+# - acl()     -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+       'acl'
+       'statacl'
+)
+
+pkg_setup() {
+       # people with broken alphabets run into trouble. bug 82186.
+       unset LANG LC_ALL
+       export LC_COLLATE="C"
+
+       use lua && lua-single_pkg_setup
+       use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       default
+
+       # Fixup a script to use awk instead of nawk
+       sed -i -e \
+               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+       # Read vimrc and gvimrc from /etc/vim
+       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+               >> "${S}"/src/feature.h || die "echo failed"
+       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+               >> "${S}"/src/feature.h || die "echo failed"
+
+       # 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)
+       sed -i -e \
+               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+               "${S}"/runtime/doc/syntax.txt \
+               "${S}"/runtime/doc/tagsrch.txt \
+               "${S}"/runtime/doc/usr_29.txt \
+               "${S}"/runtime/menu.vim \
+               "${S}"/src/configure.ac || die 'sed failed'
+
+       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+       # correctly. To avoid some really entertaining error messages about 
stuff
+       # which isn't even in the source file being invalid, we'll do some 
trickery
+       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+       find "${S}" -name '*.c' | while read c; do
+               echo >> "$c" || die "echo failed"
+       done
+
+       # Try to avoid sandbox problems. Bug #114475.
+       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
+       fi
+
+       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
+
+       # Fix bug 18245: Prevent "make" from the following chain:
+       # (1) Notice configure.ac is newer than auto/configure
+       # (2) Rebuild auto/configure
+       # (3) Notice auto/configure is newer than auto/config.mk
+       # (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 -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)
+       if ! use cscope; then
+               sed -i -e \
+                       '/# define FEAT_CSCOPE/d' src/feature.h || die 
"couldn't disable cscope"
+       fi
+
+       # bug 908961
+       if use elibc_musl ; then
+               sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+       fi
+}
+
+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.
+       local file
+       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+               if [[ -e ${file} ]]; then
+                       addwrite $file
+               fi
+       done
+
+       use debug && append-flags "-DDEBUG"
+
+       local myconf=(
+               --with-features=huge
+               --disable-gpm
+               --with-gnome=no
+               $(use_enable sound canberra)
+               $(use_enable acl)
+               $(use_enable crypt libsodium)
+               $(use_enable cscope)
+               $(use_enable netbeans)
+               $(use_enable nls)
+               $(use_enable perl perlinterp)
+               $(use_enable python python3interp)
+               $(use_with python python3-command "${PYTHON}")
+               $(use_enable racket mzschemeinterp)
+               $(use_enable ruby rubyinterp)
+               $(use_enable selinux)
+               $(use_enable session xsmp)
+               $(use_enable tcl tclinterp)
+       )
+
+       if use lua; then
+               # -DLUA_COMPAT_OPENLIB=1 is required to enable the
+               # deprecated (in 5.1) luaL_openlib API (#874690)
+               use lua_single_target_lua5-1 && append-cppflags 
-DLUA_COMPAT_OPENLIB=1
+
+               myconf+=(
+                       --enable-luainterp
+                       $(use_with lua_single_target_luajit luajit)
+                       --with-lua-prefix="${EPREFIX}/usr"
+               )
+       fi
+
+       # Default is gtk unless motif is enabled
+       echo ; echo
+       if use motif; then
+               einfo "Building gvim with the MOTIF GUI"
+               myconf+=( --enable-gui=motif )
+       else
+               myconf+=( --enable-gtk3-check )
+               einfo "Building gvim with the gtk+-3 GUI"
+               myconf+=( --enable-gui=gtk3 )
+       fi
+       echo ; echo
+
+       # let package manager strip binaries
+       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+       # keep prefix env contained within the EPREFIX
+       use prefix && myconf+=( --without-local-dir )
+
+       if tc-is-cross-compiler ; then
+               export vim_cv_getcwd_broken=no \
+                          vim_cv_memmove_handles_overlap=yes \
+                          vim_cv_stat_ignores_slash=yes \
+                          vim_cv_terminfo=yes \
+                          vim_cv_toupper_broken=no
+       fi
+
+       econf \
+               --with-modified-by="Gentoo-${PVR} (RIP Bram)" \
+               --with-vim-name=gvim \
+               --with-x \
+               "${myconf[@]}"
+}
+
+src_compile() {
+       # The following allows emake to be used
+       emake -j1 -C src auto/osdef.h objects
+
+       emake
+}
+
+src_test() {
+       einfo
+       einfo "Starting vim tests. Several error messages will be shown"
+       einfo "while the tests run. This is normal behaviour and does not"
+       einfo "indicate a fault."
+       einfo
+       ewarn "If the tests fail, your terminal may be left in a strange"
+       ewarn "state. Usually, running 'reset' will fix this."
+       einfo
+
+       # Don't let vim talk to X
+       unset DISPLAY
+
+       # Make gvim not try to connect to X. See :help gui-x11-start in vim for 
how
+       # this evil trickery works.
+       ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+       # Make sure our VIMPROG is used.
+       sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+       # Don't do additional GUI tests.
+       emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+       ebegin "Calling eselect vi update"
+       eselect vi update --if-unset
+       eend $?
+}
+
+src_install() {
+       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+       dobin src/gvim
+       dosym gvim /usr/bin/gvimdiff
+       dosym gvim /usr/bin/evim
+       dosym gvim /usr/bin/eview
+       dosym gvim /usr/bin/gview
+       dosym gvim /usr/bin/rgvim
+       dosym gvim /usr/bin/rgview
+
+       emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+       dodir /usr/share/man/man1
+       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo 
failed"
+       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo 
failed"
+       echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+               die "echo failed"
+
+       insinto /etc/vim
+       newins "${FILESDIR}"/gvimrc-r1 gvimrc
+       eprefixify "${ED}"/etc/vim/gvimrc
+
+       # bash completion script, bug #79018.
+       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+       # don't install vim desktop file
+       rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to 
remove vim.desktop"
+}
+
+pkg_postinst() {
+       # update documentation tags (from vim-doc.eclass)
+       update_vim_helptags
+
+       # update fdo mime stuff, bug #78394
+       xdg_desktop_database_update
+
+       # update icon cache
+       xdg_icon_cache_update
+
+       # call eselect vi update
+       eselect_vi_update
+}
+
+pkg_postrm() {
+       # update documentation tags (from vim-doc.eclass)
+       update_vim_helptags
+
+       # update fdo mime stuff, bug #78394
+       xdg_desktop_database_update
+
+       # update icon cache
+       xdg_icon_cache_update
+
+       # call eselect vi update
+       eselect_vi_update
+}

Reply via email to