gentoo auto-resync : 15:01:2023 - 17:55:24

14 files changed, 90 insertions, 132 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 988852c370d4..e4bdef893e33 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 7100a5d45d39..b9e203e1385b 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.25.5.tar.xz 175988 BLAKE2B 1dd5c25409e28a793b1fc073074974fc4600fc3d683e2296768daf058bd32b9fab08e940beb859cca9543eaa53fbe11201c491f82a3faf8aced9d221f8a2c294 SHA512 80bc69729b5f905743d7bc1923577eafcd9c3b2b8c51c0267b75e79053dd2437cfa47d95dcf36e3cc32b03673fd3ea92a69e5d3ce81d577e1d5884953317afb6
 DIST bluedevil-5.26.5.tar.xz 318640 BLAKE2B 438e3d838e34b98d097fee3a88062ebbe50f53f451b5d0521dee12c787dad1b028f42a5be88b9b082382b67c8b6277f53bad3295089d7250b47b477a3dff587c SHA512 7bb514056e8329893ec8820441f733e879d09565d724a6e13df1af3daab5f6c976ad8179c58de7e25c4f9082e71b52da31f82ad6510ab78ac02d7afc2e9226ba
 EBUILD bluedevil-5.25.5.ebuild 1125 BLAKE2B 774bd74988417f1b0b6f3e3275f0bcc27785429b77b7490cca9a1187c74ebfc06bab5386e153e495ee14e9b89ab7cd99245c02ed49e6380bf4c52dde715b6053 SHA512 840f6b234780265e64c1150874b42b8a50ba53acbfe4cbe6ecf17e3e7d3c4be3ba6b77a197fddc9039f6311c096011f3f9e0e07172a60addecab4f7f71267ebb
-EBUILD bluedevil-5.26.5.ebuild 1211 BLAKE2B 63ba39935f0911bd6d87550510199b1686a89d1db044048827f11b6721ba56bd0435f8efe050e4a5923473fce2f66b11a826e4e15422b27cc83f36ffdd6199b1 SHA512 ae5dbd9fe5937262ea0d348d2217e630249c1552a9c66aa487183b74c3c74db6eaeeefe77238514c5d3a9db937a26fb3d14214d462f0e1fb77ee3251c4fb86e5
+EBUILD bluedevil-5.26.5-r1.ebuild 1281 BLAKE2B d798091347f8f532166dee44817404bbe46120072e54b9094d4e740ba6764be022db11c7cb799da89e666937b163aeb50093e0797700a04fcb6486119a114e8a SHA512 139c9eef4ad964eed585779a6cfad8f9c21c648872e89a5eab6661f9155a37cdbc1ad3dcdaaa9c4f75009676724bf7be2fbe8c555e2c2966a2b058b3952dcdf5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/bluedevil/bluedevil-5.26.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.26.5-r1.ebuild
index b7c66652302b..5617c8450ce5 100644
--- a/kde-plasma/bluedevil/bluedevil-5.26.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.26.5-r1.ebuild
@@ -17,6 +17,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -32,7 +33,7 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	>=kde-frameworks/plasma-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index d1f085833e57..4148c55cea1c 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.25.5.tar.xz 106800 BLAKE2B ed3dacb51ab775f5a267d7018c0ec5a77f9e71f5ec4e946ec24675e7c64d6ded8f8295c7ad2d3555db6a93dfeb8a21d101b27dec59c3b446f38b26d279f4a0bc SHA512 41ecaa92472f6888d589015b7341fb9cda434aaef604f3b78a189018291bb0469459b271ae3d3f0cf2519693b34cb2016378743118d74bdcaf2a1c5b2e644c6d
 DIST kactivitymanagerd-5.26.5.tar.xz 109164 BLAKE2B efc79871412db00bfa2b66f3e1766b34c91e028a2e3907ea14a4d14a40fa568d61b70782cc004b618d584f7114969eb7ef9eed5c1937cf44fbfa1a8a62048276 SHA512 952d97497d80098f2f19362e0fb6ebaeb4fbf1ab7cf5b4e1a6b08505d7e3a4069951de357b78571a27234fd20396db929b752cf90d50bfd22f901c3d28b42a46
 EBUILD kactivitymanagerd-5.25.5.ebuild 930 BLAKE2B 1cecba63016496b54e61a026ee061078894d0a99f34c339efa012186df91cb425eb85dd839e523c11d20f0ff51d0fb493087569db46ae1a59f254723f2b5ce66 SHA512 fb253755f72c6d3a22be755201659d63c18eec2af27294572f39853ab29bf62b066eadfa646172ae5ebda166c4cba20c74886b7ac3e08170b4f1fdc10d98fa16
-EBUILD kactivitymanagerd-5.26.5.ebuild 933 BLAKE2B 8a5bd5a81f0eec9969f0c345ed9367e0a9f6fc721e5406999c60faafc125a56e7847c2fdd39cbd39868c58927bbc4daa749e825e936062965524b438d3cd544d SHA512 85a0d3c27926a701ace05ddd500b53b4f62a1a93fcc5d951e462964ed719ceb572af43eebb1719da4e9fc7ede89175ae979f0b99bce4fd3e5ef53ce4db3beea6
+EBUILD kactivitymanagerd-5.26.5-r1.ebuild 1003 BLAKE2B 5818ffdf889d04bfaa8fdfb62833460b2b070496b48bef28696dd6b5a4381511ec55bcc8e4dec820812a678c602d572cecd3fcd45e0eb0ba2176a90ad2253dd6 SHA512 bb0010d61dcf83bc96d5a17a64ef29729108a2973e33b787072f1513dfe1fab674771bdf3bc8cb0036a63673cab94b6939dcb78cf2240eb6e83c8283b84db03a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.26.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.26.5-r1.ebuild
index 7c1842a2d7b4..5099a4267ead 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.26.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.26.5-r1.ebuild
@@ -15,6 +15,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -28,7 +29,7 @@ RDEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 DEPEND="${RDEPEND}
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 60205a725522..c881f3981116 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,6 @@
 AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b
-AUX libksysguard-5.26.0-with_x11.patch 4087 BLAKE2B adacb60e121142b090c3cb01af68c4d6e2ce42bbfb5d802b2f18f0a9f6bc1b83deb34a1a1f447a5bb26254cd9c1b9ff9d51f84f7370ed2267ba373855a347473 SHA512 d2ff6d12e540274267ad900d9e8699c6ead71f8583e12856e47eb6d29353f715cfca3f9934efca287a511d048078805f833d60e7c00e6a514d50b1d4fb558e47
 DIST libksysguard-5.25.5.tar.xz 783508 BLAKE2B c0b174991b14b5d422a5c5a8d50c19ac15c63d843aad9b946f65cc4fd1365fadd6c3b9af23e426d8f4e2ea4c4de22d025141f0b34c83e90d23cf16e408e531ed SHA512 c26bd5b3d6ac92a914d909e9d97691f0a851dcd069f158c5231f04bcb8d621defe49c667b166fd9b6fbea789bf37cc1a7dd9a52f53c942281f1ff0d76623baf8
 DIST libksysguard-5.26.5.tar.xz 796464 BLAKE2B c3e02dd6f66aec96556ae6587f55006f6efa43bfbc10ef601f4d249f41c2d5b31834795a53a7c55e5d5e3c0148e3922e81d6bebceead6da8deeadd7f20a70af8 SHA512 7ea143fde6daf141b73eb9ee6eabace8d0e5a3eb99a3b8a00ec1fe37cff4267ef20fb6c685a36aff303601b5f7c1d8c46082a542dd8dd06033b4b50a69e6d396
 EBUILD libksysguard-5.25.5.ebuild 1804 BLAKE2B 6594f0b394b005dfcfbdf52bec2f344abd3272e5b7c846fa4adb8e4be1b802d7c2cc64fd57a5fb4e4a4b1f59489e6a9f352304691b370e6018b0ca4cdd2a9b2d SHA512 1251c8d4cc14f89fa40d167f3d25215fba1a6b42915eeac1a6f62642bfb8212996e653713d22eb1d4c9141f580136bf323d82612967308cd0f41741025b96c28
-EBUILD libksysguard-5.26.5.ebuild 1995 BLAKE2B ab87de2f3e471113268caf596da7911f134190ebe50891fbba76972ab5bb52c2f390de9a5800590146f57366255d6a8454d5b91564ba0c51cf83e3f7b15b1a1d SHA512 fccc85a1a513e8e52dabfece2fb66062de7e87bc24182adca6068d3fef305ae0a74412959deaddf962cea2f2887aab125848692e76b575b67275d89b8e48d6ee
+EBUILD libksysguard-5.26.5-r1.ebuild 1890 BLAKE2B 2db4218572a88b652aa9ddb89c52be67b9d54ae4e28f9d8f3a01c70ad7afd7a385f3bc25550cd201a9360453ae9a1f1b7758d62b882b4a1660be7a0bafe084bc SHA512 3f60fa5415fe241569e7bface38bc2ac0de6e25bcb2d1f11c3b0bddd3a8e41b0a32d2c419c5d9a8fb21b9c2a56748337981e60b447762746fa7bb1009f07afa3
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch b/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
deleted file mode 100644
index d27504413384..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From c389fbdaff34e35b0cd5de32b52e818714e13d40 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 1 Aug 2022 16:53:42 +0200
-Subject: [PATCH] Add CMake option to build WITH_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config.
-
-- Cleanup HAVE_* definitions a bit
-- Clarify X11 PURPOSE a bit
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt           | 44 ++++++++++++++++++++++------------------
- processui/CMakeLists.txt |  4 ++--
- 2 files changed, 26 insertions(+), 22 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55938c4..5d4e085 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,25 +65,31 @@ ecm_setup_version(${PROJECT_VERSION}
-                   SOVERSION 9
- )
- 
--find_package(X11)
--set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
--                        URL "https://www.x.org"
--                        TYPE OPTIONAL
--                        PURPOSE "Required for building the X11 based workspace"
--                    )
--if(X11_FOUND)
--    if (QT_MAJOR_VERSION STREQUAL "5")
--        find_package(Qt5X11Extras REQUIRED)
--    elseif (QT_MAJOR_VERSION STREQUAL "6")
--        find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
--    endif()
--    set(HAVE_X11 1)
--    find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
--    find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
--
--    if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
--        set(X11_XRes_FOUND TRUE)
-+option(WITH_X11 "Build with X11 support." ON)
-+if(WITH_X11)
-+    find_package(X11)
-+    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+                            URL "https://www.x.org"
-+                            TYPE OPTIONAL
-+                            PURPOSE "Required for building Process UI with X11 support"
-+                        )
-+    if(X11_FOUND)
-+        if (QT_MAJOR_VERSION STREQUAL "5")
-+            find_package(Qt5X11Extras REQUIRED)
-+        elseif (QT_MAJOR_VERSION STREQUAL "6")
-+            find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
-+        endif()
-+        set(HAVE_X11 1)
-+        find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
-+        find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
-+
-+        if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
-+            set(HAVE_XRES 1)
-+        endif()
-     endif()
-+else()
-+    set(HAVE_X11 0)
-+    set(HAVE_XRES 0)
- endif()
- 
- set(WEBENGINE_SCRIPTING_ENABLED FALSE)
-@@ -122,8 +128,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-         PURPOSE "Used for reading hardware sensors")
- endif()
- 
--set(HAVE_X11 ${X11_FOUND})
--set(HAVE_XRES ${X11_XRes_FOUND})
- configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
- 
- option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
-diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
-index 2932733..c9bd800 100644
---- a/processui/CMakeLists.txt
-+++ b/processui/CMakeLists.txt
-@@ -30,7 +30,7 @@ ki18n_wrap_ui( processui_LIB_SRCS
- add_library(processui ${processui_LIB_SRCS})
- add_library(KSysGuard::ProcessUi ALIAS processui)
- 
--if(X11_XRes_FOUND)
-+if(HAVE_XRES)
-     target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIES})
-     include_directories(${X11_XRes_INCLUDE_PATH})
- endif()
-@@ -59,7 +59,7 @@ target_include_directories(processui
-         "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
-         "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard>"
- )
--if(X11_FOUND)
-+if(HAVE_X11)
-     if (QT_MAJOR_VERSION STREQUAL "5")
-        target_link_libraries(processui PRIVATE Qt::X11Extras KF5::WindowSystem)
-     else()
--- 
-2.35.1
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.26.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild
index d9c38f3b05fc..43bb682c183b 100644
--- a/kde-plasma/libksysguard/libksysguard-5.26.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild
@@ -15,8 +15,9 @@ DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/9"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="webengine X"
+IUSE="webengine"
 
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 COMMON_DEPEND="
 	dev-libs/libnl:3
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -24,6 +25,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5[qml]
@@ -34,24 +36,21 @@ COMMON_DEPEND="
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	net-libs/libpcap
 	sys-apps/lm-sensors:=
 	sys-libs/libcap
 	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXres
 	webengine? (
 		>=dev-qt/qtwebchannel-${QTMIN}:5
 		>=dev-qt/qtwebengine-${QTMIN}:5
 	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
 "
 DEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	X? ( x11-base/xorg-proto )
+	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/ksysguard-5.21.90:5
@@ -60,16 +59,12 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# downstream patch
 	"${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch"
-	# pending upstream:
-	# https://invent.kde.org/plasma/libksysguard/-/merge_requests/238
-	"${FILESDIR}/${PN}-5.26.0-with_x11.patch"
 )
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package webengine Qt5WebChannel)
 		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DWITH_X11=$(usex X)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index e7cba9da8ae0..1f26bb6c4bd7 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -2,9 +2,11 @@ AUX plasma-desktop-5.25.5-desktoptoolbox-fix-flickering-on-close.patch 1033 BLAK
 AUX plasma-desktop-5.25.5-folderview-fix-grid-overflow-property.patch 1738 BLAKE2B 968ba671e2d1a12562bb3681731c2c1d285e8153d2babee626a8fd3592137d69da75cbced54b21121b2391d997a2e381c68518b63c66ec5fe4094ff6c7a788f4 SHA512 9a95cce7d7511a8f68b5db6dd13850307b17fa8cde64d5443f24e2063059f0f84cd401f81755a11365d7fb0311072cb28aceb4da9e8e196f069455dcd987aa0d
 AUX plasma-desktop-5.25.5-lock-layout-check.patch 1209 BLAKE2B 4a6626c6fa83d38b05f43d8aa79e2db2badc468333edf1d1d7d6f8dd124a3394345d36c0df5b8f9cb21cd4413bd0706add6fbea733b762cb13ba4048f67916a2 SHA512 410bc165a26d592825dfd1c698345b640f9561c34586a39dcdaca80d85306cf1b4b43541e433178a0254c3b36ac38da14eb2d313c8c5b0673c016a1ff7ec1869
 AUX plasma-desktop-5.25.5-lock-layout.patch 2732 BLAKE2B b4c2c09b91e29030f14c82183a540a7984cba4647b115043027d05278dc16053939ddff2ddb2eef0eb38e0c63e8c19aabbdee0beca1b42fe476494a026acdd2c SHA512 e7c68b9814dcbc9792ce985c0c7b12606918d85cbdb3e79d56c68b888eb47b74827c24c0f1a49902c25e4287a4fa1b5f367fe9a4bb5f7befc60b614c6bae94d1
+AUX plasma-desktop-5.26.5-missing-kpackage-1.patch 607 BLAKE2B 9259235c168e4139578e55656e5d870e7f9dea8b224913cf27874614c1023c48ed88ee0d196c62c70b4efcd5b75879fac69edac194fe1774575070318c705602 SHA512 1b70359238da9c73a5a25e4399871a37016b14737258cf37dee71c089aca443af4a5b2a8e83a9855517a163a6d57dbc82b665e4e8c1c416c0924c63777a5ccea
+AUX plasma-desktop-5.26.5-missing-kpackage-2.patch 1123 BLAKE2B 160c72f267016be9a320bd735b1d84e3cba30a28a09665a2f4e4a73eb9834c9b04feb468b1359867d77ee062a84278a65048f727595ac211b492b8490a00e8b3 SHA512 cb75f2a27d4436f5828929fd05d92ec3847c2741a776eeeb7df26fc406da5751ec542f94db9a6e1d71e063e7c292f09c1233e81693409d33d9f65641c558f6ad
 DIST plasma-desktop-5.25.5.tar.xz 6327616 BLAKE2B b0693b2097b3cbee01c82c19b803c64401139a5206014de5ceaa17a253de159948d93b870910d37d205989e99e66f245480ca1c79b09338babc0d56eef387399 SHA512 8bcf570ae73c21af7780706a33cf905bd566465badb457cc64515717c01ed332cd8543ca353a82222abdc8b63a762ae85d7881706742b3fe8f93c77584261ec4
 DIST plasma-desktop-5.26.5.tar.xz 6352588 BLAKE2B 093d559830719ac011d5aea33beb86c6fb39403a44416da97646c1f890373cfcd570ae6015dfacf0d4cd2448b44e03f814376a3897351178c582bc865e110fce SHA512 6d58bc09c7f0e0218d3ffe4609fe206012c34d8c1ad64003a51ee3228e2ca203b0131b878f797babc43476bd0cf3e7cbe295e8a11ff1ae97843a61b2183ae182
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
 EBUILD plasma-desktop-5.25.5-r2.ebuild 5469 BLAKE2B 26a135bc888a05120351bf8052ed06cb1df987e0dde0d6c5dc117a3ab0f1b1f8a2c167a128f63ac4d696b245c58e9304b573de912cbe9814b047f09586222fb0 SHA512 56343cc7e5976c4eed101862763d0d91db0776fc72e3496da2b8547524845268d0ceb2d1ffc9e37fd15d71bbabe00f9e31e95d0a4d887d232d7342b170cd0183
-EBUILD plasma-desktop-5.26.5.ebuild 5488 BLAKE2B 8fa2f0b4e15a7d38ce92820fecb811657f394f7cefc27b9db2f77f957641a081e9370d93c0fa3f19bbe0f04a6cab26a7459759136535e94e6a414b05c7233b49 SHA512 b58b95038d6b73a252fb0f9a9ff4537c44ee0f5731c85091ddeb9272f04ffb4860da4edf17271f26484f3b87d7128a2bbbac176ce7196b18945f7457d49169f0
+EBUILD plasma-desktop-5.26.5-r2.ebuild 5673 BLAKE2B 15b58cc7809d59609921410586e42260d635b15928946a239910119ffa3849d532ff9d293b077d03d23d2f8780abc99bbf63bdb690c0836e354ee1351f1c30b3 SHA512 bae2d469aca2b15ae6a08f4697bfaac1dbccb86a03c1d86abd1f2fb8854b03a5825c4ab87a02493c06842f9ee725abe3bb42bf2a1645b0cba42b497f33163a6b
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch
new file mode 100644
index 000000000000..68f4ffc07848
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch
@@ -0,0 +1,24 @@
+From 8447cfdf67458768627def4f481d9f52f8d444e1 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 28 Nov 2022 13:08:09 +0100
+Subject: [PATCH] Add missing KPackage link
+
+---
+ kcms/ksplash/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kcms/ksplash/CMakeLists.txt b/kcms/ksplash/CMakeLists.txt
+index ea75dd743..8bf51f997 100644
+--- a/kcms/ksplash/CMakeLists.txt
++++ b/kcms/ksplash/CMakeLists.txt
+@@ -28,6 +28,7 @@ target_link_libraries(kcm_splashscreen
+   KF5::Plasma
+   KF5::PlasmaQuick
+   KF5::NewStuff
++  KF5::Package
+ 
+   Qt::DBus
+   Qt::Widgets
+-- 
+2.39.0
+
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch
new file mode 100644
index 000000000000..3ebddb75d195
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch
@@ -0,0 +1,40 @@
+From 8ad8d248b91d9357f4ee421e4933d89595faf80a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 15 Jan 2023 15:17:09 +0100
+Subject: [PATCH] Add missing KPackage search and link
+
+Follow-up to 8447cfdf67458768627def4f481d9f52f8d444e1
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                  | 1 +
+ kcms/landingpage/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e797efa50..ef2db360d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,6 +74,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     WidgetsAddons
+     Codecs
+     Sonnet
++    Package
+     KDELibs4Support # kcms/dateandtime
+ )
+ 
+diff --git a/kcms/landingpage/CMakeLists.txt b/kcms/landingpage/CMakeLists.txt
+index 215d51234..e39da9f51 100644
+--- a/kcms/landingpage/CMakeLists.txt
++++ b/kcms/landingpage/CMakeLists.txt
+@@ -26,6 +26,7 @@ target_link_libraries(kcm_landingpage
+     KF5::KCMUtils
+     KF5::ConfigWidgets
+     KF5::Declarative
++    KF5::Package
+     PW::KWorkspace
+     KF5::ActivitiesStats
+ 
+-- 
+2.39.0
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.26.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild
index 4266cf6d166b..554f71e30f2c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.26.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild
@@ -20,6 +20,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="emoji ibus +kaccounts scim screencast +semantic-desktop telemetry"
 
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
 COMMON_DEPEND="
 	dev-libs/wayland
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -62,11 +63,12 @@ COMMON_DEPEND="
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
@@ -77,9 +79,11 @@ COMMON_DEPEND="
 	>=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?]
 	>=media-libs/phonon-4.11.0
 	x11-libs/libX11
+	x11-libs/libXcursor
 	x11-libs/libXfixes
 	x11-libs/libXi
 	x11-libs/libxcb
+	x11-libs/libxkbcommon
 	x11-libs/libxkbfile
 	emoji? (
 		app-i18n/ibus[emoji]
@@ -129,6 +133,7 @@ BDEPEND="
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}"/${P}-missing-kpackage-{1,2}.patch
 )
 
 src_prepare() {
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index adb59940891a..d7861109e500 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -15,5 +15,5 @@ AUX plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch 1438 BLAKE
 DIST plasma-workspace-5.25.5.tar.xz 18638932 BLAKE2B f83aabf84b775c0bf9d1e60db03f94400e3363fa8f45767bdc471706682cda7323fae4948cffa156188cc7ed2d30d05349a385dd370ef941c16464ddddf8fa01 SHA512 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb
 DIST plasma-workspace-5.26.5.tar.xz 17470516 BLAKE2B 4809ad1ec93e4e6d27b17197457b76f5971ea6c74ac64f64e68ecfe828068f7f33af69bdd03411a4cd0cf8fb26080ebf9c85741eacc0e53d6b782af4eabb4b8a SHA512 9fb840d3f36e1cb25126a715d5599bf89680b0c3ff2a674f07f83246dc15358e15c7e31565d39570e33f6b4d3292822d5fdde05e4795f2eef13e1a0ff2f1c687
 EBUILD plasma-workspace-5.25.5-r5.ebuild 7410 BLAKE2B 48c72c6987afd8fb1c7731fe2ab5051abf511963cff9566ab3dbfa6c504cddeb212a07642e1fcbe9ff35c53f4e515bc7c8ba014620f1d9d7cb468ea12f8686d5 SHA512 aafb94f70606104ceb339c4ccf89117c351f135f1f1cf499c118775ecebc72d24726890fc1a0caf229f1074093bcf7c2f799dc4d47bc0126b2bd3c19fef14e82
-EBUILD plasma-workspace-5.26.5.ebuild 6825 BLAKE2B 9f78d1c369aeaaec38925cfa5fb377e29dd1022ed6eeb69081897882a0404e8636b7f77df4b4f3a021ddbabfe2ae14e6f589a0e9ad4c168cb507b53bc1a795ce SHA512 ae38d43f0ddc017416783aa107af5fb7059adbf64c106e3a27089758a9d51aa822c3e6628053cd6b7f5a00d7956d38251263fd3b517d0e36a4a1b89f91a1960b
+EBUILD plasma-workspace-5.26.5-r1.ebuild 6879 BLAKE2B 47ab7321a4453fb7e61f65ce5a0a11b0eae8942c0d7f81e36aab76229fe1973f9d234b0612e5916d73821b4c5655236ba024500da6ae3f6d084a270e0dcd4785 SHA512 177cf7c51724e61c3e23a809eb563c41e33aa5fba8ae4ba3f5c7955b66c1729f6c413f6e1174b9355fbaeb2945f505b56c4bd134147f0cec789c57e0f02d7795
 MISC metadata.xml 959 BLAKE2B 6513ae79e0cf24efd0bd33a16708950d36393770b51ea752c4c8c6e7ec63c7675dcf5e96dcfbb07d527ba910462b7c23afe35c55b4643ec69d1175660b245478 SHA512 8af28473216b00d4273be4bbb5d93adf8a4db79c46d9e97bd8b2822fa3920e8fc789042669bc93e6e9a6fa1c864a49fc23887be8456ea122a6d8b09e384dffbd
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.26.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.26.5-r1.ebuild
index ef9ecce04265..40f0f0bba2e5 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.26.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.26.5-r1.ebuild
@@ -22,6 +22,7 @@ screencast +semantic-desktop telemetry +wallpaper-metadata"
 REQUIRED_USE="gps? ( geolocation )"
 RESTRICT="test"
 
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
 # slot op: various private QtWaylandClient headers
 COMMON_DEPEND="
 	dev-libs/icu:=
@@ -72,7 +73,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/prison-${KFMIN}:5[qml]