summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-19 08:00:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-19 08:00:50 +0000
commit38fbd3990fddae5ffe3bb7196d7c36957919c6f3 (patch)
treee1cbf81e2e62294fe1d4f12da88fd3f10ff64436 /sys-auth
parentmarked x86 per bug 421335 (diff)
downloadgentoo-2-38fbd3990fddae5ffe3bb7196d7c36957919c6f3.tar.gz
gentoo-2-38fbd3990fddae5ffe3bb7196d7c36957919c6f3.tar.bz2
gentoo-2-38fbd3990fddae5ffe3bb7196d7c36957919c6f3.zip
Adapt to sys-auth/pambase with USE="systemd" wrt #372229 by Michał Górny
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/polkit/ChangeLog5
-rw-r--r--sys-auth/polkit/polkit-0.106-r2.ebuild11
2 files changed, 10 insertions, 6 deletions
diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 22f15cce6640..77c95a5efc5b 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-auth/polkit
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.83 2012/06/17 13:45:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.84 2012/06/19 08:00:50 ssuominen Exp $
+
+ 19 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.106-r2.ebuild:
+ Adapt to sys-auth/pambase with USE="systemd" wrt #372229 by Michał Górny
17 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> -polkit-0.106-r1.ebuild:
old
diff --git a/sys-auth/polkit/polkit-0.106-r2.ebuild b/sys-auth/polkit/polkit-0.106-r2.ebuild
index 92fae90c0cff..168e1077ac32 100644
--- a/sys-auth/polkit/polkit-0.106-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.106-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r2.ebuild,v 1.1 2012/06/17 13:44:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r2.ebuild,v 1.2 2012/06/19 08:00:50 ssuominen Exp $
EAPI=4
inherit eutils pam systemd user
@@ -35,10 +35,11 @@ PDEPEND="
lxde-base/lxpolkit
) )
kde? ( sys-auth/polkit-kde-agent )
- !systemd? (
- >=sys-auth/consolekit-0.4.5_p2012[policykit]
- pam? ( sys-auth/pambase[consolekit] )
- )"
+ pam? (
+ systemd? ( sys-auth/pambase[systemd] )
+ !systemd? ( sys-auth/pambase[consolekit] )
+ )
+ !systemd? ( >=sys-auth/consolekit-0.4.5_p2012[policykit] )"
DOCS="docs/TODO HACKING NEWS README"