gentoo resync : 16.01.2021

16 files changed, 250 insertions, 120 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 746983aa821d..d8a5e80d3ea7 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index e95b141a6643..7b9a006ea2b4 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -3,5 +3,6 @@ DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26
 DIST kinfocenter-5.23.4.tar.xz 1153160 BLAKE2B 8273d69e6e548f5b2b7bc95eca7d9fac204f6dcc1a3f26a1b496da926b241e11c20fa047f449255e3e6d31c61056d44e2b89301c0e6b9851312fb53bcda58962 SHA512 c3fb598ef27dc696d3763b5ca982b17d521999c5ebaa00484dfac120f1eeafaa41adc1694bc6f0cc96388eb56e83b015c80bc94a54af334d5e643730ad4485ae
 DIST kinfocenter-5.23.5.tar.xz 1152396 BLAKE2B f30af8e32a43079cd87b52e5d8180ca58f8d5743fa2f26afbc4f7cf70bbb2260929f7bfc0907d03320ff29fd2440968f14fa8185832052194390bd4581a085e1 SHA512 9cb25087587f3b469178424ee991b1832bed23cabcdfe2fc515fb1824ba618ee0cc7e5cd270f9ca348f90ceac68f5758d0c7d690cc1ae29b5c136995d7a2e684
 EBUILD kinfocenter-5.23.4.ebuild 2862 BLAKE2B 81c0d51c51324740e5bbe76ebfc4043ec076aefc98d602cd5fb0fd6a3d1fd489ac5a9bc452af14231a006e0a8a79f6d36d79c16ebb776b0d9ab5f0be54604dcd SHA512 6b72d7a8e13fb2a64b0b3945c1ac744adc96e9b1401ed87d1306ba58217bdd6606fbfd5457d48f9f6e86dfab57734ad267c602e14dd8ef4fc012f086e46dca51
+EBUILD kinfocenter-5.23.5-r1.ebuild 2637 BLAKE2B 025961f044124e82cdbe64038924ce26986fe1f0127fe424569005c08cb12af9790b5f9ba4a3331215e408e076343ba3c093db1d1c8e9dd25170a9682e37f730 SHA512 b8c082d9cbe4deca38d92b1902197b71ad15befc1d4daa7e7f66d88bcc13367663d9c160ea2c77675705744223a9a72af90d89fdd62a759b6b108898febdeeb3
 EBUILD kinfocenter-5.23.5.ebuild 2786 BLAKE2B f47b235421964bfd928c8842b9b15a86731afb50262e71e0b7915b60ad5b1b172ce808ae3eb8440cced8151128a7c069e9a8c7ef9f1741ceb099fb8cc5993695 SHA512 be7c490f4bf07d54a8d14abe5b9f298aa00d2f8c33c6e46a5a50c1825ab848532796cb0a732f3f661bc79aa9b6f67acf8be24935bcb3c878acc6b27c2e7ff113
 MISC metadata.xml 389 BLAKE2B 7775c88615433812927bd69023ba3943d13b1fadc77d1c8a84f286e0f7b3efdc34d3cd9b877cafcb3ae7ef9c0056c6a39d669baea5875707155d361a6024b1d0 SHA512 dfebb398a78818127260bc03d2e267c3feea4c54f2de6adec01868fceede532764a0f90559b070d4136cb6c1ad8e86cc98d832f340b3a0a687a41b0c354631b0
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild
new file mode 100644
index 000000000000..771923518700
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only ieee1394 +opengl +pci usb +X"
+
+REQUIRED_USE="opengl? ( X )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	gles2-only? ( media-libs/mesa[gles2] )
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		media-libs/libglvnd[X?]
+		!gles2-only? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/systemsettings-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ieee1394 RAW1394)
+		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package usb USB1)
+		$(cmake_use_find_package X X11)
+	)
+
+	if has_version "dev-qt/qtgui[gles2-only]"; then
+		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
+	fi
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# TODO: Make this fully obsolete by /etc/os-release
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "NFS information module" net-fs/nfs-utils
+		optfeature "Samba status information module" net-fs/samba
+		optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
+		optfeature "advanced CPU information module" sys-apps/util-linux
+	fi
+	optfeature "Wayland information module" app-misc/wayland-utils
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 23758b89f65a..5c2f9ea58a76 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -3,5 +3,5 @@ AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f
 DIST kscreenlocker-5.23.4.tar.xz 117720 BLAKE2B 9b4178915b9d2fa33ea308b49417e4a2a33495054dddc8a0e8a3eb7b6465b81a8ba1116323b3e9392f192b0449287e0ff37624ebdb3311cf3423fb649c46d462 SHA512 a043cca755d266548bac5a10cdc812f7c1476d1a95f4ae17c475a4d6b74a3d2b2f2e67373e4c3df3d5299c3013394abe7fc8e7d79353f1d14073a06f4f6794bd
 DIST kscreenlocker-5.23.5.tar.xz 117656 BLAKE2B ac7b90165383cc66af21a026b7cf6ddf7aeb04b3aceaccec8d12eeeb8af1b2d296200929a2118d7b6c0b3079db125baa60903a86d9111e0957e3784b4c9ad913 SHA512 1f2a9ffb61de664e4b0ccda0f162fe96936ff476271e906498434c9818a63405d687f3fd4c69baa8a98e470d4a085a874f10e2d37987d7b17b474757c89326d2
 EBUILD kscreenlocker-5.23.4.ebuild 2263 BLAKE2B 170be03ab695034974424ca0d70fa4a8e69ce139a7cec5de4d1a637376bb6e2bdc419d7c93a43e6d4602590eedcdc163ed5e9c9a4784412fb8ef3eaad9a076a0 SHA512 9e02b8d9440327b57c9817a28ee2879e595c1da04126b3c903c9970eab344460b5d0f10f4216359dbe2208e74198172140f555f508d2614d4962ddbc1fbbe335
-EBUILD kscreenlocker-5.23.5.ebuild 2266 BLAKE2B c57d1ab9a9970e798cd36b47587a221f343a7e96032a83d0b4980a2f87f63effd244900eee3945cc33551822260ced73bcb6b20a4c1fe42acb0372a00aff98b3 SHA512 b4e0080deff804b1a1546d19c57df3900b106e2a47ea9c24307cc955ddfa6996b06f5d2f93502f9d4d110ee520525fbc035790c420ed30c2e8bcefbf4e493765
+EBUILD kscreenlocker-5.23.5.ebuild 2264 BLAKE2B bb798d15a14c9b032ec048a6309fa7602b12f6868e10656e3686b8ef6683bc11250b8a61cb3db2b08c92eb97a9aa189f7f5e83b072f5565bb101685d73f8bc6d SHA512 c219a8a75f19ed5ca428f01f8d78473e0573918edcc5bbb2e8310327918d5977516ef94fff2476562e6c41314ba3c33a705e9b0ccca93b20c39be61770fa2460
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.23.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.23.5.ebuild
index 55bd27ee2e6f..1e988535cf0f 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.23.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.23.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 KFMIN=5.86.0
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+pam"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	dev-libs/wayland
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 07a991955e13..eaaf544b2700 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,3 +1,6 @@
+AUX ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch 628 BLAKE2B a069558012a58e83443c82a50d26507f113c8f2f85afbc43c2d0280334281a73f6ca1502390f4779e0fcbb5d3efab34b577009a8da33be585da4b73682eb307a SHA512 d952ab61591b8d6f7270f58fd240fa9258158f117f228a818376f362006cd6d18e6125961f9c0005807964b52a89ac2bc9c2f70b423bd7dffbc0305b4cf6e318
+AUX ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch 1948 BLAKE2B abaf60aab50905c86a8a4cfcfc225681c805fce032298112189e14b49a04f1ddd75373eca0ce14a8460fce393575b0daa9e6f9ef908ed93ed7162af8e7e23576 SHA512 458824f0b8949975dc1c89f493b6bff9e30681b25d06d4880ef970f7c8ea6494cb9d7f84446450556fad996cf3a31ae084e37567a8006f14305f96191004c524
 DIST ksysguard-5.22.0.tar.xz 521768 BLAKE2B 0cceb54c19b5263d658fded8c603bbd3415b98c0e6ebde04fccc8d4f09a68037ba2b8666ed7beccaa1d54b9b792e537a730fa93233fd3cf1b59f915effce4b0e SHA512 07314366506d029206e6fba934eefc8d338e52ab0f8f79747c189a9f856e13f32c7b156bd49ccf1ab2bef5c37fb05924022606bae6bbf2eb4628043d7c2579a2
+EBUILD ksysguard-5.22.0-r1.ebuild 1531 BLAKE2B d2cbada1092a4951c740a5ab5cc36261faba52219a368d40732ee3f8a27b8b1d8327c9cf8164a55dce53e50ce77a6671a35d06eaf10ebf682b9ce9c7b9bc5e75 SHA512 c70982e9ec1c306643bac0c34f81ce1e85acea83eaa9a75b1972324478f16f7bf5a941f217b6d36d10b4e3e38548a76da28c83b8ea506d41f91898dd1fe4cc14
 EBUILD ksysguard-5.22.0.ebuild 1469 BLAKE2B 7c4318dfe5ae1475723b41de7f32d59aedcb957e0f54f50a2a37ee62ad98daba8ccfe0dc5d1468e72dbcc7cffc9e34ce6abfda30528ccb7cd7950c2a83852278 SHA512 6639bf8564a66dfa4be2a2ed77abe7c97bc85083ec4f8af0cad6d1e6d8239d032c5eb873007cdd349f2f3183f8c17e7e79a1d7ce4abab1f9283df6588e01eaf4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch
new file mode 100644
index 000000000000..8eecf7d8e52f
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch
@@ -0,0 +1,21 @@
+From 6b0c2ca25571c7d0d2dd94f1f539ba8ed6796347 Mon Sep 17 00:00:00 2001
+From: Shriraj Hegde <shriraj.hegde@gmail.com>
+Date: Wed, 9 Jun 2021 08:21:46 +0000
+Subject: [PATCH] Add StartupWMClass to desktop file
+
+---
+ gui/org.kde.ksysguard.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gui/org.kde.ksysguard.desktop b/gui/org.kde.ksysguard.desktop
+index 0c59d5b7..feb4f220 100755
+--- a/gui/org.kde.ksysguard.desktop
++++ b/gui/org.kde.ksysguard.desktop
+@@ -224,3 +224,4 @@ StartupNotify=true
+ X-DBUS-StartupType=Multi
+ Categories=Qt;KDE;System;
+ X-DBUS-ServiceName=org.kde.ksysguard
++StartupWMClass=ksysguard
+-- 
+GitLab
+
diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch
new file mode 100644
index 000000000000..d8e63cf7ca8c
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch
@@ -0,0 +1,59 @@
+From cfd3a0f8b0d4223dbd3181ecaaee6111165a9e94 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 5 Aug 2021 21:01:30 +0200
+Subject: [PATCH] Port to QtQuickDialogWrapper
+
+---
+ CMakeLists.txt    |  2 +-
+ gui/Workspace.cpp | 13 +++++--------
+ 2 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23069e76..dcb92975 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(KSYSGUARD_VERSION 4.98.0)
+ set(KSYSGUARD_STRING_VERSION "${KSYSGUARD_VERSION}")
+ 
+ set(QT_MIN_VERSION "5.15.0")
+-set(KF5_MIN_VERSION "5.78")
++set(KF5_MIN_VERSION "5.80")
+ 
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}  ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+diff --git a/gui/Workspace.cpp b/gui/Workspace.cpp
+index 827d63e1..bdd03743 100644
+--- a/gui/Workspace.cpp
++++ b/gui/Workspace.cpp
+@@ -29,8 +29,8 @@
+ #include <KMessageBox>
+ #include <KAcceleratorManager>
+ #include <KActionCollection>
+-#include <KNewStuff3/KNS3/DownloadDialog>
+ #include <KNewStuff3/KNSCore/Engine>
++#include <KNS3/QtQuickDialogWrapper>
+ #include <KConfigGroup>
+ 
+ #include "WorkSheet.h"
+@@ -307,14 +307,11 @@ void Workspace::uploadHotNewWorksheet()
+ }
+ void Workspace::getHotNewWorksheet()
+ {
+-    KNS3::DownloadDialog dialog(QStringLiteral("ksysguard.knsrc"));
+-    if( dialog.exec() == QDialog::Rejected )
+-        return;
+-
+-    KNS3::Entry::List entries = dialog.installedEntries();
+-    foreach(KNS3::Entry entry, entries) {
++    KNS3::QtQuickDialogWrapper dialog(QStringLiteral("ksysguard.knsrc") );
++    const QList<KNSCore::EntryInternal> entries = dialog.exec();
++    for (auto entry : entries) {
+         if(!entry.installedFiles().isEmpty()) {
+-            QString filename = entry.installedFiles().first();
++            const QString filename = entry.installedFiles().constFirst();
+             restoreWorkSheet(filename, true);
+         }
+     }
+-- 
+GitLab
+
diff --git a/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
new file mode 100644
index 000000000000..34a165e4c311
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.88.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Network-enabled resource usage monitor"
+HOMEPAGE="https://apps.kde.org/ksysguard/ https://userbase.kde.org/KSysGuard"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="lm-sensors"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libksysguard-5.22.0:5
+	lm-sensors? ( sys-apps/lm-sensors:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-add-StartupWMClass-to-desktop-file.patch
+	"${FILESDIR}"/${P}-port-to-QtQuickDialogWrapper.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package lm-sensors Sensors)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 9424124dc93c..1e87a07a5f95 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.23.4.tar.xz 97936 BLAKE2B 39cf833170ded9e7a94f16593d66a1dfa7865d3cfe23b3de3196664ec9c95a4a0bfd412a269e2007857c275486fda657f33772a9086f48f42c20367f5c789ed4 SHA512 78eb13063f3a26a6ab7cc87862f1f475cdd3b3e5f591ce55146688a11678c768aa2632388582a9137b9d203c57d542d29ad7e6b0f620050ce70156891def0436
 DIST libkscreen-5.23.5.tar.xz 97940 BLAKE2B c2f449c00582ef8017c0cd388532ec969328b9c86f13456f952dea4381aa6179e1186595a320dd6ee9837d9df0d00b34e24c26790bf698f67c3df5f48a75cf4c SHA512 467555bfae1cb8d1948f395362fafe4c556abf8be1d47ee99cde0853533101f6b1332a7883ebae64005315593afd551190127d094fafe5b85703a1fa5e91504d
 EBUILD libkscreen-5.23.4.ebuild 652 BLAKE2B 7f98b7f967abd4a977447513f67ec907c27aef28533fa797a25c8aefa768702113ba4aeff5a2e5fd347903a4793f7788513b57a25c06e2c6ae317fd42ac6eebc SHA512 814e539d30c0cae66353c8764f1a82bfe1100b193de94134c8143f5dbfbb48c2ca96a89576fbc3a77394026550db691bd85513c2c1a483d8530c027d8cdce496
-EBUILD libkscreen-5.23.5.ebuild 655 BLAKE2B 05852e8ed54e8769444563ca88f5ab64aa12805d56a25ff65e7ae32b554d81da4b709e9baf88b410a533fb3c75d1124d71578f5665e5336f4a1e792973bcb85a SHA512 908e66dbbf477bb9166f9d86946b896edc248f24412304bed5a3074023233d421396109864abc1e8866fa257ee3d70661cbebb283b17f68c18dde27c67fcec66
+EBUILD libkscreen-5.23.5-r1.ebuild 784 BLAKE2B d8b8bcab84b7c45b548c8c490843b7e8eca56022b51ea5013a4dd84a683037924daf7b9bbdac634b2d011ae78f1acb1c483f17d0d67d860f72de2551640dd71f SHA512 124160e9759e14718413659709542d56b72da5b5ff5e50ce7bfce485ab6b920e68aa31976b118614d388949f0056bf5545a66079f45972888e451faeb7e179e3
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/libkscreen-5.23.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
index 1fcb6f146de3..c42852b8140f 100644
--- a/kde-plasma/libkscreen/libkscreen-5.23.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
@@ -21,12 +21,17 @@ IUSE=""
 # requires running session
 RESTRICT="test"
 
-DEPEND="
+RDEPEND="
+	dev-libs/wayland
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	x11-libs/libxcb
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.4.0
+"
+BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index b22f66208d31..8987ef84dca4 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,4 +1,3 @@
-AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
 AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
 AUX libkworkspace-5.23.3-synchronous-dbus-calls.patch 1532 BLAKE2B ac54ae6e42b9e20633b33d3f42e00b184f0d65fa57ffffab7695a1463631b7f577a25722d8c3dcc51bfd55023cf30d22d1a73eb1f9c065a3800a81d6ecf27569 SHA512 927ab4b0641285094b6599384012a629b27ec596291c124b3dc01176dfb781b0b551b920d651738b518dba4f0b71426d671f8d977856c6c12221e3e6cb57f3d9
 DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
deleted file mode 100644
index 430b98aadcb9..000000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 2 Feb 2020 18:29:57 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
----
- libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
- 1 file changed, 66 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 015c5181f..0aa635e11 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,56 @@
-+project(libkworkspace)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+    set(PROJECT_VERSION "GENTOO_PV")
-+    set(PROJECT_VERSION_MAJOR 5)
-+
-+    cmake_minimum_required(VERSION 3.16)
-+
-+    set(QT_MIN_VERSION "5.15.0")
-+    set(KF5_MIN_VERSION "5.82.0")
-+    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
-+    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
-+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+
-+    include(KDEInstallDirs)
-+    include(KDECMakeSettings)
-+    include(KDECompilerSettings NO_POLICY_SCOPE)
-+    include(ECMMarkNonGuiExecutable)
-+    include(CMakePackageConfigHelpers)
-+    include(WriteBasicConfigVersionFile)
-+    include(CheckIncludeFiles)
-+    include(FeatureSummary)
-+    include(ECMQtDeclareLoggingCategory)
-+    include(KDEPackageAppTemplates)
-+    include(ECMMarkAsTest)
-+    include(GenerateExportHeader)
-+
-+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem)
-+
-+    find_package(KWinDBusInterface CONFIG REQUIRED)
-+    find_package(KScreenLocker 5.13.80 REQUIRED)
-+    find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
-+
-+    find_package(X11)
-+    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+                URL "http://www.x.org"
-+                TYPE OPTIONAL
-+                PURPOSE "Required for X11 support")
-+
-+    if(X11_FOUND)
-+        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
-+        set(HAVE_X11 1)
-+    endif()
-+
-+    if(BUILD_TESTING)
-+        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+    endif()
-+
-+    check_include_files(unistd.h HAVE_UNISTD_H)
-+
-+    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
-+    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-+endif()
- 
- set(kworkspace_LIB_SRCS kdisplaymanager.cpp
-                         kworkspace.cpp
-@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
-+else()
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-+endif()
- 
- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
-                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
- 
--set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
- 
- add_library(kworkspace ${kworkspace_LIB_SRCS})
-@@ -98,3 +158,8 @@ if(BUILD_TESTING)
-     add_subdirectory(autotests)
-     add_subdirectory(tests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
-+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
--- 
-2.31.1
-
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 2ac43b30a9c5..143f9392d148 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.23.4.tar.xz 629336 BLAKE2B 26f92a14012585ce15ff0f00f3c57c4e11cba986a1b467f210d77bf6488fd552138b3775774fb2b17d1d340e4bb5bad77fd155aeb9986fa190005204aa8416ea SHA512 a84cb7555716333e5d6ab9be114fb4072c315b244add05ad829bd476884c282a17f8166daf35d6a343bfea3407f1388374d8632e37ce6057d546b67f7deea256
 DIST powerdevil-5.23.5.tar.xz 629528 BLAKE2B cb34fa1a7added039b5fdcd974fdb898a2e6bea0143abce4d0c99d140e1f24cde91fa008be6686fa9dc976411cd6813cc7d124e15247d6a618bf0b2ca1a4499d SHA512 906d4481afee63368d62200a51b3bdfc202c28a5336a135ea161a5389518c92ad66fc2a5f502089d9e189c0b3a9d9ae83c17bde03b2cba680f8954b73624787d
-EBUILD powerdevil-5.23.4.ebuild 1951 BLAKE2B 41c5624dcd8801e8d41dad9d9ee5b920d273a7d1ca211b670bd62cf2e4d3dff83ac4e4e7ed9d5a488aaa1ca2d99fa5d211f9d37a6125cfef8a83f8cb6d7c6332 SHA512 3a0acd635117d8577466dec37b7aee3a928151200d8dc143a6d44a1fb5c831b65786b2b42d9382fa12b5ea6bc4a84027cd647be0e41a366dfad495b970821c34
-EBUILD powerdevil-5.23.5.ebuild 1954 BLAKE2B 33b7e916ecf2b788bf6144907c3c02e4e875babd688d2e0d74cef7e95ee63d1b1f3f0896e340726c52de1894d094ba22ee1a00e9838acd8f53d259218d3cb2d9 SHA512 4c6247dbf8a6a9b34274ba9451e7ca3ca7d340c82fd1601732e27fc077888e0ce7ce137607b832d33d427714915dc656faabab7ecc7cc39e17213f24da218701
+EBUILD powerdevil-5.23.4-r1.ebuild 1953 BLAKE2B 77789a40e40e22eecce7800c386238d84ac942d8d8fb4ab9d24266063467b775503ef1d4c9cdabd154e836b1eca369ac13a470274d534230ba6b3f00e7ba8446 SHA512 2c77d8b81d8872f52d4b208276b1c72edbbcda3384989291b40e74cd1cffe86986d65bd22d9b09ac4dd1ed704dc376d74950096a47fc4362694fc3520059e3e1
+EBUILD powerdevil-5.23.5-r1.ebuild 1956 BLAKE2B 3c0d0e37263a897306b6021b9c553374e994e3fb3d2ed224f3aa78290936449f9acc9a08491a7d303fecebfa9ee119f035763698186a080463a6ea4f6ab33ce1 SHA512 546ac21045efd4e20994b73c76f734461b792dbd5056d846719d17c3e09c215b8155865efa1545df42c8b9581a345c3b1ee097bd9b275c66f791b7c7aa7f0803
 MISC metadata.xml 597 BLAKE2B 4e436cb067ff3c936a6e497de75b03947f4ccd1103f45237a8a7fe738f67c5a718bf17bbb7aa0a9eff068ce18ce4f0b73bb8f737badc63971e3edabcdd09bff8 SHA512 f4652971683109791e796a57de30efaf603566ad5f9e3e1d16ca54b1212b4cd3ebe1d9a934959fcb51d2722aafe3d57af708f45722534f225ea4b2889a492dc6
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild
index fa6b1b4bd1b9..40e0884adb2a 100644
--- a/kde-plasma/powerdevil/powerdevil-5.23.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,7 +45,7 @@ DEPEND="
 	>=kde-plasma/libkworkspace-${PVCUT}:5
 	virtual/libudev:=
 	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
+	brightness-control? ( app-misc/ddcutil:= )
 	caps? ( sys-libs/libcap )
 	wireless? (
 		>=kde-frameworks/bluez-qt-${KFMIN}:5
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild
index 298d369017f8..4b2632d141ec 100644
--- a/kde-plasma/powerdevil/powerdevil-5.23.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	>=kde-plasma/libkworkspace-${PVCUT}:5
 	virtual/libudev:=
 	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
+	brightness-control? ( app-misc/ddcutil:= )
 	caps? ( sys-libs/libcap )
 	wireless? (
 		>=kde-frameworks/bluez-qt-${KFMIN}:5