diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index 953a3fdd2edc7..6d937de2039d7 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1 +1,2 @@
 DIST heaptrack-1.5.80_pre20250110-5d8bfe44.tar.gz 9485092 BLAKE2B 86c04c9892a845c382b8c28248c6230517fff3ed536f773e8cd24b73c1655e08d571bb351b606aca4f0147141256f2496f119d5406a04f8da89f58de29c969db SHA512 019882341d4e046b5a1f7f8873227f455995ce1c837efa1f934c17578b41e13fa8dd4c6a20edaaea4e2e9659b43e9631c1cb3d4ccd87108f5c4342889374dff1
+DIST heaptrack-1.5.80_pre20250331-0fb2eb51.tar.gz 9486961 BLAKE2B aecf5da2278f81da07ca02d735b5f7520c6d6dbddd6035fb8d3819eb251865992253d41d6509c8d05adbd908bd0cb683182fe41cf341e8808ecd35f2578c11ee SHA512 20c18c5119d1bb7cd78bc1b8faa00c4a61eaaf524da6948d75ba9bd1d96b62ea00aeb42ad5daf47b7edca9a77051a7a2c3508e28b01876d0a716e4196590e45a
diff --git a/dev-util/heaptrack/heaptrack-1.5.80_pre20250331.ebuild b/dev-util/heaptrack/heaptrack-1.5.80_pre20250331.ebuild
new file mode 100644
index 0000000000000..440ef9ac6be1b
--- /dev/null
+++ b/dev-util/heaptrack/heaptrack-1.5.80_pre20250331.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=0fb2eb516b5d762f202195f8f439bbf1ea463880
+inherit cmake kde.org xdg
+
+DESCRIPTION="Fast heap memory profiler"
+HOMEPAGE="https://apps.kde.org/heaptrack/
+https://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS=""
+IUSE="+gui test zstd"
+
+RESTRICT="!test? ( test )"
+
+# TODO: unbundle robin-map
+DEPEND="
+	dev-libs/boost:=[zstd?,zlib]
+	sys-libs/libunwind:=
+	sys-libs/zlib
+	gui? (
+		dev-libs/kdiagram:6
+		dev-qt/qtbase:6[gui,widgets]
+		kde-frameworks/kconfig:6
+		kde-frameworks/kconfigwidgets:6
+		kde-frameworks/kcoreaddons:6
+		kde-frameworks/ki18n:6
+		kde-frameworks/kio:6
+		kde-frameworks/kitemmodels:6
+		kde-frameworks/kwidgetsaddons:6
+		kde-frameworks/threadweaver:6
+	)
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	gui? ( >=kde-frameworks/kf-env-4 )
+"
+BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# This doesn't exist in libunwind (bug #898768).
+	unw_backtrace_skip
+)
+
+src_prepare() {
+	cmake_src_prepare
+	rm -rf 3rdparty/boost-zstd || die # ensure no bundling
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHEAPTRACK_USE_QT6=ON
+		-DHEAPTRACK_BUILD_GUI=$(usex gui)
+		-DBUILD_TESTING=$(usex test)
+		$(cmake_use_find_package zstd ZSTD)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	use gui && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use gui && xdg_pkg_postrm
+}
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
index e4c530eac199c..12471bad5b167 100644
--- a/dev-util/heaptrack/heaptrack-9999.ebuild
+++ b/dev-util/heaptrack/heaptrack-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake kde.org xdg-utils
+inherit cmake kde.org xdg
 
 DESCRIPTION="Fast heap memory profiler"
 HOMEPAGE="https://apps.kde.org/heaptrack/
@@ -61,15 +61,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
+	use gui && xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
+	use gui && xdg_pkg_postrm
 }