commit: 894909f17af84d1b744cf58ceb0f52c033c55bfd Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Thu Jun 4 14:22:40 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Jun 4 14:22:40 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=894909f1
[kde-plasma/powerdevil] Fix missing shutdown/restart/suspend/hibernate options for non-systemd systems wrt bug #529186. Package-Manager: portage-2.2.20 .../files/10-org.freedesktop.upower.pkla | 14 +++++++++++ ...ktop.consolekit.system.stop-multiple-users.pkla | 13 +++++++++++ ...p.consolekit.system.restart-multiple-users.pkla | 13 +++++++++++ ...3.49.9999.ebuild => powerdevil-5.3.1-r1.ebuild} | 27 +++++++++++++++++++--- .../powerdevil/powerdevil-5.3.49.9999.ebuild | 25 ++++++++++++++++++-- kde-plasma/powerdevil/powerdevil-9999.ebuild | 25 ++++++++++++++++++-- 6 files changed, 110 insertions(+), 7 deletions(-) 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 0000000..a15702f --- /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 <[email protected]> +# +# 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 0000000..8755318 --- /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 <[email protected]> +# +# 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 0000000..1856535 --- /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 <[email protected]> +# +# 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.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild similarity index 59% copy from kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild copy to kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild index 1f37423..02241b7 100644 --- a/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild +++ b/kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild @@ -9,8 +9,8 @@ inherit kde5 DESCRIPTION="Power management for KDE Plasma Shell" HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"; -KEYWORDS="" -IUSE="" +KEYWORDS="~amd64" +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-5.3.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild index 1f37423..e344706 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 1f37423..e344706 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 +}
