Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim/
Date: Sun, 26 Jun 2022 19:38:04
Message-Id: 1656272254.a43cf558989922caf611410f0e381b22480ceeba.mattst88@gentoo
1 commit: a43cf558989922caf611410f0e381b22480ceeba
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 26 19:33:23 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 26 19:37:34 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43cf558
7
8 app-editors/vim: Drop old versions
9
10 Bug: https://bugs.gentoo.org/833572
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 app-editors/vim/Manifest | 1 -
14 app-editors/vim/vim-8.2.4328-r1.ebuild | 350 ---------------------------------
15 2 files changed, 351 deletions(-)
16
17 diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
18 index 95416aebcb47..bf14412cb3bd 100644
19 --- a/app-editors/vim/Manifest
20 +++ b/app-editors/vim/Manifest
21 @@ -1,4 +1,3 @@
22 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
23 -DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
24 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
25 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
26
27 diff --git a/app-editors/vim/vim-8.2.4328-r1.ebuild b/app-editors/vim/vim-8.2.4328-r1.ebuild
28 deleted file mode 100644
29 index 3e1259d88e0a..000000000000
30 --- a/app-editors/vim/vim-8.2.4328-r1.ebuild
31 +++ /dev/null
32 @@ -1,350 +0,0 @@
33 -# Copyright 1999-2022 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -# Please bump with app-editors/vim-core and app-editors/gvim
39 -
40 -VIM_VERSION="8.2"
41 -LUA_COMPAT=( lua5-1 luajit )
42 -PYTHON_COMPAT=( python3_{7..10} )
43 -PYTHON_REQ_USE="threads(+)"
44 -USE_RUBY="ruby24 ruby25 ruby26 ruby27"
45 -
46 -inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
47 -
48 -if [[ ${PV} == 9999* ]] ; then
49 - inherit git-r3
50 - EGIT_REPO_URI="https://github.com/vim/vim.git"
51 -else
52 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
53 - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
54 - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
55 -fi
56 -
57 -DESCRIPTION="Vim, an improved vi-style text editor"
58 -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
59 -
60 -LICENSE="vim"
61 -SLOT="0"
62 -IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
63 -REQUIRED_USE="
64 - lua? ( ${LUA_REQUIRED_USE} )
65 - python? ( ${PYTHON_REQUIRED_USE} )
66 - vim-pager? ( !minimal )
67 -"
68 -
69 -RDEPEND="
70 - >=app-eselect/eselect-vi-1.1
71 - >=sys-libs/ncurses-5.2-r2:0=
72 - nls? ( virtual/libintl )
73 - acl? ( kernel_linux? ( sys-apps/acl ) )
74 - crypt? ( dev-libs/libsodium:= )
75 - cscope? ( dev-util/cscope )
76 - gpm? ( >=sys-libs/gpm-1.19.3 )
77 - lua? ( ${LUA_DEPS}
78 - $(lua_gen_impl_dep 'deprecated' lua5-1)
79 - )
80 - ~app-editors/vim-core-${PV}
81 - !<app-editors/vim-core-8.2.4328-r1
82 - vim-pager? ( app-editors/vim-core[-minimal] )
83 - perl? ( dev-lang/perl:= )
84 - python? ( ${PYTHON_DEPS} )
85 - racket? ( dev-scheme/racket )
86 - ruby? ( ${RUBY_DEPS} )
87 - selinux? ( sys-libs/libselinux )
88 - sound? ( media-libs/libcanberra )
89 - tcl? ( dev-lang/tcl:0= )
90 - X? ( x11-libs/libXt )
91 -"
92 -DEPEND="${RDEPEND}"
93 -# configure runs the Lua interpreter
94 -BDEPEND="
95 - sys-devel/autoconf
96 - lua? ( ${LUA_DEPS} )
97 - nls? ( sys-devel/gettext )
98 -"
99 -
100 -pkg_setup() {
101 - # people with broken alphabets run into trouble. bug #82186.
102 - unset LANG LC_ALL
103 - export LC_COLLATE="C"
104 -
105 - # Gnome sandbox silliness. bug #114475.
106 - mkdir -p "${T}"/home || die "mkdir failed"
107 - export HOME="${T}"/home
108 -
109 - use lua && lua-single_pkg_setup
110 - use python && python-single-r1_pkg_setup
111 -}
112 -
113 -src_prepare() {
114 - if [[ ${PV} != 9999* ]] ; then
115 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
116 - eapply "${WORKDIR}"/patches/
117 - fi
118 -
119 - # Fixup a script to use awk instead of nawk
120 - sed -i -e \
121 - '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
122 - "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
123 -
124 - # Read vimrc and gvimrc from /etc/vim
125 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
126 - >> "${S}"/src/feature.h || die "echo failed"
127 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
128 - >> "${S}"/src/feature.h || die "echo failed"
129 -
130 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
131 - # Hopefully this pattern won't break for a while at least.
132 - # This fixes bug #29398 (27 Sep 2003 agriffis)
133 - sed -i -e \
134 - 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
135 - "${S}"/runtime/doc/syntax.txt \
136 - "${S}"/runtime/doc/tagsrch.txt \
137 - "${S}"/runtime/doc/usr_29.txt \
138 - "${S}"/runtime/menu.vim \
139 - "${S}"/src/configure.ac || die 'sed failed'
140 -
141 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
142 - # this is NeXT, but it's actually just a file in dev-libs/9libs
143 - # This fixes bug #43885 (20 Mar 2004 agriffis)
144 - sed -i -e \
145 - 's/ libc\.h / /' \
146 - "${S}"/src/configure.ac || die 'sed failed'
147 -
148 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
149 - # correctly. To avoid some really entertaining error messages about stuff
150 - # which isn't even in the source file being invalid, we'll do some trickery
151 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
152 - find "${S}" -name '*.c' | while read c; do
153 - echo >> "$c" || die "echo failed"
154 - done
155 -
156 - # conditionally make the manpager.sh script
157 - if use vim-pager; then
158 - cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
159 - #!/bin/sh
160 - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
161 - vim \\
162 - -c 'let no_plugin_maps = 1' \\
163 - -c 'set nolist nomod ft=man ts=8' \\
164 - -c 'let g:showmarks_enable=0' \\
165 - -c 'runtime! macros/less.vim' -
166 - _EOF_
167 - fi
168 -
169 - # Try to avoid sandbox problems. Bug #114475.
170 - if [[ -d "${S}"/src/po ]]; then
171 - sed -i -e \
172 - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
173 - "${S}"/src/po/Makefile || die "sed failed"
174 - fi
175 -
176 - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
177 -
178 - sed -i -e \
179 - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
180 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
181 -
182 - eapply_user
183 -}
184 -
185 -src_configure() {
186 - local myconf=()
187 -
188 - # Fix bug #37354: Disallow -funroll-all-loops on amd64
189 - # Bug #57859 suggests that we want to do this for all archs
190 - filter-flags -funroll-all-loops
191 -
192 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
193 - # everyone since previous flag filtering bugs have turned out to affect
194 - # multiple archs...
195 - replace-flags -O3 -O2
196 -
197 - # Fix bug 18245: Prevent "make" from the following chain:
198 - # (1) Notice configure.ac is newer than auto/configure
199 - # (2) Rebuild auto/configure
200 - # (3) Notice auto/configure is newer than auto/config.mk
201 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
202 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
203 - rm src/auto/configure || die "rm failed"
204 - emake -j1 -C src autoconf
205 -
206 - # This should fix a sandbox violation (see bug #24447). The hvc
207 - # things are for ppc64, see bug #86433.
208 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
209 - if [[ -e "${file}" ]]; then
210 - addwrite ${file}
211 - fi
212 - done
213 -
214 - if use minimal; then
215 - myconf=(
216 - --with-features=tiny
217 - --disable-nls
218 - --disable-canberra
219 - --disable-acl
220 - --enable-gui=no
221 - --without-x
222 - --disable-darwin
223 - --disable-luainterp
224 - --disable-perlinterp
225 - --disable-pythoninterp
226 - --disable-mzschemeinterp
227 - --disable-rubyinterp
228 - --disable-selinux
229 - --disable-tclinterp
230 - --disable-gpm
231 - )
232 - else
233 - use debug && append-flags "-DDEBUG"
234 -
235 - myconf=(
236 - --with-features=huge
237 - $(use_enable sound canberra)
238 - $(use_enable acl)
239 - $(use_enable crypt libsodium)
240 - $(use_enable cscope)
241 - $(use_enable gpm)
242 - $(use_enable nls)
243 - $(use_enable perl perlinterp)
244 - $(use_enable python python3interp)
245 - $(use_with python python3-command "${PYTHON}")
246 - $(use_enable racket mzschemeinterp)
247 - $(use_enable ruby rubyinterp)
248 - $(use_enable selinux)
249 - $(use_enable tcl tclinterp)
250 - $(use_enable terminal)
251 - )
252 -
253 - # --with-features=huge forces on cscope even if we --disable it. We need
254 - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
255 - if ! use cscope; then
256 - sed -i -e \
257 - '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
258 - fi
259 -
260 - if use lua; then
261 - myconf+=(
262 - --enable-luainterp
263 - $(use_with lua_single_target_luajit luajit)
264 - --with-lua-prefix="${EPREFIX}/usr"
265 - )
266 - fi
267 -
268 - # don't test USE=X here ... see bug #19115
269 - # but need to provide a way to link against X ... see bug #20093
270 - myconf+=(
271 - --enable-gui=no
272 - --disable-darwin
273 - $(use_with X x)
274 - )
275 - fi
276 -
277 - # let package manager strip binaries
278 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
279 -
280 - # keep prefix env contained within the EPREFIX
281 - use prefix && myconf+=( --without-local-dir )
282 -
283 - econf \
284 - --with-modified-by=Gentoo-${PVR} \
285 - "${myconf[@]}"
286 -}
287 -
288 -src_compile() {
289 - # The following allows emake to be used
290 - emake -j1 -C src auto/osdef.h objects
291 -
292 - emake
293 -}
294 -
295 -src_test() {
296 - einfo
297 - einfo "Starting vim tests. Several error messages will be shown"
298 - einfo "while the tests run. This is normal behaviour and does not"
299 - einfo "indicate a fault."
300 - einfo
301 - ewarn "If the tests fail, your terminal may be left in a strange"
302 - ewarn "state. Usually, running 'reset' will fix this."
303 - einfo
304 -
305 - # Don't let vim talk to X
306 - unset DISPLAY
307 -
308 - # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
309 - # for more information on test variables we can use.
310 - # Note that certain variables need vim-compatible regex (not PCRE), see e.g.
311 - # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
312 - #
313 - # Skipped tests:
314 - # - Test_expand_star_star
315 - # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
316 - # - Test_exrc
317 - # Looks in wrong location? (bug #742710)
318 - # - Test_job_tty_in_out
319 - # Fragile and depends on TERM(?)
320 - # - Test_spelldump_bang
321 - # Hangs.
322 - export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
323 -
324 - emake -j1 -C src/testdir nongui
325 -}
326 -
327 -# Call eselect vi update with --if-unset
328 -# to respect user's choice (bug #187449)
329 -eselect_vi_update() {
330 - ebegin "Calling eselect vi update"
331 - eselect vi update --if-unset
332 - eend $?
333 -}
334 -
335 -src_install() {
336 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
337 -
338 - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
339 - # managed by eselect-vi
340 - dobin src/vim
341 - if ! use minimal ; then
342 - dosym vim /usr/bin/vimdiff
343 - fi
344 - dosym vim /usr/bin/rvim
345 - dosym vim /usr/bin/rview
346 - if use vim-pager ; then
347 - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
348 - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
349 - insinto ${vimfiles}/macros
350 - doins runtime/macros/manpager.sh
351 - fperms a+x ${vimfiles}/macros/manpager.sh
352 - fi
353 -
354 - domenu runtime/vim.desktop
355 -
356 - newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
357 -
358 - # keep in sync with 'complete ... -F' list
359 - bashcomp_alias vim ex vi view rvim rview vimdiff
360 -}
361 -
362 -pkg_postinst() {
363 - # Update documentation tags (from vim-doc.eclass)
364 - update_vim_helptags
365 -
366 - # Call eselect vi update
367 - eselect_vi_update
368 -
369 - # update desktop file mime cache
370 - xdg_desktop_database_update
371 -}
372 -
373 -pkg_postrm() {
374 - # Update documentation tags (from vim-doc.eclass)
375 - update_vim_helptags
376 -
377 - # Call eselect vi update
378 - eselect_vi_update
379 -
380 - # update desktop file mime cache
381 - xdg_desktop_database_update
382 -}