gentoo resync : 22.10.2018

3 files changed, 13 insertions, 15 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 2f9609356c17..3776e3aa6415 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -2,10 +2,10 @@ AUX ck-unlock-session 6159 BLAKE2B e5ef1f55e5082b35a67778e055548a59e15f346cd0aaa
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 AUX kscreenlocker-consolekit-unlock.patch 792 BLAKE2B 65ada31a191a5ae478a8a5edf27d0555ab4e81a20dbfb128cff1de520386f914b9730f22bb709be97f0ab9a38c9aba1d0a4596039b2438325ad55ea3969f7fea SHA512 21f06f101a9a04a80393a040d29506de8b4de129f3c6433d5455245ec6a9dca9630a59338612396032bd66e345fb59fb78bcd1b486b5d46138be616da632ff18
-DIST kscreenlocker-5.12.5.tar.xz 118332 BLAKE2B 87705ff5aff4d73c8b7823f4aa505be282fa9a152352aacf1682d5d7f4dff06fdca1b39d30a43dddd6c0dbfd267586d2a74bbdbd8bdacf487a251cb496311dce SHA512 c07cae22cc4500aeb4d38388d2033a677171659a76d81ff55155a97aca439babcb912f47586697657c7944c80b0d250770ed3a080fad0ed9463058dc879f390a
 DIST kscreenlocker-5.12.7.tar.xz 119484 BLAKE2B d8f0e60ec3c3f294d9daf109fc327d895f32e0c9b26841787a1ed20b5b6d3ba8113b30858caec0e8782b56d717d91979f13187466c174f4c2153678e14e7d7f3 SHA512 76554e8ad6872705e903bda5f55f650d859b282b400ca739f346e392ce7961891057c8a8a43b5dcb85c83860e4744252500c338e5d99fd67a33df529a7e040c6
 DIST kscreenlocker-5.13.5.tar.xz 122112 BLAKE2B 4effbfd26b15ca9a0225031b11b892092351a95eddf2bad659b7a97e347db402d5f28415d6d8fb11eb3ad095faa7ad430e949d5f21abaf33da8cc8f47ba8e26e SHA512 c09f55da12893f162fcdc7559e55fa50d48bb642673de84809939e695ee93843e97a5224cfc79cb6bea6a1146ac757c45eab0bd1aa20e36206290c0155d8dfe2
-EBUILD kscreenlocker-5.12.5.ebuild 2231 BLAKE2B 64e6f1fcec4c10f1b132f982885b7e147bd4cc5683dde7db7f6156eb6657bfb28348de634f18c63aee355397527552cc658e26fae2abae217a29de3cedc42544 SHA512 f29c740fd2c2191f64595192ca48c6eb4bfa07eb0739aa157de6b33b96873f27b3368039a18d100cd4af24aa6873b6bb3e65f5b7d8dc368bb7fa03072b556edb
+DIST kscreenlocker-5.14.1.tar.xz 122056 BLAKE2B 890ae3a0e179a0216efd0ca49f6f702df9a7e8c7cb5a27fa25e94c825b218b3df15365625a55b7bb98790dc561e72ba3bdbf006ddb88c23febac85e7e0f40740 SHA512 6097289a4935ed296d7266309aa057031a7e28a2dc4b7c41bb47f1e476fe1d7f9691df7c40812e1215644e540658c743f76c3e377fccb6d17ca1494c5312a0b8
 EBUILD kscreenlocker-5.12.7.ebuild 2252 BLAKE2B 86dcd3c39af729ebe9d12ab2b356a482c5d2613bde23bce1bf05dc7dce2b42f8b049f177c01bc2e126e5ad8536f7108ae04f276a65c8387a35d69d3400c89ef6 SHA512 101c95a11d8df57b0a244e708780cde854bc919668a85d3aaeee50dcee4cb14b5bb92a129aa629130a6b63dbf77378969f877bafc258efcd2e8c42e012376b91
-EBUILD kscreenlocker-5.13.5.ebuild 2127 BLAKE2B 98be7d075d0a12eb2097e0bc70c4fe0bd348b8ca971f8c13b0c51720ddf7fd05f171cc540633b28e7c090796b4971397d65ab9aed58fd2cc96be8454a389cb3f SHA512 8fa4af6398741fcf4cfbb2ab9da4ebe10e50c5cad46bdc2fb7176fa826a1cbe9e05430fd85194663708bdcfea236451ebca9d3aa6cef6a9dc64da73d184650ad
+EBUILD kscreenlocker-5.13.5.ebuild 2122 BLAKE2B 13c6cfe20e6e742cdb837eddfdbfddb1f65190a8c471a537523c3464d54b034cf8b632baad6477e997c5bba2dcc78b2e7f686e4af78b0d563ad50642aefd66c1 SHA512 5bdef92448cc1d024248b3497df0d53bf798b59d6dcc5374399e4425ead6f4d6f20d0f39854253150ad6038abafed1f55ca8216a003e3531227b6385e2a7dec3
+EBUILD kscreenlocker-5.14.1.ebuild 2124 BLAKE2B bc2a3e99d04da5f9b8f29ff892e354d59ba43b985ad104005a3a92f350237c86ea3b5529f3fa4dc37282ac066d8c8a9357c235cf76d1552bfcb4b6b67750bbe3 SHA512 0a845b6ff77e2fd8045d186517344229690d8853dbb3ae75b00ef6aac3e2728059d19e551411006cf753f424fbea75bec1391aabc835793700b3c4664a773dde
 MISC metadata.xml 397 BLAKE2B 0fad03b144a175f0f5f9d8e0c0ba4f75e6cd4f211ba0207e73a7968b7d49bbe0977860324a51ebef324ea0f915eb92dc23978558e000085ff21bd8fdb1d53187 SHA512 1d3749f74eab5cd2e17f73bb44e9f8d7ce03060db8d422a835597f13dce6c39c232eface04d9e74ed3ef66e9a45bb7b4b64c4cd82f6b5aedc62627bd77801c76
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild
index 4fcb306fa5a5..509d7ebe22da 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.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
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 pam
 
 DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.12.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.1.ebuild
index a28a5f5d6422..ab0f95ec9ebe 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.12.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.1.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
@@ -8,8 +8,8 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 pam
 
 DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="consolekit +pam seccomp"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
 
@@ -48,18 +48,18 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
 	!<kde-plasma/kcheckpass-4.11.22-r1:4
 	!kde-plasma/kdebase-pam:0
 "
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
 
 RESTRICT+=" test"
 
 src_prepare() {
 	kde5_src_prepare
 
-	use consolekit && eapply "${FILESDIR}"/${PN}-consolekit-unlock.patch
-
 	use test || sed -i \
 		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
 }
@@ -84,10 +84,8 @@ src_configure() {
 src_install() {
 	kde5_src_install
 
-	newpamd "${FILESDIR}/kde.pam" kde
-	newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	use consolekit && dobin "${FILESDIR}"/ck-unlock-session
+	use pam && newpamd "${FILESDIR}/kde.pam" kde
+	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
 
 	if ! use pam; then
 		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die