gentoo auto-resync : 03:09:2024 - 12:28:20

18 files changed, 654 insertions, 285 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 91ed1b7f93b9..a6db685f7d62 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 51a04d84667f..ade3bb901a59 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -2,5 +2,6 @@ AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193d
 DIST kde-cli-tools-5.27.11.tar.xz 670892 BLAKE2B 56463030f1935dd722212282000f9fd5e337de7171cc2f9ec08fdae66ed681463680af33fa5ac6b21c93e9eebbb4b415a211f0e72f075521960084afa69bfdb0 SHA512 8f6bbe39df4e491a28d3c6576c58bcbf74971f54157a8cdbc3bb7d4719a31d83f38bae45402cb8f48f11bd37d907bb625f89b929b83a2bb459d7c9c836d78006
 DIST kde-cli-tools-6.1.4.tar.xz 629280 BLAKE2B accd7ffbfe0d52c4ab3bffbb2eff03f1f4ffd80b915cb9ed643fc3216d3ab23c373b29a24b273072e3ee3dddc3f72d258acee5ad9d25a8a869e16193c9413519 SHA512 8f06ef6e4eb1b070ecd2e52ca3e38c6aeb2bca3f3617dbf9a935d0a081bab71bd0d25b275ad6e19177dd8f7768b3dfd18a5b54f6074227d32e12b74c257d1689
 EBUILD kde-cli-tools-5.27.11.ebuild 1760 BLAKE2B 8693dc3463e9a2c956dd203fe689d61bed1274ea22f90655ed4f6ac10091afdf4ce27de060dcca89371c68d3a325d1fd1d3e33a710a30ac156219f43d321aa84 SHA512 70cd6bad7ae2f3296be59dffb74643c1b837d071305e9ff2f5f212036ef951825d3d22d068e41136f6f49c5914cb3b682fa85c915655888cc17a2296d6494adb
+EBUILD kde-cli-tools-6.1.4-r1.ebuild 1482 BLAKE2B fc43454e4a2f1b2bac72802f967018bfdc302b39846eb5dbfa121cb4d30d3954e31a491747df5c1415ef5417be3e278e70943229a5b390cf43955d623688b6c0 SHA512 7e625dca432bd73845fdc62ae5f5c1f96d994c51ccfb2afada7e64b8325c66a24b1f7a29bf3d8cee1408921dd9d9e5879ffc6845803d12f86fe0f7aee4dd0a36
 EBUILD kde-cli-tools-6.1.4.ebuild 1508 BLAKE2B 9fddcd61148aa4d9f718140b7066325cb15f1be64b701631cc3d55051f04b2ac69f25c8159fe506ddf9a007e768c7aa65167bb8c11d1c02f35ef951ce33a217d SHA512 5368e2fddf8177a901abc31990d71915fc0a83c11919f22b4eb8283718750e3b0ec013666644c9b4549b4f98c3f7eb555eca661ad5e682b580d6c4b26cbffcec
 MISC metadata.xml 486 BLAKE2B 1a7c2a5cfa5065f0555430580bbf1ef93b4c6a3849ce1e963c6efc791e0ae13457f1a9abd4f5330d777a74e55f7bba616b64b0b1e80f094e9c1d6acd610491c1 SHA512 75f5d7f5ce1624c964a7b62a64ad6d004d735946fa20d2e95c91871e5f5d70b4e1e0155c0054b752f91d59ef554f828b2d50b0b5ee206147a97a957a44c5ad7d
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.4-r1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.4-r1.ebuild
new file mode 100644
index 000000000000..e018eaa50f6d
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 6 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="kdesu X"
+
+# requires running kde environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:6 )
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
+"
+RDEPEND="${DEPEND}
+	kdesu? ( sys-apps/dbus[X] )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kdesu KF6Su)
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	use kdesu && dosym ../libexec/kf6/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kpipewire/Manifest b/kde-plasma/kpipewire/Manifest
index 8194e6a1a881..1f548d4d35a3 100644
--- a/kde-plasma/kpipewire/Manifest
+++ b/kde-plasma/kpipewire/Manifest
@@ -1,5 +1,8 @@
+AUX kpipewire-6.1.4-avoid-segfault.patch 1338 BLAKE2B 545b1b5e0c3d9185fe6e7d6e4e9fa8d4eacf3d20e6b8c5385aacce61f2a23e841286f40e9428422f6634b93bbf02d625cda195c072c8f9f00fc861a04388b413 SHA512 55c2f390db7ac2cab3fb8635a39f0bd3d1bc3037978494b50456f7c0bed8abee785d743243be77deb982a7e935a929d0b9c894f7e7688c903bd26d1c6eebe879
+AUX kpipewire-6.1.4-dont-process-null-streams.patch 1315 BLAKE2B dcef6307c7b28e0b3499d9cdc97a8fd61937ebbbe6ab2d6d25ad2b1b33c0ef059b325160097593128c1ce1a2f26be4502c20a801f7c8b6174662f59318c6f179 SHA512 4dd14ef5041b64f1a3429bcd346de652570f51339f4e3d1ac699bcb784ea9fd1e89a4bbbddc73d165e695cbd8451b4e2522775adaebedf51dd177685f475b4f1
 DIST kpipewire-5.27.11.tar.xz 60076 BLAKE2B a0f9513babcf7d68252296ad258b2875e0e16a131302af8305f78a7d1fff87844c57cd88103aa95bdc8e584eab1e2142cd9edd9278c4afecf7b61769290f5910 SHA512 0350946c2e64f8b1224e31d49154f47b652bba55b3c3fbe39fa8b9da0e959a3c65b38d6f99cd3003a8ff409b29bdbbcc1b3f99deeb4052d1538776a2465c3641
 DIST kpipewire-6.1.4.tar.xz 148980 BLAKE2B d9ead0bfc582c31519b4a64bcd6ae14ee5a614579ef4edd741a2329bb4e3271bedfeaf5cad2158211d70ba1f3113a26c4378436d085f1b80fecfc83fddab0298 SHA512 e247709e2f89ac3bc55ca3cda78024d39b608c0be09453dcbabe441b247e7b8a54ad8c9ef0ba52a5d9e01b3361e569d14041188e317384c7baa835ec6d943ff4
 EBUILD kpipewire-5.27.11-r1.ebuild 996 BLAKE2B 0e838f274f3d27b83dad52ff869932eff874878778af932df98f8ddfb656ecd763c42f919d6c627b7026038ee242ab01cf88c5cfdd90902d993bf86d5aa7d805 SHA512 ba10ba172823ee0acf408176887b3206e768b36c2ca2b3007fc95f6a76ef6e0285ea575aac3ced39cfaca9ad39df2bd55eb8a6a38473b1a38125251455603e6b
 EBUILD kpipewire-6.1.4-r1.ebuild 1061 BLAKE2B 586842251050b2252e55a0d0b81649e5ef4d911079f2e285ec25544044f89a7c6e5a18a4ea45231470e35d7523939dedc26aff7d1454f947e58a7cc234f771e6 SHA512 5b1436993c62e8cc3347214558a2f782943a0f1dedf18edbcfd3ff0b34ad0cc062f8ff4be70039a143073716d7c05bbc3390091d5d15f21ebfaf01b92f82771b
+EBUILD kpipewire-6.1.4-r2.ebuild 1169 BLAKE2B 7ff837067466d2e19c7acfc761745baa8e45dee6e1a7ed5f5575921fe7907e1b92ece15fdc630be05a9bf8a605eafbb5dfbc9db3c8b182c47d7d12e28635df51 SHA512 bbfdd96ce2df55a7b8fe30f68f2cea69deca42a71aaad466f7c96fa88891f3eb4545b8bc883d218e0be560836283c2ae7ed83d5905ed68dff3ce1fc5bfcf3f01
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kpipewire/files/kpipewire-6.1.4-avoid-segfault.patch b/kde-plasma/kpipewire/files/kpipewire-6.1.4-avoid-segfault.patch
new file mode 100644
index 000000000000..eb4fa8b4f447
--- /dev/null
+++ b/kde-plasma/kpipewire/files/kpipewire-6.1.4-avoid-segfault.patch
@@ -0,0 +1,42 @@
+From 32628055172430a5b06a3ec5724d774290e86fd6 Mon Sep 17 00:00:00 2001
+From: Akseli Lahtinen <akselmo@akselmo.dev>
+Date: Mon, 12 Aug 2024 08:20:50 +0000
+Subject: [PATCH] pipewireproduce.cpp: Add guard to m_stream
+
+After multiple consecutive KRDP sessions,
+m_stream can be null, so add a guard to it to avoid segfault.
+
+
+(cherry picked from commit c9c8c1a7410463c98bab1d9b47abb71a80804258)
+
+96dc2be6 pipewireproduce.cpp: Add guard to m_stream
+a3afdd53 Destroy queued connection if no m_stream or m_encoder is found
+6de6cb8f Simplify code
+
+Co-authored-by: Akseli Lahtinen <akselmo@akselmo.dev>
+---
+ src/pipewireproduce.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/pipewireproduce.cpp b/src/pipewireproduce.cpp
+index 8fbf366..8bdcb91 100644
+--- a/src/pipewireproduce.cpp
++++ b/src/pipewireproduce.cpp
+@@ -152,9 +152,11 @@ void PipeWireProduce::deactivate()
+ {
+     m_deactivated = true;
+ 
+-    auto streamState = m_stream->state();
+-
+-    m_stream->setActive(false);
++    auto streamState = PW_STREAM_STATE_PAUSED;
++    if (m_stream) {
++        streamState = m_stream->state();
++        m_stream->setActive(false);
++    }
+ 
+     // If we have not been initialized properly before, ensure we still run any
+     // cleanup code and exit the thread, otherwise we risk applications not closing
+-- 
+GitLab
+
diff --git a/kde-plasma/kpipewire/files/kpipewire-6.1.4-dont-process-null-streams.patch b/kde-plasma/kpipewire/files/kpipewire-6.1.4-dont-process-null-streams.patch
new file mode 100644
index 000000000000..d04b15ef5e76
--- /dev/null
+++ b/kde-plasma/kpipewire/files/kpipewire-6.1.4-dont-process-null-streams.patch
@@ -0,0 +1,39 @@
+From dd08a7afd5957d8ae74cd0d1cb07d6e0f755ae9a Mon Sep 17 00:00:00 2001
+From: Aleix Pol Gonzalez <aleixpol@kde.org>
+Date: Mon, 19 Aug 2024 10:13:01 +0000
+Subject: [PATCH] sourcestream: Do not process null streams
+
+We have a callback that tells us that a stream has been destroyed and so
+we clean it up. Now we shouldn't process streams after this happened,
+otherwise we crash.
+
+
+(cherry picked from commit b526691684b004ff12fe52d8d86f77c21dedc996)
+
+Co-authored-by: Aleix Pol <aleixpol@kde.org>
+---
+ src/pipewiresourcestream.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/pipewiresourcestream.cpp b/src/pipewiresourcestream.cpp
+index f4fc63e..6f8242a 100644
+--- a/src/pipewiresourcestream.cpp
++++ b/src/pipewiresourcestream.cpp
+@@ -685,6 +685,14 @@ void PipeWireSourceStream::coreFailed(const QString &errorMessage)
+ 
+ void PipeWireSourceStream::process()
+ {
++#if !PW_CHECK_VERSION(0, 3, 73)
++    if (Q_UNLIKELY(!d->pwStream)) {
++        // Assuming it's caused by https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3314
++        qCDebug(PIPEWIRE_LOGGING) << "stream was terminated before processing buffer";
++        return;
++    }
++#endif
++
+     pw_buffer *buf = pw_stream_dequeue_buffer(d->pwStream);
+     if (!buf) {
+         qCDebug(PIPEWIRE_LOGGING) << "out of buffers";
+-- 
+GitLab
+
diff --git a/kde-plasma/kpipewire/kpipewire-6.1.4-r2.ebuild b/kde-plasma/kpipewire/kpipewire-6.1.4-r2.ebuild
new file mode 100644
index 000000000000..defd0cee287e
--- /dev/null
+++ b/kde-plasma/kpipewire/kpipewire-6.1.4-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Components relating to Flatpak pipewire use in Plasma"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 926511, fixed in 6.2
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	media-libs/libepoxy
+	media-libs/libglvnd
+	media-libs/libva:=
+	media-libs/mesa[opengl]
+	media-video/ffmpeg:=
+	>=media-video/pipewire-0.3:=
+	x11-libs/libdrm
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-libs/plasma-wayland-protocols
+		dev-libs/wayland
+		>=dev-qt/qtwayland-${QTMIN}:6
+		>=kde-plasma/kwayland-${PVCUT}:6
+		media-video/pipewire[extra]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	x11-themes/sound-theme-freedesktop
+"
+BDEPEND="test? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-avoid-segfault.patch"
+	"${FILESDIR}/${P}-dont-process-null-streams.patch"
+)
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index c08095b1d2a6..44d4bde1487f 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,9 @@
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
 AUX kwin-6.1.4-screenedge-dnd.patch 1347 BLAKE2B f54f43135efa888f9f7d42e440fdad98674f5eedc2513f96cebbdd5648f88ebe19dd5b388c6e3e9eeb11a9186268c83622c4ce7386bf541fa1da8d3c10363745 SHA512 c117a3550c7813f62e4dfb7f6a5bb2230e9b916e46db15907236c010d64335848d4439eaa360ed8729a418beac4034d6d4903b01e0e56f3d0469d2edcba3ecc3
 DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b
+DIST kwin-6.1.4-patchset.tar.xz 12252 BLAKE2B ced952cffbc5a1b077c94f39eb8af7e7f88716fd205c2079c16d610f4e01b2835368522bcc86f9b801210aef8cf4c266b31235378f9e29ef2f06a0866e69196c SHA512 db183d11db57fcf98431ea6391a5fbfc0d6a76dfacc6d9832145a00151167b75c916cc21435ee18e9549b4a4ce5dd8577d7d9f565f0f8f711c33b0b83c36e9b0
 DIST kwin-6.1.4.tar.xz 8499248 BLAKE2B f455ee5da1ab735237581b41c3a423e3768443270e294ee1bd974f3f59bc72adf9d67939a27761dff51c2781df5f278b2fcf40f3b768e4bffaa1712934932894 SHA512 f7d512e633ec153f19b2f76f781d67a6c5f9b97df81205cf6e3cca227185b2764ffa612f0d1c0a528a37964dfcf3c6ac060c062ae8d653997057555cfd477090
 EBUILD kwin-5.27.11-r2.ebuild 4351 BLAKE2B 8066146aebebf86bb00932f6ea8a90936e7d73b1d208c532bf8ea919abf9b12e7d9a23cb3197eb8955a018fae1f68569acea27f9ec8ab51a37cf7ff1ea48b457 SHA512 74db326cb10b54faede92389992c45ca933b5e10d27abc66fd05f300a0b39c311712041eb306d613588dfd98603cb8988656e1548c61da4682d3707a7295ff22
 EBUILD kwin-6.1.4-r1.ebuild 4281 BLAKE2B 9a048866f1c35ca2a06382dd134ae8d0440a128bead66bb9f840aecf46cc582110889ad82a0d6e1eb25c6acf84d1aa846701269e1e74261023f020054aec8762 SHA512 6d4c8ed104ba29367020a6b06201fb8ee5719f224368c6a5b992da5dd50f959e34e1c4b0b81b6682c4c2e2411b9df7b513dc2f441850bf037d8c109b513db906
+EBUILD kwin-6.1.4-r2.ebuild 4290 BLAKE2B 77dd0e73290c20865f551fd39ded43fd70c7d956192bffcee05bd084bfb67481db6ddfbcd9ad7587fa9b857d7536fc7a43690f253672a43a80f22c0eba64a409 SHA512 46814038756fb85748a10121785975caa10ab42b8d5eb07e855c753b5e3f62039ad8d7ba9d6e980fbbfbeeb12ca45ae1a9f887e078c729ca64cc7b7a6c4d00ac
 MISC metadata.xml 760 BLAKE2B 3592da53cc329bc726ca8d4a33e6f4af27fb40c0bf3ce4e4d30374b5a704d29bb787d9a9b84f5352deb9627130912a7832aa8d0c9261970a5179ecbafcba1a28 SHA512 20892d3ff5e1dd1980e83006ee3b07b06f48bc4f0af8d2204a41a62c7768552a14208d19408852c619b10b1e83deda93c9f7e4ca68c5ea9d1bf04312770c74cf
diff --git a/kde-plasma/kwin/kwin-6.1.4-r2.ebuild b/kde-plasma/kwin/kwin-6.1.4-r2.ebuild
new file mode 100644
index 000000000000..1e8ae01ae3ac
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.1.4-r2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.5.0 # bug 933271
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+PATCHSET="${P}-patchset"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility +caps gles2-only lock screencast +shortcuts systemd"
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in tabbox
+COMMON_DEPEND="
+	dev-libs/libei
+	>=dev-libs/libinput-1.19:=
+	>=dev-libs/wayland-1.22.0
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsensors-${QTMIN}:6
+	>=dev-qt/qtshadertools-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6=[X(+)]
+	>=kde-frameworks/kguiaddons-${KFMIN}:6[wayland]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6=[wayland]
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-plasma/breeze-${PVCUT}:6
+	>=kde-plasma/kdecoration-${PVCUT}:6
+	>=kde-plasma/kwayland-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libdisplay-info:=
+	media-libs/libepoxy
+	media-libs/libglvnd
+	>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXi
+	>=x11-libs/libdrm-2.4.116
+	>=x11-libs/libxcb-1.10:=
+	>=x11-libs/libxcvt-0.1.1
+	>=x11-libs/libxkbcommon-1.5.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:6 )
+	gles2-only? ( || (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[gles2]
+	) )
+	lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+	shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kdeplasma-addons:5
+	!kde-plasma/kwayland-server
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	|| (
+		dev-qt/qtmultimedia:6[ffmpeg]
+		(
+			dev-qt/qtmultimedia:6[gstreamer]
+			media-plugins/gst-plugins-soup:1.0
+		)
+	)
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6[wayland(+)]
+	sys-apps/hwdata
+	x11-base/xwayland[libei]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+	>=dev-libs/wayland-protocols-1.34
+	>=dev-qt/qttools-${QTMIN}:6[widgets]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	>=dev-qt/qtwayland-${QTMIN}:6
+	x11-base/xorg-proto
+	x11-libs/xcb-util-image
+	caps? ( sys-libs/libcap )
+	test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) )
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+"
+
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use systemd; then
+		sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: KWIN_BUILD_X11?
+		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
+		$(cmake_use_find_package accessibility QAccessibilityClient6)
+		$(cmake_use_find_package caps Libcap)
+		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+		-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index b3fdaef4140e..294e5cf4e0c3 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,9 +6,12 @@ AUX plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch 2591 BLAKE2B
 AUX plasma-workspace-6.1.4-fix-mediacontroller-1.patch 1373 BLAKE2B eaf2d564cfc8c430d06d5897a98c45acdbbaf0753b761a4e06eeb9ac70f5bea3afb85f0c64fc18bdf7abfb7d20f3b8a8e648d9097ac7433eba517e70b1d96ad6 SHA512 ca2a3843430f3bd407a5cf87145ca84fc411f88f51271ad120c38eb18dabb3ac738b5bb27d50a69183f1c23c0c056e2e3763443747b4865207f2f38aac8ab48f
 AUX plasma-workspace-6.1.4-fix-mediacontroller-2.patch 1987 BLAKE2B 8870c3a21575b64d47ca62f2488e1f6c9b0724105e0089c9b8e7d95653797bdad29ffa7422dad7395efdf03b2e6e6854ecc4b23c0c61c93d17ee626879b85fd6 SHA512 b44c7f3b0f216c6279627db5b4a59ff8167fc4583bca85978252d38f5878c976ca995b52ac4581cf0d07aafef9e21c2c440baed9dee912beba2d38fb63d1b484
 AUX plasma-workspace-6.1.4-fix-svg-images.patch 1275 BLAKE2B d47e2a77c33cd03429b7a9704f0e3102ea22d0feee339a48653038e3ab6bbcf7ae00faed9608e275d4697bd3eecab1748883ed0ef648fee4a28964b8c6174925 SHA512 c34c138037fc76306aa51d26a48c20796ad524cae973e7d403194a84e4f2a987b6b7bf8c788fa9c7da6250e3d2517f8c72a5c9c62556c0c496e74bd703f3f973
+AUX plasma-workspace-6.1.4-klipper-fix-copying-cells.patch 1233 BLAKE2B c824e6a46bb234a281b9974e050e92608042ba91af3fbdcc1518d6b45f2df7c47c63636cd78432f83e8fb0a84308108138fce0f952e3b57c859fed4b752dbd2b SHA512 2a637f58ad476c6a01fd67abd6c2b6e841346c567f2ee344895de8a183435896c2f186d55869c8199d479e1e9ac7273312532dce4319e6d7b324e9d3beedd4ce
 AUX plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch 1068 BLAKE2B 2f593499840a799e7683e599c2150f8c7e8f485b1ccb03c853915a4ec6cef1a9953f2d7b95bfac5a8b701d32c637b24201562d82aaaa3dc84450b1eb22f5aa10 SHA512 7d70cdbb370dbefe3721eb57ac66943db29f574401c5a47ec8c6ed897d928bb5e2d8f9e3bb608574c9e73f367d3f6db7dc85bf7f07dcd88be3b04b5336eb3981
+AUX plasma-workspace-6.1.4-xembedsniproxy-crash.patch 1184 BLAKE2B d38520d3d88af97812cb80a0d91b0499e4c60f3261f5caf552b4b7397d5047b2dffc9ecac37a1752148caaa7e998ea87b15240ed5d44a2ceb8fa916fada82640 SHA512 0193622c040816637278ff2bf62ab2b614be3c2e23830bd73277251213a99c4fab717d2b07278a5005c3d4be99deb454fe4435d1dcaa6492b2b50c71fddb8f45
 DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006
 DIST plasma-workspace-6.1.4.tar.xz 19294480 BLAKE2B c0ebf51f6f67f43a09dcffe40fae7114b6234719e56053f36600999e289eb42e5d2ca281da0259fa0c60f5b3a3cfef4a8bb912f48cbf05eefc60fb5bc48193ec SHA512 c7ac27c60e75998e2cc6abb96004ce2abd84b7a7978de4fc256bf06892fca818595e2a5dd505768bcce9be4103ccecbb34d82761c0f7be45a402ca6173e90f05
 EBUILD plasma-workspace-5.27.11.1-r1.ebuild 7049 BLAKE2B 9aa8f728e227338b85a7f351e47f73fa83844c4228644883d801d5da3965b430b8cfd57cfa4ad17acabf9535bb57e8c33da58ca9fca6b098ef414ebb96c879a7 SHA512 a81b272671b6f5eed5173dd3378e34534522dfec5aac040b4d2a1ff45bf0db2200fcbaccf7b6319be026a566af7aac92daa6fd2ee43aba57949e579b7233cda8
 EBUILD plasma-workspace-6.1.4-r1.ebuild 7168 BLAKE2B e8b42d176996edcf9fde59d7f0ba3900bc60c12b96d0e25678954383ee98b9bf400f34c850290902bd23fb3122f8f91f749c266c5bbf104f133d6541d31c845b SHA512 475e735aeff60c49b2f36a77056ef234da46d4ceee3810d7cdfbfb120a76f67c2927f6b609302ab09f98b15ae38165a6b35aea5e4d6faf08d690d5ae116fbc5d
+EBUILD plasma-workspace-6.1.4-r2.ebuild 7301 BLAKE2B c6c81ff09d14f852e08937551119ebd835717d74040d10a610f0aab074cf415d2a14e0387403b7ac157f48fa79d172b0ddca5fd96a438e344faa92f9ffe4bd12 SHA512 f6dd400ca9a199095707740228ddb4c816b95a1b4dd39df6e3c28d4dce14583d49db0884c62891f52dc420bef7fcaa24d175756713470f012b5c9cc990dd8f90
 MISC metadata.xml 1026 BLAKE2B 49c2bc5fdc752caf8f45ce982633df0542a008ba1ef0cc99d32b64d6cd73c237d9c98484cac16fa32210156a080e17ad365c2d4eeb81cd3e9a7dc2119b1f7395 SHA512 4cdf77f6be4ce18148936e2a7012b86c70cdcc9de8b99455b3db65a4a52990eb604082ca098cdaee5fe6762bb9d138861f687f8d5fbedb3f60eef7c7be3a42cb
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch
new file mode 100644
index 000000000000..310015c7d70f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch
@@ -0,0 +1,36 @@
+From fead4fa8174aeb6e61354390e9ddee4627b31166 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 23 Aug 2024 17:03:52 +0000
+Subject: [PATCH] klipper: fix copying cells when images are ignored
+
+When copying a cell to the clipboard, both the image and the plain text
+will be copied, and the plain text should be saved to the history when
+images are ignored.
+
+BUG: 491488
+FIXED-IN: 6.1.5
+
+
+(cherry picked from commit b83bc9a076fc0ae091f0df1eddce84d0d1dea5fd)
+
+Co-authored-by: Fushan Wen <qydwhotmail@gmail.com>
+---
+ klipper/klipper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
+index b41129d2e1b..24446e216ef 100644
+--- a/klipper/klipper.cpp
++++ b/klipper/klipper.cpp
+@@ -640,7 +640,7 @@ void Klipper::checkClipData(QClipboard::Mode mode, const QMimeData *data)
+     if (selectionMode && m_bSelectionTextOnly && !data->hasText())
+         return;
+ 
+-    if (m_bIgnoreImages && data->hasImage() && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) {
++    if (m_bIgnoreImages && data->hasImage() && !data->hasText() /*BUG 491488*/ && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) {
+         return;
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch
new file mode 100644
index 000000000000..58a367a386ae
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch
@@ -0,0 +1,34 @@
+From dec0608369e1fe50685ce94113681ec9ed1bc43c Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 13 Aug 2024 09:09:06 +0000
+Subject: [PATCH] xembedsniproxy: Guard against crash when xcb_query_tree_reply
+ is null
+
+BUG:491509
+FIXED-IN:6.1.5
+
+
+(cherry picked from commit 85eb56e174bf887ccb8311e8f1a871e1ec453e04)
+
+Co-authored-by: David Redondo <kde@david-redondo.de>
+---
+ xembed-sni-proxy/sniproxy.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp
+index 41e1fb0550c..21d74c566d5 100644
+--- a/xembed-sni-proxy/sniproxy.cpp
++++ b/xembed-sni-proxy/sniproxy.cpp
+@@ -76,6 +76,9 @@ static bool checkWindowOrDescendantWantButtonEvents(xcb_window_t window)
+     }
+     auto treeCookie = xcb_query_tree(connection, window);
+     UniqueCPointer<xcb_query_tree_reply_t> tree(xcb_query_tree_reply(connection, treeCookie, nullptr));
++    if (!tree) {
++        return false;
++    }
+     std::span<xcb_window_t> children(xcb_query_tree_children(tree.get()), xcb_query_tree_children_length(tree.get()));
+     return std::ranges::any_of(children, &checkWindowOrDescendantWantButtonEvents);
+ }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild
new file mode 100644
index 000000000000..6fdc40a5dfdb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop systemd telemetry +wallpaper-metadata"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+	dev-libs/icu:=
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtshadertools-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6=
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kded-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kunitconversion-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/prison-${KFMIN}:6[qml]
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-plasma/breeze-${PVCUT}:6
+	>=kde-plasma/kscreenlocker-${PVCUT}:6
+	>=kde-plasma/kwayland-${PVCUT}:6
+	>=kde-plasma/kwin-${PVCUT}:6
+	>=kde-plasma/layer-shell-qt-${PVCUT}:6
+	>=kde-plasma/libkscreen-${PVCUT}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	>=kde-plasma/plasma-activities-stats-${PVCUT}:6
+	>=kde-plasma/plasma5support-${PVCUT}:6
+	media-libs/libcanberra
+	>=media-libs/phonon-4.12.0[qt6]
+	sci-libs/libqalculate:=
+	sys-libs/zlib
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	appstream? ( >=dev-libs/appstream-1[qt6] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 )
+	fontconfig? (
+		media-libs/fontconfig
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+	gps? ( sci-geosciences/gpsd )
+	policykit? (
+		>=sys-auth/polkit-qt-0.175[qt6]
+		virtual/libcrypt:=
+	)
+	screencast? (
+		>=dev-qt/qtbase-${QTMIN}:6=[opengl]
+		>=kde-plasma/kpipewire-${PVCUT}:6
+		media-libs/libglvnd
+		>=media-video/pipewire-0.3:=
+		x11-libs/libdrm
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+	systemd? ( sys-apps/systemd:= )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+	wallpaper-metadata? ( kde-apps/libkexiv2:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+	dev-libs/qcoro[dbus]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/libkworkspace:5
+	!<kde-plasma/plasma-desktop-5.27.0:5
+	!kde-plasma/xembed-sni-proxy:*
+	app-text/iso-codes
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qttools-${QTMIN}:*[qdbus]
+	kde-apps/kio-extras:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kquickcharts-${KFMIN}:6
+	>=kde-plasma/kactivitymanagerd-${PVCUT}:6
+	>=kde-plasma/kde-cli-tools-${PVCUT}:*[kdesu]
+	>=kde-plasma/milou-${PVCUT}:6
+	>=kde-plasma/plasma-integration-${PVCUT}:6
+	sys-apps/dbus
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=dev-util/wayland-scanner-1.19.0
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+	test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] )
+"
+
+PATCHES=(
+	# TODO upstream: KDE-bug 432975, bug 767478
+	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch"
+	# upstream Plasma/6.1 branch (fixed in 6.1.5)
+	"${FILESDIR}/${P}-restart-unhide-timer-on-dnd.patch" # KDE-bug 450579
+	"${FILESDIR}"/${P}-fix-mediacontroller-{1,2}.patch # KDE-bug 490569
+	"${FILESDIR}/${P}-fix-svg-images.patch" # KDE-bug 491369
+	"${FILESDIR}/${P}-xembedsniproxy-crash.patch" # KDE-bug 491509
+	"${FILESDIR}/${P}-klipper-fix-copying-cells.patch" # KDE-bug 491488
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		ecm_punt_bogus_dep KPipeWire
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if use geolocation; then
+		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+			-i dataengines/geolocation/CMakeLists.txt || die
+	fi
+
+	if ! use policykit; then
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
+
+	if ! use fontconfig; then
+		ecm_punt_bogus_dep XCB IMAGE
+		sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use systemd; then
+		sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=ON # TODO: broken upstream, fix it if you can
+		-DGLIBC_LOCALE_GEN=$(usex policykit)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF6Holidays)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package geolocation KF6NetworkManagerQt)
+		$(cmake_use_find_package semantic-desktop KF6Baloo)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+		$(cmake_use_find_package wallpaper-metadata KExiv2Qt6)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${FILESDIR}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${FILESDIR}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/wacomtablet/Manifest b/kde-plasma/wacomtablet/Manifest
index f20554a79192..e3bfb09c1cac 100644
--- a/kde-plasma/wacomtablet/Manifest
+++ b/kde-plasma/wacomtablet/Manifest
@@ -1,9 +1,3 @@
-AUX wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch 1917 BLAKE2B be46610081082f1106803ab619be82ed2433913199e8507cd15284a7bd83bfc202bdcc3dad4a5d3a94d7268439189be02c1db838652b3ed2bf23340ca585bb68 SHA512 a465880d880cf8db0e889e0b605dccc689fa7c8e5f05970458265320764b725b3470e8e63d600c769145632d7917985567571d23af44dc1728738b75544fa9cf
-AUX wacomtablet-3.2.0-missing-include.patch 643 BLAKE2B 29e0991458acf87affaf6994fb9fa5191dc3212853af0082eee704f745d60ed208acb72127e5ed1c40cd67e42521d21794094e588f4cf45a74211a4f94cf81c8 SHA512 e1ab6720ea2261622d648c3ad770025e0f99b94ab060f673a2d7c6630b7b0574ac6910408a03df802c8894747e318c62d1e70a2dbd4623a478619eaa1f1b322c
-AUX wacomtablet-3.2.0-port-to-QRegularExpression.patch 6430 BLAKE2B bd2cd551009972942af339726b568a4cc9d1bcc60825a5c1fd6075c5ce155f8a0d47e78981a98412908244f0d31a9db3343009156854e147869531c70abaf53c SHA512 927dbaa487d891e5ab73f6b83cd4d5fa492b6c62a1aa847dbfcb2f268deabd99687f4b377c0cfcf48efd38536ce0d34b478756b658c2a0e1f84d1ca03e56fe75
-DIST wacomtablet-3.2.0-patchset-1.tar.xz 7796 BLAKE2B 4fa998a0f4376579d1e0d06a8aa9edababedca22d579dbdae651eee3699decc880a7a1d277f04c2bc24adba87908c07ab711989a5985b68af5b295d3b3260d33 SHA512 ff96f05831e4760ce99920061f0dc927aa6a2d5ef4b7443c3129bb1431262cb4bc1434097595976672393e3b611438014ccb528fc948e7c0407fc9a2d52ade8d
-DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6
 DIST wacomtablet-6.1.4.tar.xz 829624 BLAKE2B 1bf333ef012e65dcedf62a211eaab479caa73fafd73b46d89984582fc0aa8a469d2269b695d2cf74cef23010d010a1fbb66f86e5e82ab2cef86d820076270fab SHA512 c9e9d1dac0d44b6db9ce847908cfda9351fcf023b9f2f787d8c39b32ae74b805348c1e3dd35d7ac4432421ba5269ee6a6686ea46a2769df4a625034a4daba673
-EBUILD wacomtablet-3.2.0-r3.ebuild 2279 BLAKE2B 0e0bbccfb1d5bfcb1402fa36c94effac1e16afc41abe7bde129f6cd4df827bcd5f413fd419aa5f7e403a81724f7e5d06f9408cdb84d1cae7eca5e62242de3d26 SHA512 0bc5673f08afe6f0c2cad6deb45d450d57a57c10645edf9940870493ef316fbc03649eff7c7d06ff258c0c0908522bac7e673b374275c88594e3c7607b4d2620
 EBUILD wacomtablet-6.1.4.ebuild 1444 BLAKE2B 4755ecd9136b8b4620a6ccf4bcd52bad4976f106a7105e9038c4bd006fc36163999b3ba950bf26621baab66bf4f5192c33512130a38fe01f13d4db9b5971d11d SHA512 c0bd7b64eebeb54271a6521c757e2a4f735bf73a4d5f0bc484ce5199dcc0b40388499bdbc0a8caaa4445dd1421551d3c285fdc122f69b16cc785f10718131e72
 MISC metadata.xml 380 BLAKE2B 683aba479ac043f8d6c5e3ece7db3c73dd64c7ecf36038e480c4f6e50cbf13fc503e8ad64b219346454bc113b1f8fdb43a731f092c1e536e39bd0b0e14459b39 SHA512 3ba6bcf82d48997a530f58c2c6f9988771fd4d8a5c815bded87a13ab385b85580467fee67f1f5c9caf73702a6dc69e6a128124fc084faee768566d3f8721412d
diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch
deleted file mode 100644
index 9434b0082569..000000000000
--- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 32c78782b3061bab2a3b1457133faf77b6d9ed2a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 14 Nov 2022 02:57:07 +0100
-Subject: [PATCH] Fix incorrect xsetwacom call
-
-When param is e.g. 'Button 1' the 'Button' and '1' need to be passed as separate arguments
-
-BUG: 454947
----
- src/kded/xsetwacomadaptor.cpp | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
-index 934fa8b..fc1bcac 100644
---- a/src/kded/xsetwacomadaptor.cpp
-+++ b/src/kded/xsetwacomadaptor.cpp
-@@ -245,10 +245,18 @@ bool XsetwacomAdaptor::setRotation(const QString& value)
- bool XsetwacomAdaptor::setParameter(const QString &device, const QString &param, const QString &value) const
- {
-     QProcess setConf;
--    if (!value.isEmpty()) {
--        setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value);
-+
-+    // https://bugs.kde.org/show_bug.cgi?id=454947
-+    static const QRegularExpression buttonWithNumber(QStringLiteral("^Button \\d+$"));
-+    if (param.contains(buttonWithNumber)) {
-+        const QStringList splitted = param.split(QLatin1Char(' '));
-+        setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << splitted[0] << splitted[1] << value);
-     } else {
--        setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param);
-+        if (!value.isEmpty()) {
-+            setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value);
-+        } else {
-+            setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param);
-+        }
-     }
- 
-     if (!setConf.waitForStarted() || !setConf.waitForFinished()) {
--- 
-GitLab
-
diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch
deleted file mode 100644
index 4ab144beabd4..000000000000
--- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c6bdd5a15c2e200aae6a7fe3597bbf11691e7e5f Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 6 Jun 2023 23:24:07 +0200
-Subject: [PATCH] Add missing include
-
----
- autotests/faketablet/faketablet.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/autotests/faketablet/faketablet.cpp b/autotests/faketablet/faketablet.cpp
-index 076a8d18..bf9e4904 100644
---- a/autotests/faketablet/faketablet.cpp
-+++ b/autotests/faketablet/faketablet.cpp
-@@ -20,6 +20,7 @@
- #include <iostream>
- #include <cstring>
- #include <cstdio>
-+#include <cstdint>
- #include <cstdlib>
- #include <csignal>
- #include <unistd.h>
--- 
-GitLab
-
diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch
deleted file mode 100644
index e86f97cfaef4..000000000000
--- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 9c2f133ee400562ca9813e329f6e2bdae24a5ac5 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 4 Aug 2022 22:43:07 +0200
-Subject: [PATCH] Port from QRegExp to QRegularExpression
-
----
- src/common/buttonshortcut.cpp | 33 ++++++++++++++++++++-------------
- src/kded/xsetwacomadaptor.cpp | 17 +++++++++++------
- 2 files changed, 31 insertions(+), 19 deletions(-)
-
-diff --git a/src/common/buttonshortcut.cpp b/src/common/buttonshortcut.cpp
-index e11784f..32bf842 100644
---- a/src/common/buttonshortcut.cpp
-+++ b/src/common/buttonshortcut.cpp
-@@ -19,7 +19,7 @@
- 
- #include "buttonshortcut.h"
- 
--#include <QRegExp>
-+#include <QRegularExpression>
- #include <QKeySequence>
- 
- #include <KLocalizedString>
-@@ -266,8 +266,8 @@ bool ButtonShortcut::set(const QString& sequence)
-         return true;
-     }
- 
--    QRegExp modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), Qt::CaseInsensitive);
--    QRegExp buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), Qt::CaseInsensitive);
-+    static const QRegularExpression modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), QRegularExpression::CaseInsensitiveOption);
-+    static const QRegularExpression buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), QRegularExpression::CaseInsensitiveOption);
- 
-     if (seq.contains(buttonRx)) {
-         // this is a button
-@@ -388,7 +388,8 @@ void ButtonShortcut::convertToNormalizedKeySequence(QString& sequence, bool from
- {
-     normalizeKeySequence(sequence);
- 
--    QStringList keyList    = sequence.split (QRegExp (QLatin1String ("\\s+")), Qt::SkipEmptyParts);
-+    static const QRegularExpression rx(QStringLiteral("\\s+"));
-+    QStringList keyList    = sequence.split (rx, Qt::SkipEmptyParts);
-     bool        isFirstKey = true;
- 
-     sequence.clear();
-@@ -460,28 +461,33 @@ void ButtonShortcut::normalizeKeySequence(QString& sequence) const
- {
-     // When setting a shortcut like "ctrl+x", xsetwacom will convert it to "key +ctrl +x -x"
-     // therefore we just truncate the string on the first "-key" we find.
--    QRegExp minusKeyRx (QLatin1String ("(^|\\s)-\\S"));
--    int     pos = 0;
-+    static const QRegularExpression minusKeyRx (QLatin1String ("(^|\\s)-\\S"));
- 
--    if ((pos = minusKeyRx.indexIn(sequence, 0)) != -1) {
--        sequence = sequence.left(pos);
-+    const QRegularExpressionMatch minusKeyRxMatch = minusKeyRx.match(sequence);
-+
-+    if (minusKeyRxMatch.hasMatch()) {
-+        sequence = sequence.left(minusKeyRxMatch.capturedStart());
-     }
- 
-     // cleanup leading "key " identifier from xsetwacom sequences
--    sequence.remove(QRegExp (QLatin1String ("^\\s*key\\s+"), Qt::CaseInsensitive));
-+    static const QRegularExpression leadingKey(QStringLiteral("^\\s*key\\s+"), QRegularExpression::CaseInsensitiveOption);
-+    sequence.remove(leadingKey);
- 
-     // Remove all '+' prefixes from keys.
-     // This will convert shortcuts like "+ctrl +alt" to "ctrl alt", but not
-     // shortcuts like "ctrl +" which is required to keep compatibility to older
-     // (buggy) configuration files.
--    sequence.replace(QRegExp (QLatin1String ("(^|\\s)\\+(\\S)")), QLatin1String ("\\1\\2"));
-+    static const QRegularExpression plusPrefixes(QStringLiteral("(^|\\s)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption);
-+    sequence.replace(plusPrefixes, QLatin1String ("\\1\\2"));
- 
-     // Cleanup plus signs between keys.
-     // This will convert shortcuts like "ctrl+alt+shift" or "Ctrl++" to "ctrl alt shift" or "Ctrl +".
--    sequence.replace (QRegExp (QLatin1String ("(\\S)\\+(\\S)")), QLatin1String ("\\1 \\2"));
-+    static const QRegularExpression cleanupPlus(QStringLiteral("(\\S)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption);
-+    sequence.replace (cleanupPlus, QLatin1String ("\\1 \\2"));
- 
-     // replace multiple whitespaces with one
--    sequence.replace (QRegExp (QLatin1String ("\\s{2,}")), QLatin1String (" "));
-+    static const QRegularExpression whitespaces(QStringLiteral("\\s{2,}"), QRegularExpression::CaseInsensitiveOption);
-+    sequence.replace (whitespaces, QLatin1String (" "));
- 
-     // trim the string
-     sequence = sequence.trimmed();
-@@ -500,7 +506,8 @@ void ButtonShortcut::prettifyKey(QString& key) const
- bool ButtonShortcut::setButtonSequence(const QString& buttonSequence)
- {
-     QString buttonNumber = buttonSequence;
--    buttonNumber.remove(QRegExp (QLatin1String ("^\\s*button\\s+"), Qt::CaseInsensitive));
-+    static const QRegularExpression rx(QStringLiteral("^\\s*button\\s+"), QRegularExpression::CaseInsensitiveOption);
-+    buttonNumber.remove(rx);
- 
-     bool ok     = false;
-     int  button = buttonNumber.toInt(&ok);
-diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
-index a39f307..934fa8b 100644
---- a/src/kded/xsetwacomadaptor.cpp
-+++ b/src/kded/xsetwacomadaptor.cpp
-@@ -27,7 +27,7 @@
- #include "tabletarea.h"
- 
- #include <QProcess>
--#include <QRegExp>
-+#include <QRegularExpression>
- 
- using namespace Wacom;
- 
-@@ -142,10 +142,13 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
-     QString modifiedParam = param.key();
- 
-     // convert tablet button number to hardware button number
--    QRegExp rx(QLatin1String("^Button\\s*([0-9]+)$"), Qt::CaseInsensitive);
-+    static const QRegularExpression rx(QLatin1String("^Button\\s*([0-9]+)$"), QRegularExpression::CaseInsensitiveOption);
-+
-+    const QRegularExpressionMatch match = rx.match(modifiedParam);
-+
-+    if (match.hasMatch()) {
-+        QString hwButtonNumber = match.captured(1);
- 
--    if (rx.indexIn(modifiedParam, 0) != -1) {
--        QString hwButtonNumber = rx.cap(1);
-         QString kernelButtonNumber;
- 
-         if (!d->buttonMap.isEmpty()) {
-@@ -167,9 +170,11 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
- 
- void XsetwacomAdaptor::convertButtonShortcut (const XsetwacomProperty& property, QString& value) const
- {
--    QRegExp rx (QLatin1String("^Button\\s*[0-9]+$"), Qt::CaseInsensitive);
-+    static const QRegularExpression rx(QLatin1String("^Button\\s*[0-9]+$"), QRegularExpression::CaseInsensitiveOption);
-+
-+    const QRegularExpressionMatch match = rx.match(property.key());
- 
--    if (rx.indexIn(property.key(), 0) != -1) {
-+    if (match.hasMatch()) {
-         ButtonShortcut buttonshortcut(value);
-         value = buttonshortcut.toString();
-     }
--- 
-GitLab
-
diff --git a/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild b/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild
deleted file mode 100644
index 7fd90c74d4a8..000000000000
--- a/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Wacom system settings module that supports different button/pen layout profiles"
-HOMEPAGE="https://userbase.kde.org/Wacomtablet"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-libs/libwacom-0.30:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${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
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libplasma-${KFMIN}:5
-	>=x11-drivers/xf86-input-wacom-0.20.0
-	x11-libs/libXi
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libX11
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${WORKDIR}/${P}-qt-5.15.patch"
-	"${WORKDIR}/${P}-qt-5.15-obsoletions.patch"
-	"${WORKDIR}/${P}-no-override-screenspace-w-missing-screen.patch" # KDE-bug 419392
-	"${WORKDIR}/${P}-fix-xsetwacom-adapter.patch"
-	"${WORKDIR}/${P}-Intuos-M-bluetooth.patch" # KDE-bug 418827
-	"${WORKDIR}/${P}-correct-icons.patch"
-	"${WORKDIR}/${P}-drop-empty-X-KDE-PluginInfo-Depends.patch"
-	"${WORKDIR}/${P}-fix-QProcess-invocation.patch"
-	"${WORKDIR}/${P}-turn-off-gesture-support-by-default.patch" # KDE-bug 440556
-	"${WORKDIR}/${P}-only-show-on-X11.patch"
-	"${FILESDIR}/${P}-port-to-QRegularExpression.patch" # pre-requisite for below:
-	"${FILESDIR}/${P}-fix-incorrect-xsetwacom-call.patch" # bug 850652, KDE-bug 454947
-	"${FILESDIR}/${P}-missing-include.patch" # bug 920043
-)
-
-CMAKE_SKIP_TESTS=(
-	# test needs DBus, bugs 675548, 920558
-	Test.KDED.DBusTabletService
-	Test.KDED.TabletHandler
-	Test.KDED.XInputAdaptor # SEGFAULT
-	Test.KDED.XsetWacomAdaptor # SEGFAULT
-)