gentoo auto-resync : 27:06:2024 - 07:59:39

3 files changed, 105 insertions, 2 deletions

diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 09b1bca32d8a..3f7eff645618 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -13,7 +13,9 @@ DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7f
 DIST rocm-tracer-5.3.3.tar.gz 353041 BLAKE2B b7614707ae3af2f5a46d058dacadfb0ef3b980963ac49face66a80c8396e66cf13e0430ab41737ba15e163f5da03697376b13238ea1decfe7ee4a7f31c7664a5 SHA512 95a202f76f6b68a35942750233bd09d372a9be843150d7ec02824da13c6b9a7c8da7a752ac69f66776e7ccfb6176473745dc46a7baadfe77c99c0596fbc2ffeb
 DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
 DIST roctracer-5.7.1.tar.gz 354686 BLAKE2B 2e72d8df5cf53a913102a715dab55f7c6d33b2d4a9cad7647a61824deba0363cf3dbf96d8de3469a78d6b5c8e517c163c303bf6aa12eeaf8e43f82ac8381ef97 SHA512 62cf62fc505955426596bd6d539c92f4d730d90d820d817343525f1b7be693290727c8c447ca98b1a0e46d1d188b62b3f4fafcf6bffbf2479fc5d937fb354e13
+DIST roctracer-6.1.1.tar.gz 396688 BLAKE2B e332c3a6056d1678e3da511878fd2710a4eaa02526cd1e7353dd1dbcba776cb77e6e431d90daf5f238ec7793fc8e9f51afd7f09992f70b26c7e3aab28bb319a9 SHA512 d59c367953b1d5df0daae96746095e2e19f706f43b5ebed3d45c15d23697e9c99c1623bbb8dfa001648fdeda172a3c1d820d884b6da3946addec8f4b9a86e5dc
 EBUILD roctracer-5.1.3-r1.ebuild 2414 BLAKE2B 177f01dc1079d29a764541b00b1df66763691cf42a6115c6c7f76a525605c928852d485271f5812efeb5b9aaa752c83213db6d874386e2a8e6796d32a01ea443 SHA512 2860674405c36b699c633737549a03382acd113be07371dbde78c25ec965208618218f85e940aba6280676918f34c7e6d3a8181c71f9b1f57ff976406e46f75a
 EBUILD roctracer-5.3.3-r1.ebuild 1659 BLAKE2B d8b729531db35650b674f30e2c9aeb2c494d82705bd46c784365dbe7d6396dfdba9339af5e378a4eec35a40f93fded8b2df4c0d583b976bc689d51d087d6900f SHA512 7efbf7deaf110325d6df22f1180609f7ffa54bf3b34ca50a9c2fa2b4c4b0359ff2c4aa881e4c36d8a11db3946bf6cc8746f9c384811635beed945b35565cc1ae
 EBUILD roctracer-5.7.1-r1.ebuild 2230 BLAKE2B a2a1f033a011244d6039107c7f121b39965abfe12c362eedcb0d1e13c63e09dc7a8214b9115fd59ea5c4c5faced21f4e8ead45277ad9f5d49b1f3145f0abfca2 SHA512 ef63e786f59130b2b4bbe071d598b44d04aa66a932f17739908f41dfc4029debcbcc139cd4693a970ed7e7b2a2d70d497806c651fe634dec775991fdbe06e0c3
-MISC metadata.xml 620 BLAKE2B 305256592e98101accc2200175ee94af58ac66f529fc01978972b9daeb33c1588751e242fc72a69860e5aada7a94f641c71d60d4b2ae48daca8f606f1336e8d9 SHA512 10b5b9a17a3696915eefc0602ff21b160ddd9c45390ae2bb35472c213f1b3d67b5f650c962218b6300d51284ca5086a439c8f5fea52272f81ef014025c48f4f7
+EBUILD roctracer-6.1.1.ebuild 2325 BLAKE2B 4038182909251dfc4d15b499e881fd555909f03886420c67ab2e52cdb9bec35c19bda6531e0af1aa60a76ed8c54b78261465675141cc8fcf49c363f3858a3024 SHA512 c90319f75e904475cc0bea9f06a26809eccf39551737b3443b1f08e3a41c924f0c958e1ff379ad10459e80cf7525940ad218f8cc61ca187275017384d79f7003
+MISC metadata.xml 717 BLAKE2B 9705d469093d1851c10e8f727b43300a1fbe1746057114ddeaa38520a094a8906c1a8bd13869e3f84ffff652b68823f63522685a97ab3d3f0fdcb52283fc27bd SHA512 d6ff1910d66ed3990e965826f0df28c74b9b6287f4dc4d619425c2803a1092bcd1c7d8dc9776e5ae3366a31f3a56d498b0ffaf8f7c336af623df02421de26430
diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml
index 872a2a3bdb22..a7f7157360b0 100644
--- a/dev-util/roctracer/metadata.xml
+++ b/dev-util/roctracer/metadata.xml
@@ -13,7 +13,11 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/roctracer</remote-id>
+    <remote-id type="github">ROCm/roctracer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/roctracer/roctracer-6.1.1.ebuild b/dev-util/roctracer/roctracer-6.1.1.ebuild
new file mode 100644
index 000000000000..61a5b02149f2
--- /dev/null
+++ b/dev-util/roctracer/roctracer-6.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+LLVM_COMPAT=( 18 )
+ROCM_VERSION=${PV}
+
+inherit cmake prefix python-any-r1 rocm llvm-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm/roctracer"
+SRC_URI="https://github.com/ROCm/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-util/hip:${SLOT}
+	dev-libs/rocr-runtime
+"
+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}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	llvm-r1_pkg_setup
+}
+
+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
+
+	# bug #892732
+	sed -i -e 's/-Werror//' 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)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DHIP_ROOT_DIR="${EPREFIX}/usr"
+		-DHIP_CLANG_INSTALL_DIR="$(get_llvm_prefix)/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
+}