commit: c3758fb419000d29f4f154aec21b744e89706361
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 15:26:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@
<email>[email protected]</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <use>
+ <flag name="consolekit">Support for killing the screenlocker
when <pkg>sys-auth/consolekit</pkg> is the session tracker</flag>
+ </use>
</pkgmetadata>