mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 17:11:34 +02:00
app-editors/vim-core: Sync with Gentoo
It's from Gentoo commit 8218305dc9dc0468081f5e0a503ed890a301c8ab.
This commit is contained in:
parent
313be82d70
commit
5667fc9703
@ -1,6 +1,3 @@
|
|||||||
DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
|
|
||||||
DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943
|
|
||||||
DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
|
DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
|
||||||
DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
|
DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
|
||||||
DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
|
|
||||||
DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
|
DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
|
||||||
|
@ -1,28 +0,0 @@
|
|||||||
https://github.com/vim/vim/pull/11496
|
|
||||||
|
|
||||||
From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sam James <sam@gentoo.org>
|
|
||||||
Date: Fri, 4 Nov 2022 03:18:23 +0000
|
|
||||||
Subject: [PATCH] configure.ac: Fix -Wimplicit-int
|
|
||||||
|
|
||||||
Clang 16 makes -Wimplicit-int an error by default. Fixes errors like:
|
|
||||||
```
|
|
||||||
error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-int]
|
|
||||||
```
|
|
||||||
|
|
||||||
We already use proper declarations with every other test anyway, so
|
|
||||||
let's be consistent.
|
|
||||||
|
|
||||||
Signed-off-by: Sam James <sam@gentoo.org>
|
|
||||||
--- a/src/configure.ac
|
|
||||||
+++ b/src/configure.ac
|
|
||||||
@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI only)
|
|
||||||
AC_MSG_CHECKING(for struct sigcontext)
|
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
|
|
||||||
#include <signal.h>
|
|
||||||
-test_sig()
|
|
||||||
+int test_sig()
|
|
||||||
{
|
|
||||||
struct sigcontext *scont;
|
|
||||||
scont = (struct sigcontext *)0;
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
|||||||
From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Varsha Teratipally <teratipally@google.com>
|
|
||||||
Date: Tue, 2 Aug 2022 22:18:29 +0000
|
|
||||||
Subject: [PATCH] Configure check for timer_create may give wrong error.
|
|
||||||
Give a warning instead of an error
|
|
||||||
|
|
||||||
Partial solution from github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c
|
|
||||||
|
|
||||||
---
|
|
||||||
src/configure.ac | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/configure.ac b/src/configure.ac
|
|
||||||
index e8522ec05..41f41dee3 100644
|
|
||||||
--- a/src/configure.ac
|
|
||||||
+++ b/src/configure.ac
|
|
||||||
@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {}
|
|
||||||
])],
|
|
||||||
vim_cv_timer_create=yes,
|
|
||||||
vim_cv_timer_create=no),
|
|
||||||
- AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
|
|
||||||
+ AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create')
|
|
||||||
)]
|
|
||||||
)
|
|
||||||
|
|
||||||
--
|
|
||||||
|
|
||||||
|
|
@ -1,234 +0,0 @@
|
|||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
# Please bump with app-editors/vim and app-editors/gvim
|
|
||||||
|
|
||||||
VIM_VERSION="9.0"
|
|
||||||
inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop 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-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
|
|
||||||
S="${WORKDIR}/vim-${PV}"
|
|
||||||
|
|
||||||
DESCRIPTION="vim and gvim shared files"
|
|
||||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
|
||||||
|
|
||||||
LICENSE="vim"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="nls acl minimal"
|
|
||||||
|
|
||||||
# ncurses is only needed by ./configure, so no subslot operator required
|
|
||||||
DEPEND=">=sys-libs/ncurses-5.2-r2:0"
|
|
||||||
BDEPEND="sys-devel/autoconf"
|
|
||||||
# Avoid icon file collision, bug #673880
|
|
||||||
RDEPEND="!<app-editors/vim-8.2.4328-r1"
|
|
||||||
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
# people with broken alphabets run into trouble. bug #82186.
|
|
||||||
unset LANG LC_ALL
|
|
||||||
export LC_COLLATE="C"
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
eapply "${FILESDIR}"/vim-9.0-fix-create-timer-for-cros-compiling.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Fixup a script to use awk instead of nawk
|
|
||||||
sed -i \
|
|
||||||
-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
|
||||||
"${S}"/runtime/tools/mve.awk || die "sed failed"
|
|
||||||
|
|
||||||
# See bug #77841. We remove this file after the tarball extraction.
|
|
||||||
rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
|
|
||||||
|
|
||||||
# Read vimrc and gvimrc from /etc/vim
|
|
||||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die
|
|
||||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die
|
|
||||||
|
|
||||||
# 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 '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'
|
|
||||||
|
|
||||||
# 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 '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
|
|
||||||
# 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 "sed failed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
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
|
|
||||||
sed -i -e \
|
|
||||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
|
||||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# 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"
|
|
||||||
|
|
||||||
# Remove src/auto/configure file.
|
|
||||||
rm -v src/auto/configure || die "rm configure failed"
|
|
||||||
|
|
||||||
eapply_user
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
emake -j1 -C src autoconf
|
|
||||||
|
|
||||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
|
||||||
# things are for ppc64, see bug 86433.
|
|
||||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
|
||||||
if [[ -e "${file}" ]]; then
|
|
||||||
addwrite ${file}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Let Portage do the stripping. Some people like that.
|
|
||||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
|
||||||
|
|
||||||
local myconf=(
|
|
||||||
--with-modified-by=Gentoo-${PVR}
|
|
||||||
--enable-gui=no
|
|
||||||
--without-x
|
|
||||||
--disable-darwin
|
|
||||||
--disable-perlinterp
|
|
||||||
--disable-pythoninterp
|
|
||||||
--disable-rubyinterp
|
|
||||||
--disable-gpm
|
|
||||||
--disable-selinux
|
|
||||||
$(use_enable nls)
|
|
||||||
$(use_enable acl)
|
|
||||||
)
|
|
||||||
|
|
||||||
# Keep Gentoo 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 "${myconf[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake -j1 -C src auto/osdef.h objects
|
|
||||||
emake tools
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() { :; }
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
|
||||||
|
|
||||||
dodir /usr/{bin,share/{man/man1,vim}}
|
|
||||||
emake -C src \
|
|
||||||
installruntime \
|
|
||||||
installmanlinks \
|
|
||||||
installmacros \
|
|
||||||
installtutor \
|
|
||||||
installtutorbin \
|
|
||||||
installtools \
|
|
||||||
install-languages \
|
|
||||||
DESTDIR="${D}" \
|
|
||||||
BINDIR="${EPREFIX}"/usr/bin \
|
|
||||||
MANDIR="${EPREFIX}"/usr/share/man \
|
|
||||||
DATADIR="${EPREFIX}"/usr/share
|
|
||||||
|
|
||||||
keepdir ${vimfiles}/keymap
|
|
||||||
|
|
||||||
# default vimrc is installed by vim-core since it applies to
|
|
||||||
# both vim and gvim
|
|
||||||
insinto /etc/vim/
|
|
||||||
newins "${FILESDIR}"/vimrc-r6 vimrc
|
|
||||||
eprefixify "${ED}"/etc/vim/vimrc
|
|
||||||
|
|
||||||
if use minimal; then
|
|
||||||
# To save space, install only a subset of the files.
|
|
||||||
# Helps minimalize the livecd, bug 65144.
|
|
||||||
rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
|
|
||||||
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
|
|
||||||
rm -v "${ED}"/usr/bin/vimtutor || die
|
|
||||||
|
|
||||||
for f in "${ED}${vimfiles}"/colors/*.vim; do
|
|
||||||
if [[ ${f} != */@(default).vim ]] ; then
|
|
||||||
printf '%s\0' "${f}"
|
|
||||||
fi
|
|
||||||
done | xargs -0 rm -f || die
|
|
||||||
|
|
||||||
for f in "${ED}${vimfiles}"/syntax/*.vim; do
|
|
||||||
if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
|
|
||||||
printf '%s\0' "${f}"
|
|
||||||
fi
|
|
||||||
done | xargs -0 rm -f || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
newbashcomp "${FILESDIR}"/xxd-completion xxd
|
|
||||||
|
|
||||||
# install gvim icon since both vim/gvim desktop files reference it
|
|
||||||
doicon -s scalable "${FILESDIR}"/gvim.svg
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
# update documentation tags (from vim-doc.eclass)
|
|
||||||
update_vim_helptags
|
|
||||||
|
|
||||||
# update icon cache
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
# Update documentation tags (from vim-doc.eclass)
|
|
||||||
update_vim_helptags
|
|
||||||
|
|
||||||
# update icon cache
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
@ -1,234 +0,0 @@
|
|||||||
# Copyright 1999-2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
# Please bump with app-editors/vim and app-editors/gvim
|
|
||||||
|
|
||||||
VIM_VERSION="9.0"
|
|
||||||
inherit bash-completion-r1 desktop flag-o-matic prefix 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-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
|
|
||||||
S="${WORKDIR}/vim-${PV}"
|
|
||||||
|
|
||||||
DESCRIPTION="vim and gvim shared files"
|
|
||||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
|
||||||
|
|
||||||
LICENSE="vim"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="nls acl minimal"
|
|
||||||
|
|
||||||
# ncurses is only needed by ./configure, so no subslot operator required
|
|
||||||
DEPEND=">=sys-libs/ncurses-5.2-r2:0"
|
|
||||||
BDEPEND="sys-devel/autoconf"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/vim-0.0.0828-configure-clang16.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
# people with broken alphabets run into trouble. bug #82186.
|
|
||||||
unset LANG LC_ALL
|
|
||||||
export LC_COLLATE="C"
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
# Fixup a script to use awk instead of nawk
|
|
||||||
sed -i \
|
|
||||||
-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
|
||||||
"${S}"/runtime/tools/mve.awk || die "sed failed"
|
|
||||||
|
|
||||||
# See bug #77841. We remove this file after the tarball extraction.
|
|
||||||
rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
|
|
||||||
|
|
||||||
# Read vimrc and gvimrc from /etc/vim
|
|
||||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die
|
|
||||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die
|
|
||||||
|
|
||||||
# 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 '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'
|
|
||||||
|
|
||||||
# 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 '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
|
|
||||||
# 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 "sed failed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
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
|
|
||||||
sed -i -e \
|
|
||||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
|
||||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# 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"
|
|
||||||
|
|
||||||
# Remove src/auto/configure file.
|
|
||||||
rm -v src/auto/configure || die "rm configure failed"
|
|
||||||
|
|
||||||
eapply_user
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
emake -j1 -C src autoconf
|
|
||||||
|
|
||||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
|
||||||
# things are for ppc64, see bug 86433.
|
|
||||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
|
||||||
if [[ -e "${file}" ]]; then
|
|
||||||
addwrite ${file}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Let Portage do the stripping. Some people like that.
|
|
||||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
|
||||||
|
|
||||||
local myconf=(
|
|
||||||
--with-modified-by=Gentoo-${PVR}
|
|
||||||
--enable-gui=no
|
|
||||||
--without-x
|
|
||||||
--disable-darwin
|
|
||||||
--disable-perlinterp
|
|
||||||
--disable-pythoninterp
|
|
||||||
--disable-rubyinterp
|
|
||||||
--disable-gpm
|
|
||||||
--disable-selinux
|
|
||||||
$(use_enable nls)
|
|
||||||
$(use_enable acl)
|
|
||||||
)
|
|
||||||
|
|
||||||
# Keep Gentoo 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 "${myconf[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake -j1 -C src auto/osdef.h objects
|
|
||||||
emake tools
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() { :; }
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
|
||||||
|
|
||||||
dodir /usr/{bin,share/{man/man1,vim}}
|
|
||||||
emake -C src \
|
|
||||||
installruntime \
|
|
||||||
installmanlinks \
|
|
||||||
installmacros \
|
|
||||||
installtutor \
|
|
||||||
installtutorbin \
|
|
||||||
installtools \
|
|
||||||
install-languages \
|
|
||||||
DESTDIR="${D}" \
|
|
||||||
BINDIR="${EPREFIX}"/usr/bin \
|
|
||||||
MANDIR="${EPREFIX}"/usr/share/man \
|
|
||||||
DATADIR="${EPREFIX}"/usr/share
|
|
||||||
|
|
||||||
keepdir ${vimfiles}/keymap
|
|
||||||
|
|
||||||
# default vimrc is installed by vim-core since it applies to
|
|
||||||
# both vim and gvim
|
|
||||||
insinto /etc/vim/
|
|
||||||
newins "${FILESDIR}"/vimrc-r6 vimrc
|
|
||||||
eprefixify "${ED}"/etc/vim/vimrc
|
|
||||||
|
|
||||||
if use minimal; then
|
|
||||||
# To save space, install only a subset of the files.
|
|
||||||
# Helps minimalize the livecd, bug 65144.
|
|
||||||
rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
|
|
||||||
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
|
|
||||||
rm -v "${ED}"/usr/bin/vimtutor || die
|
|
||||||
|
|
||||||
for f in "${ED}${vimfiles}"/colors/*.vim; do
|
|
||||||
if [[ ${f} != */@(default).vim ]] ; then
|
|
||||||
printf '%s\0' "${f}"
|
|
||||||
fi
|
|
||||||
done | xargs -0 rm -f || die
|
|
||||||
|
|
||||||
for f in "${ED}${vimfiles}"/syntax/*.vim; do
|
|
||||||
if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
|
|
||||||
printf '%s\0' "${f}"
|
|
||||||
fi
|
|
||||||
done | xargs -0 rm -f || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
newbashcomp "${FILESDIR}"/xxd-completion xxd
|
|
||||||
|
|
||||||
# install gvim icon since both vim/gvim desktop files reference it
|
|
||||||
doicon -s scalable "${FILESDIR}"/gvim.svg
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
# update documentation tags (from vim-doc.eclass)
|
|
||||||
update_vim_helptags
|
|
||||||
|
|
||||||
# update icon cache
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
# Update documentation tags (from vim-doc.eclass)
|
|
||||||
update_vim_helptags
|
|
||||||
|
|
||||||
# update icon cache
|
|
||||||
xdg_icon_cache_update
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user