Replace amuled USE-flag with daemon, bug #178128

Package-Manager: portage-2.1.3.19

5 files changed, 50 insertions, 46 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/Manifest b/net-p2p/amule/Manifest
index 16c7f96c91e4..e064f3193948 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -17,22 +17,22 @@ SHA256 40f941351b8cff50a51cd3cd86046c88d66c7281882290121d8c78ed43920e76 files/am
 DIST aMule-2.1.3.tar.bz2 3248530 RMD160 fcc345000e5ad0a221d1e96d0d514f3be36428c3 SHA1 dd47deb38e7a5b823550b85150f5a814c597b273 SHA256 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
 DIST aMule-CVS-20070422.tar.bz2 3406102 RMD160 ab2912e5e07c6690a854682373107c532715faea SHA1 d0e519849d5e44d6d73940af505a209fa6fdff9c SHA256 f5a532da419a6a78238144588bb420c4cbd7b1113ea05000abf8a29b3202ac1a
 DIST aMule-CVS-20080101.tar.bz2 4049672 RMD160 c82f55031cf8ff0eef96e5254ea310383c2ac662 SHA1 da875ecbdd48860c15948377a093b2f5d1f72c0e SHA256 71fff2793a52984f5a860e0cbc4db664a882711ab66c424a4c0b7d92ba21b7ad
-EBUILD amule-2.1.3.ebuild 3008 RMD160 d33362a16feac0a0d4b05aa7988247a4ed51c9d8 SHA1 2eeb055c47a689f73214a8a5d4e9814004d3f652 SHA256 ae1e16d6f43cb4a76fcc443f96c879e734ca2ee7d8a46f32409bde06d138b95a
-MD5 7bf9166f8ab91ccca4c9daa5ed986e1f amule-2.1.3.ebuild 3008
-RMD160 d33362a16feac0a0d4b05aa7988247a4ed51c9d8 amule-2.1.3.ebuild 3008
-SHA256 ae1e16d6f43cb4a76fcc443f96c879e734ca2ee7d8a46f32409bde06d138b95a amule-2.1.3.ebuild 3008
-EBUILD amule-2.2.0_pre20070422.ebuild 2948 RMD160 ea319654a810d3b7802085dc5fbb6b5b15682042 SHA1 4d6bd0695f391a38d88562a4fbbfd5d0e18def35 SHA256 faaaea48e0712cc94b367078275c6374d342d63847c5e5a644ba4961c5b37eae
-MD5 e79e89300edc7a2db58e994626305daf amule-2.2.0_pre20070422.ebuild 2948
-RMD160 ea319654a810d3b7802085dc5fbb6b5b15682042 amule-2.2.0_pre20070422.ebuild 2948
-SHA256 faaaea48e0712cc94b367078275c6374d342d63847c5e5a644ba4961c5b37eae amule-2.2.0_pre20070422.ebuild 2948
-EBUILD amule-2.2.0_pre20080101.ebuild 2876 RMD160 004c0822192ae5beed3b84c9d78ac623701e97a4 SHA1 f8a9622f814eea2bea6793d18ad7e6e8cadeb571 SHA256 1db8b2a326417279d4551d54ac9070cfb184a7ad0572f125db7bdbe905731cf1
-MD5 6e7556a19a4a329ec6543fb49ef47b3d amule-2.2.0_pre20080101.ebuild 2876
-RMD160 004c0822192ae5beed3b84c9d78ac623701e97a4 amule-2.2.0_pre20080101.ebuild 2876
-SHA256 1db8b2a326417279d4551d54ac9070cfb184a7ad0572f125db7bdbe905731cf1 amule-2.2.0_pre20080101.ebuild 2876
-MISC ChangeLog 13828 RMD160 1cdceca51a04fde4e7435aaf937942424dd1029f SHA1 b66e52be2ce2ef556ac5b6c931a75b1c81fae74b SHA256 6165e2a175db2f6acd762159c2ffced976d74894ac49ff372b691f6a58b2cb72
-MD5 b0233539345c267a4bf40d44ae7df00b ChangeLog 13828
-RMD160 1cdceca51a04fde4e7435aaf937942424dd1029f ChangeLog 13828
-SHA256 6165e2a175db2f6acd762159c2ffced976d74894ac49ff372b691f6a58b2cb72 ChangeLog 13828
+EBUILD amule-2.1.3.ebuild 3013 RMD160 0435e512f6b69ae8e47cf697fa26e0101553ad9f SHA1 421e60db1e7e7041df32437b00ae8b1c4a84cc16 SHA256 e680653b5c7925ae07d8f3282927f9f97831db5a081b8eb1445a4efccd7158ef
+MD5 75fc547849963da53d97728a16c9991e amule-2.1.3.ebuild 3013
+RMD160 0435e512f6b69ae8e47cf697fa26e0101553ad9f amule-2.1.3.ebuild 3013
+SHA256 e680653b5c7925ae07d8f3282927f9f97831db5a081b8eb1445a4efccd7158ef amule-2.1.3.ebuild 3013
+EBUILD amule-2.2.0_pre20070422.ebuild 2946 RMD160 52103b048707024ff1c43e7ed67f5a8e87ac881e SHA1 cb9c314a237c76dba4c41cd1b4d0e95a09251b04 SHA256 06f0a03a0bcdac300b73b8f7aa6f93cad06a234108b05122b340a76d25614e09
+MD5 9467c110863ecd8291505100b3deb143 amule-2.2.0_pre20070422.ebuild 2946
+RMD160 52103b048707024ff1c43e7ed67f5a8e87ac881e amule-2.2.0_pre20070422.ebuild 2946
+SHA256 06f0a03a0bcdac300b73b8f7aa6f93cad06a234108b05122b340a76d25614e09 amule-2.2.0_pre20070422.ebuild 2946
+EBUILD amule-2.2.0_pre20080101.ebuild 2876 RMD160 c04daea40115fa05d2a7c3e1892588694eea2891 SHA1 4a6be5971284c4946a180f75f675ef9e9f8a5890 SHA256 bce9f97e6169d49d38aaeb46d6eea6b7db790b18943a38bd703c2bc8c0dc3618
+MD5 943d8803287f590218fcbc4c1de97706 amule-2.2.0_pre20080101.ebuild 2876
+RMD160 c04daea40115fa05d2a7c3e1892588694eea2891 amule-2.2.0_pre20080101.ebuild 2876
+SHA256 bce9f97e6169d49d38aaeb46d6eea6b7db790b18943a38bd703c2bc8c0dc3618 amule-2.2.0_pre20080101.ebuild 2876
+MISC ChangeLog 14015 RMD160 572124580c0aae522b08d33b026658fc614d167b SHA1 c4013c13ed96c328e96f524cca2c120a78667e78 SHA256 464da9629571a204927f7e7b598c705661b2de17a01038ca83493a8981c14d54
+MD5 befb6e9ea6c553dbb7fecd9956f6a539 ChangeLog 14015
+RMD160 572124580c0aae522b08d33b026658fc614d167b ChangeLog 14015
+SHA256 464da9629571a204927f7e7b598c705661b2de17a01038ca83493a8981c14d54 ChangeLog 14015
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
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