gentoo resync : 25.11.2020

4 files changed, 35 insertions, 45 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 0a84980f93ec..869692c565b6 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
 DIST kscreenlocker-5.19.5.tar.xz 126420 BLAKE2B bef083f6ffaa7930446a234c35d628ffe81c187718be48ee3158b50d5eaf7b5989abda1d3f23a275cff5b949d101cc43e4819bc44b300674681b4233bcbf1f1b SHA512 aa112b28374e2ccfa257d161d47de96ba8a884dbf6cdc59be9dac3624e49472aad7ee0f413e63c9a001969b7e0413d2571e19f39e232e46cefe112fb7f880eda
-EBUILD kscreenlocker-5.18.5.ebuild 2352 BLAKE2B f28abd967b9d6fafb6a7c145d6cdcea966815165073f955c4fccfeaa70a134df0afe54da10a78b8dd8c0793bbe14d3fe6c94eebc18ac8d915ff635d5e7fc5b8c SHA512 e11ded96c0973a085cea50109e3206f8295633bd9b9710514d97499c2ca0b6e8497b73afcb5fcbc9d2eddbfae885ebee2ed0b12bdb69115c4b99b66e4cd7f94b
-EBUILD kscreenlocker-5.19.5.ebuild 2241 BLAKE2B 28ad29b6fa22e9c5dfa7476060b3af8648467d3244c76af9ed7293ba21daedde797e896aa81d8348c2d2ac0e98bbac45ac45305ae5ae67de2f1e304258016ef0 SHA512 b4c37e4249bcb5ed685931f24d69575b83cd74a9c3ccbee936098f28223c66b1ce16ffe39d312d1a23afcb499261fc66533b37ce1e19e1a49d0b70a73e510ba0
-MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
+DIST kscreenlocker-5.20.3.tar.xz 115308 BLAKE2B 7d4675caa5b347e55e15f7ca67919b61c48e6c5c5ec1cc50293a67f96e44aa04ebec465caf5d302b67f060790b178cf8d72fba7d2e05e3fadeef48910d9ccee4 SHA512 dc2b984ed65c167341d7ad60dda490a8889abf47a2f09190ca4e827786e7d1c9c550285e47056dd59d2d4b18f15b21b970ea8e107249bb6d77734a6a2093f721
+EBUILD kscreenlocker-5.19.5.ebuild 2238 BLAKE2B 7368868e7337088729cf8fcc9d4bd6f68f43b123bd62d646b0326d5bb719e9185b34621e373ecc6f9948f597a05dce51ad2bcdff7d0b9f12536866e8a593f563 SHA512 a50bb08b695832eb913f74cd43214a5c2ab777917fea82bb5838845f45075f30ec4f4922e5b9a575599a7a6a153f218c115eb39483f3b9f77a983aba60b13341
+EBUILD kscreenlocker-5.20.3.ebuild 2149 BLAKE2B cff77a7274ae408256c38a0f5f30b03059eef1a9b78032a1b0830d7c79515974726e087d1e6637b99757712aba8f15f0a15643cf311cc4398f21c33475c02818 SHA512 82ca10fed7cedab270436b480b32b89e3e170c5932bf14d08233a0b2c479ccd03271eb180c4758546ea09e62f790a375555e0ddeb4ce6988a38a49a4fcd028cb
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
index 33c822cfa5ee..209457e8c183 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+pam"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.20.3.ebuild
index 81e224ad8d76..055daeafa7c7 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org pam
 
@@ -14,13 +14,17 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit +pam seccomp"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+pam"
 
-REQUIRED_USE="seccomp? ( pam )"
-
-RDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -31,29 +35,24 @@ RDEPEND="
 	>=kde-frameworks/kidletime-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=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}
+DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
 PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
@@ -62,11 +61,15 @@ RESTRICT+=" test"
 
 src_prepare() {
 	ecm_src_prepare
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
+}
 
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+	)
+	ecm_src_configure
 }
 
 src_test() {
@@ -77,23 +80,13 @@ src_test() {
 	ecm_src_test
 }
 
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package consolekit loginctl)
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-		$(cmake_use_find_package seccomp Seccomp)
-	)
-	ecm_src_configure
-}
-
 src_install() {
 	ecm_src_install
 
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
+	if use pam; then
+		newpamd "${FILESDIR}/kde.pam" kde
+		newpamd "${FILESDIR}/kde-np.pam" kde-np
+	else
 		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
 		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
 	fi
diff --git a/kde-plasma/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml
index 7c59355b622c..2fdbf33d963d 100644
--- a/kde-plasma/kscreenlocker/metadata.xml
+++ b/kde-plasma/kscreenlocker/metadata.xml
@@ -5,7 +5,4 @@
 		<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>