Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/
Date: Sun, 29 Dec 2019 18:17:49
Message-Id: 1577643458.1294505e626a8ed18960aceb6834b76d2cebb77b.zlogene@gentoo
1 commit: 1294505e626a8ed18960aceb6834b76d2cebb77b
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 29 18:15:42 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 29 18:17:38 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1294505e
7
8 app-editors/vim-core: Version bump (v8.2.0055)
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.16
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 app-editors/vim-core/Manifest | 1 +
14 app-editors/vim-core/vim-core-8.2.0055.ebuild | 225 ++++++++++++++++++++++++++
15 2 files changed, 226 insertions(+)
16
17 diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
18 index 88f7734b453..878da4cc54d 100644
19 --- a/app-editors/vim-core/Manifest
20 +++ b/app-editors/vim-core/Manifest
21 @@ -1,3 +1,4 @@
22 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
23 DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
24 DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
25 +DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
26
27 diff --git a/app-editors/vim-core/vim-core-8.2.0055.ebuild b/app-editors/vim-core/vim-core-8.2.0055.ebuild
28 new file mode 100644
29 index 00000000000..b12aef7dde9
30 --- /dev/null
31 +++ b/app-editors/vim-core/vim-core-8.2.0055.ebuild
32 @@ -0,0 +1,225 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=6
37 +VIM_VERSION="8.1"
38 +inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
39 +
40 +if [[ ${PV} == 9999* ]] ; then
41 + inherit git-r3
42 + EGIT_REPO_URI="https://github.com/vim/vim.git"
43 + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
44 +else
45 + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
46 + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
47 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
48 +fi
49 +
50 +DESCRIPTION="vim and gvim shared files"
51 +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
52 +
53 +SLOT="0"
54 +LICENSE="vim"
55 +IUSE="nls acl minimal"
56 +
57 +DEPEND="sys-devel/autoconf"
58 +# avoid icon file collision bug #673880
59 +RDEPEND="!!<app-editors/gvim-8.1.0648"
60 +PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
61 +
62 +S=${WORKDIR}/vim-${PV}
63 +
64 +pkg_setup() {
65 + # people with broken alphabets run into trouble. bug 82186.
66 + unset LANG LC_ALL
67 + export LC_COLLATE="C"
68 +
69 + # Gnome sandbox silliness. bug #114475.
70 + mkdir -p "${T}"/home || die "mkdir -p failed"
71 + export HOME="${T}"/home
72 +}
73 +
74 +src_prepare() {
75 + if [[ ${PV} != 9999* ]] ; then
76 + # Gentoo patches to fix runtime issues, cross-compile errors, etc
77 + eapply "${WORKDIR}"/patches
78 + fi
79 +
80 + # Fixup a script to use awk instead of nawk
81 + sed -i \
82 + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
83 + "${S}"/runtime/tools/mve.awk || die "sed failed"
84 +
85 + # See #77841. We remove this file after the tarball extraction.
86 + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
87 +
88 + # Read vimrc and gvimrc from /etc/vim
89 + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
90 + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
91 +
92 + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
93 + # Hopefully this pattern won't break for a while at least.
94 + # This fixes bug 29398 (27 Sep 2003 agriffis)
95 + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
96 + "${S}"/runtime/doc/syntax.txt \
97 + "${S}"/runtime/doc/tagsrch.txt \
98 + "${S}"/runtime/doc/usr_29.txt \
99 + "${S}"/runtime/menu.vim \
100 + "${S}"/src/configure.ac || die 'sed failed'
101 +
102 + # Don't be fooled by /usr/include/libc.h. When found, vim thinks
103 + # this is NeXT, but it's actually just a file in dev-libs/9libs
104 + # This fixes bug 43885 (20 Mar 2004 agriffis)
105 + sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
106 +
107 + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
108 + # correctly. To avoid some really entertaining error messages about stuff
109 + # which isn't even in the source file being invalid, we'll do some trickery
110 + # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
111 + find "${S}" -name '*.c' | while read c; do
112 + echo >> "$c" || die "echo failed"
113 + done
114 +
115 + # Try to avoid sandbox problems. Bug #114475.
116 + if [[ -d "${S}"/src/po ]]; then
117 + sed -i -e \
118 + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
119 + "${S}"/src/po/Makefile || die "sed failed"
120 + fi
121 +
122 + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
123 +
124 + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
125 + sed -i -e \
126 + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
127 + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
128 +
129 + eapply_user
130 +}
131 +
132 +src_configure() {
133 + local myconf
134 +
135 + # Fix bug 37354: Disallow -funroll-all-loops on amd64
136 + # Bug 57859 suggests that we want to do this for all archs
137 + filter-flags -funroll-all-loops
138 +
139 + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
140 + # everyone since previous flag filtering bugs have turned out to affect
141 + # multiple archs...
142 + replace-flags -O3 -O2
143 +
144 + # Fix bug 18245: Prevent "make" from the following chain:
145 + # (1) Notice configure.ac is newer than auto/configure
146 + # (2) Rebuild auto/configure
147 + # (3) Notice auto/configure is newer than auto/config.mk
148 + # (4) Run ./configure (with wrong args) to remake auto/config.mk
149 + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
150 +
151 + # Remove src/auto/configure file.
152 + rm -v src/auto/configure || die "rm configure failed"
153 +
154 + emake -j1 -C src autoconf
155 +
156 + # This should fix a sandbox violation (see bug 24447). The hvc
157 + # things are for ppc64, see bug 86433.
158 + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
159 + if [[ -e "${file}" ]]; then
160 + addwrite $file
161 + fi
162 + done
163 +
164 + # Let Portage do the stripping. Some people like that.
165 + export ac_cv_prog_STRIP="$(type -P true ) faking strip"
166 +
167 + # Keep Gentoo Prefix env contained within the EPREFIX
168 + use prefix && myconf+=" --without-local-dir"
169 +
170 + econf \
171 + --with-modified-by=Gentoo-${PVR} \
172 + --enable-gui=no \
173 + --without-x \
174 + --disable-darwin \
175 + --disable-perlinterp \
176 + --disable-pythoninterp \
177 + --disable-rubyinterp \
178 + --disable-gpm \
179 + --disable-selinux \
180 + $(use_enable nls) \
181 + $(use_enable acl) \
182 + ${myconf}
183 +}
184 +
185 +src_compile() {
186 + emake -j1 -C src auto/osdef.h objects
187 + emake tools
188 +}
189 +
190 +src_test() { :; }
191 +
192 +src_install() {
193 + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
194 +
195 + dodir /usr/{bin,share/{man/man1,vim}}
196 + emake -C src \
197 + installruntime \
198 + installmanlinks \
199 + installmacros \
200 + installtutor \
201 + installtutorbin \
202 + installtools \
203 + install-languages \
204 + DESTDIR="${D}" \
205 + BINDIR="${EPREFIX}"/usr/bin \
206 + MANDIR="${EPREFIX}"/usr/share/man \
207 + DATADIR="${EPREFIX}"/usr/share
208 +
209 + keepdir ${vimfiles}/keymap
210 +
211 + # default vimrc is installed by vim-core since it applies to
212 + # both vim and gvim
213 + insinto /etc/vim/
214 + newins "${FILESDIR}"/vimrc-r5 vimrc
215 + eprefixify "${ED}"/etc/vim/vimrc
216 +
217 + if use minimal; then
218 + # To save space, install only a subset of the files.
219 + # Helps minimalize the livecd, bug 65144.
220 + eshopts_push -s extglob
221 +
222 + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
223 + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
224 + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
225 +
226 + local keep_colors="default"
227 + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
228 +
229 + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
230 + # tinkering with the next line might make bad things happen ...
231 + keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
232 + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
233 +
234 + eshopts_pop
235 + fi
236 +
237 + newbashcomp "${FILESDIR}"/xxd-completion xxd
238 +
239 + # install gvim icon since both vim/gvim desktop files reference it
240 + doicon -s scalable "${FILESDIR}"/gvim.svg
241 +}
242 +
243 +pkg_postinst() {
244 + # update documentation tags (from vim-doc.eclass)
245 + update_vim_helptags
246 +
247 + # update icon cache
248 + gnome2_icon_cache_update
249 +}
250 +
251 +pkg_postrm() {
252 + # Update documentation tags (from vim-doc.eclass)
253 + update_vim_helptags
254 +
255 + # update icon cache
256 + gnome2_icon_cache_update
257 +}