Fixing incorrect USE flag handling (bug #106697)

Package-Manager: portage-1.589-cvs

5 files changed, 26 insertions, 16 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 8b0381890e87..5f17edf45213 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # 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.51 2005/09/20 15:38:06 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.52 2005/09/20 17:24:52 mkay Exp $
+
+  20 Sep 2005; <mkay@gentoo.org> amule-1.2.8-r2.ebuild,
+  amule-2.0.1-r1.ebuild, amule-2.0.3-r3.ebuild:
+  Fixing incorrect USE flag handling. Thanks Giacomo Perale for bug #106697
 
 *amule-2.0.3-r3 (20 Sep 2005)
 *amule-2.0.1-r2 (20 Sep 2005)
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index e1746b7922fc..d72d4d6f4ff5 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,14 +1,14 @@
-MD5 6c1239bc97a333db92a6a78ca6f003a3 ChangeLog 7384
+MD5 598adb138a321ea843fc709c4b5533e1 ChangeLog 7565
 MD5 8089773038f60bec63f9fc87c15aa26e amule-1.2.8.ebuild 922
 MD5 5ff5515bcbef5c070e0356ce1f01aef4 amule-2.0.1.ebuild 2229
 MD5 1abaced287e5f9e1594893fb667a96df amule-2.0.3.ebuild 2258
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 4a0952d7f9e0fb9c6825b27f105b4494 amule-1.2.8-r2.ebuild 830
+MD5 52781eab799d0ab31cdcd3847805789e amule-1.2.8-r2.ebuild 826
 MD5 b3c15e104e1b64f5499fad3b01f9b27d amule-1.2.8-r1.ebuild 829
-MD5 bcdd2b75d6b9bc9030bad15ae7748780 amule-2.0.1-r1.ebuild 2167
 MD5 9842bde0d727d0714cf5ae1f01c14f19 amule-2.0.3-r2.ebuild 2167
-MD5 4874595252ca4894f64233d0cb1eb4d0 amule-2.0.1-r2.ebuild 2168
-MD5 82246089cd903d29858faefefc87ed1d amule-2.0.3-r3.ebuild 2168
+MD5 4b1e5b8f876490da282983c0fe3af6e6 amule-2.0.1-r2.ebuild 2183
+MD5 28a843108dc2a81ececee701965cb3da amule-2.0.3-r3.ebuild 2183
+MD5 bcdd2b75d6b9bc9030bad15ae7748780 amule-2.0.1-r1.ebuild 2167
 MD5 75c780e3a94f217a14a99371aa7e9a56 files/amuleweb.initd 1176
 MD5 8cde6982e4b5300f4521da90ab8733d6 files/amule-2.0.0_rc7-wxgtk.patch 1293
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
diff --git a/net-p2p/amule/amule-1.2.8-r2.ebuild b/net-p2p/amule/amule-1.2.8-r2.ebuild
index 1565d21b0336..bd16af3322b0 100644
--- a/net-p2p/amule/amule-1.2.8-r2.ebuild
+++ b/net-p2p/amule/amule-1.2.8-r2.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-1.2.8-r2.ebuild,v 1.1 2005/09/20 15:38:06 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.8-r2.ebuild,v 1.2 2005/09/20 17:24:52 mkay Exp $
 
 inherit wxwidgets
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug nls remote gtk"
+IUSE="debug nls remote"
 
 DEPEND=">=x11-libs/wxGTK-2.4.2-r2
 	>=net-misc/curl-7.11.0
diff --git a/net-p2p/amule/amule-2.0.1-r2.ebuild b/net-p2p/amule/amule-2.0.1-r2.ebuild
index dd2f761045f8..468970e40f6e 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
 # 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.1 2005/09/20 15:38:06 mkay Exp $
+# $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 $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~ppc64 ~sparc ~alpha"
-IUSE="amuled debug gtk nls remote stats unicode"
+IUSE="amuled debug nls remote stats unicode"
 
 
 DEPEND=">=x11-libs/wxGTK-2.6.0
@@ -27,8 +27,11 @@ DEPEND=">=x11-libs/wxGTK-2.6.0
 
 pkg_setup() {
 	export WX_GTK_VER="2.6"
-	need-wxwidgets gtk2
-	use unicode && need-wxwidgets unicode
+	if use unicode; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
+	fi
 }
 
 src_unpack() {
diff --git a/net-p2p/amule/amule-2.0.3-r3.ebuild b/net-p2p/amule/amule-2.0.3-r3.ebuild
index 3e0b2c61f77e..06f8d3e19cde 100644
--- a/net-p2p/amule/amule-2.0.3-r3.ebuild
+++ b/net-p2p/amule/amule-2.0.3-r3.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-r3.ebuild,v 1.1 2005/09/20 15:38:06 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3-r3.ebuild,v 1.2 2005/09/20 17:24:52 mkay Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~ppc64 ~sparc ~alpha"
-IUSE="amuled debug gtk nls remote stats unicode"
+IUSE="amuled debug nls remote stats unicode"
 
 
 DEPEND=">=x11-libs/wxGTK-2.6.0
@@ -27,8 +27,11 @@ DEPEND=">=x11-libs/wxGTK-2.6.0
 
 pkg_setup() {
 	export WX_GTK_VER="2.6"
-	need-wxwidgets gtk2
-	use unicode && need-wxwidgets unicode
+	if use unicode; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
+	fi
 }
 
 src_unpack() {