Gentoo Archives: gentoo-commits

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