app-emacs: Remove unnecessary die statements after eclass functions.

Functions elisp-compile, elisp-install, and elisp-site-file-install
from elisp-common.eclass all die by themselves.

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm@gentoo.org>

13 files changed, 49 insertions, 57 deletions

diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
index de398952a5db..8cbf1b14e044 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
@@ -35,7 +35,7 @@ src_install() {
 
 	if use X; then
 		local i
-		domenu emacs.desktop emacsclient.desktop || die
+		domenu emacs.desktop emacsclient.desktop
 
 		pushd icons || die
 		newicon sink.png emacs-sink.png
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
index cfd2bfcc7f22..5541f1eb3266 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ src_install() {
 		ICONDIR="${ED}${SITEETC}/${PN}" \
 		install-en $(use l10n_ja && echo install-ja) install-icons
 
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc ChangeLog* NEWS README
 	use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
 
diff --git a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
index 9803686ef359..a54c351b2c4e 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 	haskell-cabal_src_compile
 	if use emacs ; then
 		pushd elisp
-		elisp-compile *.el || die
+		elisp-compile *.el
 		popd
 	fi
 }
diff --git a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
index b67184547ee0..122d5f8ea2cd 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 	haskell-cabal_src_compile
 	if use emacs ; then
 		pushd elisp
-		elisp-compile *.el || die
+		elisp-compile *.el
 		popd
 	fi
 }
diff --git a/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild
index fb6256d2db11..f054faba6519 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild
@@ -55,7 +55,7 @@ src_compile() {
 	haskell-cabal_src_compile
 	if use emacs ; then
 		pushd elisp
-		elisp-compile *.el || die
+		elisp-compile *.el
 		popd
 	fi
 }
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
index 94972c40cfd3..142d9eeeeaf7 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
@@ -53,9 +53,7 @@ src_install() {
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc ChangeLog README README.orig
 
-	if use X; then
-		domenu "${FILESDIR}"/gnuclient.desktop || die
-	fi
+	use X && domenu "${FILESDIR}"/gnuclient.desktop
 }
 
 pkg_postinst() {
diff --git a/app-emacs/slime/slime-2.15.ebuild b/app-emacs/slime/slime-2.15.ebuild
index 26d86bd44bde..985b5d35c782 100644
--- a/app-emacs/slime/slime-2.15.ebuild
+++ b/app-emacs/slime/slime-2.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -81,24 +81,23 @@ src_prepare() {
 }
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp-compile *.el
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
-	emake -j1 -C doc slime.info || die "Cannot build info docs"
+		elisp-compile contrib/*.el lib/*.el
+	emake -j1 -C doc slime.info
 
 	if use doc; then
 		VARTEXFONTS="${T}"/fonts \
-			emake -j1 -C doc slime.pdf || die "emake doc failed"
+			emake -j1 -C doc slime.pdf
 	fi
 }
 
 src_install() {
 	## install core
-	elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp \
-		|| die "Cannot install SLIME core"
+	elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp
 	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/2.0_p20110617/${SITEFILE} \
 		>"${T}"/${SITEFILE} || die "sed failed"
-	elisp-site-file-install "${T}"/${SITEFILE} || die
+	elisp-site-file-install "${T}"/${SITEFILE}
 	cp "${FILESDIR}"/2.0_p20110617/swank.asd "${S}"
 	# remove upstream swank-loader, since it won't be used
 	rm "${S}"/swank-loader.lisp
@@ -106,13 +105,11 @@ src_install() {
 	common-lisp-install-asdf swank.asd
 
 	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
-		|| die "Cannot install contribs"
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo}
 	common-lisp-install-sources contrib/*.lisp
 
 	## install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} \
-		|| die "Cannot install libs"
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
 
 	## install docs
 	dodoc README.md ChangeLog CONTRIBUTING.md NEWS PROBLEMS
diff --git a/app-emacs/slime/slime-2.20-r1.ebuild b/app-emacs/slime/slime-2.20-r1.ebuild
index 8c79ae0d45c3..90d933d93e25 100644
--- a/app-emacs/slime/slime-2.20-r1.ebuild
+++ b/app-emacs/slime/slime-2.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,11 +37,11 @@ src_prepare() {
 }
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp-compile *.el
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
+		elisp-compile contrib/*.el lib/*.el
 
-	emake -C doc slime.info || die
+	emake -C doc slime.info
 	if use doc ; then
 		VARTEXFONTS="${T}"/fonts \
 			emake -C doc all
@@ -50,19 +50,18 @@ src_compile() {
 
 src_install() {
 	# Install core
-	elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+	elisp-install ${PN} *.{el,elc,lisp}
 
 	# Install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
-		|| die "Cannot install contribs"
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo}
 
 	# Install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
 
 	# Install swank
-	elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+	elisp-install ${PN}/swank/ swank/*.lisp
 
-	elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die "Cannon install site file"
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	# Install docs
 	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
 	newdoc contrib/README.md README-contrib.md
diff --git a/app-emacs/slime/slime-2.20.ebuild b/app-emacs/slime/slime-2.20.ebuild
index d03c14d9dbf8..26655e54934d 100644
--- a/app-emacs/slime/slime-2.20.ebuild
+++ b/app-emacs/slime/slime-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,11 +37,11 @@ src_prepare() {
 }
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp-compile *.el
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
+		elisp-compile contrib/*.el lib/*.el
 
-	emake -C doc slime.info || die
+	emake -C doc slime.info
 	if use doc ; then
 		VARTEXFONTS="${T}"/fonts \
 			emake -C doc all
@@ -50,19 +50,18 @@ src_compile() {
 
 src_install() {
 	## install core
-	elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+	elisp-install ${PN} *.{el,elc,lisp}
 
 	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
-		|| die "Cannot install contribs"
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo}
 
 	## install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
 
 	## install swank
-	elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+	elisp-install ${PN}/swank/ swank/*.lisp
 
-	elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	## install docs
 	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
 	newdoc contrib/README.md README-contrib.md
diff --git a/app-emacs/slime/slime-2.21.ebuild b/app-emacs/slime/slime-2.21.ebuild
index aa82b5505f38..a8d36329a5a5 100644
--- a/app-emacs/slime/slime-2.21.ebuild
+++ b/app-emacs/slime/slime-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,11 +32,11 @@ src_prepare() {
 }
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp-compile *.el
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
+		elisp-compile contrib/*.el lib/*.el
 
-	emake -C doc slime.info || die
+	emake -C doc slime.info
 	if use doc ; then
 		VARTEXFONTS="${T}"/fonts \
 			emake -C doc all
@@ -45,19 +45,18 @@ src_compile() {
 
 src_install() {
 	# Install core
-	elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+	elisp-install ${PN} *.{el,elc,lisp}
 
 	# Install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
-		|| die "Cannot install contribs"
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo}
 
 	# Install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
 
 	# Install swank
-	elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+	elisp-install ${PN}/swank/ swank/*.lisp
 
-	elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die "Cannon install site file"
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	# Install docs
 	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
 	newdoc contrib/README.md README-contrib.md
diff --git a/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild b/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
index d8d3529415ea..6cbe27f5ad97 100644
--- a/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
@@ -26,7 +26,7 @@ DEPEND=""
 RDEPEND="app-crypt/gnupg"
 
 src_compile() {
-	elisp-compile twittering-mode.el || die
+	elisp-compile twittering-mode.el
 	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
@@ -36,5 +36,5 @@ src_test() {
 
 src_install() {
 	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
-	elisp-install ${PN} twittering-mode.el *.elc || die
+	elisp-install ${PN} twittering-mode.el *.elc
 }
diff --git a/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild b/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
index d8d3529415ea..6cbe27f5ad97 100644
--- a/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
@@ -26,7 +26,7 @@ DEPEND=""
 RDEPEND="app-crypt/gnupg"
 
 src_compile() {
-	elisp-compile twittering-mode.el || die
+	elisp-compile twittering-mode.el
 	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
@@ -36,5 +36,5 @@ src_test() {
 
 src_install() {
 	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
-	elisp-install ${PN} twittering-mode.el *.elc || die
+	elisp-install ${PN} twittering-mode.el *.elc
 }
diff --git a/app-emacs/twittering-mode/twittering-mode-9999.ebuild b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
index d8d3529415ea..6cbe27f5ad97 100644
--- a/app-emacs/twittering-mode/twittering-mode-9999.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND=""
 RDEPEND="app-crypt/gnupg"
 
 src_compile() {
-	elisp-compile twittering-mode.el || die
+	elisp-compile twittering-mode.el
 	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
@@ -36,5 +36,5 @@ src_test() {
 
 src_install() {
 	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
-	elisp-install ${PN} twittering-mode.el *.elc || die
+	elisp-install ${PN} twittering-mode.el *.elc
 }