[gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/

[Michael Palimaka]

commit:     6c779689028e731fb55fc0d04d0a324a566461c1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 15:36:47 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 15:37:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6c779689

kde-plasma/powerdevil: add support for suspending with consolekit2 and new upower

Thanks to Consolekit2 upstream for the pkla file.

Package-Manager: portage-2.2.26

 ...reedesktop.consolekit.system.suspend-multiple-users.pkla | 13 +++++++++++++
 .../{powerdevil-5.5.2.ebuild => powerdevil-5.5.2-r1.ebuild} | 11 +++++++++--
 kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild         | 11 +++++++++--
 kde-plasma/powerdevil/powerdevil-9999.ebuild                | 11 +++++++++--
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/powerdevil/files/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla b/kde-plasma/powerdevil/files/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
new file mode 100644
index 0000000..b01aa4f
--- /dev/null
+++ b/kde-plasma/powerdevil/files/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
@@ -0,0 +1,13 @@
+# Enable user suspend support with Consolekit2.
+#
+# Author: Eric Hameleers <alien@×××××××××.com>
+#
+# KDE bug #344456
+# Gentoo bug #529186
+#
+[Allow all users to suspend with Conesolekit2]
+Identity=unix-group:users
+Action=org.freedesktop.consolekit.system.suspend-multiple-users;org.freedesktop.consolekit.system.suspend
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes

diff --git a/kde-plasma/powerdevil/powerdevil-5.5.2.ebuild b/kde-plasma/powerdevil/powerdevil-5.5.2-r1.ebuild
similarity index 87%
rename from kde-plasma/powerdevil/powerdevil-5.5.2.ebuild
rename to kde-plasma/powerdevil/powerdevil-5.5.2-r1.ebuild
index 9b572a8..35e2b00 100644
--- a/kde-plasma/powerdevil/powerdevil-5.5.2.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.5.2-r1.ebuild
@@ -44,8 +44,14 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	|| ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
-	!systemd? ( sys-auth/polkit-pkla-compat )
+	systemd? ( >=sys-power/upower-0.9.23 )
+	!systemd? (
+		sys-auth/polkit-pkla-compat
+		|| (
+			( >=sys-auth/consolekit-1.0.0 >=sys-power/upower-0.9.23 )
+			sys-power/upower-pm-utils
+		)
+	)
 	!kde-base/powerdevil:4
 	!kde-base/systemsettings:4[handbook]
 "
@@ -58,6 +64,7 @@ src_install() {
 		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
 		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
 		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+		doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
 	fi
 }
 

diff --git a/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
index e98e921..c38080f 100644
--- a/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
@@ -44,8 +44,14 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	|| ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
-	!systemd? ( sys-auth/polkit-pkla-compat )
+	systemd? ( >=sys-power/upower-0.9.23 )
+	!systemd? (
+		sys-auth/polkit-pkla-compat
+		|| (
+			( >=sys-auth/consolekit-1.0.0 >=sys-power/upower-0.9.23 )
+			sys-power/upower-pm-utils
+		)
+	)
 	!kde-base/powerdevil:4
 	!kde-base/systemsettings:4[handbook]
 "
@@ -58,6 +64,7 @@ src_install() {
 		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
 		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
 		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+		doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
 	fi
 }
 

diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index e98e921..c38080f 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -44,8 +44,14 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	|| ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
-	!systemd? ( sys-auth/polkit-pkla-compat )
+	systemd? ( >=sys-power/upower-0.9.23 )
+	!systemd? (
+		sys-auth/polkit-pkla-compat
+		|| (
+			( >=sys-auth/consolekit-1.0.0 >=sys-power/upower-0.9.23 )
+			sys-power/upower-pm-utils
+		)
+	)
 	!kde-base/powerdevil:4
 	!kde-base/systemsettings:4[handbook]
 "
@@ -58,6 +64,7 @@ src_install() {
 		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
 		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
 		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+		doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
 	fi
 }