Add ewarn about ensuring that consolekit sessions are working. Either the user needs...

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index d5eecb14ec974b250748cf9ba9a2147fbfdbc01b..87438142de787d58932d77b3bf9ae18584c8e762 100644 (file)
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.18 2010/07/02 10:02:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.19 2010/07/07 21:20:06 nirbheek Exp $
+
+  07 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org> polkit-0.96-r1.ebuild,
+  polkit-0.96-r2.ebuild:
+  Add ewarn about ensuring that consolekit sessions are working. Either the
+  user needs to login using a login-manager with consolekit support, or use
+  ck-launch-session to launch the DE as suggested in bug 291116 comment 13
 
 *polkit-0.96-r2 (02 Jul 2010)
 

diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 58618e952ea6ee9017d81b37b6317ef98994af42..8542bd09e42641dd4c71652ecdc06544fbda2294 100644 (file)
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -2,8 +2,8 @@ AUX polkit-0.96-getcwd.patch 652 RMD160 400afc6333cebf50dcdc0c5167cb6bd4dbaf8ea4
 DIST polkit-0.96-r1-shadow-support.patch.lzma 4970 RMD160 51c53d8be68bfdfa0b5a3eb2a4d8ddbba10c94b6 SHA1 bd4d3446aea77e3c84ad94a28f9644307921a086 SHA256 c7c323be29362816abd08463b962cd38a97c24f61d5f8b6da635e2bb329fa52a
 DIST polkit-0.96-shadow-support.patch.bz2 6138 RMD160 97ed7fc118e1f52f8182f872992eb068f5c98584 SHA1 83b53931a9cfe47a4e4b9501c0f75164dfa9ed11 SHA256 dde65f3795a2d1bef8f009a2f9bc0c3ee0130037bf012cf66b874128a76ef4e6
 DIST polkit-0.96.tar.gz 1034210 RMD160 19847f0835a3041446523066e6db58dfb60d3aae SHA1 0815b2ee2ffc2ebf2b6fc73491018a898fc73930 SHA256 3426ca917210b2a5525732559368c18f983a4c39a6a55c5dddba26071bd8054a
-EBUILD polkit-0.96-r1.ebuild 2636 RMD160 b32e6d0fda723ef942ddf46810f6a58db0a95f3e SHA1 574bc5a51a3000a091fb1291aa82131053ab4233 SHA256 0f25a5f3c0b0dbfcc53247ef92d151e7c5255a9121b1b3a0f3ca385269b4c030
-EBUILD polkit-0.96-r2.ebuild 2439 RMD160 aec40a2184b464f93f073da837ba99c11c1c4f11 SHA1 d8ec2256b0e8be47a0f2690ce7b8023809856471 SHA256 b84ce82d58299d3745a791ed4c40673ffe62396625c79258b6e49aed6b58cc50
+EBUILD polkit-0.96-r1.ebuild 3925 RMD160 e64f3089922f9da7adfa4c839f0463b0ef75240c SHA1 0953cde4f15f44ca3fd213c5d703a3207456120d SHA256 08743bfe98b680995eaed6c274ba6c4b2d768f5c7d6747ab1297d73335da34f1
+EBUILD polkit-0.96-r2.ebuild 3726 RMD160 f8b93454bda8900d30a731e33cddf14f4ed07f8a SHA1 b0673127f419d7a64d9106c19561c3b2086dab4e SHA256 8c7d00bc0d811a912bcc270c187675e2dd267c3c3f8aeb71447b191a04803da7
 EBUILD polkit-0.96.ebuild 2579 RMD160 9dda733a60bf639e5003d3f69ae31f0457b0453b SHA1 5f7664e81c13651b41b71037a922844d50962f19 SHA256 cdafcfbd66e61b07c2aaef98ce19cfbb1049056948ad92bae5ca69d2e8184e4e
-MISC ChangeLog 2979 RMD160 35dbcdb36d9140337c68ef452c2dbcdb385a8d00 SHA1 d571d8668f149b19018d3e5e70832cfb62d7d8b8 SHA256 1067051c1e44532e04864d73b8741417773edb450ba06a8b04bfd74272cc8f26
+MISC ChangeLog 3309 RMD160 8143ca080615f178b7a4a2823af6c489c1ab73d5 SHA1 56673c7276162505a528ee3d2d9963ee7e5db623 SHA256 1c665def6cb60fdde40d3204e41f2fad5b027e947e3fa68a53cb2835167539b8
 MISC metadata.xml 382 RMD160 a1de2f0bbe45fa2eae8bccbb2c52abc3c360563b SHA1 6e874e8a2b69027d778ec2c556bc4a3c347505d8 SHA256 c9e19b020dccea9a19e76721c47195e9973c751c0a10cd7e9e3d941c6947ba10

diff --git a/sys-auth/polkit/polkit-0.96-r1.ebuild b/sys-auth/polkit/polkit-0.96-r1.ebuild
index 2336bfce757e33085dad4dcb0ed5d7ec52f31f8f..7bd3ebd6158f651a6fb28b784251abbecc3a0f83 100644 (file)
--- a/sys-auth/polkit/polkit-0.96-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.96-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.96-r1.ebuild,v 1.6 2010/06/04 19:50:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.96-r1.ebuild,v 1.7 2010/07/07 21:20:06 nirbheek Exp $
 
 EAPI="2"
 
@@ -97,3 +97,31 @@ src_install() {
        keepdir /var/run/polkit-1
        keepdir /var/lib/polkit-1
 }
+
+pkg_postinst() {
+       # Make sure that the user has consolekit sessions working so that the
+       # 'allow_active' directive in polkit action policies works
+       if has_version 'gnome-base/gdm' && ! has_version 'gnome-base/gdm[consolekit]'; then
+               # If user has GDM installed, but USE=-consolekit, warn them
+               ewarn "You have GDM installed, but it does not have USE=consolekit"
+               ewarn "If you login using GDM, polkit authorizations will not work"
+               ewarn "unless you enable USE=consolekit"
+               einfo
+       fi
+       if has_version 'kde-base/kdm' && ! has_version 'kde-base/kdm[consolekit]'; then
+               # If user has KDM installed, but USE=-consolekit, warn them
+               ewarn "You have KDM installed, but it does not have USE=consolekit"
+               ewarn "If you login using KDM, polkit authorizations will not work"
+               ewarn "unless you enable USE=consolekit"
+               einfo
+       fi
+       if ! has_version 'gnome-base/gdm[consolekit]' && \
+               ! has_version 'kde-base/kdm[consolekit]'; then
+               # Inform user about the alternative method
+               ewarn "If you don't use GDM or KDM for logging in,"
+               ewarn "you must start your desktop environment (DE) as follows:"
+               ewarn " ck-launch-session \$STARTGUI"
+               ewarn "Where \$STARTGUI is a DE-starting command such as 'gnome-session'."
+               ewarn "You should add this to your ~/.xinitrc if you use startx."
+       fi
+}

diff --git a/sys-auth/polkit/polkit-0.96-r2.ebuild b/sys-auth/polkit/polkit-0.96-r2.ebuild
index bed7a4e62702aaf95965746cd8454681a5d18e16..73fcd2cc72151b4e3a079a71d006d414021dfdf9 100644 (file)
--- a/sys-auth/polkit/polkit-0.96-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.96-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.96-r2.ebuild,v 1.1 2010/07/02 10:02:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.96-r2.ebuild,v 1.2 2010/07/07 21:20:06 nirbheek Exp $
 
 EAPI="2"
 
@@ -86,3 +86,31 @@ src_install() {
        keepdir /var/run/polkit-1
        keepdir /var/lib/polkit-1
 }
+
+pkg_postinst() {
+       # Make sure that the user has consolekit sessions working so that the
+       # 'allow_active' directive in polkit action policies works
+       if has_version 'gnome-base/gdm' && ! has_version 'gnome-base/gdm[consolekit]'; then
+               # If user has GDM installed, but USE=-consolekit, warn them
+               ewarn "You have GDM installed, but it does not have USE=consolekit"
+               ewarn "If you login using GDM, polkit authorizations will not work"
+               ewarn "unless you enable USE=consolekit"
+               einfo
+       fi
+       if has_version 'kde-base/kdm' && ! has_version 'kde-base/kdm[consolekit]'; then
+               # If user has KDM installed, but USE=-consolekit, warn them
+               ewarn "You have KDM installed, but it does not have USE=consolekit"
+               ewarn "If you login using KDM, polkit authorizations will not work"
+               ewarn "unless you enable USE=consolekit"
+               einfo
+       fi
+       if ! has_version 'gnome-base/gdm[consolekit]' && \
+               ! has_version 'kde-base/kdm[consolekit]'; then
+               # Inform user about the alternative method
+               ewarn "If you don't use GDM or KDM for logging in,"
+               ewarn "you must start your desktop environment (DE) as follows:"
+               ewarn " ck-launch-session \$STARTGUI"
+               ewarn "Where \$STARTGUI is a DE-starting command such as 'gnome-session'."
+               ewarn "You should add this to your ~/.xinitrc if you use startx."
+       fi
+}