1 |
commit: 599a4926f1435729e3506de70ce00221d20734ad |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 24 20:46:43 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 24 21:37:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599a4926 |
7 |
|
8 |
app-editors/vim-core: update 9999 ebuild. |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
app-editors/vim-core/vim-core-9999.ebuild | 59 +++++++++++++++---------------- |
13 |
1 file changed, 28 insertions(+), 31 deletions(-) |
14 |
|
15 |
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild |
16 |
index a009ebab1f3..e383fc5b1c0 100644 |
17 |
--- a/app-editors/vim-core/vim-core-9999.ebuild |
18 |
+++ b/app-editors/vim-core/vim-core-9999.ebuild |
19 |
@@ -33,7 +33,7 @@ pkg_setup() { |
20 |
export LC_COLLATE="C" |
21 |
|
22 |
# Gnome sandbox silliness. bug #114475. |
23 |
- mkdir -p "${T}"/home |
24 |
+ mkdir -p "${T}"/home || die "mkdir -p failed" |
25 |
export HOME="${T}"/home |
26 |
} |
27 |
|
28 |
@@ -44,8 +44,12 @@ src_prepare() { |
29 |
fi |
30 |
|
31 |
# Fixup a script to use awk instead of nawk |
32 |
- sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ |
33 |
- || die "mve.awk sed failed" |
34 |
+ sed -i \ |
35 |
+ -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ |
36 |
+ "${S}"/runtime/tools/mve.awk || die "sed failed" |
37 |
+ |
38 |
+ # See #77841. We remove this file after the tarball extraction. |
39 |
+ rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" |
40 |
|
41 |
# Read vimrc and gvimrc from /etc/vim |
42 |
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h |
43 |
@@ -70,24 +74,23 @@ src_prepare() { |
44 |
# correctly. To avoid some really entertaining error messages about stuff |
45 |
# which isn't even in the source file being invalid, we'll do some trickery |
46 |
# to make the error never occur. bug 66162 (02 October 2004 ciaranm) |
47 |
- find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done |
48 |
+ find "${S}" -name '*.c' | while read c; do |
49 |
+ echo >> "$c" || die "echo failed" |
50 |
+ done |
51 |
|
52 |
# Try to avoid sandbox problems. Bug #114475. |
53 |
- if [[ -d "${S}"/src/po ]] ; then |
54 |
+ if [[ -d "${S}"/src/po ]]; then |
55 |
sed -i -e \ |
56 |
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ |
57 |
- "${S}"/src/po/Makefile |
58 |
+ "${S}"/src/po/Makefile || die "sed failed" |
59 |
fi |
60 |
|
61 |
- if version_is_at_least 7.3.122 ; then |
62 |
- cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk |
63 |
- fi |
64 |
+ cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" |
65 |
|
66 |
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 |
67 |
- if version_is_at_least 7.3 ; then |
68 |
- sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ |
69 |
- "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' |
70 |
- fi |
71 |
+ sed -i -e \ |
72 |
+ "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ |
73 |
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' |
74 |
|
75 |
eapply_user |
76 |
} |
77 |
@@ -110,13 +113,18 @@ src_configure() { |
78 |
# (3) Notice auto/configure is newer than auto/config.mk |
79 |
# (4) Run ./configure (with wrong args) to remake auto/config.mk |
80 |
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" |
81 |
- rm -f src/auto/configure |
82 |
+ |
83 |
+ # Remove src/auto/configure file. |
84 |
+ rm -v src/auto/configure || die "rm configure failed" |
85 |
+ |
86 |
emake -j1 -C src autoconf |
87 |
|
88 |
# This should fix a sandbox violation (see bug 24447). The hvc |
89 |
# things are for ppc64, see bug 86433. |
90 |
- for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do |
91 |
- [[ -e ${file} ]] && addwrite $file |
92 |
+ for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do |
93 |
+ if [[ -e "${file}" ]]; then |
94 |
+ addwrite $file |
95 |
+ fi |
96 |
done |
97 |
|
98 |
# Let Portage do the stripping. Some people like that. |
99 |
@@ -141,9 +149,7 @@ src_configure() { |
100 |
} |
101 |
|
102 |
src_compile() { |
103 |
- # The following allows emake to be used |
104 |
emake -j1 -C src auto/osdef.h objects |
105 |
- |
106 |
emake tools |
107 |
} |
108 |
|
109 |
@@ -174,14 +180,14 @@ src_install() { |
110 |
newins "${FILESDIR}"/vimrc-r5 vimrc |
111 |
eprefixify "${ED}"/etc/vim/vimrc |
112 |
|
113 |
- if use minimal ; then |
114 |
+ if use minimal; then |
115 |
# To save space, install only a subset of the files. |
116 |
# Helps minimalize the livecd, bug 65144. |
117 |
eshopts_push -s extglob |
118 |
|
119 |
- rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} |
120 |
- rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} |
121 |
- rm "${ED}"/usr/bin/vimtutor |
122 |
+ rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" |
123 |
+ rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" |
124 |
+ rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" |
125 |
|
126 |
local keep_colors="default" |
127 |
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) |
128 |
@@ -194,16 +200,7 @@ src_install() { |
129 |
eshopts_pop |
130 |
fi |
131 |
|
132 |
- # These files might have slight security issues, so we won't |
133 |
- # install them. See bug #77841. We don't mind if these don't |
134 |
- # exist. |
135 |
- rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null |
136 |
- |
137 |
newbashcomp "${FILESDIR}"/xxd-completion xxd |
138 |
- |
139 |
- # We shouldn't be installing the ex or view man page symlinks, as they |
140 |
- # are managed by eselect-vi |
141 |
- rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 |
142 |
} |
143 |
|
144 |
pkg_postinst() { |