Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/
Date: Sun, 26 Jun 2022 19:38:02
Message-Id: 1656272250.dd7f1c1443c3218ac445dc15abe99a152d387b29.mattst88@gentoo
1 commit: dd7f1c1443c3218ac445dc15abe99a152d387b29
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 26 19:33:22 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 26 19:37:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd7f1c14
7
8 app-editors/vim-core: Drop old versions
9
10 Bug: https://bugs.gentoo.org/833572
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 app-editors/vim-core/Manifest | 1 -
14 app-editors/vim-core/vim-core-8.2.4328-r1.ebuild | 231 -----------------------
15 2 files changed, 232 deletions(-)
16
17 diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
18 index 95416aebcb47..bf14412cb3bd 100644
19 --- a/app-editors/vim-core/Manifest
20 +++ b/app-editors/vim-core/Manifest
21 @@ -1,4 +1,3 @@
22 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
23 -DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
24 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
25 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
26
27 diff --git a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild
28 deleted file mode 100644
29 index 128d32eeb7ad..000000000000
30 --- a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild
31 +++ /dev/null
32 @@ -1,231 +0,0 @@
33 -# Copyright 1999-2022 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -# Please bump with app-editors/vim and app-editors/gvim
39 -
40 -VIM_VERSION="8.2"
41 -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
42 -
43 -if [[ ${PV} == 9999* ]] ; then
44 - inherit git-r3
45 - EGIT_REPO_URI="https://github.com/vim/vim.git"
46 - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
47 -else
48 - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
49 - https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
50 - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
51 -fi
52 -S="${WORKDIR}"/vim-${PV}
53 -
54 -DESCRIPTION="vim and gvim shared files"
55 -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
56 -
57 -LICENSE="vim"
58 -SLOT="0"
59 -IUSE="nls acl minimal"
60 -
61 -BDEPEND="sys-devel/autoconf"
62 -# Avoid icon file collision, bug #673880
63 -RDEPEND="!!<app-editors/gvim-8.1.0648
64 - !<app-editors/vim-8.2.4328-r1"
65 -PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
66 -
67 -pkg_setup() {
68 - # people with broken alphabets run into trouble. bug #82186.
69 - unset LANG LC_ALL
70 - export LC_COLLATE="C"
71 -
72 - # Gnome sandbox silliness. bug #114475.
73 - mkdir -p "${T}"/home || die "mkdir -p failed"
74 - export HOME="${T}"/home
75 -}
76 -
77 -src_prepare() {
78 - if [[ ${PV} != 9999* ]] ; then
79 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
80 - eapply "${WORKDIR}"/patches
81 - fi
82 -
83 - # Fixup a script to use awk instead of nawk
84 - sed -i \
85 - -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
86 - "${S}"/runtime/tools/mve.awk || die "sed failed"
87 -
88 - # See bug #77841. We remove this file after the tarball extraction.
89 - rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
90 -
91 - # Read vimrc and gvimrc from /etc/vim
92 - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
93 - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
94 -
95 - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
96 - # Hopefully this pattern won't break for a while at least.
97 - # This fixes bug #29398 (27 Sep 2003 agriffis)
98 - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
99 - "${S}"/runtime/doc/syntax.txt \
100 - "${S}"/runtime/doc/tagsrch.txt \
101 - "${S}"/runtime/doc/usr_29.txt \
102 - "${S}"/runtime/menu.vim \
103 - "${S}"/src/configure.ac || die 'sed failed'
104 -
105 - # Don't be fooled by /usr/include/libc.h. When found, vim thinks
106 - # this is NeXT, but it's actually just a file in dev-libs/9libs
107 - # This fixes bug #43885 (20 Mar 2004 agriffis)
108 - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
109 -
110 - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
111 - # correctly. To avoid some really entertaining error messages about stuff
112 - # which isn't even in the source file being invalid, we'll do some trickery
113 - # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
114 - find "${S}" -name '*.c' | while read c; do
115 - echo >> "$c" || die "echo failed"
116 - done
117 -
118 - # Try to avoid sandbox problems. Bug #114475.
119 - if [[ -d "${S}"/src/po ]]; then
120 - sed -i -e \
121 - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
122 - "${S}"/src/po/Makefile || die "sed failed"
123 - fi
124 -
125 - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
126 -
127 - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
128 - sed -i -e \
129 - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
130 - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
131 -
132 - eapply_user
133 -}
134 -
135 -src_configure() {
136 - local myconf
137 -
138 - # Fix bug #37354: Disallow -funroll-all-loops on amd64
139 - # Bug 57859 suggests that we want to do this for all archs
140 - filter-flags -funroll-all-loops
141 -
142 - # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
143 - # everyone since previous flag filtering bugs have turned out to affect
144 - # multiple archs...
145 - replace-flags -O3 -O2
146 -
147 - # Fix bug #18245: Prevent "make" from the following chain:
148 - # (1) Notice configure.ac is newer than auto/configure
149 - # (2) Rebuild auto/configure
150 - # (3) Notice auto/configure is newer than auto/config.mk
151 - # (4) Run ./configure (with wrong args) to remake auto/config.mk
152 - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
153 -
154 - # Remove src/auto/configure file.
155 - rm -v src/auto/configure || die "rm configure failed"
156 -
157 - emake -j1 -C src autoconf
158 -
159 - # This should fix a sandbox violation (see bug 24447). The hvc
160 - # things are for ppc64, see bug 86433.
161 - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
162 - if [[ -e "${file}" ]]; then
163 - addwrite ${file}
164 - fi
165 - done
166 -
167 - # Let Portage do the stripping. Some people like that.
168 - export ac_cv_prog_STRIP="$(type -P true ) faking strip"
169 -
170 - # Keep Gentoo Prefix env contained within the EPREFIX
171 - use prefix && myconf+=" --without-local-dir"
172 -
173 - econf \
174 - --with-modified-by=Gentoo-${PVR} \
175 - --enable-gui=no \
176 - --without-x \
177 - --disable-darwin \
178 - --disable-perlinterp \
179 - --disable-pythoninterp \
180 - --disable-rubyinterp \
181 - --disable-gpm \
182 - --disable-selinux \
183 - $(use_enable nls) \
184 - $(use_enable acl) \
185 - ${myconf}
186 -}
187 -
188 -src_compile() {
189 - emake -j1 -C src auto/osdef.h objects
190 - emake tools
191 -}
192 -
193 -src_test() { :; }
194 -
195 -src_install() {
196 - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
197 -
198 - dodir /usr/{bin,share/{man/man1,vim}}
199 - emake -C src \
200 - installruntime \
201 - installmanlinks \
202 - installmacros \
203 - installtutor \
204 - installtutorbin \
205 - installtools \
206 - install-languages \
207 - DESTDIR="${D}" \
208 - BINDIR="${EPREFIX}"/usr/bin \
209 - MANDIR="${EPREFIX}"/usr/share/man \
210 - DATADIR="${EPREFIX}"/usr/share
211 -
212 - keepdir ${vimfiles}/keymap
213 -
214 - # default vimrc is installed by vim-core since it applies to
215 - # both vim and gvim
216 - insinto /etc/vim/
217 - newins "${FILESDIR}"/vimrc-r5 vimrc
218 - eprefixify "${ED}"/etc/vim/vimrc
219 -
220 - if use minimal; then
221 - # To save space, install only a subset of the files.
222 - # Helps minimalize the livecd, bug 65144.
223 - eshopts_push -s extglob
224 -
225 - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
226 - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
227 - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
228 -
229 - local keep_colors="default"
230 - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
231 -
232 - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
233 - # tinkering with the next line might make bad things happen ...
234 - keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
235 - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
236 -
237 - # Delete skip_defaults_vim config not supported by vim[minimal]
238 - sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
239 -
240 - eshopts_pop
241 - fi
242 -
243 - newbashcomp "${FILESDIR}"/xxd-completion xxd
244 -
245 - # install gvim icon since both vim/gvim desktop files reference it
246 - doicon -s scalable "${FILESDIR}"/gvim.svg
247 -}
248 -
249 -pkg_postinst() {
250 - # update documentation tags (from vim-doc.eclass)
251 - update_vim_helptags
252 -
253 - # update icon cache
254 - xdg_icon_cache_update
255 -}
256 -
257 -pkg_postrm() {
258 - # Update documentation tags (from vim-doc.eclass)
259 - update_vim_helptags
260 -
261 - # update icon cache
262 - xdg_icon_cache_update
263 -}