Drop unnessecary die

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

5 files changed, 20 insertions, 18 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 1b28091cfb0f..0fc584da3481 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.143 2012/02/29 16:38:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.144 2012/04/25 16:29:19 jlec Exp $
+
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> autofs-4.1.3-r7.ebuild,
+  autofs-4.1.3-r9.ebuild, autofs-5.0.3-r6.ebuild, autofs-5.0.4-r5.ebuild:
+  Drop unnessecary die
 
   29 Feb 2012; Brent Baude <ranger@gentoo.org> autofs-5.0.6-r3.ebuild:
   Marking autofs-5.0.6-r3 ppc for bug 379569
diff --git a/net-fs/autofs/autofs-4.1.3-r7.ebuild b/net-fs/autofs/autofs-4.1.3-r7.ebuild
index 0dd92556d991..befcbd7fb408 100644
--- a/net-fs/autofs/autofs-4.1.3-r7.ebuild
+++ b/net-fs/autofs/autofs-4.1.3-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r7.ebuild,v 1.7 2010/07/21 22:12:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r7.ebuild,v 1.8 2012/04/25 16:29:19 jlec Exp $
 
 inherit eutils multilib
 
@@ -40,7 +40,7 @@ src_unpack() {
 
 	cd ${S}/lib
 	sed -i '/^listmount.o:/s,$, mount.h,g' Makefile \
-		|| die "Failed to fix dependancies"
+		|| die "Failed to fix dependencies"
 }
 
 src_compile() {
diff --git a/net-fs/autofs/autofs-4.1.3-r9.ebuild b/net-fs/autofs/autofs-4.1.3-r9.ebuild
index d02e2b3c3675..7134f48b531e 100644
--- a/net-fs/autofs/autofs-4.1.3-r9.ebuild
+++ b/net-fs/autofs/autofs-4.1.3-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r9.ebuild,v 1.2 2009/09/23 18:35:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r9.ebuild,v 1.3 2012/04/25 16:29:19 jlec Exp $
 
 inherit eutils multilib
 
@@ -40,14 +40,14 @@ src_unpack() {
 
 	cd "${S}"/lib
 	sed -i '/^listmount.o:/s,$, mount.h,g' Makefile \
-		|| die "Failed to fix dependancies"
+		|| die "Failed to fix dependencies"
 }
 
 src_compile() {
 	local myconf
 	use ldap || myconf="--without-openldap"
 
-	econf ${myconf} || die
+	econf ${myconf}
 	sed -i -e '/^\(CFLAGS\|CXXFLAGS\|LDFLAGS\)[[:space:]]*=/d' Makefile.rules || die "Failed to remove (C|CXX|LD)FLAGS"
 	# fixes segfaults on startup on amd64
 	use amd64 && CFLAGS="${CFLAGS} -DLDAP_DEPRECATED"
diff --git a/net-fs/autofs/autofs-5.0.3-r6.ebuild b/net-fs/autofs/autofs-5.0.3-r6.ebuild
index 37cab66585d9..4744370f2ca2 100644
--- a/net-fs/autofs/autofs-5.0.3-r6.ebuild
+++ b/net-fs/autofs/autofs-5.0.3-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r6.ebuild,v 1.9 2010/07/21 22:12:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r6.ebuild,v 1.10 2012/04/25 16:29:19 jlec Exp $
 
 inherit eutils multilib autotools
 
@@ -100,7 +100,7 @@ src_unpack() {
 	# as the former is a lame header for the latter (bug #157968)
 	sed -i 's@nfs/nfs.h@linux/nfs.h@' include/rpc_subs.h
 
-	eautoreconf || die "Autoconf failed"
+	eautoreconf
 }
 
 src_compile() {
@@ -108,8 +108,7 @@ src_compile() {
 	econf \
 		$(use_with ldap openldap) \
 		$(use_with sasl) \
-		--enable-ignore-busy \
-		|| die "configure failed"
+		--enable-ignore-busy
 
 	emake DONTSTRIP=1 || die "make failed"
 }
diff --git a/net-fs/autofs/autofs-5.0.4-r5.ebuild b/net-fs/autofs/autofs-5.0.4-r5.ebuild
index 21b1187611bc..72f90a2b06c2 100644
--- a/net-fs/autofs/autofs-5.0.4-r5.ebuild
+++ b/net-fs/autofs/autofs-5.0.4-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.4-r5.ebuild,v 1.9 2011/05/15 11:03:49 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.4-r5.ebuild,v 1.10 2012/04/25 16:29:19 jlec Exp $
 
 inherit eutils multilib autotools
 
@@ -112,7 +112,7 @@ src_unpack() {
 	# as the former is a lame header for the latter (bug #157968)
 	sed -i 's@nfs/nfs.h@linux/nfs.h@' include/rpc_subs.h
 
-	eautoreconf || die "Autoconf failed"
+	eautoreconf
 }
 
 src_compile() {
@@ -125,8 +125,7 @@ src_compile() {
 		$(use_with ldap openldap) \
 		$(use_with sasl) \
 		--without-hesiod \
-		--enable-ignore-busy \
-		|| die "configure failed"
+		--enable-ignore-busy
 
 	emake DONTSTRIP=1 || die "make failed"
 }