Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/
Date: Tue, 06 Jun 2017 17:42:35
Message-Id: 1496770870.ad3e624dc57a3776778e5ea55f3dd4714ae38496.monsieurp@gentoo
1 commit: ad3e624dc57a3776778e5ea55f3dd4714ae38496
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 4 12:46:25 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 6 17:41:10 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3e624d
7
8 app-editors/vim-core: remove unsecure version.
9
10 Gentoo-Bug: https://bugs.gentoo.org/611386
11
12 Package-Manager: Portage-2.3.5, Repoman-2.3.2
13 Closes: https://github.com/gentoo/gentoo/pull/4847
14
15 app-editors/vim-core/Manifest | 1 -
16 app-editors/vim-core/vim-core-8.0.0106.ebuild | 217 --------------------------
17 2 files changed, 218 deletions(-)
18
19 diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
20 index fa600747941..210d7aea1a6 100644
21 --- a/app-editors/vim-core/Manifest
22 +++ b/app-editors/vim-core/Manifest
23 @@ -1,3 +1,2 @@
24 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b
25 -DIST vim-8.0.0106.tar.gz 12945768 SHA256 cbace3e7a2db3df73720c4181fa4cdbf7df94310522b1c7a4fd7d6afeaa1e145 SHA512 4e40d9ba8ba694d951be78c653d8fcfebe2b3cc460986ef8e3478f81f2dfd5e4b3c2bc5d22082536b9c275e41beeac343cee0aa1e4de125b71fe95c772e26c20 WHIRLPOOL 569a8f50ebdb7f380f675ed0a4b4aa5e7e226303a8e92db2a8e81f5d8acc0e466620c60c160e2204f3af615b91ca2481eb9716f9c2e6dbdb416050d758a49f09
26 DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b
27
28 diff --git a/app-editors/vim-core/vim-core-8.0.0106.ebuild b/app-editors/vim-core/vim-core-8.0.0106.ebuild
29 deleted file mode 100644
30 index 9851a0f1b95..00000000000
31 --- a/app-editors/vim-core/vim-core-8.0.0106.ebuild
32 +++ /dev/null
33 @@ -1,217 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -VIM_VERSION="8.0"
39 -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-8.0.0106-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 ~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 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
76 - eapply "${WORKDIR}"/patches
77 - fi
78 -
79 - # Fixup a script to use awk instead of nawk
80 - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
81 - || die "mve.awk sed failed"
82 -
83 - # Read vimrc and gvimrc from /etc/vim
84 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
85 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
86 -
87 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
88 - # Hopefully this pattern won't break for a while at least.
89 - # This fixes bug 29398 (27 Sep 2003 agriffis)
90 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
91 - "${S}"/runtime/doc/syntax.txt \
92 - "${S}"/runtime/doc/tagsrch.txt \
93 - "${S}"/runtime/doc/usr_29.txt \
94 - "${S}"/runtime/menu.vim \
95 - "${S}"/src/configure.ac || die 'sed failed'
96 -
97 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
98 - # this is NeXT, but it's actually just a file in dev-libs/9libs
99 - # This fixes bug 43885 (20 Mar 2004 agriffis)
100 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
101 -
102 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
103 - # correctly. To avoid some really entertaining error messages about stuff
104 - # which isn't even in the source file being invalid, we'll do some trickery
105 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
106 - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
107 -
108 - # Try to avoid sandbox problems. Bug #114475.
109 - if [[ -d "${S}"/src/po ]] ; then
110 - sed -i -e \
111 - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
112 - "${S}"/src/po/Makefile
113 - fi
114 -
115 - if version_is_at_least 7.3.122 ; then
116 - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
117 - fi
118 -
119 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
120 - if version_is_at_least 7.3 ; then
121 - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
122 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
123 - fi
124 -
125 - eapply_user
126 -}
127 -
128 -src_configure() {
129 - local myconf
130 -
131 - # Fix bug 37354: Disallow -funroll-all-loops on amd64
132 - # Bug 57859 suggests that we want to do this for all archs
133 - filter-flags -funroll-all-loops
134 -
135 - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
136 - # everyone since previous flag filtering bugs have turned out to affect
137 - # multiple archs...
138 - replace-flags -O3 -O2
139 -
140 - # Fix bug 18245: Prevent "make" from the following chain:
141 - # (1) Notice configure.ac is newer than auto/configure
142 - # (2) Rebuild auto/configure
143 - # (3) Notice auto/configure is newer than auto/config.mk
144 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
145 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
146 - rm -f src/auto/configure
147 - emake -j1 -C src autoconf
148 -
149 - # This should fix a sandbox violation (see bug 24447). The hvc
150 - # things are for ppc64, see bug 86433.
151 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
152 - [[ -e ${file} ]] && addwrite $file
153 - done
154 -
155 - # Let Portage do the stripping. Some people like that.
156 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
157 -
158 - # Keep Gentoo Prefix env contained within the EPREFIX
159 - use prefix && myconf+=" --without-local-dir"
160 -
161 - econf \
162 - --with-modified-by=Gentoo-${PVR} \
163 - --enable-gui=no \
164 - --without-x \
165 - --disable-darwin \
166 - --disable-perlinterp \
167 - --disable-pythoninterp \
168 - --disable-rubyinterp \
169 - --disable-gpm \
170 - --disable-selinux \
171 - $(use_enable nls) \
172 - $(use_enable acl) \
173 - ${myconf}
174 -}
175 -
176 -src_compile() {
177 - # The following allows emake to be used
178 - emake -j1 -C src auto/osdef.h objects
179 -
180 - emake tools
181 -}
182 -
183 -src_test() { :; }
184 -
185 -src_install() {
186 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
187 -
188 - dodir /usr/{bin,share/{man/man1,vim}}
189 - emake -C src \
190 - installruntime \
191 - installmanlinks \
192 - installmacros \
193 - installtutor \
194 - installtutorbin \
195 - installtools \
196 - install-languages \
197 - DESTDIR="${D}" \
198 - BINDIR="${EPREFIX}"/usr/bin \
199 - MANDIR="${EPREFIX}"/usr/share/man \
200 - DATADIR="${EPREFIX}"/usr/share
201 -
202 - keepdir ${vimfiles}/keymap
203 -
204 - # default vimrc is installed by vim-core since it applies to
205 - # both vim and gvim
206 - insinto /etc/vim/
207 - newins "${FILESDIR}"/vimrc-r5 vimrc
208 - eprefixify "${ED}"/etc/vim/vimrc
209 -
210 - if use minimal ; then
211 - # To save space, install only a subset of the files.
212 - # Helps minimalize the livecd, bug 65144.
213 - eshopts_push -s extglob
214 -
215 - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
216 - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
217 - rm "${ED}"/usr/bin/vimtutor
218 -
219 - local keep_colors="default"
220 - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
221 -
222 - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
223 - # tinkering with the next line might make bad things happen ...
224 - keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
225 - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
226 -
227 - eshopts_pop
228 - fi
229 -
230 - # These files might have slight security issues, so we won't
231 - # install them. See bug #77841. We don't mind if these don't
232 - # exist.
233 - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
234 -
235 - newbashcomp "${FILESDIR}"/xxd-completion xxd
236 -
237 - # We shouldn't be installing the ex or view man page symlinks, as they
238 - # are managed by eselect-vi
239 - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
240 -}
241 -
242 -pkg_postinst() {
243 - # Update documentation tags (from vim-doc.eclass)
244 - update_vim_helptags
245 -}
246 -
247 -pkg_postrm() {
248 - # Update documentation tags (from vim-doc.eclass)
249 - update_vim_helptags
250 -}