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-core/
Date: Sun, 08 May 2016 02:48:38
Message-Id: 1462675644.f6d6b81111f131e630afe597795f1bfa71bd6e37.radhermit@gentoo
1 commit: f6d6b81111f131e630afe597795f1bfa71bd6e37
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 8 02:43:38 2016 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Sun May 8 02:47:24 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d6b811
7
8 app-editors/vim-core: version bump to 7.4.1821
9
10 app-editors/vim-core/Manifest | 1 +
11 app-editors/vim-core/vim-core-7.4.1821.ebuild | 223 ++++++++++++++++++++++++++
12 2 files changed, 224 insertions(+)
13
14 diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
15 index 1e8c29b..8f919f0 100644
16 --- a/app-editors/vim-core/Manifest
17 +++ b/app-editors/vim-core/Manifest
18 @@ -2,6 +2,7 @@ DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f
19 DIST vim-7.4.1229.tar.gz 12576784 SHA256 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d SHA512 ac139e828f95319d668091e79295f7be88011c9fe0417736d051c844ec49a50ebdcec6c655f839025ee78349c36891ce1ed27467ff31ec5d1b7fc1c3a70bf5dd WHIRLPOOL 8da7059a35fbebd3fc9a360c861c2fcde197b807fe0a0ed9864b7f5ed0419488a6308a520fd97d0690e9fd10a3974fcdf228dd5d81d5848679ca74f4554d784d
20 DIST vim-7.4.1342.tar.gz 12608839 SHA256 af2776a7bdc87748734391ab05d2f8280829f837b8e520d1372dcf52176bbc4c SHA512 ec288aae83b0f98a62366781940b82b10871adeab91ca2596584caaedd7eb29696e4fa0aa6fcb71c144959be700836a765e8c4fea3038f50f8f6a3abe340091a WHIRLPOOL fc51a1adc36d036cdfae81ef8ddccf086bcfb2680fa32158cbe3b0c7d171b713e7f7fdf66eb5b9fd61cc1fb102a5d76d9aba00296089b1602c17f0fffe187adf
21 DIST vim-7.4.1583.tar.gz 12559634 SHA256 dbe697fcacca5c50535714a31dbd02e7691943491c4004a867edd4a6fcdc9cf5 SHA512 6e049ea8e711382fd4f69360afaeac904ad7721ccb7bf9990754983efd66963e1bc24919483ac8f4cbededcd22e1e58c2e246d524f059a0648600e49b550fc2b WHIRLPOOL a4e18bfa89b1a2620e96b6688cac41bed8d68d3adb7f8c7b3580a9ae40df0c39d612c051c73b2b91cf3d5d18348651e4bd4808f40b44132ebcc648bc554e451f
22 +DIST vim-7.4.1821.tar.gz 12565373 SHA256 452b6346f64b23ab0e7483091ddc09b62540f149fa786bdd14d6712d8b66e1cf SHA512 6bc3698c715860837ab264b9312207f85e0c2a603c15eca92678f301175db93195d83d3f26c4815fc6f0757e5051945b88ce415f358b7396520df6231314cc64 WHIRLPOOL 3699966e5c599ca9090486006a8e1bab5720854f9c44fc249f5cb31d6198e048a6523697ce6416c835154c737ffab87482a72ebe1af321874eef3461b69de90b
23 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
24 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
25 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
26
27 diff --git a/app-editors/vim-core/vim-core-7.4.1821.ebuild b/app-editors/vim-core/vim-core-7.4.1821.ebuild
28 new file mode 100644
29 index 0000000..5e2f6a1
30 --- /dev/null
31 +++ b/app-editors/vim-core/vim-core-7.4.1821.ebuild
32 @@ -0,0 +1,223 @@
33 +# Copyright 1999-2016 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +# $Id$
36 +
37 +EAPI=5
38 +VIM_VERSION="7.4"
39 +inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
40 +
41 +if [[ ${PV} == 9999* ]] ; then
42 + inherit git-r3
43 + EGIT_REPO_URI="https://github.com/vim/vim.git"
44 + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
45 +else
46 + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
47 + https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2"
48 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
49 +fi
50 +
51 +DESCRIPTION="vim and gvim shared files"
52 +HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
53 +
54 +SLOT="0"
55 +LICENSE="vim"
56 +IUSE="nls acl minimal"
57 +
58 +DEPEND="sys-devel/autoconf"
59 +PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
60 +
61 +S=${WORKDIR}/vim-${PV}
62 +
63 +pkg_setup() {
64 + # people with broken alphabets run into trouble. bug 82186.
65 + unset LANG LC_ALL
66 + export LC_COLLATE="C"
67 +
68 + # Gnome sandbox silliness. bug #114475.
69 + mkdir -p "${T}"/home
70 + export HOME="${T}"/home
71 +}
72 +
73 +src_prepare() {
74 + if [[ ${PV} != 9999* ]] ; then
75 + if [[ -d "${WORKDIR}"/patches/ ]]; then
76 + # Gentoo patches to fix runtime issues, cross-compile errors, etc
77 + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
78 + epatch "${WORKDIR}"/patches/
79 + fi
80 + fi
81 +
82 + # Fixup a script to use awk instead of nawk
83 + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
84 + || die "mve.awk sed failed"
85 +
86 + # Read vimrc and gvimrc from /etc/vim
87 + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
88 + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
89 +
90 + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
91 + # Hopefully this pattern won't break for a while at least.
92 + # This fixes bug 29398 (27 Sep 2003 agriffis)
93 + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
94 + "${S}"/runtime/doc/syntax.txt \
95 + "${S}"/runtime/doc/tagsrch.txt \
96 + "${S}"/runtime/doc/usr_29.txt \
97 + "${S}"/runtime/menu.vim \
98 + "${S}"/src/configure.in || die 'sed failed'
99 +
100 + # Don't be fooled by /usr/include/libc.h. When found, vim thinks
101 + # this is NeXT, but it's actually just a file in dev-libs/9libs
102 + # This fixes bug 43885 (20 Mar 2004 agriffis)
103 + sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
104 +
105 + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
106 + # correctly. To avoid some really entertaining error messages about stuff
107 + # which isn't even in the source file being invalid, we'll do some trickery
108 + # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
109 + find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
110 +
111 + # Try to avoid sandbox problems. Bug #114475.
112 + if [[ -d "${S}"/src/po ]] ; then
113 + sed -i -e \
114 + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
115 + "${S}"/src/po/Makefile
116 + fi
117 +
118 + if version_is_at_least 7.3.122 ; then
119 + cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
120 + fi
121 +
122 + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
123 + if version_is_at_least 7.3 ; then
124 + sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
125 + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
126 + fi
127 +
128 + epatch_user
129 +}
130 +
131 +src_configure() {
132 + local myconf
133 +
134 + # Fix bug 37354: Disallow -funroll-all-loops on amd64
135 + # Bug 57859 suggests that we want to do this for all archs
136 + filter-flags -funroll-all-loops
137 +
138 + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
139 + # everyone since previous flag filtering bugs have turned out to affect
140 + # multiple archs...
141 + replace-flags -O3 -O2
142 +
143 + # Fix bug 18245: Prevent "make" from the following chain:
144 + # (1) Notice configure.in is newer than auto/configure
145 + # (2) Rebuild auto/configure
146 + # (3) Notice auto/configure is newer than auto/config.mk
147 + # (4) Run ./configure (with wrong args) to remake auto/config.mk
148 + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
149 + rm -f src/auto/configure
150 + emake -j1 -C src autoconf
151 +
152 + # This should fix a sandbox violation (see bug 24447). The hvc
153 + # things are for ppc64, see bug 86433.
154 + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
155 + [[ -e ${file} ]] && addwrite $file
156 + done
157 +
158 + # Let Portage do the stripping. Some people like that.
159 + export ac_cv_prog_STRIP="$(type -P true ) faking strip"
160 +
161 + # Keep Gentoo Prefix env contained within the EPREFIX
162 + use prefix && myconf+=" --without-local-dir"
163 +
164 + econf \
165 + --with-modified-by=Gentoo-${PVR} \
166 + --enable-gui=no \
167 + --without-x \
168 + --disable-darwin \
169 + --disable-perlinterp \
170 + --disable-pythoninterp \
171 + --disable-rubyinterp \
172 + --disable-gpm \
173 + --disable-selinux \
174 + $(use_enable nls) \
175 + $(use_enable acl) \
176 + ${myconf}
177 +}
178 +
179 +src_compile() {
180 + # The following allows emake to be used
181 + emake -j1 -C src auto/osdef.h objects
182 +
183 + emake tools
184 +}
185 +
186 +src_test() { :; }
187 +
188 +src_install() {
189 + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
190 +
191 + dodir /usr/{bin,share/{man/man1,vim}}
192 + cd src || die "cd src failed"
193 + emake \
194 + installruntime \
195 + installmanlinks \
196 + installmacros \
197 + installtutor \
198 + installtutorbin \
199 + installtools \
200 + install-languages \
201 + install-icons \
202 + DESTDIR="${D}" \
203 + BINDIR="${EPREFIX}"/usr/bin \
204 + MANDIR="${EPREFIX}"/usr/share/man \
205 + DATADIR="${EPREFIX}"/usr/share
206 +
207 + keepdir ${vimfiles}/keymap
208 +
209 + # default vimrc is installed by vim-core since it applies to
210 + # both vim and gvim
211 + insinto /etc/vim/
212 + newins "${FILESDIR}"/vimrc-r4 vimrc
213 + eprefixify "${ED}"/etc/vim/vimrc
214 +
215 + if use minimal ; then
216 + # To save space, install only a subset of the files.
217 + # Helps minimalize the livecd, bug 65144.
218 + eshopts_push -s extglob
219 +
220 + rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
221 + rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
222 + rm "${ED}"/usr/bin/vimtutor
223 +
224 + local keep_colors="default"
225 + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
226 +
227 + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
228 + # tinkering with the next line might make bad things happen ...
229 + keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
230 + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
231 +
232 + eshopts_pop
233 + fi
234 +
235 + # These files might have slight security issues, so we won't
236 + # install them. See bug #77841. We don't mind if these don't
237 + # exist.
238 + rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
239 +
240 + newbashcomp "${FILESDIR}"/xxd-completion xxd
241 +
242 + # We shouldn't be installing the ex or view man page symlinks, as they
243 + # are managed by eselect-vi
244 + rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
245 +}
246 +
247 +pkg_postinst() {
248 + # Update documentation tags (from vim-doc.eclass)
249 + update_vim_helptags
250 +}
251 +
252 +pkg_postrm() {
253 + # Update documentation tags (from vim-doc.eclass)
254 + update_vim_helptags
255 +}