commit:     85391e12057560911d0fb88f25a6f05d29edf621
Author:     Leo Douglas <douglarek <AT> gmail <DOT> com>
AuthorDate: Sat Aug  9 11:08:07 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 23 08:37:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85391e12

app-editors/vim-core: 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
Closes: https://github.com/gentoo/gentoo/pull/43396
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/vim-core/Manifest                 |   1 +
 app-editors/vim-core/vim-core-9.1.1652.ebuild | 233 ++++++++++++++++++++++++++
 2 files changed, 234 insertions(+)

diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 16da5ddee6f7..b538ca863bc2 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/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/vim-core/vim-core-9.1.1652.ebuild 
b/app-editors/vim-core/vim-core-9.1.1652.ebuild
new file mode 100644
index 000000000000..d2e027476100
--- /dev/null
+++ b/app-editors/vim-core/vim-core-9.1.1652.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim and app-editors/gvim
+
+VIM_VERSION="9.1"
+VIM_PATCHES_VERSION="9.1.1432"
+inherit bash-completion-r1 desktop flag-o-matic prefix 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="vim and gvim shared files"
+HOMEPAGE="https://www.vim.org https://github.com/vim/vim";
+S="${WORKDIR}/vim-${PV}"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="nls acl minimal"
+
+# ncurses is only needed by ./configure, so no subslot operator required
+DEPEND=">=sys-libs/ncurses-5.2-r2:0"
+BDEPEND="dev-build/autoconf"
+
+if [[ ${PV} != 9999* ]]; then
+       # Gentoo patches to fix runtime issues, cross-compile errors, etc
+       PATCHES=(
+               "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+       )
+fi
+
+# platform-specific checks (bug #898406):
+# - 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"
+}
+
+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 "sed failed"
+
+       # See bug #77841. We remove this file after the tarball extraction.
+       rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+       # Read vimrc and gvimrc from /etc/vim
+       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> 
"${S}"/src/feature.h || die
+       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> 
"${S}"/src/feature.h || die
+
+       # 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 '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 "sed failed"
+       fi
+
+       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
+
+       # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this 
for
+       # everyone since previous flag filtering bugs have turned out to affect
+       # multiple archs...
+       replace-flags -O3 -O2
+
+       # 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 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
+
+       # Remove src/auto/configure file.
+       rm -v src/auto/configure || die "rm configure failed"
+
+       # 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.
+       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+               if [[ -e "${file}" ]]; then
+                       addwrite ${file}
+               fi
+       done
+
+       # Let Portage do the stripping. Some people like that.
+       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+       local myconf=(
+               --with-modified-by="Gentoo-${PVR} (RIP Bram)"
+               --enable-gui=no
+               --without-x
+               --disable-darwin
+               --disable-perlinterp
+               --disable-pythoninterp
+               --disable-rubyinterp
+               --disable-gpm
+               --disable-selinux
+               $(use_enable nls)
+               $(use_enable acl)
+       )
+
+       # Keep Gentoo 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 "${myconf[@]}"
+}
+
+src_compile() {
+       emake -j1 -C src auto/osdef.h objects
+       emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+       dodir /usr/{bin,share/{man/man1,vim}}
+       emake -C src \
+               installruntime \
+               installmanlinks \
+               installmacros \
+               installtutor \
+               installtutorbin \
+               installtools \
+               install-languages \
+               DESTDIR="${D}" \
+               BINDIR="${EPREFIX}"/usr/bin \
+               MANDIR="${EPREFIX}"/usr/share/man \
+               DATADIR="${EPREFIX}"/usr/share
+
+       keepdir ${vimfiles}/keymap
+
+       # default vimrc is installed by vim-core since it applies to
+       # both vim and gvim
+       insinto /etc/vim/
+       newins "${FILESDIR}"/vimrc-r7 vimrc
+       eprefixify "${ED}"/etc/vim/vimrc
+
+       if use minimal; then
+               # To save space, install only a subset of the files.
+               # Helps minimalize the livecd, bug 65144.
+               rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+               rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+               rm -v "${ED}"/usr/bin/vimtutor || die
+
+               for f in "${ED}${vimfiles}"/colors/*.vim; do
+                       if [[ ${f} != */@(default).vim ]] ; then
+                               printf '%s\0' "${f}"
+                       fi
+               done | xargs -0 rm -f || die
+
+               for f in "${ED}${vimfiles}"/syntax/*.vim; do
+                       if [[ ${f} != 
*/@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim 
]] ; then
+                               printf '%s\0' "${f}"
+                       fi
+               done | xargs -0 rm -f || die
+       fi
+
+       newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+       # install gvim icon since both vim/gvim desktop files reference it
+       doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+       # update documentation tags (from vim-doc.eclass)
+       update_vim_helptags
+
+       # update icon cache
+       xdg_icon_cache_update
+}
+
+pkg_postrm() {
+       # Update documentation tags (from vim-doc.eclass)
+       update_vim_helptags
+
+       # update icon cache
+       xdg_icon_cache_update
+}

Reply via email to