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 6CA22138359 for ; Sun, 2 Aug 2020 11:16:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 865AAE0B19; Sun, 2 Aug 2020 11:16:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6DFEAE0B19 for ; Sun, 2 Aug 2020 11:16:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6C62A34F009 for ; Sun, 2 Aug 2020 11:16:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AB7D2F5 for ; Sun, 2 Aug 2020 11:16:04 +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: <1596358647.ab60e71421fc10e14f37939f6c91d67fdb00aae8.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kscreenlocker/files/, kde-plasma/kscreenlocker/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild kde-plasma/kscreenlocker/metadata.xml X-VCS-Directories: kde-plasma/kscreenlocker/files/ kde-plasma/kscreenlocker/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ab60e71421fc10e14f37939f6c91d67fdb00aae8 X-VCS-Branch: master Date: Sun, 2 Aug 2020 11:16:04 +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: 084cb133-43e7-4d8a-a56e-1391a741bca1 X-Archives-Hash: accaf23461f640a0d759b3d78de007f8 commit: ab60e71421fc10e14f37939f6c91d67fdb00aae8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 2 08:57:27 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 @@ kde@gentoo.org Gentoo KDE Project - - Support for killing the screenlocker when sys-auth/consolekit is the session tracker -