gentoo auto-resync : 05:09:2024 - 12:28:40

14 files changed, 317 insertions, 75 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index a6db685f7d62..be4fcec2730b 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kde-cli-tools-common/Manifest b/kde-plasma/kde-cli-tools-common/Manifest
new file mode 100644
index 000000000000..a7e2f8c1e2e4
--- /dev/null
+++ b/kde-plasma/kde-cli-tools-common/Manifest
@@ -0,0 +1,3 @@
+DIST kde-cli-tools-6.1.4.tar.xz 629280 BLAKE2B accd7ffbfe0d52c4ab3bffbb2eff03f1f4ffd80b915cb9ed643fc3216d3ab23c373b29a24b273072e3ee3dddc3f72d258acee5ad9d25a8a869e16193c9413519 SHA512 8f06ef6e4eb1b070ecd2e52ca3e38c6aeb2bca3f3617dbf9a935d0a081bab71bd0d25b275ad6e19177dd8f7768b3dfd18a5b54f6074227d32e12b74c257d1689
+EBUILD kde-cli-tools-common-6.1.4.ebuild 368 BLAKE2B 9ece559df48074c3aaa0edfa0b7cb6f7cc476a1e1caea0ec7273c621fb9c293e00ec3f65d1dfbf8149fe885bf161c7b3f18b0639ceebbb76d5a3bbebfa704a13 SHA512 d3e84f89ffd1218e821f8663fc97013c992bcf3b80f10b749c23c96afbb819bdf5c86a44c82b69054ea86a66dbaecbe2773fd8293378881dd99cfb280fe3c580
+MISC metadata.xml 382 BLAKE2B 65e332d88052943d815597bae85a59fcc93ae16b2216202922007679f0dac8753cec074897dcd59c06ddccd2221977fb78e9b5fab34a6d752a2022fb93d42d65 SHA512 d767c9739c3a351a3d463c2e44cbb6b79b5673d9aeaecc429a3c177ab711aa510c2b83b97d5e3db3f6d8464444579cd07f73689c064cfb4cca1fc4e212fc3c6b
diff --git a/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.4.ebuild b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.4.ebuild
new file mode 100644
index 000000000000..4a4a993032f6
--- /dev/null
+++ b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common plasma.kde.org
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*"
diff --git a/kde-plasma/kde-cli-tools-common/metadata.xml b/kde-plasma/kde-cli-tools-common/metadata.xml
new file mode 100644
index 000000000000..7e9d56c900d5
--- /dev/null
+++ b/kde-plasma/kde-cli-tools-common/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/kde-cli-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index ade3bb901a59..7cee3cc4c158 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -2,6 +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-r2.ebuild 1422 BLAKE2B 0df654c4f1e1ecf766bf63164368625a5946def3f4ff4baae7407ebf3720a4178bab0e1f34578ab83660e29bf8936b5d89ef301cfe4f8fdeadf67b76fd0ec834 SHA512 9cf3ccca66f41403dd9aae0b773923a5b9455651711cbd1acce615285ffd102788f20825c20188562b4c495483e5ca281294a79ca307d0b777858d0bf75adb66
 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-r2.ebuild
index e018eaa50f6d..a4250961f995 100644
--- 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-r2.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 ECM_TEST="true"
 KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
 QTMIN=6.7.2
 inherit ecm plasma.kde.org
 
@@ -36,24 +35,24 @@ DEPEND="
 	>=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] )
+	>=${CATEGORY}/${PN}-common-${PV}
+	kdesu? ( >=${CATEGORY}/kdesu-gui-${PV} )
 "
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
 
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package kdesu KF6Su)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF6Su=ON
 		-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/kdesu-gui/Manifest b/kde-plasma/kdesu-gui/Manifest
new file mode 100644
index 000000000000..9019559b2d93
--- /dev/null
+++ b/kde-plasma/kdesu-gui/Manifest
@@ -0,0 +1,7 @@
+AUX kdesu-gui-5.27.11-build-only-kdesu.patch 2411 BLAKE2B 63c1d1b42e499470097daead457b694766a0a871001fec66fe966fc7391b567f982216df13b1973fac0e6153f4a56ac841cca860690ba43e9ed2ad502b969743 SHA512 9db751ec3b9dcffe26466c060729512b1cb287167c30727ed13c5338227c6943b2ae9ba7135c2f4e208442cd32b472d9b69c18df5411eb963b0268269eff0528
+AUX kdesu-gui-6.1.5-build-only-kdesu.patch 2043 BLAKE2B d938496e7276f468b72e3f8f8e1e1a623e57c0dbfff6882f53ef7f447f14ac835dfd858d2534d29424def3c1d04f12dd53e70f5b0c13f00bfa3a23c9d12fba91 SHA512 762e38da5e02f725418eadae0f90e8af42c8b53a3bb5814506b99c8b8f6517fa7cdebff574b900191462d9e989908f284256d5382a6ac534f4070bd1f681c1d4
+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 kdesu-gui-5.27.11-r1.ebuild 1063 BLAKE2B ed8623a6bb15054de14d59803a29be91ae164a7553cbd91f3da328d09514f6896dc451cd68968d0b4ba3b9c962924b207fa5f81f33e84e797588583f140f739c SHA512 187e8e232a4c39e7601fab289d91f5af2ad17178294e91d81da7eba91e351b40cc8bf06857bcb3804c2d466e67f0cc9e9a1c9a1c69eb189114cff39a46e53ec0
+EBUILD kdesu-gui-6.1.4.ebuild 1155 BLAKE2B 5796892e622ad670800cb747f7e892cb63335f4122b0affdcf6d74b8ab4dddfc1b75501977711e997f2cbbfd0b00fc574d5a61b44b43461b32e44a738cbb5c63 SHA512 84788dd37c504f17b1325c79c59ce54a09a95aa7feeb56eb6c1dcf93aff282331098d024c3d7eeaace6259e965129641a7d21d0a9486cdce46105f943f17b1a1
+MISC metadata.xml 382 BLAKE2B 65e332d88052943d815597bae85a59fcc93ae16b2216202922007679f0dac8753cec074897dcd59c06ddccd2221977fb78e9b5fab34a6d752a2022fb93d42d65 SHA512 d767c9739c3a351a3d463c2e44cbb6b79b5673d9aeaecc429a3c177ab711aa510c2b83b97d5e3db3f6d8464444579cd07f73689c064cfb4cca1fc4e212fc3c6b
diff --git a/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-build-only-kdesu.patch b/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-build-only-kdesu.patch
new file mode 100644
index 000000000000..ecca7f33a00b
--- /dev/null
+++ b/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-build-only-kdesu.patch
@@ -0,0 +1,87 @@
+From 879f2767224d79fd9b8636b0893f6a99483c98df Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 2 Sep 2024 23:18:46 +0200
+Subject: [PATCH] Make all KF5 and Qt5 modules optional, disable all subdirs
+ except kdesu
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fad18a81..6356d0c7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(ECMDeprecationSettings)
+ 
+ include(KDEGitCommitHooks)
+ 
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG COMPONENTS
+     Widgets
+     Svg
+     DBus
+@@ -44,7 +44,7 @@ if (NOT Qt${QT_MAJOR_VERSION}Test_FOUND)
+     set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+ endif()
+ 
+-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
++find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS
+     Config
+     DocTools
+     IconThemes
+@@ -87,31 +87,31 @@ function(install_compat_symlink executable_target)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${executable_target}5 DESTINATION ${KDE_INSTALL_FULL_BINDIR})
+ endfunction()
+ 
+-add_subdirectory(kcmshell)
+-add_subdirectory(keditfiletype)
+-add_subdirectory(kmimetypefinder)
+-if (QT_MAJOR_VERSION EQUAL "5")
+-    add_subdirectory(ktraderclient)
+-endif()
+-add_subdirectory(kioclient)
+-add_subdirectory(ksvgtopng)
+-add_subdirectory(kdeinhibit)
+-add_subdirectory(plasma-open-settings)
+-add_subdirectory(kinfo)
+-
+-if(Qt5X11Extras_FOUND)
+-    add_subdirectory(kstart)
+-endif()
++#add_subdirectory(kcmshell)
++#add_subdirectory(keditfiletype)
++#add_subdirectory(kmimetypefinder)
++#if (QT_MAJOR_VERSION EQUAL "5")
++#    add_subdirectory(ktraderclient)
++#endif()
++#add_subdirectory(kioclient)
++#add_subdirectory(ksvgtopng)
++#add_subdirectory(kdeinhibit)
++#add_subdirectory(plasma-open-settings)
++#add_subdirectory(kinfo)
++
++#if(Qt5X11Extras_FOUND)
++#    add_subdirectory(kstart)
++#endif()
+ 
+ 
+ if(KF5Su_FOUND)
+     add_subdirectory(kdesu)
+ endif()
+ 
+-if(UNIX)
+-    add_subdirectory(kdeeject)
+-    add_subdirectory(kbroadcastnotification)
+-endif()
++#if(UNIX)
++#    add_subdirectory(kdeeject)
++#    add_subdirectory(kbroadcastnotification)
++#endif()
+ 
+ check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
+ 
+-- 
+2.46.0
+
diff --git a/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-build-only-kdesu.patch b/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-build-only-kdesu.patch
new file mode 100644
index 000000000000..0679d9bf8501
--- /dev/null
+++ b/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-build-only-kdesu.patch
@@ -0,0 +1,72 @@
+From eacbe389502b4f89cb64dc24f10f3e8d2b5eb5c7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 2 Sep 2024 23:18:46 +0200
+Subject: [PATCH] Make all KF6 and Qt6 modules optional, disable all subdirs
+ except kdesu
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc435bca..234447e0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(ECMDeprecationSettings)
+ 
+ include(KDEGitCommitHooks)
+ 
+-find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
++find_package(Qt6 ${QT_MIN_VERSION} CONFIG COMPONENTS
+     Widgets
+     Svg
+     DBus
+@@ -44,7 +44,7 @@ if (NOT Qt6Test_FOUND)
+     set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+ endif()
+ 
+-find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
++find_package(KF6 ${KF6_MIN_VERSION} COMPONENTS
+     Config
+     DocTools
+     IconThemes
+@@ -78,23 +78,23 @@ function(install_compat_symlink executable_target)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${executable_target}5 DESTINATION ${KDE_INSTALL_FULL_BINDIR})
+ endfunction()
+ 
+-add_subdirectory(keditfiletype)
+-add_subdirectory(kmimetypefinder)
+-add_subdirectory(kioclient)
+-add_subdirectory(ksvgtopng)
+-add_subdirectory(kdeinhibit)
+-add_subdirectory(plasma-open-settings)
+-add_subdirectory(kinfo)
+-add_subdirectory(kstart)
++#add_subdirectory(keditfiletype)
++#add_subdirectory(kmimetypefinder)
++#add_subdirectory(kioclient)
++#add_subdirectory(ksvgtopng)
++#add_subdirectory(kdeinhibit)
++#add_subdirectory(plasma-open-settings)
++#add_subdirectory(kinfo)
++#add_subdirectory(kstart)
+ 
+ if(KF6Su_FOUND)
+     add_subdirectory(kdesu)
+ endif()
+ 
+-if(UNIX)
+-    add_subdirectory(kdeeject)
+-    add_subdirectory(kbroadcastnotification)
+-endif()
++#if(UNIX)
++#    add_subdirectory(kdeeject)
++#    add_subdirectory(kbroadcastnotification)
++#endif()
+ 
+ check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
+ 
+-- 
+2.46.0
+
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-5.27.11-r1.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-5.27.11-r1.ebuild
new file mode 100644
index 000000000000..cf92644003ea
--- /dev/null
+++ b/kde-plasma/kdesu-gui/kdesu-gui-5.27.11-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="false"
+KDE_ORG_NAME="kde-cli-tools"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Graphical frontend for KDE Frameworks' kdesu"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="0"
+KEYWORDS="~loong ~x86"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+"
+RDEPEND="${DEPEND}
+	!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*[kdesu(+)]
+	>=${CATEGORY}/${KDE_ORG_NAME}-common-${PV}
+	sys-apps/dbus[X]
+"
+
+PATCHES=( "${FILESDIR}/${P}-build-only-kdesu.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_install() {
+	ecm_src_install
+	dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-6.1.4.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-6.1.4.ebuild
new file mode 100644
index 000000000000..c4ba0b2f76d2
--- /dev/null
+++ b/kde-plasma/kdesu-gui/kdesu-gui-6.1.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="false"
+KDE_ORG_NAME="kde-cli-tools"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Graphical frontend for KDE Frameworks' kdesu"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdesu-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+"
+RDEPEND="${DEPEND}
+	!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*[kdesu(+)]
+	>=${CATEGORY}/${KDE_ORG_NAME}-common-${PV}
+	sys-apps/dbus[X]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-6.1.5-build-only-kdesu.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dosym ../libexec/kf6/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kdesu-gui/metadata.xml b/kde-plasma/kdesu-gui/metadata.xml
new file mode 100644
index 000000000000..7e9d56c900d5
--- /dev/null
+++ b/kde-plasma/kdesu-gui/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/kde-cli-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-plasma/print-manager/Manifest b/kde-plasma/print-manager/Manifest
index c955ce595ad6..38e26020ae21 100644
--- a/kde-plasma/print-manager/Manifest
+++ b/kde-plasma/print-manager/Manifest
@@ -1,6 +1,4 @@
-DIST print-manager-23.08.5.tar.xz 290620 BLAKE2B 3a29dd5e4684e966d95cd9db424a4b3c82889cf8c2d1fe99a4c9d27e6593979cdbd26c11c8bd1af8df98ca9c86d2557da96a31f914e4deac10e86c2a188f0a9d SHA512 28af8ea76d08e83a5cdf1ea5c2e6ff6314bb89b835ed6af2648219075a75ed3606eb7472a2ebeea2aceb67fc562838a3c554b8515f168f36510a4e07077974f3
 DIST print-manager-6.1.4.tar.xz 370456 BLAKE2B cdc4ca600161746e1a602b65e6a37137b5dd8619a073fbe1c2569b94ef26d1be0d71cb1abce941827cdf3835dea4178ba0f5011302b2661a6a0b540aa2001a4c SHA512 6f041893116b698ffaa140d59541e469cf5b5e2ecf7a613a038f1fe44dd4d784d24a336ec8f994d3cb6b75f20187c3b31e5014ae6f50d0f27ebc7297478ce88e
 EBUILD print-manager-23.08.5-r100.ebuild 333 BLAKE2B be514ab3449ecd57593507a57229d8735213a2229cc0bb72e96bac478717cc16405050658306b6295d07698bd4776332b70ce7ea6763101495239888b305c065 SHA512 7995643d45d2a914d1179748a904b31577bcd7ef1d5aad639f8c1ba11896837d349ad8003bbd8dd045c2726758b2404c49d61d441021568695e3be15171acb05
-EBUILD print-manager-23.08.5.ebuild 1853 BLAKE2B 6a63325beb5073b9ffa085f5f7e1447176aa8a090d47808f5c03dbbc2301bc13b99279ae6ed00ddf95ad9defe59ff1ca606daff51b972b17838169f3e88b6222 SHA512 b199470f93ed7012baee44a8262e4950532ab3c1a2b726cdb676119c700d24b1eaa5e0ee8a9d7ba0621529b8bb23dd9c8dcaebf4a5ea66512e63037ea0002b75
 EBUILD print-manager-6.1.4.ebuild 1975 BLAKE2B 1e1555e0efdb72c5c4116c63eca940fb7b62db3900e0a6d881f157d8bed1de84682999201a90a4eaf39768ac9dfe953722b9271c99da81752cd262340bf8d45d SHA512 a5c5919e1cc9a0d8e8a2540ab192b344017b372815a13e9661038afaea50eecc03787679f1ca8332ee506207eb4f0d555fb8780b67145720a75bac85ce8ee858
 MISC metadata.xml 452 BLAKE2B c24b456647acd7c47efb46ef742082dd5da3a66a8686baa785172e2747113f1e1147bbb82e58db1bb312dca882352bf46b5eb1cd5cbf76fff8cc15af01b3a7f7 SHA512 9ce3f10533c3251d5b8490620b2c3d53ee79482f45d1bf74d2426487e166d613ba8eb388618e14943e6a36c9c3675dc549b573c926445ab918559ac9064055a0
diff --git a/kde-plasma/print-manager/print-manager-23.08.5.ebuild b/kde-plasma/print-manager/print-manager-23.08.5.ebuild
deleted file mode 100644
index 7dce0e85c4e5..000000000000
--- a/kde-plasma/print-manager/print-manager-23.08.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Manage CUPS print jobs and printers in Plasma"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+gtk"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/libplasma-${KFMIN}:5
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	kde-plasma/kde-cli-tools:*
-	gtk? ( app-admin/system-config-printer )
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-	fi
-}