From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17960139085 for ; Thu, 29 Dec 2016 13:25:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80A9121C038; Thu, 29 Dec 2016 13:25:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5163B21C038 for ; Thu, 29 Dec 2016 13:25:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B226341142 for ; Thu, 29 Dec 2016 13:25:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77B4E24BF for ; Thu, 29 Dec 2016 13:25:27 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1483017917.0dafa9c6bcd15d9c2b0f0f7f2cbd8a4d36124cc5.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/powerdevil/metadata.xml kde-plasma/powerdevil/powerdevil-5.8.49.9999.ebuild kde-plasma/powerdevil/powerdevil-9999.ebuild X-VCS-Directories: kde-plasma/powerdevil/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 0dafa9c6bcd15d9c2b0f0f7f2cbd8a4d36124cc5 X-VCS-Branch: master Date: Thu, 29 Dec 2016 13:25:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e431c7c8-61e1-4bf9-aa92-223e56199db8 X-Archives-Hash: a3acdc69a67af81d69e4ab351d4865b5 commit: 0dafa9c6bcd15d9c2b0f0f7f2cbd8a4d36124cc5 Author: Sven Eden gmx net> AuthorDate: Thu Dec 29 13:24:29 2016 +0000 Commit: Michael Palimaka gentoo 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 @@ Gentoo KDE Project + Use sys-auth/elogind for session tracking. Enable wireless energy saving actions via kde-frameworks/bluez-qt and kde-frameworks/networkmanager-qt 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:"