Some die statements are not needed in EAPI 4.

svn path=/emacs-overlay/; revision=1556

5 files changed, 22 insertions, 19 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 2c0cc58..05d1ccb 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r23.ebuild,
+  emacs-22.3-r7.ebuild, emacs-23.2-r3.ebuild:
+  Some die statements are not needed in EAPI 4.
+
   01 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r23.ebuild,
   emacs-22.3-r7.ebuild, emacs-23.2-r3.ebuild:
   Remove unnecessary automake dependency.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 54171d6..7b77406 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,8 +5,8 @@ DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
 DIST emacs-23.2-patches-2.tar.bz2 2248 RMD160 e8e6d8ac11b9d9f61edca4046381f93deec24d17 SHA1 261f32cde33890d77efde5448c6aedf72377f1f1 SHA256 5a5c257847ec952d4ca8e9c1c296ae906043b9fb989c40042d25cdb27a81768c
 DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-21.4-r23.ebuild 5146 RMD160 300866750b75acebab9efae5073f24ab1d5cbdd3 SHA1 6182c9dcef0a32cbaada1f8cf7ea9c55cc4a1cbe SHA256 5f3a1480a0cfe5dea9ea6c56ea6c8109919b7998e39593d4b64425876e40a344
-EBUILD emacs-22.3-r7.ebuild 8021 RMD160 8da2b2b78509b6425a48c9434e1e7c3bd11b7d3a SHA1 d662dbb15f01361fbe054672ddce2830f831c920 SHA256 f5ee29b77afab3fedbdc27b079bc0dbbe0c620cb156ba8b4f52896ace019b443
-EBUILD emacs-23.2-r3.ebuild 9977 RMD160 32377a2c7ad0d6e93e716374adefb420ff4af514 SHA1 6e5298c83015f75c7401fbe237b2ac32708c12fe SHA256 e3429ccc2815622dc2f3433cf40e0e6d084328da8885df325cbadf0e9f616ad7
-MISC ChangeLog 867 RMD160 c06043db8fa29339a3893be1d2b5f1916c2d5bf4 SHA1 d2101118bb213028daf5598b96dfd3a3c22d1580 SHA256 db0a6930fc8185568d433592b3af05daea1e248cef1597b28e74373f9bcb7af4
+EBUILD emacs-21.4-r23.ebuild 5019 RMD160 83385af5aaed6fe97262908b040346e2278a5e9d SHA1 15c3ca2917d94b8dcb6a960bb4fc2959b0e85c46 SHA256 5a1d1f0df477f371eed9c256b5070d25742f6638f9ff2bf7ab20e5abcabf90db
+EBUILD emacs-22.3-r7.ebuild 7920 RMD160 22d37c9c13d2087d5efa9295090db28c96b76f64 SHA1 de7bcb96a67e20f4fc31d4d9649201c0b9d3a972 SHA256 56251036e46e9fdda4ad1ff415146fc2c60bb26ffabb251398bbcaa728883d81
+EBUILD emacs-23.2-r3.ebuild 9845 RMD160 8696db457f4ebecf9284dd532449ed8eabe3663e SHA1 cf1679ef039a91edb17b6b1cf509241041ad2d4e SHA256 9d67567ca03cd8285d584ec3b9581d064e28ca67b3093304095c20ba4b8ab56f
+MISC ChangeLog 1032 RMD160 57b9eaccd8d14d9d7c1a1bc58204be8c0f247340 SHA1 097bbab323e0eb6923ea48a1b22efaa59aac94ae SHA256 6ca27215f02c99d2f6afecfa1d28fb54102cae06dd348a0315138596d3713c20
 MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010
diff --git a/app-editors/emacs/emacs-21.4-r23.ebuild b/app-editors/emacs/emacs-21.4-r23.ebuild
index 625537c..1189321 100644
--- a/app-editors/emacs/emacs-21.4-r23.ebuild
+++ b/app-editors/emacs/emacs-21.4-r23.ebuild
@@ -97,24 +97,23 @@ src_configure() {
 		myconf="${myconf} --without-x"
 	fi
 
-	econf ${myconf} || die "econf failed"
+	econf ${myconf}
 }
 
 src_compile() {
 	export SANDBOX_ON=0
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)"
 
 	einfo "Recompiling patched lisp files..."
-	(cd lisp; emake recompile) || die "emake recompile failed"
+	(cd lisp; emake recompile)
 	(cd src; emake versionclean)
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	local i m
 
-	einstall infodir="${D}/usr/share/info/emacs-${SLOT}" \
-		|| die "einstall failed"
+	einstall infodir="${D}/usr/share/info/emacs-${SLOT}"
 
 	for i in "${D}"/usr/bin/* ; do
 		mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
diff --git a/app-editors/emacs/emacs-22.3-r7.ebuild b/app-editors/emacs/emacs-22.3-r7.ebuild
index 527736c..4636471 100644
--- a/app-editors/emacs/emacs-22.3-r7.ebuild
+++ b/app-editors/emacs/emacs-22.3-r7.ebuild
@@ -145,18 +145,18 @@ src_configure() {
 		--infodir=/usr/share/info/${EMACS_SUFFIX} \
 		--without-carbon \
 		--with-gameuser="${GAMES_USER_DED:-games}" \
-		${myconf} || die "econf emacs failed"
+		${myconf}
 }
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install () {
 	local i m
 
-	emake install DESTDIR="${D}" || die "make install failed"
+	emake install DESTDIR="${D}"
 
 	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
 		|| die "removing duplicate emacs executable failed"
@@ -208,7 +208,7 @@ src_install () {
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
-	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
+	dodoc AUTHORS BUGS CONTRIBUTE README
 }
 
 pkg_preinst() {
diff --git a/app-editors/emacs/emacs-23.2-r3.ebuild b/app-editors/emacs/emacs-23.2-r3.ebuild
index 9c37707..5d3475c 100644
--- a/app-editors/emacs/emacs-23.2-r3.ebuild
+++ b/app-editors/emacs/emacs-23.2-r3.ebuild
@@ -195,23 +195,23 @@ src_configure() {
 		--infodir=/usr/share/info/${EMACS_SUFFIX} \
 		--with-crt-dir=/usr/$(get_libdir) \
 		--with-gameuser="${GAMES_USER_DED:-games}" \
-		${myconf} || die "econf emacs failed"
+		${myconf}
 }
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
 	if [ "${PV##*.}" = "9999" ]; then
-		emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
+		emake CC="$(tc-getCC)" bootstrap
 		# cleanup, otherwise emacs will be dumped again in src_install
 		(cd src; emake versionclean)
 	fi
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install () {
 	local i m
 
-	emake install DESTDIR="${D}" || die "make install failed"
+	emake install DESTDIR="${D}"
 
 	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
 		|| die "removing duplicate emacs executable failed"
@@ -264,7 +264,7 @@ src_install () {
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
-	dodoc README BUGS || die "dodoc failed"
+	dodoc README BUGS
 }
 
 pkg_preinst() {