Replace amuled USE-flag with daemon, bug #178128

(Portage version: 2.1.3.19)

4 files changed, 34 insertions, 30 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 97b428f55097..cd2e65421ec3 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.96 2008/01/01 15:43:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.97 2008/01/15 13:43:48 armin76 Exp $
+
+  15 Jan 2008; Raúl Porcel <armin76@gentoo.org> amule-2.1.3.ebuild,
+  amule-2.2.0_pre20070422.ebuild, amule-2.2.0_pre20080101.ebuild:
+  Replace amuled USE-flag with daemon, bug #178128
 
 *amule-2.2.0_pre20080101 (01 Jan 2008)
 
diff --git a/net-p2p/amule/amule-2.1.3.ebuild b/net-p2p/amule/amule-2.1.3.ebuild
index 1fa5d8592ddc..ef8af9d29a8d 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-2007 Gentoo Foundation
+# Copyright 1999-2008 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.15 2007/10/13 16:16:45 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.16 2008/01/15 13:43:48 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="amuled debug gtk nls remote stats unicode"
+IUSE="daemon debug gtk nls remote stats unicode"
 
 DEPEND="=x11-libs/wxGTK-2.6*
 		>=sys-libs/zlib-1.2.1
@@ -23,9 +23,9 @@ DEPEND="=x11-libs/wxGTK-2.6*
 			unicode? ( >=media-libs/gd-2.0.26 ) )"
 
 pkg_setup() {
-		if ! use gtk && ! use remote && ! use amuled; then
+		if ! use gtk && ! use remote && ! use daemon; then
 				eerror ""
-				eerror "You have to specify at least one of gtk, remote or amuled"
+				eerror "You have to specify at least one of gtk, remote or daemon"
 				eerror "USE flag to build amule."
 				eerror ""
 				die "Invalid USE flag set"
@@ -43,7 +43,7 @@ pkg_setup() {
 }
 
 pkg_preinst() {
-	if use amuled || use remote; then
+	if use daemon || use remote; then
 		enewgroup p2p
 		enewuser p2p -1 -1 /home/p2p p2p
 	fi
@@ -86,13 +86,13 @@ src_compile() {
 				--with-wx-config=${WX_CONFIG} \
 				--with-wxbase-config=${WX_CONFIG} \
 				--enable-amulecmd \
-				`use_enable debug` \
-				`use_enable !debug optimize` \
-				`use_enable amuled amule-daemon` \
-				`use_enable nls` \
-				`use_enable remote webserver` \
-				`use_enable stats cas` \
-				`use_enable stats alcc` \
+				$(use_enable debug) \
+				$(use_enable !debug optimize) \
+				$(use_enable daemon amule-daemon) \
+				$(use_enable nls) \
+				$(use_enable remote webserver) \
+				$(use_enable stats cas) \
+				$(use_enable stats alcc) \
 				${myconf} || die
 
 		# we filter ssp until bug #74457 is closed to build on hardened
@@ -104,7 +104,7 @@ src_compile() {
 src_install() {
 		emake DESTDIR="${D}" install || die
 
-		if use amuled; then
+		if use daemon; then
 				newconfd "${FILESDIR}"/amuled.confd amuled
 				newinitd "${FILESDIR}"/amuled.initd amuled
 		fi
diff --git a/net-p2p/amule/amule-2.2.0_pre20070422.ebuild b/net-p2p/amule/amule-2.2.0_pre20070422.ebuild
index dbca1e79f510..265a14c50478 100644
--- a/net-p2p/amule/amule-2.2.0_pre20070422.ebuild
+++ b/net-p2p/amule/amule-2.2.0_pre20070422.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20070422.ebuild,v 1.3 2007/10/13 16:16:45 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20070422.ebuild,v 1.4 2008/01/15 13:43:48 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.hirnriss.net/files/cvs/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amuled debug gtk nls remote stats unicode"
+IUSE="daemon debug gtk nls remote stats unicode"
 
 DEPEND="=x11-libs/wxGTK-2.6*
 		>=sys-libs/zlib-1.2.1
@@ -23,9 +23,9 @@ DEPEND="=x11-libs/wxGTK-2.6*
 			unicode? ( >=media-libs/gd-2.0.26 ) )"
 
 pkg_setup() {
-		if ! use gtk && ! use remote && ! use amuled; then
+		if ! use gtk && ! use remote && ! use daemon; then
 				eerror ""
-				eerror "You have to specify at least one of gtk, remote or amuled"
+				eerror "You have to specify at least one of gtk, remote or daemon"
 				eerror "USE flag to build amule."
 				eerror ""
 				die "Invalid USE flag set"
@@ -43,7 +43,7 @@ pkg_setup() {
 }
 
 pkg_preinst() {
-	if use amuled || use remote; then
+	if use daemon || use remote; then
 		enewgroup p2p
 		enewuser p2p -1 -1 /home/p2p p2p
 	fi
@@ -85,7 +85,7 @@ src_compile() {
 				--enable-amulecmd \
 				`use_enable debug` \
 				`use_enable !debug optimize` \
-				`use_enable amuled amule-daemon` \
+				`use_enable daemon amule-daemon` \
 				`use_enable nls` \
 				`use_enable remote webserver` \
 				`use_enable stats cas` \
@@ -101,7 +101,7 @@ src_compile() {
 src_install() {
 		emake DESTDIR="${D}" install || die
 
-		if use amuled; then
+		if use daemon; then
 				newconfd "${FILESDIR}"/amuled.confd amuled
 				newinitd "${FILESDIR}"/amuled.initd amuled
 		fi
diff --git a/net-p2p/amule/amule-2.2.0_pre20080101.ebuild b/net-p2p/amule/amule-2.2.0_pre20080101.ebuild
index fdbd9724fde7..e46263c3abd6 100644
--- a/net-p2p/amule/amule-2.2.0_pre20080101.ebuild
+++ b/net-p2p/amule/amule-2.2.0_pre20080101.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080101.ebuild,v 1.1 2008/01/01 15:43:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20080101.ebuild,v 1.2 2008/01/15 13:43:48 armin76 Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.hirnriss.net/files/cvs/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amuled debug geoip gtk nls remote stats unicode"
+IUSE="daemon debug geoip gtk nls remote stats unicode"
 
 DEPEND="=x11-libs/wxGTK-2.8*
 		>=sys-libs/zlib-1.2.1
@@ -24,9 +24,9 @@ DEPEND="=x11-libs/wxGTK-2.8*
 		unicode? ( >=media-libs/gd-2.0.26 ) )"
 
 pkg_setup() {
-		if ! use gtk && ! use remote && ! use amuled; then
+		if ! use gtk && ! use remote && ! use daemon; then
 				eerror ""
-				eerror "You have to specify at least one of gtk, remote or amuled"
+				eerror "You have to specify at least one of gtk, remote or daemon"
 				eerror "USE flag to build amule."
 				eerror ""
 				die "Invalid USE flag set"
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 pkg_preinst() {
-	if use amuled || use remote; then
+	if use daemon || use remote; then
 		enewgroup p2p
 		enewuser p2p -1 -1 /home/p2p p2p
 	fi
@@ -83,7 +83,7 @@ src_compile() {
 				--enable-amulecmd \
 				$(use_enable debug) \
 				$(use_enable !debug optimize) \
-				$(use_enable amuled amule-daemon) \
+				$(use_enable daemon amule-daemon) \
 				$(use_enable geoip) \
 				$(use_enable nls) \
 				$(use_enable remote webserver) \
@@ -100,7 +100,7 @@ src_compile() {
 src_install() {
 		emake DESTDIR="${D}" install || die
 
-		if use amuled; then
+		if use daemon; then
 				newconfd "${FILESDIR}"/amuled.confd amuled
 				newinitd "${FILESDIR}"/amuled.initd amuled
 		fi