diff options
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/Manifest.gz | bin | 13919 -> 13933 bytes | |||
-rw-r--r-- | app-editors/gvim/Manifest | 5 | ||||
-rw-r--r-- | app-editors/gvim/gvim-9.0.0049.ebuild | 379 | ||||
-rw-r--r-- | app-editors/gvim/gvim-9999.ebuild | 50 | ||||
-rw-r--r-- | app-editors/vim-core/Manifest | 5 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9.0.0049.ebuild | 227 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9999.ebuild | 68 | ||||
-rw-r--r-- | app-editors/vim/Manifest | 5 | ||||
-rw-r--r-- | app-editors/vim/vim-9.0.0049.ebuild | 356 | ||||
-rw-r--r-- | app-editors/vim/vim-9999.ebuild | 30 |
10 files changed, 1042 insertions, 83 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 2b0f4da072a1..8f0c01835be8 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 74a80017d483..bc4ff09d32f0 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -3,7 +3,10 @@ AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e +DIST vim-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8 +DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 EBUILD gvim-8.2.4586.ebuild 10692 BLAKE2B 6cfe421fbb3cd2ea0132f8d1b2f6bcccdf575eb6527dc056c8a35549ed4bcdb06056188c383186d0a41bf375dab44cc35f9ee97f156b1ac4fa245a54c892a60f SHA512 6e134cdca1e03729cfc4400850ce8c74ad3bc9ccb08f8afaf48f7998fe238098993c6f18fe26e553d0930c4507e5ad6f3c52df1b17e580f24a7c59df698ca767 EBUILD gvim-8.2.5066.ebuild 10752 BLAKE2B 03bffa111a79f704377ca932f852a887244f2d0177a159cafc03d77fc0c687e513555d0d88b041f27a8fafb612bdf54bdf7730b84f93d0f3e12f7b4a94091e8e SHA512 1b5185359767eb6a792fd68ebe3ab37ba7a9a681a19811259f0058078fd81e44a056ab23b1768d48a2a43ebd3438fa223e8505a682480ee98842824b1f60ba99 -EBUILD gvim-9999.ebuild 10752 BLAKE2B 03bffa111a79f704377ca932f852a887244f2d0177a159cafc03d77fc0c687e513555d0d88b041f27a8fafb612bdf54bdf7730b84f93d0f3e12f7b4a94091e8e SHA512 1b5185359767eb6a792fd68ebe3ab37ba7a9a681a19811259f0058078fd81e44a056ab23b1768d48a2a43ebd3438fa223e8505a682480ee98842824b1f60ba99 +EBUILD gvim-9.0.0049.ebuild 10603 BLAKE2B d49a0bf661f62bb0748bdcdca8491e93dfa0f5e860279109a693cad52c4e58145cf20d1156adfe975d45778a36bbbf9dc3cf636437ee662345efe835ee155742 SHA512 770deaed448b51e6c4a19cdfd9c07f2514fbaa23254cdcb3fbbb9d2c2eb5466ac117579f21d2cc362036c51af41e61ad28c93f962ecb3ef1c8c037f49ca0f6c2 +EBUILD gvim-9999.ebuild 10603 BLAKE2B d49a0bf661f62bb0748bdcdca8491e93dfa0f5e860279109a693cad52c4e58145cf20d1156adfe975d45778a36bbbf9dc3cf636437ee662345efe835ee155742 SHA512 770deaed448b51e6c4a19cdfd9c07f2514fbaa23254cdcb3fbbb9d2c2eb5466ac117579f21d2cc362036c51af41e61ad28c93f962ecb3ef1c8c037f49ca0f6c2 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10 diff --git a/app-editors/gvim/gvim-9.0.0049.ebuild b/app-editors/gvim/gvim-9.0.0049.ebuild new file mode 100644 index 000000000000..99018e02a288 --- /dev/null +++ b/app-editors/gvim/gvim-9.0.0049.ebuild @@ -0,0 +1,379 @@ +# Copyright 1999-2022 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.0" +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby26 ruby27" + +inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single + +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-9.0.0049-patches.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt 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 ) ) + !aqua? ( + gtk? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + !gtk? ( + gtk2? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + ) + !gtk2? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) + ) + ) + ) + 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}" +# configure runs the Lua interpreter +BDEPEND=" + sys-devel/autoconf + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +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() { + if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches" + fi + + # 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' + + # 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 -e \ + '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" + 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" + + # 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' + + # 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 + + eapply_user +} + +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 + + # 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 + + 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 + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # gvim's GUI preference order is as follows: + # aqua CARBON (not tested) + # -aqua gtk GTK3 + # -aqua -gtk gtk2 GTK2 + # -aqua -gtk -gtk motif MOTIF + # -aqua -gtk -gtk -motif neXt NEXTAW + # -aqua -gtk -gtk -motif -neXt ATHENA + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use gtk; then + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + elif use gtk2; then + myconf+=( --enable-gtk2-check ) + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + elif use neXt; then + einfo "Building gvim with the neXtaw GUI" + myconf+=( --enable-gui=nextaw ) + else + einfo "Building gvim with the Athena GUI" + myconf+=( --enable-gui=athena ) + 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 [[ ${CHOST} == *-interix* ]]; then + # avoid finding of this function, to avoid having to patch either + # configure or the source, which would be much more hackish. + # after all vim does it right, only interix is badly broken (again) + export ac_cv_func_sigaction=no + fi + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --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 +} diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 2fe57d502981..99018e02a288 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -3,11 +3,11 @@ EAPI=8 -# Please bump with app-editors/vim-core and app-editors/gvim +# Please bump with app-editors/vim-core and app-editors/vim -VIM_VERSION="8.2" +VIM_VERSION="9.0" LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby26 ruby27" @@ -19,7 +19,7 @@ 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" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" fi S="${WORKDIR}"/vim-${PV} @@ -96,20 +96,14 @@ pkg_setup() { unset LANG LC_ALL export LC_COLLATE="C" - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die - export HOME="${T}"/home - use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } src_prepare() { if [[ ${PV} != 9999* ]]; then - rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || di - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches/ + eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches" fi # Fixup a script to use awk instead of nawk @@ -162,11 +156,26 @@ src_prepare() { "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS 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 + 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 @@ -177,14 +186,6 @@ src_configure() { # 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 -e \ - 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -v src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc @@ -198,7 +199,7 @@ src_configure() { use debug && append-flags "-DDEBUG" - myconf=( + local myconf=( --with-features=huge --disable-gpm --with-gnome=no @@ -218,13 +219,6 @@ src_configure() { $(use_enable tcl tclinterp) ) - # --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 - if use lua; then myconf+=( --enable-luainterp diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index b179dbe7bc1b..94a4990b5426 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -5,7 +5,10 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9 DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e +DIST vim-core-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8 +DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 EBUILD vim-core-8.2.4586.ebuild 7145 BLAKE2B b80dc1b8ef8b8b8601445d66396d0e3ee4a13115552930cacf8de13be456cd54c474025a7e45de83926d691ba0c4850524e5a076ec6905a5cdcfc117185d6adb SHA512 86e425f416065660943f5ef7f34bad34e5fe97ae95c07d3c17f391abc99f0326515ac4718d10a2e8b6dccf3197397cd84fe78f3e4a5bc2b27be6107a1c3c14f5 EBUILD vim-core-8.2.5066-r1.ebuild 7135 BLAKE2B 517fbdaf0d2f4f7d03f72bb148d2d1d93940f2eeb9deb1dad3adc022da3375097e85fea0b2ff9565dd73057d31ce5cd25b757301df1a40f68517d5b99d2395ad SHA512 fa9abcfc6a2986844bf5f8056cd9044fc00d709a0aec6f7fc26c78e1e7555e9da36fe9d356afbe94e685fb3d4873fe1ca744f0fbc463b5b2f34be4de016fe73c -EBUILD vim-core-9999.ebuild 7135 BLAKE2B 517fbdaf0d2f4f7d03f72bb148d2d1d93940f2eeb9deb1dad3adc022da3375097e85fea0b2ff9565dd73057d31ce5cd25b757301df1a40f68517d5b99d2395ad SHA512 fa9abcfc6a2986844bf5f8056cd9044fc00d709a0aec6f7fc26c78e1e7555e9da36fe9d356afbe94e685fb3d4873fe1ca744f0fbc463b5b2f34be4de016fe73c +EBUILD vim-core-9.0.0049.ebuild 7058 BLAKE2B a168b1df745f60f67816180152949de0b533de9039807b44312aec7756b1a2040046a7991f41774aca1179ec918f4654f446fabe1f4507adcd1057b2b9382b7c SHA512 05679fb463cfc01cbe422a0f0b1873ef5035d98e957088e4801b80c801327505a6e05b33f01f3ae70b9ea8c368aaca6dd97b00f338006c03ba469d1471e097b9 +EBUILD vim-core-9999.ebuild 7058 BLAKE2B a168b1df745f60f67816180152949de0b533de9039807b44312aec7756b1a2040046a7991f41774aca1179ec918f4654f446fabe1f4507adcd1057b2b9382b7c SHA512 05679fb463cfc01cbe422a0f0b1873ef5035d98e957088e4801b80c801327505a6e05b33f01f3ae70b9ea8c368aaca6dd97b00f338006c03ba469d1471e097b9 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7 diff --git a/app-editors/vim-core/vim-core-9.0.0049.ebuild b/app-editors/vim-core/vim-core-9.0.0049.ebuild new file mode 100644 index 000000000000..0fd6ae36dd53 --- /dev/null +++ b/app-editors/vim-core/vim-core-9.0.0049.ebuild @@ -0,0 +1,227 @@ +# Copyright 1999-2022 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.0" +inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop 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 -> ${P}.tar.gz + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +S="${WORKDIR}/vim-${PV}" + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +BDEPEND="sys-devel/autoconf" +# Avoid icon file collision, bug #673880 +RDEPEND="!!<app-editors/gvim-8.1.0648 + !<app-editors/vim-8.2.4328-r1" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches" + fi + + # 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' + + # 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" + 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" + + # 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' + + # 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" + + eapply_user +} + +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} + 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 "${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-r5 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 ) + + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + + eshopts_pop + 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 +} diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 2ab640fe7da3..0fd6ae36dd53 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Please bump with app-editors/vim and app-editors/gvim -VIM_VERSION="8.2" +VIM_VERSION="9.0" inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils if [[ ${PV} == 9999* ]] ; then @@ -13,11 +13,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://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz" + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -S="${WORKDIR}"/vim-${PV} +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" @@ -36,16 +36,12 @@ pkg_setup() { # 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 + eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches" fi # Fixup a script to use awk instead of nawk @@ -57,8 +53,8 @@ src_prepare() { 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. @@ -97,16 +93,6 @@ src_prepare() { "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 # everyone since previous flag filtering bugs have turned out to affect # multiple archs... @@ -122,6 +108,14 @@ src_configure() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" + eapply_user +} + +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 @@ -135,22 +129,24 @@ src_configure() { # 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 ) + + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index ceb8838bd68d..d1fa5bc5644c 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -3,7 +3,10 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9 DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e +DIST vim-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8 +DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 EBUILD vim-8.2.4586.ebuild 10091 BLAKE2B 9073b2cdbd5e910154e4f5ecf845d46b10407e1b363a05d98dd0e688071abfe5d67209efece7997f48197de5951f8a1369ca3b424cb44d69a1d532ff7167ee2b SHA512 3907db9b383f43378ce0c87c8abcbf64aa64212462be5873595a796a562af34e8875a5f38b9bc55363c94d0a9eae9ed9f58f386062ab2a73e1fa7dcee5479478 EBUILD vim-8.2.5066-r1.ebuild 10420 BLAKE2B 04e5471f93e5883fb3d6a4177b1a09937ce247bf227c71f0056d912554aa64676e66e86aee044cd2f31c90b0544b1033988e159811b3188a41a05537084878f3 SHA512 78aaecc2b156e8fbe304a3d3af5bcbf4b5d8806b199d12221bf2203035cfbdb0d2c497f9c28ea7d2f5100c58f2d5e205c1bd2990aa4aeee955ba662d6c80f07e -EBUILD vim-9999.ebuild 10420 BLAKE2B 04e5471f93e5883fb3d6a4177b1a09937ce247bf227c71f0056d912554aa64676e66e86aee044cd2f31c90b0544b1033988e159811b3188a41a05537084878f3 SHA512 78aaecc2b156e8fbe304a3d3af5bcbf4b5d8806b199d12221bf2203035cfbdb0d2c497f9c28ea7d2f5100c58f2d5e205c1bd2990aa4aeee955ba662d6c80f07e +EBUILD vim-9.0.0049.ebuild 10353 BLAKE2B 2a17dd40451b1da566d846146f870e4890d031127dac21778a808fe5767f47e5dcbe3c2262125aeb31e88347f214e1d5f695bc76fa94a6863d3d6bd3ae385626 SHA512 e5941d993cb16375b2f5a4879fe3019345922b14a53ad3ae6b27b000eb5f03113a5c538c3c61a31e88fae1bfbc2e8f97fb5c197ae176607364c13c9ead092bf8 +EBUILD vim-9999.ebuild 10353 BLAKE2B 2a17dd40451b1da566d846146f870e4890d031127dac21778a808fe5767f47e5dcbe3c2262125aeb31e88347f214e1d5f695bc76fa94a6863d3d6bd3ae385626 SHA512 e5941d993cb16375b2f5a4879fe3019345922b14a53ad3ae6b27b000eb5f03113a5c538c3c61a31e88fae1bfbc2e8f97fb5c197ae176607364c13c9ead092bf8 MISC metadata.xml 891 BLAKE2B 00a55660fecbeca3df9b50e7400510fb92bbcdd42ba588725580c153d74a4731b31dd0ebaade4f60a4db88c695a7f60663773d63046c1b38aab0363520b8858d SHA512 76eebfe4d34eb609b29946b724ae450916eeab2573edf0f5aa87325f1e9abc8a2ca45d7abe3bfa9d996670d90e7cde17cb84662f69502a4b4a5b44b14b4c8890 diff --git a/app-editors/vim/vim-9.0.0049.ebuild b/app-editors/vim/vim-9.0.0049.ebuild new file mode 100644 index 000000000000..38aa4796d06e --- /dev/null +++ b/app-editors/vim/vim-9.0.0049.ebuild @@ -0,0 +1,356 @@ +# Copyright 1999-2022 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/gvim + +VIM_VERSION="9.0" +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby26 ruby27" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + vim-pager? ( !minimal ) +" + +RDEPEND=" + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + crypt? ( dev-libs/libsodium:= ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + ~app-editors/vim-core-${PV} + !<app-editors/vim-core-8.2.4328-r1 + vim-pager? ( app-editors/vim-core[-minimal] ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( ${RUBY_DEPS} ) + selinux? ( sys-libs/libselinux ) + sound? ( media-libs/libcanberra ) + tcl? ( dev-lang/tcl:0= ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND}" +# configure runs the Lua interpreter +BDEPEND=" + sys-devel/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" + +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() { + + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches" + fi + + # 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' + + # 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 -e \ + '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" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # 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" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS 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 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + + eapply_user +} + +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 + + # 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 + + 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 + + local myconf=() + if use minimal; then + myconf=( + --with-features=tiny + --disable-nls + --disable-canberra + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable crypt libsodium) + $(use_enable cscope) + $(use_enable gpm) + $(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 tcl tclinterp) + $(use_enable terminal) + ) + + # --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 "sed failed" + fi + + if use lua; then + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # 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 ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${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 + + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\)' + + emake -j1 -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/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + domenu runtime/vim.desktop + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index bcec32097911..38aa4796d06e 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -5,9 +5,9 @@ EAPI=8 # Please bump with app-editors/vim-core and app-editors/gvim -VIM_VERSION="8.2" +VIM_VERSION="9.0" LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby26 ruby27" @@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="https://github.com/vim/vim.git" else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -70,18 +70,15 @@ pkg_setup() { unset LANG LC_ALL export LC_COLLATE="C" - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir failed" - export HOME="${T}"/home - use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } src_prepare() { + if [[ ${PV} != 9999* ]] ; then # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches/ + eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches" fi # Fixup a script to use awk instead of nawk @@ -147,11 +144,18 @@ src_prepare() { "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS 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 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm 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 @@ -162,13 +166,6 @@ src_configure() { # 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" - rm src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug #24447). The hvc @@ -179,6 +176,7 @@ src_configure() { fi done + local myconf=() if use minimal; then myconf=( --with-features=tiny |