gentoo auto-resync : 25:03:2024 - 01:00:59

15 files changed, 68 insertions, 46 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 200aaba46aa8..35ed7d93fb4e 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 1ac8d5cdc2fa..ef8bc32eaa88 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,6 @@
+AUX kdbusaddons-6.0.0-cmake.patch 1166 BLAKE2B c386e9ecb029f16da636d6fa87c1be74b4744d06c8636ea3b975838eb20af5409eb9c9ef0a46610e975f2dd3bd998f732bf16c2a8632261987d4a5563754fc1d SHA512 5c9ef0b979a5d9c80aba507ac6add8ef5f3d6a582a2535e7c0d9c03df848fa780268ecd9a24b055ed6d80b2e0802730715af8285716402a4d19349eb79fd9708
 DIST kdbusaddons-5.115.0.tar.xz 48924 BLAKE2B d781b8a42b80abc3096f10e7fe2ae8bd5d6d7306e0d6c0cd61b82c28719c8ecdfb9652388bcd29d49e614fdfdf448ac4cfbf7de7abbb7ea7f8cc1f632ce565b4 SHA512 4d43d39300652a7923a8f2a66dab18e606c2472c18f9629d3481bfc9329ff60b0d53f463de88d6dabfa106cebf68422184a4dc76b35c95f05050271eac29654e
 DIST kdbusaddons-6.0.0.tar.xz 46140 BLAKE2B 2b608bd9a0ccb242b18798c6f9e6345de394382605875fc9349451d7a7a7dea8422fcd35cc7acd4bd5fbbd384887f837ea1a07113529e5804f22cc36348f3e33 SHA512 0fbd3176fb04217be2dd53a6254056a1db678e5a314836b8a714583d756de5310de32d2f4d05b06763bf8a0dfb72ed75b0e3a2c9f3134fe5c07be01432d2a18e
 EBUILD kdbusaddons-5.115.0.ebuild 607 BLAKE2B 41ced1d2ffa91c711431848faf78833da62764a4085fadf6b67d52c0c90228d9c7c0c11000edb0a6254ef69a5a08421cf8721a3a9d8f19146e8a2f11ba3c3c46 SHA512 1b6f919e3590fdc7f21a0c5fa13b8593d0f6138714ba9a88ff28fb4cd129218663bcc5e7a73dd6c6f1e78e892957aee578e37795975e2195d836a2bc47e69777
-EBUILD kdbusaddons-6.0.0.ebuild 561 BLAKE2B fbc709ba76459864d86ffbd21220a170cd02fb9729dc5742eb66d992aaacc12e24e7312e21f4aec0e88de84840f0df1be616b166be6b82812f7309365ab891b3 SHA512 a57fae3bc8b520626907646399dbd2443c3fb4c46eacaf63ff06f3a14f6f76bc2174a5a5cfa538f79615bb24e67fcb5279a423ca292cb1959396f15e8c9b57bc
+EBUILD kdbusaddons-6.0.0-r1.ebuild 658 BLAKE2B 1a6c70127701eacbfd1648f01e54f86841385ec7e5363085219edcd42c00162d87e795511e9bc93448c39dae449c9fb44fadf8d3ee342e3b22a361a92f6128d4 SHA512 94c7b84dd8c02b8b8382c78b5cff0adf663c1bf0fb5fdb9abd9ada42173b7c4e1445658de42e71f2e572d02f4b2d9b38fb2d367b234fe29c1724946aa9d155c2
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdbusaddons/files/kdbusaddons-6.0.0-cmake.patch b/kde-frameworks/kdbusaddons/files/kdbusaddons-6.0.0-cmake.patch
new file mode 100644
index 000000000000..b1ebc6d32bfd
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/files/kdbusaddons-6.0.0-cmake.patch
@@ -0,0 +1,35 @@
+From d307f232232de6e5646fd6a91053fe097b90b35f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 15 Mar 2024 14:26:49 +0100
+Subject: [PATCH] Conditionalise Qt6::GuiPrivate on HAVE_X11
+
+qtx11extras_p.h is already conditional behind HAVE_X11
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c47bc15..de5ac6f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -60,11 +60,11 @@ ecm_generate_export_header(KF6DBusAddons
+     EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
+ )
+ 
+-if(TARGET Qt6::Gui)
+-    set(_qt_x11_extras_libs Qt6::GuiPrivate) # qtx11extras_p.h
+-endif()
++target_link_libraries(KF6DBusAddons PUBLIC Qt6::DBus)
+ 
+-target_link_libraries(KF6DBusAddons PUBLIC Qt6::DBus PRIVATE ${_qt_x11_extras_libs})
++if(HAVE_X11)
++    target_link_libraries(KF6DBusAddons PRIVATE Qt6::GuiPrivate) # qtx11extras_p.h
++endif()
+ 
+ target_include_directories(KF6DBusAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KDBusAddons>")
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-6.0.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-6.0.0-r1.ebuild
index 7d0db60a68ee..5c8019cf1755 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-6.0.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-6.0.0-r1.ebuild
@@ -13,13 +13,16 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64"
 IUSE="X"
 
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus]
-	X? ( >=dev-qt/qtbase-${QTMIN}:6[gui] )
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
 "
 RDEPEND="${DEPEND}"
 BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_X11=$(usex X)
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 0aa5d666996d..c8488876dc59 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
 DIST kiconthemes-5.115.0.tar.xz 1312068 BLAKE2B 6e40e89610031f5ed9cffbd4c847c1475ee8229810cb917e82837003db714854f96ceabc1e997e7a6c6197de00d84c946fcb51c4527fd203d9a917058160a871 SHA512 7cbfe721f45a9edda811fffdb2599452011b679fd5ffdc9088da009de4e712700a6b31cadf0ce24025fe3c264d5169eaae505a9080da123613dd47a8ffb43b6f
 DIST kiconthemes-6.0.0.tar.xz 1314064 BLAKE2B b8eafb3b77dca77a31920847accc47fdb5eb02439087d753e0f77ab78aa0a37d2ac55b32f9dae7015fd23a138d6c43c4154d8060af5678a5ed12ffd4bb769411 SHA512 99e2f366c7b9439b90495e3af5dc5fabcabe82bfcada7ab909c0c8912c1cf29fb41319543fe390429bfdd42a35b2dbb3295a1eec2fe647aa563a925172b042b5
 EBUILD kiconthemes-5.115.0.ebuild 803 BLAKE2B 3c1bf5e6c9659cc53512dcdc836591a5443c6e3c248092fd8071f58d9f5397c177aae929df602945db1073f807ba86c4476690260d92713dfcdd06ff83bdb0e8 SHA512 51e89610858961e411e59a4268ee77596c28fce46194e2fc5101e829a23aac5213b887feb68e4ee379f536f3ac5dad9d25660914df27b86e3a072dd96ecfde4c
-EBUILD kiconthemes-6.0.0.ebuild 719 BLAKE2B 15720785a7079e0b6b2eb10bab03dc36b9194369aba64fa7ab45bcfdb74d451c8250f05a7741c81d5de640218a54f35637f6f3e35a581db26fd98429341be19d SHA512 4479b20f5ba4a2cceab78b97a6c9900f4118e512037af9d845a2ea4ec5b847462bf88e860c7ea46d04516983866cd07095324c36b43db4216936bc07a2447afd
+EBUILD kiconthemes-6.0.0-r1.ebuild 793 BLAKE2B 49bdb785bcdb1aac3df3b27706445a143d40779bf6d1ded4670797e69dd899d15a34cdf9e3d29af291c36a2a04c5e9ef5862b578530785365cd93e1881e395d4 SHA512 86d0d838a94c1a3c3b73986854606a15dbef35369183064c563aad90607b1a67d018d985fd8282d7a32ac2e37df6f0b3087abfc68d8d41aa472e22ac5a554d44
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kiconthemes/kiconthemes-6.0.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-6.0.0-r1.ebuild
index e89ae7b58774..ab3f30c4325c 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-6.0.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-6.0.0-r1.ebuild
@@ -16,8 +16,9 @@ IUSE=""
 
 RESTRICT="test" # bug 574770
 
+# slot op: Uses Qt6::GuiPrivate for qiconloader_p.h, qguiapplication_p.h
 RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	=kde-frameworks/karchive-${PVCUT}*:6
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 333e3ab3b8ea..82ebf8c071ff 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,6 +1,6 @@
-AUX kio-6.0.0-kterminallauncherjob.patch 1258 BLAKE2B e6796734803b67d8acab1216695a5b987b3037bcccaab5785ed6dde88aa87f92c69a65638ac344611555a8db51b84237aa5cb55934fdd504e40f6b8f460d9b4f SHA512 7b568b9797badbfd445461270a025835c3b33e6cd57a417be5569ea392b981683924179f3fc0e4911a326177575119aa62db7947917602b04c10a61348f75b96
 DIST kio-5.115.0.tar.xz 3799964 BLAKE2B 020084259a4e41d102e786d34b899420e18d75f27a3f8391dfd05f57d86168676d5ae88b603d84176a8ad963aee7bc5883ef4952c25f6d8ea1b11cd6d04bb470 SHA512 014eab017a1a9ba65cf122a9f241764054b3591c5759d5121ccd82593ebfe301eec0ba1f9e08165ef75b0fdf057094ef81293a6ec020ee2100394a68ab80a8d7
+DIST kio-6.0.0-patchset.tar.xz 5808 BLAKE2B 94b6a57a660fa2c6d2362b3a35c02a355dc486e59b9d4d74adab91258f2a8fd73ee2f2ae8168d4aaa11ae5508f3492e898002ba274cdd6a51eb1cf3422a003bb SHA512 b20e2b2ed673dffdbc9588bcaf1bcde9ff7dd6d4c77ef7398240b4d6c5f899f1025ef4757fa19f42c2196c60836afe6205bd8cd1ed436cc91ccffd7be427a7a7
 DIST kio-6.0.0.tar.xz 3353680 BLAKE2B f65c2cc36e2e22494edf77f598ca6eff037d26de0981d3f136d3db901d1ca4cd069f696c5dd9a42622bcb6b60aabf79e1221b9862e47cc15205341101efe58e2 SHA512 ec230cda5fc9f973e0b02bf7e9a2c282c447c69cd247be10b11299b950043a9517ff17061c1262e4e709539d9fe17ff532d1ff69dae36abe56b1bb0d81327bfe
 EBUILD kio-5.115.0.ebuild 2433 BLAKE2B ef2dbdc733214e9ad012fbf45564b3eb052bf3980e346977d9c9c7ec13a4cd512fcc5a6b517d9993ed333c821e885228779ea53649905c9f744025ffdd21dd0d SHA512 9ea1c94266e3f638e891fdf834919deba8ade49b4339366d8ff965a23e221c55155e5bf963f585185ef8b191c3c242d04d7c88f09cbc73196bee5fb18d72c3ee
-EBUILD kio-6.0.0-r1.ebuild 2316 BLAKE2B ff278c654297dee03830d86f3eb28ad51f611c27de4ff7b94bb74e7c9c9d9324de7fd7c4745598edfa362feeae55cda25b6f2981ba0718bc2bb073b20b4d4aa5 SHA512 2e5f43057970b1d9a338f46743ba12b9f181bbc1b205d4af551682eb09b6434d8d815137edc8606d5c613e3a5f7e1dadab3846ef40567b3277cf35abed244f0a
+EBUILD kio-6.0.0-r2.ebuild 2506 BLAKE2B f42e9a82476c979faea9d5424178a53f0a3e613e8a9f7d163413b7b4b0e48b412021a50fca9110d94cc89925feed163f337d46e771c0ab539f2d2d32d6a04b7c SHA512 5152c3db548c4d9c59ddb274720be1d6e46cf815cfc6e4caf36730fa8533b98f20932fab03239f75b661402262f5359a8c801a94fcf58d55b0530fc3c4d3f8a2
 MISC metadata.xml 776 BLAKE2B c30d6d930265af6c0f0d5e01e2ad7b4c7961190f013e9447dea890880f947a0ad006ac523e7363e50a58221d807e1b9ce78270800a20226906e48980eb332b6a SHA512 ccf86c003f2933287e41fcac9980f07006b3bde5a303f241d7a1fadeffa0b22656ea6e51fadd5ea5c40d7e8fa0debaf16a0ac004db317a18c99d80461bc82115
diff --git a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch
deleted file mode 100644
index 2c9b594b33ee..000000000000
--- a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6e7775d315f389df0a440ed62b842ce83dc9a27e Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Fri, 1 Mar 2024 22:16:07 +0100
-Subject: [PATCH] [kterminallauncherjob] Inherit default process environment
- from parent
-
-Before Qt 6.3, an empty (default constructed) QProcessEnvironment caused
-QProcess to incorrectly inherit the environment variables from the parent
-process. This was fixed in qtbase 5fc9c02a695.
-
-CommandLauncherJob was adjusted for this in 916984940f64e07db9b4d152be9f2a87dda0cfb4,
-however here we are overriding its default env with our own default-constructed one
-
-BUG: 482107
----
- src/gui/kterminallauncherjob.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp
-index c4e83fb11b..edd99327bd 100644
---- a/src/gui/kterminallauncherjob.cpp
-+++ b/src/gui/kterminallauncherjob.cpp
-@@ -22,7 +22,7 @@ public:
-     QString m_fullCommand; // "xterm -e ls"
-     QString m_desktopName;
-     QByteArray m_startupId;
--    QProcessEnvironment m_environment;
-+    QProcessEnvironment m_environment{QProcessEnvironment::InheritFromParent};
- };
- 
- KTerminalLauncherJob::KTerminalLauncherJob(const QString &command, QObject *parent)
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/kio-6.0.0-r1.ebuild b/kde-frameworks/kio/kio-6.0.0-r2.ebuild
index 384afe22e7e1..468a30f84e2f 100644
--- a/kde-frameworks/kio/kio-6.0.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-6.0.0-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+PATCHSET="${P}-patchset"
 ECM_DESIGNERPLUGIN="true"
 ECM_HANDBOOK="optional"
 ECM_HANDBOOK_DIR="docs"
@@ -12,6 +13,7 @@ QTMIN=6.6.2
 inherit ecm frameworks.kde.org xdg-utils
 
 DESCRIPTION="Framework providing transparent file and data management"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
 
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64"
@@ -20,6 +22,7 @@ IUSE="acl +kwallet wayland X"
 # tests hang
 RESTRICT="test"
 
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
 COMMON_DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets]
 	>=dev-qt/qt5compat-${QTMIN}:6
@@ -58,16 +61,18 @@ COMMON_DEPEND="
 		=kde-frameworks/kdoctools-${PVCUT}*:6
 	)
 	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 )
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
 "
 RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[libproxy]
 	sys-power/switcheroo-control
 "
 PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
 
-PATCHES=( "${FILESDIR}/${P}-kterminallauncherjob.patch" ) # KDE-bug 482107
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index f2e2a371ed2c..a9ceeafb08b0 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,6 @@
+DIST kirigami-6.0.0-patchset.tar.xz 1488 BLAKE2B 1ff8a9e65f5b1de74155860fc887c6723d224a90173c21a9a19a7625eb27e8c9ab974521478c2f42be7a315d7be0bf065c109f76f27d1926657ac88ccc5f9ea4 SHA512 5018d4ab3e0d2a3c3a71795b5b8404f2de37855fe791a60322fc04afe895fd94c3b3a61255b805e324a20e936cbdf8eb140eea1679e2cf0e97fd538d987a1bee
 DIST kirigami-6.0.0.tar.xz 371664 BLAKE2B 4d50f4b803d1042c0c69a6e31a4acd3d87d0269b45e60330aa7ea00c45f89504b61c86ed03f01834aeb4b7925fe720419b556d3c3cfaa45693a8a380bf8a816b SHA512 b94307d71f71ff59f670e98782924f54f4d4b32e41c21f29701946b2430131ed8e7e5d38e0145c601d2b50ecf3ab2e2e2a1bbad2e446fb533ffc5b9f3e464d62
 DIST kirigami2-5.115.0.tar.xz 383944 BLAKE2B ce95794319ebbda40d384896da4e94dcf5137d176b0c3cab53bf5223ed48e0c95486002010c74008b42857ce7d27d4840c2af0395e957d0eade18bc2f5796f87 SHA512 b99d9829f864ae59b0ae4064e0b0b24a0f33ce2c35c60b4609fd9746bb322cab26d3f9afe6ba0893b486d4c546ead98c5ba42dc33271d2fdf47e34caef35ea90
 EBUILD kirigami-5.115.0.ebuild 1179 BLAKE2B 931d5c609369b2cbe37388c90886b6287da66d74343b3d22fff37578667b2a87599821fc2a313394be435e4bcbfdf3ceded2bff1b5419333eb9bf61fb2198231 SHA512 e0c3775f55bf3e3f34a7d0f7d9e57e011fb3a5dfddbd1f3030ab419466948683078c25653d6c4372f0229458cd96dcfc496f5d3a73a1b2ba28ef2d2c4ef7b27e
-EBUILD kirigami-6.0.0.ebuild 1063 BLAKE2B 6c76bdf8a994327abaad666bb180bbe9a59f165a898b7028b54dc80265011a0195817a1f07922d0c0a9f9130fad70bf9376c0ace4ecd9a511db3eecafda33962 SHA512 31544a807fcbaf91ef1e983701ea16860d5f22bc3906bed256751fe9c589a21ab0c317337ed0126518be5bc8a4508f5349c064e47cfd0624ccd15843b5c0b959
+EBUILD kirigami-6.0.0-r1.ebuild 1255 BLAKE2B 939a44c12068bf8aef86bd7a82dd61f2e8e717d86a5f5374bee4ec42e577957ab920ab77878b402d396f25cf9367312001ede3407cf802729d1feb15c2fc10e9 SHA512 7d55c2f8c575941b546e39a010e4caccebc74a37caceddee4e85371bb78eeccda106d3c50bbcac149f96976e5c9140c3274f6505c0dbf5dc6ae6691e5175fc6f
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kirigami/kirigami-6.0.0.ebuild b/kde-frameworks/kirigami/kirigami-6.0.0-r1.ebuild
index 9c9933f83293..f45661c6ccd2 100644
--- a/kde-frameworks/kirigami/kirigami-6.0.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-6.0.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+PATCHSET="${P}-patchset"
 ECM_EXAMPLES="true"
 ECM_QTHELP="false"
 ECM_TEST="true"
@@ -11,6 +12,7 @@ inherit ecm frameworks.kde.org toolchain-funcs
 
 DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
 HOMEPAGE="https://techbase.kde.org/Kirigami"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
 
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64"
@@ -19,8 +21,9 @@ IUSE="openmp"
 # requires package to already be installed
 RESTRICT="test"
 
+# slot op: Uses Qt6::GuiPrivate for qguiapplication_p.h
 DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network]
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 "
@@ -30,6 +33,8 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
 
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 455c37537a26..6d51f0418105 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.115.0.tar.xz 2301320 BLAKE2B 52bbc7fc8cf26494a865400f4dd852e6779558e05c05cdbd589df983a7d431147ff65608b945f2786d6f81445df0b0e145d5f81bd0c9013f9e3dcb9e77a6387c SHA512 8364d7dc63fe7777dcf053aa627e8e8182cb56e4d93b4ed2e366f327cae60fbcfa93dac35ca37bc86a2352297a745a93d38c4123bccf73b57d19f987414f8fd0
 DIST kjobwidgets-6.0.0.tar.xz 2299356 BLAKE2B a2348e10a2248ef3f1d2fa5bb03110a279f09ccde7d997374d88704cdb1e7cd11cc5b03960408ccb210c984c4f7f460c90529f675a238920ba170de68e134b9b SHA512 537cfe76b916b242b395f698af5e598312b553ea5ab4ecc7b78a086b46f159082ea80b0ff45502f3ffd857f21fe5a7e594e263eded9c88c8968148d9b1af86b5
 EBUILD kjobwidgets-5.115.0.ebuild 781 BLAKE2B 2dc13e00408fa9d8fc43e1b2b624981b9e39f71722887fff2933a9f47a500e2884d50a4641d17a2f3f682d8a1d56bcf55aee6f15a3296b3998fe44d37e8e25ed SHA512 45e00d059c2635988cc7fee26211876510b6ef659da931fe75308bfb6917691987d86febead0b99b458948506114946e3b430ec80dd1eea93aba747bb9d5542e
-EBUILD kjobwidgets-6.0.0.ebuild 713 BLAKE2B 2aa64271d154952cdb2e1c213592eeb45319e226d6d7fb2a15456e72b7071430c59c70536a6b4680f4148a8e471132886784485ccb32ff70398f1c2db49936e1 SHA512 926c5b9ba49df923d49a27d6758f973c6529426ac0118bd2f765faa5f5bf9aaa508332fce002f3d1cce54ad234dab304f93996ac4432f22df0ae2a7a1bdb30c0
+EBUILD kjobwidgets-6.0.0-r1.ebuild 806 BLAKE2B 3b501eb9cf57a66571857a602a96dfab19e9be0e2be72bcde08f9f94d4fb75630bed0d28e5265cd1fd0d87cc0dc84dbe38c9c0abb44223d046e66124b3e54bcf SHA512 4b21aa006715ca5d872a0fa6b8628c52c62087db637bfca83c291312ddce3d5423ecf774b6d8c449629ba8a112528eee3104c218fe0ff44e47d467e80daad7d5
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-6.0.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-6.0.0-r1.ebuild
index 27e465183536..9c172ae81960 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-6.0.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-6.0.0-r1.ebuild
@@ -13,11 +13,13 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64"
 IUSE="X"
 
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
 RDEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
 	=kde-frameworks/kcoreaddons-${PVCUT}*:6
 	=kde-frameworks/knotifications-${PVCUT}*:6
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
 "
 DEPEND="${RDEPEND}
 	X? (
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 6da59b7b2171..cacfbd7daa9e 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
 DIST kwindowsystem-5.115.0.tar.xz 2406616 BLAKE2B 1ce5be2069b592664875f0714213dfa3aaa28f0309f04800d55a35c815ff1b4481859bf92305092ea46f48981650cdd9da5aecd7c9cd77924164581ed10ca32f SHA512 37380c8a523220cece2b9867e9801b79b848c55b0808fa472834050bbbd23ecd18db48d3ef3a17fcf8cf9ee6dbf8a5988a5c562c29c876065a3fda96913f78c7
 DIST kwindowsystem-6.0.0.tar.xz 2393276 BLAKE2B b0451481489612c2498eb2414c3896e6344f2fc0fd6bcda2b02220bb195bf308de497c7547e26e077c94dafc229f5a67ecd441d076546d3abad107d54b5a3695 SHA512 80d7270bc26ca8c7914b2c5d10f014afa033c076a970f82b2d5a0063178349f8f0b430deeba5eb10ea69e8ab42783d50597c3cccc7f749ccee9df48683be1919
 EBUILD kwindowsystem-5.115.0.ebuild 910 BLAKE2B 9b81b1df9ee302c221e5ce6c7f53b1d4f7d211c07c882c7c56ae5a6b18b1f5bf7d7c7bcc795ab42f1e47007cad63e16d94176896cfdfdb3fd98d511f8a3b06ec SHA512 4ea39d7def2df05066d726ca4a1b16caebd1749a8280b87c82255b4fc6f676782f035aac084c5c3107356e2434668d83443ede56b2e663860f4d7f6cb9c0e81a
-EBUILD kwindowsystem-6.0.0.ebuild 961 BLAKE2B 44c1896c914ead165b9660daf422bf2531e8070ca3f5abb06c9a9cba488c20780e5b1a3f1453d8db692d86161d605536eab8d8ef80531589f7381c3cd8b0b43e SHA512 49f6c1c2f732ec281ee4151c7da869e037702c2fd9d31b0b541de8f1581daff1ba41457c184166d540497038eba8978e61f27e323d4be588aedd288d136a5b2f
+EBUILD kwindowsystem-6.0.0-r1.ebuild 1095 BLAKE2B ca236c79d1c158e98c6b3ffe994c79a10f8611ea3068bfdbd3f61c99fc097fafd22deb466c1a33e4fe2bbbe7fc46bbb827dcd11cab1368839705ec816a04aaad SHA512 854070599323c4e558b3ac2aa06b842cd5f1a256f4051935b6e38dc40d43c5f54f7474e73ec88cbd5ed474a7ffbc6fde47ca58810897ae5799472b499b534ce0
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-6.0.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-6.0.0-r1.ebuild
index b5695d0f4634..28c792b12620 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-6.0.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-6.0.0-r1.ebuild
@@ -14,11 +14,14 @@ IUSE="wayland X"
 
 RESTRICT="test"
 
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# slot op: Uses private/qwayland*_p.h headers
 RDEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
-	wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )
+	wayland? ( >=dev-qt/qtwayland-${QTMIN}:6= )
 	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[gui]
 		x11-libs/libX11
 		x11-libs/libXfixes
 		x11-libs/libxcb