Fix missing shutdown/restart/suspend/hibernate options for non-systemd systems wrt bug #529186.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key )

5 files changed, 120 insertions, 1 deletions

diff --git a/kde-plasma/powerdevil/ChangeLog b/kde-plasma/powerdevil/ChangeLog
index 48db0353d8e5..75517b691ec4 100644
--- a/kde-plasma/powerdevil/ChangeLog
+++ b/kde-plasma/powerdevil/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-plasma/powerdevil
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-plasma/powerdevil/ChangeLog,v 1.1 2015/05/31 22:06:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-plasma/powerdevil/ChangeLog,v 1.2 2015/06/12 17:30:30 mrueg Exp $
+
+*powerdevil-5.3.1-r1 (12 Jun 2015)
+
+  12 Jun 2015; Manuel Rüger <mrueg@gentoo.org>
+  +files/10-org.freedesktop.upower.pkla,
+  +files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla,
+  +files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla,
+  +powerdevil-5.3.1-r1.ebuild:
+  Fix missing shutdown/restart/suspend/hibernate options for non-systemd systems
+  wrt bug #529186.
 
 *powerdevil-5.3.1 (31 May 2015)
 
diff --git a/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla b/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla
new file mode 100644
index 000000000000..a15702fcdb30
--- /dev/null
+++ b/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla
@@ -0,0 +1,14 @@
+# Enable user suspend and hiberate support.
+#
+# Author: Eric Hameleers <alien@slackware.com>
+#
+# KDE bug #344456
+# Gentoo bug #529186
+#
+[Allow all users to suspend and hiberate]
+Identity=unix-group:users
+Action=org.freedesktop.upower.suspend;org.freedesktop.upower.hibernate
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
diff --git a/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla b/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
new file mode 100644
index 000000000000..87553184bb19
--- /dev/null
+++ b/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
@@ -0,0 +1,13 @@
+# Enable user shutdown support.
+#
+# Author: Eric Hameleers <alien@slackware.com>
+#
+# KDE bug #344456
+# Gentoo bug #529186
+#
+[Allow all users to shutdown]
+Identity=unix-group:users
+Action=org.freedesktop.consolekit.system.stop-multiple-users;org.freedesktop.consolekit.system.stop
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
diff --git a/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla b/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
new file mode 100644
index 000000000000..1856535f5041
--- /dev/null
+++ b/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
@@ -0,0 +1,13 @@
+# Enable user restart.
+#
+# Author: Eric Hameleers <alien@slackware.com>
+#
+# KDE bug #344456
+# Gentoo bug #529186
+#
+[Allow all users to restart]
+Identity=unix-group:users
+Action=org.freedesktop.consolekit.system.restart-multiple-users;org.freedesktop.consolekit.system.restart
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
diff --git a/kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild
new file mode 100644
index 000000000000..ffb5bcfddc95
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild,v 1.1 2015/06/12 17:30:30 mrueg Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep plasma-workspace)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/libudev:=
+	x11-libs/libxcb
+"
+
+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 )
+	!kde-base/powerdevil
+"
+
+src_install() {
+	kde5_src_install
+
+	if ! use systemd ; then
+		insinto /etc/polkit-1/localauthority/10-vendor.d/
+		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
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version sys-power/upower-pm-utils && ! use systemd ; then
+		ewarn "Suspend and hibernate will not be available as it requires sys-power/upower-pm-utils"
+		ewarn "on non-systemd systems. Please install it if you require this functionality."
+	fi
+}