Clean up die usage.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 25 insertions, 21 deletions

diff --git a/dev-lang/v8/ChangeLog b/dev-lang/v8/ChangeLog
index cc3b0d5876a2..50fe484f96bb 100644
--- a/dev-lang/v8/ChangeLog
+++ b/dev-lang/v8/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/v8
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.289 2013/03/07 00:54:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.290 2013/03/11 22:01:50 floppym Exp $
+
+  11 Mar 2013; Mike Gilbert <floppym@gentoo.org> v8-3.17.6.ebuild,
+  v8-9999.ebuild:
+  Clean up die usage.
 
   07 Mar 2013; Mike Gilbert <floppym@gentoo.org> v8-3.17.6.ebuild,
   v8-9999.ebuild:
diff --git a/dev-lang/v8/v8-3.17.6.ebuild b/dev-lang/v8/v8-3.17.6.ebuild
index 6c2e70c3b0f2..f9ebaa7bc000 100644
--- a/dev-lang/v8/v8-3.17.6.ebuild
+++ b/dev-lang/v8/v8-3.17.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.17.6.ebuild,v 1.2 2013/03/07 00:54:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.17.6.ebuild,v 1.3 2013/03/11 22:01:50 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -58,7 +58,7 @@ src_configure() {
 		snapshot=on \
 		hardfp=${hardfp} \
 		console=${console} \
-		out/Makefile.${myarch} || die
+		out/Makefile.${myarch}
 }
 
 src_compile() {
@@ -71,12 +71,12 @@ src_compile() {
 	)
 
 	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot || die
+	emake "${makeargs[@]}" mksnapshot
 	pax-mark m out/${mytarget}/mksnapshot
 
 	# Build everything else.
-	emake "${makeargs[@]}" || die
-	pax-mark m out/${mytarget}/{cctest,d8,shell} || die
+	emake "${makeargs[@]}"
+	pax-mark m out/${mytarget}/{cctest,d8,shell}
 }
 
 src_test() {
@@ -89,11 +89,11 @@ src_test() {
 
 src_install() {
 	insinto /usr
-	doins -r include || die
+	doins -r include
 
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# buildsystem is too horrific to get this built correctly
-		mkdir -p out/${mytarget}/lib.target
+		mkdir -p out/${mytarget}/lib.target || die
 		mv out/${mytarget}/libv8.so.${soname_version} \
 			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
 		install_name_tool \
@@ -107,10 +107,10 @@ src_install() {
 			out/${mytarget}/d8 || die
 	fi
 
-	dobin out/${mytarget}/d8 || die
+	dobin out/${mytarget}/d8
 
-	dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
+	dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version})
+	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
 
 	dodoc AUTHORS ChangeLog || die
 }
diff --git a/dev-lang/v8/v8-9999.ebuild b/dev-lang/v8/v8-9999.ebuild
index 740ad80ee864..dbbd3e1dfba9 100644
--- a/dev-lang/v8/v8-9999.ebuild
+++ b/dev-lang/v8/v8-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.38 2013/03/07 00:54:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.39 2013/03/11 22:01:50 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -66,7 +66,7 @@ src_configure() {
 		snapshot=on \
 		hardfp=${hardfp} \
 		console=${console} \
-		out/Makefile.${myarch} || die
+		out/Makefile.${myarch}
 }
 
 src_compile() {
@@ -79,12 +79,12 @@ src_compile() {
 	)
 
 	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot || die
+	emake "${makeargs[@]}" mksnapshot
 	pax-mark m out/${mytarget}/mksnapshot
 
 	# Build everything else.
-	emake "${makeargs[@]}" || die
-	pax-mark m out/${mytarget}/{cctest,d8,shell} || die
+	emake "${makeargs[@]}"
+	pax-mark m out/${mytarget}/{cctest,d8,shell}
 }
 
 src_test() {
@@ -97,11 +97,11 @@ src_test() {
 
 src_install() {
 	insinto /usr
-	doins -r include || die
+	doins -r include
 
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# buildsystem is too horrific to get this built correctly
-		mkdir -p out/${mytarget}/lib.target
+		mkdir -p out/${mytarget}/lib.target || die
 		mv out/${mytarget}/libv8.so.${soname_version} \
 			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
 		install_name_tool \
@@ -115,10 +115,10 @@ src_install() {
 			out/${mytarget}/d8 || die
 	fi
 
-	dobin out/${mytarget}/d8 || die
+	dobin out/${mytarget}/d8
 
-	dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
+	dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version})
+	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
 
 	dodoc AUTHORS ChangeLog || die
 }