[gentoo-commits] proj/kde:master commit in: kde-plasma/kscreenlocker/files/, kde-plasma/kscreenlocker/

[Andreas Sturmlechner]

commit:     ab60e71421fc10e14f37939f6c91d67fdb00aae8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  2 08:57:27 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug  2 08:57:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab60e714

kde-plasma/kscreenlocker: Drop IUSE=consolekit from 5.19 too

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kscreenlocker-5.19.5-ck-unlock.patch     | 32 ----------------------
 .../kscreenlocker-5.19.49.9999.ebuild              |  6 +---
 kde-plasma/kscreenlocker/metadata.xml              |  3 --
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch
deleted file mode 100644
index bb15eba72b..0000000000
--- a/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1bac5f6e50bc3255ab0e4c9183e7456f53acfdd5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-Date: Sat, 1 Aug 2020 20:05:17 +0200
-Subject: [PATCH] Provide ConsoleKit switch irrespective of HAVE_LOGINCTL
-
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 60d3ee1..aaebc82 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,7 +92,6 @@ set_package_properties(loginctl PROPERTIES
-     )
- set(HAVE_LOGINCTL ${loginctl_FOUND})
- 
--if ( NOT HAVE_LOGINCTL )
-     find_package(ConsoleKit)
-     set_package_properties(ConsoleKit PROPERTIES
-         URL "https://github.com/ConsoleKit2/ConsoleKit2"
-@@ -100,7 +99,6 @@ if ( NOT HAVE_LOGINCTL )
-         TYPE RECOMMENDED
-         )
-     set(HAVE_CONSOLEKIT ${ConsoleKit_FOUND})
--endif ()
- 
- if (HAVE_LOGINCTL OR HAVE_CONSOLEKIT)
-     set(HAVE_UNLOCK_CAPABILITY TRUE)
--- 
-2.28.0
-

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild
index ae938b4eea..c230b040ab 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="consolekit +pam"
+IUSE="+pam"
 
 COMMON_DEPEND="
 	dev-libs/wayland
@@ -45,7 +45,6 @@ COMMON_DEPEND="
 	x11-libs/libXi
 	x11-libs/libxcb
 	x11-libs/xcb-util-keysyms
-	consolekit? ( sys-auth/consolekit )
 	pam? ( sys-libs/pam )
 "
 DEPEND="${COMMON_DEPEND}
@@ -61,8 +60,6 @@ PDEPEND="
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-5.19.5-ck-unlock.patch" )
-
 src_prepare() {
 	ecm_src_prepare
 
@@ -83,7 +80,6 @@ src_test() {
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Seccomp=ON
-		$(cmake_use_find_package consolekit ConsoleKit)
 		-DPAM_REQUIRED=$(usex pam)
 		$(cmake_use_find_package pam PAM)
 	)

diff --git a/kde-plasma/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml
index 7c59355b62..2fdbf33d96 100644
--- a/kde-plasma/kscreenlocker/metadata.xml
+++ b/kde-plasma/kscreenlocker/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@g.o</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>