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
commit65589b538e56361b9a304c464842028892ebb5cc (patch)
tree81f87a24b0ace8d1ffb91478361eaad00efaad21 /dev-util
parentRemoved masked file (diff)
downloadhistorical-65589b538e56361b9a304c464842028892ebb5cc.tar.gz
historical-65589b538e56361b9a304c464842028892ebb5cc.tar.bz2
historical-65589b538e56361b9a304c464842028892ebb5cc.zip
Make some dependencies optional, bug #267033.
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/Manifest10
-rw-r--r--dev-util/meld/meld-1.3.0.ebuild16
3 files changed, 17 insertions, 14 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/Manifest b/dev-util/meld/Manifest
index 209adc08a501..eba8b8c0f0aa 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -6,13 +6,13 @@ AUX meld-1.2-wrap-list.patch 3322 RMD160 3e34936ae64ff7c00c6294721f3bd79e2e67e8d
DIST meld-1.2.1.tar.bz2 699861 RMD160 4b38b786bbe1551a5434c54f00b77556e2f8f8b3 SHA1 8c50e2b03ebc175d771539043c9db3a128373ab8 SHA256 8ed7834a40fa10aaea33981bcc8f9862afd073461a258fe008e16b6b0c156394
DIST meld-1.3.0.tar.bz2 799554 RMD160 d001f2a74fe25f2bf6539bc29e9d9be8b5f4a94b SHA1 a8b53d3f3e4ff1ededfef4ce500c2d664cb3af75 SHA256 94a6f834ce236fc1efb026fb9a875c8cb51d2c4f82361b0c989bef38ae015bfc
EBUILD meld-1.2.1.ebuild 1727 RMD160 5ef480ea9f8b8cd4bc9581380c9f41b4b7cbaa39 SHA1 0cd89c91db1bafd9ee58424c19c9581ea723a1a5 SHA256 500376c42884518da23686fc59c47e446a38d8c8494666b2f2a58f38b28cfec1
-EBUILD meld-1.3.0.ebuild 1834 RMD160 290f72b66537c3ae5a7997b2ce9a4da22e03462d SHA1 d362a5af624bc020e83d560f0a31fce014c44b90 SHA256 5be21c4a801924b943b2a585425cf84b353c55c94cdd577b6fe5fb4a83daef56
-MISC ChangeLog 12996 RMD160 65810911d9afa4a1308f02c7820b1f819a2c2d84 SHA1 7fd7a738b10563493d6f1a50bf5d5f3849714f60 SHA256 fcfea5af814cd4a2535c6abc441df7a14d93736bb13fb929df11492b56d5a050
+EBUILD meld-1.3.0.ebuild 1857 RMD160 63ea770d42667fc84f000c3cccb128874b9a941c SHA1 8367457d8cf8ffbaaa2812083ef3a96b659e2332 SHA256 156b45b3f0951418940d65823489e4768d26ce9c948a59d6d53ebb7065a84802
+MISC ChangeLog 13111 RMD160 a0a1118ad772d26af27139bfa719dc731f57c5dd SHA1 2f9fe51157bb72cd211be5a1c7b0f2613e57baea SHA256 8337ac887bf047e6e2441667ecdfcf84b3b2dea36b6ee6b841061b33beb76ea4
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkns+SoACgkQ1fmVwcYIWAbuWgCeKnnN9C055nrzYHN/J+H2ymc0
-FQEAn3fIcdPmRhtaeehMRMBTwT8rz0rl
-=sHz+
+iEYEARECAAYFAkn2K0wACgkQ1fmVwcYIWAZapQCfUUSBvgOAQLYJRQTDS4yAgnoo
+KKAAoME/+c7B+dqP1ONmT6K35xpzbRbf
+=0D+A
-----END PGP SIGNATURE-----
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