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 BA03B138334 for ; Wed, 19 Dec 2018 15:32:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08000E0AAD; Wed, 19 Dec 2018 15:32:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF36BE0AAD for ; Wed, 19 Dec 2018 15:32:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 498D7335C58 for ; Wed, 19 Dec 2018 15:32:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1A6A42F for ; Wed, 19 Dec 2018 15:32:27 +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: <1545233513.c3758fb419000d29f4f154aec21b744e89706361.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kscreenlocker/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kscreenlocker/kscreenlocker-5.14.49.9999.ebuild kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild kde-plasma/kscreenlocker/metadata.xml X-VCS-Directories: kde-plasma/kscreenlocker/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c3758fb419000d29f4f154aec21b744e89706361 X-VCS-Branch: master Date: Wed, 19 Dec 2018 15:32: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8de38c1-579a-4b1d-8af6-ac3338dccaa5 X-Archives-Hash: 7ca307652bb7dd7cb6acce8a925c88f4 commit: c3758fb419000d29f4f154aec21b744e89706361 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 19 15:26:29 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 19 15:31:53 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3758fb4 kde-plasma/kscreenlocker: Add USE consolekit Make sure that ck-unlock-session is installed even if upstream cmake is detecting elogind or systemd. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/kscreenlocker/kscreenlocker-5.14.49.9999.ebuild | 4 +++- kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 6 ++++-- kde-plasma/kscreenlocker/metadata.xml | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.49.9999.ebuild index 1bbfc3a5bb..8fa1d15952 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.14.49.9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.49.9999.ebuild @@ -9,7 +9,7 @@ inherit kde5 pam DESCRIPTION="Library and components for secure lock screen architecture" KEYWORDS="" -IUSE="+pam seccomp" +IUSE="consolekit +pam seccomp" REQUIRED_USE="seccomp? ( pam )" @@ -41,6 +41,7 @@ COMMON_DEPEND=" x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms + consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) " @@ -74,6 +75,7 @@ src_test() { src_configure() { local mycmakeargs=( + $(cmake-utils_use_find_package consolekit loginctl) -DPAM_REQUIRED=$(usex pam) $(cmake-utils_use_find_package pam PAM) $(cmake-utils_use_find_package seccomp Seccomp) diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild index 7e05bd42d2..8fa1d15952 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ inherit kde5 pam DESCRIPTION="Library and components for secure lock screen architecture" KEYWORDS="" -IUSE="+pam seccomp" +IUSE="consolekit +pam seccomp" REQUIRED_USE="seccomp? ( pam )" @@ -41,6 +41,7 @@ COMMON_DEPEND=" x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms + consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) " @@ -74,6 +75,7 @@ src_test() { src_configure() { local mycmakeargs=( + $(cmake-utils_use_find_package consolekit loginctl) -DPAM_REQUIRED=$(usex pam) $(cmake-utils_use_find_package pam PAM) $(cmake-utils_use_find_package seccomp Seccomp) diff --git a/kde-plasma/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml index 2fdbf33d96..7c59355b62 100644 --- a/kde-plasma/kscreenlocker/metadata.xml +++ b/kde-plasma/kscreenlocker/metadata.xml @@ -5,4 +5,7 @@ kde@gentoo.org Gentoo KDE Project + + Support for killing the screenlocker when sys-auth/consolekit is the session tracker +