bad enewuser usage, check if user already exists is done by eclass, bug #142754

(Portage version: 2.1.1_rc1-r7)

7 files changed, 24 insertions, 31 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 1c26eb144c05..9de757c986f5 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.73 2006/06/12 15:24:28 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.74 2006/09/07 22:29:35 sekretarz Exp $
+
+  08 Sep 2006; Karol Wojtaszek <sekretarz@gentoo.org> amule-2.0.1-r2.ebuild,
+  amule-2.0.3-r4.ebuild, amule-2.1.0-r1.ebuild, amule-2.1.1.ebuild,
+  amule-2.1.2.ebuild, amule-2.1.3.ebuild:
+  bad enewuser usage, check if user already exists is done by eclass, bug #142754
 
 *amule-2.1.3 (12 Jun 2006)
 
diff --git a/net-p2p/amule/amule-2.0.1-r2.ebuild b/net-p2p/amule/amule-2.0.1-r2.ebuild
index 37710da50449..57c9b2c21aed 100644
--- a/net-p2p/amule/amule-2.0.1-r2.ebuild
+++ b/net-p2p/amule/amule-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.1-r2.ebuild,v 1.3 2006/04/24 15:17:13 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.1-r2.ebuild,v 1.4 2006/09/07 22:29:35 sekretarz Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -36,10 +36,8 @@ pkg_setup() {
 
 pkg_preinst() {
 	if use amuled || use remote; then
-		if ! id p2p >/dev/null; then
-			enewgroup p2p
-			enewuser p2p -1 -1 /home/p2p p2p
-		fi
+		enewgroup p2p
+		enewuser p2p -1 -1 /home/p2p p2p
 	fi
 }
 
diff --git a/net-p2p/amule/amule-2.0.3-r4.ebuild b/net-p2p/amule/amule-2.0.3-r4.ebuild
index d6c5a99e5dbc..aaadadc37cd1 100644
--- a/net-p2p/amule/amule-2.0.3-r4.ebuild
+++ b/net-p2p/amule/amule-2.0.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3-r4.ebuild,v 1.10 2006/04/24 15:17:13 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3-r4.ebuild,v 1.11 2006/09/07 22:29:35 sekretarz Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -50,10 +50,8 @@ pkg_setup() {
 
 pkg_preinst() {
 	if use amuled || use remote; then
-		if ! id p2p >/dev/null; then
-			enewgroup p2p
-			enewuser p2p -1 -1 /home/p2p p2p
-		fi
+		enewgroup p2p
+		enewuser p2p -1 -1 /home/p2p p2p
 	fi
 }
 
diff --git a/net-p2p/amule/amule-2.1.0-r1.ebuild b/net-p2p/amule/amule-2.1.0-r1.ebuild
index e42944dd6f88..dcb2d58e0912 100644
--- a/net-p2p/amule/amule-2.1.0-r1.ebuild
+++ b/net-p2p/amule/amule-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.0-r1.ebuild,v 1.2 2006/04/24 15:17:13 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.0-r1.ebuild,v 1.3 2006/09/07 22:29:35 sekretarz Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -60,10 +60,8 @@ pkg_setup() {
 
 pkg_preinst() {
 	if use amuled || use remote; then
-		if ! id p2p >/dev/null; then
-			enewgroup p2p
-			enewuser p2p -1 -1 /home/p2p p2p
-		fi
+		enewgroup p2p
+		enewuser p2p -1 -1 /home/p2p p2p
 	fi
 }
 
diff --git a/net-p2p/amule/amule-2.1.1.ebuild b/net-p2p/amule/amule-2.1.1.ebuild
index 136050c01efc..590143d99def 100644
--- a/net-p2p/amule/amule-2.1.1.ebuild
+++ b/net-p2p/amule/amule-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.1.ebuild,v 1.2 2006/04/24 15:17:13 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.1.ebuild,v 1.3 2006/09/07 22:29:35 sekretarz Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -60,10 +60,8 @@ pkg_setup() {
 
 pkg_preinst() {
 	if use amuled || use remote; then
-		if ! id p2p >/dev/null; then
-			enewgroup p2p
-			enewuser p2p -1 -1 /home/p2p p2p
-		fi
+		enewgroup p2p
+		enewuser p2p -1 -1 /home/p2p p2p
 	fi
 }
 
diff --git a/net-p2p/amule/amule-2.1.2.ebuild b/net-p2p/amule/amule-2.1.2.ebuild
index 82546110ada1..475e59d2241c 100644
--- a/net-p2p/amule/amule-2.1.2.ebuild
+++ b/net-p2p/amule/amule-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.2.ebuild,v 1.6 2006/06/10 14:52:21 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.2.ebuild,v 1.7 2006/09/07 22:29:35 sekretarz Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -60,10 +60,8 @@ pkg_setup() {
 
 pkg_preinst() {
 	if use amuled || use remote; then
-		if ! id p2p >/dev/null; then
-			enewgroup p2p
-			enewuser p2p -1 -1 /home/p2p p2p
-		fi
+	    enewgroup p2p
+	enewuser p2p -1 -1 /home/p2p p2p
 	fi
 }
 
diff --git a/net-p2p/amule/amule-2.1.3.ebuild b/net-p2p/amule/amule-2.1.3.ebuild
index f9f93c85d73e..300b0801173b 100644
--- a/net-p2p/amule/amule-2.1.3.ebuild
+++ b/net-p2p/amule/amule-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.1 2006/06/12 15:24:28 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.2 2006/09/07 22:29:35 sekretarz Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -60,10 +60,8 @@ pkg_setup() {
 
 pkg_preinst() {
 	if use amuled || use remote; then
-		if ! id p2p >/dev/null; then
-			enewgroup p2p
-			enewuser p2p -1 -1 /home/p2p p2p
-		fi
+		enewgroup p2p
+		enewuser p2p -1 -1 /home/p2p p2p
 	fi
 }