summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2006-11-18 22:04:19 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2006-11-18 22:04:19 +0000
commit49b91e6d682bf1c10770f9d408297015ea665bfc (patch)
tree830e46f48e6d3cd5d5f91876c06ed4bae81b187d /gnome-base
parentppc stable, bug #154832 (diff)
downloadgentoo-2-49b91e6d682bf1c10770f9d408297015ea665bfc.tar.gz
gentoo-2-49b91e6d682bf1c10770f9d408297015ea665bfc.tar.bz2
gentoo-2-49b91e6d682bf1c10770f9d408297015ea665bfc.zip
fix dbus dependency for dbus-1.0
(Portage version: 2.1.2_rc2)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-mount/ChangeLog6
-rw-r--r--gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild9
2 files changed, 11 insertions, 4 deletions
diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index ab29c8242c72..ea1869c7b35a 100644
--- a/gnome-base/gnome-mount/ChangeLog
+++ b/gnome-base/gnome-mount/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-mount
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.20 2006/10/21 23:43:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.21 2006/11/18 22:04:19 compnerd Exp $
+
+ 18 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+ gnome-mount-0.4-r5.ebuild:
+ Fix dbus dependency for dbus-1.0 (bug #155293)
21 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
gnome-mount-0.4-r5.ebuild:
diff --git a/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild b/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild
index ae0ef23b8c57..4a27912abbdd 100644
--- a/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild
+++ b/gnome-base/gnome-mount/gnome-mount-0.4-r5.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/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild,v 1.3 2006/10/21 23:43:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild,v 1.4 2006/11/18 22:04:19 compnerd Exp $
inherit eutils gnome2
@@ -14,12 +14,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE="debug"
RDEPEND=">=gnome-base/libgnomeui-2.13
- >=sys-apps/dbus-0.60
>=sys-apps/hal-0.5.7-r1
>=x11-libs/gtk+-2.8
gnome-base/gnome-keyring
>=gnome-base/libglade-2
- >=gnome-base/gconf-2"
+ >=gnome-base/gconf-2
+ || (
+ >=dev-libs/dbus-glib-0.71
+ ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+ )"
DEPEND="${RDEPEND}
dev-util/pkgconfig