diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index bd8dc45bd4ba6..a241c7c505146 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -3,3 +3,4 @@ DIST roct-thunk-interface-6.1.1.tar.gz 666377 BLAKE2B b30d733fb769f7169e97b8a28e
 DIST roct-thunk-interface-6.1.2.tar.gz 666380 BLAKE2B ffff2405bbb95a6908670a23cf6090147a5669f8ab0c999047203731c99c511738a33ac8d3fc0f0e5432e3744e948ec3fe658d6a578ecc63606c8a5662025b0a SHA512 083b1a865608016f78c094a27ece3858072e72d80e1322e7cef22261222a0f868d3b72ebfcd80a11e4719e90d3d3fc7b0c683aed77714f54f520bb126b13ab7c
 DIST roct-thunk-interface-6.3.2.tar.gz 2260102 BLAKE2B 706cd4cc61c3007aec2b7822c02a7c98399454b366f2a2c221ae53ea3ee4c288c47c7fcfbe8f1cbd38d071ab5c90a2d79c054a0b0d2a2f6892a051b843794d32 SHA512 0326242deae601275d71fb268781735b117e713e73b1bcac2fd732828d993dee5840dec011fdc4350be2afdbc8266b6d1b65d5dff0d465a5b9c9cc091a5c645c
 DIST roct-thunk-interface-6.3.3.tar.gz 2260073 BLAKE2B bca4a1809a90a4009b7f1f6e97764ab2f6d235b1c8d16d0417309c6484b2449ff807d248fe05e97867a10e660a86345c442a055081faefa17bbdf6a55b981867 SHA512 5b59d817f0fe5c87cb6eb639c8d1b8e5814b7b236eb961c9b7e2ade81163710b4cebb63f45cdf508a9ae6eb5dc380a63c09b9aa44cb082fe2b85c727efed8061
+DIST roct-thunk-interface-6.4.1.tar.gz 2291908 BLAKE2B be905dc864e4488e35c37480f889c29179523a1d95441d3b6bd7c531f273beaa3048c65d16570aa223db02692098408abd9bf310a3e5b8b9ce59f9fae1b5ebad SHA512 f12b5bb6437629264bbc6699bbde974857fba50059d515dec42257729d9e57a2d2dcfb68237082b4d7506e0d37278828f9e5693c45698aeb84fbb54a1f332646
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.4.1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.4.1.ebuild
new file mode 100644
index 0000000000000..2d16066e27244
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.4.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 20 )
+ROCM_SKIP_GLOBALS=1
+inherit cmake flag-o-matic linux-info llvm-r1 rocm
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/libhsakmt"
+else
+	SRC_URI="https://github.com/ROCm/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/libhsakmt"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/ROCm/ROCR-Runtime/tree/amd-staging/libhsakmt"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	x11-libs/libdrm[video_cards_amdgpu]"
+DEPEND="${RDEPEND}
+	test? (
+		$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')
+		dev-cpp/gtest
+	)"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.0-functions.patch"
+	"${FILESDIR}/kfdtest-6.1.0-skipIPCtest.patch"
+	"${FILESDIR}/kfdtest-6.2.4-fix-llvm-header.patch"
+)
+
+test_wrapper() {
+	local S="$1"
+	shift 1
+	local CMAKE_USE_DIR="${S}"
+	local BUILD_DIR="${S}_build"
+	cd "${S}" || die
+	"$@"
+}
+
+src_prepare() {
+	sed -e "s/get_version ( \"1.0.0\" )/get_version ( \"${PV}\" )/" -i CMakeLists.txt || die
+
+	# https://github.com/ROCm/ROCR-Runtime/issues/263
+	sed -e "s/\${HSAKMT_TARGET} STATIC/\${HSAKMT_TARGET}/" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_SLOT}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+
+	if use test; then
+		# ODR violations (bug #956958)
+		filter-lto
+
+		export LIBHSAKMT_PATH="${BUILD_DIR}"
+		test_wrapper "${S}/tests/kfdtest" cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use test; then
+		LIBRARY_PATH="${BUILD_DIR}" test_wrapper "${S}/tests/kfdtest" cmake_src_compile
+	fi
+}
+
+src_test() {
+	check_amdgpu
+	TESTDIR="${S}/tests/kfdtest_build/"
+	cd "${TESTDIR}" || die
+	PATH="${PATH}:${TESTDIR}" ./run_kfdtest.sh
+}