enewuser/newgroup QA issues, bug #131099.

(Portage version: 2.1_pre7-r5)

6 files changed, 61 insertions, 49 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index f6cb417e2b44..1d1facf21656 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # 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.65 2006/03/24 12:35:37 reb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.66 2006/04/24 15:17:13 squinky86 Exp $
+
+  24 Apr 2006; <squinky86@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:
+  Fix enewuser QA issues, bug #131099.
 
 *amule-2.1.1 (24 Mar 2006)
 
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 09d8f8730b9b..0b3cc8a7c6af 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,18 +1,18 @@
-MD5 9ee6e83f9fec04e358888d3282c1a09d ChangeLog 9376
-RMD160 c83645928513023c1f94e3859c7f0606d70a537d ChangeLog 9376
-SHA256 06e0dcf56c5920f8f3dc5cca3506d27319ab94c0b4aa67d15d91729fdd50fdee ChangeLog 9376
-MD5 4b1e5b8f876490da282983c0fe3af6e6 amule-2.0.1-r2.ebuild 2183
-RMD160 9c7cdc4f0e75e273f3e41e539128367b2c269d82 amule-2.0.1-r2.ebuild 2183
-SHA256 43a60ba77748d43dc1afe70b349f0a1d32359bbbed61999ca2589666b3517a5a amule-2.0.1-r2.ebuild 2183
-MD5 e73a7685f6c86e4d5cff45392e291fba amule-2.0.3-r4.ebuild 2766
-RMD160 735eecfc0164fac0f283e1079fd7a1a94d4e81ab amule-2.0.3-r4.ebuild 2766
-SHA256 201df6a97dc1e3fe0d301ec7e333efa6f86b1ccb6bda08092c4794a5fa844d94 amule-2.0.3-r4.ebuild 2766
-MD5 98f71604f7f7ccc8b63b3aaaba3c9b89 amule-2.1.0-r1.ebuild 3117
-RMD160 1a525779e966c18eada28ee50110cc34b2afd537 amule-2.1.0-r1.ebuild 3117
-SHA256 4373d0812ac394d1450b3ad5a452d3e4dbfcd7aa0a7530e2b8a75a202c3a6eae amule-2.1.0-r1.ebuild 3117
-MD5 3924b2962c2e2013ee6900aba685890d amule-2.1.1.ebuild 3113
-RMD160 33a97bfa3c5674e12fb4a3df2b03f795d6b65675 amule-2.1.1.ebuild 3113
-SHA256 141873a5c819dae772bf3a9294d8a38219f5d93f582be7c9c9c13903d9a81872 amule-2.1.1.ebuild 3113
+MD5 9f9e67d38fe931de4b1b7faa44f4b24f ChangeLog 9545
+RMD160 18d0d5c6eff9fd34c4d370aa93b01e75ec307979 ChangeLog 9545
+SHA256 be1dcd1b592606f9f5f79eaf98fc6eea6fb875c423812723b09402242edca79b ChangeLog 9545
+MD5 a0a3e03ffcb226af126cb9344101a962 amule-2.0.1-r2.ebuild 2194
+RMD160 6c4b64a0a5d96385d3d116fadf89fa3d528f11ba amule-2.0.1-r2.ebuild 2194
+SHA256 f5b8a3a8efa4c960c1d9cbf602de79f50bcc5959fc314be7831a773cdaaa53ab amule-2.0.1-r2.ebuild 2194
+MD5 41564c6ea8a33c0634804a02780cabf6 amule-2.0.3-r4.ebuild 2777
+RMD160 e44c9dc823322bddfe715601182f6425ed78614d amule-2.0.3-r4.ebuild 2777
+SHA256 5f1b93d1caa795073249da189b6133c03e72a4d36544325e4b7fc6935083189b amule-2.0.3-r4.ebuild 2777
+MD5 d00a6d2a49eb1d08545c9b266b651e1e amule-2.1.0-r1.ebuild 3127
+RMD160 05ae6ad0b6e801df0b896c04a91f3eb70d6f40ce amule-2.1.0-r1.ebuild 3127
+SHA256 6f55abb232afdeb15ba8a9d1b45d9a249420c275252c11ca3f888b47ad026e6c amule-2.1.0-r1.ebuild 3127
+MD5 0a78c6b547c6ad6dcc9280750afaa811 amule-2.1.1.ebuild 3123
+RMD160 dabd7010ec8c9c4171122837b1df3f474a09da38 amule-2.1.1.ebuild 3123
+SHA256 37f11cb06f85189e9bbf292e5722936454e92b554adfab4af2e32a989baf1478 amule-2.1.1.ebuild 3123
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 files/amuled.confd 409
 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a files/amuled.confd 409
diff --git a/net-p2p/amule/amule-2.0.1-r2.ebuild b/net-p2p/amule/amule-2.0.1-r2.ebuild
index 468970e40f6e..37710da50449 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-2005 Gentoo Foundation
+# 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.2 2005/09/20 17:24:52 mkay Exp $
+# $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 $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -34,6 +34,15 @@ pkg_setup() {
 	fi
 }
 
+pkg_preinst() {
+	if use amuled || use remote; then
+		if ! id p2p >/dev/null; then
+			enewgroup p2p
+			enewuser p2p -1 -1 /home/p2p p2p
+		fi
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -70,13 +79,6 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if use amuled || use remote; then
-		if ! id p2p >/dev/null; then
-		        enewgroup p2p
-			enewuser p2p -1 -1 /home/p2p p2p
-		fi
-	fi
-
 	if use amuled; then
 	        insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled
 	        exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled
diff --git a/net-p2p/amule/amule-2.0.3-r4.ebuild b/net-p2p/amule/amule-2.0.3-r4.ebuild
index f9e96678aa7b..d6c5a99e5dbc 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.9 2006/02/07 02:45:17 agriffis Exp $
+# $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 $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -48,6 +48,15 @@ pkg_setup() {
 	fi
 }
 
+pkg_preinst() {
+	if use amuled || use remote; then
+		if ! id p2p >/dev/null; then
+			enewgroup p2p
+			enewuser p2p -1 -1 /home/p2p p2p
+		fi
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -93,13 +102,6 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if use amuled || use remote; then
-		if ! id p2p >/dev/null; then
-		        enewgroup p2p
-			enewuser p2p -1 -1 /home/p2p p2p
-		fi
-	fi
-
 	if use amuled; then
 	        insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled
 	        exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled
diff --git a/net-p2p/amule/amule-2.1.0-r1.ebuild b/net-p2p/amule/amule-2.1.0-r1.ebuild
index 40aa56dc1ade..e42944dd6f88 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.1 2006/01/13 11:18:44 mkay Exp $
+# $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 $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -58,6 +58,15 @@ pkg_setup() {
 		fi
 }
 
+pkg_preinst() {
+	if use amuled || use remote; then
+		if ! id p2p >/dev/null; then
+			enewgroup p2p
+			enewuser p2p -1 -1 /home/p2p p2p
+		fi
+	fi
+}
+
 src_compile() {
 		local myconf=""
 
@@ -98,13 +107,6 @@ src_compile() {
 src_install() {
 		make DESTDIR=${D} install || die
 
-		if use amuled || use remote; then
-			if ! id p2p >/dev/null; then
-					enewgroup p2p
-					enewuser p2p -1 -1 /home/p2p p2p
-			fi
-		fi
-
 		if use amuled; then
 				insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled
 				exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled
diff --git a/net-p2p/amule/amule-2.1.1.ebuild b/net-p2p/amule/amule-2.1.1.ebuild
index 627a6aa8d9aa..136050c01efc 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.1 2006/03/24 12:35:37 reb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.1.ebuild,v 1.2 2006/04/24 15:17:13 squinky86 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -58,6 +58,15 @@ pkg_setup() {
 		fi
 }
 
+pkg_preinst() {
+	if use amuled || use remote; then
+		if ! id p2p >/dev/null; then
+			enewgroup p2p
+			enewuser p2p -1 -1 /home/p2p p2p
+		fi
+	fi
+}
+
 src_compile() {
 		local myconf=""
 
@@ -98,13 +107,6 @@ src_compile() {
 src_install() {
 		make DESTDIR=${D} install || die
 
-		if use amuled || use remote; then
-			if ! id p2p >/dev/null; then
-					enewgroup p2p
-					enewuser p2p -1 -1 /home/p2p p2p
-			fi
-		fi
-
 		if use amuled; then
 				insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled
 				exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled