diff options
| author |   Thomas Bracht Laumann Jespersen <t@laumann.xyz> | 2022-07-18 21:38:50 +0200 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2022-07-19 17:12:16 -0400 |
| commit | 8dbd6630540cd98e94e1521d6bee5df771c3e569 (patch) | |
| tree | 23890e85a5dece989977dcbfc56aca614283c158 /app-editors | |
| parent | app-editors/vim-core: update live ebuild (diff) | |
| download | gentoo-8dbd6630540cd98e94e1521d6bee5df771c3e569.tar.gz gentoo-8dbd6630540cd98e94e1521d6bee5df771c3e569.tar.bz2 gentoo-8dbd6630540cd98e94e1521d6bee5df771c3e569.zip | |
app-editors/vim: update live ebuild
Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/vim/vim-9999.ebuild | 30 |
1 files changed, 14 insertions, 16 deletions
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 |