[kde-plasma/powerdevil] Fix missing shutdown/restart/suspend/hibernate options for non-systemd systems wrt bug #529186.

Package-Manager: portage-2.2.20

7 files changed, 156 insertions, 4 deletions

diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
new file mode 100644
index 00000000000..fa718269f49
--- /dev/null
+++ b/kde-plasma/powerdevil/Manifest
@@ -0,0 +1 @@
+DIST powerdevil-5.3.1.tar.xz 352420 SHA256 1459673e50c20d63562514e2732bd246a3c53791cd7dc66dbf8aae8f4fc36c1e SHA512 2c86759678770cfab207e08f07f62d522929e36cfae3cb3e5532afa03dcf9cbee57dfbb3aa1ff335f4c47ab2cd57f5e3043502ae8e707fed0b76145b2fc1f9cd WHIRLPOOL 8014e574dde9317dba478efa197c76f06a4412b37e7efbcc5d1385309db9561687690d10bd9ea5fd80f1ceedd747502b0c9cefbfeee8bee1a47e71f5479611eb
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 00000000000..a15702fcdb3
--- /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 00000000000..87553184bb1
--- /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 00000000000..1856535f504
--- /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 00000000000..02241b713ab
--- /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: $
+
+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
+}
diff --git a/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild
index 1f37423f0dc..e344706c0a9 100644
--- a/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
 KEYWORDS=""
-IUSE=""
+IUSE="systemd"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -43,6 +43,27 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	|| ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
+	|| ( 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
+}
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index 1f37423f0dc..e344706c0a9 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
 KEYWORDS=""
-IUSE=""
+IUSE="systemd"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -43,6 +43,27 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	|| ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
+	|| ( 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
+}