summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-07 10:48:03 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-07 10:48:03 +0000
commit4236cb40411aac908e7f499faa98c3c7e83adad8 (patch)
tree2e6b48997aa6a4bdbbe8f33772944432bca4de75 /sys-auth
parentVersion bump (diff)
downloadgentoo-2-4236cb40411aac908e7f499faa98c3c7e83adad8.tar.gz
gentoo-2-4236cb40411aac908e7f499faa98c3c7e83adad8.tar.bz2
gentoo-2-4236cb40411aac908e7f499faa98c3c7e83adad8.zip
Stop blocking sys-apps/systemd (to let users switch between OpenRC and ConsoleKit vs. systemd and systemd-logind without uninstalling one or the another) wrt #478258 by Pacho Ramos
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/consolekit/ChangeLog7
-rw-r--r--sys-auth/consolekit/consolekit-0.4.6.ebuild5
2 files changed, 8 insertions, 4 deletions
diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 3ee7cde3113b..23ff4a3301c5 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-auth/consolekit
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.155 2013/07/20 05:58:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.156 2013/08/07 10:48:03 ssuominen Exp $
+
+ 07 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.6.ebuild:
+ Stop blocking sys-apps/systemd (to let users switch between OpenRC and
+ ConsoleKit vs. systemd and systemd-logind without uninstalling one or the
+ another) wrt #478258 by Pacho Ramos
*consolekit-0.4.6 (20 Jul 2013)
diff --git a/sys-auth/consolekit/consolekit-0.4.6.ebuild b/sys-auth/consolekit/consolekit-0.4.6.ebuild
index c36090900150..4d48616b0f3f 100644
--- a/sys-auth/consolekit/consolekit-0.4.6.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.6.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/sys-auth/consolekit/consolekit-0.4.6.ebuild,v 1.1 2013/07/20 05:58:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.6.ebuild,v 1.2 2013/08/07 10:48:03 ssuominen Exp $
EAPI=5
inherit autotools eutils linux-info pam systemd
@@ -26,8 +26,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
>=virtual/udev-200
)
pam? ( virtual/pam )
- policykit? ( >=sys-auth/polkit-0.110 )
- !sys-apps/systemd"
+ policykit? ( >=sys-auth/polkit-0.110 )"
RDEPEND="${COMMON_DEPEND}
kernel_linux? ( sys-apps/coreutils[acl?] )
selinux? ( sec-policy/selinux-consolekit )"