gui now needs unicode _always_, bug 173382

Package-Manager: portage-2.1.2.3

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index ab219c9b3847b7699be5d6d00b856c7ac2199dd9..4fedc54b4c198d14c73a6db740a9bb5abf8af9c5 100644 (file)
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.87 2007/04/04 11:20:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.88 2007/04/04 20:14:33 armin76 Exp $
+
+  04 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  amule-2.2.0_pre20070404.ebuild:
+  gui now needs unicode _always_, bug 173382
 
 *amule-2.2.0_pre20070404 (04 Apr 2007)
 

diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index de4f17126bea71bf2dace6436b5a48e49daf99a3..6e25d3b6107b9a6bf85b653fda08468277d46364 100644 (file)
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -25,14 +25,14 @@ EBUILD amule-2.1.3.ebuild 3084 RMD160 ac2671ae2e6ae5e58283e0865020ee1bd5d270e4 S
 MD5 98ac401ac72f999ba7d9369d4af00600 amule-2.1.3.ebuild 3084
 RMD160 ac2671ae2e6ae5e58283e0865020ee1bd5d270e4 amule-2.1.3.ebuild 3084
 SHA256 b5a6a8a66144f1a7f5200d0b9fac60e50f50be0937585c58958b6f6136d6b9fa amule-2.1.3.ebuild 3084
-EBUILD amule-2.2.0_pre20070404.ebuild 3132 RMD160 81e59b1c0153da36e45843a84851e211934a87f4 SHA1 eb18fa45107983910cb740e9beca05f718741224 SHA256 4b3388aca5289644dfd7a0a2da2d3a3b50b312473130daba287e147e62e2ad50
-MD5 3096c9dc84c13f59108863572c7f73a2 amule-2.2.0_pre20070404.ebuild 3132
-RMD160 81e59b1c0153da36e45843a84851e211934a87f4 amule-2.2.0_pre20070404.ebuild 3132
-SHA256 4b3388aca5289644dfd7a0a2da2d3a3b50b312473130daba287e147e62e2ad50 amule-2.2.0_pre20070404.ebuild 3132
-MISC ChangeLog 12268 RMD160 a599910538521b3fc4bef6e8f2d63d1b3b22e6ee SHA1 98b9581df0e4e82032efcb782e29eb76cfbc21fe SHA256 5621ac34a5d720f73f72c1adf122e046d2fc5e010a54072bc5cd5f64e7af4cc5
-MD5 5b37227623f9ff3f573df2f5b3571bf5 ChangeLog 12268
-RMD160 a599910538521b3fc4bef6e8f2d63d1b3b22e6ee ChangeLog 12268
-SHA256 5621ac34a5d720f73f72c1adf122e046d2fc5e010a54072bc5cd5f64e7af4cc5 ChangeLog 12268
+EBUILD amule-2.2.0_pre20070404.ebuild 3015 RMD160 5b12e3408aa1b65782850ca8e3fadaaf9aa28874 SHA1 c4f970a7326d0cd72d06aecd26aac52d6bf20a81 SHA256 80a83ee545ca17a5bf13f69d76562f1de3476c808c6d14cac233581fd356c6ea
+MD5 ddf9079b050c780f46909f6eba4b8842 amule-2.2.0_pre20070404.ebuild 3015
+RMD160 5b12e3408aa1b65782850ca8e3fadaaf9aa28874 amule-2.2.0_pre20070404.ebuild 3015
+SHA256 80a83ee545ca17a5bf13f69d76562f1de3476c808c6d14cac233581fd356c6ea amule-2.2.0_pre20070404.ebuild 3015
+MISC ChangeLog 12397 RMD160 70d4592a503c3bd8e6f5892385cc67c27bf12517 SHA1 f8267fb8a15e190dbc0680a7a0e06e74d1987822 SHA256 e8630fcaf793c2c7e03e4936cbcf92b441fdf1bc6d06a9a97b470bfe4d751bb2
+MD5 34cd8a764d28940275c2c88ce49f823c ChangeLog 12397
+RMD160 70d4592a503c3bd8e6f5892385cc67c27bf12517 ChangeLog 12397
+SHA256 e8630fcaf793c2c7e03e4936cbcf92b441fdf1bc6d06a9a97b470bfe4d751bb2 ChangeLog 12397
 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.2.0_pre20070404.ebuild b/net-p2p/amule/amule-2.2.0_pre20070404.ebuild
index 518ba0b54694feba7e35ba3cc9734977ada61637..0d545da4f8072492ffe385aab927e18921c8e92e 100644 (file)
--- a/net-p2p/amule/amule-2.2.0_pre20070404.ebuild
+++ b/net-p2p/amule/amule-2.2.0_pre20070404.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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_pre20070404.ebuild,v 1.1 2007/04/04 11:20:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20070404.ebuild,v 1.2 2007/04/04 20:14:33 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="amuled debug gtk nls remote stats"
 
 DEPEND=">=x11-libs/wxGTK-2.6.0
                >=sys-libs/zlib-1.2.1
@@ -33,12 +33,9 @@ pkg_setup() {
                                die "Invalid USE flag set"
                fi
 
-               if use unicode && use gtk; then
+               if use gtk; then
                                einfo "wxGTK with gtk2 and unicode support will be used"
                                need-wxwidgets unicode
-               elif use gtk; then
-                               einfo "wxGTK with gtk2 support will be used"
-                               need-wxwidgets gtk2
                elif use unicode; then
                                einfo "wxGTK with unicode and without X support will be used"
                                need-wxwidgets base-unicode