summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-04-27 20:01:39 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-04-27 20:01:39 +0000
commit30d947691216839468d8e2563fa2be4d327fdbc5 (patch)
tree1348adb517a81f836bc7234f3b54e8858323a47b /dev-util/meld
parentRemoved masked file (diff)
downloadgentoo-2-30d947691216839468d8e2563fa2be4d327fdbc5.tar.gz
gentoo-2-30d947691216839468d8e2563fa2be4d327fdbc5.tar.bz2
gentoo-2-30d947691216839468d8e2563fa2be4d327fdbc5.zip
Make some dependencies optional, bug #267033.
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/meld-1.3.0.ebuild16
2 files changed, 12 insertions, 9 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 58d7d1776e73..ce0099c3b3f2 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.95 2009/04/20 22:37:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.96 2009/04/27 20:01:39 eva Exp $
+
+ 27 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> meld-1.3.0:
+ Make some dependencies optional, bug #267033.
*meld-1.3.0 (20 Apr 2009)
diff --git a/dev-util/meld/meld-1.3.0.ebuild b/dev-util/meld/meld-1.3.0.ebuild
index 0826b71faced..ffb0e6303964 100644
--- a/dev-util/meld/meld-1.3.0.ebuild
+++ b/dev-util/meld/meld-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.0.ebuild,v 1.1 2009/04/20 22:37:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.0.ebuild,v 1.2 2009/04/27 20:01:39 eva Exp $
inherit python gnome2 eutils multilib
@@ -10,17 +10,17 @@ HOMEPAGE="http://meld.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
+IUSE="doc gnome"
RDEPEND=">=dev-lang/python-2.4
>=gnome-base/libglade-2
- >=gnome-base/libgnome-2
-
- >=dev-python/gconf-python-2.22
- >=dev-python/libgnome-python-2.22
- >=dev-python/gnome-vfs-python-2.22
+ gnome? (
+ >=gnome-base/libgnome-2
+ >=dev-python/libgnome-python-2.22
+ >=dev-python/gconf-python-2.22
+ >=dev-python/gnome-vfs-python-2.22 )
>=dev-python/pygtk-2.8.0
- >=dev-python/pyorbit-2.8"
+ >=dev-python/pygobject-2.8"
DEPEND="${RDEPEND}
dev-util/intltool