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: Wed, 15 Nov 2017 03:57:48
Message-Id: 1510718073.0247fbda728a6e7cb3163210127651ee7a88046d.radhermit@gentoo
1 commit: 0247fbda728a6e7cb3163210127651ee7a88046d
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 15 03:54:33 2017 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 15 03:54:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0247fbda
7
8 app-editors/vim-core: remove old
9
10 app-editors/vim-core/Manifest | 3 -
11 app-editors/vim-core/vim-core-8.0.0938.ebuild | 217 --------------------------
12 app-editors/vim-core/vim-core-8.0.0983.ebuild | 217 --------------------------
13 app-editors/vim-core/vim-core-8.0.1056.ebuild | 217 --------------------------
14 4 files changed, 654 deletions(-)
15
16 diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
17 index cbc6f49ed75..510dd0337d1 100644
18 --- a/app-editors/vim-core/Manifest
19 +++ b/app-editors/vim-core/Manifest
20 @@ -1,8 +1,5 @@
21 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b
22 DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b
23 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 SHA256 851418dbbbac25e581eeb44a24e62f8841a7df33f436d1986dd7332fb5d07c60 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b WHIRLPOOL 8521b344426b5d2b246ddab7768eae45e0ee54ef58085099f9e15575e7854eb461fbcf0093caee1326e29d2425c2d451de36812cda24fa767709fc5d6046236c
24 -DIST vim-8.0.0938.tar.gz 13287289 SHA256 7a07fb164069ce82e5c90ff3831b6f3249e09193800f76d9c576867a63828071 SHA512 be4b6a29ace6a708cd7d0d3a3585cd3b88056e49f3869e18c6b895272e4ec01a8a7a68695ec2f885dd1fc139ae022a3f1b2d2d11e8b883362b9683cf5a8b0cd3 WHIRLPOOL 5098cf73f8b294686888c8b5a31199044ec1f409cc9c3de39e96911f688374282716a3137827e260c97e688bb42e79a77c53a29fa7d3364ce2c3375c2257b309
25 -DIST vim-8.0.0983.tar.gz 13292263 SHA256 5f3d5307d7055e3a55811546f6c787f1c65d209ae5b83e36c0de16d64fda8bf2 SHA512 985cdcf134c3513a973b4c91a899684a563fca4c347afba2d51892d737c8b58a2008bbf8573a98838da6df16552096e437a5064dc2ef653c7222bbac59ce6136 WHIRLPOOL 98a1ed102182f07e1dc2105b9bae73e1f6c0f7522b25ab91aba4767a3c9d805082a89bd964ab6441fb4185f4076b046a25ca92bf08f0446e4d2a53b0298bb3e0
26 -DIST vim-8.0.1056.tar.gz 13309986 SHA256 c061d1ddc0f4001415e68678780eac7121d08877a852fae484e6a93f633aec0c SHA512 19385736d4d97a66a2fb3fd8ce725d42c435da09a41e8b40234048626b28d2fa96c4db96a4313bd30f1c2d3733c52097e147c90e4bc11be80d3fcbf12fa4d13b WHIRLPOOL d81b3166f028867ebf48d43bf249675f16cda0118a2e443606a8cae01b0932d3f8a29ca568d088953d4b9d8afe8299ac207d0213ad247e1c10b9c52ed18514e1
27 DIST vim-8.0.1188.tar.gz 13363260 SHA256 cd92e56493584128bff13d3104631d3d38e66264101a3c5d59e2488f74f738de SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b WHIRLPOOL 7b19600f086d2f2908fbee5c44876a1775881d9a1cbb54428d4d1db254d14cdbcfe243fe055a754f58027c0166f7dcb1dd13b4db5662793bb7fc014bd76ea504
28 DIST vim-8.0.1298.tar.gz 13395459 SHA256 5126240843b559251fe6a96d4ce7e1dd3d1de9bcb38556dd9fe63b163629fdf2 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 WHIRLPOOL dbb1f136091ad63b78e7e26ed2ca9d5045b966fe8d7caaeace981c789d679070323a4a345d750e037aa9e0489cf7bd1769f17ac1d590f0624e50dc3276b6a84f
29
30 diff --git a/app-editors/vim-core/vim-core-8.0.0938.ebuild b/app-editors/vim-core/vim-core-8.0.0938.ebuild
31 deleted file mode 100644
32 index 15a9ee34065..00000000000
33 --- a/app-editors/vim-core/vim-core-8.0.0938.ebuild
34 +++ /dev/null
35 @@ -1,217 +0,0 @@
36 -# Copyright 1999-2017 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -VIM_VERSION="8.0"
41 -inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
42 -
43 -if [[ ${PV} == 9999* ]] ; then
44 - inherit git-r3
45 - EGIT_REPO_URI="https://github.com/vim/vim.git"
46 - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
47 -else
48 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
49 - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
50 - 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"
51 -fi
52 -
53 -DESCRIPTION="vim and gvim shared files"
54 -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
55 -
56 -SLOT="0"
57 -LICENSE="vim"
58 -IUSE="nls acl minimal"
59 -
60 -DEPEND="sys-devel/autoconf"
61 -PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
62 -
63 -S=${WORKDIR}/vim-${PV}
64 -
65 -pkg_setup() {
66 - # people with broken alphabets run into trouble. bug 82186.
67 - unset LANG LC_ALL
68 - export LC_COLLATE="C"
69 -
70 - # Gnome sandbox silliness. bug #114475.
71 - mkdir -p "${T}"/home
72 - export HOME="${T}"/home
73 -}
74 -
75 -src_prepare() {
76 - if [[ ${PV} != 9999* ]] ; then
77 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
78 - eapply "${WORKDIR}"/patches
79 - fi
80 -
81 - # Fixup a script to use awk instead of nawk
82 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
83 - || die "mve.awk sed failed"
84 -
85 - # Read vimrc and gvimrc from /etc/vim
86 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
87 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
88 -
89 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
90 - # Hopefully this pattern won't break for a while at least.
91 - # This fixes bug 29398 (27 Sep 2003 agriffis)
92 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
93 - "${S}"/runtime/doc/syntax.txt \
94 - "${S}"/runtime/doc/tagsrch.txt \
95 - "${S}"/runtime/doc/usr_29.txt \
96 - "${S}"/runtime/menu.vim \
97 - "${S}"/src/configure.ac || die 'sed failed'
98 -
99 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
100 - # this is NeXT, but it's actually just a file in dev-libs/9libs
101 - # This fixes bug 43885 (20 Mar 2004 agriffis)
102 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
103 -
104 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
105 - # correctly. To avoid some really entertaining error messages about stuff
106 - # which isn't even in the source file being invalid, we'll do some trickery
107 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
108 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; 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
115 - fi
116 -
117 - if version_is_at_least 7.3.122 ; then
118 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
119 - fi
120 -
121 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
122 - if version_is_at_least 7.3 ; then
123 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
124 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
125 - fi
126 -
127 - eapply_user
128 -}
129 -
130 -src_configure() {
131 - local myconf
132 -
133 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
134 - # Bug 57859 suggests that we want to do this for all archs
135 - filter-flags -funroll-all-loops
136 -
137 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
138 - # everyone since previous flag filtering bugs have turned out to affect
139 - # multiple archs...
140 - replace-flags -O3 -O2
141 -
142 - # Fix bug 18245: Prevent "make" from the following chain:
143 - # (1) Notice configure.ac is newer than auto/configure
144 - # (2) Rebuild auto/configure
145 - # (3) Notice auto/configure is newer than auto/config.mk
146 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
147 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
148 - rm -f src/auto/configure
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 - [[ -e ${file} ]] && addwrite $file
155 - done
156 -
157 - # Let Portage do the stripping. Some people like that.
158 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
159 -
160 - # Keep Gentoo Prefix env contained within the EPREFIX
161 - use prefix && myconf+=" --without-local-dir"
162 -
163 - econf \
164 - --with-modified-by=Gentoo-${PVR} \
165 - --enable-gui=no \
166 - --without-x \
167 - --disable-darwin \
168 - --disable-perlinterp \
169 - --disable-pythoninterp \
170 - --disable-rubyinterp \
171 - --disable-gpm \
172 - --disable-selinux \
173 - $(use_enable nls) \
174 - $(use_enable acl) \
175 - ${myconf}
176 -}
177 -
178 -src_compile() {
179 - # The following allows emake to be used
180 - emake -j1 -C src auto/osdef.h objects
181 -
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 -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
218 - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
219 - rm "${ED}"/usr/bin/vimtutor
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 - # These files might have slight security issues, so we won't
233 - # install them. See bug #77841. We don't mind if these don't
234 - # exist.
235 - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
236 -
237 - newbashcomp "${FILESDIR}"/xxd-completion xxd
238 -
239 - # We shouldn't be installing the ex or view man page symlinks, as they
240 - # are managed by eselect-vi
241 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
242 -}
243 -
244 -pkg_postinst() {
245 - # Update documentation tags (from vim-doc.eclass)
246 - update_vim_helptags
247 -}
248 -
249 -pkg_postrm() {
250 - # Update documentation tags (from vim-doc.eclass)
251 - update_vim_helptags
252 -}
253
254 diff --git a/app-editors/vim-core/vim-core-8.0.0983.ebuild b/app-editors/vim-core/vim-core-8.0.0983.ebuild
255 deleted file mode 100644
256 index a009ebab1f3..00000000000
257 --- a/app-editors/vim-core/vim-core-8.0.0983.ebuild
258 +++ /dev/null
259 @@ -1,217 +0,0 @@
260 -# Copyright 1999-2017 Gentoo Foundation
261 -# Distributed under the terms of the GNU General Public License v2
262 -
263 -EAPI=6
264 -VIM_VERSION="8.0"
265 -inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
266 -
267 -if [[ ${PV} == 9999* ]] ; then
268 - inherit git-r3
269 - EGIT_REPO_URI="https://github.com/vim/vim.git"
270 - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
271 -else
272 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
273 - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
274 - 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"
275 -fi
276 -
277 -DESCRIPTION="vim and gvim shared files"
278 -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
279 -
280 -SLOT="0"
281 -LICENSE="vim"
282 -IUSE="nls acl minimal"
283 -
284 -DEPEND="sys-devel/autoconf"
285 -PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
286 -
287 -S=${WORKDIR}/vim-${PV}
288 -
289 -pkg_setup() {
290 - # people with broken alphabets run into trouble. bug 82186.
291 - unset LANG LC_ALL
292 - export LC_COLLATE="C"
293 -
294 - # Gnome sandbox silliness. bug #114475.
295 - mkdir -p "${T}"/home
296 - export HOME="${T}"/home
297 -}
298 -
299 -src_prepare() {
300 - if [[ ${PV} != 9999* ]] ; then
301 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
302 - eapply "${WORKDIR}"/patches
303 - fi
304 -
305 - # Fixup a script to use awk instead of nawk
306 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
307 - || die "mve.awk sed failed"
308 -
309 - # Read vimrc and gvimrc from /etc/vim
310 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
311 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
312 -
313 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
314 - # Hopefully this pattern won't break for a while at least.
315 - # This fixes bug 29398 (27 Sep 2003 agriffis)
316 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
317 - "${S}"/runtime/doc/syntax.txt \
318 - "${S}"/runtime/doc/tagsrch.txt \
319 - "${S}"/runtime/doc/usr_29.txt \
320 - "${S}"/runtime/menu.vim \
321 - "${S}"/src/configure.ac || die 'sed failed'
322 -
323 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
324 - # this is NeXT, but it's actually just a file in dev-libs/9libs
325 - # This fixes bug 43885 (20 Mar 2004 agriffis)
326 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
327 -
328 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
329 - # correctly. To avoid some really entertaining error messages about stuff
330 - # which isn't even in the source file being invalid, we'll do some trickery
331 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
332 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
333 -
334 - # Try to avoid sandbox problems. Bug #114475.
335 - if [[ -d "${S}"/src/po ]] ; then
336 - sed -i -e \
337 - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
338 - "${S}"/src/po/Makefile
339 - fi
340 -
341 - if version_is_at_least 7.3.122 ; then
342 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
343 - fi
344 -
345 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
346 - if version_is_at_least 7.3 ; then
347 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
348 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
349 - fi
350 -
351 - eapply_user
352 -}
353 -
354 -src_configure() {
355 - local myconf
356 -
357 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
358 - # Bug 57859 suggests that we want to do this for all archs
359 - filter-flags -funroll-all-loops
360 -
361 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
362 - # everyone since previous flag filtering bugs have turned out to affect
363 - # multiple archs...
364 - replace-flags -O3 -O2
365 -
366 - # Fix bug 18245: Prevent "make" from the following chain:
367 - # (1) Notice configure.ac is newer than auto/configure
368 - # (2) Rebuild auto/configure
369 - # (3) Notice auto/configure is newer than auto/config.mk
370 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
371 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
372 - rm -f src/auto/configure
373 - emake -j1 -C src autoconf
374 -
375 - # This should fix a sandbox violation (see bug 24447). The hvc
376 - # things are for ppc64, see bug 86433.
377 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
378 - [[ -e ${file} ]] && addwrite $file
379 - done
380 -
381 - # Let Portage do the stripping. Some people like that.
382 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
383 -
384 - # Keep Gentoo Prefix env contained within the EPREFIX
385 - use prefix && myconf+=" --without-local-dir"
386 -
387 - econf \
388 - --with-modified-by=Gentoo-${PVR} \
389 - --enable-gui=no \
390 - --without-x \
391 - --disable-darwin \
392 - --disable-perlinterp \
393 - --disable-pythoninterp \
394 - --disable-rubyinterp \
395 - --disable-gpm \
396 - --disable-selinux \
397 - $(use_enable nls) \
398 - $(use_enable acl) \
399 - ${myconf}
400 -}
401 -
402 -src_compile() {
403 - # The following allows emake to be used
404 - emake -j1 -C src auto/osdef.h objects
405 -
406 - emake tools
407 -}
408 -
409 -src_test() { :; }
410 -
411 -src_install() {
412 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
413 -
414 - dodir /usr/{bin,share/{man/man1,vim}}
415 - emake -C src \
416 - installruntime \
417 - installmanlinks \
418 - installmacros \
419 - installtutor \
420 - installtutorbin \
421 - installtools \
422 - install-languages \
423 - DESTDIR="${D}" \
424 - BINDIR="${EPREFIX}"/usr/bin \
425 - MANDIR="${EPREFIX}"/usr/share/man \
426 - DATADIR="${EPREFIX}"/usr/share
427 -
428 - keepdir ${vimfiles}/keymap
429 -
430 - # default vimrc is installed by vim-core since it applies to
431 - # both vim and gvim
432 - insinto /etc/vim/
433 - newins "${FILESDIR}"/vimrc-r5 vimrc
434 - eprefixify "${ED}"/etc/vim/vimrc
435 -
436 - if use minimal ; then
437 - # To save space, install only a subset of the files.
438 - # Helps minimalize the livecd, bug 65144.
439 - eshopts_push -s extglob
440 -
441 - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
442 - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
443 - rm "${ED}"/usr/bin/vimtutor
444 -
445 - local keep_colors="default"
446 - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
447 -
448 - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
449 - # tinkering with the next line might make bad things happen ...
450 - keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
451 - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
452 -
453 - eshopts_pop
454 - fi
455 -
456 - # These files might have slight security issues, so we won't
457 - # install them. See bug #77841. We don't mind if these don't
458 - # exist.
459 - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
460 -
461 - newbashcomp "${FILESDIR}"/xxd-completion xxd
462 -
463 - # We shouldn't be installing the ex or view man page symlinks, as they
464 - # are managed by eselect-vi
465 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
466 -}
467 -
468 -pkg_postinst() {
469 - # Update documentation tags (from vim-doc.eclass)
470 - update_vim_helptags
471 -}
472 -
473 -pkg_postrm() {
474 - # Update documentation tags (from vim-doc.eclass)
475 - update_vim_helptags
476 -}
477
478 diff --git a/app-editors/vim-core/vim-core-8.0.1056.ebuild b/app-editors/vim-core/vim-core-8.0.1056.ebuild
479 deleted file mode 100644
480 index a009ebab1f3..00000000000
481 --- a/app-editors/vim-core/vim-core-8.0.1056.ebuild
482 +++ /dev/null
483 @@ -1,217 +0,0 @@
484 -# Copyright 1999-2017 Gentoo Foundation
485 -# Distributed under the terms of the GNU General Public License v2
486 -
487 -EAPI=6
488 -VIM_VERSION="8.0"
489 -inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
490 -
491 -if [[ ${PV} == 9999* ]] ; then
492 - inherit git-r3
493 - EGIT_REPO_URI="https://github.com/vim/vim.git"
494 - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
495 -else
496 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
497 - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
498 - 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"
499 -fi
500 -
501 -DESCRIPTION="vim and gvim shared files"
502 -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
503 -
504 -SLOT="0"
505 -LICENSE="vim"
506 -IUSE="nls acl minimal"
507 -
508 -DEPEND="sys-devel/autoconf"
509 -PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
510 -
511 -S=${WORKDIR}/vim-${PV}
512 -
513 -pkg_setup() {
514 - # people with broken alphabets run into trouble. bug 82186.
515 - unset LANG LC_ALL
516 - export LC_COLLATE="C"
517 -
518 - # Gnome sandbox silliness. bug #114475.
519 - mkdir -p "${T}"/home
520 - export HOME="${T}"/home
521 -}
522 -
523 -src_prepare() {
524 - if [[ ${PV} != 9999* ]] ; then
525 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
526 - eapply "${WORKDIR}"/patches
527 - fi
528 -
529 - # Fixup a script to use awk instead of nawk
530 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
531 - || die "mve.awk sed failed"
532 -
533 - # Read vimrc and gvimrc from /etc/vim
534 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
535 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
536 -
537 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
538 - # Hopefully this pattern won't break for a while at least.
539 - # This fixes bug 29398 (27 Sep 2003 agriffis)
540 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
541 - "${S}"/runtime/doc/syntax.txt \
542 - "${S}"/runtime/doc/tagsrch.txt \
543 - "${S}"/runtime/doc/usr_29.txt \
544 - "${S}"/runtime/menu.vim \
545 - "${S}"/src/configure.ac || die 'sed failed'
546 -
547 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
548 - # this is NeXT, but it's actually just a file in dev-libs/9libs
549 - # This fixes bug 43885 (20 Mar 2004 agriffis)
550 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
551 -
552 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
553 - # correctly. To avoid some really entertaining error messages about stuff
554 - # which isn't even in the source file being invalid, we'll do some trickery
555 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
556 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
557 -
558 - # Try to avoid sandbox problems. Bug #114475.
559 - if [[ -d "${S}"/src/po ]] ; then
560 - sed -i -e \
561 - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
562 - "${S}"/src/po/Makefile
563 - fi
564 -
565 - if version_is_at_least 7.3.122 ; then
566 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
567 - fi
568 -
569 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
570 - if version_is_at_least 7.3 ; then
571 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
572 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
573 - fi
574 -
575 - eapply_user
576 -}
577 -
578 -src_configure() {
579 - local myconf
580 -
581 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
582 - # Bug 57859 suggests that we want to do this for all archs
583 - filter-flags -funroll-all-loops
584 -
585 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
586 - # everyone since previous flag filtering bugs have turned out to affect
587 - # multiple archs...
588 - replace-flags -O3 -O2
589 -
590 - # Fix bug 18245: Prevent "make" from the following chain:
591 - # (1) Notice configure.ac is newer than auto/configure
592 - # (2) Rebuild auto/configure
593 - # (3) Notice auto/configure is newer than auto/config.mk
594 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
595 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
596 - rm -f src/auto/configure
597 - emake -j1 -C src autoconf
598 -
599 - # This should fix a sandbox violation (see bug 24447). The hvc
600 - # things are for ppc64, see bug 86433.
601 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
602 - [[ -e ${file} ]] && addwrite $file
603 - done
604 -
605 - # Let Portage do the stripping. Some people like that.
606 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
607 -
608 - # Keep Gentoo Prefix env contained within the EPREFIX
609 - use prefix && myconf+=" --without-local-dir"
610 -
611 - econf \
612 - --with-modified-by=Gentoo-${PVR} \
613 - --enable-gui=no \
614 - --without-x \
615 - --disable-darwin \
616 - --disable-perlinterp \
617 - --disable-pythoninterp \
618 - --disable-rubyinterp \
619 - --disable-gpm \
620 - --disable-selinux \
621 - $(use_enable nls) \
622 - $(use_enable acl) \
623 - ${myconf}
624 -}
625 -
626 -src_compile() {
627 - # The following allows emake to be used
628 - emake -j1 -C src auto/osdef.h objects
629 -
630 - emake tools
631 -}
632 -
633 -src_test() { :; }
634 -
635 -src_install() {
636 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
637 -
638 - dodir /usr/{bin,share/{man/man1,vim}}
639 - emake -C src \
640 - installruntime \
641 - installmanlinks \
642 - installmacros \
643 - installtutor \
644 - installtutorbin \
645 - installtools \
646 - install-languages \
647 - DESTDIR="${D}" \
648 - BINDIR="${EPREFIX}"/usr/bin \
649 - MANDIR="${EPREFIX}"/usr/share/man \
650 - DATADIR="${EPREFIX}"/usr/share
651 -
652 - keepdir ${vimfiles}/keymap
653 -
654 - # default vimrc is installed by vim-core since it applies to
655 - # both vim and gvim
656 - insinto /etc/vim/
657 - newins "${FILESDIR}"/vimrc-r5 vimrc
658 - eprefixify "${ED}"/etc/vim/vimrc
659 -
660 - if use minimal ; then
661 - # To save space, install only a subset of the files.
662 - # Helps minimalize the livecd, bug 65144.
663 - eshopts_push -s extglob
664 -
665 - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
666 - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
667 - rm "${ED}"/usr/bin/vimtutor
668 -
669 - local keep_colors="default"
670 - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
671 -
672 - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
673 - # tinkering with the next line might make bad things happen ...
674 - keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
675 - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
676 -
677 - eshopts_pop
678 - fi
679 -
680 - # These files might have slight security issues, so we won't
681 - # install them. See bug #77841. We don't mind if these don't
682 - # exist.
683 - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
684 -
685 - newbashcomp "${FILESDIR}"/xxd-completion xxd
686 -
687 - # We shouldn't be installing the ex or view man page symlinks, as they
688 - # are managed by eselect-vi
689 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
690 -}
691 -
692 -pkg_postinst() {
693 - # Update documentation tags (from vim-doc.eclass)
694 - update_vim_helptags
695 -}
696 -
697 -pkg_postrm() {
698 - # Update documentation tags (from vim-doc.eclass)
699 - update_vim_helptags
700 -}