gentoo auto-resync : 12:03:2025 - 01:49:51HEADmaster

8 files changed, 59 insertions, 390 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 5eb888a45e13..9f5477f3387a 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,9 +1,7 @@
-AUX kwin-6.3.2.1-another-crashfix.patch 1173 BLAKE2B 7ffeef99ab6b77d8f8d80b573b19b18a514126c16d5e48ea49b7f5b7bab3ea0dbb532505fba0b929763b83a4a0e4f8c2aec990179e6b7a85b10871a05180b3ed SHA512 dcfda9e4ff06419722cb7afe25369b6da4a10474a886b0867349384f1efff5b8853a698374fdffb2684328ddae160412965d7dce4c17c3e957d18cd167be9ff5
-AUX kwin-6.3.2.1-crashfix.patch 1759 BLAKE2B c8965b00b54cb34374811a8c051c9c54da98900662a121916c61873bdf6ced4fc94673401384bf3b5e1dd39bcebf82e603d62b46f3fd0fde5c1977c76389fa07 SHA512 ad6fa8a4968562d9d56a320885ea3efdbaa0544e5d1a975ff1268129c0d64bf4020b7e13e8577085b5f85164c15e5099718567e84eba7c8b8eb69da80bbecf79
+AUX kwin-6.3.3-remove-pragma.patch 858 BLAKE2B b3be15d6ee083e0626850a8113c1e14549b4bb21b532fc4eeb9f4cb99932d7fc5364f60b069a9b93a206c338b100854b940f70475f3a6cebb095c765f6ef0d9a SHA512 5efb2fc90ee819f45aa02d17d0ce8bb4977e77e52b44a150cb8e9e8175af47341c6e8d357417f2bd53d7184c70db43f77f44847344ef5dc6606c8171b0d028d0
+AUX kwin-6.3.3-version.patch 655 BLAKE2B 171e7e60d90d4f0e9e49acaf2adaba4d7dd526e132f993a2816d6abaf0e6ba225cb1d5f0d082ef9e5d5f4cb854875a20f2e74a2bb69c5a492a93c23e31fa59e2 SHA512 44c72786fd102afc834d912a6ffa8b1872381bcf4fcf5393126c0636c182f9e4977285d9529335238bfd35fe3fe6b5509ecdf893a6b027c9cb6a435377499fe4
 DIST kwin-6.2.5.tar.xz 8563352 BLAKE2B 9a1ac80c337722d6a6411c338ac31f14f542f6d84505cc65c66e1ceedea2b88cbc9dabba68c42acf5dbace28b62e04cadc09a010a7972bc5ceb22d79344033fe SHA512 06a78d41003f2fb676f3cadca21a1e26a0006b78dcd9188c09d92fbc45f934aa9e923a69013b1cb496396d924a1848feb136d3016d64e14eca9cc525743b095b
-DIST kwin-6.3.2.1.tar.xz 8869196 BLAKE2B 2f1578278c8c977cbd6e1f149e6bd83290779242a1cddad8596e8a7f71f5a439ea65f681772aff0dcd47c6d2283a50c5474f82f0bab606c31bd072b75de8f698 SHA512 551e3860babe05d69f267075fa4cd99b4ce8864717b62f99e09febc63df500c7d355e2f4d59d911e833023e43eb85f9c0fd02190622c26f5361d2b7bdb785894
+DIST kwin-6.3.3.tar.xz 8968752 BLAKE2B 7e27db7b93ec4b37bb139adf2e37a969525ed37b7a4ac51e529129ca433891afdd262ccf65a1bbcc9baf885c94ccefcdf397302a291b146117247110eb5c25f0 SHA512 1504a71162e90f458a42e86646e816234c4aa98b1bb884670545ae9e47b6d567d6b27dd09ac6a7337f84cb06db28d2c43e7997d0a65c9a3ac243ede8715183ea
 EBUILD kwin-6.2.5.ebuild 4338 BLAKE2B 7d9ee1ed1aa206230a23efdbb00a9a12b3094ee803bc5dabc74baf5dfdfa325f56a93194e2ecb24863266271973ef3bb011d4fd4acaf595f445f5a4edba5a184 SHA512 044f0f5e4336069826772e335264d5968a620acad76fe73f8d9debe88bf51ac87ed5e980286a3089aaa17c99ef677c88fb7fd6ca7906455470d560eb8a5ea285
-EBUILD kwin-6.3.2.1-r1.ebuild 4515 BLAKE2B b9153bfda63b53099d287e6d426ef57e910f6f478d5a717c8888b24c5fca298ff09fd52f669d8cdb2ba0ae850b831273bc09dcfbcfa9d8b158ee62f0ca735d93 SHA512 c3d9de64dba2e88228488762805b15d1733ca5a546655859850caa971ad7cd748277dcbade559e7edeb7634f12b470da8c5a8b28f2c561b28ae7dc4ce27ad15b
-EBUILD kwin-6.3.2.1-r2.ebuild 4559 BLAKE2B 1db6f27c330971774ca51dabdc451ed7e259b4204e547b43291bf9418a6c9b2cd65c0c284512ed05d6f9b4fa2452405ce8a289dce56ed5d84f1c518a92db15d4 SHA512 81cf98d0b87b882ac4b91b70dbd2ae16f38c648319adffa8869a8d26e22be7783661d72cfef5b1f26d491d2f8263429f3980910d9964a60aa0307bc4cf943bbe
-EBUILD kwin-6.3.2.1.ebuild 4468 BLAKE2B 77ee10c8d0900f1dbbd6eccd15f9543a5d2989c35872fc5409df7414b4c0289386d99b1f8f2d50e4e8b28b0fb71efff48fba8243ba40b606a13d830e95a6c261 SHA512 cdb79fe87a8f45d5e790e50670e6f4f9ddc1b697a34aad12da5ca35b1ac82c05c1119d09a910327fa9ef7ee783d876e8ea827c140bb000b82b66562ac8e9f3b4
+EBUILD kwin-6.3.3.ebuild 4605 BLAKE2B 90dc4c7d9d65a00d5618aa96c8897d5994a4e8354fe116d19865ae1c893aa198f2db8a7ac8bf2e757e622129a8ad7082950224d8266489b3b09df1f47a54adc7 SHA512 ea427aabf02dc50139b4ee6d2cbbc269c3b4074a22395ab16d578ecc9b33365ed0df7b42382ab6f9b5cac829546edc4c0bb114abc0e7005bb16569a6986d8ed0
 MISC metadata.xml 677 BLAKE2B 050345f8f8f489b3cb81e112c05fddedc738c8f136d409b8754c54494a02caf5671a66dd1ecd7cfb91f24ab11210c67f78c09c928a4daf16b3512600649551c5 SHA512 5134373a0ce30f351344c07df4a68f97a15bf3bdb061ba8ff3355a42da2281d64bb506cdcb5b1dad698fc2061b4a4a92e054e08c521acb327b84f968a7d936dc
diff --git a/kde-plasma/kwin/files/kwin-6.3.2.1-another-crashfix.patch b/kde-plasma/kwin/files/kwin-6.3.2.1-another-crashfix.patch
deleted file mode 100644
index 7a0330c4deed..000000000000
--- a/kde-plasma/kwin/files/kwin-6.3.2.1-another-crashfix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.kde.org/show_bug.cgi?id=501181
-
-(This is a minimal backport of https://invent.kde.org/plasma/kwin/-/commit/e652bdd3118fa55563caf0125deb0999f5ebd503,
-but given the next release is on Tuesday, let's just go with the thing that
-is confirmed to work.)
-
-From d63e308604d6b45f5c572acd4f299e2c5cfbab44 Mon Sep 17 00:00:00 2001
-From: Mike Lothian <mike@fireburn.co.uk>
-Date: Fri, 7 Mar 2025 15:24:00 +0000
-Subject: [PATCH] Quick fix
-
----
- src/backends/drm/drm_gpu.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/backends/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp
-index 4599b3d..a47f5ce 100644
---- a/src/backends/drm/drm_gpu.cpp
-+++ b/src/backends/drm/drm_gpu.cpp
-@@ -443,6 +443,10 @@ DrmPipeline::Error DrmGpu::testPendingConfiguration()
- 
- DrmPipeline::Error DrmGpu::testPipelines()
- {
-+    if (m_pipelines.isEmpty()) {
-+        // nothing to do
-+        return DrmPipeline::Error::None;
-+    }
-     QList<DrmPipeline *> inactivePipelines;
-     std::copy_if(m_pipelines.constBegin(), m_pipelines.constEnd(), std::back_inserter(inactivePipelines), [](const auto pipeline) {
-         return pipeline->enabled() && !pipeline->active();
--- 
-2.48.1
-
-
diff --git a/kde-plasma/kwin/files/kwin-6.3.2.1-crashfix.patch b/kde-plasma/kwin/files/kwin-6.3.2.1-crashfix.patch
deleted file mode 100644
index ef481cc513f3..000000000000
--- a/kde-plasma/kwin/files/kwin-6.3.2.1-crashfix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit b97892417ec1649c780e85e403842a77a6ab87b6
-Author: Xaver Hugl <xaver.hugl@gmail.com>
-Date:   Wed Feb 26 12:58:09 2025 +0100
-
-    backends/drm: fix testing for more connectors than CRTCs
-    
-    The connectors may not actually be enabled, so the checks could sometimes result in
-    wrongly returning Error::NotEnoughCrtcs.
-    
-    BUG: 500819
-    CCBUG: 500797
-    
-    (cherry picked from commit aa11d89a90bc4eb77bfe191a2cadede4d957d2a9)
-
-diff --git a/src/backends/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp
-index 9291b5296d..4599b3dc46 100644
---- a/src/backends/drm/drm_gpu.cpp
-+++ b/src/backends/drm/drm_gpu.cpp
-@@ -345,15 +345,7 @@ void DrmGpu::removeOutputs()
- 
- DrmPipeline::Error DrmGpu::checkCrtcAssignment(QList<DrmConnector *> connectors, const QList<DrmCrtc *> &crtcs)
- {
--    if (connectors.isEmpty() || crtcs.isEmpty()) {
--        if (m_pipelines.isEmpty()) {
--            // nothing to do
--            return DrmPipeline::Error::None;
--        }
--        if (!connectors.empty()) {
--            // we have no crtcs left to drive the remaining connectors
--            return DrmPipeline::Error::InvalidArguments;
--        }
-+    if (connectors.isEmpty()) {
-         return testPipelines();
-     }
-     auto connector = connectors.takeFirst();
-@@ -363,6 +355,10 @@ DrmPipeline::Error DrmGpu::checkCrtcAssignment(QList<DrmConnector *> connectors,
-         pipeline->setCrtc(nullptr);
-         return checkCrtcAssignment(connectors, crtcs);
-     }
-+    if (crtcs.isEmpty()) {
-+        // we have no crtc left to drive this connector
-+        return DrmPipeline::Error::InvalidArguments;
-+    }
-     DrmCrtc *currentCrtc = nullptr;
-     if (m_atomicModeSetting) {
-         // try the crtc that this connector is already connected to first
diff --git a/kde-plasma/kwin/files/kwin-6.3.3-remove-pragma.patch b/kde-plasma/kwin/files/kwin-6.3.3-remove-pragma.patch
new file mode 100644
index 000000000000..556a41681423
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.3.3-remove-pragma.patch
@@ -0,0 +1,29 @@
+From a3249e495907f0090119fc92e5d33530e0c4c285 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+Date: Tue, 11 Mar 2025 20:48:15 +0100
+Subject: [PATCH] kcms/rules: Remove pragma on OptionsComboBox
+
+It is suggested by qmlls, but this seems to cause graphical artifacts
+on some systems, rendering the comboboxes unusable
+
+BUG: 501357
+---
+ src/kcms/rules/ui/OptionsComboBox.qml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/kcms/rules/ui/OptionsComboBox.qml b/src/kcms/rules/ui/OptionsComboBox.qml
+index 5a5d02eee9..d8a2eb8bf0 100644
+--- a/src/kcms/rules/ui/OptionsComboBox.qml
++++ b/src/kcms/rules/ui/OptionsComboBox.qml
+@@ -11,8 +11,6 @@ import QtQuick.Controls as QQC2
+ import org.kde.kirigami 2.10 as Kirigami
+ import org.kde.kcms.kwinrules
+ 
+-pragma ComponentBehavior: Bound
+-
+ 
+ QQC2.ComboBox {
+     id: optionsCombo
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-6.3.3-version.patch b/kde-plasma/kwin/files/kwin-6.3.3-version.patch
new file mode 100644
index 000000000000..cfb544b4d7fc
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.3.3-version.patch
@@ -0,0 +1,24 @@
+From 0005710eccdf702915ec776830c79102a6b66f1b Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Tue, 25 Feb 2025 16:45:29 +0000
+Subject: [PATCH] update version for new release
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6ab65f06bf8..61932a493c1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+-set(PROJECT_VERSION "6.3.2") # Handled by release scripts
++set(PROJECT_VERSION "6.3.3") # Handled by release scripts
+ project(KWin VERSION ${PROJECT_VERSION})
+ 
+ set(CMAKE_C_STANDARD 99)
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-6.3.2.1-r1.ebuild b/kde-plasma/kwin/kwin-6.3.2.1-r1.ebuild
deleted file mode 100644
index 1f63d7f5a050..000000000000
--- a/kde-plasma/kwin/kwin-6.3.2.1-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.10.0
-QTMIN=6.8.1
-inherit ecm fcaps plasma.kde.org xdg
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
-
-RESTRICT="test"
-
-# qtbase slot op: GuiPrivate use in tabbox
-COMMON_DEPEND="
-	dev-libs/libei
-	>=dev-libs/libinput-1.27:=
-	>=dev-libs/wayland-1.23.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
-	>=dev-qt/qtsvg-${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-${KDE_CATV}:6
-	>=kde-plasma/kdecoration-${KDE_CATV}:6
-	>=kde-plasma/kwayland-${KDE_CATV}:6
-	>=kde-plasma/plasma-activities-${KDE_CATV}:6
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libcanberra
-	>=media-libs/libdisplay-info-0.2.0:=
-	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 )
-	lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 )
-	screencast? ( >=media-video/pipewire-1.2.0:= )
-	shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/kdeplasma-addons:5
-	>=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/aurorae-${KDE_CATV}:6
-	>=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)]
-	sys-apps/hwdata
-	>=x11-base/xwayland-23.1.0[libei]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.16.0
-	>=dev-libs/wayland-protocols-1.38
-	>=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
-	test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
-"
-BDEPEND="
-	>=dev-qt/qtwayland-${QTMIN}:6
-	dev-util/wayland-scanner
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-"
-
-# https://bugs.gentoo.org/941628
-# -m 0755 to avoid suid with USE="-filecaps"
-FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland )
-
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
-
-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
-
-	cmake_run_in src/plugins cmake_comment_add_subdirectory kdecorations
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: KWIN_BUILD_X11=$(usex xwayland) KWIN_BUILD_X11_BACKEND=$(usex X)
-		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
-		$(cmake_use_find_package accessibility QAccessibilityClient6)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
-		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
-		-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	fcaps_pkg_postinst
-}
diff --git a/kde-plasma/kwin/kwin-6.3.2.1.ebuild b/kde-plasma/kwin/kwin-6.3.2.1.ebuild
deleted file mode 100644
index ad356a50bab6..000000000000
--- a/kde-plasma/kwin/kwin-6.3.2.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.10.0
-QTMIN=6.8.1
-inherit ecm fcaps plasma.kde.org xdg
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
-
-RESTRICT="test"
-
-# qtbase slot op: GuiPrivate use in tabbox
-COMMON_DEPEND="
-	dev-libs/libei
-	>=dev-libs/libinput-1.27:=
-	>=dev-libs/wayland-1.23.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
-	>=dev-qt/qtsvg-${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-${KDE_CATV}:6
-	>=kde-plasma/kdecoration-${KDE_CATV}:6
-	>=kde-plasma/kwayland-${KDE_CATV}:6
-	>=kde-plasma/plasma-activities-${KDE_CATV}:6
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libcanberra
-	>=media-libs/libdisplay-info-0.2.0:=
-	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 )
-	lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 )
-	screencast? ( >=media-video/pipewire-1.2.0:= )
-	shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/kdeplasma-addons:5
-	>=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/aurorae-${KDE_CATV}:6
-	>=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)]
-	sys-apps/hwdata
-	>=x11-base/xwayland-23.1.0[libei]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.16.0
-	>=dev-libs/wayland-protocols-1.38
-	>=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
-	test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
-"
-BDEPEND="
-	>=dev-qt/qtwayland-${QTMIN}:6
-	dev-util/wayland-scanner
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-"
-
-# https://bugs.gentoo.org/941628
-# -m 0755 to avoid suid with USE="-filecaps"
-FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland )
-
-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
-
-	cmake_run_in src/plugins cmake_comment_add_subdirectory kdecorations
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: KWIN_BUILD_X11=$(usex xwayland) KWIN_BUILD_X11_BACKEND=$(usex X)
-		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
-		$(cmake_use_find_package accessibility QAccessibilityClient6)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
-		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
-		-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	fcaps_pkg_postinst
-}
diff --git a/kde-plasma/kwin/kwin-6.3.2.1-r2.ebuild b/kde-plasma/kwin/kwin-6.3.3.ebuild
index 1c265dfd90bd..6dad38dd8eb3 100644
--- a/kde-plasma/kwin/kwin-6.3.2.1-r2.ebuild
+++ b/kde-plasma/kwin/kwin-6.3.3.ebuild
@@ -116,8 +116,8 @@ BDEPEND="
 FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland )
 
 PATCHES=(
-	"${FILESDIR}/${P}-crashfix.patch"
-	"${FILESDIR}/${P}-another-crashfix.patch"
+	"${FILESDIR}/${P}-version.patch" # temp. downstream fix
+	"${FILESDIR}/${P}-remove-pragma.patch" # MR 7317, KDE-Bug: 501357
 )
 
 src_prepare() {