gentoo auto-resync : 08:04:2025 - 08:43:11

4 files changed, 56 insertions, 44 deletions

diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index 4316f758ce9a..aedc2da8c5bb 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/kdbg/Manifest b/dev-debug/kdbg/Manifest
index 075de656a32a..92188782d537 100644
--- a/dev-debug/kdbg/Manifest
+++ b/dev-debug/kdbg/Manifest
@@ -1,3 +1,4 @@
-DIST kdbg-3.1.0.tar.gz 444052 BLAKE2B d0083094f8ba3cb374b2df4a20b7697ddae4fb24579e18d883701a5e826e86041a8cdb7bd1919c881bc149c49e764221eb246d98bcebacbffbdb5e0f83264ad6 SHA512 e7da5bb1a4882b031077bd4344c6795b058088eb9a00ef3a2ba9c3d72c0a022bb16822525369ca7bcfb623c775cf73140caa114c1591d37f1d6f6a3b22ae649b
-EBUILD kdbg-3.1.0.ebuild 1020 BLAKE2B 18df3ef03bc422ad59c730db3755e43d1637e7d4f89c470950a751f371c47e00e7d5ecabb5b9760f6078c93224a78aa254a4d111682da3fb380e9c0cc6357526 SHA512 0ef5500e7c8c356a09e8a5fbe6712682a0808f7632ff628c8af757466b468da789cdb7443ff7b126ec317ee3acebdedfb7e5b33e7711d52274e6fa103cab5e24
+DIST kdbg-3.1.0_p20250406-patchset.tar.xz 3812 BLAKE2B bbdc08408b9ff123dcd3e283f8862e541031646e4a303dbe0c311571282ddf6a7d580fb68637def3685d779f598c7ea2b4f5b280963629bd964c0ae408e0ddd6 SHA512 6cce46cb257cedb31c13fa556ec6c5ca0ba558ac1fb21e29be99996011c8077e3563bb39e0895c84c66e3246d871a51a6cdc3157c9cda9f06569090add3e53be
+DIST kdbg-3.1.0_p20250406.tar.gz 454669 BLAKE2B c4aafba0df4841d972dc3c48d8ac0cfaa4ea9dd4a689105fb4f93ed82595b0a058d798b42243ac9475125855fa2130587ba0e2dd9f5cf9c40c699b85f6bdb9d6 SHA512 57bb250251c43e83fc1897c3798cb8ae740e2b549014cdc54d44fb9775bff7ab786acfddfc5b0f159b9d22c39b84793236fbf6db712c00df8f8938b196a56454
+EBUILD kdbg-3.1.0_p20250406.ebuild 1576 BLAKE2B fdb361aee8120da71a5e3e0022ded38f7c662377b22bf90144afe9da826ec43b13d627f4efc837f6e53354c564c0fcaa4932477b154e4a5e9b6cb8427e6757ca SHA512 47d70945008440c70df21679114716adda596f5ecaa809e9373301f354b3bae38c0ecfe9572b3e77d6ad7fc35630df9deda250091431b97e304fe0a21bdc93e0
 MISC metadata.xml 372 BLAKE2B f633a86dc35ba0a596d161b7789f01b22b32c4f501c9a5b68701ad352555956a433dadbf8856c1fdb0f331abb39fc89caee0cf2da6cf295095be993b24d1f414 SHA512 9f19dcf19b03626e2263f3bfccc611e6013da09b97de69a6673c5e79b9f1c1b3622d540d6e49bff59ced02f632ccc4b8734950690c4363556fa622edb3e576d9
diff --git a/dev-debug/kdbg/kdbg-3.1.0.ebuild b/dev-debug/kdbg/kdbg-3.1.0.ebuild
deleted file mode 100644
index 81d583500276..000000000000
--- a/dev-debug/kdbg/kdbg-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-KFMIN=5.85.0
-QTMIN=5.15.2
-inherit ecm
-
-DESCRIPTION="Graphical debugger interface"
-HOMEPAGE="https://www.kdbg.org/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-debug/gdb
-"
-
-src_prepare() {
-	# allow documentation to be handled by eclass
-	mv kdbg/doc . || die
-	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
-	echo 'add_subdirectory(doc)' >> CMakeLists.txt || die
-
-	ecm_src_prepare
-}
diff --git a/dev-debug/kdbg/kdbg-3.1.0_p20250406.ebuild b/dev-debug/kdbg/kdbg-3.1.0_p20250406.ebuild
new file mode 100644
index 000000000000..de9a311f996b
--- /dev/null
+++ b/dev-debug/kdbg/kdbg-3.1.0_p20250406.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="78450aec94de5c2c5e07f9a448f454ebe39e4fc0"
+PATCHSET="${P}-patchset.tar.xz"
+ECM_HANDBOOK="true"
+KFMIN=6.9.0
+QTMIN=6.8.1
+inherit ecm
+
+DESCRIPTION="Graphical debugger interface"
+HOMEPAGE="https://www.kdbg.org/"
+SRC_URI="https://github.com/j6t/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=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/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+	dev-debug/gdb
+"
+
+# Patchset containing queued up upstream MRs, in order:
+# https://github.com/j6t/kdbg/pull/48 (only partially picked)
+# https://github.com/j6t/kdbg/commit/2e5de789 (Switch to KX11Extras)
+# https://github.com/j6t/kdbg/pull/49 (Cast to QChar)
+# https://github.com/j6t/kdbg/pull/50
+PATCHES=( "${WORKDIR}"/${PATCHSET/.tar.xz/} )
+
+src_prepare() {
+	ecm_src_prepare
+	# TODO: raising ECM leads to many more deprecations erroring out:
+	sed -e "/^find_package(ECM/ s/\${KF_MIN_VERSION} //" -i CMakeLists.txt || die
+	if ! use handbook; then
+		cmake_run_in kdbg cmake_comment_add_subdirectory doc
+	fi
+}