gentoo resync : 12.05.2022

9 files changed, 72 insertions, 277 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index cab54d8cb7d2..f66dd8282924 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,13 +1,10 @@
-AUX plasma-5.90.0-KDEBUG-426969.patch 3254 BLAKE2B 2b2bcafa630b3daaecd54e6cf2d10b5d7f3a668c54393ca0f1f307c3dac05450801d80537b7af6188e39f25ec00430601ea5fa55f7cc7c2c4564e7f234f5fc7d SHA512 f87839edda4fd680d81ddaf59befcf6836bc5510fd287e3ca3737de0f0b16e3d8272ac3d9eaf4b12704bdd65991348e450c93824ae6ab2603c47f25be9950884
-AUX plasma-5.90.0-KDEBUG-447752.patch 2649 BLAKE2B 879a0fbb02e6a90120797d2352e8b3c9874b3203fc1125a004b940f52757eea907a4499d047589c59b4cc7f87dd1ca15119aaa2d990462fda8cc989da5996826 SHA512 17e43da6fd6d6f956e17c889fd4bccdb39d88a1a08cd4cf6bf3af1021eae7dc034821b2b87e2bc5bf2eeedf0338e0d2afb3adba62c0d07a0c68bece08ac781e8
-AUX plasma-5.90.0-KDEBUG-448590.patch 1433 BLAKE2B 667d2f07b474ac5b5ceda34e1e819e7b62fc74463dcc763638d18b60b9dfd93eeca87519069792ff91a80cfe0d795562468b1423943b672556bb6b49a2e84362 SHA512 822f3795fc89f95deb71d6ab3608d38608cff9be48bb30748b2c52adecdf12899707ad2be918fe014087297539c42018914d4c77f7855d4d912844838cca871c
 AUX plasma-5.92.0-breeze-light-dark-visual-fix.patch 1689 BLAKE2B 8c15834e53bdb2dfe4707a2173bdf19fd1a98652f644256f050ce55cc57e3268f1d33a1d67901d68301749bf7458137092c71e68d50454bd8db88d962c2bcd01 SHA512 d490f815b11bbf6af35266fab33392cfd5562b2011970b433b2c3952e1e9638af56175e10258596dd863c8fff49d448f141c22bfa3d688c9194a31ca0ed2f1ee
 AUX plasma-5.92.0-fix-blurry-buttons.patch 5410 BLAKE2B 689bf20c1848fd5ac299991f6dcc1e6ee81ef2fecd68d87952967dbb2367326aee8d464588824b059f7162a1cc6092c84cce7d254ac20dbbef3da639a5eaa4e0 SHA512 facb4d4ca36f5edaad918253f8d79442d350a12d611d833d0c48684abd2160527813d7186614fc54d3d5f67171400bbaf56f64c0ffb98c2433e062ee024b180d
+AUX plasma-5.93.0-fix-osd-dialog-position.patch 1057 BLAKE2B 2aefb325c4f4c09dac0632e01a0877afc12998ebdd8d7397ea6268e6c4b0602b5d1e385fae821185bcbf276356777bd47ed5e645c86dbdb81e4bf13b504b0f60 SHA512 3a4c349cc8064ecf9513bdab4db44ff329ce9fa5d3af72b695bedc241509dd70f9c62d8de0903d9cc87775b20fcbc729701917686e5ad3fbd66df3242e3bb5a0
 AUX plasma-5.93.0-fix-widget-popups.patch 931 BLAKE2B 32488d998398ff027f3a265c43a89b2f72b10861e4993584d2fc665a3ef6d4ec9219e105f5de09ce53a83ad6f0ad1ab545ac92d0607406fd2c75984da322a5a0 SHA512 06c7d7d6710d176979756070f4492be2d3101d4c86728b8234484ad3fbc4b57d8d59d78d6ff34d9f79c578a1ca4ffe659819f46924d7ba309e76247e8d0e168b
-DIST plasma-framework-5.90.0.tar.xz 3143720 BLAKE2B 497a1808c2f07b985f3b458d2bf6b4b4e0198a8bd92cffdad86cc9470cd51c857c3de66edbe4d6ea543da74f6ba05fe5ce1b6746e2df7830839e45549ca01293 SHA512 0f22e100ad996be39a2cc5afa72d3e769dc512d3854d417e81536908bc4e6c9874788554fcea1ca1ec4798cd78681c78ab7c2242b95d7f5fdb6cfd9eeee9543b
+AUX plasma-5.93.0-keep-legacy-highlight-behaviour.patch 1054 BLAKE2B 95efe2e47a5816139f77c1ca5b7b75cb42ce93555daec773a6d3942f9498d1ddfd04676fe7a51742ea415b295f88440261ab08400a6734c661dba51157504bb1 SHA512 168098d5a6f492dc37272a23eff873938ad7595345d589faef5ea7a486f4fd3f40cec0e0c3b96fde030f99155d6d79a7dc4a81ece4d3d242d25757d456584971
 DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
 DIST plasma-framework-5.93.0.tar.xz 3148720 BLAKE2B 2e11e742279ce33b33bf5a7a7e4051e14bb7e7c2cdecb41e127bf07c5fbe91fd4ab8905cadb27a2a1be95ce4287e4eb8539cdfb9ad36e052f9789abf5d8159c3 SHA512 df876c422d2de82325537bfdce4db016dc649202f334de063403c15f44d554c4b0f6707e02c8890e269bdb71c17fdd31f651fad3ed7506f23a110d725fd8ccf8
-EBUILD plasma-5.90.0-r1.ebuild 2073 BLAKE2B 6a79b018dca1c936508c1b129df9bb44945e4787c2b0f448e451f287bbf5af111787034eabb107cd26fd63d596bd6f388d8d7b17f93bed09b4b8177bb75c39ff SHA512 ca9ef2b7ec8b87ab1df3eeaa8c90ff2aedc78eb4ab860e1539bd5d4bb3805cec253772e0bb17a79047138e41e014b6a5ff2e5a50f867be1a3cc2390ad5112560
-EBUILD plasma-5.92.0-r2.ebuild 2073 BLAKE2B a84f1823219690cefc3af290cebb69c72b84fded490dabed29274820c6476434a85f27ace4a2e4e655698ee6d7d3906e63161048efc8c839607807d0aea6c105 SHA512 c4c3b4c49ad410602f982de423673f334f854a58c4cb4ca9ecc579fc264c4366ffd2aa4caa70729d08e657417564c1e7c2252a660297cd3e855b0f3d527e63c5
-EBUILD plasma-5.93.0-r1.ebuild 2099 BLAKE2B d03ec534d8106fc96e796158049b4e662d87b92a3d4cae97799ba59072bd78fc207290c9441a5293c4e2e454c1540bf56a35b09e3eb0081a87557894a2fd4bf2 SHA512 be27bc951fdae92cfa43d8257cb8ea4aea3a101b120a973a19348683279694ae5a65c235a313746b18880639350f311c85914b6b3610191c1a797a475ae23119
+EBUILD plasma-5.92.0-r2.ebuild 2070 BLAKE2B 6e234e85ddc2694560bcdd46a9b12df6a9ab7ee1a3fb2f29e2a9c835a0255a981af7d73f12caf4bd4a7ef90320cb7f23d3906b083b2346e289c6e8bd092f1acb SHA512 3d9389f095b09c330f552f52fa2d7c624c968abc658f6c447bbed066e864d205573314878f8b47f207dcdf3e7273beaecf62de39984bc763a494b26e29bceac9
+EBUILD plasma-5.93.0-r2.ebuild 2241 BLAKE2B 239219e02e14d05f54afe61e6eae15cf18df73e35df3b2262049cb64d4a91727a5ebfe0688492e60745eb39e13110dc8d87ee3fbf8a4fd1a03841e5a327fcd1b SHA512 f5e402e962ddc81f381b8635244f7395e13e2b6f491c71ae0fbbf829ac43c1fe9528e8b1089c9a82b541ede1c5fba52b795a1c3daf7a3795bf470da4068814ca
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch
deleted file mode 100644
index bccc097a3b99..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From d40d36057a0ee9fcb4badc7ff8b56844da79dfc8 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 12 Jan 2022 22:21:34 +0000
-Subject: [PATCH] Always sync the setPanelBehavior to wayland
-
-Currently this code is in the else statement to if (type !=
-Dialog::Normal) {
-
-This doesn't make sense as panel roles apply explicitly to other types,
-like Dialog::Dock. On X11 the equivalent always applies.
-
-BUG: 426969
-
-* asturm 2022-01-22: Merged with below fixup:
-
-From b882b34d7b55975f679133ef86cfd12869e8bba5 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 13 Jan 2022 17:03:38 +0000
-Subject: [PATCH] Always sync the setPanelBehavior to wayland
-
-The previous patch moved some code that reapplied setRole in a way that
-caused issues.
-
-BUG: 448373
-
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -693,14 +693,13 @@
- 
- void DialogPrivate::applyType()
- {
--    if (type != Dialog::Normal) {
-         /*QXcbWindowFunctions::WmWindowType*/ int wmType = 0;
- 
- #if HAVE_X11
-         if (KWindowSystem::isPlatformX11()) {
-             switch (type) {
-             case Dialog::Normal:
--                Q_UNREACHABLE();
-+                q->setFlags(Qt::FramelessWindowHint | q->flags());
-                 break;
-             case Dialog::Dock:
-                 wmType = QXcbWindowFunctions::WmWindowType::Dock;
-@@ -729,11 +728,15 @@
-         }
- #endif
- 
--        if (!wmType) {
-+        if (!wmType && type != Dialog::Normal) {
-             KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
-         }
- #if HAVE_KWAYLAND
-         if (shellSurface) {
-+            if (q->flags() & Qt::WindowStaysOnTopHint) {
-+                type = Dialog::Dock;
-+                shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow);
-+            }
-             switch (type) {
-                 case Dialog::Dock:
-                 shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel);
-@@ -750,27 +753,13 @@
-             case Dialog::CriticalNotification:
-                 shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::CriticalNotification);
-                 break;
-+            case Dialog::Normal:
-+                shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal);
-             default:
-                 break;
-             }
-         }
- #endif
--    } else {
--        q->setFlags(Qt::FramelessWindowHint | q->flags());
--
--#if HAVE_KWAYLAND
--        // Only possible after setup
--        if (shellSurface) {
--            if (q->flags() & Qt::WindowStaysOnTopHint) {
--                shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel);
--                shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow);
--            } else {
--                shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal);
--                shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::AlwaysVisible);
--            }
--        }
--#endif
--    }
- 
-     // an OSD can't be a Dialog, as qt xcb would attempt to set a transient parent for it
-     // see bug 370433
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch
deleted file mode 100644
index 62cb8a52b6c5..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From ecf0cc36936f69830a07937b97807ec0ba4d3f41 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 10 Jan 2022 09:22:09 +0000
-Subject: [PATCH] Don't crash when a screen gets disabled and enabled again
-
-when a screen gets disabled, the containment loses its view, and when gets enabled again,
-the process of the old orphaned containment getting a new view causes a plasma crash.
-It comes from the wallpaper, which indicates a hierarchy of C++ owned objects
-makes the internal one (wallpaper) to not reset correctly its window and have a stray pointer to it.
-
-BUG:447752
----
- .../qml/plasmoid/containmentinterface.cpp     | 21 +++++++++++++++----
- .../qml/plasmoid/containmentinterface.h       |  1 +
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
-index d8a89014c..29a7738ca 100644
---- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp
-+++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
-@@ -74,10 +74,6 @@ void ContainmentInterface::init()
-     connect(m_activityInfo, &KActivities::Info::nameChanged, this, &ContainmentInterface::activityNameChanged);
-     Q_EMIT activityNameChanged();
- 
--    if (!m_containment->wallpaper().isEmpty()) {
--        loadWallpaper();
--    }
--
-     AppletInterface::init();
- 
-     // Create the ToolBox
-@@ -1162,4 +1158,21 @@ bool ContainmentInterface::isLoading() const
-     return loading;
- }
- 
-+void ContainmentInterface::itemChange(ItemChange change, const ItemChangeData &value)
-+{
-+    if (change == QQuickItem::ItemSceneChange) {
-+        // we have a window: create the representations if needed
-+        if (value.window && !m_containment->wallpaper().isEmpty()) {
-+            loadWallpaper();
-+        } else if (m_wallpaperInterface) {
-+            m_wallpaperInterface->deleteLater();
-+            m_wallpaperInterface = nullptr;
-+            Q_EMIT wallpaperInterfaceChanged();
-+        }
-+    }
-+
-+    AppletInterface::itemChange(change, value);
-+}
-+
-+
- #include "moc_containmentinterface.cpp"
-diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.h b/src/scriptengines/qml/plasmoid/containmentinterface.h
-index a91c60c5e..f1276ee80 100644
---- a/src/scriptengines/qml/plasmoid/containmentinterface.h
-+++ b/src/scriptengines/qml/plasmoid/containmentinterface.h
-@@ -169,6 +169,7 @@ protected:
-     void addContainmentActions(QMenu *desktopMenu, QEvent *event);
- 
-     virtual bool isLoading() const override;
-+    void itemChange(ItemChange change, const ItemChangeData &value) override;
- 
- Q_SIGNALS:
-     /**
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch
deleted file mode 100644
index 4bbb7a8ce1b0..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e9ba0c54f2c01bb530370c16502cf304fc18b3f6 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Mon, 17 Jan 2022 19:58:53 +0100
-Subject: [PATCH] Corona::containmentForScreen: Ignore activities when an empty
- string is used
-
-With the other overloads being deprecated, consumers are forced to put in an empty string
-for the activity. As one can see in the pre-existing code, an empty string indicates
-that the activity should be ignored. Consequently we should skip the activity check, when
-we got an empty string.
-
-BUG: 448590
----
- src/plasma/corona.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp
-index f034d7b2e..8f532d690 100644
---- a/src/plasma/corona.cpp
-+++ b/src/plasma/corona.cpp
-@@ -206,7 +206,7 @@ Containment *Corona::containmentForScreen(int screen, const QString &activity, c
-     for (Containment *cont : std::as_const(d->containments)) {
-         /* clang-format off */
-         if (cont->lastScreen() == screen
--            && (cont->activity().isEmpty() || cont->activity() == activity)
-+            && ((cont->activity().isEmpty() || activity.isEmpty()) || cont->activity() == activity)
-             && (cont->containmentType() == Plasma::Types::DesktopContainment
-                 || cont->containmentType() == Plasma::Types::CustomContainment)) { /* clang-format on */
-             containment = cont;
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch b/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch
new file mode 100644
index 000000000000..088230402863
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch
@@ -0,0 +1,32 @@
+From aec00b32980390b93411f140dfb0503a671c2163 Mon Sep 17 00:00:00 2001
+From: Jim Jones <rauchwolke@gmx.net>
+Date: Wed, 20 Apr 2022 16:18:20 +0000
+Subject: [PATCH] Fix osd dialog position
+
+After the upgrade to kde-frameworks-5.93 the osd volume indicator is displayed in the top left corner of the screen instead of being displayed in the center of the screen.
+
+BUG: 452648
+---
+ src/plasmaquick/dialog.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 9ca2c8a66..1e6736dee 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -1237,11 +1237,7 @@ bool Dialog::event(QEvent *event)
+ {
+     if (event->type() == QEvent::Expose) {
+         if (!KWindowSystem::isPlatformWayland() || !isExposed()) {
+-            auto ret = QQuickWindow::event(event);
+-            if (d->mainItem) {
+-                d->syncToMainItemSize();
+-            }
+-            return ret;
++            return QQuickWindow::event(event);
+         }
+ 
+         /*
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch
new file mode 100644
index 000000000000..20935856caa8
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch
@@ -0,0 +1,33 @@
+From 734b956c27bd76df7fed6979beb27c2f30cbd3bf Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 13 Apr 2022 17:25:52 +0200
+Subject: [PATCH] Keep PlasmaComponents.Highlight on its former behaviour
+
+Otherwise some applets like Kickoff Legacy don't get a highlight
+
+BUG: 452555
+---
+ src/declarativeimports/plasmacomponents/qml/Highlight.qml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/declarativeimports/plasmacomponents/qml/Highlight.qml b/src/declarativeimports/plasmacomponents/qml/Highlight.qml
+index 672e57231..3672050b7 100644
+--- a/src/declarativeimports/plasmacomponents/qml/Highlight.qml
++++ b/src/declarativeimports/plasmacomponents/qml/Highlight.qml
+@@ -4,6 +4,7 @@
+     SPDX-License-Identifier: LGPL-2.0-or-later
+ */
+ 
++import QtQuick 2.15
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ 
+ /**
+@@ -15,4 +16,5 @@ PlasmaExtras.Highlight
+     id: root
+     // At some point we had the "hover" property which was replaced with "hovered"
+     property alias hover: root.hovered
++    hovered: true
+ }
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
deleted file mode 100644
index df38b8e9aa83..000000000000
--- a/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( media-libs/libglvnd[X?] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-KDEBUG-426969.patch"
-	"${FILESDIR}/${P}-KDEBUG-447752.patch"
-	"${FILESDIR}/${P}-KDEBUG-448590.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
index 8d660fd871a3..f048636a97a6 100644
--- a/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
+++ b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Plasma framework"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gles2-only man wayland X"
 
 RESTRICT="test"
diff --git a/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild
index 1548d3671d1d..f5d72b460cb0 100644
--- a/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.93.0-r2.ebuild
@@ -62,6 +62,8 @@ BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.92.0-fix-blurry-buttons.patch" # KDE-bug 447977
 	"${FILESDIR}/${P}-fix-widget-popups.patch" # bug 838661, KDE-bug 452512
+	"${FILESDIR}/${P}-fix-osd-dialog-position.patch" # KDE-bug 452648
+	"${FILESDIR}/${P}-keep-legacy-highlight-behaviour.patch" # KDE-bug 452555
 )
 
 src_configure() {