Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim/
Date: Tue, 06 Jun 2017 17:42:34
Message-Id: 1496770870.bb4f8f1eb30e2ca058de28927722d956c6366eec.monsieurp@gentoo
1 commit: bb4f8f1eb30e2ca058de28927722d956c6366eec
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 4 12:45:46 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 6 17:41:10 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4f8f1e
7
8 app-editors/vim: remove unsecure version.
9
10 Gentoo-Bug: https://bugs.gentoo.org/611386
11
12 Package-Manager: Portage-2.3.5, Repoman-2.3.2
13 Closes: https://github.com/gentoo/gentoo/pull/4847
14
15 app-editors/vim/Manifest | 1 -
16 app-editors/vim/vim-8.0.0106.ebuild | 348 ------------------------------------
17 2 files changed, 349 deletions(-)
18
19 diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
20 index fa600747941..210d7aea1a6 100644
21 --- a/app-editors/vim/Manifest
22 +++ b/app-editors/vim/Manifest
23 @@ -1,3 +1,2 @@
24 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b
25 -DIST vim-8.0.0106.tar.gz 12945768 SHA256 cbace3e7a2db3df73720c4181fa4cdbf7df94310522b1c7a4fd7d6afeaa1e145 SHA512 4e40d9ba8ba694d951be78c653d8fcfebe2b3cc460986ef8e3478f81f2dfd5e4b3c2bc5d22082536b9c275e41beeac343cee0aa1e4de125b71fe95c772e26c20 WHIRLPOOL 569a8f50ebdb7f380f675ed0a4b4aa5e7e226303a8e92db2a8e81f5d8acc0e466620c60c160e2204f3af615b91ca2481eb9716f9c2e6dbdb416050d758a49f09
26 DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b
27
28 diff --git a/app-editors/vim/vim-8.0.0106.ebuild b/app-editors/vim/vim-8.0.0106.ebuild
29 deleted file mode 100644
30 index 90798503aa8..00000000000
31 --- a/app-editors/vim/vim-8.0.0106.ebuild
32 +++ /dev/null
33 @@ -1,348 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -VIM_VERSION="8.0"
39 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
40 -PYTHON_REQ_USE=threads
41 -inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
42 -
43 -if [[ ${PV} == 9999* ]] ; then
44 - inherit git-r3
45 - EGIT_REPO_URI="https://github.com/vim/vim.git"
46 -else
47 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
48 - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
49 - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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"
50 -fi
51 -
52 -DESCRIPTION="Vim, an improved vi-style text editor"
53 -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
54 -
55 -SLOT="0"
56 -LICENSE="vim"
57 -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
58 -REQUIRED_USE="
59 - luajit? ( lua )
60 - python? (
61 - || ( $(python_gen_useflags '*') )
62 - ?? ( $(python_gen_useflags 'python2*') )
63 - ?? ( $(python_gen_useflags 'python3*') )
64 - )
65 -"
66 -
67 -RDEPEND="
68 - >=app-eselect/eselect-vi-1.1
69 - >=sys-libs/ncurses-5.2-r2:0=
70 - nls? ( virtual/libintl )
71 - acl? ( kernel_linux? ( sys-apps/acl ) )
72 - cscope? ( dev-util/cscope )
73 - gpm? ( >=sys-libs/gpm-1.19.3 )
74 - lua? (
75 - luajit? ( dev-lang/luajit:2= )
76 - !luajit? ( dev-lang/lua:0[deprecated] )
77 - )
78 - !minimal? (
79 - ~app-editors/vim-core-${PV}
80 - dev-util/ctags
81 - )
82 - perl? ( dev-lang/perl:= )
83 - python? ( ${PYTHON_DEPS} )
84 - racket? ( dev-scheme/racket )
85 - ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
86 - selinux? ( sys-libs/libselinux )
87 - tcl? ( dev-lang/tcl:0= )
88 - X? ( x11-libs/libXt )
89 -"
90 -DEPEND="${RDEPEND}
91 - sys-devel/autoconf
92 - nls? ( sys-devel/gettext )
93 -"
94 -
95 -pkg_setup() {
96 - # people with broken alphabets run into trouble. bug 82186.
97 - unset LANG LC_ALL
98 - export LC_COLLATE="C"
99 -
100 - # Gnome sandbox silliness. bug #114475.
101 - mkdir -p "${T}"/home
102 - export HOME="${T}"/home
103 -}
104 -
105 -src_prepare() {
106 - if [[ ${PV} != 9999* ]] ; then
107 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
108 - eapply "${WORKDIR}"/patches/
109 - fi
110 -
111 - # Fixup a script to use awk instead of nawk
112 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
113 - || die "mve.awk sed failed"
114 -
115 - # Read vimrc and gvimrc from /etc/vim
116 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
117 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
118 -
119 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
120 - # Hopefully this pattern won't break for a while at least.
121 - # This fixes bug 29398 (27 Sep 2003 agriffis)
122 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
123 - "${S}"/runtime/doc/syntax.txt \
124 - "${S}"/runtime/doc/tagsrch.txt \
125 - "${S}"/runtime/doc/usr_29.txt \
126 - "${S}"/runtime/menu.vim \
127 - "${S}"/src/configure.ac || die 'sed failed'
128 -
129 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
130 - # this is NeXT, but it's actually just a file in dev-libs/9libs
131 - # This fixes bug 43885 (20 Mar 2004 agriffis)
132 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
133 -
134 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
135 - # correctly. To avoid some really entertaining error messages about stuff
136 - # which isn't even in the source file being invalid, we'll do some trickery
137 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
138 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
139 -
140 - # conditionally make the manpager.sh script
141 - if use vim-pager ; then
142 - cat <<-END > "${S}"/runtime/macros/manpager.sh
143 - #!/bin/sh
144 - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
145 - vim \\
146 - -c 'let no_plugin_maps = 1' \\
147 - -c 'set nolist nomod ft=man ts=8' \\
148 - -c 'let g:showmarks_enable=0' \\
149 - -c 'runtime! macros/less.vim' -
150 - END
151 - fi
152 -
153 - # Try to avoid sandbox problems. Bug #114475.
154 - if [[ -d "${S}"/src/po ]] ; then
155 - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
156 - "${S}"/src/po/Makefile
157 - fi
158 -
159 - if version_is_at_least 7.3.122 ; then
160 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
161 - fi
162 -
163 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
164 - if version_is_at_least 7.3 ; then
165 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
166 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
167 - fi
168 -
169 - eapply_user
170 -}
171 -
172 -src_configure() {
173 - local myconf=()
174 -
175 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
176 - # Bug 57859 suggests that we want to do this for all archs
177 - filter-flags -funroll-all-loops
178 -
179 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
180 - # everyone since previous flag filtering bugs have turned out to affect
181 - # multiple archs...
182 - replace-flags -O3 -O2
183 -
184 - # Fix bug 18245: Prevent "make" from the following chain:
185 - # (1) Notice configure.ac is newer than auto/configure
186 - # (2) Rebuild auto/configure
187 - # (3) Notice auto/configure is newer than auto/config.mk
188 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
189 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
190 - rm -f src/auto/configure
191 - emake -j1 -C src autoconf
192 -
193 - # This should fix a sandbox violation (see bug 24447). The hvc
194 - # things are for ppc64, see bug 86433.
195 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
196 - [[ -e ${file} ]] && addwrite $file
197 - done
198 -
199 - if use minimal ; then
200 - myconf=(
201 - --with-features=tiny
202 - --disable-nls
203 - --disable-multibyte
204 - --disable-acl
205 - --enable-gui=no
206 - --without-x
207 - --disable-darwin
208 - --disable-luainterp
209 - --disable-perlinterp
210 - --disable-pythoninterp
211 - --disable-mzschemeinterp
212 - --disable-rubyinterp
213 - --disable-selinux
214 - --disable-tclinterp
215 - --disable-gpm
216 - )
217 - else
218 - use debug && append-flags "-DDEBUG"
219 -
220 - myconf=(
221 - --with-features=huge
222 - --enable-multibyte
223 - $(use_enable acl)
224 - $(use_enable cscope)
225 - $(use_enable gpm)
226 - $(use_enable lua luainterp)
227 - $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
228 - $(use_with luajit)
229 - $(use_enable nls)
230 - $(use_enable perl perlinterp)
231 - $(use_enable racket mzschemeinterp)
232 - $(use_enable ruby rubyinterp)
233 - $(use_enable selinux)
234 - $(use_enable tcl tclinterp)
235 - )
236 -
237 - if use python ; then
238 - py_add_interp() {
239 - local v
240 -
241 - [[ ${EPYTHON} == python3* ]] && v=3
242 - myconf+=(
243 - --enable-python${v}interp
244 - vi_cv_path_python${v}="${PYTHON}"
245 - )
246 - }
247 -
248 - python_foreach_impl py_add_interp
249 - else
250 - myconf+=(
251 - --disable-pythoninterp
252 - --disable-python3interp
253 - )
254 - fi
255 -
256 - # --with-features=huge forces on cscope even if we --disable it. We need
257 - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
258 - if ! use cscope ; then
259 - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
260 - die "couldn't disable cscope"
261 - fi
262 -
263 - # don't test USE=X here ... see bug #19115
264 - # but need to provide a way to link against X ... see bug #20093
265 - myconf+=(
266 - --enable-gui=no
267 - --disable-darwin
268 - $(use_with X x)
269 - )
270 - fi
271 -
272 - # let package manager strip binaries
273 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
274 -
275 - # keep prefix env contained within the EPREFIX
276 - use prefix && myconf+=( --without-local-dir )
277 -
278 - econf \
279 - --with-modified-by=Gentoo-${PVR} \
280 - "${myconf[@]}"
281 -}
282 -
283 -src_compile() {
284 - # The following allows emake to be used
285 - emake -j1 -C src auto/osdef.h objects
286 -
287 - emake
288 -}
289 -
290 -src_test() {
291 - echo
292 - einfo "Starting vim tests. Several error messages will be shown"
293 - einfo "while the tests run. This is normal behaviour and does not"
294 - einfo "indicate a fault."
295 - echo
296 - ewarn "If the tests fail, your terminal may be left in a strange"
297 - ewarn "state. Usually, running 'reset' will fix this."
298 - echo
299 -
300 - # Don't let vim talk to X
301 - unset DISPLAY
302 -
303 - emake -j1 -C src/testdir nongui
304 -}
305 -
306 -# Make convenience symlinks, hopefully without stepping on toes. Some
307 -# of these links are "owned" by the vim ebuild when it is installed,
308 -# but they might be good for gvim as well (see bug 45828)
309 -update_vim_symlinks() {
310 - local f syms
311 - syms="vimdiff rvim rview"
312 - einfo "Calling eselect vi update..."
313 - # Call this with --if-unset to respect user's choice (bug 187449)
314 - eselect vi update --if-unset
315 -
316 - # Make or remove convenience symlink, vim -> gvim
317 - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
318 - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
319 - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
320 - rm "${EROOT}"/usr/bin/vim
321 - fi
322 -
323 - # Make or remove convenience symlinks to vim
324 - if [[ -f "${EROOT}"/usr/bin/vim ]]; then
325 - for f in ${syms}; do
326 - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
327 - done
328 - else
329 - for f in ${syms}; do
330 - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
331 - rm -f "${EROOT}"/usr/bin/${f}
332 - fi
333 - done
334 - fi
335 -
336 - # This will still break if you merge then remove the vi package,
337 - # but there's only so much you can do, eh? Unfortunately we don't
338 - # have triggers like are done in rpm-land.
339 -}
340 -
341 -src_install() {
342 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
343 -
344 - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
345 - # managed by eselect-vi
346 - dobin src/vim
347 - dosym vim /usr/bin/vimdiff
348 - dosym vim /usr/bin/rvim
349 - dosym vim /usr/bin/rview
350 - if use vim-pager ; then
351 - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
352 - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
353 - insinto ${vimfiles}/macros
354 - doins runtime/macros/manpager.sh
355 - fperms a+x ${vimfiles}/macros/manpager.sh
356 - fi
357 -
358 - newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
359 - # keep in sync with 'complete ... -F' list
360 - bashcomp_alias vim ex vi view rvim rview vimdiff
361 -
362 - # We shouldn't be installing the ex or view man page symlinks, as they
363 - # are managed by eselect-vi
364 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
365 -}
366 -
367 -pkg_postinst() {
368 - # Update documentation tags (from vim-doc.eclass)
369 - update_vim_helptags
370 -
371 - # Make convenience symlinks
372 - update_vim_symlinks
373 -}
374 -
375 -pkg_postrm() {
376 - # Update documentation tags (from vim-doc.eclass)
377 - update_vim_helptags
378 -
379 - # Make convenience symlinks
380 - update_vim_symlinks
381 -}