gentoo resync : 25.08.2020

3 files changed, 48 insertions, 16 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index fa8354966a6d..5330cca45df0 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,8 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
+AUX kscreenlocker-5.19.5-ck-unlock.patch 906 BLAKE2B 5551961d457f2d74cd956b779cbf7282e51ac97df7b112600fe5d5a3f6c5dba9545df143077eff01cfc1b67af5ad2f344af6f0007c33aa78901a18cc872f0dd0 SHA512 541b7e6d7b8feed1455879a03cce78be0b944aee798cd67fa4ead86bcb0e6e7c4b4468f4813dd1785e35acc7065e45afec7f430a869ef15ec27101905b616a62
 DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
-DIST kscreenlocker-5.19.2.tar.xz 126260 BLAKE2B 4eeb7d5e40f0a978b162f76abeb4755edffe599e06f6ad9ee8e1f55fb42a59a5f3c29c1f24cf314694dbcdbb6e2a3d1ec989ef376870b72596d9fdd10599c6a8 SHA512 c82ca7c49180dd4528b257296579730e4edbc59ba1dee2f79195e45ddaf22b5e00ae003cff4896934c591ebab10b84517ef2896d511e7299db6119d3d41b4ae8
+DIST kscreenlocker-5.19.4.tar.xz 126328 BLAKE2B a09e37b59231570519399332fdcd7d759bace113d9edcb0ea0f27bcc4b64ae39e70781de004eddbaebb51455cff3dbb1377c265bda97ffce5f03c8da4cd9c1af SHA512 d26b776d30447ed8260eae01f560966fe98e2e6d7686f2e73a5df906a43e3c115844cd8b016ddac1a4024f8c9189b93613559875f0b573f2d18fc352571dffcf
 EBUILD kscreenlocker-5.18.5.ebuild 2352 BLAKE2B f28abd967b9d6fafb6a7c145d6cdcea966815165073f955c4fccfeaa70a134df0afe54da10a78b8dd8c0793bbe14d3fe6c94eebc18ac8d915ff635d5e7fc5b8c SHA512 e11ded96c0973a085cea50109e3206f8295633bd9b9710514d97499c2ca0b6e8497b73afcb5fcbc9d2eddbfae885ebee2ed0b12bdb69115c4b99b66e4cd7f94b
-EBUILD kscreenlocker-5.19.2.ebuild 2350 BLAKE2B 2e58693195fbcc6c4e149250ff9d298b2efbba1c8d335f570b617472b9fc9910c4684de736624984899f3998ea6a2037765f4f5f77262ca990b3e0ef99cb15be SHA512 b06de6916924606d7bdcc81d17289ed7c11f49d43ebc85ad8ac2e68ac94f2b4248591306b283b9dc601d128fd3e50810a50f9ed438e7302a31f47d6a7ab7156a
+EBUILD kscreenlocker-5.19.4-r1.ebuild 2336 BLAKE2B 9437b05f26ab01fddc32199d6f59b724fda45ee0a166c9e06f7accdf484ea92162c95a7436db5c1b795cd777b1ad12b4bdfa454187a547cb1aae169fac19501c SHA512 d25582331875bc370469e54b4ec55d69db4af986c0fb511116d130482a7836a42e4853e728fe51f01fef5b90e95ece6fa3c2e67e245abc7e4159f3a9ea3142fa
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
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
new file mode 100644
index 000000000000..bb15eba72b86
--- /dev/null
+++ b/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch
@@ -0,0 +1,32 @@
+From 1bac5f6e50bc3255ab0e4c9183e7456f53acfdd5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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.2.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.ebuild
index 71661692dea5..8848223ae78c 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.2.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.ebuild
@@ -14,12 +14,17 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="consolekit +pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="consolekit +pam"
 
 RDEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -36,20 +41,12 @@ RDEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	dev-libs/wayland
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libxcb
 	x11-libs/xcb-util-keysyms
 	consolekit? ( sys-auth/consolekit )
 	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
@@ -60,6 +57,8 @@ PDEPEND="
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-5.19.5-ck-unlock.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 
@@ -79,10 +78,10 @@ src_test() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package consolekit loginctl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Seccomp=ON
+		$(cmake_use_find_package consolekit ConsoleKit)
 		-DPAM_REQUIRED=$(usex pam)
 		$(cmake_use_find_package pam PAM)
-		$(cmake_use_find_package seccomp Seccomp)
 	)
 	ecm_src_configure
 }