Drop "die" from enew{user,group} since these have always taken care of calling it when necessary.

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

4 files changed, 15 insertions, 19 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 5e1c77e1fc9b..6ad9da3d61fa 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.97 2011/09/08 06:41:38 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.98 2011/11/02 21:38:29 vapier Exp $
+
+  02 Nov 2011; Mike Frysinger <vapier@gentoo.org> sendmail-8.14.4.ebuild,
+  sendmail-8.14.5.ebuild, sendmail-8.14.5-r1.ebuild:
+  Drop "die" from enew{user,group} since these have always taken care of
+  calling it when necessary.
 
 *sendmail-8.14.5-r1 (08 Sep 2011)
 
diff --git a/mail-mta/sendmail/sendmail-8.14.4.ebuild b/mail-mta/sendmail/sendmail-8.14.4.ebuild
index 8542e0ad2752..954c12a64d01 100644
--- a/mail-mta/sendmail/sendmail-8.14.4.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.4.ebuild,v 1.9 2011/04/22 16:12:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.4.ebuild,v 1.10 2011/11/02 21:38:29 vapier Exp $
 
 EAPI="2"
 
@@ -48,11 +48,8 @@ PDEPEND="!mbox? ( mail-filter/procmail )"
 LIBMILTER_VER=1.0.1
 
 pkg_setup() {
-	einfo "checking for smmsp group...    create if missing."
-	enewgroup smmsp 209 || die "problem adding group smmsp"
-	einfo "checking for smmsp user...     create if missing."
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp \
-		|| die "problem adding user smmsp"
+	enewgroup smmsp 209
+	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
 }
 
 src_prepare() {
diff --git a/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild b/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild
index 8e561f741291..58e5ef9b1b0e 100644
--- a/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild,v 1.1 2011/09/08 06:41:38 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.5-r1.ebuild,v 1.2 2011/11/02 21:38:29 vapier Exp $
 
 EAPI="2"
 
@@ -48,11 +48,8 @@ PDEPEND="!mbox? ( mail-filter/procmail )"
 LIBMILTER_VER=1.0.2
 
 pkg_setup() {
-	einfo "checking for smmsp group...    create if missing."
-	enewgroup smmsp 209 || die "problem adding group smmsp"
-	einfo "checking for smmsp user...     create if missing."
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp \
-		|| die "problem adding user smmsp"
+	enewgroup smmsp 209
+	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
 }
 
 src_prepare() {
diff --git a/mail-mta/sendmail/sendmail-8.14.5.ebuild b/mail-mta/sendmail/sendmail-8.14.5.ebuild
index d2be94d298aa..2957afb1fe76 100644
--- a/mail-mta/sendmail/sendmail-8.14.5.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.5.ebuild,v 1.1 2011/05/17 17:59:20 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.5.ebuild,v 1.2 2011/11/02 21:38:29 vapier Exp $
 
 EAPI="2"
 
@@ -48,11 +48,8 @@ PDEPEND="!mbox? ( mail-filter/procmail )"
 LIBMILTER_VER=1.0.2
 
 pkg_setup() {
-	einfo "checking for smmsp group...    create if missing."
-	enewgroup smmsp 209 || die "problem adding group smmsp"
-	einfo "checking for smmsp user...     create if missing."
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp \
-		|| die "problem adding user smmsp"
+	enewgroup smmsp 209
+	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
 }
 
 src_prepare() {