gentoo resync : 22.12.2021

3 files changed, 2 insertions, 98 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 5f21453076aa..a07b633960a9 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.22.5.tar.xz 116688 BLAKE2B 8e4bba6e78910f37e6abe18130c634afbbf9be7bba2a6eb1a694badd376890bd16e96bc2e575f1468dc9c4cc0a9bb057bd5c1dc0c4a75e2e8feb9dd26caad3b4 SHA512 e2b467743f36271cf3eac2c7b593ae5971dcc3ab917af42480dbf782bbe93eb2f24cb600d6fceae5efc2ccd8e5ab3d6a76b921f189cfcec62c661d7cc1f545f9
 DIST kscreenlocker-5.23.4.tar.xz 117720 BLAKE2B 9b4178915b9d2fa33ea308b49417e4a2a33495054dddc8a0e8a3eb7b6465b81a8ba1116323b3e9392f192b0449287e0ff37624ebdb3311cf3423fb649c46d462 SHA512 a043cca755d266548bac5a10cdc812f7c1476d1a95f4ae17c475a4d6b74a3d2b2f2e67373e4c3df3d5299c3013394abe7fc8e7d79353f1d14073a06f4f6794bd
-EBUILD kscreenlocker-5.22.5.ebuild 2263 BLAKE2B b61aab7b36993b2ad7fd0e02f58118a47f339f7be5fee412eff406c40b47bfc6cf2fb6b942f218962dbb3edc069f62b8deb74e964247dc34fd0d13343c855a0e SHA512 fdb4d5a984c7fb9ab3ae1730503ca3232239763d8608cd8d716440fb5d6c95b638c00d37594396ce9459f68d06ee135ff62d4cd5d1ae43366688c7bbb7345a41
-EBUILD kscreenlocker-5.23.4.ebuild 2266 BLAKE2B 8e992b572d848e3f4d3d8805b33f96e1dd579a7698752ca02ac7601161634aaa307fe83ca2e5087b9a1d211727d3a60febb2f50989aef29bf305cda0b6df619a SHA512 a0987917fc6d9ba233280eb2a1aa83b265763c660c31b29822323bf14e03843c3f2d38b7942902cad162bd5a2710a3c54256dbd3d73c942448facc2805d63983
+EBUILD kscreenlocker-5.23.4.ebuild 2263 BLAKE2B 170be03ab695034974424ca0d70fa4a8e69ce139a7cec5de4d1a637376bb6e2bdc419d7c93a43e6d4602590eedcdc163ed5e9c9a4784412fb8ef3eaad9a076a0 SHA512 9e02b8d9440327b57c9817a28ee2879e595c1da04126b3c903c9970eab344460b5d0f10f4216359dbe2208e74198172140f555f508d2614d4962ddbc1fbbe335
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild
deleted file mode 100644
index 1ae99c84f64e..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="+pam"
-
-RESTRICT+=" test"
-
-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/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}:5
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( sys-libs/pam )
-"
-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"
-BDEPEND="dev-util/wayland-scanner"
-
-src_prepare() {
-	ecm_src_prepare
-	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
-}
-
-src_install() {
-	ecm_src_install
-
-	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/kscreenlocker-5.23.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.23.4.ebuild
index 0f53f43e33ae..edc1dafc72f9 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.23.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+pam"
 
 RESTRICT+=" test"