Fixes #58526, incorrect enewuser usage

9 files changed, 40 insertions, 29 deletions

diff --git a/net-p2p/gift/Manifest b/net-p2p/gift/Manifest
index 7591bc167616..537c90cd8f55 100644
--- a/net-p2p/gift/Manifest
+++ b/net-p2p/gift/Manifest
@@ -1,8 +1,8 @@
-MD5 167cad0b38268cf2a890a29a059691e6 ChangeLog 2527
 MD5 3408d5257ab210c257a3176267b33453 gift-0.11.6.ebuild 1339
 MD5 875f23093b78af2d864a7a7ba464f126 metadata.xml 223
 MD5 40bcbec53e6a0bb7e674be273f0a9cf9 gift-0.11.6-r1.ebuild 1921
 MD5 29c2e6461208278433fa6dde8515c48d gift-0.11.7_pre20040627.ebuild 2139
+MD5 d9a29f0533eb867c5a415126bd0fcf1c ChangeLog 2684
 MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6 64
 MD5 64b21cffd79f35db281d077303eb810b files/digest-gift-0.11.6-r1 64
 MD5 e53b1d5024a6b4a9c59097929889cd0e files/digest-gift-0.11.7_pre20040627 76
diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index fb89a69db3a8..3995a82ee8fe 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.54 2004/07/19 23:16:41 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.55 2004/07/27 13:14:20 kang Exp $
+
+  27 Jul 2004; Guillaume Destuynder <kang@gentoo.org>
+  mldonkey-2.5.16-r(4,5,6,7).ebuild,
+  mldonkey-2.5.21-r(1,2).ebuild:
+  Fixed #58526, incorrect enewuser usage
 
   19 Jul 2004; Jon Hood <squinky86@gentoo.org> mldonkey-2.5.16-r5.ebuild:
   stable on x86
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 06148688fe06..d377d96e06f2 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,22 +1,22 @@
-MD5 09df2925ffd7be17ff1d98384c095931 mldonkey-2.5.16-r7.ebuild 2627
-MD5 0f41d126f063d42afe575dfc74743254 mldonkey-2.5.16-r4.ebuild 2599
-MD5 e021922395e2c4fbf1a65ced0cf265a7 mldonkey-2.5.16-r6.ebuild 2627
-MD5 6de0958f42d8a8c43b6074854be3d8e7 mldonkey-2.5.21-r2.ebuild 2667
-MD5 a1898b3f7a049c875546e302483c1704 mldonkey-2.5.16-r5.ebuild 2599
-MD5 d5ec56cf36a14c96cd96a0ee7916c90d mldonkey-2.5.21-r1.ebuild 2693
-MD5 aade12b239f670592314b42bee82518a ChangeLog 9473
 MD5 74e4ceef69a9fc3a7a76299e5f4d2ed8 metadata.xml 307
+MD5 83b3d337937fcd5d36ab3c7177b85d62 mldonkey-2.5.16-r4.ebuild 2600
+MD5 f442072b0c1b3d1ef2680031562b04fb mldonkey-2.5.16-r5.ebuild 2600
+MD5 af2b75c99fbb83ce18de658a0ffa25fe mldonkey-2.5.16-r6.ebuild 2628
+MD5 3f6b03df09ad572b3b04c40c55814222 mldonkey-2.5.16-r7.ebuild 2628
+MD5 e9cf2cdbc9b9ee541731d598963adac9 mldonkey-2.5.21-r1.ebuild 2694
+MD5 f2c214aa5ae25b64b54aef4eee0f0759 mldonkey-2.5.21-r2.ebuild 2668
+MD5 9fe19923a9c7ef04a1c3920d5c2faa20 ChangeLog 9634
+MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
+MD5 97c421f85a3a6aaaeb849d97400f89ca files/digest-mldonkey-2.5.21-r1 125
+MD5 9d632d54e4484981f81a2a912272f57e files/mldonkey 2543
+MD5 d68e3759e1f0f2f9a295bbf0a1c30f6b files/mldonkey-2.5.16-16g.patch 92755
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
+MD5 9d462b1fffabccafe674b6138f151ed6 files/mldonkey-2.5.16-oldbt.patch 5713
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 d9e7f6261a7e566c4e24f870678a8e8b files/mldonkey.initd 1910
-MD5 9d462b1fffabccafe674b6138f151ed6 files/mldonkey-2.5.16-oldbt.patch 5713
 MD5 a5e46e41c4a0b1a00f6da0e70561427a files/digest-mldonkey-2.5.16-r4 126
 MD5 413e60164538b85e9ba290d64e24e63f files/digest-mldonkey-2.5.16-r5 126
 MD5 8cb26fa21496d16cfdf0abf0a88fecf2 files/digest-mldonkey-2.5.16-r6 126
-MD5 920f9e5989329dba967bff5a111911a7 files/digest-mldonkey-2.5.16-r7 126
-MD5 97c421f85a3a6aaaeb849d97400f89ca files/digest-mldonkey-2.5.21-r1 125
 MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
-MD5 d68e3759e1f0f2f9a295bbf0a1c30f6b files/mldonkey-2.5.16-16g.patch 92755
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
-MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
-MD5 9d632d54e4484981f81a2a912272f57e files/mldonkey 2543
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
+MD5 920f9e5989329dba967bff5a111911a7 files/digest-mldonkey-2.5.16-r7 126
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild
index 41a4c2ec3d2d..5a1788c080d2 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild,v 1.4 2004/07/06 20:49:20 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild,v 1.5 2004/07/27 13:14:20 kang Exp $
 
 inherit eutils
 
@@ -79,8 +79,9 @@ src_install() {
 
 	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
 	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
+}
 
-	# add user
+pkg_preinst() {
 	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
 }
 
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild
index 16ddb0946fbf..0d0b9bc189d8 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild,v 1.4 2004/07/19 23:16:41 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild,v 1.5 2004/07/27 13:14:20 kang Exp $
 
 inherit eutils
 
@@ -79,8 +79,9 @@ src_install() {
 
 	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
 	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
+}
 
-	# add user
+pkg_preinst() {
 	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
 }
 
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild
index d4f0a3f62a42..7356e9e416d2 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild,v 1.3 2004/07/06 20:49:20 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild,v 1.4 2004/07/27 13:14:20 kang Exp $
 
 inherit eutils
 
@@ -80,8 +80,9 @@ src_install() {
 
 	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
 	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
+}
 
-	# add user
+pkg_preinst() {
 	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
 }
 
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild
index 3417916cdebd..c28c33088c76 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild,v 1.1 2004/07/06 20:28:04 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild,v 1.2 2004/07/27 13:14:20 kang Exp $
 
 inherit eutils
 
@@ -80,8 +80,9 @@ src_install() {
 
 	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
 	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
+}
 
-	# add user
+pkg_preinst() {
 	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
 }
 
diff --git a/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild
index 8e1133650443..48f1340c297c 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild,v 1.4 2004/07/06 20:49:20 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild,v 1.5 2004/07/27 13:14:20 kang Exp $
 
 inherit eutils
 
@@ -82,8 +82,9 @@ src_install() {
 
 	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
 	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
+}
 
-	# add user
+pkg_preinst() {
 	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
 }
 
diff --git a/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild b/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
index eb759587021d..8e496d5501e4 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild,v 1.6 2004/07/04 21:00:16 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild,v 1.7 2004/07/27 13:14:20 kang Exp $
 
 inherit eutils
 
@@ -80,8 +80,9 @@ src_install() {
 
 	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
 	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
+}
 
-	# add user
+pkg_preinst() {
 	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
 }