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/
Date: Wed, 15 Nov 2017 03:57:47
Message-Id: 1510718030.986a27ae308617c02830c340776b2d3b7e354a00.radhermit@gentoo
1 commit: 986a27ae308617c02830c340776b2d3b7e354a00
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 15 03:53:50 2017 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 15 03:53:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986a27ae
7
8 app-editors/vim: remove old
9
10 app-editors/vim/Manifest | 3 -
11 app-editors/vim/vim-8.0.0386-r1.ebuild | 329 --------------------------------
12 app-editors/vim/vim-8.0.0938.ebuild | 330 ---------------------------------
13 app-editors/vim/vim-8.0.0983.ebuild | 330 ---------------------------------
14 app-editors/vim/vim-8.0.1056.ebuild | 330 ---------------------------------
15 5 files changed, 1322 deletions(-)
16
17 diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
18 index cbc6f49ed75..510dd0337d1 100644
19 --- a/app-editors/vim/Manifest
20 +++ b/app-editors/vim/Manifest
21 @@ -1,8 +1,5 @@
22 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b
23 DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b
24 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 SHA256 851418dbbbac25e581eeb44a24e62f8841a7df33f436d1986dd7332fb5d07c60 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b WHIRLPOOL 8521b344426b5d2b246ddab7768eae45e0ee54ef58085099f9e15575e7854eb461fbcf0093caee1326e29d2425c2d451de36812cda24fa767709fc5d6046236c
25 -DIST vim-8.0.0938.tar.gz 13287289 SHA256 7a07fb164069ce82e5c90ff3831b6f3249e09193800f76d9c576867a63828071 SHA512 be4b6a29ace6a708cd7d0d3a3585cd3b88056e49f3869e18c6b895272e4ec01a8a7a68695ec2f885dd1fc139ae022a3f1b2d2d11e8b883362b9683cf5a8b0cd3 WHIRLPOOL 5098cf73f8b294686888c8b5a31199044ec1f409cc9c3de39e96911f688374282716a3137827e260c97e688bb42e79a77c53a29fa7d3364ce2c3375c2257b309
26 -DIST vim-8.0.0983.tar.gz 13292263 SHA256 5f3d5307d7055e3a55811546f6c787f1c65d209ae5b83e36c0de16d64fda8bf2 SHA512 985cdcf134c3513a973b4c91a899684a563fca4c347afba2d51892d737c8b58a2008bbf8573a98838da6df16552096e437a5064dc2ef653c7222bbac59ce6136 WHIRLPOOL 98a1ed102182f07e1dc2105b9bae73e1f6c0f7522b25ab91aba4767a3c9d805082a89bd964ab6441fb4185f4076b046a25ca92bf08f0446e4d2a53b0298bb3e0
27 -DIST vim-8.0.1056.tar.gz 13309986 SHA256 c061d1ddc0f4001415e68678780eac7121d08877a852fae484e6a93f633aec0c SHA512 19385736d4d97a66a2fb3fd8ce725d42c435da09a41e8b40234048626b28d2fa96c4db96a4313bd30f1c2d3733c52097e147c90e4bc11be80d3fcbf12fa4d13b WHIRLPOOL d81b3166f028867ebf48d43bf249675f16cda0118a2e443606a8cae01b0932d3f8a29ca568d088953d4b9d8afe8299ac207d0213ad247e1c10b9c52ed18514e1
28 DIST vim-8.0.1188.tar.gz 13363260 SHA256 cd92e56493584128bff13d3104631d3d38e66264101a3c5d59e2488f74f738de SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b WHIRLPOOL 7b19600f086d2f2908fbee5c44876a1775881d9a1cbb54428d4d1db254d14cdbcfe243fe055a754f58027c0166f7dcb1dd13b4db5662793bb7fc014bd76ea504
29 DIST vim-8.0.1298.tar.gz 13395459 SHA256 5126240843b559251fe6a96d4ce7e1dd3d1de9bcb38556dd9fe63b163629fdf2 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 WHIRLPOOL dbb1f136091ad63b78e7e26ed2ca9d5045b966fe8d7caaeace981c789d679070323a4a345d750e037aa9e0489cf7bd1769f17ac1d590f0624e50dc3276b6a84f
30
31 diff --git a/app-editors/vim/vim-8.0.0386-r1.ebuild b/app-editors/vim/vim-8.0.0386-r1.ebuild
32 deleted file mode 100644
33 index dcd88946537..00000000000
34 --- a/app-editors/vim/vim-8.0.0386-r1.ebuild
35 +++ /dev/null
36 @@ -1,329 +0,0 @@
37 -# Copyright 1999-2017 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=6
41 -VIM_VERSION="8.0"
42 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
43 -PYTHON_REQ_USE=threads
44 -inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
45 -
46 -if [[ ${PV} == 9999* ]] ; then
47 - inherit git-r3
48 - EGIT_REPO_URI="https://github.com/vim/vim.git"
49 -else
50 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
51 - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
52 - 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"
53 -fi
54 -
55 -DESCRIPTION="Vim, an improved vi-style text editor"
56 -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
57 -
58 -SLOT="0"
59 -LICENSE="vim"
60 -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
61 -REQUIRED_USE="
62 - luajit? ( lua )
63 - python? ( ${PYTHON_REQUIRED_USE} )
64 -"
65 -
66 -RDEPEND="
67 - >=app-eselect/eselect-vi-1.1
68 - >=sys-libs/ncurses-5.2-r2:0=
69 - nls? ( virtual/libintl )
70 - acl? ( kernel_linux? ( sys-apps/acl ) )
71 - cscope? ( dev-util/cscope )
72 - gpm? ( >=sys-libs/gpm-1.19.3 )
73 - lua? (
74 - luajit? ( dev-lang/luajit:2= )
75 - !luajit? ( dev-lang/lua:0[deprecated] )
76 - )
77 - !minimal? (
78 - ~app-editors/vim-core-${PV}
79 - dev-util/ctags
80 - )
81 - perl? ( dev-lang/perl:= )
82 - python? ( ${PYTHON_DEPS} )
83 - racket? ( dev-scheme/racket )
84 - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
85 - selinux? ( sys-libs/libselinux )
86 - tcl? ( dev-lang/tcl:0= )
87 - X? ( x11-libs/libXt )
88 -"
89 -DEPEND="${RDEPEND}
90 - sys-devel/autoconf
91 - nls? ( sys-devel/gettext )
92 -"
93 -
94 -pkg_setup() {
95 - # people with broken alphabets run into trouble. bug 82186.
96 - unset LANG LC_ALL
97 - export LC_COLLATE="C"
98 -
99 - # Gnome sandbox silliness. bug #114475.
100 - mkdir -p "${T}"/home
101 - export HOME="${T}"/home
102 -
103 - use python && python-single-r1_pkg_setup
104 -}
105 -
106 -src_prepare() {
107 - if [[ ${PV} != 9999* ]] ; then
108 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
109 - eapply "${WORKDIR}"/patches/
110 - fi
111 -
112 - # Fixup a script to use awk instead of nawk
113 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
114 - || die "mve.awk sed failed"
115 -
116 - # Read vimrc and gvimrc from /etc/vim
117 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
118 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
119 -
120 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
121 - # Hopefully this pattern won't break for a while at least.
122 - # This fixes bug 29398 (27 Sep 2003 agriffis)
123 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
124 - "${S}"/runtime/doc/syntax.txt \
125 - "${S}"/runtime/doc/tagsrch.txt \
126 - "${S}"/runtime/doc/usr_29.txt \
127 - "${S}"/runtime/menu.vim \
128 - "${S}"/src/configure.ac || die 'sed failed'
129 -
130 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
131 - # this is NeXT, but it's actually just a file in dev-libs/9libs
132 - # This fixes bug 43885 (20 Mar 2004 agriffis)
133 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
134 -
135 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
136 - # correctly. To avoid some really entertaining error messages about stuff
137 - # which isn't even in the source file being invalid, we'll do some trickery
138 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
139 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
140 -
141 - # conditionally make the manpager.sh script
142 - if use vim-pager ; then
143 - cat <<-END > "${S}"/runtime/macros/manpager.sh
144 - #!/bin/sh
145 - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
146 - vim \\
147 - -c 'let no_plugin_maps = 1' \\
148 - -c 'set nolist nomod ft=man ts=8' \\
149 - -c 'let g:showmarks_enable=0' \\
150 - -c 'runtime! macros/less.vim' -
151 - END
152 - fi
153 -
154 - # Try to avoid sandbox problems. Bug #114475.
155 - if [[ -d "${S}"/src/po ]] ; then
156 - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
157 - "${S}"/src/po/Makefile
158 - fi
159 -
160 - if version_is_at_least 7.3.122 ; then
161 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
162 - fi
163 -
164 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
165 - if version_is_at_least 7.3 ; then
166 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
167 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
168 - fi
169 -
170 - eapply_user
171 -}
172 -
173 -src_configure() {
174 - local myconf=()
175 -
176 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
177 - # Bug 57859 suggests that we want to do this for all archs
178 - filter-flags -funroll-all-loops
179 -
180 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
181 - # everyone since previous flag filtering bugs have turned out to affect
182 - # multiple archs...
183 - replace-flags -O3 -O2
184 -
185 - # Fix bug 18245: Prevent "make" from the following chain:
186 - # (1) Notice configure.ac is newer than auto/configure
187 - # (2) Rebuild auto/configure
188 - # (3) Notice auto/configure is newer than auto/config.mk
189 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
190 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
191 - rm -f src/auto/configure
192 - emake -j1 -C src autoconf
193 -
194 - # This should fix a sandbox violation (see bug 24447). The hvc
195 - # things are for ppc64, see bug 86433.
196 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
197 - [[ -e ${file} ]] && addwrite $file
198 - done
199 -
200 - if use minimal ; then
201 - myconf=(
202 - --with-features=tiny
203 - --disable-nls
204 - --disable-multibyte
205 - --disable-acl
206 - --enable-gui=no
207 - --without-x
208 - --disable-darwin
209 - --disable-luainterp
210 - --disable-perlinterp
211 - --disable-pythoninterp
212 - --disable-mzschemeinterp
213 - --disable-rubyinterp
214 - --disable-selinux
215 - --disable-tclinterp
216 - --disable-gpm
217 - )
218 - else
219 - use debug && append-flags "-DDEBUG"
220 -
221 - myconf=(
222 - --with-features=huge
223 - --enable-multibyte
224 - $(use_enable acl)
225 - $(use_enable cscope)
226 - $(use_enable gpm)
227 - $(use_enable lua luainterp)
228 - $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
229 - $(use_with luajit)
230 - $(use_enable nls)
231 - $(use_enable perl perlinterp)
232 - $(use_enable python pythoninterp)
233 - $(use_enable python python3interp)
234 - $(use_enable racket mzschemeinterp)
235 - $(use_enable ruby rubyinterp)
236 - $(use_enable selinux)
237 - $(use_enable tcl tclinterp)
238 - )
239 -
240 - # --with-features=huge forces on cscope even if we --disable it. We need
241 - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
242 - if ! use cscope ; then
243 - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
244 - die "couldn't disable cscope"
245 - fi
246 -
247 - # don't test USE=X here ... see bug #19115
248 - # but need to provide a way to link against X ... see bug #20093
249 - myconf+=(
250 - --enable-gui=no
251 - --disable-darwin
252 - $(use_with X x)
253 - )
254 - fi
255 -
256 - # let package manager strip binaries
257 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
258 -
259 - # keep prefix env contained within the EPREFIX
260 - use prefix && myconf+=( --without-local-dir )
261 -
262 - econf \
263 - --with-modified-by=Gentoo-${PVR} \
264 - "${myconf[@]}"
265 -}
266 -
267 -src_compile() {
268 - # The following allows emake to be used
269 - emake -j1 -C src auto/osdef.h objects
270 -
271 - emake
272 -}
273 -
274 -src_test() {
275 - echo
276 - einfo "Starting vim tests. Several error messages will be shown"
277 - einfo "while the tests run. This is normal behaviour and does not"
278 - einfo "indicate a fault."
279 - echo
280 - ewarn "If the tests fail, your terminal may be left in a strange"
281 - ewarn "state. Usually, running 'reset' will fix this."
282 - echo
283 -
284 - # Don't let vim talk to X
285 - unset DISPLAY
286 -
287 - emake -j1 -C src/testdir nongui
288 -}
289 -
290 -# Make convenience symlinks, hopefully without stepping on toes. Some
291 -# of these links are "owned" by the vim ebuild when it is installed,
292 -# but they might be good for gvim as well (see bug 45828)
293 -update_vim_symlinks() {
294 - local f syms
295 - syms="vimdiff rvim rview"
296 - einfo "Calling eselect vi update..."
297 - # Call this with --if-unset to respect user's choice (bug 187449)
298 - eselect vi update --if-unset
299 -
300 - # Make or remove convenience symlink, vim -> gvim
301 - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
302 - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
303 - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
304 - rm "${EROOT}"/usr/bin/vim
305 - fi
306 -
307 - # Make or remove convenience symlinks to vim
308 - if [[ -f "${EROOT}"/usr/bin/vim ]]; then
309 - for f in ${syms}; do
310 - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
311 - done
312 - else
313 - for f in ${syms}; do
314 - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
315 - rm -f "${EROOT}"/usr/bin/${f}
316 - fi
317 - done
318 - fi
319 -
320 - # This will still break if you merge then remove the vi package,
321 - # but there's only so much you can do, eh? Unfortunately we don't
322 - # have triggers like are done in rpm-land.
323 -}
324 -
325 -src_install() {
326 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
327 -
328 - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
329 - # managed by eselect-vi
330 - dobin src/vim
331 - dosym vim /usr/bin/vimdiff
332 - dosym vim /usr/bin/rvim
333 - dosym vim /usr/bin/rview
334 - if use vim-pager ; then
335 - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
336 - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
337 - insinto ${vimfiles}/macros
338 - doins runtime/macros/manpager.sh
339 - fperms a+x ${vimfiles}/macros/manpager.sh
340 - fi
341 -
342 - newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
343 - # keep in sync with 'complete ... -F' list
344 - bashcomp_alias vim ex vi view rvim rview vimdiff
345 -
346 - # We shouldn't be installing the ex or view man page symlinks, as they
347 - # are managed by eselect-vi
348 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
349 -}
350 -
351 -pkg_postinst() {
352 - # Update documentation tags (from vim-doc.eclass)
353 - update_vim_helptags
354 -
355 - # Make convenience symlinks
356 - update_vim_symlinks
357 -}
358 -
359 -pkg_postrm() {
360 - # Update documentation tags (from vim-doc.eclass)
361 - update_vim_helptags
362 -
363 - # Make convenience symlinks
364 - update_vim_symlinks
365 -}
366
367 diff --git a/app-editors/vim/vim-8.0.0938.ebuild b/app-editors/vim/vim-8.0.0938.ebuild
368 deleted file mode 100644
369 index 9ec2edf156f..00000000000
370 --- a/app-editors/vim/vim-8.0.0938.ebuild
371 +++ /dev/null
372 @@ -1,330 +0,0 @@
373 -# Copyright 1999-2017 Gentoo Foundation
374 -# Distributed under the terms of the GNU General Public License v2
375 -
376 -EAPI=6
377 -VIM_VERSION="8.0"
378 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
379 -PYTHON_REQ_USE=threads
380 -inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
381 -
382 -if [[ ${PV} == 9999* ]] ; then
383 - inherit git-r3
384 - EGIT_REPO_URI="https://github.com/vim/vim.git"
385 -else
386 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
387 - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
388 - 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"
389 -fi
390 -
391 -DESCRIPTION="Vim, an improved vi-style text editor"
392 -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
393 -
394 -SLOT="0"
395 -LICENSE="vim"
396 -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
397 -REQUIRED_USE="
398 - luajit? ( lua )
399 - python? ( ${PYTHON_REQUIRED_USE} )
400 -"
401 -
402 -RDEPEND="
403 - >=app-eselect/eselect-vi-1.1
404 - >=sys-libs/ncurses-5.2-r2:0=
405 - nls? ( virtual/libintl )
406 - acl? ( kernel_linux? ( sys-apps/acl ) )
407 - cscope? ( dev-util/cscope )
408 - gpm? ( >=sys-libs/gpm-1.19.3 )
409 - lua? (
410 - luajit? ( dev-lang/luajit:2= )
411 - !luajit? ( dev-lang/lua:0[deprecated] )
412 - )
413 - !minimal? (
414 - ~app-editors/vim-core-${PV}
415 - dev-util/ctags
416 - )
417 - perl? ( dev-lang/perl:= )
418 - python? ( ${PYTHON_DEPS} )
419 - racket? ( dev-scheme/racket )
420 - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
421 - selinux? ( sys-libs/libselinux )
422 - tcl? ( dev-lang/tcl:0= )
423 - X? ( x11-libs/libXt )
424 -"
425 -DEPEND="${RDEPEND}
426 - sys-devel/autoconf
427 - nls? ( sys-devel/gettext )
428 -"
429 -
430 -pkg_setup() {
431 - # people with broken alphabets run into trouble. bug 82186.
432 - unset LANG LC_ALL
433 - export LC_COLLATE="C"
434 -
435 - # Gnome sandbox silliness. bug #114475.
436 - mkdir -p "${T}"/home
437 - export HOME="${T}"/home
438 -
439 - use python && python-single-r1_pkg_setup
440 -}
441 -
442 -src_prepare() {
443 - if [[ ${PV} != 9999* ]] ; then
444 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
445 - eapply "${WORKDIR}"/patches/
446 - fi
447 -
448 - # Fixup a script to use awk instead of nawk
449 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
450 - || die "mve.awk sed failed"
451 -
452 - # Read vimrc and gvimrc from /etc/vim
453 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
454 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
455 -
456 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
457 - # Hopefully this pattern won't break for a while at least.
458 - # This fixes bug 29398 (27 Sep 2003 agriffis)
459 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
460 - "${S}"/runtime/doc/syntax.txt \
461 - "${S}"/runtime/doc/tagsrch.txt \
462 - "${S}"/runtime/doc/usr_29.txt \
463 - "${S}"/runtime/menu.vim \
464 - "${S}"/src/configure.ac || die 'sed failed'
465 -
466 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
467 - # this is NeXT, but it's actually just a file in dev-libs/9libs
468 - # This fixes bug 43885 (20 Mar 2004 agriffis)
469 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
470 -
471 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
472 - # correctly. To avoid some really entertaining error messages about stuff
473 - # which isn't even in the source file being invalid, we'll do some trickery
474 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
475 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
476 -
477 - # conditionally make the manpager.sh script
478 - if use vim-pager ; then
479 - cat <<-END > "${S}"/runtime/macros/manpager.sh
480 - #!/bin/sh
481 - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
482 - vim \\
483 - -c 'let no_plugin_maps = 1' \\
484 - -c 'set nolist nomod ft=man ts=8' \\
485 - -c 'let g:showmarks_enable=0' \\
486 - -c 'runtime! macros/less.vim' -
487 - END
488 - fi
489 -
490 - # Try to avoid sandbox problems. Bug #114475.
491 - if [[ -d "${S}"/src/po ]] ; then
492 - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
493 - "${S}"/src/po/Makefile
494 - fi
495 -
496 - if version_is_at_least 7.3.122 ; then
497 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
498 - fi
499 -
500 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
501 - if version_is_at_least 7.3 ; then
502 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
503 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
504 - fi
505 -
506 - eapply_user
507 -}
508 -
509 -src_configure() {
510 - local myconf=()
511 -
512 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
513 - # Bug 57859 suggests that we want to do this for all archs
514 - filter-flags -funroll-all-loops
515 -
516 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
517 - # everyone since previous flag filtering bugs have turned out to affect
518 - # multiple archs...
519 - replace-flags -O3 -O2
520 -
521 - # Fix bug 18245: Prevent "make" from the following chain:
522 - # (1) Notice configure.ac is newer than auto/configure
523 - # (2) Rebuild auto/configure
524 - # (3) Notice auto/configure is newer than auto/config.mk
525 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
526 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
527 - rm -f src/auto/configure
528 - emake -j1 -C src autoconf
529 -
530 - # This should fix a sandbox violation (see bug 24447). The hvc
531 - # things are for ppc64, see bug 86433.
532 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
533 - [[ -e ${file} ]] && addwrite $file
534 - done
535 -
536 - if use minimal ; then
537 - myconf=(
538 - --with-features=tiny
539 - --disable-nls
540 - --disable-multibyte
541 - --disable-acl
542 - --enable-gui=no
543 - --without-x
544 - --disable-darwin
545 - --disable-luainterp
546 - --disable-perlinterp
547 - --disable-pythoninterp
548 - --disable-mzschemeinterp
549 - --disable-rubyinterp
550 - --disable-selinux
551 - --disable-tclinterp
552 - --disable-gpm
553 - )
554 - else
555 - use debug && append-flags "-DDEBUG"
556 -
557 - myconf=(
558 - --with-features=huge
559 - --enable-multibyte
560 - $(use_enable acl)
561 - $(use_enable cscope)
562 - $(use_enable gpm)
563 - $(use_enable lua luainterp)
564 - $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
565 - $(use_with luajit)
566 - $(use_enable nls)
567 - $(use_enable perl perlinterp)
568 - $(use_enable python pythoninterp)
569 - $(use_enable python python3interp)
570 - $(use_enable racket mzschemeinterp)
571 - $(use_enable ruby rubyinterp)
572 - $(use_enable selinux)
573 - $(use_enable tcl tclinterp)
574 - $(use_enable terminal)
575 - )
576 -
577 - # --with-features=huge forces on cscope even if we --disable it. We need
578 - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
579 - if ! use cscope ; then
580 - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
581 - die "couldn't disable cscope"
582 - fi
583 -
584 - # don't test USE=X here ... see bug #19115
585 - # but need to provide a way to link against X ... see bug #20093
586 - myconf+=(
587 - --enable-gui=no
588 - --disable-darwin
589 - $(use_with X x)
590 - )
591 - fi
592 -
593 - # let package manager strip binaries
594 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
595 -
596 - # keep prefix env contained within the EPREFIX
597 - use prefix && myconf+=( --without-local-dir )
598 -
599 - econf \
600 - --with-modified-by=Gentoo-${PVR} \
601 - "${myconf[@]}"
602 -}
603 -
604 -src_compile() {
605 - # The following allows emake to be used
606 - emake -j1 -C src auto/osdef.h objects
607 -
608 - emake
609 -}
610 -
611 -src_test() {
612 - echo
613 - einfo "Starting vim tests. Several error messages will be shown"
614 - einfo "while the tests run. This is normal behaviour and does not"
615 - einfo "indicate a fault."
616 - echo
617 - ewarn "If the tests fail, your terminal may be left in a strange"
618 - ewarn "state. Usually, running 'reset' will fix this."
619 - echo
620 -
621 - # Don't let vim talk to X
622 - unset DISPLAY
623 -
624 - emake -j1 -C src/testdir nongui
625 -}
626 -
627 -# Make convenience symlinks, hopefully without stepping on toes. Some
628 -# of these links are "owned" by the vim ebuild when it is installed,
629 -# but they might be good for gvim as well (see bug 45828)
630 -update_vim_symlinks() {
631 - local f syms
632 - syms="vimdiff rvim rview"
633 - einfo "Calling eselect vi update..."
634 - # Call this with --if-unset to respect user's choice (bug 187449)
635 - eselect vi update --if-unset
636 -
637 - # Make or remove convenience symlink, vim -> gvim
638 - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
639 - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
640 - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
641 - rm "${EROOT}"/usr/bin/vim
642 - fi
643 -
644 - # Make or remove convenience symlinks to vim
645 - if [[ -f "${EROOT}"/usr/bin/vim ]]; then
646 - for f in ${syms}; do
647 - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
648 - done
649 - else
650 - for f in ${syms}; do
651 - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
652 - rm -f "${EROOT}"/usr/bin/${f}
653 - fi
654 - done
655 - fi
656 -
657 - # This will still break if you merge then remove the vi package,
658 - # but there's only so much you can do, eh? Unfortunately we don't
659 - # have triggers like are done in rpm-land.
660 -}
661 -
662 -src_install() {
663 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
664 -
665 - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
666 - # managed by eselect-vi
667 - dobin src/vim
668 - dosym vim /usr/bin/vimdiff
669 - dosym vim /usr/bin/rvim
670 - dosym vim /usr/bin/rview
671 - if use vim-pager ; then
672 - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
673 - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
674 - insinto ${vimfiles}/macros
675 - doins runtime/macros/manpager.sh
676 - fperms a+x ${vimfiles}/macros/manpager.sh
677 - fi
678 -
679 - newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
680 - # keep in sync with 'complete ... -F' list
681 - bashcomp_alias vim ex vi view rvim rview vimdiff
682 -
683 - # We shouldn't be installing the ex or view man page symlinks, as they
684 - # are managed by eselect-vi
685 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
686 -}
687 -
688 -pkg_postinst() {
689 - # Update documentation tags (from vim-doc.eclass)
690 - update_vim_helptags
691 -
692 - # Make convenience symlinks
693 - update_vim_symlinks
694 -}
695 -
696 -pkg_postrm() {
697 - # Update documentation tags (from vim-doc.eclass)
698 - update_vim_helptags
699 -
700 - # Make convenience symlinks
701 - update_vim_symlinks
702 -}
703
704 diff --git a/app-editors/vim/vim-8.0.0983.ebuild b/app-editors/vim/vim-8.0.0983.ebuild
705 deleted file mode 100644
706 index 1514ffa1b1d..00000000000
707 --- a/app-editors/vim/vim-8.0.0983.ebuild
708 +++ /dev/null
709 @@ -1,330 +0,0 @@
710 -# Copyright 1999-2017 Gentoo Foundation
711 -# Distributed under the terms of the GNU General Public License v2
712 -
713 -EAPI=6
714 -VIM_VERSION="8.0"
715 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
716 -PYTHON_REQ_USE=threads
717 -inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
718 -
719 -if [[ ${PV} == 9999* ]] ; then
720 - inherit git-r3
721 - EGIT_REPO_URI="https://github.com/vim/vim.git"
722 -else
723 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
724 - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
725 - 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"
726 -fi
727 -
728 -DESCRIPTION="Vim, an improved vi-style text editor"
729 -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
730 -
731 -SLOT="0"
732 -LICENSE="vim"
733 -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
734 -REQUIRED_USE="
735 - luajit? ( lua )
736 - python? ( ${PYTHON_REQUIRED_USE} )
737 -"
738 -
739 -RDEPEND="
740 - >=app-eselect/eselect-vi-1.1
741 - >=sys-libs/ncurses-5.2-r2:0=
742 - nls? ( virtual/libintl )
743 - acl? ( kernel_linux? ( sys-apps/acl ) )
744 - cscope? ( dev-util/cscope )
745 - gpm? ( >=sys-libs/gpm-1.19.3 )
746 - lua? (
747 - luajit? ( dev-lang/luajit:2= )
748 - !luajit? ( dev-lang/lua:0[deprecated] )
749 - )
750 - !minimal? (
751 - ~app-editors/vim-core-${PV}
752 - dev-util/ctags
753 - )
754 - perl? ( dev-lang/perl:= )
755 - python? ( ${PYTHON_DEPS} )
756 - racket? ( dev-scheme/racket )
757 - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
758 - selinux? ( sys-libs/libselinux )
759 - tcl? ( dev-lang/tcl:0= )
760 - X? ( x11-libs/libXt )
761 -"
762 -DEPEND="${RDEPEND}
763 - sys-devel/autoconf
764 - nls? ( sys-devel/gettext )
765 -"
766 -
767 -pkg_setup() {
768 - # people with broken alphabets run into trouble. bug 82186.
769 - unset LANG LC_ALL
770 - export LC_COLLATE="C"
771 -
772 - # Gnome sandbox silliness. bug #114475.
773 - mkdir -p "${T}"/home
774 - export HOME="${T}"/home
775 -
776 - use python && python-single-r1_pkg_setup
777 -}
778 -
779 -src_prepare() {
780 - if [[ ${PV} != 9999* ]] ; then
781 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
782 - eapply "${WORKDIR}"/patches/
783 - fi
784 -
785 - # Fixup a script to use awk instead of nawk
786 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
787 - || die "mve.awk sed failed"
788 -
789 - # Read vimrc and gvimrc from /etc/vim
790 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
791 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
792 -
793 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
794 - # Hopefully this pattern won't break for a while at least.
795 - # This fixes bug 29398 (27 Sep 2003 agriffis)
796 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
797 - "${S}"/runtime/doc/syntax.txt \
798 - "${S}"/runtime/doc/tagsrch.txt \
799 - "${S}"/runtime/doc/usr_29.txt \
800 - "${S}"/runtime/menu.vim \
801 - "${S}"/src/configure.ac || die 'sed failed'
802 -
803 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
804 - # this is NeXT, but it's actually just a file in dev-libs/9libs
805 - # This fixes bug 43885 (20 Mar 2004 agriffis)
806 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
807 -
808 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
809 - # correctly. To avoid some really entertaining error messages about stuff
810 - # which isn't even in the source file being invalid, we'll do some trickery
811 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
812 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
813 -
814 - # conditionally make the manpager.sh script
815 - if use vim-pager ; then
816 - cat <<-END > "${S}"/runtime/macros/manpager.sh
817 - #!/bin/sh
818 - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
819 - vim \\
820 - -c 'let no_plugin_maps = 1' \\
821 - -c 'set nolist nomod ft=man ts=8' \\
822 - -c 'let g:showmarks_enable=0' \\
823 - -c 'runtime! macros/less.vim' -
824 - END
825 - fi
826 -
827 - # Try to avoid sandbox problems. Bug #114475.
828 - if [[ -d "${S}"/src/po ]] ; then
829 - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
830 - "${S}"/src/po/Makefile
831 - fi
832 -
833 - if version_is_at_least 7.3.122 ; then
834 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
835 - fi
836 -
837 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
838 - if version_is_at_least 7.3 ; then
839 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
840 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
841 - fi
842 -
843 - eapply_user
844 -}
845 -
846 -src_configure() {
847 - local myconf=()
848 -
849 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
850 - # Bug 57859 suggests that we want to do this for all archs
851 - filter-flags -funroll-all-loops
852 -
853 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
854 - # everyone since previous flag filtering bugs have turned out to affect
855 - # multiple archs...
856 - replace-flags -O3 -O2
857 -
858 - # Fix bug 18245: Prevent "make" from the following chain:
859 - # (1) Notice configure.ac is newer than auto/configure
860 - # (2) Rebuild auto/configure
861 - # (3) Notice auto/configure is newer than auto/config.mk
862 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
863 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
864 - rm -f src/auto/configure
865 - emake -j1 -C src autoconf
866 -
867 - # This should fix a sandbox violation (see bug 24447). The hvc
868 - # things are for ppc64, see bug 86433.
869 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
870 - [[ -e ${file} ]] && addwrite $file
871 - done
872 -
873 - if use minimal ; then
874 - myconf=(
875 - --with-features=tiny
876 - --disable-nls
877 - --disable-multibyte
878 - --disable-acl
879 - --enable-gui=no
880 - --without-x
881 - --disable-darwin
882 - --disable-luainterp
883 - --disable-perlinterp
884 - --disable-pythoninterp
885 - --disable-mzschemeinterp
886 - --disable-rubyinterp
887 - --disable-selinux
888 - --disable-tclinterp
889 - --disable-gpm
890 - )
891 - else
892 - use debug && append-flags "-DDEBUG"
893 -
894 - myconf=(
895 - --with-features=huge
896 - --enable-multibyte
897 - $(use_enable acl)
898 - $(use_enable cscope)
899 - $(use_enable gpm)
900 - $(use_enable lua luainterp)
901 - $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
902 - $(use_with luajit)
903 - $(use_enable nls)
904 - $(use_enable perl perlinterp)
905 - $(use_enable python pythoninterp)
906 - $(use_enable python python3interp)
907 - $(use_enable racket mzschemeinterp)
908 - $(use_enable ruby rubyinterp)
909 - $(use_enable selinux)
910 - $(use_enable tcl tclinterp)
911 - $(use_enable terminal)
912 - )
913 -
914 - # --with-features=huge forces on cscope even if we --disable it. We need
915 - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
916 - if ! use cscope ; then
917 - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
918 - die "couldn't disable cscope"
919 - fi
920 -
921 - # don't test USE=X here ... see bug #19115
922 - # but need to provide a way to link against X ... see bug #20093
923 - myconf+=(
924 - --enable-gui=no
925 - --disable-darwin
926 - $(use_with X x)
927 - )
928 - fi
929 -
930 - # let package manager strip binaries
931 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
932 -
933 - # keep prefix env contained within the EPREFIX
934 - use prefix && myconf+=( --without-local-dir )
935 -
936 - econf \
937 - --with-modified-by=Gentoo-${PVR} \
938 - "${myconf[@]}"
939 -}
940 -
941 -src_compile() {
942 - # The following allows emake to be used
943 - emake -j1 -C src auto/osdef.h objects
944 -
945 - emake
946 -}
947 -
948 -src_test() {
949 - echo
950 - einfo "Starting vim tests. Several error messages will be shown"
951 - einfo "while the tests run. This is normal behaviour and does not"
952 - einfo "indicate a fault."
953 - echo
954 - ewarn "If the tests fail, your terminal may be left in a strange"
955 - ewarn "state. Usually, running 'reset' will fix this."
956 - echo
957 -
958 - # Don't let vim talk to X
959 - unset DISPLAY
960 -
961 - emake -j1 -C src/testdir nongui
962 -}
963 -
964 -# Make convenience symlinks, hopefully without stepping on toes. Some
965 -# of these links are "owned" by the vim ebuild when it is installed,
966 -# but they might be good for gvim as well (see bug 45828)
967 -update_vim_symlinks() {
968 - local f syms
969 - syms="vimdiff rvim rview"
970 - einfo "Calling eselect vi update..."
971 - # Call this with --if-unset to respect user's choice (bug 187449)
972 - eselect vi update --if-unset
973 -
974 - # Make or remove convenience symlink, vim -> gvim
975 - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
976 - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
977 - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
978 - rm "${EROOT}"/usr/bin/vim
979 - fi
980 -
981 - # Make or remove convenience symlinks to vim
982 - if [[ -f "${EROOT}"/usr/bin/vim ]]; then
983 - for f in ${syms}; do
984 - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
985 - done
986 - else
987 - for f in ${syms}; do
988 - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
989 - rm -f "${EROOT}"/usr/bin/${f}
990 - fi
991 - done
992 - fi
993 -
994 - # This will still break if you merge then remove the vi package,
995 - # but there's only so much you can do, eh? Unfortunately we don't
996 - # have triggers like are done in rpm-land.
997 -}
998 -
999 -src_install() {
1000 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
1001 -
1002 - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
1003 - # managed by eselect-vi
1004 - dobin src/vim
1005 - dosym vim /usr/bin/vimdiff
1006 - dosym vim /usr/bin/rvim
1007 - dosym vim /usr/bin/rview
1008 - if use vim-pager ; then
1009 - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
1010 - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
1011 - insinto ${vimfiles}/macros
1012 - doins runtime/macros/manpager.sh
1013 - fperms a+x ${vimfiles}/macros/manpager.sh
1014 - fi
1015 -
1016 - newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
1017 - # keep in sync with 'complete ... -F' list
1018 - bashcomp_alias vim ex vi view rvim rview vimdiff
1019 -
1020 - # We shouldn't be installing the ex or view man page symlinks, as they
1021 - # are managed by eselect-vi
1022 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
1023 -}
1024 -
1025 -pkg_postinst() {
1026 - # Update documentation tags (from vim-doc.eclass)
1027 - update_vim_helptags
1028 -
1029 - # Make convenience symlinks
1030 - update_vim_symlinks
1031 -}
1032 -
1033 -pkg_postrm() {
1034 - # Update documentation tags (from vim-doc.eclass)
1035 - update_vim_helptags
1036 -
1037 - # Make convenience symlinks
1038 - update_vim_symlinks
1039 -}
1040
1041 diff --git a/app-editors/vim/vim-8.0.1056.ebuild b/app-editors/vim/vim-8.0.1056.ebuild
1042 deleted file mode 100644
1043 index 1514ffa1b1d..00000000000
1044 --- a/app-editors/vim/vim-8.0.1056.ebuild
1045 +++ /dev/null
1046 @@ -1,330 +0,0 @@
1047 -# Copyright 1999-2017 Gentoo Foundation
1048 -# Distributed under the terms of the GNU General Public License v2
1049 -
1050 -EAPI=6
1051 -VIM_VERSION="8.0"
1052 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
1053 -PYTHON_REQ_USE=threads
1054 -inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
1055 -
1056 -if [[ ${PV} == 9999* ]] ; then
1057 - inherit git-r3
1058 - EGIT_REPO_URI="https://github.com/vim/vim.git"
1059 -else
1060 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
1061 - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
1062 - 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"
1063 -fi
1064 -
1065 -DESCRIPTION="Vim, an improved vi-style text editor"
1066 -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
1067 -
1068 -SLOT="0"
1069 -LICENSE="vim"
1070 -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
1071 -REQUIRED_USE="
1072 - luajit? ( lua )
1073 - python? ( ${PYTHON_REQUIRED_USE} )
1074 -"
1075 -
1076 -RDEPEND="
1077 - >=app-eselect/eselect-vi-1.1
1078 - >=sys-libs/ncurses-5.2-r2:0=
1079 - nls? ( virtual/libintl )
1080 - acl? ( kernel_linux? ( sys-apps/acl ) )
1081 - cscope? ( dev-util/cscope )
1082 - gpm? ( >=sys-libs/gpm-1.19.3 )
1083 - lua? (
1084 - luajit? ( dev-lang/luajit:2= )
1085 - !luajit? ( dev-lang/lua:0[deprecated] )
1086 - )
1087 - !minimal? (
1088 - ~app-editors/vim-core-${PV}
1089 - dev-util/ctags
1090 - )
1091 - perl? ( dev-lang/perl:= )
1092 - python? ( ${PYTHON_DEPS} )
1093 - racket? ( dev-scheme/racket )
1094 - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
1095 - selinux? ( sys-libs/libselinux )
1096 - tcl? ( dev-lang/tcl:0= )
1097 - X? ( x11-libs/libXt )
1098 -"
1099 -DEPEND="${RDEPEND}
1100 - sys-devel/autoconf
1101 - nls? ( sys-devel/gettext )
1102 -"
1103 -
1104 -pkg_setup() {
1105 - # people with broken alphabets run into trouble. bug 82186.
1106 - unset LANG LC_ALL
1107 - export LC_COLLATE="C"
1108 -
1109 - # Gnome sandbox silliness. bug #114475.
1110 - mkdir -p "${T}"/home
1111 - export HOME="${T}"/home
1112 -
1113 - use python && python-single-r1_pkg_setup
1114 -}
1115 -
1116 -src_prepare() {
1117 - if [[ ${PV} != 9999* ]] ; then
1118 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
1119 - eapply "${WORKDIR}"/patches/
1120 - fi
1121 -
1122 - # Fixup a script to use awk instead of nawk
1123 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
1124 - || die "mve.awk sed failed"
1125 -
1126 - # Read vimrc and gvimrc from /etc/vim
1127 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
1128 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
1129 -
1130 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
1131 - # Hopefully this pattern won't break for a while at least.
1132 - # This fixes bug 29398 (27 Sep 2003 agriffis)
1133 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
1134 - "${S}"/runtime/doc/syntax.txt \
1135 - "${S}"/runtime/doc/tagsrch.txt \
1136 - "${S}"/runtime/doc/usr_29.txt \
1137 - "${S}"/runtime/menu.vim \
1138 - "${S}"/src/configure.ac || die 'sed failed'
1139 -
1140 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
1141 - # this is NeXT, but it's actually just a file in dev-libs/9libs
1142 - # This fixes bug 43885 (20 Mar 2004 agriffis)
1143 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
1144 -
1145 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
1146 - # correctly. To avoid some really entertaining error messages about stuff
1147 - # which isn't even in the source file being invalid, we'll do some trickery
1148 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
1149 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
1150 -
1151 - # conditionally make the manpager.sh script
1152 - if use vim-pager ; then
1153 - cat <<-END > "${S}"/runtime/macros/manpager.sh
1154 - #!/bin/sh
1155 - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
1156 - vim \\
1157 - -c 'let no_plugin_maps = 1' \\
1158 - -c 'set nolist nomod ft=man ts=8' \\
1159 - -c 'let g:showmarks_enable=0' \\
1160 - -c 'runtime! macros/less.vim' -
1161 - END
1162 - fi
1163 -
1164 - # Try to avoid sandbox problems. Bug #114475.
1165 - if [[ -d "${S}"/src/po ]] ; then
1166 - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
1167 - "${S}"/src/po/Makefile
1168 - fi
1169 -
1170 - if version_is_at_least 7.3.122 ; then
1171 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
1172 - fi
1173 -
1174 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
1175 - if version_is_at_least 7.3 ; then
1176 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
1177 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
1178 - fi
1179 -
1180 - eapply_user
1181 -}
1182 -
1183 -src_configure() {
1184 - local myconf=()
1185 -
1186 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
1187 - # Bug 57859 suggests that we want to do this for all archs
1188 - filter-flags -funroll-all-loops
1189 -
1190 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
1191 - # everyone since previous flag filtering bugs have turned out to affect
1192 - # multiple archs...
1193 - replace-flags -O3 -O2
1194 -
1195 - # Fix bug 18245: Prevent "make" from the following chain:
1196 - # (1) Notice configure.ac is newer than auto/configure
1197 - # (2) Rebuild auto/configure
1198 - # (3) Notice auto/configure is newer than auto/config.mk
1199 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
1200 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
1201 - rm -f src/auto/configure
1202 - emake -j1 -C src autoconf
1203 -
1204 - # This should fix a sandbox violation (see bug 24447). The hvc
1205 - # things are for ppc64, see bug 86433.
1206 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
1207 - [[ -e ${file} ]] && addwrite $file
1208 - done
1209 -
1210 - if use minimal ; then
1211 - myconf=(
1212 - --with-features=tiny
1213 - --disable-nls
1214 - --disable-multibyte
1215 - --disable-acl
1216 - --enable-gui=no
1217 - --without-x
1218 - --disable-darwin
1219 - --disable-luainterp
1220 - --disable-perlinterp
1221 - --disable-pythoninterp
1222 - --disable-mzschemeinterp
1223 - --disable-rubyinterp
1224 - --disable-selinux
1225 - --disable-tclinterp
1226 - --disable-gpm
1227 - )
1228 - else
1229 - use debug && append-flags "-DDEBUG"
1230 -
1231 - myconf=(
1232 - --with-features=huge
1233 - --enable-multibyte
1234 - $(use_enable acl)
1235 - $(use_enable cscope)
1236 - $(use_enable gpm)
1237 - $(use_enable lua luainterp)
1238 - $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
1239 - $(use_with luajit)
1240 - $(use_enable nls)
1241 - $(use_enable perl perlinterp)
1242 - $(use_enable python pythoninterp)
1243 - $(use_enable python python3interp)
1244 - $(use_enable racket mzschemeinterp)
1245 - $(use_enable ruby rubyinterp)
1246 - $(use_enable selinux)
1247 - $(use_enable tcl tclinterp)
1248 - $(use_enable terminal)
1249 - )
1250 -
1251 - # --with-features=huge forces on cscope even if we --disable it. We need
1252 - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
1253 - if ! use cscope ; then
1254 - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
1255 - die "couldn't disable cscope"
1256 - fi
1257 -
1258 - # don't test USE=X here ... see bug #19115
1259 - # but need to provide a way to link against X ... see bug #20093
1260 - myconf+=(
1261 - --enable-gui=no
1262 - --disable-darwin
1263 - $(use_with X x)
1264 - )
1265 - fi
1266 -
1267 - # let package manager strip binaries
1268 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
1269 -
1270 - # keep prefix env contained within the EPREFIX
1271 - use prefix && myconf+=( --without-local-dir )
1272 -
1273 - econf \
1274 - --with-modified-by=Gentoo-${PVR} \
1275 - "${myconf[@]}"
1276 -}
1277 -
1278 -src_compile() {
1279 - # The following allows emake to be used
1280 - emake -j1 -C src auto/osdef.h objects
1281 -
1282 - emake
1283 -}
1284 -
1285 -src_test() {
1286 - echo
1287 - einfo "Starting vim tests. Several error messages will be shown"
1288 - einfo "while the tests run. This is normal behaviour and does not"
1289 - einfo "indicate a fault."
1290 - echo
1291 - ewarn "If the tests fail, your terminal may be left in a strange"
1292 - ewarn "state. Usually, running 'reset' will fix this."
1293 - echo
1294 -
1295 - # Don't let vim talk to X
1296 - unset DISPLAY
1297 -
1298 - emake -j1 -C src/testdir nongui
1299 -}
1300 -
1301 -# Make convenience symlinks, hopefully without stepping on toes. Some
1302 -# of these links are "owned" by the vim ebuild when it is installed,
1303 -# but they might be good for gvim as well (see bug 45828)
1304 -update_vim_symlinks() {
1305 - local f syms
1306 - syms="vimdiff rvim rview"
1307 - einfo "Calling eselect vi update..."
1308 - # Call this with --if-unset to respect user's choice (bug 187449)
1309 - eselect vi update --if-unset
1310 -
1311 - # Make or remove convenience symlink, vim -> gvim
1312 - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
1313 - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
1314 - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
1315 - rm "${EROOT}"/usr/bin/vim
1316 - fi
1317 -
1318 - # Make or remove convenience symlinks to vim
1319 - if [[ -f "${EROOT}"/usr/bin/vim ]]; then
1320 - for f in ${syms}; do
1321 - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
1322 - done
1323 - else
1324 - for f in ${syms}; do
1325 - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
1326 - rm -f "${EROOT}"/usr/bin/${f}
1327 - fi
1328 - done
1329 - fi
1330 -
1331 - # This will still break if you merge then remove the vi package,
1332 - # but there's only so much you can do, eh? Unfortunately we don't
1333 - # have triggers like are done in rpm-land.
1334 -}
1335 -
1336 -src_install() {
1337 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
1338 -
1339 - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
1340 - # managed by eselect-vi
1341 - dobin src/vim
1342 - dosym vim /usr/bin/vimdiff
1343 - dosym vim /usr/bin/rvim
1344 - dosym vim /usr/bin/rview
1345 - if use vim-pager ; then
1346 - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
1347 - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
1348 - insinto ${vimfiles}/macros
1349 - doins runtime/macros/manpager.sh
1350 - fperms a+x ${vimfiles}/macros/manpager.sh
1351 - fi
1352 -
1353 - newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
1354 - # keep in sync with 'complete ... -F' list
1355 - bashcomp_alias vim ex vi view rvim rview vimdiff
1356 -
1357 - # We shouldn't be installing the ex or view man page symlinks, as they
1358 - # are managed by eselect-vi
1359 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
1360 -}
1361 -
1362 -pkg_postinst() {
1363 - # Update documentation tags (from vim-doc.eclass)
1364 - update_vim_helptags
1365 -
1366 - # Make convenience symlinks
1367 - update_vim_symlinks
1368 -}
1369 -
1370 -pkg_postrm() {
1371 - # Update documentation tags (from vim-doc.eclass)
1372 - update_vim_helptags
1373 -
1374 - # Make convenience symlinks
1375 - update_vim_symlinks
1376 -}