mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 14:06:58 +02:00
app-editors/vim: Sync with Gentoo
It's from Gentoo commit 83d72770bcd85405144b4a6ad2b427abc11fe62c.
This commit is contained in:
parent
d28d7a8361
commit
ec004a70e0
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
# Copyright 1999-2024 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -9,7 +9,7 @@ VIM_VERSION="9.0"
|
|||||||
VIM_PATCHES_VERSION="9.0.1000"
|
VIM_PATCHES_VERSION="9.0.1000"
|
||||||
|
|
||||||
LUA_COMPAT=( lua5-{1..4} luajit )
|
LUA_COMPAT=( lua5-{1..4} luajit )
|
||||||
PYTHON_COMPAT=( python3_{9..11} )
|
PYTHON_COMPAT=( python3_{10..11} )
|
||||||
PYTHON_REQ_USE="threads(+)"
|
PYTHON_REQ_USE="threads(+)"
|
||||||
USE_RUBY="ruby27 ruby30 ruby31"
|
USE_RUBY="ruby27 ruby30 ruby31"
|
||||||
|
|
||||||
@ -62,7 +62,7 @@ RDEPEND="
|
|||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
# configure runs the Lua interpreter
|
# configure runs the Lua interpreter
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
sys-devel/autoconf
|
dev-build/autoconf
|
||||||
lua? ( ${LUA_DEPS} )
|
lua? ( ${LUA_DEPS} )
|
||||||
nls? ( sys-devel/gettext )
|
nls? ( sys-devel/gettext )
|
||||||
"
|
"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
# Copyright 1999-2024 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -9,7 +9,7 @@ VIM_VERSION="9.0"
|
|||||||
VIM_PATCHES_VERSION="9.0.1000"
|
VIM_PATCHES_VERSION="9.0.1000"
|
||||||
|
|
||||||
LUA_COMPAT=( lua5-{1..4} luajit )
|
LUA_COMPAT=( lua5-{1..4} luajit )
|
||||||
PYTHON_COMPAT=( python3_{9..11} )
|
PYTHON_COMPAT=( python3_{10..11} )
|
||||||
PYTHON_REQ_USE="threads(+)"
|
PYTHON_REQ_USE="threads(+)"
|
||||||
USE_RUBY="ruby27 ruby30 ruby31"
|
USE_RUBY="ruby27 ruby30 ruby31"
|
||||||
|
|
||||||
@ -62,7 +62,7 @@ RDEPEND="
|
|||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
# configure runs the Lua interpreter
|
# configure runs the Lua interpreter
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
sys-devel/autoconf
|
dev-build/autoconf
|
||||||
lua? ( ${LUA_DEPS} )
|
lua? ( ${LUA_DEPS} )
|
||||||
nls? ( sys-devel/gettext )
|
nls? ( sys-devel/gettext )
|
||||||
"
|
"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
# Copyright 1999-2024 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -9,7 +9,7 @@ VIM_VERSION="9.0"
|
|||||||
VIM_PATCHES_VERSION="9.0.1000"
|
VIM_PATCHES_VERSION="9.0.1000"
|
||||||
|
|
||||||
LUA_COMPAT=( lua5-{1..4} luajit )
|
LUA_COMPAT=( lua5-{1..4} luajit )
|
||||||
PYTHON_COMPAT=( python3_{9..11} )
|
PYTHON_COMPAT=( python3_{10..11} )
|
||||||
PYTHON_REQ_USE="threads(+)"
|
PYTHON_REQ_USE="threads(+)"
|
||||||
USE_RUBY="ruby27 ruby30 ruby31"
|
USE_RUBY="ruby27 ruby30 ruby31"
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ RDEPEND="
|
|||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
# configure runs the Lua interpreter
|
# configure runs the Lua interpreter
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
sys-devel/autoconf
|
dev-build/autoconf
|
||||||
lua? ( ${LUA_DEPS} )
|
lua? ( ${LUA_DEPS} )
|
||||||
nls? ( sys-devel/gettext )
|
nls? ( sys-devel/gettext )
|
||||||
"
|
"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
# Copyright 1999-2024 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -9,7 +9,7 @@ VIM_VERSION="9.0"
|
|||||||
VIM_PATCHES_VERSION="9.0.1000"
|
VIM_PATCHES_VERSION="9.0.1000"
|
||||||
|
|
||||||
LUA_COMPAT=( lua5-{1..4} luajit )
|
LUA_COMPAT=( lua5-{1..4} luajit )
|
||||||
PYTHON_COMPAT=( python3_{9..11} )
|
PYTHON_COMPAT=( python3_{10..11} )
|
||||||
PYTHON_REQ_USE="threads(+)"
|
PYTHON_REQ_USE="threads(+)"
|
||||||
USE_RUBY="ruby27 ruby30 ruby31"
|
USE_RUBY="ruby27 ruby30 ruby31"
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ RDEPEND="
|
|||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
# configure runs the Lua interpreter
|
# configure runs the Lua interpreter
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
sys-devel/autoconf
|
dev-build/autoconf
|
||||||
lua? ( ${LUA_DEPS} )
|
lua? ( ${LUA_DEPS} )
|
||||||
nls? ( sys-devel/gettext )
|
nls? ( sys-devel/gettext )
|
||||||
"
|
"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
# Copyright 1999-2024 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -9,7 +9,7 @@ VIM_VERSION="9.0"
|
|||||||
VIM_PATCHES_VERSION="9.0.1000"
|
VIM_PATCHES_VERSION="9.0.1000"
|
||||||
|
|
||||||
LUA_COMPAT=( lua5-{1..4} luajit )
|
LUA_COMPAT=( lua5-{1..4} luajit )
|
||||||
PYTHON_COMPAT=( python3_{9..11} )
|
PYTHON_COMPAT=( python3_{10..11} )
|
||||||
PYTHON_REQ_USE="threads(+)"
|
PYTHON_REQ_USE="threads(+)"
|
||||||
USE_RUBY="ruby27 ruby30 ruby31"
|
USE_RUBY="ruby27 ruby30 ruby31"
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ RDEPEND="
|
|||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
# configure runs the Lua interpreter
|
# configure runs the Lua interpreter
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
sys-devel/autoconf
|
dev-build/autoconf
|
||||||
lua? ( ${LUA_DEPS} )
|
lua? ( ${LUA_DEPS} )
|
||||||
nls? ( sys-devel/gettext )
|
nls? ( sys-devel/gettext )
|
||||||
"
|
"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
# Copyright 1999-2024 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -9,7 +9,7 @@ VIM_VERSION="9.0"
|
|||||||
VIM_PATCHES_VERSION="9.0.2092"
|
VIM_PATCHES_VERSION="9.0.2092"
|
||||||
|
|
||||||
LUA_COMPAT=( lua5-{1..4} luajit )
|
LUA_COMPAT=( lua5-{1..4} luajit )
|
||||||
PYTHON_COMPAT=( python3_{9..11} )
|
PYTHON_COMPAT=( python3_{10..11} )
|
||||||
PYTHON_REQ_USE="threads(+)"
|
PYTHON_REQ_USE="threads(+)"
|
||||||
USE_RUBY="ruby27 ruby30 ruby31"
|
USE_RUBY="ruby27 ruby30 ruby31"
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ RDEPEND="
|
|||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
# configure runs the Lua interpreter
|
# configure runs the Lua interpreter
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
sys-devel/autoconf
|
dev-build/autoconf
|
||||||
lua? ( ${LUA_DEPS} )
|
lua? ( ${LUA_DEPS} )
|
||||||
nls? ( sys-devel/gettext )
|
nls? ( sys-devel/gettext )
|
||||||
"
|
"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
# Copyright 1999-2024 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then
|
|||||||
else
|
else
|
||||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||||
https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
|
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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DESCRIPTION="Vim, an improved vi-style text editor"
|
DESCRIPTION="Vim, an improved vi-style text editor"
|
||||||
@ -61,7 +61,7 @@ RDEPEND="
|
|||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
# configure runs the Lua interpreter
|
# configure runs the Lua interpreter
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
sys-devel/autoconf
|
dev-build/autoconf
|
||||||
lua? ( ${LUA_DEPS} )
|
lua? ( ${LUA_DEPS} )
|
||||||
nls? ( sys-devel/gettext )
|
nls? ( sys-devel/gettext )
|
||||||
"
|
"
|
||||||
@ -153,6 +153,11 @@ src_prepare() {
|
|||||||
# (4) Run ./configure (with wrong args) to remake 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"
|
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||||
rm src/auto/configure || die "rm failed"
|
rm src/auto/configure || die "rm failed"
|
||||||
|
|
||||||
|
# bug 908961
|
||||||
|
if use elibc_musl ; then
|
||||||
|
sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
# Copyright 1999-2024 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -9,7 +9,7 @@ VIM_VERSION="9.0"
|
|||||||
VIM_PATCHES_VERSION="9.0.1000"
|
VIM_PATCHES_VERSION="9.0.1000"
|
||||||
|
|
||||||
LUA_COMPAT=( lua5-{1..4} luajit )
|
LUA_COMPAT=( lua5-{1..4} luajit )
|
||||||
PYTHON_COMPAT=( python3_{9..11} )
|
PYTHON_COMPAT=( python3_{10..11} )
|
||||||
PYTHON_REQ_USE="threads(+)"
|
PYTHON_REQ_USE="threads(+)"
|
||||||
USE_RUBY="ruby27 ruby30 ruby31"
|
USE_RUBY="ruby27 ruby30 ruby31"
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ RDEPEND="
|
|||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
# configure runs the Lua interpreter
|
# configure runs the Lua interpreter
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
sys-devel/autoconf
|
dev-build/autoconf
|
||||||
lua? ( ${LUA_DEPS} )
|
lua? ( ${LUA_DEPS} )
|
||||||
nls? ( sys-devel/gettext )
|
nls? ( sys-devel/gettext )
|
||||||
"
|
"
|
||||||
@ -153,6 +153,11 @@ src_prepare() {
|
|||||||
# (4) Run ./configure (with wrong args) to remake 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"
|
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||||
rm src/auto/configure || die "rm failed"
|
rm src/auto/configure || die "rm failed"
|
||||||
|
|
||||||
|
# bug 908961
|
||||||
|
if use elibc_musl ; then
|
||||||
|
sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
|
Loading…
Reference in New Issue
Block a user