diff options
Diffstat (limited to 'app-editors/gvim')
| -rw-r--r-- | app-editors/gvim/Manifest | 7 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-9.0.1503.ebuild | 360 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-9.0.1627.ebuild | 360 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-9.0.1678.ebuild | 360 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-9.0.1777.ebuild | 360 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-9.1.0366.ebuild | 2 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-9.1.0470.ebuild (renamed from app-editors/gvim/gvim-9.0.2092.ebuild) | 19 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-9999.ebuild | 23 |
8 files changed, 26 insertions, 1465 deletions
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 71f002ea046c..67344428f5b6 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -1,9 +1,4 @@ -DIST vim-9.0.1503.tar.gz 17010118 BLAKE2B 4f74d52a3fcf7875031378f86fc3411c64c92e4b82bee371148b19042478d3f974793477c3fc2d9ddff9233fa1ec3c864962880840867544e92464f1a0876f51 SHA512 2f3242ec0f79cf6affc2f7fdaf689c35d8597706ac1689dbbdc01352676199605bb37f22bd901f1e8d59f312237d3fce4bee8b979b28a744ea9e40558621980e -DIST vim-9.0.1627.tar.gz 17048824 BLAKE2B 3fa583cf676c2388641b1240ed4b90c2e42cd9f50ea44a943cce86bba4bf278adf54837bb5c4530471fd57cfcd08cd39be78b17a5e907435a02dc5874ff7f571 SHA512 d2fb863e03d4ad773fcba8917f3cd1e373f661aa8b8a20bd3e416a73788997d31c6dd106a1bf59d72475bb577bbe6d52eb079fff9c7152d96bb6e5c9aa6e2f3b -DIST vim-9.0.1678.tar.gz 17069551 BLAKE2B e83cea77513eb0d8b3ed02bd508333fb97357d2d7a91a90c5a9376b03b444a0b65b6ce04b14e191e33445132845af71193ab140ea615bb03a2c24a904b726cb4 SHA512 c5ffb7ca56ff4eee70f06599dd84db2eb28ddadac229d4f7faf01174805923636a4ce61486bdf5a47910c929613dc9b9290dfc9288006222b4bc4ac891548bb8 -DIST vim-9.0.1777.tar.gz 17177555 BLAKE2B ad6d785f4c6b112199bd2f34e0b7f6070615fba8dce25354a7ded40ff8536388e7b7120c1f2fad790c8dc7134d74649697b6e95777e79dcf1e208ead81b229d6 SHA512 702781b6a9cf540d22aa0bc1e25a4fb785ff2b22e9c6a59643e87fd6f7b3e5444adbee1816bfaa0b45b9655bb56dc2d13904230840a0ecea56f5453034d81a2e DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d576665a183927051eddd53d019a5ca413c74dc10aff09917ee3120bd2e2ba441219d7238994f0d5ba14fc9c31180199 SHA512 ec27e4056460948ff86bc48a21de239a84b53757a8283144ec121654096796d970ad832234d6591a132bcd38bc12dc507cc7795a11cd383d20f08b4d9bcb051f -DIST vim-9.0.2092.tar.gz 17359377 BLAKE2B eeb50de7e4876ce0e2a1e8b241ea2c7c472898495ef5517fa115e01f29ef8922fb7ef970f2c1a3ffe65a8274e2c59bd5a939f397048c6b486683c29c01484d1e SHA512 1c3e78ee1bb507858e0d30a8a1e646c16dd6d8d666ea587e91d1c90e490aef46387d6dfadc01e80f9aa807f7b109e4072efa8d8115fcd2a81dd62cabc30a8001 DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0 DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb -DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a +DIST vim-9.1.0470.tar.gz 17919981 BLAKE2B 90ebffc6e7b6162f8a047976659e044b75aaa946799b901e9f8c88f04a787543cde56545c8c6e5394fa2bc957d2e46810c5ca3f1315fc20a398a57bbdbc90f4c SHA512 41b71e9e5385237b30aa256f064c9d5c914b29a97c0ec562f1995ac5d476fcf840c3f0e9a52e599f6084777db147e83fcbf0ec6b985bb94c126264d4cbafb964 diff --git a/app-editors/gvim/gvim-9.0.1503.ebuild b/app-editors/gvim/gvim-9.0.1503.ebuild deleted file mode 100644 index bf09149d4a15..000000000000 --- a/app-editors/gvim/gvim-9.0.1503.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2024 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" -VIM_PATCHES_VERSION="9.0.1000" - -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby27 ruby30 ruby31" - -inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -fi -S="${WORKDIR}"/vim-${PV} - -DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="https://www.vim.org https://github.com/vim/vim" - -LICENSE="vim" -SLOT="0" -IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - aqua? ( !motif ) -" - -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? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - x11-libs/gtk+:3 - x11-libs/libXft - ) - ) - crypt? ( dev-libs/libsodium:= ) - cscope? ( dev-util/cscope ) - lua? ( - ${LUA_DEPS} - $(lua_gen_impl_dep 'deprecated' lua5-1) - ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - racket? ( dev-scheme/racket ) - ruby? ( ${RUBY_DEPS} ) - selinux? ( sys-libs/libselinux ) - session? ( x11-libs/libSM ) - sound? ( media-libs/libcanberra ) - tcl? ( dev-lang/tcl:0= ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -# configure runs the Lua interpreter -BDEPEND=" - dev-build/autoconf - virtual/pkgconfig - lua? ( ${LUA_DEPS} ) - nls? ( sys-devel/gettext ) -" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" - -if [[ ${PV} != 9999* ]]; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - PATCHES=( - "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" - ) -fi - -# various failures (bugs #630042 and #682320) -RESTRICT="test" - -# platform-specific checks (bug #898450): -# - acl() -- Solaris -# - statacl() -- AIX -QA_CONFIG_IMPL_DECL_SKIP=( - 'acl' - 'statacl' -) - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Fixup a script to use awk instead of nawk - sed -i -e \ - '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ - "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" - - # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i -e \ - 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ - "${S}"/runtime/doc/syntax.txt \ - "${S}"/runtime/doc/tagsrch.txt \ - "${S}"/runtime/doc/usr_29.txt \ - "${S}"/runtime/menu.vim \ - "${S}"/src/configure.ac || die 'sed failed' - - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF - # correctly. To avoid some really entertaining error messages about stuff - # which isn't even in the source file being invalid, we'll do some trickery - # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" - done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i -e \ - 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -v src/auto/configure || die "rm failed" - - # --with-features=huge forces on cscope even if we --disable it. We need - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope; then - sed -i -e \ - '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" - fi -} - -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 - # -DLUA_COMPAT_OPENLIB=1 is required to enable the - # deprecated (in 5.1) luaL_openlib API (#874690) - use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 - - myconf+=( - --enable-luainterp - $(use_with lua_single_target_luajit luajit) - --with-lua-prefix="${EPREFIX}/usr" - ) - fi - - # Default is gtk unless aqua or motif are enabled - echo ; echo - if use aqua; then - einfo "Building gvim with the Carbon GUI" - myconf+=( - --enable-darwin - --enable-gui=carbon - ) - elif use motif; then - einfo "Building gvim with the MOTIF GUI" - myconf+=( --enable-gui=motif ) - else - myconf+=( --enable-gtk3-check ) - einfo "Building gvim with the gtk+-3 GUI" - myconf+=( --enable-gui=gtk3 ) - fi - echo ; echo - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if tc-is-cross-compiler ; then - export vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no - fi - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --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-9.0.1627.ebuild b/app-editors/gvim/gvim-9.0.1627.ebuild deleted file mode 100644 index 3baf872227e8..000000000000 --- a/app-editors/gvim/gvim-9.0.1627.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2024 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" -VIM_PATCHES_VERSION="9.0.1000" - -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby27 ruby30 ruby31" - -inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -fi -S="${WORKDIR}"/vim-${PV} - -DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="https://www.vim.org https://github.com/vim/vim" - -LICENSE="vim" -SLOT="0" -IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - aqua? ( !motif ) -" - -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? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - x11-libs/gtk+:3 - x11-libs/libXft - ) - ) - crypt? ( dev-libs/libsodium:= ) - cscope? ( dev-util/cscope ) - lua? ( - ${LUA_DEPS} - $(lua_gen_impl_dep 'deprecated' lua5-1) - ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - racket? ( dev-scheme/racket ) - ruby? ( ${RUBY_DEPS} ) - selinux? ( sys-libs/libselinux ) - session? ( x11-libs/libSM ) - sound? ( media-libs/libcanberra ) - tcl? ( dev-lang/tcl:0= ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -# configure runs the Lua interpreter -BDEPEND=" - dev-build/autoconf - virtual/pkgconfig - lua? ( ${LUA_DEPS} ) - nls? ( sys-devel/gettext ) -" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" - -if [[ ${PV} != 9999* ]]; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - PATCHES=( - "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" - ) -fi - -# various failures (bugs #630042 and #682320) -RESTRICT="test" - -# platform-specific checks (bug #898450): -# - acl() -- Solaris -# - statacl() -- AIX -QA_CONFIG_IMPL_DECL_SKIP=( - 'acl' - 'statacl' -) - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Fixup a script to use awk instead of nawk - sed -i -e \ - '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ - "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" - - # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i -e \ - 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ - "${S}"/runtime/doc/syntax.txt \ - "${S}"/runtime/doc/tagsrch.txt \ - "${S}"/runtime/doc/usr_29.txt \ - "${S}"/runtime/menu.vim \ - "${S}"/src/configure.ac || die 'sed failed' - - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF - # correctly. To avoid some really entertaining error messages about stuff - # which isn't even in the source file being invalid, we'll do some trickery - # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" - done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i -e \ - 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -v src/auto/configure || die "rm failed" - - # --with-features=huge forces on cscope even if we --disable it. We need - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope; then - sed -i -e \ - '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" - fi -} - -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 - # -DLUA_COMPAT_OPENLIB=1 is required to enable the - # deprecated (in 5.1) luaL_openlib API (#874690) - use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 - - myconf+=( - --enable-luainterp - $(use_with lua_single_target_luajit luajit) - --with-lua-prefix="${EPREFIX}/usr" - ) - fi - - # Default is gtk unless aqua or motif are enabled - echo ; echo - if use aqua; then - einfo "Building gvim with the Carbon GUI" - myconf+=( - --enable-darwin - --enable-gui=carbon - ) - elif use motif; then - einfo "Building gvim with the MOTIF GUI" - myconf+=( --enable-gui=motif ) - else - myconf+=( --enable-gtk3-check ) - einfo "Building gvim with the gtk+-3 GUI" - myconf+=( --enable-gui=gtk3 ) - fi - echo ; echo - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if tc-is-cross-compiler ; then - export vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no - fi - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --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-9.0.1678.ebuild b/app-editors/gvim/gvim-9.0.1678.ebuild deleted file mode 100644 index 91813ab71f13..000000000000 --- a/app-editors/gvim/gvim-9.0.1678.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2024 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" -VIM_PATCHES_VERSION="9.0.1000" - -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby27 ruby30 ruby31" - -inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -fi -S="${WORKDIR}"/vim-${PV} - -DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="https://www.vim.org https://github.com/vim/vim" - -LICENSE="vim" -SLOT="0" -IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - aqua? ( !motif ) -" - -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? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - x11-libs/gtk+:3 - x11-libs/libXft - ) - ) - crypt? ( dev-libs/libsodium:= ) - cscope? ( dev-util/cscope ) - lua? ( - ${LUA_DEPS} - $(lua_gen_impl_dep 'deprecated' lua5-1) - ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - racket? ( dev-scheme/racket ) - ruby? ( ${RUBY_DEPS} ) - selinux? ( sys-libs/libselinux ) - session? ( x11-libs/libSM ) - sound? ( media-libs/libcanberra ) - tcl? ( dev-lang/tcl:0= ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -# configure runs the Lua interpreter -BDEPEND=" - dev-build/autoconf - virtual/pkgconfig - lua? ( ${LUA_DEPS} ) - nls? ( sys-devel/gettext ) -" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" - -if [[ ${PV} != 9999* ]]; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - PATCHES=( - "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" - ) -fi - -# various failures (bugs #630042 and #682320) -RESTRICT="test" - -# platform-specific checks (bug #898450): -# - acl() -- Solaris -# - statacl() -- AIX -QA_CONFIG_IMPL_DECL_SKIP=( - 'acl' - 'statacl' -) - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Fixup a script to use awk instead of nawk - sed -i -e \ - '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ - "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" - - # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i -e \ - 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ - "${S}"/runtime/doc/syntax.txt \ - "${S}"/runtime/doc/tagsrch.txt \ - "${S}"/runtime/doc/usr_29.txt \ - "${S}"/runtime/menu.vim \ - "${S}"/src/configure.ac || die 'sed failed' - - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF - # correctly. To avoid some really entertaining error messages about stuff - # which isn't even in the source file being invalid, we'll do some trickery - # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" - done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i -e \ - 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -v src/auto/configure || die "rm failed" - - # --with-features=huge forces on cscope even if we --disable it. We need - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope; then - sed -i -e \ - '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" - fi -} - -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 - # -DLUA_COMPAT_OPENLIB=1 is required to enable the - # deprecated (in 5.1) luaL_openlib API (#874690) - use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 - - myconf+=( - --enable-luainterp - $(use_with lua_single_target_luajit luajit) - --with-lua-prefix="${EPREFIX}/usr" - ) - fi - - # Default is gtk unless aqua or motif are enabled - echo ; echo - if use aqua; then - einfo "Building gvim with the Carbon GUI" - myconf+=( - --enable-darwin - --enable-gui=carbon - ) - elif use motif; then - einfo "Building gvim with the MOTIF GUI" - myconf+=( --enable-gui=motif ) - else - myconf+=( --enable-gtk3-check ) - einfo "Building gvim with the gtk+-3 GUI" - myconf+=( --enable-gui=gtk3 ) - fi - echo ; echo - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if tc-is-cross-compiler ; then - export vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no - fi - - econf \ - --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ - --with-vim-name=gvim \ - --with-x \ - "${myconf[@]}" -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake -} - -src_test() { - einfo - einfo "Starting vim tests. Several error messages will be shown" - einfo "while the tests run. This is normal behaviour and does not" - einfo "indicate a fault." - einfo - ewarn "If the tests fail, your terminal may be left in a strange" - ewarn "state. Usually, running 'reset' will fix this." - einfo - - # Don't let vim talk to X - unset DISPLAY - - # Make gvim not try to connect to X. See :help gui-x11-start in vim for how - # this evil trickery works. - ln -s "${S}"/src/gvim "${S}"/src/testvim || die - - # Make sure our VIMPROG is used. - sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die - - # Don't do additional GUI tests. - emake -j1 VIMPROG=../testvim -C src/testdir nongui -} - -# Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) -eselect_vi_update() { - ebegin "Calling eselect vi update" - eselect vi update --if-unset - eend $? -} - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dobin src/gvim - dosym gvim /usr/bin/gvimdiff - dosym gvim /usr/bin/evim - dosym gvim /usr/bin/eview - dosym gvim /usr/bin/gview - dosym gvim /usr/bin/rgvim - dosym gvim /usr/bin/rgview - - emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons - - dodir /usr/share/man/man1 - echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed" - echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed" - echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \ - die "echo failed" - - insinto /etc/vim - newins "${FILESDIR}"/gvimrc-r1 gvimrc - eprefixify "${ED}"/etc/vim/gvimrc - - # bash completion script, bug #79018. - newbashcomp "${FILESDIR}"/${PN}-completion ${PN} - - # don't install vim desktop file - rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" -} - -pkg_postinst() { - # update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # update fdo mime stuff, bug #78394 - xdg_desktop_database_update - - # update icon cache - xdg_icon_cache_update - - # call eselect vi update - eselect_vi_update -} - -pkg_postrm() { - # update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # update fdo mime stuff, bug #78394 - xdg_desktop_database_update - - # update icon cache - xdg_icon_cache_update - - # call eselect vi update - eselect_vi_update -} diff --git a/app-editors/gvim/gvim-9.0.1777.ebuild b/app-editors/gvim/gvim-9.0.1777.ebuild deleted file mode 100644 index 5d9b88f5d4f7..000000000000 --- a/app-editors/gvim/gvim-9.0.1777.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2024 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" -VIM_PATCHES_VERSION="9.0.1000" - -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby27 ruby30 ruby31" - -inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -fi -S="${WORKDIR}"/vim-${PV} - -DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="https://www.vim.org https://github.com/vim/vim" - -LICENSE="vim" -SLOT="0" -IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - aqua? ( !motif ) -" - -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? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - x11-libs/gtk+:3 - x11-libs/libXft - ) - ) - crypt? ( dev-libs/libsodium:= ) - cscope? ( dev-util/cscope ) - lua? ( - ${LUA_DEPS} - $(lua_gen_impl_dep 'deprecated' lua5-1) - ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - racket? ( dev-scheme/racket ) - ruby? ( ${RUBY_DEPS} ) - selinux? ( sys-libs/libselinux ) - session? ( x11-libs/libSM ) - sound? ( media-libs/libcanberra ) - tcl? ( dev-lang/tcl:0= ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -# configure runs the Lua interpreter -BDEPEND=" - dev-build/autoconf - virtual/pkgconfig - lua? ( ${LUA_DEPS} ) - nls? ( sys-devel/gettext ) -" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" - -if [[ ${PV} != 9999* ]]; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - PATCHES=( - "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" - ) -fi - -# various failures (bugs #630042 and #682320) -RESTRICT="test" - -# platform-specific checks (bug #898450): -# - acl() -- Solaris -# - statacl() -- AIX -QA_CONFIG_IMPL_DECL_SKIP=( - 'acl' - 'statacl' -) - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Fixup a script to use awk instead of nawk - sed -i -e \ - '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ - "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" - - # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i -e \ - 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ - "${S}"/runtime/doc/syntax.txt \ - "${S}"/runtime/doc/tagsrch.txt \ - "${S}"/runtime/doc/usr_29.txt \ - "${S}"/runtime/menu.vim \ - "${S}"/src/configure.ac || die 'sed failed' - - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF - # correctly. To avoid some really entertaining error messages about stuff - # which isn't even in the source file being invalid, we'll do some trickery - # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" - done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i -e \ - 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -v src/auto/configure || die "rm failed" - - # --with-features=huge forces on cscope even if we --disable it. We need - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope; then - sed -i -e \ - '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" - fi -} - -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 - # -DLUA_COMPAT_OPENLIB=1 is required to enable the - # deprecated (in 5.1) luaL_openlib API (#874690) - use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 - - myconf+=( - --enable-luainterp - $(use_with lua_single_target_luajit luajit) - --with-lua-prefix="${EPREFIX}/usr" - ) - fi - - # Default is gtk unless aqua or motif are enabled - echo ; echo - if use aqua; then - einfo "Building gvim with the Carbon GUI" - myconf+=( - --enable-darwin - --enable-gui=carbon - ) - elif use motif; then - einfo "Building gvim with the MOTIF GUI" - myconf+=( --enable-gui=motif ) - else - myconf+=( --enable-gtk3-check ) - einfo "Building gvim with the gtk+-3 GUI" - myconf+=( --enable-gui=gtk3 ) - fi - echo ; echo - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if tc-is-cross-compiler ; then - export vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no - fi - - econf \ - --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ - --with-vim-name=gvim \ - --with-x \ - "${myconf[@]}" -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake -} - -src_test() { - einfo - einfo "Starting vim tests. Several error messages will be shown" - einfo "while the tests run. This is normal behaviour and does not" - einfo "indicate a fault." - einfo - ewarn "If the tests fail, your terminal may be left in a strange" - ewarn "state. Usually, running 'reset' will fix this." - einfo - - # Don't let vim talk to X - unset DISPLAY - - # Make gvim not try to connect to X. See :help gui-x11-start in vim for how - # this evil trickery works. - ln -s "${S}"/src/gvim "${S}"/src/testvim || die - - # Make sure our VIMPROG is used. - sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die - - # Don't do additional GUI tests. - emake -j1 VIMPROG=../testvim -C src/testdir nongui -} - -# Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) -eselect_vi_update() { - ebegin "Calling eselect vi update" - eselect vi update --if-unset - eend $? -} - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dobin src/gvim - dosym gvim /usr/bin/gvimdiff - dosym gvim /usr/bin/evim - dosym gvim /usr/bin/eview - dosym gvim /usr/bin/gview - dosym gvim /usr/bin/rgvim - dosym gvim /usr/bin/rgview - - emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons - - dodir /usr/share/man/man1 - echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed" - echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed" - echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \ - die "echo failed" - - insinto /etc/vim - newins "${FILESDIR}"/gvimrc-r1 gvimrc - eprefixify "${ED}"/etc/vim/gvimrc - - # bash completion script, bug #79018. - newbashcomp "${FILESDIR}"/${PN}-completion ${PN} - - # don't install vim desktop file - rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" -} - -pkg_postinst() { - # update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # update fdo mime stuff, bug #78394 - xdg_desktop_database_update - - # update icon cache - xdg_icon_cache_update - - # call eselect vi update - eselect_vi_update -} - -pkg_postrm() { - # update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # update fdo mime stuff, bug #78394 - xdg_desktop_database_update - - # update icon cache - xdg_icon_cache_update - - # call eselect vi update - eselect_vi_update -} diff --git a/app-editors/gvim/gvim-9.1.0366.ebuild b/app-editors/gvim/gvim-9.1.0366.ebuild index 826999e81017..0b232812613b 100644 --- a/app-editors/gvim/gvim-9.1.0366.ebuild +++ b/app-editors/gvim/gvim-9.1.0366.ebuild @@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi S="${WORKDIR}"/vim-${PV} diff --git a/app-editors/gvim/gvim-9.0.2092.ebuild b/app-editors/gvim/gvim-9.1.0470.ebuild index b4393c4f6a4c..826999e81017 100644 --- a/app-editors/gvim/gvim-9.0.2092.ebuild +++ b/app-editors/gvim/gvim-9.1.0470.ebuild @@ -5,13 +5,13 @@ EAPI=8 # Please bump with app-editors/vim-core and app-editors/vim -VIM_VERSION="9.0" +VIM_VERSION="9.1" VIM_PATCHES_VERSION="9.0.2092" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby27 ruby30 ruby31" +USE_RUBY="ruby31 ruby32" inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils @@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" fi S="${WORKDIR}"/vim-${PV} @@ -118,9 +118,9 @@ src_prepare() { # Read vimrc and gvimrc from /etc/vim echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" + >> "${S}"/src/feature.h || die "echo failed" echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" + >> "${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. @@ -138,7 +138,7 @@ src_prepare() { # 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. @@ -165,6 +165,11 @@ src_prepare() { sed -i -e \ '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" fi + + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } src_configure() { diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 9f2b67d6fdc0..826999e81017 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -5,13 +5,13 @@ EAPI=8 # Please bump with app-editors/vim-core and app-editors/vim -VIM_VERSION="9.0" -VIM_PATCHES_VERSION="9.0.1000" +VIM_VERSION="9.1" +VIM_PATCHES_VERSION="9.0.2092" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby27 ruby30 ruby31" +USE_RUBY="ruby31 ruby32" inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils @@ -21,7 +21,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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" fi S="${WORKDIR}"/vim-${PV} @@ -70,7 +70,8 @@ RDEPEND=" sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" # configure runs the Lua interpreter BDEPEND=" dev-build/autoconf @@ -83,7 +84,7 @@ PDEPEND="!minimal? ( app-vim/gentoo-syntax )" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc PATCHES=( - "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches" ) fi @@ -117,9 +118,9 @@ src_prepare() { # Read vimrc and gvimrc from /etc/vim echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" + >> "${S}"/src/feature.h || die "echo failed" echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" + >> "${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. @@ -137,7 +138,7 @@ src_prepare() { # 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. @@ -260,7 +261,7 @@ src_configure() { fi econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ --with-vim-name=gvim \ --with-x \ "${myconf[@]}" |