9 files changed, 9 insertions, 409 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 7ffd76103dfd..3276436eb98b 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,12 +1,6 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
-AUX kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch 1014 BLAKE2B 6395723747077a5d024b47b9cf4763bc52e2155a60b98ca2143b04a8b4682c1d1cd41779cc337dc4175279428fe05d16897ce2f5afd747692df5ecb17948d6f0 SHA512 0b15b757768fadb4cd7b960d20a9183aa7e9104e49203946e398ae76852c488bc4f55c1544409ad653b753266b8d9c519ba673f8cf6a1521f72a8c81de4f60f4
-AUX kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch 1756 BLAKE2B 6e24b6780cb756229aec301477c95880e381ae4a582e5de718528f1ebb2bf95ede8d0ace6ed0791443ceb85b5fa9eb87eaa11be8f12cbca4b39b4268e80f2130 SHA512 c4c8c6e265e8bdceb69310e6cd202fc7b38c1002a2eeaf422839e6689265a0ec9546ac100a28d851e333f27a618e2e370aeb62f372eeafd6a49cd928d4f41a7b
-AUX kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch 1450 BLAKE2B 689880b0a016d0d20bf792f7b88f3317910f1e3380c12dcd47855849018f7746b4f6b57724bce7964c80f0ef212052455bbb39ba1ea7211822a531fbcbbafd39 SHA512 e5b40ff15e53b6b11d60f824873602bfa2c5bac2aea8d739946efec80746904dd2ce61da716f1b01ce654c6ebd20826baa2881cc7bd0228555846b3aef55235b
-AUX kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch 5272 BLAKE2B d5959c8c036a2e043bba35b4498e1ec876936ef345647c088d1afb628e108019d407c6b105e44ac8734bb646825272c757ae78c407932a33e9d084b1f52b9eb1 SHA512 2937ef87e839c6f043fd362bd97f3fa88c75b658afae1d137f16e500a5435f1882537e8f62947f59cb65e8b8eaf705cfa6f5ce84df37e8b84a0fde025e5aafa1
-AUX kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch 1241 BLAKE2B 9b34872dcb435bf4ed1e06d4c45ea7b80e9dd2cbb7ff1e1de6178c8edcac011a5e9c9acf35a649101a0e6aaf0c4c7e6c928861dcd6c90a4bad3887cc0b555ef7 SHA512 4e864baacf775409ce9ce06933f8674215809246eb41aba322beb0978e2e21c5131dd247c5b1dbaeb6947eb620ebc381bc26e720f0a25e3de461ed8cfae333e9
-DIST kwin-5.23.4.tar.xz 6341720 BLAKE2B 5dd984c0ff4c62f9d3e4915be5f5423477314a79c4e8fa9a0c306f99be968ca99e61ab9f23ee1b866e171c40c0ad173c96f6de49a28b2eea3a2c62bf5c9a20b3 SHA512 82da0883cf5e900c2278351e815453e25052edfb6534e4be015636dcc2c4051f154c6685eb2542e851d48bf8026bf2b359189864dda336b266208344dcfc851d
 DIST kwin-5.23.5.tar.xz 6347020 BLAKE2B 30a47d572665084aa4569dcfd525ac197648bcc32f2650460803eb592e34dd6e2395be2e491c76b71afe32968bdc2d6aa67dd6f8adb0f776366a7f9f48fb5047 SHA512 45bae86857391b9ce9eca8e75c664914b3b59d0327b670af8eaca6b2bd8008376ecb18347019906c9a9553c8767ea3e05d8ad81d57d4bfb3e91589ae27e3680f
-EBUILD kwin-5.23.4-r1.ebuild 4154 BLAKE2B 1fb74c0e6e99b135085de71e4c5d69d101b0c501ec86a30a11932099860dd0ec267e299c46af065dcb87eeac7aba5133d3b23825b971aa45671fac13685b7244 SHA512 9839876d52714eea2a662f79a8e3b10f5bfe2ac959f4bb3c77ffb96362f4f0dde049a1f49e2dad1a523239ff5ce93927b540cd901b71ad3a02ba96683c5a43b3
-EBUILD kwin-5.23.4-r2.ebuild 4326 BLAKE2B ff3c124a3c5deb911a29853f65c1485db608345a7c30202de1fe8ec3a9904ff103b94095589adfb0b0fbc29297c0d9300e2e8940f9e73f55a00fb7d5067ec660 SHA512 aec33fb84a2900e15f4bd4ff66d905c706ca4a6a357cd078528c9b0348b7eef7167beda0c2ca76ebede9ab10f7561176bf4ddaedc71518cbcd867272b9abe043
-EBUILD kwin-5.23.5.ebuild 3897 BLAKE2B f1172da729f5c1ca42e780fc1dca3a7efaf5d778e8517fb151740b1c569896d3b6b1b10152563ae70b23a56d08c3715fdcb309ec46651502333b7502ef4c7255 SHA512 b0f3b3f17ee7bd15f22f971bd086a5845b079929e8d6a640f138b9c66eb996dbce424f08bcd25b7674e092244a02a7e7e98fa4ac8989ad0d59d3cf27338d2732
+DIST kwin-5.23.90.tar.xz 6430504 BLAKE2B 708f80d1ecb8cca60dc4ef4d6aa62af463b8ff7121bd5ce8cfa47ba6cb4cb886a4925a25b3741a4fa7d7f3164d18fb9c05c85c2c2746c7d5823b6436d326e933 SHA512 b05e986a784a6c7c49a25b5aa9d0e8403db3292a0c9d3461026a57f68164ba66f50ebc83e3328c499d71e5f796e7c38379ba3b70ca3c84ff796e5442f0f87c3e
+EBUILD kwin-5.23.5.ebuild 3894 BLAKE2B a496722bff1661458d974401ba617793f0b90383111679efc3c7ae473347851736c79e3bd9682922c7f88cc3b1f7b7935fe94eb568b1f6fd3338dac9a406b067 SHA512 7f5d59f3ef62b4e88805cc1cfaf07d03b7cad12f7190239869b0d92ee0a60fcecb9d04b9e777ffab7ad8f53745f9383ce5092f6259bb057a9294eda8509a518d
+EBUILD kwin-5.23.90.ebuild 3938 BLAKE2B 2e573f93f7ccfdc41acaea46fe84a6ddd4fdf442fbb439035ca3c2c738e298965fd38ec29bc4f9d8931cf1019ac0c90946010fecf5e7ccfbc6a217eb3fd4321c SHA512 fb5be20eb13936313f892d285d1286e2dd0339cf7ccdeedb089dc307eea4248ad5cd52ca5a4c8ecd4c3c04acb23dfe3b180aaddf958b3903bfa9134329334988
 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch b/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch
deleted file mode 100644
index cc323e4540f6..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8a0036fdee0eaa7dc5808dfe2dfc516fc32dfd8e Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Thu, 9 Dec 2021 12:51:55 +0100
-Subject: [PATCH] platforms/drm: remove the dpms filter when outputs are added
-
-When the dpms filter is active and an output is hotunplugged, or
-is momentarily detected as hotunplugged, adding a new output should
-remove the dpms filter again.
-
-BUG: 446699
-FIXED-IN: 5.23.5
----
- src/plugins/platforms/drm/drm_backend.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plugins/platforms/drm/drm_backend.cpp b/src/plugins/platforms/drm/drm_backend.cpp
-index a99b720177..d7908f6332 100644
---- a/src/plugins/platforms/drm/drm_backend.cpp
-+++ b/src/plugins/platforms/drm/drm_backend.cpp
-@@ -321,6 +321,7 @@ void DrmBackend::addOutput(DrmAbstractOutput *o)
-         primaryGpu()->removeVirtualOutput(m_placeHolderOutput);
-         m_placeHolderOutput = nullptr;
-     }
-+    checkOutputsAreOn();
- }
- 
- void DrmBackend::removeOutput(DrmAbstractOutput *o)
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch b/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch
deleted file mode 100644
index 5abcfa49969c..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8accc777a5b3ab1e53341f1838ed636652dc1221 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Mon, 13 Dec 2021 12:53:32 +0200
-Subject: [PATCH] Fix memory leak in some plasma components
-
-A few plasma components cache QSGTexture. Those components rely on
-texture references going away with QSGNode users. However, with the
-current tear down logic, OffscreenQuickView won't destroy any paint
-nodes.
-
-Destroy QQuickRenderControl before QQuickWindow to ensure that are no
-paint nodes left alive after OffscreenQuickView.
-
-BUG: 444429
-BUG: 444381
-BUG: 444077
-BUG: 444306
-(cherry picked from commit 64f2cdf9ed290a1fb7c2bf41753613078eb023c4)
----
- src/libkwineffects/kwineffectquickview.cpp | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/libkwineffects/kwineffectquickview.cpp b/src/libkwineffects/kwineffectquickview.cpp
-index ca5a025729..14be1e1b25 100644
---- a/src/libkwineffects/kwineffectquickview.cpp
-+++ b/src/libkwineffects/kwineffectquickview.cpp
-@@ -160,13 +160,15 @@ EffectQuickView::EffectQuickView(QObject *parent, QWindow *renderWindow, ExportM
- EffectQuickView::~EffectQuickView()
- {
-     if (d->m_glcontext) {
--        d->m_glcontext->makeCurrent(d->m_offscreenSurface.data());
-         // close the view whilst we have an active GL context
--        delete d->m_view;
--        d->m_view = nullptr;
--        d->m_renderControl->invalidate();
--        d->m_glcontext->doneCurrent();
-+        d->m_glcontext->makeCurrent(d->m_offscreenSurface.data());
-     }
-+
-+    delete d->m_renderControl; // Always delete render control first.
-+    d->m_renderControl = nullptr;
-+
-+    delete d->m_view;
-+    d->m_view = nullptr;
- }
- 
- bool EffectQuickView::automaticRepaint() const
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch b/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch
deleted file mode 100644
index 6ec6a59cd59f..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fd8d01d9892f12c48a82c6e2ab675396bf6ec113 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Sun, 5 Dec 2021 18:24:35 +0200
-Subject: [PATCH] scripting: Fix type of KWinComponents.Workspace
-
-Currently, the workspace.clients property doesn't work in declarative
-scripts because wrong workspace wrapper is used.
-
-
-(cherry picked from commit 29a85e830cdca5ae483b411e942e7a5bf85f6140)
----
- src/scripting/scripting.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp
-index b901db7455..929c94afab 100644
---- a/src/scripting/scripting.cpp
-+++ b/src/scripting/scripting.cpp
-@@ -650,10 +650,10 @@ void KWin::Scripting::init()
-     qmlRegisterType<ScriptingModels::V3::ClientModel>("org.kde.kwin", 3, 0, "ClientModel");
-     qmlRegisterType<ScriptingModels::V3::ClientFilterModel>("org.kde.kwin", 3, 0, "ClientFilterModel");
- 
--    qmlRegisterSingletonType<QtScriptWorkspaceWrapper>("org.kde.kwin", 3, 0, "Workspace", [](QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
-+    qmlRegisterSingletonType<DeclarativeScriptWorkspaceWrapper>("org.kde.kwin", 3, 0, "Workspace", [](QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
-         Q_UNUSED(qmlEngine)
-         Q_UNUSED(jsEngine)
--        return new QtScriptWorkspaceWrapper();
-+        return new DeclarativeScriptWorkspaceWrapper();
-     });
- 
-     qmlRegisterType<KWin::AbstractClient>();
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch b/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch
deleted file mode 100644
index 7846681ed528..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 6a84b9454c869a16c2fa5fd49a8fac4a9497f30f Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Tue, 7 Dec 2021 09:32:33 +0200
-Subject: [PATCH] wayland: Resize the client to last requested client size if
- decoration is destroyed
-
-If the decoration is destroyed before the window is mapped, kwin can
-respond with a configure event that has 0x0 size. New tests check that
-problematic case.
-
-BUG: 444962
-(cherry picked from commit 9cc80d7468c92a2800daf98319e626e022ff1045)
----
- autotests/integration/xdgshellclient_test.cpp | 48 +++++++++++++++++++
- src/abstract_client.cpp                       |  3 +-
- 2 files changed, 50 insertions(+), 1 deletion(-)
-
-diff --git a/autotests/integration/xdgshellclient_test.cpp b/autotests/integration/xdgshellclient_test.cpp
-index c00e4ebb2d..eabed754dd 100644
---- a/autotests/integration/xdgshellclient_test.cpp
-+++ b/autotests/integration/xdgshellclient_test.cpp
-@@ -104,6 +104,8 @@ private Q_SLOTS:
-     void testPointerInputTransform();
-     void testReentrantSetFrameGeometry();
-     void testDoubleMaximize();
-+    void testMaximizeAndChangeDecorationModeAfterInitialCommit();
-+    void testFullScreenAndChangeDecorationModeAfterInitialCommit();
- };
- 
- void TestXdgShellClient::testXdgWindowReactive()
-@@ -1839,5 +1841,51 @@ void TestXdgShellClient::testMaximizeFull()
-     QVERIFY(Test::waitForWindowDestroyed(client));
- }
- 
-+void TestXdgShellClient::testMaximizeAndChangeDecorationModeAfterInitialCommit()
-+{
-+    // Ideally, the app would initialize the xdg-toplevel surface before the initial commit, but
-+    // many don't do it. They initialize the surface after the first commit.
-+    // This test verifies that the client will receive a configure event with correct size
-+    // if an xdg-toplevel surface is set maximized and decoration mode changes after initial commit.
-+
-+    QScopedPointer<KWayland::Client::Surface> surface(Test::createSurface());
-+    QScopedPointer<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.data())); // will wait for the first configure event
-+    QScopedPointer<Test::XdgToplevelDecorationV1> decoration(Test::createXdgToplevelDecorationV1(shellSurface.data()));
-+    QSignalSpy toplevelConfigureRequestedSpy(shellSurface.data(), &Test::XdgToplevel::configureRequested);
-+    QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
-+
-+    // Request maximized mode and set decoration mode, i.e. perform late initialization.
-+    shellSurface->set_maximized();
-+    decoration->set_mode(Test::XdgToplevelDecorationV1::mode_client_side);
-+
-+    // The compositor will respond with a new configure event, which should contain maximized state.
-+    QVERIFY(surfaceConfigureRequestedSpy.wait());
-+    QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).value<QSize>(), QSize(1280, 1024));
-+    QCOMPARE(toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>(), Test::XdgToplevel::State::Maximized);
-+}
-+
-+void TestXdgShellClient::testFullScreenAndChangeDecorationModeAfterInitialCommit()
-+{
-+    // Ideally, the app would initialize the xdg-toplevel surface before the initial commit, but
-+    // many don't do it. They initialize the surface after the first commit.
-+    // This test verifies that the client will receive a configure event with correct size
-+    // if an xdg-toplevel surface is set fullscreen and decoration mode changes after initial commit.
-+
-+    QScopedPointer<KWayland::Client::Surface> surface(Test::createSurface());
-+    QScopedPointer<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.data())); // will wait for the first configure event
-+    QScopedPointer<Test::XdgToplevelDecorationV1> decoration(Test::createXdgToplevelDecorationV1(shellSurface.data()));
-+    QSignalSpy toplevelConfigureRequestedSpy(shellSurface.data(), &Test::XdgToplevel::configureRequested);
-+    QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
-+
-+    // Request fullscreen mode and set decoration mode, i.e. perform late initialization.
-+    shellSurface->set_fullscreen(nullptr);
-+    decoration->set_mode(Test::XdgToplevelDecorationV1::mode_client_side);
-+
-+    // The compositor will respond with a new configure event, which should contain fullscreen state.
-+    QVERIFY(surfaceConfigureRequestedSpy.wait());
-+    QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).value<QSize>(), QSize(1280, 1024));
-+    QCOMPARE(toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>(), Test::XdgToplevel::State::Fullscreen);
-+}
-+
- WAYLANDTEST_MAIN(TestXdgShellClient)
- #include "xdgshellclient_test.moc"
-diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
-index 79c079109a..95576de0b1 100644
---- a/src/abstract_client.cpp
-+++ b/src/abstract_client.cpp
-@@ -2361,8 +2361,9 @@ void AbstractClient::createDecoration(const QRect &oldGeometry)
- 
- void AbstractClient::destroyDecoration()
- {
-+    const QSize clientSize = frameSizeToClientSize(moveResizeGeometry().size());
-     setDecoration(nullptr);
--    resize(clientSizeToFrameSize(clientSize()));
-+    resize(clientSize);
- }
- 
- void AbstractClient::setDecoration(KDecoration2::Decoration *decoration)
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch b/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch
deleted file mode 100644
index a80348be3562..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 77b678c522cce0e8e7b39087f74e2ac591cd28d0 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Sun, 12 Dec 2021 15:16:28 +0100
-Subject: [PATCH] XDGShellClient: Protect from invalid frameGeometry on
- updateDecoration
-
-When updating window decoration do not try to restore the previous frameGeometry
-if it was invalid.
-
-This fixes the case when applying a `noBorder=true` rule on a newly created
-client would set it to a minimal window size
-
-Targeted at 5.23 only, since this codepath is being reworked for 5.24
-
-BUG: 445140
-FIXED-IN: 5.23.5
----
- src/xdgshellclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp
-index b4427b8cf7..75c4031498 100644
---- a/src/xdgshellclient.cpp
-+++ b/src/xdgshellclient.cpp
-@@ -637,7 +637,7 @@ void XdgToplevelClient::updateDecoration(bool check_workspace_pos, bool force)
-         scheduleConfigure();
-     }
-     updateShadow();
--    if (check_workspace_pos) {
-+    if (check_workspace_pos && oldFrameGeometry.isValid()) {
-         const QRect oldGeometryRestore = geometryRestore();
-         setGeometryRestore(frameGeometry());
-         checkWorkspacePosition(oldFrameGeometry, oldClientGeometry);
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/kwin-5.23.4-r2.ebuild b/kde-plasma/kwin/kwin-5.23.4-r2.ebuild
deleted file mode 100644
index 8b40bded6cad..000000000000
--- a/kde-plasma/kwin/kwin-5.23.4-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="accessibility caps gles2-only multimedia plasma screencast"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.14
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libepoxy
-	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	accessibility? ( media-libs/libqaccessibilityclient:5 )
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	sys-apps/hwdata
-	x11-base/xwayland
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	test? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-wayland-resize-to-last-requested-client-size.patch # KDE-bug 444962
-	"${FILESDIR}"/${P}-scripting-fix-KWinComponents-Workspace-type.patch
-	"${FILESDIR}"/${P}-drm-remove-dpms-filter-when-outputs-are-added.patch # KDE-bug 446699
-	"${FILESDIR}"/${P}-xdgshell-protect-from-invalid-frameGeometry.patch # KDE-bug 445140
-	"${FILESDIR}"/${P}-fix-memory-leak-caching-QSGTexture.patch # KDE-bug 444077 +more
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-5.23.5.ebuild b/kde-plasma/kwin/kwin-5.23.5.ebuild
index 3bc2182222d7..6a8b24a358d7 100644
--- a/kde-plasma/kwin/kwin-5.23.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.23.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT="test"
diff --git a/kde-plasma/kwin/kwin-5.23.4-r1.ebuild b/kde-plasma/kwin/kwin-5.23.90.ebuild
index 024d953ad4b3..92235562b5a5 100644
--- a/kde-plasma/kwin/kwin-5.23.4-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.23.90.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="optional"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -15,13 +15,13 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT="test"
 
 COMMON_DEPEND="
-	>=dev-libs/libinput-1.14
+	>=dev-libs/libinput-1.19
 	>=dev-libs/wayland-1.2
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
 	>=kde-frameworks/ki18n-${KFMIN}:5
@@ -97,12 +98,6 @@ DEPEND="${COMMON_DEPEND}
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-wayland-resize-to-last-requested-client-size.patch # KDE-bug 444962
-	"${FILESDIR}"/${P}-scripting-fix-KWinComponents-Workspace-type.patch
-	"${FILESDIR}"/${P}-drm-remove-dpms-filter-when-outputs-are-added.patch # KDE-bug 446699
-)
-
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"