enewuser/enewgroup die on their own, no need to || die

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686)

6 files changed, 25 insertions, 20 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index d83e2eed7d67..dfc6a3a26c89 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.130 2008/08/04 20:13:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.131 2008/09/10 10:47:13 pva Exp $
+
+  10 Sep 2008; Peter Volkov <pva@gentoo.org> tcpdump-3.9.5-r3.ebuild,
+  tcpdump-3.9.6-r1.ebuild, tcpdump-3.9.7-r1.ebuild, tcpdump-3.9.8.ebuild,
+  tcpdump-3.9.8-r1.ebuild:
+  enewuser/enewgroup die on their own, no need to || die
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Describe local USE flags for GLEP 56.
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.5-r3.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.5-r3.ebuild
index 1e0031db64f8..dd9b6e320662 100644
--- a/net-analyzer/tcpdump/tcpdump-3.9.5-r3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.9.5-r3.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/tcpdump/tcpdump-3.9.5-r3.ebuild,v 1.9 2007/08/25 14:30:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.5-r3.ebuild,v 1.10 2008/09/10 10:47:13 pva Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ssl ipv6 samba"
 
 DEPEND="net-libs/libpcap
@@ -74,8 +74,8 @@ src_compile() {
 }
 
 pkg_preinst() {
-	enewgroup tcpdump || die "Failed to add group tcpdump"
-	enewuser tcpdump -1 -1 -1 tcpdump || die "Failed to add user tcpdump"
+	enewgroup tcpdump
+	enewuser tcpdump -1 -1 -1 tcpdump
 }
 
 src_install() {
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.6-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.6-r1.ebuild
index 2b027d796708..25fe23b80f4c 100644
--- a/net-analyzer/tcpdump/tcpdump-3.9.6-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.9.6-r1.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/tcpdump/tcpdump-3.9.6-r1.ebuild,v 1.6 2007/08/25 14:30:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.6-r1.ebuild,v 1.7 2008/09/10 10:47:13 pva Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ssl ipv6 samba"
 
 DEPEND="net-libs/libpcap
@@ -74,8 +74,8 @@ src_compile() {
 }
 
 pkg_preinst() {
-	enewgroup tcpdump || die "Failed to add group tcpdump"
-	enewuser tcpdump -1 -1 -1 tcpdump || die "Failed to add user tcpdump"
+	enewgroup tcpdump
+	enewuser tcpdump -1 -1 -1 tcpdump
 }
 
 src_install() {
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.7-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.7-r1.ebuild
index 0122c2263895..037b32ae620d 100644
--- a/net-analyzer/tcpdump/tcpdump-3.9.7-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.9.7-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/tcpdump/tcpdump-3.9.7-r1.ebuild,v 1.7 2008/01/10 09:09:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.7-r1.ebuild,v 1.8 2008/09/10 10:47:13 pva Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -64,8 +64,8 @@ src_compile() {
 }
 
 pkg_preinst() {
-	enewgroup tcpdump || die "Failed to add group tcpdump"
-	enewuser tcpdump -1 -1 -1 tcpdump || die "Failed to add user tcpdump"
+	enewgroup tcpdump
+	enewuser tcpdump -1 -1 -1 tcpdump
 }
 
 src_install() {
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.8-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.8-r1.ebuild
index 550a7f9edf67..ea3f4bd1e422 100644
--- a/net-analyzer/tcpdump/tcpdump-3.9.8-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.9.8-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/tcpdump/tcpdump-3.9.8-r1.ebuild,v 1.3 2008/06/25 17:44:44 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.8-r1.ebuild,v 1.4 2008/09/10 10:47:13 pva Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -68,8 +68,8 @@ src_compile() {
 }
 
 pkg_preinst() {
-	enewgroup tcpdump || die "Failed to add group tcpdump"
-	enewuser tcpdump -1 -1 -1 tcpdump || die "Failed to add user tcpdump"
+	enewgroup tcpdump
+	enewuser tcpdump -1 -1 -1 tcpdump
 }
 
 src_install() {
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.8.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.8.ebuild
index 1ecce31d7401..51208f80e47c 100644
--- a/net-analyzer/tcpdump/tcpdump-3.9.8.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.9.8.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/tcpdump/tcpdump-3.9.8.ebuild,v 1.7 2008/01/10 09:09:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.8.ebuild,v 1.8 2008/09/10 10:47:13 pva Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -64,8 +64,8 @@ src_compile() {
 }
 
 pkg_preinst() {
-	enewgroup tcpdump || die "Failed to add group tcpdump"
-	enewuser tcpdump -1 -1 -1 tcpdump || die "Failed to add user tcpdump"
+	enewgroup tcpdump
+	enewuser tcpdump -1 -1 -1 tcpdump
 }
 
 src_install() {