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