commit: c84fe1a9f1f351895a8069b8d92fae892150b08d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 07:17:16 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 16 07:30:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84fe1a9
app-editors/emacs: Add some die statements after rm commands
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/emacs/emacs-23.4-r20.ebuild | 16 ++++++++--------
app-editors/emacs/emacs-24.5-r10.ebuild | 12 ++++++------
app-editors/emacs/emacs-25.3-r9.ebuild | 12 ++++++------
app-editors/emacs/emacs-26.3-r4.ebuild | 14 +++++++-------
app-editors/emacs/emacs-27.1-r4.ebuild | 14 +++++++-------
app-editors/emacs/emacs-27.2.9999.ebuild | 14 +++++++-------
app-editors/emacs/emacs-27.2.ebuild | 14 +++++++-------
app-editors/emacs/emacs-28.0.9999.ebuild | 14 +++++++-------
8 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild
b/app-editors/emacs/emacs-23.4-r20.ebuild
index 245667931c0..f46ce1b68c8 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -255,15 +255,15 @@ src_install() {
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{applications,icons} || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
local cdir
if use source; then
@@ -273,8 +273,8 @@ src_install() {
# C source you might find via find-function
doins src/*.{c,h,m}
doins -r src/{m,s}
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c || die
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README ||
die
elif has installsources ${FEATURES}; then
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
@@ -303,7 +303,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild
b/app-editors/emacs/emacs-24.5-r10.ebuild
index 3358010308c..c9d98111c2b 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -244,15 +244,15 @@ src_install() {
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{applications,icons} || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use gzip-el; then
# compress .el files when a corresponding .elc exists
@@ -296,7 +296,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild
b/app-editors/emacs/emacs-25.3-r9.ebuild
index 2ef65527eee..c41040407de 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -253,15 +253,15 @@ src_install() {
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use gzip-el; then
# compress .el files when a corresponding .elc exists
@@ -305,7 +305,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild
b/app-editors/emacs/emacs-26.3-r4.ebuild
index 34237af4f67..4dc17e9bd91 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -262,16 +262,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -324,7 +324,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild
b/app-editors/emacs/emacs-27.1-r4.ebuild
index f7ad194e0ef..a296afd19d0 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -325,16 +325,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -387,7 +387,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild
b/app-editors/emacs/emacs-27.2.9999.ebuild
index 7f3c223e9ed..d565c8aad9a 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -324,16 +324,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -386,7 +386,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-27.2.ebuild
b/app-editors/emacs/emacs-27.2.ebuild
index c3f5c07c149..45899a7477f 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -324,16 +324,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -386,7 +386,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild
b/app-editors/emacs/emacs-28.0.9999.ebuild
index 80e296098e7..d1f8dc79560 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -308,16 +308,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -370,7 +370,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
