1 |
commit: b431f8cc912082ad3a839b098c575dea82f01107 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 4 12:45:01 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 6 17:41:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b431f8cc |
7 |
|
8 |
app-editors/gvim: 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/gvim/Manifest | 1 - |
16 |
app-editors/gvim/gvim-8.0.0106.ebuild | 407 ---------------------------------- |
17 |
2 files changed, 408 deletions(-) |
18 |
|
19 |
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest |
20 |
index fa600747941..210d7aea1a6 100644 |
21 |
--- a/app-editors/gvim/Manifest |
22 |
+++ b/app-editors/gvim/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/gvim/gvim-8.0.0106.ebuild b/app-editors/gvim/gvim-8.0.0106.ebuild |
29 |
deleted file mode 100644 |
30 |
index 6bf0bbfc480..00000000000 |
31 |
--- a/app-editors/gvim/gvim-8.0.0106.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,407 +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 gnome2-utils versionator bash-completion-r1 prefix python-r1 |
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.0106-gentoo-patches.tar.bz2" |
50 |
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" |
51 |
-fi |
52 |
- |
53 |
-DESCRIPTION="GUI version of the Vim text editor" |
54 |
-HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" |
55 |
- |
56 |
-SLOT="0" |
57 |
-LICENSE="vim" |
58 |
-IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" |
59 |
-REQUIRED_USE=" |
60 |
- luajit? ( lua ) |
61 |
- python? ( |
62 |
- || ( $(python_gen_useflags '*') ) |
63 |
- ?? ( $(python_gen_useflags 'python2*') ) |
64 |
- ?? ( $(python_gen_useflags 'python3*') ) |
65 |
- ) |
66 |
-" |
67 |
- |
68 |
-RDEPEND=" |
69 |
- ~app-editors/vim-core-${PV} |
70 |
- >=app-eselect/eselect-vi-1.1 |
71 |
- >=sys-libs/ncurses-5.2-r2:0= |
72 |
- x11-libs/libICE |
73 |
- x11-libs/libSM |
74 |
- x11-libs/libXext |
75 |
- x11-libs/libXt |
76 |
- acl? ( kernel_linux? ( sys-apps/acl ) ) |
77 |
- !aqua? ( |
78 |
- gtk3? ( |
79 |
- x11-libs/gtk+:3 |
80 |
- x11-libs/libXft |
81 |
- ) |
82 |
- !gtk3? ( |
83 |
- gtk? ( |
84 |
- >=x11-libs/gtk+-2.6:2 |
85 |
- x11-libs/libXft |
86 |
- gnome? ( >=gnome-base/libgnomeui-2.6 ) |
87 |
- ) |
88 |
- !gtk? ( |
89 |
- motif? ( >=x11-libs/motif-2.3:0 ) |
90 |
- !motif? ( |
91 |
- neXt? ( x11-libs/neXtaw ) |
92 |
- !neXt? ( x11-libs/libXaw ) |
93 |
- ) |
94 |
- ) |
95 |
- ) |
96 |
- ) |
97 |
- cscope? ( dev-util/cscope ) |
98 |
- lua? ( |
99 |
- luajit? ( dev-lang/luajit:2= ) |
100 |
- !luajit? ( dev-lang/lua:0[deprecated] ) |
101 |
- ) |
102 |
- nls? ( virtual/libintl ) |
103 |
- perl? ( dev-lang/perl:= ) |
104 |
- python? ( ${PYTHON_DEPS} ) |
105 |
- racket? ( dev-scheme/racket ) |
106 |
- ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) |
107 |
- selinux? ( sys-libs/libselinux ) |
108 |
- session? ( x11-libs/libSM ) |
109 |
- tcl? ( dev-lang/tcl:0= ) |
110 |
-" |
111 |
-DEPEND="${RDEPEND} |
112 |
- dev-util/ctags |
113 |
- sys-devel/autoconf |
114 |
- virtual/pkgconfig |
115 |
- nls? ( sys-devel/gettext ) |
116 |
-" |
117 |
- |
118 |
-S=${WORKDIR}/vim-${PV} |
119 |
- |
120 |
-pkg_setup() { |
121 |
- # people with broken alphabets run into trouble. bug 82186. |
122 |
- unset LANG LC_ALL |
123 |
- export LC_COLLATE="C" |
124 |
- |
125 |
- # Gnome sandbox silliness. bug #114475. |
126 |
- mkdir -p "${T}"/home |
127 |
- export HOME="${T}"/home |
128 |
-} |
129 |
- |
130 |
-src_prepare() { |
131 |
- if [[ ${PV} != 9999* ]] ; then |
132 |
- # Gentoo patches to fix runtime issues, cross-compile errors, etc |
133 |
- eapply "${WORKDIR}"/patches/ |
134 |
- fi |
135 |
- |
136 |
- # Fixup a script to use awk instead of nawk |
137 |
- sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ |
138 |
- || die "mve.awk sed failed" |
139 |
- |
140 |
- # Read vimrc and gvimrc from /etc/vim |
141 |
- echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h |
142 |
- echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h |
143 |
- |
144 |
- # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. |
145 |
- # Hopefully this pattern won't break for a while at least. |
146 |
- # This fixes bug 29398 (27 Sep 2003 agriffis) |
147 |
- sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ |
148 |
- "${S}"/runtime/doc/syntax.txt \ |
149 |
- "${S}"/runtime/doc/tagsrch.txt \ |
150 |
- "${S}"/runtime/doc/usr_29.txt \ |
151 |
- "${S}"/runtime/menu.vim \ |
152 |
- "${S}"/src/configure.ac || die 'sed failed' |
153 |
- |
154 |
- # Don't be fooled by /usr/include/libc.h. When found, vim thinks |
155 |
- # this is NeXT, but it's actually just a file in dev-libs/9libs |
156 |
- # This fixes bug 43885 (20 Mar 2004 agriffis) |
157 |
- sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' |
158 |
- |
159 |
- # gcc on sparc32 has this, uhm, interesting problem with detecting EOF |
160 |
- # correctly. To avoid some really entertaining error messages about stuff |
161 |
- # which isn't even in the source file being invalid, we'll do some trickery |
162 |
- # to make the error never occur. bug 66162 (02 October 2004 ciaranm) |
163 |
- find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done |
164 |
- |
165 |
- # Try to avoid sandbox problems. Bug #114475. |
166 |
- if [[ -d "${S}"/src/po ]] ; then |
167 |
- sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ |
168 |
- "${S}"/src/po/Makefile |
169 |
- fi |
170 |
- |
171 |
- if version_is_at_least 7.3.122 ; then |
172 |
- cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk |
173 |
- fi |
174 |
- |
175 |
- # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 |
176 |
- if version_is_at_least 7.3 ; then |
177 |
- sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ |
178 |
- "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' |
179 |
- fi |
180 |
- |
181 |
- eapply_user |
182 |
-} |
183 |
- |
184 |
-src_configure() { |
185 |
- local myconf=() |
186 |
- |
187 |
- # Fix bug 37354: Disallow -funroll-all-loops on amd64 |
188 |
- # Bug 57859 suggests that we want to do this for all archs |
189 |
- filter-flags -funroll-all-loops |
190 |
- |
191 |
- # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for |
192 |
- # everyone since previous flag filtering bugs have turned out to affect |
193 |
- # multiple archs... |
194 |
- replace-flags -O3 -O2 |
195 |
- |
196 |
- # Fix bug 18245: Prevent "make" from the following chain: |
197 |
- # (1) Notice configure.ac is newer than auto/configure |
198 |
- # (2) Rebuild auto/configure |
199 |
- # (3) Notice auto/configure is newer than auto/config.mk |
200 |
- # (4) Run ./configure (with wrong args) to remake auto/config.mk |
201 |
- sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" |
202 |
- rm -f src/auto/configure |
203 |
- emake -j1 -C src autoconf |
204 |
- |
205 |
- # This should fix a sandbox violation (see bug 24447). The hvc |
206 |
- # things are for ppc64, see bug 86433. |
207 |
- for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do |
208 |
- [[ -e ${file} ]] && addwrite $file |
209 |
- done |
210 |
- |
211 |
- use debug && append-flags "-DDEBUG" |
212 |
- |
213 |
- myconf=( |
214 |
- --with-features=huge |
215 |
- --disable-gpm |
216 |
- --enable-multibyte |
217 |
- $(use_enable acl) |
218 |
- $(use_enable cscope) |
219 |
- $(use_enable lua luainterp) |
220 |
- $(use_with luajit) |
221 |
- $(use_enable netbeans) |
222 |
- $(use_enable nls) |
223 |
- $(use_enable perl perlinterp) |
224 |
- $(use_enable racket mzschemeinterp) |
225 |
- $(use_enable ruby rubyinterp) |
226 |
- $(use_enable selinux) |
227 |
- $(use_enable session xsmp) |
228 |
- $(use_enable tcl tclinterp) |
229 |
- ) |
230 |
- |
231 |
- if use python ; then |
232 |
- py_add_interp() { |
233 |
- local v |
234 |
- |
235 |
- [[ ${EPYTHON} == python3* ]] && v=3 |
236 |
- myconf+=( |
237 |
- --enable-python${v}interp |
238 |
- vi_cv_path_python${v}="${PYTHON}" |
239 |
- ) |
240 |
- } |
241 |
- |
242 |
- python_foreach_impl py_add_interp |
243 |
- else |
244 |
- myconf+=( |
245 |
- --disable-pythoninterp |
246 |
- --disable-python3interp |
247 |
- ) |
248 |
- fi |
249 |
- |
250 |
- # --with-features=huge forces on cscope even if we --disable it. We need |
251 |
- # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) |
252 |
- if ! use cscope ; then |
253 |
- sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ |
254 |
- die "couldn't disable cscope" |
255 |
- fi |
256 |
- |
257 |
- # gvim's GUI preference order is as follows: |
258 |
- # aqua CARBON (not tested) |
259 |
- # -aqua gtk3 GTK3 |
260 |
- # -aqua -gtk3 gnome GNOME2 |
261 |
- # -aqua -gtk3 -gnome gtk GTK2 |
262 |
- # -aqua -gtk -gtk3 motif MOTIF |
263 |
- # -aqua -gtk -gtk3 -motif neXt NEXTAW |
264 |
- # -aqua -gtk -gtk3 -motif -neXt ATHENA |
265 |
- echo ; echo |
266 |
- if use aqua ; then |
267 |
- einfo "Building gvim with the Carbon GUI" |
268 |
- myconf+=( |
269 |
- --enable-darwin |
270 |
- --enable-gui=carbon |
271 |
- ) |
272 |
- elif use gtk3 ; then |
273 |
- myconf+=( --enable-gtk3-check ) |
274 |
- einfo "Building gvim with the gtk+-3 GUI" |
275 |
- myconf+=( --enable-gui=gtk3 ) |
276 |
- elif use gtk ; then |
277 |
- myconf+=( --enable-gtk2-check ) |
278 |
- if use gnome ; then |
279 |
- einfo "Building gvim with the Gnome 2 GUI" |
280 |
- myconf+=( --enable-gui=gnome2 ) |
281 |
- else |
282 |
- einfo "Building gvim with the gtk+-2 GUI" |
283 |
- myconf+=( --enable-gui=gtk2 ) |
284 |
- fi |
285 |
- elif use motif ; then |
286 |
- einfo "Building gvim with the MOTIF GUI" |
287 |
- myconf+=( --enable-gui=motif ) |
288 |
- elif use neXt ; then |
289 |
- einfo "Building gvim with the neXtaw GUI" |
290 |
- myconf+=( --enable-gui=nextaw ) |
291 |
- else |
292 |
- einfo "Building gvim with the Athena GUI" |
293 |
- myconf+=( --enable-gui=athena ) |
294 |
- fi |
295 |
- echo ; echo |
296 |
- |
297 |
- # let package manager strip binaries |
298 |
- export ac_cv_prog_STRIP="$(type -P true ) faking strip" |
299 |
- |
300 |
- # keep prefix env contained within the EPREFIX |
301 |
- use prefix && myconf+=( --without-local-dir ) |
302 |
- |
303 |
- if [[ ${CHOST} == *-interix* ]]; then |
304 |
- # avoid finding of this function, to avoid having to patch either |
305 |
- # configure or the source, which would be much more hackish. |
306 |
- # after all vim does it right, only interix is badly broken (again) |
307 |
- export ac_cv_func_sigaction=no |
308 |
- fi |
309 |
- |
310 |
- econf \ |
311 |
- --with-modified-by=Gentoo-${PVR} \ |
312 |
- --with-vim-name=gvim \ |
313 |
- --with-x \ |
314 |
- "${myconf[@]}" |
315 |
-} |
316 |
- |
317 |
-src_compile() { |
318 |
- # The following allows emake to be used |
319 |
- emake -j1 -C src auto/osdef.h objects |
320 |
- |
321 |
- emake |
322 |
-} |
323 |
- |
324 |
-src_test() { |
325 |
- echo |
326 |
- einfo "Starting vim tests. Several error messages will be shown" |
327 |
- einfo "while the tests run. This is normal behaviour and does not" |
328 |
- einfo "indicate a fault." |
329 |
- echo |
330 |
- ewarn "If the tests fail, your terminal may be left in a strange" |
331 |
- ewarn "state. Usually, running 'reset' will fix this." |
332 |
- echo |
333 |
- |
334 |
- # Don't let vim talk to X |
335 |
- unset DISPLAY |
336 |
- |
337 |
- # Make gvim not try to connect to X. See :help gui-x11-start in vim for how |
338 |
- # this evil trickery works. |
339 |
- ln -s "${S}"/src/gvim "${S}"/src/testvim || die |
340 |
- |
341 |
- # Make sure our VIMPROG is used. |
342 |
- sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die |
343 |
- |
344 |
- # Don't do additional GUI tests. |
345 |
- emake -j1 VIMPROG=../testvim -C src/testdir nongui |
346 |
-} |
347 |
- |
348 |
-# Make convenience symlinks, hopefully without stepping on toes. Some |
349 |
-# of these links are "owned" by the vim ebuild when it is installed, |
350 |
-# but they might be good for gvim as well (see bug 45828) |
351 |
-update_vim_symlinks() { |
352 |
- local f syms |
353 |
- syms="vimdiff rvim rview" |
354 |
- einfo "Calling eselect vi update..." |
355 |
- # Call this with --if-unset to respect user's choice (bug 187449) |
356 |
- eselect vi update --if-unset |
357 |
- |
358 |
- # Make or remove convenience symlink, vim -> gvim |
359 |
- if [[ -f "${EROOT}"/usr/bin/gvim ]]; then |
360 |
- ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null |
361 |
- elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then |
362 |
- rm "${EROOT}"/usr/bin/vim |
363 |
- fi |
364 |
- |
365 |
- # Make or remove convenience symlinks to vim |
366 |
- if [[ -f "${EROOT}"/usr/bin/vim ]]; then |
367 |
- for f in ${syms}; do |
368 |
- ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null |
369 |
- done |
370 |
- else |
371 |
- for f in ${syms}; do |
372 |
- if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then |
373 |
- rm -f "${EROOT}"/usr/bin/${f} |
374 |
- fi |
375 |
- done |
376 |
- fi |
377 |
- |
378 |
- # This will still break if you merge then remove the vi package, |
379 |
- # but there's only so much you can do, eh? Unfortunately we don't |
380 |
- # have triggers like are done in rpm-land. |
381 |
-} |
382 |
- |
383 |
-src_install() { |
384 |
- local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} |
385 |
- |
386 |
- dobin src/gvim |
387 |
- dosym gvim /usr/bin/gvimdiff |
388 |
- dosym gvim /usr/bin/evim |
389 |
- dosym gvim /usr/bin/eview |
390 |
- dosym gvim /usr/bin/gview |
391 |
- dosym gvim /usr/bin/rgvim |
392 |
- dosym gvim /usr/bin/rgview |
393 |
- |
394 |
- emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons |
395 |
- |
396 |
- dodir /usr/share/man/man1 |
397 |
- echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 |
398 |
- echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 |
399 |
- echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 |
400 |
- |
401 |
- insinto /etc/vim |
402 |
- newins "${FILESDIR}"/gvimrc-r1 gvimrc |
403 |
- eprefixify "${ED}"/etc/vim/gvimrc |
404 |
- |
405 |
- doicon -s scalable "${FILESDIR}"/gvim.svg |
406 |
- |
407 |
- # bash completion script, bug #79018. |
408 |
- newbashcomp "${FILESDIR}"/${PN}-completion ${PN} |
409 |
- |
410 |
- # don't install vim desktop file |
411 |
- rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" |
412 |
-} |
413 |
- |
414 |
-pkg_postinst() { |
415 |
- # Update documentation tags (from vim-doc.eclass) |
416 |
- update_vim_helptags |
417 |
- |
418 |
- # Update fdo mime stuff, bug #78394 |
419 |
- fdo-mime_desktop_database_update |
420 |
- |
421 |
- # Update icon cache |
422 |
- gnome2_icon_cache_update |
423 |
- |
424 |
- # Make convenience symlinks |
425 |
- update_vim_symlinks |
426 |
-} |
427 |
- |
428 |
-pkg_postrm() { |
429 |
- # Update documentation tags (from vim-doc.eclass) |
430 |
- update_vim_helptags |
431 |
- |
432 |
- # Update fdo mime stuff, bug #78394 |
433 |
- fdo-mime_desktop_database_update |
434 |
- |
435 |
- # Update icon cache |
436 |
- gnome2_icon_cache_update |
437 |
- |
438 |
- # Make convenience symlinks |
439 |
- update_vim_symlinks |
440 |
-} |