commit: 0dafa9c6bcd15d9c2b0f0f7f2cbd8a4d36124cc5
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Thu Dec 29 13:24:29 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 13:25:17 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dafa9c6
kde-plasma/powerdevil: add elogind support
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-plasma/powerdevil/metadata.xml | 1 +
kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild | 15 ++++++++++-----
kde-plasma/powerdevil/powerdevil-9999.ebuild | 15 ++++++++++-----
3 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/kde-plasma/powerdevil/metadata.xml
b/kde-plasma/powerdevil/metadata.xml
index 19e9234..8344ab7 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for
session tracking.</flag>
<flag name="wireless">Enable wireless energy saving actions via
<pkg>kde-frameworks/bluez-qt</pkg> and
<pkg>kde-frameworks/networkmanager-qt</pkg></flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild
b/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild
index 209580d..212adbd 100644
--- a/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild
@@ -11,7 +11,11 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil";
KEYWORDS=""
-IUSE="systemd +wireless"
+IUSE="elogind systemd +wireless"
+
+REQUIRED_USE="elogind? ( !systemd )
+ systemd? ( !elogind )
+"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -51,7 +55,8 @@ DEPEND="
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
systemd? ( >=sys-power/upower-0.9.23 )
- !systemd? (
+ elogind? ( >=sys-power/upower-0.9.23 )
+ !systemd? ( !elogind? (
sys-auth/polkit-pkla-compat
|| (
(
@@ -61,7 +66,7 @@ RDEPEND="${DEPEND}
)
sys-power/upower-pm-utils
)
- )
+ ) )
!kde-plasma/powerdevil:4
!kde-plasma/systemsettings:4[handbook]
"
@@ -78,7 +83,7 @@ src_configure() {
src_install() {
kde5_src_install
- if ! use systemd ; then
+ if ! use systemd && ! use elogind ; 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
@@ -91,7 +96,7 @@ src_install() {
pkg_postinst() {
kde5_pkg_postinst
- if has_version sys-power/upower-pm-utils && ! use systemd ; then
+ if has_version sys-power/upower-pm-utils && ! use systemd && ! use
elogind ; then
ewarn "You have sys-power/upower-pm-utils installed, which was
recommended in the past to"
ewarn "enable suspend and hibernate support. This workaround is
no longer required, and it"
ewarn "is now recommended to use a recent version of upower and
consolekit instead:"
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild
b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index 209580d..212adbd 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -11,7 +11,11 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil";
KEYWORDS=""
-IUSE="systemd +wireless"
+IUSE="elogind systemd +wireless"
+
+REQUIRED_USE="elogind? ( !systemd )
+ systemd? ( !elogind )
+"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -51,7 +55,8 @@ DEPEND="
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
systemd? ( >=sys-power/upower-0.9.23 )
- !systemd? (
+ elogind? ( >=sys-power/upower-0.9.23 )
+ !systemd? ( !elogind? (
sys-auth/polkit-pkla-compat
|| (
(
@@ -61,7 +66,7 @@ RDEPEND="${DEPEND}
)
sys-power/upower-pm-utils
)
- )
+ ) )
!kde-plasma/powerdevil:4
!kde-plasma/systemsettings:4[handbook]
"
@@ -78,7 +83,7 @@ src_configure() {
src_install() {
kde5_src_install
- if ! use systemd ; then
+ if ! use systemd && ! use elogind ; 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
@@ -91,7 +96,7 @@ src_install() {
pkg_postinst() {
kde5_pkg_postinst
- if has_version sys-power/upower-pm-utils && ! use systemd ; then
+ if has_version sys-power/upower-pm-utils && ! use systemd && ! use
elogind ; then
ewarn "You have sys-power/upower-pm-utils installed, which was
recommended in the past to"
ewarn "enable suspend and hibernate support. This workaround is
no longer required, and it"
ewarn "is now recommended to use a recent version of upower and
consolekit instead:"
