Add missing die: || "..." -> || die "..."

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-tuxonice-r9 i686

7 files changed, 23 insertions, 13 deletions

diff --git a/net-analyzer/firewalk/ChangeLog b/net-analyzer/firewalk/ChangeLog
index 369b79922421..e6653a66e68e 100644
--- a/net-analyzer/firewalk/ChangeLog
+++ b/net-analyzer/firewalk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/firewalk
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/ChangeLog,v 1.11 2007/11/02 18:39:04 beandog Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/ChangeLog,v 1.12 2008/06/29 10:11:21 tove Exp $
+
+  29 Jun 2008; Torsten Veller <tove@gentoo.org> firewalk-5.0.ebuild:
+  Add missing die: || "..." -> || die "..."
 
   02 Nov 2007; Steve Dibb <beandog@gentoo.org> firewalk-5.0.ebuild:
   amd64 stable, bug 194180
diff --git a/net-analyzer/firewalk/firewalk-5.0.ebuild b/net-analyzer/firewalk/firewalk-5.0.ebuild
index 52885147dd5a..65c03fccda96 100644
--- a/net-analyzer/firewalk/firewalk-5.0.ebuild
+++ b/net-analyzer/firewalk/firewalk-5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/firewalk-5.0.ebuild,v 1.10 2007/11/02 18:39:04 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/firewalk-5.0.ebuild,v 1.11 2008/06/29 10:11:21 tove Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	doman man/firewalk.8
 	dodoc README TODO BUGS
 }
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index e870df3941a6..b9256dbb8d70 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.127 2008/06/27 20:03:52 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.128 2008/06/29 10:10:06 tove Exp $
+
+  29 Jun 2008; Torsten Veller <tove@gentoo.org> nagios-core-2.12.ebuild:
+  Add missing die: || "..." -> || die "..."
 
   27 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   -nagios-core-2.11.ebuild, -nagios-core-3.0.2.ebuild,
diff --git a/net-analyzer/nagios-core/nagios-core-2.12.ebuild b/net-analyzer/nagios-core/nagios-core-2.12.ebuild
index e1b1ca83b9e5..0a705c371bf8 100644
--- a/net-analyzer/nagios-core/nagios-core-2.12.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.12.ebuild,v 1.5 2008/05/22 18:32:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.12.ebuild,v 1.6 2008/06/29 10:10:06 tove Exp $
 
 EAPI="1"
 
@@ -93,7 +93,7 @@ src_compile() {
 		make CC=$(tc-getCC) DESTDIR="${D}" cgis || die
 	fi
 
-	emake -C contrib all || "contrib make filed"
+	emake -C contrib all || die "contrib make filed"
 
 }
 
diff --git a/net-analyzer/ndoutils/ChangeLog b/net-analyzer/ndoutils/ChangeLog
index 092bdc361835..2b49c006d194 100644
--- a/net-analyzer/ndoutils/ChangeLog
+++ b/net-analyzer/ndoutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ndoutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ChangeLog,v 1.5 2008/06/08 18:37:50 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ChangeLog,v 1.6 2008/06/29 10:07:24 tove Exp $
+
+  29 Jun 2008; Torsten Veller <tove@gentoo.org> ndoutils-1.4_beta7.ebuild,
+  ndoutils-1.4_beta7-r1.ebuild:
+  Add missing die: || "..." -> || die "..."
 
 *ndoutils-1.4_beta7-r1 (08 Jun 2008)
 
diff --git a/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild b/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild
index f914b270fffe..505e1c40213f 100644
--- a/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild,v 1.1 2008/06/08 18:37:50 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild,v 1.2 2008/06/29 10:07:24 tove Exp $
 
 inherit eutils
 
@@ -45,7 +45,7 @@ src_install() {
 	cp -R "${S}"/db "${D}"/usr/share/nagios
 
 	chown -R root:nagios "${D}"/usr/bin || die "Failed chown of "${D}"/usr/nagios"
-	chmod 750 "${D}"/usr/bin/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} || "Failed chmod"
+	chmod 750 "${D}"/usr/bin/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} || die "Failed chmod"
 
 	dodoc README REQUIREMENTS TODO UPGRADING Changelog "docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf"
 
diff --git a/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild b/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild
index 4f9d2ac9c72b..11a093d6778a 100644
--- a/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild,v 1.2 2008/06/08 18:37:50 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ndoutils-1.4_beta7.ebuild,v 1.3 2008/06/29 10:07:24 tove Exp $
 
 inherit eutils
 
@@ -44,7 +44,7 @@ src_install() {
 	cp -R "${S}"/db "${D}"/usr/nagios/share
 
 	chown -R root:nagios "${D}"/usr/nagios || die "Failed chown of "${D}"/usr/nagios"
-	chmod 750 "${D}"/usr/nagios/bin/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} || "Failed chmod"
+	chmod 750 "${D}"/usr/nagios/bin/{file2sock,log2ndo,ndo2db-2x,ndomod-2x.o,sockdebug} || die "Failed chmod"
 
 	dodoc README REQUIREMENTS TODO UPGRADING Changelog "docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf"