Ebuild clean up. Using -1 option instead of /bin/false in enewuser to be compliant with G/FBSD and G/Darwin, bug #103421

Package-Manager: portage-2.0.51.22-r2

10 files changed, 22 insertions, 266 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 41268219f42e..83559ef6ba71 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.39 2005/07/10 15:02:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.40 2005/08/26 15:21:18 sekretarz Exp $
+
+  26 Aug 2005; <sekretarz@gentoo.org> -amule-1.2.8.ebuild,
+  -amule-2.0.0_rc5.ebuild, -amule-2.0.0_rc6.ebuild, -amule-2.0.0_rc7.ebuild,
+  amule-2.0.1.ebuild, amule-2.0.3.ebuild:
+  Ebuild clean up. Using -1 option instead of /bin/false in enewuser to be
+  compliant with G/FBSD and G/Darwin, bug #103421
 
 *amule-2.0.3 (10 Jul 2005)
 
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index ff2729a2af65..4b10bc2ffd5e 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,29 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 74a1cf32ba352ff02ec0fb9703a564a5 amule-2.0.0_rc7.ebuild 2282
+MD5 e6febc40306e094cd492c779f7bdcea9 amule-2.0.1.ebuild 2104
+MD5 80d529bae1f690fb63e09ef229fc18b3 amule-2.0.3.ebuild 2104
+MD5 bb832173f9d021b4e5357796bff154d0 ChangeLog 5978
 MD5 85966639c4bc2dba5e2a625d7415a40b amule-1.2.8.ebuild 925
-MD5 61b39c9f0f0999585cc8622e76470fc8 amule-2.0.3.ebuild 2111
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 1734754c9dc2919079e6c206c4a0f2dd amule-2.0.0_rc6.ebuild 2188
-MD5 8f582ba6d49c7a9a29270b3dc1d8cff3 ChangeLog 5673
-MD5 893f8fdf4f04feaaa1fbbe293e8066f2 amule-2.0.1.ebuild 2112
-MD5 ad9ff075371157b4cf0398b40d95a409 amule-2.0.0_rc5.ebuild 2355
-MD5 556a1639bd14b1a3274a3a36a77408ca files/digest-amule-2.0.0_rc7 68
-MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3 65
-MD5 9b94153fb9594079c1df009460ece8fd files/amuleweb.confd 697
-MD5 25f3451bd4e421754b720ec5f10605b4 files/digest-amule-2.0.0_rc5 68
-MD5 e875c8bb7caccbc783bbd7238b520a04 files/digest-amule-2.0.1 65
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
+MD5 8d682aa5267ef2462c2a5d1f1867709e files/amuled.initd 1126
+MD5 9b94153fb9594079c1df009460ece8fd files/amuleweb.confd 697
 MD5 28942df92b0d2b99bd5f2d50feedca3b files/amuleweb.initd 1169
-MD5 f2547d4da315bc18cab4eb08898633c9 files/digest-amule-2.0.0_rc6 68
 MD5 6222124296125a6909963944434e0291 files/digest-amule-1.2.8 65
-MD5 8d682aa5267ef2462c2a5d1f1867709e files/amuled.initd 1126
+MD5 e875c8bb7caccbc783bbd7238b520a04 files/digest-amule-2.0.1 65
+MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3 65
 MD5 8cde6982e4b5300f4521da90ab8733d6 files/amule-2.0.0_rc7-wxgtk.patch 1293
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC0Tjbp5vW4rUFj5oRAkmuAJ44/unNzNoqKNlE286lUeoN1uGSfACdGTaI
-kFULwp+ee33A0AcmgweE5XI=
-=f1bZ
+iD8DBQFDD01wZ/iYVBmujdURAnlYAJ9UhyIn4AkjjUmNYuZEQtl6Y7+dRQCfeGEe
+AJreIrvvZlhPNim18MsPCvs=
+=7K59
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-2.0.0_rc5.ebuild b/net-p2p/amule/amule-2.0.0_rc5.ebuild
deleted file mode 100644
index cc5a6269c763..000000000000
--- a/net-p2p/amule/amule-2.0.0_rc5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc5.ebuild,v 1.7 2005/03/12 15:18:28 corsair Exp $
-
-inherit wxwidgets
-
-MY_P=${P/m/M}
-MY_P=${MY_P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gtk2 nls remote stats unicode gd"
-
-# USE "stats" enables external utilities (statistics and other)
-# USE "remote" enables remote controlling utilities (webserver, text client)
-
-
-DEPEND="remote? ( =x11-libs/wxGTK-2.4* )
-	!remote? ( >=x11-libs/wxGTK-2.4.2-r2 )
-	>=net-misc/curl-7.11.0
-	>=dev-libs/crypto++-5.1-r1
-	>=sys-libs/zlib-1.2.1
-	stats? ( >=media-libs/gd-2.0.26 )
-	gd? ( >=media-libs/gd-2.0.26 )
-	!net-p2p/xmule"
-
-pkg_setup() {
-
-	if use gtk2 >& /dev/null && use remote >& /dev/null ; then
-		die "aMule remote utilities don't work with wxGTK 2.5 so use either USE='remote' or USE='gtk2'"
-	fi
-
-	need-wxwidgets gtk
-
-	if ${WX_CONFIG} --version | grep 2.4 >& /dev/null ; then
-		if use gtk2 >& /dev/null || use unicode >& /dev/null ; then
-			einfo "Compiling ${PN} against wxGTK2 2.4.x is not supported."
-			einfo "You can upgrade wxGTK to development snapshot 2.5.*"
-			einfo "but this will break other applications, or emerge amule"
-			einfo "with USE=\"-gtk2\"."
-			die "Emerge amule with USE=\"-gtk2 -unicode\"."
-		fi
-	else
-		if ! use gtk2 >& /dev/null ; then
-			need-wxwidgets gtk || die "gtk version of x11-libs/wxGTK not found"
-		elif use unicode >& /dev/null ; then
-			need-wxwidgets unicode || die "You need to emerge unicoded wxGTK with USE='gtk2 unicode'"
-		else
-			need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-		fi
-	fi
-}
-
-src_compile() {
-	econf \
-		--disable-optimise \
-		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG} \
-		`use_enable nls` \
-		`use_enable remote amulecmd` \
-		`use_enable remote amulecmdgui` \
-		`use_enable remote webserver` \
-		`use_enable remote webservergui` \
-		`use_enable stats cas` \
-		`use_enable stats wxcas` \
-		`use_enable stats alc` \
-		`use_enable stats alcc` \
-		`use_enable debug` \
-		|| die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-p2p/amule/amule-2.0.0_rc6.ebuild b/net-p2p/amule/amule-2.0.0_rc6.ebuild
deleted file mode 100644
index 9e058072d8a4..000000000000
--- a/net-p2p/amule/amule-2.0.0_rc6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc6.ebuild,v 1.2 2005/03/12 15:18:28 corsair Exp $
-
-inherit wxwidgets
-
-MY_P=${P/m/M}
-MY_P=${MY_P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gtk2 nls remote stats unicode gd"
-
-DEPEND="remote? ( =x11-libs/wxGTK-2.4* )
-	!remote? ( >=x11-libs/wxGTK-2.4.2-r2 )
-	>=net-misc/curl-7.11.0
-	>=sys-libs/zlib-1.2.1
-	stats? ( >=media-libs/gd-2.0.26 )
-	gd? ( >=media-libs/gd-2.0.26 )
-	!net-p2p/xmule"
-
-pkg_setup() {
-
-	if use gtk2 >& /dev/null && use remote >& /dev/null ; then
-		die "aMule remote utilities don't work with wxGTK 2.5 so use either USE='remote' or USE='gtk2'"
-	fi
-
-	need-wxwidgets gtk
-
-	if ${WX_CONFIG} --version | grep 2.4 >& /dev/null ; then
-		if use gtk2 >& /dev/null || use unicode >& /dev/null ; then
-			einfo "Compiling ${PN} against wxGTK2 2.4.x is not supported."
-			einfo "You can upgrade wxGTK to development snapshot 2.5.*"
-			einfo "but this will break other applications, or emerge amule"
-			einfo "with USE=\"-gtk2 -unicode\"."
-			die "Emerge amule with USE=\"-gtk2 -unicode\"."
-		fi
-	else
-		if ! use gtk2 >& /dev/null ; then
-			need-wxwidgets gtk || die "gtk version of x11-libs/wxGTK not found"
-		elif use unicode >& /dev/null ; then
-			need-wxwidgets unicode || die "You need to emerge unicoded wxGTK with USE='gtk2 unicode'"
-		else
-			need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-		fi
-	fi
-}
-
-src_compile() {
-	econf \
-		--enable-optimise \
-		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG} \
-		`use_enable nls` \
-		`use_enable remote amulecmd` \
-		`use_enable remote amulecmdgui` \
-		`use_enable remote webserver` \
-		`use_enable remote webservergui` \
-		`use_enable stats cas` \
-		`use_enable stats wxcas` \
-		`use_enable stats alc` \
-		`use_enable stats alcc` \
-		`use_enable debug` || die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-p2p/amule/amule-2.0.0_rc7.ebuild b/net-p2p/amule/amule-2.0.0_rc7.ebuild
deleted file mode 100644
index 7d5997d5b3c8..000000000000
--- a/net-p2p/amule/amule-2.0.0_rc7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc7.ebuild,v 1.3 2005/05/31 21:26:01 sekretarz Exp $
-
-inherit wxwidgets eutils
-
-MY_P=${P/m/M}
-MY_P=${MY_P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc64"
-IUSE="debug gtk2 nls remote stats unicode gd"
-
-DEPEND="remote? ( =x11-libs/wxGTK-2.4* )
-	!remote? ( >=x11-libs/wxGTK-2.4.2-r2 )
-	>=net-misc/curl-7.11.0
-	>=sys-libs/zlib-1.2.1
-	stats? ( >=media-libs/gd-2.0.26 )
-	gd? ( >=media-libs/gd-2.0.26 )
-	!net-p2p/xmule"
-
-pkg_setup() {
-
-	if use gtk2 >& /dev/null && use remote >& /dev/null ; then
-		die "aMule remote utilities don't work with wxGTK 2.5 so use either USE='remote' or USE='gtk2'"
-	fi
-
-	need-wxwidgets gtk
-
-	if ${WX_CONFIG} --version | grep 2.4 >& /dev/null ; then
-		if use gtk2 >& /dev/null || use unicode >& /dev/null ; then
-			einfo "Compiling ${PN} against wxGTK2 2.4.x is not supported."
-			einfo "You can upgrade wxGTK to development snapshot 2.5.*"
-			einfo "but this will break other applications, or emerge amule"
-			einfo "with USE=\"-gtk2 -unicode\"."
-			die "Emerge amule with USE=\"-gtk2 -unicode\"."
-		fi
-	else
-		if ! use gtk2 >& /dev/null ; then
-			need-wxwidgets gtk || die "gtk version of x11-libs/wxGTK not found"
-		elif use unicode >& /dev/null ; then
-			need-wxwidgets unicode || die "You need to emerge unicoded wxGTK with USE='gtk2 unicode'"
-		else
-			need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-wxgtk.patch
-}
-
-src_compile() {
-	econf \
-		--enable-optimise \
-		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG} \
-		`use_enable nls` \
-		`use_enable remote amulecmd` \
-		`use_enable remote amulecmdgui` \
-		`use_enable remote webserver` \
-		`use_enable remote webservergui` \
-		`use_enable stats cas` \
-		`use_enable stats wxcas` \
-		`use_enable stats alc` \
-		`use_enable stats alcc` \
-		`use_enable debug` || die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-p2p/amule/amule-2.0.1.ebuild b/net-p2p/amule/amule-2.0.1.ebuild
index 865f9dd2ef2f..8447464fb164 100644
--- a/net-p2p/amule/amule-2.0.1.ebuild
+++ b/net-p2p/amule/amule-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.3 2005/06/02 18:30:30 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.1.ebuild,v 1.4 2005/08/26 15:21:18 sekretarz Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -68,7 +68,7 @@ src_install() {
 	if use amuled || use remote; then
 		if ! id p2p >/dev/null; then
 		        enewgroup p2p
-			enewuser p2p -1 /bin/false /home/p2p p2p
+			enewuser p2p -1 -1 /home/p2p p2p
 		fi
 	fi
 
diff --git a/net-p2p/amule/amule-2.0.3.ebuild b/net-p2p/amule/amule-2.0.3.ebuild
index 7992cda018d3..4309ffeb23aa 100644
--- a/net-p2p/amule/amule-2.0.3.ebuild
+++ b/net-p2p/amule/amule-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.1 2005/07/10 15:02:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3.ebuild,v 1.2 2005/08/26 15:21:18 sekretarz Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -68,7 +68,7 @@ src_install() {
 	if use amuled || use remote; then
 		if ! id p2p >/dev/null; then
 		        enewgroup p2p
-			enewuser p2p -1 /bin/false /home/p2p p2p
+			enewuser p2p -1 -1 /home/p2p p2p
 		fi
 	fi
 
diff --git a/net-p2p/amule/files/digest-amule-2.0.0_rc5 b/net-p2p/amule/files/digest-amule-2.0.0_rc5
deleted file mode 100644
index eab48bb84bf4..000000000000
--- a/net-p2p/amule/files/digest-amule-2.0.0_rc5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c701db7489b98424a5eb652bd28eaa4d aMule-2.0.0rc5.tar.bz2 2854287
diff --git a/net-p2p/amule/files/digest-amule-2.0.0_rc6 b/net-p2p/amule/files/digest-amule-2.0.0_rc6
deleted file mode 100644
index eb5453a70ff9..000000000000
--- a/net-p2p/amule/files/digest-amule-2.0.0_rc6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fcb1dc7cf04a738570dae2b198a64dd2 aMule-2.0.0rc6.tar.bz2 2282168
diff --git a/net-p2p/amule/files/digest-amule-2.0.0_rc7 b/net-p2p/amule/files/digest-amule-2.0.0_rc7
deleted file mode 100644
index fef1f1349337..000000000000
--- a/net-p2p/amule/files/digest-amule-2.0.0_rc7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 222de06b76aa944b1edc21aa2a7c0fb2 aMule-2.0.0rc7.tar.bz2 1877051