1 |
commit: 24e7c1d3154bce0d1540d2516f06b79f70cdc17f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 29 12:19:23 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 29 12:19:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=24e7c1d3 |
7 |
|
8 |
kde-plasma/powerdevil: Drop USE=consolekit, upower-pm-utils from 5.8 too |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
kde-plasma/powerdevil/metadata.xml | 3 +- |
13 |
.../powerdevil/powerdevil-5.8.49.9999.ebuild | 37 ++++------------------ |
14 |
2 files changed, 8 insertions(+), 32 deletions(-) |
15 |
|
16 |
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml |
17 |
index a83a59e337..86d83ec7bd 100644 |
18 |
--- a/kde-plasma/powerdevil/metadata.xml |
19 |
+++ b/kde-plasma/powerdevil/metadata.xml |
20 |
@@ -6,8 +6,7 @@ |
21 |
<name>Gentoo KDE Project</name> |
22 |
</maintainer> |
23 |
<use> |
24 |
- <flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg> support</flag> |
25 |
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> |
26 |
+ <flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg> support instead of logind session tracking</flag> |
27 |
<flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag> |
28 |
</use> |
29 |
</pkgmetadata> |
30 |
|
31 |
diff --git a/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild |
32 |
index 531a0ae1cf..f00f4f1278 100644 |
33 |
--- a/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild |
34 |
+++ b/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild |
35 |
@@ -10,11 +10,7 @@ inherit kde5 |
36 |
DESCRIPTION="Power management for KDE Plasma Shell" |
37 |
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil" |
38 |
KEYWORDS="" |
39 |
-IUSE="elogind systemd +wireless" |
40 |
- |
41 |
-REQUIRED_USE="elogind? ( !systemd ) |
42 |
- systemd? ( !elogind ) |
43 |
-" |
44 |
+IUSE="consolekit +wireless" |
45 |
|
46 |
DEPEND=" |
47 |
$(add_frameworks_dep kactivities) |
48 |
@@ -53,19 +49,12 @@ DEPEND=" |
49 |
|
50 |
RDEPEND="${DEPEND} |
51 |
$(add_plasma_dep kde-cli-tools) |
52 |
- systemd? ( >=sys-power/upower-0.9.23 ) |
53 |
- elogind? ( >=sys-power/upower-0.9.23 ) |
54 |
- !systemd? ( !elogind? ( |
55 |
+ >=sys-power/upower-0.9.23 |
56 |
+ consolekit? ( |
57 |
+ >=sys-auth/consolekit-1.0.1 |
58 |
sys-auth/polkit-pkla-compat |
59 |
- || ( |
60 |
- ( |
61 |
- >=sys-auth/consolekit-1.0.1 |
62 |
- sys-power/pm-utils |
63 |
- >=sys-power/upower-0.9.23 |
64 |
- ) |
65 |
- sys-power/upower-pm-utils |
66 |
- ) |
67 |
- ) ) |
68 |
+ sys-power/pm-utils |
69 |
+ ) |
70 |
!kde-plasma/powerdevil:4 |
71 |
!kde-plasma/systemsettings:4[handbook] |
72 |
" |
73 |
@@ -82,7 +71,7 @@ src_configure() { |
74 |
src_install() { |
75 |
kde5_src_install |
76 |
|
77 |
- if ! use systemd && ! use elogind ; then |
78 |
+ if use consolekit ; then |
79 |
insinto /etc/polkit-1/localauthority/10-vendor.d/ |
80 |
doins "${FILESDIR}"/10-org.freedesktop.upower.pkla |
81 |
doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla |
82 |
@@ -91,15 +80,3 @@ src_install() { |
83 |
doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla |
84 |
fi |
85 |
} |
86 |
- |
87 |
-pkg_postinst() { |
88 |
- kde5_pkg_postinst |
89 |
- |
90 |
- if has_version sys-power/upower-pm-utils && ! use systemd && ! use elogind ; then |
91 |
- ewarn "You have sys-power/upower-pm-utils installed, which was recommended in the past to" |
92 |
- ewarn "enable suspend and hibernate support. This workaround is no longer required, and it" |
93 |
- ewarn "is now recommended to use a recent version of upower and consolekit instead:" |
94 |
- ewarn |
95 |
- ewarn "emerge --ask --update \">=sys-auth/consolekit-1.0.0\" sys-power/upower" |
96 |
- fi |
97 |
-} |