diff options
Diffstat (limited to 'app-editors/gvim/gvim-9999.ebuild')
| -rw-r--r-- | app-editors/gvim/gvim-9999.ebuild | 181 |
1 files changed, 89 insertions, 92 deletions
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 3542682bc039..9f2b67d6fdc0 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -1,13 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -PYTHON_COMPAT=( python3_{6,7,8} ) +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="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" -inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix python-single-r1 ruby-single +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 @@ -15,18 +21,21 @@ if [[ ${PV} == 9999* ]]; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" -IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl" +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=" @@ -39,28 +48,17 @@ RDEPEND=" x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( 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? ( - luajit? ( dev-lang/luajit:2= ) - !luajit? ( dev-lang/lua:0[deprecated] ) + ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) @@ -72,34 +70,45 @@ RDEPEND=" sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) " -DEPEND="${RDEPEND} - sys-devel/autoconf +DEPEND="${RDEPEND}" +# 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" -S=${WORKDIR}/vim-${PV} +# 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" - # 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 - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches/ - fi + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -123,12 +132,6 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i -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 @@ -146,16 +149,29 @@ src_prepare() { cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + # 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:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + '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 + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } 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 @@ -166,14 +182,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 @@ -187,20 +195,19 @@ src_configure() { use debug && append-flags "-DDEBUG" - myconf=( + 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 lua luainterp) - $(use_with luajit) $(use_enable netbeans) $(use_enable nls) $(use_enable perl perlinterp) $(use_enable python python3interp) - $(use_with python python3-command $(type -P $(eselect python show --python3))) + $(use_with python python3-command "${PYTHON}") $(use_enable racket mzschemeinterp) $(use_enable ruby rubyinterp) $(use_enable selinux) @@ -208,20 +215,19 @@ 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" + 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 - # 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 + # Default is gtk unless aqua or motif are enabled echo ; echo if use aqua; then einfo "Building gvim with the Carbon GUI" @@ -229,23 +235,13 @@ src_configure() { --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 ) + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) fi echo ; echo @@ -255,11 +251,12 @@ src_configure() { # 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 + 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 \ @@ -303,7 +300,7 @@ src_test() { # Call eselect vi update with --if-unset # to respect user's choice (bug 187449) eselect_vi_update() { - einfo "Calling eselect vi update..." + ebegin "Calling eselect vi update" eselect vi update --if-unset eend $? } |