1 |
radhermit 14/02/06 07:00:46 |
2 |
|
3 |
Modified: vim-core-9999.ebuild ChangeLog |
4 |
Added: vim-core-7.4.169.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
9 |
|
10 |
Revision Changes Path |
11 |
1.7 app-editors/vim-core/vim-core-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild?rev=1.7&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild?rev=1.7&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild?r1=1.6&r2=1.7 |
16 |
|
17 |
Index: vim-core-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v |
20 |
retrieving revision 1.6 |
21 |
retrieving revision 1.7 |
22 |
diff -u -r1.6 -r1.7 |
23 |
--- vim-core-9999.ebuild 23 Jan 2014 10:30:29 -0000 1.6 |
24 |
+++ vim-core-9999.ebuild 6 Feb 2014 07:00:46 -0000 1.7 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.6 2014/01/23 10:30:29 radhermit Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.7 2014/02/06 07:00:46 radhermit Exp $ |
30 |
|
31 |
EAPI=5 |
32 |
VIM_VERSION="7.4" |
33 |
@@ -14,7 +14,7 @@ |
34 |
VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" |
35 |
|
36 |
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 |
37 |
- http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r3.tar.bz2 |
38 |
+ http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r4.tar.bz2 |
39 |
http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}" |
40 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
41 |
fi |
42 |
|
43 |
|
44 |
|
45 |
1.434 app-editors/vim-core/ChangeLog |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/ChangeLog?rev=1.434&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/ChangeLog?rev=1.434&content-type=text/plain |
49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/ChangeLog?r1=1.433&r2=1.434 |
50 |
|
51 |
Index: ChangeLog |
52 |
=================================================================== |
53 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v |
54 |
retrieving revision 1.433 |
55 |
retrieving revision 1.434 |
56 |
diff -u -r1.433 -r1.434 |
57 |
--- ChangeLog 23 Jan 2014 10:37:40 -0000 1.433 |
58 |
+++ ChangeLog 6 Feb 2014 07:00:46 -0000 1.434 |
59 |
@@ -1,6 +1,12 @@ |
60 |
# ChangeLog for app-editors/vim-core |
61 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
62 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.433 2014/01/23 10:37:40 radhermit Exp $ |
63 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.434 2014/02/06 07:00:46 radhermit Exp $ |
64 |
+ |
65 |
+*vim-core-7.4.169 (06 Feb 2014) |
66 |
+ |
67 |
+ 06 Feb 2014; Tim Harder <radhermit@g.o> +vim-core-7.4.169.ebuild, |
68 |
+ vim-core-9999.ebuild: |
69 |
+ Version bump. |
70 |
|
71 |
23 Jan 2014; Tim Harder <radhermit@g.o> -vim-core-7.4.22.ebuild, |
72 |
-vim-core-7.4.41.ebuild, -vim-core-7.4.94.ebuild, -vim-core-7.4.131.ebuild: |
73 |
|
74 |
|
75 |
|
76 |
1.1 app-editors/vim-core/vim-core-7.4.169.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-7.4.169.ebuild?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-7.4.169.ebuild?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: vim-core-7.4.169.ebuild |
82 |
=================================================================== |
83 |
# Copyright 1999-2014 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.169.ebuild,v 1.1 2014/02/06 07:00:46 radhermit Exp $ |
86 |
|
87 |
EAPI=5 |
88 |
VIM_VERSION="7.4" |
89 |
inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix |
90 |
|
91 |
if [[ ${PV} == 9999* ]] ; then |
92 |
inherit mercurial |
93 |
EHG_REPO_URI="https://vim.googlecode.com/hg/" |
94 |
EHG_PROJECT="vim" |
95 |
else |
96 |
VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" |
97 |
|
98 |
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 |
99 |
http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r4.tar.bz2 |
100 |
http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}" |
101 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
102 |
fi |
103 |
|
104 |
DESCRIPTION="vim and gvim shared files" |
105 |
HOMEPAGE="http://www.vim.org/" |
106 |
|
107 |
SLOT="0" |
108 |
LICENSE="vim" |
109 |
IUSE="nls acl minimal" |
110 |
|
111 |
DEPEND="sys-devel/autoconf" |
112 |
PDEPEND="!minimal? ( app-vim/gentoo-syntax )" |
113 |
|
114 |
S=${WORKDIR}/vim${VIM_VERSION/.} |
115 |
|
116 |
pkg_setup() { |
117 |
# people with broken alphabets run into trouble. bug 82186. |
118 |
unset LANG LC_ALL |
119 |
export LC_COLLATE="C" |
120 |
|
121 |
# Gnome sandbox silliness. bug #114475. |
122 |
mkdir -p "${T}"/home |
123 |
export HOME="${T}"/home |
124 |
} |
125 |
|
126 |
src_prepare() { |
127 |
if [[ ${PV} != 9999* ]] ; then |
128 |
if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then |
129 |
# Apply any patches available from vim.org for this version |
130 |
epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} |
131 |
fi |
132 |
|
133 |
if [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then |
134 |
# Patches for vim-core only (runtime/*) |
135 |
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ |
136 |
epatch "${WORKDIR}"/gentoo/patches-core/ |
137 |
fi |
138 |
fi |
139 |
|
140 |
# Fixup a script to use awk instead of nawk |
141 |
sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ |
142 |
|| die "mve.awk sed failed" |
143 |
|
144 |
# Read vimrc and gvimrc from /etc/vim |
145 |
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h |
146 |
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h |
147 |
|
148 |
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags. |
149 |
# Hopefully this pattern won't break for a while at least. |
150 |
# This fixes bug 29398 (27 Sep 2003 agriffis) |
151 |
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ |
152 |
"${S}"/runtime/doc/syntax.txt \ |
153 |
"${S}"/runtime/doc/tagsrch.txt \ |
154 |
"${S}"/runtime/doc/usr_29.txt \ |
155 |
"${S}"/runtime/menu.vim \ |
156 |
"${S}"/src/configure.in || die 'sed failed' |
157 |
|
158 |
# Don't be fooled by /usr/include/libc.h. When found, vim thinks |
159 |
# this is NeXT, but it's actually just a file in dev-libs/9libs |
160 |
# This fixes bug 43885 (20 Mar 2004 agriffis) |
161 |
sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed' |
162 |
|
163 |
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF |
164 |
# correctly. To avoid some really entertaining error messages about stuff |
165 |
# which isn't even in the source file being invalid, we'll do some trickery |
166 |
# to make the error never occur. bug 66162 (02 October 2004 ciaranm) |
167 |
find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done |
168 |
|
169 |
# Try to avoid sandbox problems. Bug #114475. |
170 |
if [[ -d "${S}"/src/po ]] ; then |
171 |
sed -i -e \ |
172 |
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ |
173 |
"${S}"/src/po/Makefile |
174 |
fi |
175 |
|
176 |
if version_is_at_least 7.3.122 ; then |
177 |
cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk |
178 |
fi |
179 |
|
180 |
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 |
181 |
if version_is_at_least 7.3 ; then |
182 |
sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ |
183 |
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' |
184 |
fi |
185 |
} |
186 |
|
187 |
src_configure() { |
188 |
local myconf |
189 |
|
190 |
# Fix bug 37354: Disallow -funroll-all-loops on amd64 |
191 |
# Bug 57859 suggests that we want to do this for all archs |
192 |
filter-flags -funroll-all-loops |
193 |
|
194 |
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for |
195 |
# everyone since previous flag filtering bugs have turned out to affect |
196 |
# multiple archs... |
197 |
replace-flags -O3 -O2 |
198 |
|
199 |
# Fix bug 18245: Prevent "make" from the following chain: |
200 |
# (1) Notice configure.in is newer than auto/configure |
201 |
# (2) Rebuild auto/configure |
202 |
# (3) Notice auto/configure is newer than auto/config.mk |
203 |
# (4) Run ./configure (with wrong args) to remake auto/config.mk |
204 |
sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed" |
205 |
rm -f src/auto/configure |
206 |
emake -j1 -C src autoconf |
207 |
|
208 |
# This should fix a sandbox violation (see bug 24447). The hvc |
209 |
# things are for ppc64, see bug 86433. |
210 |
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do |
211 |
[[ -e ${file} ]] && addwrite $file |
212 |
done |
213 |
|
214 |
# Let Portage do the stripping. Some people like that. |
215 |
export ac_cv_prog_STRIP="$(type -P true ) faking strip" |
216 |
|
217 |
# Keep Gentoo Prefix env contained within the EPREFIX |
218 |
use prefix && myconf+=" --without-local-dir" |
219 |
|
220 |
econf \ |
221 |
--with-modified-by=Gentoo-${PVR} \ |
222 |
--with-features=tiny \ |
223 |
--enable-gui=no \ |
224 |
--without-x \ |
225 |
--disable-darwin \ |
226 |
--disable-perlinterp \ |
227 |
--disable-pythoninterp \ |
228 |
--disable-rubyinterp \ |
229 |
--disable-gpm \ |
230 |
--disable-selinux \ |
231 |
$(use_enable nls) \ |
232 |
$(use_enable acl) \ |
233 |
${myconf} |
234 |
} |
235 |
|
236 |
src_compile() { |
237 |
# The following allows emake to be used |
238 |
emake -j1 -C src auto/osdef.h objects |
239 |
|
240 |
emake tools |
241 |
} |
242 |
|
243 |
src_test() { :; } |
244 |
|
245 |
src_install() { |
246 |
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} |
247 |
|
248 |
dodir /usr/{bin,share/{man/man1,vim}} |
249 |
cd src || die "cd src failed" |
250 |
emake \ |
251 |
installruntime \ |
252 |
installmanlinks \ |
253 |
installmacros \ |
254 |
installtutor \ |
255 |
installtutorbin \ |
256 |
installtools \ |
257 |
install-languages \ |
258 |
install-icons \ |
259 |
DESTDIR="${D}" \ |
260 |
BINDIR="${EPREFIX}"/usr/bin \ |
261 |
MANDIR="${EPREFIX}"/usr/share/man \ |
262 |
DATADIR="${EPREFIX}"/usr/share |
263 |
|
264 |
keepdir ${vimfiles}/keymap |
265 |
|
266 |
# default vimrc is installed by vim-core since it applies to |
267 |
# both vim and gvim |
268 |
insinto /etc/vim/ |
269 |
newins "${FILESDIR}"/vimrc-r4 vimrc |
270 |
eprefixify "${ED}"/etc/vim/vimrc |
271 |
|
272 |
if use minimal ; then |
273 |
# To save space, install only a subset of the files. |
274 |
# Helps minimalize the livecd, bug 65144. |
275 |
eshopts_push -s extglob |
276 |
|
277 |
rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} |
278 |
rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} |
279 |
rm "${ED}"/usr/bin/vimtutor |
280 |
|
281 |
local keep_colors="default" |
282 |
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) |
283 |
|
284 |
local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" |
285 |
# tinkering with the next line might make bad things happen ... |
286 |
keep_syntax="${keep_syntax}|syntax|nosyntax|synload" |
287 |
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) |
288 |
|
289 |
eshopts_pop |
290 |
fi |
291 |
|
292 |
# These files might have slight security issues, so we won't |
293 |
# install them. See bug #77841. We don't mind if these don't |
294 |
# exist. |
295 |
rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null |
296 |
|
297 |
newbashcomp "${FILESDIR}"/xxd-completion xxd |
298 |
|
299 |
# We shouldn't be installing the ex or view man page symlinks, as they |
300 |
# are managed by eselect-vi |
301 |
rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 |
302 |
} |
303 |
|
304 |
pkg_postinst() { |
305 |
# Update documentation tags (from vim-doc.eclass) |
306 |
update_vim_helptags |
307 |
} |
308 |
|
309 |
pkg_postrm() { |
310 |
# Update documentation tags (from vim-doc.eclass) |
311 |
update_vim_helptags |
312 |
} |