summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-12-23 08:45:01 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-12-23 08:45:01 +0000
commit1f3b7a78e0939708f74cad2c38dfea3af52b15dd (patch)
tree7114430cb5b201cd59a55ca5604fe084ffd20122
parentremove vulnerable versions (diff)
downloadgentoo-2-1f3b7a78e0939708f74cad2c38dfea3af52b15dd.tar.gz
gentoo-2-1f3b7a78e0939708f74cad2c38dfea3af52b15dd.tar.bz2
gentoo-2-1f3b7a78e0939708f74cad2c38dfea3af52b15dd.zip
Change consolekit depend to || ( ) for systemd.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
-rw-r--r--xfce-base/xfce4-session/ChangeLog6
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index dfdeb5366e60..f91b5db10726 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-session
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.146 2011/11/26 18:00:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.147 2011/12/23 08:45:01 ssuominen Exp $
+
+ 23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-session-4.8.2.ebuild:
+ Change consolekit depend to || ( ) for systemd.
26 Nov 2011; Raúl Porcel <armin76@gentoo.org> xfce4-session-4.8.2.ebuild:
alpha/ia64/sparc stable wrt #386963
diff --git a/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild
index 3ea972216518..bf763bdc6f70 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild,v 1.5 2011/11/26 18:00:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild,v 1.6 2011/12/23 08:45:01 ssuominen Exp $
EAPI=4
inherit xfconf
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.92
gnome-keyring? ( gnome-base/libgnome-keyring )
xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 )"
RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
+ consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) )
policykit? ( sys-auth/polkit )
udev? ( sys-power/upower )"
DEPEND="${COMMON_DEPEND}