Removing gtk2 flag

Package-Manager: portage-2.1_pre3-r1

4 files changed, 19 insertions, 21 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index e4ef2e157aee..e3dab9799cfb 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.60 2006/01/07 20:02:06 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.61 2006/01/13 11:18:44 mkay Exp $
+
+*amule-2.1.0-r1 (13 Jan 2006)
+
+  13 Jan 2006; Marcin Kryczek <mkay@gentoo.org> -amule-2.1.0.ebuild,
+  +amule-2.1.0-r1.ebuild:
+  Removing gtk2 flag
 
 *amule-2.1.0 (07 Jan 2006)
 
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 00ced297af50..8a3e1da45706 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,4 +1,4 @@
-MD5 8277809788cfafd5cb167b4096df8ee1 ChangeLog 8514
+MD5 db738b6a1de99712846ac16df25e0b79 ChangeLog 8657
 MD5 b3c15e104e1b64f5499fad3b01f9b27d amule-1.2.8-r1.ebuild 829
 MD5 52781eab799d0ab31cdcd3847805789e amule-1.2.8-r2.ebuild 826
 MD5 8089773038f60bec63f9fc87c15aa26e amule-1.2.8.ebuild 922
@@ -9,7 +9,7 @@ MD5 9842bde0d727d0714cf5ae1f01c14f19 amule-2.0.3-r2.ebuild 2167
 MD5 28a843108dc2a81ececee701965cb3da amule-2.0.3-r3.ebuild 2183
 MD5 eb091bbab1311a771145c644cc437b84 amule-2.0.3-r4.ebuild 2763
 MD5 1abaced287e5f9e1594893fb667a96df amule-2.0.3.ebuild 2258
-MD5 f9f5c469c7c2844ad98496b64cea938f amule-2.1.0.ebuild 3467
+MD5 98f71604f7f7ccc8b63b3aaaba3c9b89 amule-2.1.0-r1.ebuild 3117
 MD5 8cde6982e4b5300f4521da90ab8733d6 files/amule-2.0.0_rc7-wxgtk.patch 1293
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
 MD5 37c7ee8278a02051a68d062beba82fbc files/amuled.initd 1138
@@ -25,5 +25,5 @@ MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3 65
 MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3-r2 65
 MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3-r3 65
 MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3-r4 65
-MD5 17b1cd39e975bb37750852113ede26ed files/digest-amule-2.1.0 65
+MD5 17b1cd39e975bb37750852113ede26ed files/digest-amule-2.1.0-r1 65
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
diff --git a/net-p2p/amule/amule-2.1.0.ebuild b/net-p2p/amule/amule-2.1.0-r1.ebuild
index 8a32a6ca1db7..40aa56dc1ade 100644
--- a/net-p2p/amule/amule-2.1.0.ebuild
+++ b/net-p2p/amule/amule-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.0.ebuild,v 1.2 2006/01/08 17:46:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.0-r1.ebuild,v 1.1 2006/01/13 11:18:44 mkay 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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amuled debug gtk gtk2 nls remote stats unicode"
+IUSE="amuled debug gtk nls remote stats unicode"
 
 DEPEND=">=x11-libs/wxGTK-2.6.0
 		>=sys-libs/zlib-1.2.1
@@ -25,37 +25,29 @@ DEPEND=">=x11-libs/wxGTK-2.6.0
 pkg_setup() {
 		export WX_GTK_VER="2.6"
 
-		if ( ! use gtk || ! use gtk2 )  && ! use remote && ! use amuled; then
+		if ! use gtk && ! use remote && ! use amuled; then
 				eerror ""
-				eerror "You have to specify at least one of X, remote or amuled"
+				eerror "You have to specify at least one of gtk, remote or amuled"
 				eerror "USE flag to build amule."
 				eerror ""
 				die "Invalid USE flag set"
 		fi
 
-		if use unicode && use gtk2; then
+		if use unicode && use gtk; then
 				einfo "wxGTK with gtk2 and unicode support will be used"
 				need-wxwidgets unicode
-		elif use gtk2; then
+		elif use gtk; then
 				einfo "wxGTK with gtk2 support will be used"
 				need-wxwidgets gtk2
-		elif use unicode && use gtk; then
-				einfo "wxGTK with gtk2 support will be used"
-				need-wxwidgets gtk
-		elif use gtk; then
-				einfo "wxGTK with gtk1 support will be used"
-				need-wxwidgets gtk
-		elif use unicode && built_with_use x11-libs/wxGTK -X unicode; then
+		elif use unicode; then
 				einfo "wxGTK with unicode and without X support will be used"
-				einfo "(wxbase unicode)"
 				need-wxwidgets base-unicode
 		else
 				einfo "wxGTK without X support will be used"
-				einfo "(wxbase)"
 				need-wxwidgets base
 		fi
 
-		if use stats && ( ! use gtk || ! use gtk2 ); then
+		if use stats && ! use gtk; then
 				einfo "Note: You would need both the gtk and stats USE flags"
 				einfo "to compile aMule Statistics GUI."
 				einfo "I will now compile console versions only."
@@ -69,7 +61,7 @@ pkg_setup() {
 src_compile() {
 		local myconf=""
 
-		if use gtk || use gtk2; then
+		if use gtk ; then
 				use stats && myconf="${myconf}
 					--enable-wxcas
 					--enable-alc"
diff --git a/net-p2p/amule/files/digest-amule-2.1.0 b/net-p2p/amule/files/digest-amule-2.1.0-r1
index 751ecf0a175d..751ecf0a175d 100644
--- a/net-p2p/amule/files/digest-amule-2.1.0
+++ b/net-p2p/amule/files/digest-amule-2.1.0-r1