diff options
Diffstat (limited to 'app-editors/vim-core')
-rw-r--r-- | app-editors/vim-core/Manifest | 9 | ||||
-rw-r--r-- | app-editors/vim-core/files/vimrc-r6 (renamed from app-editors/vim-core/files/vimrc-r5) | 7 | ||||
-rw-r--r-- | app-editors/vim-core/files/vimrc-r7 | 210 | ||||
-rw-r--r-- | app-editors/vim-core/metadata.xml | 10 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9.0.2167-r1.ebuild (renamed from app-editors/vim-core/vim-core-8.2.0360.ebuild) | 173 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9.0.2167.ebuild (renamed from app-editors/vim-core/vim-core-8.2.0814.ebuild) | 173 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9.1.0366-r1.ebuild (renamed from app-editors/vim-core/vim-core-8.2.0508.ebuild) | 173 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9.1.0366.ebuild (renamed from app-editors/vim-core/vim-core-8.2.0638.ebuild) | 173 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9999.ebuild | 173 |
9 files changed, 687 insertions, 414 deletions
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index 30bd1b8eb791..403a34d860fa 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -1,6 +1,3 @@ -DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b -DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b -DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2 -DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6 -DIST vim-8.2.0638.tar.gz 14922315 BLAKE2B 12a8a272e1167ec845d2a5ab3b884f8d327e7b73a49fad2c7cafcd0bd5690c8c21d6b9e1b6211fd6ef8908ea93019c483ec5de74b50cf1fea8fbfc6f63b751df SHA512 4fc3aca0f3337b35d98281d1c7d5cd733bf14fbd1c3e382208ff950199125b6e4606bb7487310caf793eb6b2d1c6e719bce19b53d4d55a26354649c13b727a92 -DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2 +DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d576665a183927051eddd53d019a5ca413c74dc10aff09917ee3120bd2e2ba441219d7238994f0d5ba14fc9c31180199 SHA512 ec27e4056460948ff86bc48a21de239a84b53757a8283144ec121654096796d970ad832234d6591a132bcd38bc12dc507cc7795a11cd383d20f08b4d9bcb051f +DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0 +DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb diff --git a/app-editors/vim-core/files/vimrc-r5 b/app-editors/vim-core/files/vimrc-r6 index 2409822e628c..0197f057d233 100644 --- a/app-editors/vim-core/files/vimrc-r5 +++ b/app-editors/vim-core/files/vimrc-r6 @@ -190,8 +190,11 @@ endif " has("autocmd") " }}} " We don't want VIM to load their own built-in defaults, preferring ours here -" instead: -let g:skip_defaults_vim = 1 +" instead. This option cannot apply to minimal builds, so it is guarded by a +" test that's guaranteed to fail for those, owing to the lack of +eval. +if 1 + let g:skip_defaults_vim = 1 +endif " Enable Omni completion when opening a file only if a specific plugin does " not already exist for that filetype. This allows Omni completion diff --git a/app-editors/vim-core/files/vimrc-r7 b/app-editors/vim-core/files/vimrc-r7 new file mode 100644 index 000000000000..39a30d6f2955 --- /dev/null +++ b/app-editors/vim-core/files/vimrc-r7 @@ -0,0 +1,210 @@ +scriptencoding utf-8 +" ^^ Please leave the above line at the start of the file. + +" Default configuration file for Vim + +" Written by Aron Griffis <agriffis@gentoo.org> +" Modified by Ryan Phillips <rphillips@gentoo.org> +" Modified some more by Ciaran McCreesh <ciaranm@gentoo.org> +" Added Redhat's vimrc info by Seemant Kulleen <seemant@gentoo.org> + +" You can override any of these settings on a global basis via the +" "/etc/vim/vimrc.local" file, and on a per-user basis via "~/.vimrc". You may +" need to create these. + +" {{{ General settings +" The following are some sensible defaults for Vim for most users. +" We attempt to change as little as possible from Vim's defaults, +" deviating only where it makes sense +set nocompatible " Use Vim defaults (much better!) +set bs=2 " Allow backspacing over everything in insert mode +set ai " Always set auto-indenting on +set history=50 " keep 50 lines of command history +set ruler " Show the cursor position all the time + +set viminfo='20,\"500 " Keep a .viminfo file. + +" Don't use Ex mode, use Q for formatting +map Q gq + +" When doing tab completion, give the following files lower priority. You may +" wish to set 'wildignore' to completely ignore files, and 'wildmenu' to enable +" enhanced tab completion. These can be done in the user vimrc file. +set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo + +" When displaying line numbers, don't use an annoyingly wide number column. This +" doesn't enable line numbers -- :set number will do that. The value given is a +" minimum width to use for the number column, not a fixed size. +if v:version >= 700 + set numberwidth=3 +endif +" }}} + +" {{{ Modeline settings +" We don't allow modelines by default. See bug #14088 and bug #73715. +" If you're not concerned about these, you can enable them on a per-user +" basis by adding "set modeline" to your ~/.vimrc file. +set nomodeline +" }}} + +" {{{ Locale settings +" Try to come up with some nice sane GUI fonts. Also try to set a sensible +" value for fileencodings based upon locale. These can all be overridden in +" the user vimrc file. +if v:lang =~? "^ko" + set fileencodings=euc-kr + set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-* +elseif v:lang =~? "^ja_JP" + set fileencodings=euc-jp + set guifontset=-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-* +elseif v:lang =~? "^zh_TW" + set fileencodings=big5 + set guifontset=-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1,-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0 +elseif v:lang =~? "^zh_CN" + set fileencodings=gb2312 + set guifontset=*-r-* +endif + +" If we have a BOM, always honour that rather than trying to guess. +if &fileencodings !~? "ucs-bom" + set fileencodings^=ucs-bom +endif + +" Always check for UTF-8 when trying to determine encodings. +if &fileencodings !~? "utf-8" + " If we have to add this, the default encoding is not Unicode. + " We use this fact later to revert to the default encoding in plaintext/empty + " files. + let g:added_fenc_utf8 = 1 + set fileencodings+=utf-8 +endif + +" Make sure we have a sane fallback for encoding detection +if &fileencodings !~? "default" + set fileencodings+=default +endif +" }}} + +" {{{ Syntax highlighting settings +" Switch syntax highlighting on, when the terminal has colors +" Also switch on highlighting the last used search pattern. +if &t_Co > 2 || has("gui_running") + syntax on + set hlsearch +endif +" }}} + +" {{{ Terminal fixes +if &term ==? "xterm" + set t_Sb=^[4%dm + set t_Sf=^[3%dm + set ttymouse=xterm2 +endif + +if &term ==? "gnome" && has("eval") + " Set useful keys that vim doesn't discover via termcap but are in the + " builtin xterm termcap. See bug #122562. We use exec to avoid having to + " include raw escapes in the file. + exec "set <C-Left>=\eO5D" + exec "set <C-Right>=\eO5C" +endif +" }}} + +" {{{ Filetype plugin settings +" Enable plugin-provided filetype settings, but only if the ftplugin +" directory exists (which it won't on livecds, for example). +if isdirectory(expand("$VIMRUNTIME/ftplugin")) + filetype plugin on + + " Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided + " indent settings. Some people don't like these, so we won't turn them on by + " default. + " filetype indent on +endif +" }}} + +" {{{ Fix &shell, see bug #101665. +if "" == &shell + if executable("@GENTOO_PORTAGE_EPREFIX@/bin/bash") + set shell=@GENTOO_PORTAGE_EPREFIX@/bin/bash + elseif executable("@GENTOO_PORTAGE_EPREFIX@/bin/sh") + set shell=@GENTOO_PORTAGE_EPREFIX@/bin/sh + endif +endif +"}}} + +" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh +" files should default to bash. See :help sh-syntax and bug #101819. +if has("eval") + let is_bash=1 +endif +" }}} + +" {{{ Autocommands +if has("autocmd") + +augroup gentoo + au! + + " Gentoo-specific settings for ebuilds. These are the federally-mandated + " required tab settings. See the following for more information: + " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml + " Note that the rules below are very minimal and don't cover everything. + " Better to emerge app-vim/gentoo-syntax, which provides full syntax, + " filetype and indent settings for all things Gentoo. + au BufRead,BufNewFile *.e{build,class} let is_bash=1|setfiletype sh + au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab + + " When editing a file, always jump to the last cursor position + autocmd BufReadPost * + \ if ! exists("g:leave_my_cursor_position_alone") | + \ if line("'\"") > 0 && line ("'\"") <= line("$") | + \ exe "normal! g'\"" | + \ endif | + \ endif + + " When editing a crontab file, set backupcopy to yes rather than auto. See + " :help crontab and bug #53437. + autocmd FileType crontab set backupcopy=yes + + " If we previously detected that the default encoding is not UTF-8 + " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no + " characters at all) isn't a Unicode file, but is in the default encoding. + " Except of course if a byte-order mark is in effect. + autocmd BufReadPost * + \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" && + \ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable | + \ set fileencoding= | + \ endif + +augroup END + +endif " has("autocmd") +" }}} + +" We don't want VIM to load their own built-in defaults, preferring ours here +" instead. This option cannot apply to minimal builds, so it is guarded by a +" test that's guaranteed to fail for those, owing to the lack of +eval. +if 1 + let g:skip_defaults_vim = 1 +endif + +" Enable Omni completion when opening a file only if a specific plugin does +" not already exist for that filetype. This allows Omni completion +" (Ctrl-x/Ctrl-o) to work with any programming language if and only if a syntax +" file exists for the said language. +if exists("+omnifunc") + autocmd Filetype * + \ if &omnifunc == "" | + \ setlocal omnifunc=syntaxcomplete#Complete | + \ endif +endif + +" {{{ vimrc.local +if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local") + source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local +endif +" }}} + +" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker : + diff --git a/app-editors/vim-core/metadata.xml b/app-editors/vim-core/metadata.xml index 3979743b74bb..9c318632e59c 100644 --- a/app-editors/vim-core/metadata.xml +++ b/app-editors/vim-core/metadata.xml @@ -1,10 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>xxc3ncoredxx@gmail.com</email> + <name>Oskari Pirhonen</name> + </maintainer> <maintainer type="project"> <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">vim/vim</remote-id> <remote-id type="cpe">cpe:/a:vim:vim</remote-id> diff --git a/app-editors/vim-core/vim-core-8.2.0360.ebuild b/app-editors/vim-core/vim-core-9.0.2167-r1.ebuild index 21ea460ef5bd..bd23f78d0c6a 100644 --- a/app-editors/vim-core/vim-core-8.2.0360.ebuild +++ b/app-editors/vim-core/vim-core-9.0.2167-r1.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.2092" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,55 +15,61 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="nls acl minimal" -DEPEND="sys-devel/autoconf" -# avoid icon file collision bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" -S=${WORKDIR}/vim-${PV} +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/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. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi + 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 #77841. We remove this file after the tarball extraction. + # 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 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ @@ -67,17 +77,12 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${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" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. @@ -89,27 +94,12 @@ src_prepare() { cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - eapply_user -} - -src_configure() { - local myconf - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # 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: + # 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 @@ -119,35 +109,56 @@ src_configure() { # 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() { + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + 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 + 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" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + 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() { @@ -179,27 +190,27 @@ src_install() { # default vimrc is installed by vim-core since it applies to # both vim and gvim insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc + 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. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop + 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 diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-9.0.2167.ebuild index 4d07d8c37442..6a93ef6b0442 100644 --- a/app-editors/vim-core/vim-core-8.2.0814.ebuild +++ b/app-editors/vim-core/vim-core-9.0.2167.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.2092" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,55 +15,61 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="nls acl minimal" -DEPEND="sys-devel/autoconf" -# avoid icon file collision bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" -S=${WORKDIR}/vim-${PV} +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/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. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi + 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 #77841. We remove this file after the tarball extraction. + # 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 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ @@ -67,17 +77,12 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${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" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. @@ -89,27 +94,12 @@ src_prepare() { cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - eapply_user -} - -src_configure() { - local myconf - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # 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: + # 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 @@ -119,35 +109,56 @@ src_configure() { # 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() { + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + 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 + 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" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + 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() { @@ -179,27 +190,27 @@ src_install() { # default vimrc is installed by vim-core since it applies to # both vim and gvim insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc + newins "${FILESDIR}"/vimrc-r6 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. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop + 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 diff --git a/app-editors/vim-core/vim-core-8.2.0508.ebuild b/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild index 28ba2d3038ab..759cb04d314d 100644 --- a/app-editors/vim-core/vim-core-8.2.0508.ebuild +++ b/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.1" +VIM_PATCHES_VERSION="9.0.2092" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,55 +15,61 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="nls acl minimal" -DEPEND="sys-devel/autoconf" -# avoid icon file collision bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" -S=${WORKDIR}/vim-${PV} +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/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. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi + 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 #77841. We remove this file after the tarball extraction. + # 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 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ @@ -67,17 +77,12 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${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" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. @@ -89,27 +94,12 @@ src_prepare() { cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - eapply_user -} - -src_configure() { - local myconf - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # 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: + # 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 @@ -119,35 +109,56 @@ src_configure() { # 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() { + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + 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 + 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" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + 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() { @@ -179,27 +190,27 @@ src_install() { # default vimrc is installed by vim-core since it applies to # both vim and gvim insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc + 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. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop + 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 diff --git a/app-editors/vim-core/vim-core-8.2.0638.ebuild b/app-editors/vim-core/vim-core-9.1.0366.ebuild index 28ba2d3038ab..8df57d51b46b 100644 --- a/app-editors/vim-core/vim-core-8.2.0638.ebuild +++ b/app-editors/vim-core/vim-core-9.1.0366.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.1" +VIM_PATCHES_VERSION="9.0.2092" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,55 +15,61 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="nls acl minimal" -DEPEND="sys-devel/autoconf" -# avoid icon file collision bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" -S=${WORKDIR}/vim-${PV} +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/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. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi + 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 #77841. We remove this file after the tarball extraction. + # 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 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ @@ -67,17 +77,12 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${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" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. @@ -89,27 +94,12 @@ src_prepare() { cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - eapply_user -} - -src_configure() { - local myconf - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # 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: + # 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 @@ -119,35 +109,56 @@ src_configure() { # 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() { + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + 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 + 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" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + 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() { @@ -179,27 +190,27 @@ src_install() { # default vimrc is installed by vim-core since it applies to # both vim and gvim insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc + newins "${FILESDIR}"/vimrc-r6 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. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop + 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 diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index d1dbef9e8f10..b78c0ae44f87 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,55 +15,61 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="nls acl minimal" -DEPEND="sys-devel/autoconf" -# avoid icon file collision bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" -S=${WORKDIR}/vim-${PV} +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. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi + 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 #77841. We remove this file after the tarball extraction. + # 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 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ @@ -67,17 +77,12 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${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" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. @@ -89,27 +94,12 @@ src_prepare() { cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - eapply_user -} - -src_configure() { - local myconf - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # 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: + # 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 @@ -119,35 +109,56 @@ src_configure() { # 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() { + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + 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 + 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} + --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" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + 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() { @@ -179,27 +190,27 @@ src_install() { # default vimrc is installed by vim-core since it applies to # both vim and gvim insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc + 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. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop + 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 |