diff --git a/dev-debug/kdbg/Manifest b/dev-debug/kdbg/Manifest
index fece8a07c0ad8..2b6ec4eb9f253 100644
--- a/dev-debug/kdbg/Manifest
+++ b/dev-debug/kdbg/Manifest
@@ -1,2 +1,4 @@
 DIST kdbg-3.1.0_p20250201-patchset.tar.xz 6276 BLAKE2B 83f0fc47e30332f33c1022c3485369d4c736394016a0b7aecf9bc693e3882949ba7d76077bf0de9a96cf665444ce07d0ac8244efd3d718b7e816c99c5f0fdb07 SHA512 b6e9b5d0abdb4ff9f78656ad9ac28fa1522bac4b9f709af94edc551558a8ce730bbea9d26d92b7ef2da0c2b9b447178569d8e32c86151c796c6953207c27ddde
 DIST kdbg-3.1.0_p20250201.tar.gz 454667 BLAKE2B bb05461138cb004d35e85e911003d1d6546816beab907bcc5edbf70106492fdf85451d287fb9718d7aa453fd9f0266cf96d1f996eddba7fe1976f417f1a277e2 SHA512 34661030efa3314fe880c23a19d25d75b82fa689332c38b1cace0a4f729b564806fb64481404dd82daa149498e89e57eea17c5cab919cf65316c5c433afe1bc4
+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
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 0000000000000..de9a311f996b9
--- /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
+}