summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kryczek <mkay@gentoo.org>2005-09-20 17:24:52 +0000
committerMarcin Kryczek <mkay@gentoo.org>2005-09-20 17:24:52 +0000
commit199a4503dcb5b9e1f5d205044cbd26d2ff6f682d (patch)
tree0b9f492efe3938cdbadf43b93a0a867d3bfd74a8 /net-p2p
parentStable on ppc. (diff)
downloadgentoo-2-199a4503dcb5b9e1f5d205044cbd26d2ff6f682d.tar.gz
gentoo-2-199a4503dcb5b9e1f5d205044cbd26d2ff6f682d.tar.bz2
gentoo-2-199a4503dcb5b9e1f5d205044cbd26d2ff6f682d.zip
Fixing incorrect USE flag handling (bug #106697)
(Portage version: 1.589-cvs)
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/amule/ChangeLog6
-rw-r--r--net-p2p/amule/amule-1.2.8-r2.ebuild4
-rw-r--r--net-p2p/amule/amule-2.0.1-r2.ebuild11
-rw-r--r--net-p2p/amule/amule-2.0.3-r3.ebuild11
4 files changed, 21 insertions, 11 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/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() {