| 1 |
commit: 0dafa9c6bcd15d9c2b0f0f7f2cbd8a4d36124cc5 |
| 2 |
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net> |
| 3 |
AuthorDate: Thu Dec 29 13:24:29 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 29 13:25:17 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dafa9c6 |
| 7 |
|
| 8 |
kde-plasma/powerdevil: add elogind support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
kde-plasma/powerdevil/metadata.xml | 1 + |
| 13 |
kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild | 15 ++++++++++----- |
| 14 |
kde-plasma/powerdevil/powerdevil-9999.ebuild | 15 ++++++++++----- |
| 15 |
3 files changed, 21 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml |
| 18 |
index 19e9234..8344ab7 100644 |
| 19 |
--- a/kde-plasma/powerdevil/metadata.xml |
| 20 |
+++ b/kde-plasma/powerdevil/metadata.xml |
| 21 |
@@ -6,6 +6,7 @@ |
| 22 |
<name>Gentoo KDE Project</name> |
| 23 |
</maintainer> |
| 24 |
<use> |
| 25 |
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag> |
| 26 |
<flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag> |
| 27 |
</use> |
| 28 |
</pkgmetadata> |
| 29 |
|
| 30 |
diff --git a/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild |
| 31 |
index 209580d..212adbd 100644 |
| 32 |
--- a/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild |
| 33 |
+++ b/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild |
| 34 |
@@ -11,7 +11,11 @@ inherit kde5 |
| 35 |
DESCRIPTION="Power management for KDE Plasma Shell" |
| 36 |
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil" |
| 37 |
KEYWORDS="" |
| 38 |
-IUSE="systemd +wireless" |
| 39 |
+IUSE="elogind systemd +wireless" |
| 40 |
+ |
| 41 |
+REQUIRED_USE="elogind? ( !systemd ) |
| 42 |
+ systemd? ( !elogind ) |
| 43 |
+" |
| 44 |
|
| 45 |
DEPEND=" |
| 46 |
$(add_frameworks_dep kactivities) |
| 47 |
@@ -51,7 +55,8 @@ DEPEND=" |
| 48 |
RDEPEND="${DEPEND} |
| 49 |
$(add_plasma_dep kde-cli-tools) |
| 50 |
systemd? ( >=sys-power/upower-0.9.23 ) |
| 51 |
- !systemd? ( |
| 52 |
+ elogind? ( >=sys-power/upower-0.9.23 ) |
| 53 |
+ !systemd? ( !elogind? ( |
| 54 |
sys-auth/polkit-pkla-compat |
| 55 |
|| ( |
| 56 |
( |
| 57 |
@@ -61,7 +66,7 @@ RDEPEND="${DEPEND} |
| 58 |
) |
| 59 |
sys-power/upower-pm-utils |
| 60 |
) |
| 61 |
- ) |
| 62 |
+ ) ) |
| 63 |
!kde-plasma/powerdevil:4 |
| 64 |
!kde-plasma/systemsettings:4[handbook] |
| 65 |
" |
| 66 |
@@ -78,7 +83,7 @@ src_configure() { |
| 67 |
src_install() { |
| 68 |
kde5_src_install |
| 69 |
|
| 70 |
- if ! use systemd ; then |
| 71 |
+ if ! use systemd && ! use elogind ; then |
| 72 |
insinto /etc/polkit-1/localauthority/10-vendor.d/ |
| 73 |
doins "${FILESDIR}"/10-org.freedesktop.upower.pkla |
| 74 |
doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla |
| 75 |
@@ -91,7 +96,7 @@ src_install() { |
| 76 |
pkg_postinst() { |
| 77 |
kde5_pkg_postinst |
| 78 |
|
| 79 |
- if has_version sys-power/upower-pm-utils && ! use systemd ; then |
| 80 |
+ if has_version sys-power/upower-pm-utils && ! use systemd && ! use elogind ; then |
| 81 |
ewarn "You have sys-power/upower-pm-utils installed, which was recommended in the past to" |
| 82 |
ewarn "enable suspend and hibernate support. This workaround is no longer required, and it" |
| 83 |
ewarn "is now recommended to use a recent version of upower and consolekit instead:" |
| 84 |
|
| 85 |
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild |
| 86 |
index 209580d..212adbd 100644 |
| 87 |
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild |
| 88 |
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild |
| 89 |
@@ -11,7 +11,11 @@ inherit kde5 |
| 90 |
DESCRIPTION="Power management for KDE Plasma Shell" |
| 91 |
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil" |
| 92 |
KEYWORDS="" |
| 93 |
-IUSE="systemd +wireless" |
| 94 |
+IUSE="elogind systemd +wireless" |
| 95 |
+ |
| 96 |
+REQUIRED_USE="elogind? ( !systemd ) |
| 97 |
+ systemd? ( !elogind ) |
| 98 |
+" |
| 99 |
|
| 100 |
DEPEND=" |
| 101 |
$(add_frameworks_dep kactivities) |
| 102 |
@@ -51,7 +55,8 @@ DEPEND=" |
| 103 |
RDEPEND="${DEPEND} |
| 104 |
$(add_plasma_dep kde-cli-tools) |
| 105 |
systemd? ( >=sys-power/upower-0.9.23 ) |
| 106 |
- !systemd? ( |
| 107 |
+ elogind? ( >=sys-power/upower-0.9.23 ) |
| 108 |
+ !systemd? ( !elogind? ( |
| 109 |
sys-auth/polkit-pkla-compat |
| 110 |
|| ( |
| 111 |
( |
| 112 |
@@ -61,7 +66,7 @@ RDEPEND="${DEPEND} |
| 113 |
) |
| 114 |
sys-power/upower-pm-utils |
| 115 |
) |
| 116 |
- ) |
| 117 |
+ ) ) |
| 118 |
!kde-plasma/powerdevil:4 |
| 119 |
!kde-plasma/systemsettings:4[handbook] |
| 120 |
" |
| 121 |
@@ -78,7 +83,7 @@ src_configure() { |
| 122 |
src_install() { |
| 123 |
kde5_src_install |
| 124 |
|
| 125 |
- if ! use systemd ; then |
| 126 |
+ if ! use systemd && ! use elogind ; then |
| 127 |
insinto /etc/polkit-1/localauthority/10-vendor.d/ |
| 128 |
doins "${FILESDIR}"/10-org.freedesktop.upower.pkla |
| 129 |
doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla |
| 130 |
@@ -91,7 +96,7 @@ src_install() { |
| 131 |
pkg_postinst() { |
| 132 |
kde5_pkg_postinst |
| 133 |
|
| 134 |
- if has_version sys-power/upower-pm-utils && ! use systemd ; then |
| 135 |
+ if has_version sys-power/upower-pm-utils && ! use systemd && ! use elogind ; then |
| 136 |
ewarn "You have sys-power/upower-pm-utils installed, which was recommended in the past to" |
| 137 |
ewarn "enable suspend and hibernate support. This workaround is no longer required, and it" |
| 138 |
ewarn "is now recommended to use a recent version of upower and consolekit instead:" |
Archives