summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2006-11-18 22:07:16 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2006-11-18 22:07:16 +0000
commit422c26ddb929f464fbb0c89ec560ea3e4f4a3bfa (patch)
tree1cabc0590eb999ad2153fb2d2553aca9df05f279 /gnome-base/gnome-session
parentfix dbus dependency for dbus-1.0 (diff)
downloadhistorical-422c26ddb929f464fbb0c89ec560ea3e4f4a3bfa.tar.gz
historical-422c26ddb929f464fbb0c89ec560ea3e4f4a3bfa.tar.bz2
historical-422c26ddb929f464fbb0c89ec560ea3e4f4a3bfa.zip
Fix dbus dependencies for dbus-1.0 (bug #155294)
Package-Manager: portage-2.1.2_rc2
Diffstat (limited to 'gnome-base/gnome-session')
-rw-r--r--gnome-base/gnome-session/ChangeLog6
-rw-r--r--gnome-base/gnome-session/gnome-session-2.16.1.ebuild7
2 files changed, 10 insertions, 3 deletions
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 5b08b6fe6695..e5211ffbfbd2 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-session
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.151 2006/10/20 23:39:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.152 2006/11/18 22:07:16 compnerd Exp $
+
+ 18 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+ gnome-session-2.16.1.ebuild:
+ Fix dbus dependencies for dbus-1.0 (bug #155294)
20 Oct 2006; Aron Griffis <agriffis@gentoo.org>
gnome-session-2.14.2.ebuild:
diff --git a/gnome-base/gnome-session/gnome-session-2.16.1.ebuild b/gnome-base/gnome-session/gnome-session-2.16.1.ebuild
index cd82f2874abb..54b88bcb6ada 100644
--- a/gnome-base/gnome-session/gnome-session-2.16.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.16.1.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-session/gnome-session-2.16.1.ebuild,v 1.1 2006/10/13 01:11:22 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.16.1.ebuild,v 1.2 2006/11/18 22:07:16 compnerd Exp $
inherit eutils gnome2
@@ -18,11 +18,14 @@ RDEPEND=">=dev-libs/glib-2.6
>=x11-libs/gtk+-2.3.1
>=gnome-base/libgnomeui-2.2
=gnome-base/gnome-desktop-2*
- >=sys-apps/dbus-0.35
>=gnome-base/control-center-2.15.4
>=x11-libs/libnotify-0.2.1
>=gnome-base/gconf-2
>=gnome-base/gnome-keyring-0.5.1
+ || (
+ >=dev-libs/dbus-glib-0.71
+ ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+ )
esd? ( >=media-sound/esound-0.2.26 )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
DEPEND="${RDEPEND}