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
commit80f6c46eec90314f96479a34bfa28af6cdb5e13d (patch)
treed6cdb924125e30e38ad420d2cd3fdc7029bb654d /sys-auth
parentmarked x86 per bug 421335 (diff)
downloadhistorical-80f6c46eec90314f96479a34bfa28af6cdb5e13d.tar.gz
historical-80f6c46eec90314f96479a34bfa28af6cdb5e13d.tar.bz2
historical-80f6c46eec90314f96479a34bfa28af6cdb5e13d.zip
Adapt to sys-auth/pambase with USE="systemd" wrt #372229 by Michał Górny
Package-Manager: portage-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/Manifest18
-rw-r--r--sys-auth/polkit/polkit-0.106-r2.ebuild11
3 files changed, 19 insertions, 15 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/Manifest b/sys-auth/polkit/Manifest
index 002236850fee..d1d2fd60eea7 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -6,17 +6,17 @@ DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a
DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
-EBUILD polkit-0.106-r2.ebuild 2861 RMD160 034ff8d26362ce6db66b71bfde70ab69435a0fc8 SHA1 aedd9c01e2519cad6280ef23d1d81bca1a91ee67 SHA256 e140e37520ec753e6f523188e69ea8e730613f2ec66c07e72a1e6f6324d00743
-MISC ChangeLog 11123 RMD160 153bed51da4ec7af5ca077f7ea709bd90b79b807 SHA1 90539c7ee72862ca578fc0687974858576cae691 SHA256 68781f93736fc41312b203bfb3788bdd7345eded29f2809b6cd189d217a4d42c
+EBUILD polkit-0.106-r2.ebuild 2915 RMD160 2afab314474a75c0ab93fb61c00bbe7586ee8286 SHA1 a6ba6d01d7b4320f49597896251613df3140749c SHA256 826c35d13e652b5c36b3489ae17687f225bd00db47a90064614fb2f4bd1cdb85
+MISC ChangeLog 11279 RMD160 e8149aff5ebcacd6694e0297f5c670d12f56a10d SHA1 7303b3a476e3416327f942608f5f052a3a37c34b SHA256 2eefded08618827dca22d6d43ae2508ae29c0d59ef51695041420789321ccbcd
MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJP3d5qAAoJEEdUh39IaPFNYq4IAJiKWKx8oCD2j0GV2644f+lq
-BVpzFJoJsGJGkLmtRzknjWiyRZNzEWKW6vY4X6yb7hHNb2ZKRdl3XjknW0EhqSmd
-YVwpdjczK6juyf0MBNl0SD/7Gof/hxTIW5Y9u8jIiIODJDf7mX1oGuULj29dwMIL
-DD7UvcvkSZ0okBdCkz8l4r2BQ1uBLuR+Re4ufMXiO713oRkU+XIQhZpVCNxXSZ12
-mnjA0YtuqnKcxG+y2sxjHnI2fuiWmG/134gOkzKTwHouXqHeDu+pBGeR91dWP5sr
-D3AY5u6ZJX7mdFNsMt3nzXIR5dGGehI9JEHmHpCdEfUkpHcAz3jxLquOcJL9uyE=
-=b2hc
+iQEcBAEBAgAGBQJP4DCkAAoJEEdUh39IaPFNEREH/18Ms1FOsGBmRylW87FoUj//
+RhRWNMColLikc2cQ16VHIDf6WqjV58sQqZtki5MHEn6UhGKD95OICj/JsmxmtIt5
+qDW8puhOh7o7xZJkOutAQ6za5zkhgPYX4PHBPxeEtMrPPbo7pGf6zNQidVt6g3R+
+ydno8xBrQuJFHz2SRKyxL9H7Ivoo82E28mIvbU+d06doGBDF0IcyQFW9fl/M3APl
+TmhSnzqtJRm/wdI+lonzPvcJPF88cTdgdLggTl0ZE1PE6FdXjtxNjRrNTzAr0Tms
+5pgfH74iMcoKHkDrHR0EXytRQdk01VLeXQqumZm31ggCwWV5evCkC1VDTUg22N8=
+=6pGG
-----END PGP SIGNATURE-----
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"