summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-21 14:30:54 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-21 14:30:54 +0000
commit12e565889dc2677ad46a5aea26d7928ad1cb6410 (patch)
tree8707aab5e38ca53f12bb42ee07f7dc7acd5999ec /xfce-base
parentFix ESVN_REPO_URI in 9999 ebuild; Apply upstream kernel patches on 9999 ebuil... (diff)
downloadgentoo-2-12e565889dc2677ad46a5aea26d7928ad1cb6410.tar.gz
gentoo-2-12e565889dc2677ad46a5aea26d7928ad1cb6410.tar.bz2
gentoo-2-12e565889dc2677ad46a5aea26d7928ad1cb6410.zip
Punt sys-apps/systemd from || ( ) dependency behind USE="consolekit" wrt #478258
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4-session/ChangeLog7
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.10.0-r1.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 5f3fa9edbe3f..a315aaa0dfd0 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for xfce-base/xfce4-session
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.183 2013/05/09 14:20:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.184 2013/08/21 14:30:54 ssuominen Exp $
+
+ 21 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-session-4.10.0-r1.ebuild:
+ Punt sys-apps/systemd from || ( ) dependency behind USE="consolekit" wrt
+ #478258
09 May 2013; Samuli Suominen <ssuominen@gentoo.org>
xfce4-session-4.10.1.ebuild:
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.0-r1.ebuild
index 1591befa85e8..dc3b9afc9444 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.10.0-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.10.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.10.0-r1.ebuild,v 1.11 2013/04/13 07:20:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.0-r1.ebuild,v 1.12 2013/08/21 14:30:54 ssuominen Exp $
EAPI=5
inherit xfconf
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
RDEPEND="${COMMON_DEPEND}
x11-apps/xrdb
x11-misc/xdg-user-dirs
- consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-40 ) )
+ consolekit? ( sys-auth/consolekit )
policykit? ( >=sys-auth/polkit-0.104-r1 )
udev? ( >=sys-power/upower-0.9.15 )
xscreensaver? ( || (