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 D94E6139696 for ; Tue, 21 Mar 2017 15:14:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5C7B21C09B; Tue, 21 Mar 2017 15:13:58 +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 67B9121C091 for ; Tue, 21 Mar 2017 15:13:58 +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 8AA57341586 for ; Tue, 21 Mar 2017 15:13:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02BA17003 for ; Tue, 21 Mar 2017 15:13:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1490108725.210eb4f71e7318d36b689e634cac1415c4badc36.asturm@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.9.49.9999.ebuild kde-plasma/powerdevil/powerdevil-9999.ebuild X-VCS-Directories: kde-plasma/powerdevil/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 210eb4f71e7318d36b689e634cac1415c4badc36 X-VCS-Branch: master Date: Tue, 21 Mar 2017 15:13:55 +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: b7bfe0fb-d448-4cdb-998f-7ec28a2194a5 X-Archives-Hash: 04960aa9dd404c74af88cd912cecbf0d commit: 210eb4f71e7318d36b689e634cac1415c4badc36 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 21 15:04:16 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 21 15:05:25 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=210eb4f7 kde-plasma/powerdevil: "!elogind,!systemd"->consolekit, upower-pm-utils-- Drop REQUIRED_USE Drop deprecated sys-power/upower-pm-utils and obsolete pkg_postint message Gentoo-bug: 596988 Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-plasma/powerdevil/metadata.xml | 3 +- .../powerdevil/powerdevil-5.9.49.9999.ebuild | 37 ++++------------------ kde-plasma/powerdevil/powerdevil-9999.ebuild | 37 ++++------------------ 3 files changed, 16 insertions(+), 61 deletions(-) diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml index 8344ab76e5..a83a59e337 100644 --- a/kde-plasma/powerdevil/metadata.xml +++ b/kde-plasma/powerdevil/metadata.xml @@ -6,7 +6,8 @@ Gentoo KDE Project - Use sys-auth/elogind for session tracking. + Enable sys-auth/consolekit support + 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.9.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.9.49.9999.ebuild index 531a0ae1cf..f00f4f1278 100644 --- a/kde-plasma/powerdevil/powerdevil-5.9.49.9999.ebuild +++ b/kde-plasma/powerdevil/powerdevil-5.9.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 -} diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild index 531a0ae1cf..f00f4f1278 100644 --- a/kde-plasma/powerdevil/powerdevil-9999.ebuild +++ b/kde-plasma/powerdevil/powerdevil-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 -}