gentoo resync : 29.12.2022

5 files changed, 79 insertions, 12 deletions

diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 6e5dda7642c2..3168d9281035 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,8 +1,11 @@
 AUX roctracer-3.8.0-gen_ostream_ops-toPython3.patch 1496 BLAKE2B 951878e73412f08de88e073e2f790620c4a0f97d479211668cc9eb0e1d9cb3245070df8d0a81374d2a22d6c3d68591f85c99114639fc620a8c742167eb5a5044 SHA512 7a8808b33cf2c4280e70773768b4a5997aafe8916262fb4be562d42867847e6d4600a6559955c901d0841059a1b3764c6acef5b755b61f1ee116bc9b9d7a62c0
 AUX roctracer-4.3.0-glibc-2.34.patch 993 BLAKE2B 54f25b35525da414aa3eafd48398e9e1fc28f750b08fdb0193789d6df60866c384434a79b2d52113fd29dd1e261a46f2117a89334ea6839493e33c8541516f0a SHA512 fe9f9a89220ac93a05a1b23f70a24d8522c9809afd90e6c0677d78276a8db66e9bb0d9896b5a0ad751795118cc9dfccd5743108feba027fd8123d39fc20ebc33
+AUX roctracer-4.3.0-ldflag.patch 614 BLAKE2B 420e582d0f665c1b036be06ecc17ca84364a66ad26e713cbeca3c255f4db1e2dec4eb06fe8a6b0590e6032882af9edcceea39570ba74919844d0bb99c2469913 SHA512 10540d58691153225a549eb837175f1780411f996935e0b439b714f614a8951ccdba5ceb041ed62a829523f422cba100dff16965e6e20c2bbb64c5e996b1064e
+AUX roctracer-4.3.0-tracer_tool.patch 1554 BLAKE2B a142ec337b6baefae4da54443c6794fec1c79a7ff9bda3269c665eee046eae1c84fbab94248dc7a1dc2aaf0e5da6ce6b215694da566e10cec32b43873f961980 SHA512 cf45ee52c781623e34db493fe7f9bfb826eeb4040fd9cf88cbf03d9bce0913035ce32a1b13d9816420a4e2dbe20d19244182297e4a9cf94e6c62b6a9488aecee
 AUX roctracer-5.0.2-Werror.patch 922 BLAKE2B 5644e5450de7372ee1ad6d8158a50e006f1eae666bb62652976f88d0c36b152df59ad4b7a30e98a42fa47322777ffc90edd283c3642ca260fdbd58cf697dd88f SHA512 0b37cd7432f0d9de42c2ca2e669697b782730afc10952349d47612f59122e1a5415c83b795c6ea2fb01c695263304b7e9702e45903a7177d02a48d86734ead9f
 AUX roctracer-5.0.2-headers.patch 2452 BLAKE2B b5e34ddef1e61277d01b771b59e345c3ace07ff90f7e53c0bc50d0ebb6a13e07480173ac72b216a3fb54c3af2df5c1277fdc62db7f3e028213f71a889fa725c5 SHA512 073b45703bf37c5df1ed44843b17e08d8ada0373dce5f29a21cdea1d6d7fb73563501461a2b0c33f65c70e2c99d036523d012c7787b399a785f0ded89ad60f66
 AUX roctracer-5.0.2-strip-license.patch 681 BLAKE2B b7c78ca54fb208e1d943d9f217a8d40911a98823ff1b4c58441c87fdf60297200b4d02e5fbe685fea331c3d8f87c395291c19ac2621aa90c9fb1308071e176ba SHA512 56aae25b4c24d0f9a361c10007d0e3d90960191b08e254a0f6ffef9a36fb8d17270f8bed36c36ea866da137297ab96de4e211e8c06ace7ed7444e821f0589322
+DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefefb567ad19a9c17181ed2b60f38d0591a618f72b11f606eb44efc5e170adaf72f0ec1b93cde628ca2230a62e2d6de SHA512 f371a955bf59b7e0af07261981a6e68562fad0753d3f39d1e220034c17501abf839ed2fd88fbf376d659970395c8795a82c0560c7ed8d3b87c11c79864f5f612
 DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
 DIST rocm-tracer-4.2.0.tar.gz 476974 BLAKE2B 3a7be9c269fec5dcca98d7de514d97a2e1de7bbfaa54a1aca2df70453d05326564c8ee7bf793c7d176069ecd3f7f91409c6a20dd0773aa157f7abc1dac41448e SHA512 002d9fccee4761af4853e589b116bc5844b98abb84517c260aedcb5f31f5c92b862a233062ec280a6f878343c4f751d55f47fd38483e1882feb8c970f9836120
 DIST rocm-tracer-4.3.0.tar.gz 477647 BLAKE2B d597df2efef0c750637c8f509b89ad62927cb839ba7c9a42fa71882ee13d4a0bba295af19b02eda5310421e53187e9a98a76777f0d3a587e7e652ecf4c10cb6a SHA512 47ea2705a361cb863f33a9f4c1a7d5005bb679221fa95f14dd5404ef5af32377bad5c7d9807e2fff8030a9c26ac4230f2bab833344ef49ecebbd5653f0edfc2c
@@ -12,6 +15,6 @@ DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265
 DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
 EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
 EBUILD roctracer-4.2.0-r1.ebuild 1809 BLAKE2B 11126fdae37659f3d58b0ca3d3f6d5bdc7664577d02c07966c8af50eae42779a02e944b994957123a85131227c904b3a86fc15a2471acb954eb326fac1c1f808 SHA512 bb934a99d460828da3569ebe848294a46170995faca74b3d97443f8ef193605dae5554d68cbc6749a15f0e686833897ebe9c376e415555ae0118d112c206aa5f
-EBUILD roctracer-4.3.0-r1.ebuild 2114 BLAKE2B 4261ddd8b20cb8a9ec6b650953055183d5c352e798230259c6a0f07df3ef054821cf29ca299774f4fc652f7cc048a2b88c85c3aac0385bbb33f6da05224ead76 SHA512 fe8e5a9963cb69936da43561778d0757e9f57172244af685a3bceeafcb434fd2a987e0361e51918b1b1fc7dd5a5a4527a0c26418ec61ea755d6b34a58f3ef40d
-EBUILD roctracer-5.0.2.ebuild 1917 BLAKE2B cf6baddd3de65a79a96f8b9ae3b4299a40af63bebc8ab2a1402a227d651cf9a7b8ce9bd1bbb27f25d73a033dfc6cd5eb2cb03be4a6746eed59796053d5316ea4 SHA512 bc8dc0e0168863597a08a0497df8d71a577e00e9a24334a39dc6e056b6a9e03bff4b4db87af90b06e6b3c4434885d0160917ab8a80caeeeaa945f5e5fe45db8d
+EBUILD roctracer-4.3.0-r2.ebuild 2453 BLAKE2B 6fa00df1af44e136531c4e14e11af95a37a59e60a5137da5bf5d58cb6070d9ebfefae0e7527154ef88875110e430509d2d7f4bd9423735c850dabd0620988bff SHA512 48fa4afdecb640a3fc508a2fd87a90867278e991864061fa98ae7a5657db3c1f8db5a26cf20ebfb891975a26ba24cbb8e2dac7dee64e7e976f9539310e362faf
+EBUILD roctracer-5.0.2.ebuild 2457 BLAKE2B 430f8942ebaf5e85d9bb654e2eaf905f44a3b664d78cd559db8bf6d70ce02e0a3213deea265d408a8e2f7088cb1af841ab6e05647d41173e53cfa709ef7eaabb SHA512 cae7d1a201af227be6f8103f18de6fef8e58a9d0dd7902ef3378eca866ed89844bd600eb4f64062d62bdc88cf166eccbaee441fc119d563a244299fd9bf42528
 MISC metadata.xml 603 BLAKE2B b81a956c8e1b3d4bb6363919f82389ec7030baf7cd949e2ee8704543c515335acc8e497743dffeca426cefc5a89210e75b85c90f5dbc482f54f257e52f5fc77d SHA512 dcad8256b50fbed9b24458d845330756081aaef4c864ca753c074c6299a9dc0234e9dbe421e12e28548887d5ce8a07c06fc54d6942e4902d63964fb229cc734b
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch b/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch
new file mode 100644
index 000000000000..a1db6922158a
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch
@@ -0,0 +1,13 @@
+Index: roctracer-rocm-4.3.0/cmake_modules/env.cmake
+===================================================================
+--- roctracer-rocm-4.3.0.orig/cmake_modules/env.cmake
++++ roctracer-rocm-4.3.0/cmake_modules/env.cmake
+@@ -51,7 +51,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmerge-all-constants" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
+ 
+-set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bdynamic -Wl,-z,noexecstack" )
++set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bdynamic -Wl,-z,noexecstack" )
+ 
+ set ( CMAKE_SKIP_BUILD_RPATH TRUE )
+ 
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch b/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch
new file mode 100644
index 000000000000..f59c83a96110
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch
@@ -0,0 +1,35 @@
+Index: roctracer-rocm-4.3.0/test/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-4.3.0.orig/test/CMakeLists.txt
++++ roctracer-rocm-4.3.0/test/CMakeLists.txt
+@@ -75,7 +75,7 @@ set ( TEST_DIR ${HSA_TEST_DIR} )
+ set ( TEST_DIR ${TMP} )
+ 
+ ## Util sources
+-file( GLOB UTIL_SRC "${HSA_TEST_DIR}/util/*.cpp" )
++file( GLOB UTIL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../src/util/*.cpp" )
+ 
+ if ( DEFINED ROCTRACER_TARGET )
+   ## Build test library
+Index: roctracer-rocm-4.3.0/test/tool/tracer_tool.cpp
+===================================================================
+--- roctracer-rocm-4.3.0.orig/test/tool/tracer_tool.cpp
++++ roctracer-rocm-4.3.0/test/tool/tracer_tool.cpp
+@@ -285,7 +285,7 @@ void stop_callback() { roctracer::RocTxL
+ void roctx_flush_cb(roctx_trace_entry_t* entry) {
+ #if ROCTX_CLOCK_TIME
+   timestamp_t timestamp = 0;
+-  HsaRsrcFactory::Instance().GetTimestamp(HsaTimer::TIME_ID_CLOCK_MONOTONIC, entry->time, &timestamp);
++  util::HsaRsrcFactory::Instance().GetTimestamp(HsaTimer::TIME_ID_CLOCK_MONOTONIC, entry->time, &timestamp);
+ #else
+   const timestamp_t timestamp = entry->time;
+ #endif
+@@ -1148,7 +1148,7 @@ extern "C" PUBLIC_API bool OnLoad(HsaApi
+ 
+   // Dumping HSA handles for agents and pools
+   FILE* handles_file_handle = open_output_file(output_prefix, "hsa_handles.txt");
+-  HsaRsrcFactory::Instance().DumpHandles(handles_file_handle);
++  util::HsaRsrcFactory::Instance().DumpHandles(handles_file_handle);
+   close_output_file(handles_file_handle);
+ 
+   ONLOAD_TRACE_END();
diff --git a/dev-util/roctracer/roctracer-4.3.0-r1.ebuild b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
index 5b0d3c3f5b5d..e5c7872fe3a1 100644
--- a/dev-util/roctracer/roctracer-4.3.0-r1.ebuild
+++ b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,10} )
 
 inherit cmake prefix python-any-r1
 
 DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
 SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz
-		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz"
+		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz
+		https://github.com/ROCmSoftwarePlatform/hsa-class/archive/f8b387043b9f510afdf2e72e38a011900360d6ab.tar.gz -> hsa-class-f8b3870.tar.gz"
 S="${WORKDIR}/roctracer-rocm-${PV}"
 
 LICENSE="MIT"
@@ -30,6 +31,8 @@ BDEPEND="
 PATCHES=(
 	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
 	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+	"${FILESDIR}"/${PN}-4.3.0-ldflag.patch
+	"${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
 )
 
 python_check_deps() {
@@ -39,21 +42,24 @@ python_check_deps() {
 
 src_prepare() {
 	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+	mv "${WORKDIR}"/hsa-class-*/test/util "${S}"/inc/ || die
+	rm "${S}"/inc/util/hsa* || die
+	cp -a "${S}"/src/util/hsa* "${S}"/inc/util/ || die
 
 	# do not build the tool and it´s library;
 	# change destination for headers to include/roctracer;
 	# do not install a second set of header files;
 
 	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
-		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
 		-e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
 		-e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
-		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir)/roctracer,g" \
+		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir),g" \
 		-i CMakeLists.txt || die
 
 	# do not download additional sources via git
 	sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
 		-e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" \
 		-i test/CMakeLists.txt || die
 
 	hprefixify script/*.py
@@ -62,7 +68,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export HIP_PATH="${EPREFIX}/usr/lib/hip"
+	export HIP_PATH="$(hipconfig -p)"
 
 	local mycmakeargs=(
 		-DHIP_VDI=1
diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2.ebuild
index 7c53e956e347..efabd899d252 100644
--- a/dev-util/roctracer/roctracer-5.0.2.ebuild
+++ b/dev-util/roctracer/roctracer-5.0.2.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake prefix python-any-r1
 
 DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
 SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz
-		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz"
+		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz
+		https://github.com/ROCmSoftwarePlatform/hsa-class/archive/f8b387043b9f510afdf2e72e38a011900360d6ab.tar.gz -> hsa-class-f8b3870.tar.gz"
 S="${WORKDIR}/roctracer-rocm-${PV}"
 
 LICENSE="MIT"
@@ -30,6 +31,8 @@ BDEPEND="
 PATCHES=(
 	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
 	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+	"${FILESDIR}"/${PN}-4.3.0-ldflag.patch
+	"${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
 	"${FILESDIR}"/${PN}-5.0.2-Werror.patch
 	"${FILESDIR}"/${PN}-5.0.2-headers.patch
 	"${FILESDIR}"/${PN}-5.0.2-strip-license.patch
@@ -44,22 +47,29 @@ src_prepare() {
 	cmake_src_prepare
 
 	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+	mv "${WORKDIR}"/hsa-class-*/test/util "${S}"/inc/ || die
+	rm "${S}"/inc/util/hsa* || die
+	cp -a "${S}"/src/util/hsa* "${S}"/inc/util/ || die
+
+	# change destination for headers to include/roctracer;
 
 	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
-		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
 		-e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir),g" \
 		-i CMakeLists.txt || die
 
 	# do not download additional sources via git
 	sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
 		-e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" \
 		-i test/CMakeLists.txt || die
 
 	hprefixify script/*.py
 }
 
 src_configure() {
-	export HIP_PATH="${EPREFIX}/usr"
+	export HIP_PATH="$(hipconfig -p)"
 
 	local mycmakeargs=(
 		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"