1 |
radhermit 14/05/01 09:07:12 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gvim-7.4.273.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
9 |
|
10 |
Revision Changes Path |
11 |
1.426 app-editors/gvim/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/ChangeLog?rev=1.426&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/ChangeLog?rev=1.426&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/ChangeLog?r1=1.425&r2=1.426 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v |
20 |
retrieving revision 1.425 |
21 |
retrieving revision 1.426 |
22 |
diff -u -r1.425 -r1.426 |
23 |
--- ChangeLog 27 Apr 2014 21:35:31 -0000 1.425 |
24 |
+++ ChangeLog 1 May 2014 09:07:12 -0000 1.426 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for app-editors/gvim |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.425 2014/04/27 21:35:31 floppym Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.426 2014/05/01 09:07:12 radhermit Exp $ |
30 |
+ |
31 |
+*gvim-7.4.273 (01 May 2014) |
32 |
+ |
33 |
+ 01 May 2014; Tim Harder <radhermit@g.o> +gvim-7.4.273.ebuild: |
34 |
+ Version bump. |
35 |
|
36 |
27 Apr 2014; Mike Gilbert <floppym@g.o> gvim-7.4.193.ebuild, |
37 |
gvim-9999.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 app-editors/gvim/gvim-7.4.273.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/gvim-7.4.273.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/gvim-7.4.273.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: gvim-7.4.273.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2014 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.273.ebuild,v 1.1 2014/05/01 09:07:12 radhermit Exp $ |
51 |
|
52 |
EAPI=5 |
53 |
VIM_VERSION="7.4" |
54 |
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) |
55 |
PYTHON_REQ_USE=threads |
56 |
inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-single-r1 |
57 |
|
58 |
if [[ ${PV} == 9999* ]] ; then |
59 |
inherit mercurial |
60 |
EHG_REPO_URI="https://vim.googlecode.com/hg/" |
61 |
EHG_PROJECT="vim" |
62 |
else |
63 |
VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" |
64 |
|
65 |
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 |
66 |
http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}" |
67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" |
68 |
fi |
69 |
|
70 |
DESCRIPTION="GUI version of the Vim text editor" |
71 |
HOMEPAGE="http://www.vim.org/" |
72 |
|
73 |
SLOT="0" |
74 |
LICENSE="vim" |
75 |
IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" |
76 |
REQUIRED_USE=" |
77 |
python? ( ${PYTHON_REQUIRED_USE} ) |
78 |
luajit? ( lua ) |
79 |
" |
80 |
|
81 |
RDEPEND=" |
82 |
~app-editors/vim-core-${PV} |
83 |
>=app-admin/eselect-vi-1.1 |
84 |
>=sys-libs/ncurses-5.2-r2 |
85 |
x11-libs/libXext |
86 |
x11-libs/libXt |
87 |
acl? ( kernel_linux? ( sys-apps/acl ) ) |
88 |
!aqua? ( |
89 |
gtk? ( |
90 |
>=x11-libs/gtk+-2.6:2 |
91 |
x11-libs/libXft |
92 |
gnome? ( >=gnome-base/libgnomeui-2.6 ) |
93 |
) |
94 |
!gtk? ( |
95 |
motif? ( >=x11-libs/motif-2.3:0 ) |
96 |
!motif? ( |
97 |
neXt? ( x11-libs/neXtaw ) |
98 |
!neXt? ( x11-libs/libXaw ) |
99 |
) |
100 |
) |
101 |
) |
102 |
cscope? ( dev-util/cscope ) |
103 |
lua? ( |
104 |
luajit? ( dev-lang/luajit ) |
105 |
!luajit? ( dev-lang/lua[deprecated] ) |
106 |
) |
107 |
nls? ( virtual/libintl ) |
108 |
perl? ( dev-lang/perl ) |
109 |
python? ( ${PYTHON_DEPS} ) |
110 |
racket? ( dev-scheme/racket ) |
111 |
ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) |
112 |
selinux? ( sys-libs/libselinux ) |
113 |
session? ( x11-libs/libSM ) |
114 |
tcl? ( dev-lang/tcl ) |
115 |
" |
116 |
DEPEND="${RDEPEND} |
117 |
>=app-admin/eselect-vi-1.1 |
118 |
dev-util/ctags |
119 |
sys-devel/autoconf |
120 |
virtual/pkgconfig |
121 |
nls? ( sys-devel/gettext ) |
122 |
" |
123 |
|
124 |
S=${WORKDIR}/vim${VIM_VERSION/.} |
125 |
|
126 |
pkg_setup() { |
127 |
# people with broken alphabets run into trouble. bug 82186. |
128 |
unset LANG LC_ALL |
129 |
export LC_COLLATE="C" |
130 |
|
131 |
# Gnome sandbox silliness. bug #114475. |
132 |
mkdir -p "${T}"/home |
133 |
export HOME="${T}"/home |
134 |
|
135 |
use python && python-single-r1_pkg_setup |
136 |
} |
137 |
|
138 |
src_prepare() { |
139 |
if [[ ${PV} != 9999* ]] ; then |
140 |
if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then |
141 |
# Apply any patches available from vim.org for this version |
142 |
epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} |
143 |
fi |
144 |
fi |
145 |
|
146 |
# Fixup a script to use awk instead of nawk |
147 |
sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ |
148 |
|| die "mve.awk sed failed" |
149 |
|
150 |
# Read vimrc and gvimrc from /etc/vim |
151 |
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h |
152 |
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h |
153 |
|
154 |
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags. |
155 |
# Hopefully this pattern won't break for a while at least. |
156 |
# This fixes bug 29398 (27 Sep 2003 agriffis) |
157 |
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ |
158 |
"${S}"/runtime/doc/syntax.txt \ |
159 |
"${S}"/runtime/doc/tagsrch.txt \ |
160 |
"${S}"/runtime/doc/usr_29.txt \ |
161 |
"${S}"/runtime/menu.vim \ |
162 |
"${S}"/src/configure.in || die 'sed failed' |
163 |
|
164 |
# Don't be fooled by /usr/include/libc.h. When found, vim thinks |
165 |
# this is NeXT, but it's actually just a file in dev-libs/9libs |
166 |
# This fixes bug 43885 (20 Mar 2004 agriffis) |
167 |
sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed' |
168 |
|
169 |
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF |
170 |
# correctly. To avoid some really entertaining error messages about stuff |
171 |
# which isn't even in the source file being invalid, we'll do some trickery |
172 |
# to make the error never occur. bug 66162 (02 October 2004 ciaranm) |
173 |
find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done |
174 |
|
175 |
# Try to avoid sandbox problems. Bug #114475. |
176 |
if [[ -d "${S}"/src/po ]] ; then |
177 |
sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ |
178 |
"${S}"/src/po/Makefile |
179 |
fi |
180 |
|
181 |
if version_is_at_least 7.3.122 ; then |
182 |
cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk |
183 |
fi |
184 |
|
185 |
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 |
186 |
if version_is_at_least 7.3 ; then |
187 |
sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ |
188 |
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' |
189 |
fi |
190 |
|
191 |
epatch_user |
192 |
} |
193 |
|
194 |
src_configure() { |
195 |
local myconf |
196 |
|
197 |
# Fix bug 37354: Disallow -funroll-all-loops on amd64 |
198 |
# Bug 57859 suggests that we want to do this for all archs |
199 |
filter-flags -funroll-all-loops |
200 |
|
201 |
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for |
202 |
# everyone since previous flag filtering bugs have turned out to affect |
203 |
# multiple archs... |
204 |
replace-flags -O3 -O2 |
205 |
|
206 |
# Fix bug 18245: Prevent "make" from the following chain: |
207 |
# (1) Notice configure.in is newer than auto/configure |
208 |
# (2) Rebuild auto/configure |
209 |
# (3) Notice auto/configure is newer than auto/config.mk |
210 |
# (4) Run ./configure (with wrong args) to remake auto/config.mk |
211 |
sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed" |
212 |
rm -f src/auto/configure |
213 |
emake -j1 -C src autoconf |
214 |
|
215 |
# This should fix a sandbox violation (see bug 24447). The hvc |
216 |
# things are for ppc64, see bug 86433. |
217 |
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do |
218 |
[[ -e ${file} ]] && addwrite $file |
219 |
done |
220 |
|
221 |
use debug && append-flags "-DDEBUG" |
222 |
|
223 |
myconf="--with-features=huge --disable-gpm --enable-multibyte" |
224 |
myconf+=" $(use_enable acl)" |
225 |
myconf+=" $(use_enable cscope)" |
226 |
myconf+=" $(use_enable lua luainterp)" |
227 |
myconf+=" $(use_with luajit)" |
228 |
myconf+=" $(use_enable netbeans)" |
229 |
myconf+=" $(use_enable nls)" |
230 |
myconf+=" $(use_enable perl perlinterp)" |
231 |
myconf+=" $(use_enable racket mzschemeinterp)" |
232 |
myconf+=" $(use_enable ruby rubyinterp)" |
233 |
myconf+=" $(use_enable selinux)" |
234 |
myconf+=" $(use_enable session xsmp)" |
235 |
myconf+=" $(use_enable tcl tclinterp)" |
236 |
|
237 |
if use python ; then |
238 |
if [[ ${EPYTHON} == python3* ]] ; then |
239 |
myconf+=" --enable-python3interp" |
240 |
export vi_cv_path_python3="${PYTHON}" |
241 |
else |
242 |
myconf+=" --enable-pythoninterp" |
243 |
export vi_cv_path_python="${PYTHON}" |
244 |
fi |
245 |
else |
246 |
myconf+=" --disable-pythoninterp --disable-python3interp" |
247 |
fi |
248 |
|
249 |
# --with-features=huge forces on cscope even if we --disable it. We need |
250 |
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) |
251 |
if ! use cscope ; then |
252 |
sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ |
253 |
die "couldn't disable cscope" |
254 |
fi |
255 |
|
256 |
# gvim's GUI preference order is as follows: |
257 |
# aqua CARBON (not tested) |
258 |
# -aqua gtk gnome GNOME2 |
259 |
# -aqua gtk -gnome GTK2 |
260 |
# -aqua -gtk motif MOTIF |
261 |
# -aqua -gtk -motif neXt NEXTAW |
262 |
# -aqua -gtk -motif -neXt ATHENA |
263 |
echo ; echo |
264 |
if use aqua ; then |
265 |
einfo "Building gvim with the Carbon GUI" |
266 |
myconf+=" --enable-darwin --enable-gui=carbon" |
267 |
elif use gtk ; then |
268 |
myconf+=" --enable-gtk2-check" |
269 |
if use gnome ; then |
270 |
einfo "Building gvim with the Gnome 2 GUI" |
271 |
myconf+=" --enable-gui=gnome2" |
272 |
else |
273 |
einfo "Building gvim with the gtk+-2 GUI" |
274 |
myconf+=" --enable-gui=gtk2" |
275 |
fi |
276 |
elif use motif ; then |
277 |
einfo "Building gvim with the MOTIF GUI" |
278 |
myconf+=" --enable-gui=motif" |
279 |
elif use neXt ; then |
280 |
einfo "Building gvim with the neXtaw GUI" |
281 |
myconf+=" --enable-gui=nextaw" |
282 |
else |
283 |
einfo "Building gvim with the Athena GUI" |
284 |
myconf+=" --enable-gui=athena" |
285 |
fi |
286 |
echo ; echo |
287 |
|
288 |
# Let Portage do the stripping. Some people like that. |
289 |
export ac_cv_prog_STRIP="$(type -P true ) faking strip" |
290 |
|
291 |
# Keep Gentoo Prefix env contained within the EPREFIX |
292 |
use prefix && myconf+=" --without-local-dir" |
293 |
|
294 |
if [[ ${CHOST} == *-interix* ]]; then |
295 |
# avoid finding of this function, to avoid having to patch either |
296 |
# configure or the source, which would be much more hackish. |
297 |
# after all vim does it right, only interix is badly broken (again) |
298 |
export ac_cv_func_sigaction=no |
299 |
fi |
300 |
|
301 |
econf \ |
302 |
--with-modified-by=Gentoo-${PVR} \ |
303 |
--with-vim-name=gvim --with-x \ |
304 |
${myconf} |
305 |
} |
306 |
|
307 |
src_compile() { |
308 |
# The following allows emake to be used |
309 |
emake -j1 -C src auto/osdef.h objects |
310 |
|
311 |
emake |
312 |
} |
313 |
|
314 |
src_test() { |
315 |
echo |
316 |
einfo "Starting vim tests. Several error messages will be shown" |
317 |
einfo "while the tests run. This is normal behaviour and does not" |
318 |
einfo "indicate a fault." |
319 |
echo |
320 |
ewarn "If the tests fail, your terminal may be left in a strange" |
321 |
ewarn "state. Usually, running 'reset' will fix this." |
322 |
echo |
323 |
|
324 |
# Don't let vim talk to X |
325 |
unset DISPLAY |
326 |
|
327 |
# We've got to call make test from within testdir, since the Makefiles |
328 |
# don't pass through our VIMPROG argument |
329 |
cd "${S}"/src/testdir |
330 |
|
331 |
# Test 49 won't work inside a portage environment |
332 |
einfo "Test 49 isn't sandbox-friendly, so it will be skipped." |
333 |
sed -i 's~test49.out~~g' Makefile |
334 |
|
335 |
# We don't want to rebuild vim before running the tests |
336 |
sed -i 's,: \$(VIMPROG),: ,' Makefile |
337 |
|
338 |
# Make gvim not try to connect to X. See :help gui-x11-start |
339 |
# in vim for how this evil trickery works. |
340 |
ln -s "${S}"/src/gvim "${S}"/src/testvim |
341 |
|
342 |
# Don't try to do the additional GUI test |
343 |
emake -j1 VIMPROG=../testvim nongui |
344 |
} |
345 |
|
346 |
# Make convenience symlinks, hopefully without stepping on toes. Some |
347 |
# of these links are "owned" by the vim ebuild when it is installed, |
348 |
# but they might be good for gvim as well (see bug 45828) |
349 |
update_vim_symlinks() { |
350 |
has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}" |
351 |
local f syms |
352 |
syms="vimdiff rvim rview" |
353 |
einfo "Calling eselect vi update..." |
354 |
# Call this with --if-unset to respect user's choice (bug 187449) |
355 |
eselect vi update --if-unset |
356 |
|
357 |
# Make or remove convenience symlink, vim -> gvim |
358 |
if [[ -f "${EROOT}"/usr/bin/gvim ]]; then |
359 |
ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null |
360 |
elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then |
361 |
rm "${EROOT}"/usr/bin/vim |
362 |
fi |
363 |
|
364 |
# Make or remove convenience symlinks to vim |
365 |
if [[ -f "${EROOT}"/usr/bin/vim ]]; then |
366 |
for f in ${syms}; do |
367 |
ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null |
368 |
done |
369 |
else |
370 |
for f in ${syms}; do |
371 |
if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then |
372 |
rm -f "${EROOT}"/usr/bin/${f} |
373 |
fi |
374 |
done |
375 |
fi |
376 |
|
377 |
# This will still break if you merge then remove the vi package, |
378 |
# but there's only so much you can do, eh? Unfortunately we don't |
379 |
# have triggers like are done in rpm-land. |
380 |
} |
381 |
|
382 |
src_install() { |
383 |
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} |
384 |
|
385 |
dobin src/gvim |
386 |
dosym gvim /usr/bin/gvimdiff |
387 |
dosym gvim /usr/bin/evim |
388 |
dosym gvim /usr/bin/eview |
389 |
dosym gvim /usr/bin/gview |
390 |
dosym gvim /usr/bin/rgvim |
391 |
dosym gvim /usr/bin/rgview |
392 |
|
393 |
dodir /usr/share/man/man1 |
394 |
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 |
395 |
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 |
396 |
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 |
397 |
|
398 |
insinto /etc/vim |
399 |
newins "${FILESDIR}"/gvimrc-r1 gvimrc |
400 |
eprefixify "${ED}"/etc/vim/gvimrc |
401 |
|
402 |
newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop |
403 |
doicon "${FILESDIR}"/gvim.xpm |
404 |
|
405 |
# bash completion script, bug #79018. |
406 |
newbashcomp "${FILESDIR}"/${PN}-completion ${PN} |
407 |
|
408 |
# We shouldn't be installing the ex or view man page symlinks, as they |
409 |
# are managed by eselect-vi |
410 |
rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 |
411 |
} |
412 |
|
413 |
pkg_postinst() { |
414 |
# Update documentation tags (from vim-doc.eclass) |
415 |
update_vim_helptags |
416 |
|
417 |
# Update fdo mime stuff, bug #78394 |
418 |
fdo-mime_mime_database_update |
419 |
|
420 |
if [[ -z ${REPLACING_VERSIONS} ]] ; then |
421 |
echo |
422 |
elog "Vim 7 includes an integrated spell checker. You need to install" |
423 |
elog "word list files before you can use it. There are ebuilds for" |
424 |
elog "some of these named app-vim/vim-spell-*. If your language of" |
425 |
elog "choice is not included, please consult vim-spell.eclass for" |
426 |
elog "instructions on how to make a package." |
427 |
echo |
428 |
ewarn "Note that the English word lists are no longer installed by" |
429 |
ewarn "default." |
430 |
echo |
431 |
fi |
432 |
|
433 |
# Make convenience symlinks |
434 |
update_vim_symlinks |
435 |
} |
436 |
|
437 |
pkg_postrm() { |
438 |
# Update documentation tags (from vim-doc.eclass) |
439 |
update_vim_helptags |
440 |
|
441 |
# Update fdo mime stuff, bug #78394 |
442 |
fdo-mime_mime_database_update |
443 |
|
444 |
# Make convenience symlinks |
445 |
update_vim_symlinks |
446 |
} |