gentoo resync : 12.01.2019

4 files changed, 10 insertions, 19 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index a656c4bfc457..0a22d41f72c4 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,8 +1,7 @@
 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.14.3.tar.xz 122280 BLAKE2B 03182f4ffa11727606221e8c0c77f610c18ced1392ac0059e743074cb80cb80b35cc0a5e82f6cc3457df493599e0223b5bb2bef134c45e780ba7ecb649496772 SHA512 186f693a931936658624274c7de77e8cb06c433355932a17a6c600c6cf349f848b90642b613c786c0585f050599a545d0e596d81968a6ec0b7188eb34a6e2a71
-DIST kscreenlocker-5.14.4.tar.xz 122128 BLAKE2B 8a6e6caba1c93b50f7ebed7f50e21eaffcff457a9bfb96de82e67cd1de44ed25a793a66fec3f495b3ead26f5f710f9297d332bf6dd1c5e8d19ba07f9ea004b59 SHA512 ec6a8f768ef20cdf07f278ce6bf6b63537b44fee4f4f460aeee428df9734b3d660ec2c409640b250bcf246b5acccf404d369f7826c61dcd4fb2546130a417151
+DIST kscreenlocker-5.14.5.tar.xz 122232 BLAKE2B 652d8f2981231278d8890d2599466a86ca8530c44a2b6379631d575c457a573031672529313921fd87fbef6859302d8364ebf4769430941326e9c2ecc0d5196e SHA512 49348f137645333484be93922ec167403c74fce751294dbd02ffeedde6279ff0a0db8abc12153541612d4aeb6d6ed646b7f5ab22b78a8b80ae5eb37fa16f0e1d
 EBUILD kscreenlocker-5.14.3.ebuild 2122 BLAKE2B 13c6cfe20e6e742cdb837eddfdbfddb1f65190a8c471a537523c3464d54b034cf8b632baad6477e997c5bba2dcc78b2e7f686e4af78b0d563ad50642aefd66c1 SHA512 5bdef92448cc1d024248b3497df0d53bf798b59d6dcc5374399e4425ead6f4d6f20d0f39854253150ad6038abafed1f55ca8216a003e3531227b6385e2a7dec3
-EBUILD kscreenlocker-5.14.4.ebuild 2124 BLAKE2B bc2a3e99d04da5f9b8f29ff892e354d59ba43b985ad104005a3a92f350237c86ea3b5529f3fa4dc37282ac066d8c8a9357c235cf76d1552bfcb4b6b67750bbe3 SHA512 0a845b6ff77e2fd8045d186517344229690d8853dbb3ae75b00ef6aac3e2728059d19e551411006cf753f424fbea75bec1391aabc835793700b3c4664a773dde
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kscreenlocker-5.14.5.ebuild 2226 BLAKE2B 595e91d46af9d0cf4d1f6d38b6878928fa33e3087ee85f6e279c3eadb9abe63e2dc0fec56be9225ae2362c65fd717c96a7dde88769d1ca1122b86b2672df0826 SHA512 9d06c2f5b3eb9884547ef2578aeb49ba91f61c98e32d808a5d2a3f024cbdb7547bce6ef24c92aac7b43f3b99585ec1cc9cca4253e9ad5088845e13366f6c9c34
+MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-consolekit-unlock.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-consolekit-unlock.patch
deleted file mode 100644
index b0e4011d2b88..000000000000
--- a/kde-plasma/kscreenlocker/files/kscreenlocker-consolekit-unlock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/abstractlocker.cpp
-+++ b/abstractlocker.cpp
-@@ -52,9 +52,8 @@ void BackgroundWindow::paintEvent(QPaintEvent* )
-         auto text = ki18n("The screen locker is broken and unlocking is not possible anymore.\n"
-                           "In order to unlock switch to a virtual terminal (e.g. Ctrl+Alt+F2),\n"
-                           "log in and execute the command:\n\n"
--                          "loginctl unlock-session %1\n\n"
-+                          "ck-unlock-session\n\n"
-                           "Afterwards switch back to the running session (Ctrl+Alt+F%2).");
--        text = text.subs(QString::fromLocal8Bit(qgetenv("XDG_SESSION_ID")));
-         text = text.subs(QString::fromLocal8Bit(qgetenv("XDG_VTNR")));
-         p.setPen(Qt::white);
-         QFont f = p.font();
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.5.ebuild
index ab0f95ec9ebe..67cc582043f0 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.14.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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="~amd64 ~arm ~arm64 ~x86"
-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 2fdbf33d963d..7c59355b622c 100644
--- a/kde-plasma/kscreenlocker/metadata.xml
+++ b/kde-plasma/kscreenlocker/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</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>