From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1D5C1382C5 for ; Sun, 16 May 2021 07:31:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6DC1E081B; Sun, 16 May 2021 07:31:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4085E081B for ; Sun, 16 May 2021 07:31:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01B67335D5E for ; Sun, 16 May 2021 07:30:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1241559C for ; Sun, 16 May 2021 07:30:57 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1621150250.c84fe1a9f1f351895a8069b8d92fae892150b08d.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-23.4-r20.ebuild app-editors/emacs/emacs-24.5-r10.ebuild app-editors/emacs/emacs-25.3-r9.ebuild app-editors/emacs/emacs-26.3-r4.ebuild app-editors/emacs/emacs-27.1-r4.ebuild app-editors/emacs/emacs-27.2.9999.ebuild app-editors/emacs/emacs-27.2.ebuild app-editors/emacs/emacs-28.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: c84fe1a9f1f351895a8069b8d92fae892150b08d X-VCS-Branch: master Date: Sun, 16 May 2021 07:30:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e33a9396-ea6e-4943-a794-181be90ff0dd X-Archives-Hash: dbd4825c72df2cda97bd44eb7890ea0b commit: c84fe1a9f1f351895a8069b8d92fae892150b08d Author: Ulrich Müller gentoo org> AuthorDate: Sun May 16 07:17:16 2021 +0000 Commit: Ulrich Müller gentoo 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 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 /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 /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 /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 /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 /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 /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 /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 /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