commit: 24e7c1d3154bce0d1540d2516f06b79f70cdc17f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 12:19:23 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 12:19:23 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=24e7c1d3
kde-plasma/powerdevil: Drop USE=consolekit, upower-pm-utils from 5.8 too
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-plasma/powerdevil/metadata.xml | 3 +-
.../powerdevil/powerdevil-5.8.49.9999.ebuild | 37 ++++------------------
2 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/kde-plasma/powerdevil/metadata.xml
b/kde-plasma/powerdevil/metadata.xml
index a83a59e337..86d83ec7bd 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -6,8 +6,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg>
support</flag>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for
session tracking</flag>
+ <flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg>
support instead of logind 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 531a0ae1cf..f00f4f1278 100644
--- a/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild
@@ -10,11 +10,7 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil";
KEYWORDS=""
-IUSE="elogind systemd +wireless"
-
-REQUIRED_USE="elogind? ( !systemd )
- systemd? ( !elogind )
-"
+IUSE="consolekit +wireless"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -53,19 +49,12 @@ DEPEND="
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
- systemd? ( >=sys-power/upower-0.9.23 )
- elogind? ( >=sys-power/upower-0.9.23 )
- !systemd? ( !elogind? (
+ >=sys-power/upower-0.9.23
+ consolekit? (
+ >=sys-auth/consolekit-1.0.1
sys-auth/polkit-pkla-compat
- || (
- (
- >=sys-auth/consolekit-1.0.1
- sys-power/pm-utils
- >=sys-power/upower-0.9.23
- )
- sys-power/upower-pm-utils
- )
- ) )
+ sys-power/pm-utils
+ )
!kde-plasma/powerdevil:4
!kde-plasma/systemsettings:4[handbook]
"
@@ -82,7 +71,7 @@ src_configure() {
src_install() {
kde5_src_install
- if ! use systemd && ! use elogind ; then
+ if use consolekit ; 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,15 +80,3 @@ src_install() {
doins
"${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
fi
}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- 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:"
- ewarn
- ewarn "emerge --ask --update \">=sys-auth/consolekit-1.0.0\"
sys-power/upower"
- fi
-}
