diff options
Diffstat (limited to 'app-editors/vim/vim-9999.ebuild')
| -rw-r--r-- | app-editors/vim/vim-9999.ebuild | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 5ffcda64baac..850c5dab10c6 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,10 @@ EAPI=8 # Please bump with app-editors/vim-core and app-editors/gvim VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" @@ -18,12 +20,12 @@ 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://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" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" LICENSE="vim" SLOT="0" @@ -46,7 +48,6 @@ RDEPEND=" $(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} ) @@ -57,13 +58,31 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf 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 + +# platform-specific checks (bug #898452): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) pkg_setup() { # people with broken alphabets run into trouble. bug #82186. @@ -75,11 +94,7 @@ 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 + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -103,13 +118,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 @@ -140,10 +148,6 @@ src_prepare() { 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 @@ -152,7 +156,10 @@ src_prepare() { sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" rm src/auto/configure || die "rm failed" - eapply_user + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } src_configure() { |