dev-util/*: Re-add ROCm 5.7.1 packages for now

It was not supposed to be dropped just yet.

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

10 files changed, 489 insertions, 0 deletions

diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 22eaa64ead4f..b72390d6c7fe 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -1,2 +1,3 @@
+DIST rocm-Tensile-5.7.1.tar.gz 12396002 BLAKE2B ec2c2bc3f07fe22abd800b642c998ea80b9e4e2d0d28c4763d574dbd2fcb14c735223ddc7571d4ab3a48f0bd819cc835c16df9882049c5bf56f25ef729e6d654 SHA512 8f356f36cfec74ee9b000d1180cf52077dc5c595e5c5a40792fc3eb13f3139980c7440f9bc912218f946cf8137e2481d23fe39f110511c1bb55fe85a933ffd36
 DIST rocm-Tensile-6.3.3.tar.gz 12723968 BLAKE2B e8c14f85dd44767b685595180974d683d759f84fc044e98974beae107f78ec97d43de30232ea0bd3578aa6cd40e17309d603ce583925ed4dd65cc146241e5b7d SHA512 836e17aab29ace976595c5b3fbc6b1742c774eb0420488a1449e04649c424e5a877168cf71de96fddcfbad337e295206ec456aea7649fe9e67a8802739ddbabe
 DIST rocm-Tensile-6.4.3.tar.gz 12731564 BLAKE2B b679ecf84cd023eecec8cef58729709f60b77615a76bc3215607c4e605b6057fa1c00e230d8c0ec9b24ca7f31c8e2e99dbffdfc732c3268958ea33d60962e256 SHA512 3d358d212ad52216520d391968578e3d6d7040f23c469e42b9fe6eea0a33034074df45d4a39a8978cc13f822f75a4cdfa850aa85c772ff4443276f9c4b9397a8
diff --git a/dev-util/Tensile/Tensile-5.7.1-r2.ebuild b/dev-util/Tensile/Tensile-5.7.1-r2.ebuild
new file mode 100644
index 000000000000..ec246a594074
--- /dev/null
+++ b/dev-util/Tensile/Tensile-5.7.1-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+ROCM_VERSION=${PV}
+inherit cmake distutils-r1 llvm prefix rocm
+
+LLVM_MAX_SLOT=17
+
+DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="client test"
+REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	client? ( dev-libs/boost )
+	>=dev-cpp/msgpack-cxx-6.0.0
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	=dev-util/hip-5*
+	>=dev-util/rocm-smi-4.3.0
+	llvm-core/clang:${LLVM_MAX_SLOT}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-output-commands.patch
+	"${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
+	"${FILESDIR}"/${PN}-5.4.2-use-ninja.patch
+	"${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch
+	"${FILESDIR}"/${PN}-5.7.1-fix-msgpack-dependency.patch
+)
+
+CMAKE_USE_DIR="${S}/${PN}/Source"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" \
+		"${FILESDIR}"/${PN}-5.7.1-gentoopath.patch > "${S}"/gentoopath.patch || die
+	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+
+	pushd ${PN} || die
+
+	sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \
+		-i Source/cmake/FindROCmSMI.cmake || die
+	sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \
+		-i Source/CMakeLists.txt || die
+
+	# ${Tensile_ROOT}/bin does not exists; call command directly
+	sed -e "s,\${Tensile_ROOT}/bin/,,g" -i cmake/TensileConfig.cmake || die
+
+	local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\""
+	sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die
+
+	sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \
+		-i ReplacementKernels.py Common.py ${PN}.py || die
+
+	sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die
+
+	popd || die
+
+	sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die
+	use client && PATCHES= cmake_src_prepare  # do not apply patches again in cmake_src_prepare
+}
+
+src_configure() {
+	distutils-r1_src_configure
+	if use client; then
+		local mycmakeargs=(
+			-DCMAKE_SKIP_RPATH=ON
+			-DTENSILE_USE_MSGPACK=ON
+			-DTENSILE_USE_LLVM=ON
+			-DTensile_LIBRARY_FORMAT=msgpack
+			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		)
+		CXX=hipcc cmake_src_configure
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	use client && cmake_src_compile
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto Tensile
+	pushd Tensile || die
+	python_domodule Components
+	python_newexe Utilities/merge.py ${PN}-merge
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	pushd ${PN} || die
+	insinto /usr/share/${PN}
+	doins -r Configs Perf ReplacementKernels-cov3 Source CustomKernels
+	insinto /usr/$(get_libdir)/cmake/${PN}
+	doins cmake/*.cmake
+
+	if use client; then
+		pushd "${BUILD_DIR}" || die
+		dobin client/tensile_client
+	fi
+}
+
+# Test suite fails to start without this
+python_test() {
+	export ROCM_PATH="${EPREFIX}/usr"
+	epytest
+}
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index d14b6335a6b1..16fe129a84d0 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -1,6 +1,9 @@
+DIST hip-5.7.1.tar.gz 553774 BLAKE2B f88c235f688d3a662ec6cb4ad7fe3f82c0015015997871609cc30ab5b2f7fcb9709a08683d77194e45a6dbbe1d24c6355b128d2ecf655f1dea3468711c64e0a3 SHA512 68fa8753725b53c999d102d254c6b1dba53af4e00d6a48db93d10213cc02eec30b4a39c66e773d4f625dd9636cf8b0c5faa05b69fac27cf5a6b19dd3ddd2b905
 DIST hip-6.3.3.tar.gz 1486598 BLAKE2B 998b28786c0b156cd1c23a01ce284206d1ad5cad1f207676b9d40994dc4f60d16a1f0804cfa287622826d78871ee19d2b5aa78dc29a69fe54ab50f08652bfd26 SHA512 70544467c5c262fab1e9415f5e77d0ec3b4635b6fa104de5d7ab2da0e2ca88fe40ce716068e50eaa17a807516cd41e2c0af22bcada3a1f7de50aa88283850e38
 DIST hip-6.4.3.tar.gz 1755257 BLAKE2B 3db2d35a71ca2802e95043c5ef6d50db56b3e1412dcdb08ba7083675cccb898d2b06c2afdfc0e0f53648d09d2aa84f91cca00ecf297caa2784d07aae4b3573b6 SHA512 1fa32ca7f9f2024e66cbe0bd8faaeeaf5240ce2f962f5bfa29815ff7bdcf5c4c4dac2d0d0354c3a5215df6ebec1e1b32bc10e560d9292a0bd019da1773724e54
 DIST hip-test-6.3.3.tar.gz 1446849 BLAKE2B 474194bd7cef54af85eab0bc8fdfbe2360a9a22ab27f9014ebbb22f03952bfc014d682e2a0cbf90fcd365b4295df266a64419deebbce38aa7b5b7af9c979cc20 SHA512 65bde402804e95a09142bc2a9866bbef14068b63d09236d70086e15c3927ef29fb75d0859a90aa4bc75ebe03f94da85284b233fb41b95246bb45d1d8fee172ed
 DIST hip-test-6.4.3.tar.gz 1570417 BLAKE2B 5b6bd3d1fcaaf724061ed686b6edc08b7ba308557ae0cb22785a04bc17b48aace50225a5e3c756a28bc741bb8fcaac8bff18b17f99a4458427b3489fef7dcd44 SHA512 5eed7da562f3807bb6ea8d737115dd45b775c2588c4131f2a19206d125b2b53d8adccbe189953219dd1091f18f08badec81cba524951b8a69626df9075db7a1c
+DIST rocm-5.7.0.tar.gz 845881 BLAKE2B 08255edc1407e5ef85895336b11496319695318fce265565728ad75175b5e1dfab98f696fee2d27e60c48e862f721fad4c53118cc70b807353fff5f97ed72ac2 SHA512 72420e16c7cfe9687e030331838666dabaa43d686bdad1d109431e44db99070a2cf6dd64b59e3275019abedd6612f6008c798a79275e7225b6b122fb9f644660
+DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
 DIST rocm-clr-6.3.3.tar.gz 2095704 BLAKE2B bdb315fc9f1f9c76aa2a345bd48a600c81f3b72eb68fee8862b5e155e7519bef6f6421698a43358c6fe0200bb0b6924ff819860d9a91a5c07fc3e9d44eeb1b16 SHA512 94d2959b981b324e0dae2d06e86c72cd01fa495de081666bcec2445c02bada22aa60e94ecac0ee63e70e52275f92caeefcb6dc96a3f0fba593896be7b0d8ab42
 DIST rocm-clr-6.4.3.tar.gz 2126045 BLAKE2B eadeaa050e684373883faadfbf42d6b4152979154587afb1a2583bf9ddfb3ff9ab9787a433c8f380ac52012732ff2f68892ab256ec76f32557c164e9551745af SHA512 38daec86ea9c8e60f420b4eec5e96d88a4e51585dcbb7352bec27f0c712f4b856f413c42e2585c031a81e8046065d76763c624500ba786ae0e9133278f00418c
diff --git a/dev-util/hip/hip-5.7.1-r2.ebuild b/dev-util/hip/hip-5.7.1-r2.ebuild
new file mode 100644
index 000000000000..6ce532c4c58a
--- /dev/null
+++ b/dev-util/hip/hip-5.7.1-r2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_SKIP_GLOBALS=1
+
+inherit cmake docs flag-o-matic llvm rocm
+
+LLVM_MAX_SLOT=17
+
+TEST_PV=5.7.0 # No hip-test-5.7.1 release
+
+DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
+HOMEPAGE="https://github.com/ROCm/hipamd"
+SRC_URI="https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
+	https://github.com/ROCm/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
+	test? ( https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz )"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RESTRICT="!test? ( test )"
+IUSE="debug test"
+
+DEPEND="
+	=dev-util/rocminfo-5*
+	llvm-core/clang:${LLVM_MAX_SLOT}
+	dev-libs/rocm-comgr:${SLOT}
+	>=dev-libs/rocr-runtime-5.6
+	<dev-libs/rocr-runtime-6
+	x11-base/xorg-proto
+	virtual/opengl
+"
+BDEPEND="test? ( =dev-util/hipcc-5* )"
+RDEPEND="${DEPEND}
+	=dev-util/hipcc-5*
+	dev-perl/URI-Encode
+	llvm-runtimes/clang-runtime:=
+	>=dev-libs/roct-thunk-interface-5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.0-install.patch"
+	"${FILESDIR}/${PN}-5.7.1-fix-unaligned-access.patch"
+	"${FILESDIR}/${PN}-5.7.1-exec-stack.patch"
+	"${FILESDIR}/${PN}-5.7.1-disable-stack-protector.patch"
+	"${FILESDIR}/${PN}-5.7.1-no_asan_doc.patch"
+	"${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
+	"${FILESDIR}/${PN}-5.7.1-fix-mmap-oom-check.patch"
+)
+
+S="${WORKDIR}/clr-rocm-${PV}/"
+TEST_S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
+
+hip_test_wrapper() {
+	local CMAKE_USE_DIR="${TEST_S}"
+	local BUILD_DIR="${TEST_S}_build"
+	cd "${TEST_S}" || die
+	$@
+}
+
+src_prepare() {
+	# Set HIP and HIP Clang paths directly, don't search using heuristics
+	sed -e "s:# Search for HIP installation:set(HIP_ROOT_DIR \"${EPREFIX}/usr\"):" \
+		-e "s:#Set HIP_CLANG_PATH:set(HIP_CLANG_PATH \"$(get_llvm_prefix -d ${LLVM_MAX_SLOT})/bin\"):" \
+	    -i "${WORKDIR}"/HIP-rocm-${PV}/cmake/FindHIP.cmake || die
+
+	# https://github.com/ROCm/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3
+	# https://github.com/ROCm/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e
+	# Migrated to hip-test, but somehow the change is not applied to the tarball.
+	rm -rf "${WORKDIR}"/HIP-rocm-${PV}/tests || die
+	sed -e '/tests.*cmake/d' -i hipamd/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	if use test; then
+		local PATCHES=(
+			"${FILESDIR}"/hip-test-5.7.0-rocm_agent_enumerator-location.patch \
+			"${FILESDIR}"/hip-test-5.7.1-remove-incompatible-flag.patch
+		)
+		hip_test_wrapper cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/858383
+	# https://github.com/ROCm/clr/issues/64
+	#
+	# Do not trust it for LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# Workaround for bug #923986
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+		-DCMAKE_BUILD_TYPE=${buildtype}
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_HIPIFY_CLANG=OFF
+		-DHIP_PLATFORM=amd
+		-DHIP_COMMON_DIR="${WORKDIR}/HIP-rocm-${PV}"
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DUSE_PROF_API=0
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DCLR_BUILD_HIP=ON
+		-DHIPCC_BIN_DIR="${EPREFIX}/usr/bin"
+		-DOpenGL_GL_PREFERENCE="GLVND"
+	)
+
+	cmake_src_configure
+
+	if use test; then
+		local mycmakeargs=(
+			-DROCM_PATH="${BUILD_DIR}"/hipamd
+			-DHIP_PLATFORM=amd
+			-DCMAKE_MODULE_PATH="${TEST_S}/external/Catch2/cmake/Catch2"
+		)
+		hip_test_wrapper cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use test; then
+		HIP_PATH="${BUILD_DIR}"/hipamd \
+			hip_test_wrapper cmake_src_compile build_tests
+	fi
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/hipamd/lib"
+
+	# TODO: research how to test Vulkan-related features.
+	local CMAKE_SKIP_TESTS=(
+		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write
+		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Negative_Parameters
+		Unit_hipImportExternalMemory_Vulkan_Negative_Parameters
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Negative_Parameters
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Negative_Parameters
+		Unit_hipImportExternalSemaphore_Vulkan_Negative_Parameters
+		Unit_hipDestroyExternalSemaphore_Vulkan_Negative_Parameters
+	)
+
+	MAKEOPTS="-j1" hip_test_wrapper cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# add version file that is required by some libraries
+	mkdir "${ED}"/usr/include/rocm-core || die
+	cat <<EOF > "${ED}"/usr/include/rocm-core/rocm_version.h || die
+#pragma once
+#define ROCM_VERSION_MAJOR $(ver_cut 1)
+#define ROCM_VERSION_MINOR $(ver_cut 2)
+#define ROCM_VERSION_PATCH $(ver_cut 3)
+#define ROCM_BUILD_INFO "$(ver_cut 1-3).0-9999-unknown"
+EOF
+	dosym -r /usr/include/rocm-core/rocm_version.h /usr/include/rocm_version.h
+
+	rm "${ED}/usr/include/hip/hcc_detail" || die
+
+	# files already installed by hipcc, which is a runtime dep
+	rm "${ED}/usr/bin/hipconfig.pl" || die
+	rm "${ED}/usr/bin/hipcc.pl" || die
+	rm "${ED}/usr/bin/hipcc" || die
+	rm "${ED}/usr/bin/hipconfig" || die
+	rm "${ED}/usr/bin/hipvars.pm" || die
+}
diff --git a/dev-util/rocm_bandwidth_test/Manifest b/dev-util/rocm_bandwidth_test/Manifest
index 0c590352f4f6..494cc2d6dc76 100644
--- a/dev-util/rocm_bandwidth_test/Manifest
+++ b/dev-util/rocm_bandwidth_test/Manifest
@@ -1,2 +1,3 @@
+DIST rocm_bandwidth_test-5.7.1.tar.gz 38769 BLAKE2B 5880c4bb50d4daf87581424c2fb208363d2d34f848d3ced163b3809e5dff4e56996abf3edc6f8c8ca75f55d95b92604de6ee0c333930d32c7c52c8bcdb6562e6 SHA512 7da08b7a9bbde34e3b2b799e47e490d34dc69225b9d5efe103fd23f3a417fc7a48dcc813d2669ee4506f6699c4576c549f982a4a76a92d83447d6fab709f5042
 DIST rocm_bandwidth_test-6.3.3.tar.gz 45541 BLAKE2B c00ecafdc7bea482047362da741e45ddf4c4f5a39e677defcde845c27629ab7e1e83ac15f36d59707cbad1225166051a558d659c0e71e08a4602682e2095d394 SHA512 05bee2828a9b0b2e4137b5ff38692509c112072348bea6c3ee21553bd38f79a876a470ee390d4d47fd0ba0b9d9847be6a82a0c2c8b871868b9abad55beea9b33
 DIST rocm_bandwidth_test-6.4.3.tar.gz 44901 BLAKE2B 6d5c1c716b93727094df991dafd590af14459d2350fe7b31ba5ca190f71cc15e2c26f5fe12738fbb53513d02c33b3075e99fa135eab2411dcc2811a6fd60993b SHA512 31fe4988145e9756f64c7e8d0731a1e1cbf4140e13d3da51fabfdf10e9803a8c32a65d78776ffb13bf9ad718c65a8b91bb30c3d66c069c00446ff51d6bfd040a
diff --git a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.7.1.ebuild b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.7.1.ebuild
new file mode 100644
index 000000000000..da369dcff695
--- /dev/null
+++ b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Bandwidth test for ROCm"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_bandwidth_test"
+SRC_URI="https://github.com/RadeonOpenCompute/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/rocr-runtime:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# the autodetection logic here is very very confused. This makes it not fail.
+	sed -i -e 's/if(${hsa-runtime64_FOUND})/if(false)/' CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -rfv "${ED}"/usr/share/doc/rocm-bandwidth-test
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 29ad35991358..143ccec51ed9 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,2 +1,3 @@
+DIST rocminfo-5.7.1.tar.gz 17302 BLAKE2B 395c695ed0b79c771c4240310c457aec893ffd889ddd551866753d2a0c8d4e98399672d74a7114a89faf8b1960dd54fbb0425ea00f7d15e5c740e33ce4046d0b SHA512 38726bc52bd045b6281cccd702706fd6ea5b57cdc421ad23106d5447a002f4b530e8d4e4430d2bb8eb30803af3bacdaf34646a965cea26f42d726bf7f6aafbab
 DIST rocminfo-6.3.3.tar.gz 27221 BLAKE2B bcdb16a7087cdb321044bea6baca013b8592eb99a7a91ffdae3f7150d21c1ff804cb6620eadf6ec9ee2fd5d3d0c9205d731c36fc671f10582b79a0b7bca307e9 SHA512 29c05366833f93ca43b7bf661205c3c427c33425bfbea972648e011eca316fb8fb60c2fdc80e44959ef845a9ff04ed658225c88d83c1440c750f2967d79ca5c7
 DIST rocminfo-6.4.3.tar.gz 27947 BLAKE2B 8010179996b3b625dcdbb7441eeb85253ae3f72eaefb3ec507704ed8b131a7dc2ddcff5d162da0c73d23ba062fa9c776695ebf3cada880df5a287a69de2b5415 SHA512 2e7a7a4499614feeb0aaa3833662b6c391b7ea694db8887669408136d4dab66e546758b8ccdc8e8df6c4afc2fed0688716414d207208562ddac1731883304067
diff --git a/dev-util/rocminfo/rocminfo-5.7.1-r1.ebuild b/dev-util/rocminfo/rocminfo-5.7.1-r1.ebuild
new file mode 100644
index 000000000000..4b5df7bd0033
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-5.7.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+inherit cmake python-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="UoI-NCSA"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.0-detect-builtin-amdgpu.patch"
+	"${FILESDIR}/${PN}-6.0.0_python-3.12.patch"
+)
+
+src_prepare() {
+	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
+	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" \
+		-i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/rocm_agent_enumerator" || die
+	python_foreach_impl python_doexe rocm_agent_enumerator "${BUILD_DIR}"/rocm_agent_enumerator
+}
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 8aff605570e5..71cfe93fe754 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,2 +1,3 @@
+DIST roctracer-5.7.1.tar.gz 354686 BLAKE2B 2e72d8df5cf53a913102a715dab55f7c6d33b2d4a9cad7647a61824deba0363cf3dbf96d8de3469a78d6b5c8e517c163c303bf6aa12eeaf8e43f82ac8381ef97 SHA512 62cf62fc505955426596bd6d539c92f4d730d90d820d817343525f1b7be693290727c8c447ca98b1a0e46d1d188b62b3f4fafcf6bffbf2479fc5d937fb354e13
 DIST roctracer-6.3.3.tar.gz 397370 BLAKE2B dff4c796b7284c2107ef0d308ee16d640aab6e9ce49c769a84352837f3e29e24e09e71d5a1d1fe19d22d218e607e85f7fbe6b43ff1a0a1f6e04aa859baefd054 SHA512 50ee107b7c8676dd5d41d2b9433fce701807b954b3d6624c25c32d057bd3a50ad2c7f853cb287c7bb5dd1f5fe2c3b0ec4a7cb082d5ef545c17f2ae2644c1df7c
 DIST roctracer-6.4.3.tar.gz 398024 BLAKE2B bde34efb9640af84ae044a6fd507cdb1722e2f2f0610a7c1db176184c431af29f371a5d049eaa7cff5bb80e2f5db85430257d83527c11f5fde86f5f6b9442251 SHA512 c929786e2fbc34082d6d99c1f68e2ffd0eef1f9be31a6ccb385e50ec5059069b9d364f7a90301f184c966c01f9dfbd6cc6c1a4e8f5065c25d5f4d7673e42aad0
diff --git a/dev-util/roctracer/roctracer-5.7.1-r1.ebuild b/dev-util/roctracer/roctracer-5.7.1-r1.ebuild
new file mode 100644
index 000000000000..6c36347c9931
--- /dev/null
+++ b/dev-util/roctracer/roctracer-5.7.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+LLVM_MAX_SLOT=17
+ROCM_VERSION=${PV}
+
+inherit cmake prefix python-any-r1 rocm llvm
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer"
+SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/rocr-runtime
+	dev-util/hip"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/cppheaderparser[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}"/roctracer-5.7.1-with-tests.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/cppheaderparser[${PYTHON_USEDEP}]" \
+		"dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	hprefixify script/*.py
+	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.3.3-rocm-path.patch)
+
+	# Install libs directly into /usr/lib64
+	sed -e 's:${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}:${CMAKE_INSTALL_LIBDIR}:g' \
+		-i src/CMakeLists.txt plugin/file/CMakeLists.txt || die
+
+	# Remove all install commands for tests
+	sed -E '/^ *install\(.+/d' -i test/CMakeLists.txt || die
+
+	# Fix search path for HIP cmake
+	sed -e "s,\${ROCM_PATH}/lib/cmake,/usr/$(get_libdir)/cmake,g" -i test/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake/hip"
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DWITH_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DCMAKE_FIND_DEBUG_MODE=ON
+		-DHIP_ROOT_DIR="${EPREFIX}/usr"
+		-DHIP_CLANG_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin"
+		-DGPU_TARGETS="$(get_amdgpu_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
+	# if LD_LIBRARY_PATH not set, dlopen cannot find correct lib
+	LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" bash run.sh || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}