gentoo auto-resync : 10:09:2024 - 12:30:41

15 files changed, 38 insertions, 21 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 77d3eaeeac37..2719697a7128 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 43b80f0a5ba4..93c7415075a1 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -21,5 +21,5 @@ DIST rocm-Tensile-6.1.1.tar.gz 12675289 BLAKE2B dfe3698d7dda14d5b20a6fe1ef6535ac
 EBUILD Tensile-5.1.3-r3.ebuild 2811 BLAKE2B 77f941574f7586da7f8122c126ede4288004ca1a31860e12bdb22d340c7e9b017871bc362e698f8b797c3699965babd332742ff2832314aeef96324ea06142c6 SHA512 0275dfcec4c5b417444a5ebbff9eb1e896db69ca735ff082aa863e1aa6da12ea4b227d59d8794bf1d512d6a965d9ce1768418db830c2f27a3baf528f3f60b687
 EBUILD Tensile-5.4.2-r2.ebuild 3348 BLAKE2B e92698536854d4157a2b408b781cdec49e0c9caedacca8ee5902d976867ec8712d721adacb9973178cffe96de4d5de44cbcf70bb58494958663e9dc4c101452e SHA512 985b6dbac41eeae088247a11adb387043afff952ea7f1e87a24eb94f81f18970ad9360bbf0a683bee26234afaf698da108e75a39eeda7ccb386ec9607c0359a8
 EBUILD Tensile-5.7.1-r2.ebuild 3534 BLAKE2B eb31593d71f596d1f2c23f453fba30e8c723da3095291e46e3290e47e044e510cf57235b0b9ddafe79189b59efd1df928f2f8a7f6cc535865170740b91b94f74 SHA512 d576777ac8e31dfc7930efa2e9b16dca9c9eeca921b92cf299f8c42ab10c41463c88f6b928659b0e4056fda38e7aa5daccec3ab1996b30dbe997ee693391f79a
-EBUILD Tensile-6.1.1.ebuild 3554 BLAKE2B 721027444a768c8e4d4330acc7fea8ee85882af8a45d8576cdf2f03c68bd1e241e0f750819f32855370e3a7b11a433f83f272f0b4f30c33e39d7a0eb67b872fd SHA512 207e7a8f659c6aff1be8d5202fb99ac2ca09023247e5e5ff0827fd001bb95aaf4ab7eb12b97e5b44fb676827fa6e407093ad9eea46f41ff7766867a774ee6469
+EBUILD Tensile-6.1.1.ebuild 3561 BLAKE2B fcdad2de9653d8c1e0a8ddb68b5decd243c95a4baf3ed248bba5ca4d58a87dbd31d754a1121ac3780596dda9cac5667f45ae15613019752a81f8a6b041d8e73d SHA512 6d055e210890fc44e389b82bbcdb361e7424b62d6855420345e1179fa37138d62fb03e1b8a878aeba676f90ae71b1894c4bf52fb34c5da0b4a9be37820b1df25
 MISC metadata.xml 478 BLAKE2B 4931f453630761d3272371d09065c23cd9fea6e9a80f3b78a07e672e5d2e891c2ad7661883e1cb1f41e89fb2cd725a7189937c7b3cc7fc39b23ef0caaf0b3ce7 SHA512 d57284ff50913d95f092a5b8e4e566d0d6668b56afadfeb2e7003f2af6ed2106f14df82be880b2ea71dec29b614c5cb286a085098fbe8eed16e8bd3588149be6
diff --git a/dev-util/Tensile/Tensile-6.1.1.ebuild b/dev-util/Tensile/Tensile-6.1.1.ebuild
index c8debc3456c3..7162a0298dcf 100644
--- a/dev-util/Tensile/Tensile-6.1.1.ebuild
+++ b/dev-util/Tensile/Tensile-6.1.1.ebuild
@@ -88,6 +88,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	distutils-r1_src_configure
 	if use client; then
 		local mycmakeargs=(
@@ -97,7 +99,7 @@ src_configure() {
 			-DTensile_LIBRARY_FORMAT=msgpack
 			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		)
-		CXX=hipcc cmake_src_configure
+		cmake_src_configure
 	fi
 }
 
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index e3c40dbe6438..debde27f9af1 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -3,6 +3,6 @@ DIST cppcheck-2.13.0.tar.gz 3643744 BLAKE2B 942391bdc2ad009e1bf9f691835c268b33ae
 DIST cppcheck-2.14.2.tar.gz 3723248 BLAKE2B 551c783e13202f496b705602566799848b611bcc706f7a803c9ff530b3405db9e0b5294d2ce51ef5a4889e08c5b9d54c15d40a7ec6f4dc59333a7b6ed24b1f02 SHA512 8e90fa87845a083a4de66ec86edf707184a2293eb346fd79bfcafb73f93db049216472fcb2ab802ce529680f9708261ba3c26675c6fd9637e1dc83903bc44c4b
 DIST cppcheck-2.9.tar.gz 3916529 BLAKE2B 5d75328e1fcd389376630502ad7427d3473392a9467e8731e6cd7c2c6349efccc05eddd7eca4cb361930661d2383a8d316e33bd3609b9333a710153d199e326d SHA512 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f
 EBUILD cppcheck-2.13.0.ebuild 3174 BLAKE2B 8809bee9b0fcebb6e56de883dcd1db2102ddd50789d1992445416eaf76d22a0dbb5c8583e32b5e88cef51425c9769b11b7a69399e8b8bfbb1a3c33a2a2caa342 SHA512 d0ec553281ddcdca9d2750fe2d786f87336847ab4dcbd31f259a98d4014163e85a2ed145a85b2795362f8ce8d1dea9510aaf5eae51c5d201f778fcd77bd71757
-EBUILD cppcheck-2.14.2.ebuild 3078 BLAKE2B 53e0031e13fb36b22cc1d4052157207fa3694745009c4c67baeb6859ed9ff012c641224a813f406a339745c90fef0167fc07234754f8495a7df89c888037ab94 SHA512 f80ae436fa324556ada875032705e5ac53cc4a6fe8ae27eb0d547f0980f2022e0af4b65358be0bfd76b38ad5a2fbb466d89f64b6a0539beaf136c7437dc64fd8
+EBUILD cppcheck-2.14.2.ebuild 3075 BLAKE2B c28bb7c0dd7b039b7fe5f3188c6d2a0905acbefe912ed562415441d6e16953bade9de1e31c19d1b20d3972c33cb4c90c6903970a0d2b30e3f69d1faa9e540f80 SHA512 0b417a09a8d212cd3cd3efdd229dbc018952feb9c7e548f4c69b7148da4ad5cda14cdcd52373f4491446966aa678f5717b28f59f676341e1fa49c7b1e6cad061
 EBUILD cppcheck-2.9.ebuild 2369 BLAKE2B 909101f8491d35342282c8334e7a3e31fc8a13dd30ad8a46acbe469b2735842c7856c444bfb47950f15f62e353be9e724ba08eeec039ab58713d3832d161c83d SHA512 71152b0282b8628b4ba25110c90072b09d75c9828408688af0d025ebe111de0a28e29659bb6d95e5982badff5de5501bab1d4263635ccee9763e11a1c73889f0
 MISC metadata.xml 439 BLAKE2B 2fae88ef8445fcf382e68d615e7f9c4b41ce119785b9d3a8a3685297270043da641c8e454e40de2507f6e17a91846488e4dcb1a72e09e241287fb06cc531ae82 SHA512 64084c96f491b6f966d9b20409ec43a530280c01e29c2c531a43bb40d62263c7fb9e1c55079cddfe2eb437ffa6ca431a9dce758a5932c549bd8cb5850a8769c8
diff --git a/dev-util/cppcheck/cppcheck-2.14.2.ebuild b/dev-util/cppcheck/cppcheck-2.14.2.ebuild
index 088bb97b6b42..75e296a70059 100644
--- a/dev-util/cppcheck/cppcheck-2.14.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.14.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="charts gui qt6 htmlreport pcre test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index 5c1a3eaf76a0..5b5768dc08b2 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -1,7 +1,7 @@
-DIST gitlab-cli-1.41.0-deps.tar.xz 16529512 BLAKE2B 263d605ad70546e47984e2ef229f5ebd1ef2709c6f7e1ccb07f60807c16e0f6cdc6881d698454688718da54eb1b386a3f4eabcd9aa09008cf3eddf2fd34c5f52 SHA512 d6565eaac2dbe443080c6846fe0bbb42214ad52414d6885cfe91ce53c93f6d49e29cd2706d650f3a7c34a7d095d1a23336846571ce903faf292e85d983ae5cf2
-DIST gitlab-cli-1.41.0.tar.bz2 16825512 BLAKE2B bdb6b271ae78b43fb721f48cc5e2ed272b5fc95b0f2f24b83b5816fa73a6eb276b677dca57ce207453fec696d89b6518846b10be9cf8cfb87a0e964a8fcb5bb5 SHA512 349393cc5893d1a703aaa8bcd933fb2981ed56a071fed662fe775524132b8c09326a61fc626b60733694146f0cf42cf71a0f3cfe45161135a15025c1f3d2969f
 DIST gitlab-cli-1.44.1-deps.tar.xz 18136428 BLAKE2B 9fafde045efac7a00029170ee3b9fad61b2d4cf8facb61ae11c1b6e922f5a88627e5c9dc9d127e232c7ad635b2e7a58c65a29f26b5953d5b252580596ac72030 SHA512 aa5b97b361b18cbbb03abf33ee4249ea66e4374f2ca000dcd037758770b62b3fd45d9f2837b98cf2a6507fb509a1f5e1917456663159e0238d30d743a3ec2052
 DIST gitlab-cli-1.44.1.tar.bz2 16841236 BLAKE2B 3a9ab7b0ca02c6a4a0652a268364785a6514c7bda688137947f11add4688e30ea547fe211b92a2543b765b8a82dc9ac85a7e189697bdc51c39cf62e82eaef42f SHA512 8b4bc19f78054104ae4551efacade8c2a1e86cf538dba2b31a9e7127cd6a792b8bf00d788a93aa26ba3f9a03684db0dbf67968e66d6048168cec6a512d90b18c
-EBUILD gitlab-cli-1.41.0.ebuild 766 BLAKE2B 82a738b6c9811cf69b160a052d8deabb3fbc1e637787c96b4834d7c549881c6f21b36974a7a7d45f994d5ef640769ae1e5f14fcdda6819711fe42aa7e86aaeab SHA512 4f6a4c48eadd103ab066fce1aaf2be943b0e11ba5e22fc22ad057de5dd2c710e2a03233ad9d17d0f9d46789e338bfc8ad3ee364ff99ad9c5292267ce4488e1cc
+DIST gitlab-cli-1.46.0-deps.tar.xz 21625028 BLAKE2B c4c5c38f505e0812e2ab5490d5064815fb6b8b2d65fe21016db886959b6dee2c5ed3e2abf51a00a40b70927a9d4562e4330075809e0c2d413652f5cc33ba4be2 SHA512 9a04a6ba82c8c00124b53adfefaf4b22dbd59d085823ed44e26d7a0436c359b2e966987258206030881373302627a40b800675efbf05ed4c3558f20830aabe94
+DIST gitlab-cli-1.46.0.tar.bz2 16845037 BLAKE2B b1bbfffb0968b5245fae91a7ba0c29f7c278de06006a79f8d5b9c64acb577b5cead2a3587eb770a35d5b0fd75fc9917c078918cb51541e677b739d38ec9510e3 SHA512 c6a1a854019f21cb172dba1ce01c8a4e94d6af7ada52c1bf182bb3444fcb8f7d593eb009a2c89c078f09f7abde57443a95d2a81aa11619ebecb75bfb5ace6ada
 EBUILD gitlab-cli-1.44.1.ebuild 767 BLAKE2B 8c3e8b2f4c1617b017c6ef7c5ae268a4adf9942391e842c58cb33dab451d524c11c5f63e1a64395bb021779f2cde5522d0cba936bc636cee903ae8f49fa70847 SHA512 60dd05ce01c09c092ac7ad2a289603b10867d61566abc639958aee7d04a00a83a4f9bef4de8fd01bd3a942c2301d2cea4e19fc0dd3d7cef1248bca70838617c5
+EBUILD gitlab-cli-1.46.0.ebuild 766 BLAKE2B e891109d24fcc9984207679502e12456defe96d399a31c8eed8f01397d2f0a3f56aa0839af19009f206aa9c7c174887190821af2ed754316731051672c13de34 SHA512 1aced28b1fe6ccb1cf0adc667a6970ddfc8be4d72fb8e45303cbd17909418e2efa4dcb6d7d3cc400a1838a5138e97dd286e03a7c6c8d784b1ba0d71b5ebb5a9c
 MISC metadata.xml 328 BLAKE2B c15cee65978853695fcc911a6beb02ac29f8e82d7a82417989e497a0c014a2c5c2c22503cf2c099600e0885399496d0e7ce3b3590c8b8cfa0f6ecc6a63988d46 SHA512 4df241882ef7e722711132110271b672ef49913a92e9d70972857968e7d12a8403f5b19b5079fd78f3f08fb4aab8e615b51a6073db2c460aa2ae3ec31d8e3a28
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.41.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild
index 9f497a5929a8..4a336d97ac9f 100644
--- a/dev-util/gitlab-cli/gitlab-cli-1.41.0.ebuild
+++ b/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 inherit go-module
-GIT_COMMIT=3657f322c1dabbbc3b6d31567df8d2c8adf16162
+GIT_COMMIT=16dc43a8f0ae5c8c5310891117efaadfaa5743aa
 
 DESCRIPTION="the official gitlab command line interface"
 HOMEPAGE="https://gitlab.com/gitlab-org/cli"
diff --git a/dev-util/hipify-clang/Manifest b/dev-util/hipify-clang/Manifest
index 2a9ac02ed62c..655ddfe0ebfb 100644
--- a/dev-util/hipify-clang/Manifest
+++ b/dev-util/hipify-clang/Manifest
@@ -2,5 +2,5 @@ AUX hipify-clang-5.7.1-fix-clang-libs.patch 1298 BLAKE2B 3f6d24300e50d4144c60635
 DIST HIPIFY-5.7.1.tar.gz 673452 BLAKE2B e0293c1b7f9ea028efc8d712ddedae4ec933c5bcfba524e13816bd999e67bcf06097f9fe0e4d1f4fa6a38df133be694e92adeefd92f77301d8537b6880b1a1fe SHA512 0cc75fdbcb6278d319cfe8ee3c8547dc75ea494a007d2159c64312c3411627905e0d6c7d7f0032cbc4c727a90723325aa2705db2fd473dbeb41e60f276d1c9a7
 DIST HIPIFY-6.1.1.tar.gz 813425 BLAKE2B accc661431f11796d0c8bcf638537a6035020b2a36ebe66c1b8c10bb63b762418d5fd1f256f3a3e51d2ace224a6492abfe72838bef859b1da68c2126cc3521be SHA512 29c45e312c8e2f0d06916b57f24eba27ba7beae3bd860850b57cfe27c87df22aabe9fdcf3d12671b81e68b61c3974aaf0064e96ae68392d181148aaeef14f1c7
 EBUILD hipify-clang-5.7.1.ebuild 1037 BLAKE2B c13330ff2f0ce915b37841abde52c70cf8907a674969ba5ed929702dbe180e1166b7c62b7dc0bd6f8df2af6e4689337d22cf1e247f27f7d0c72d0cf5c59c23a4 SHA512 24caa7e7007d9ae952e976b5b5d86912cc7780dec7e04a001707d24840d98369799f6766ca85eb242ad04b8e5c8faf7a72fae1d315f42ce1608d81d896ca2fc1
-EBUILD hipify-clang-6.1.1.ebuild 1057 BLAKE2B e4357b90e71c1b177c1cde5373ae9c84ec9f9e3ff8ca47b5d48c482d7f59e4b17a9337d31f6cc6c1cd86007f9360d5e9ffde11835ad66a809ca19bb44694fdfc SHA512 2530656d0a68d34cef1a9d5b810b57b79daa807c368ebd1dcc53b1f9c893b58e869323729df2217f9717213b3434799aac71aacec00728c51f1d50c33ee33454
+EBUILD hipify-clang-6.1.1.ebuild 1221 BLAKE2B 33d5bf215f04e31448c17b962fed2b9e333d4be4c808c026613b26414796f20325e413b52b460cdead4cb94922ea7f12abd7beceee532026e5a2535aef2f0bec SHA512 75b43f7b50c2f36e0bcfd6fd52e6f41b10f7a12491f30793032bcc5030b1d4e2df3c94d374c09e172204e730c27b6c791fdd01d6d722f8de3f1c93c3bc0428bd
 MISC metadata.xml 453 BLAKE2B b7719f4627bf53a6b4bb0c5255860382008294b3e5abf41512f62a0b55f0de6e5f5859472cb4352ecbab2139c27b68015922baec4c75a45cc4d078257a1bf846 SHA512 33d3fe6ab49e832e97c122f0eca8292b9129396d9ffec137516259fc5d12924062bbd8fe600da6f1685f954bcb61b466f5631db661023ceb507151c7741c33ce
diff --git a/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild b/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild
index ca0eeb20cc2a..d50b6a0df0f5 100644
--- a/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild
+++ b/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LLVM_COMPAT=( 18 )
 
-inherit cmake llvm-r1
+inherit cmake flag-o-matic llvm-r1
 
 DESCRIPTION="A set of tools to translate CUDA source code into portable HIP C++"
 HOMEPAGE="https://github.com/ROCm/HIPIFY"
@@ -36,6 +36,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# 928906: CMakeLists.txt ignores CC/CXX, switches compiler to clang
+	# and fails if non-compatible CFLAGS/CXXFLAGS are used
+	strip-unsupported-flags
+
 	local mycmakeargs=(
 		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix)/$(get_libdir)/cmake/llvm"
 	)
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 7a2e258ee26b..4bf738997fe6 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -625,5 +625,5 @@ DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78
 DIST zip-1.1.4.crate 77910 BLAKE2B 1c6a0e14becbb43faa9510d303ab254486e97730bc741c1fa3c7a88327da0b1e8815026e319abdbeb9e6c9e0ec713d83dbb3a0ae83a32ed2d197923afa803866 SHA512 18c8e7c9246049c7be4ade2bee501da2ff7cfe45aaab88e20650246833ae3f7b492644c0f4a43aa93a7ef7bf95413c9b27d0f5f8d099f19131a682b92a6d3fc4
 EBUILD maturin-1.6.0.ebuild 12304 BLAKE2B f00ef36a7eb337dc2d7bb2cb0c9f5a0151ce87f20e262b3b992cc05b9ecd748996e60c4e572eb392dac5710b96c3d9cb937e26f9926c176f27ea8e6d0eda32d6 SHA512 fa144969049adabee32c4bc70bbc8ca83d3b4530521f17f74f32000aebb94f089fdc2878e4ec95d6b7e2063aeb369012b53845ca7980068b1998f382a3a9b249
 EBUILD maturin-1.7.0.ebuild 11415 BLAKE2B ce10ef174862962afa27f2538c9eddb2b74369a6acf9a20e120e7545ac2b273c4966da75dba7579886223f2600d7fac295bd5a9d3d7d0b0dd872d72121c07dc5 SHA512 1f808dd2f849b3686220a47195f2cc1b63e51aee789afe200e5e01edc1c095247b3fe7ccf6886d553e8d517445825b30609b4b539137f754e445414e60555858
-EBUILD maturin-1.7.1.ebuild 11631 BLAKE2B 27bdc373a93311ad43a0cd213deeebc8c8129a8ca01dfe70bf230579cba7ec2bab974ca5c7c8f387101d4cd8374b3ca9ecb66dcd98fc0e675265e838072d4dc3 SHA512 441c217cdcc698f3c7f16ba3bbe056e51607040a23250ff363d779a7e4db3bb567298af1ee9287766c55ce51b5d57cf90ac521b21f8b0ca859248f999684b6d0
+EBUILD maturin-1.7.1.ebuild 11630 BLAKE2B c2ad6a0c830e7166d5666571b6e84b38bac37698e3c4cdc81076cb7f3567f2b731ea633a6b0dbfbd3feffa1ead8e2ee8f4ba5350577020c7ab23cd012d5601fd SHA512 e79f8403823f36ee33d0ef6328439db4861b811b9bf3e8b9441b57f906fd605de7dac17ba24e499ad920ccf613278ed8fdc9a7c610421d2e388a7a337d98a683
 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7
diff --git a/dev-util/maturin/maturin-1.7.1.ebuild b/dev-util/maturin/maturin-1.7.1.ebuild
index 806f933fee42..5d09e0929ff8 100644
--- a/dev-util/maturin/maturin-1.7.1.ebuild
+++ b/dev-util/maturin/maturin-1.7.1.ebuild
@@ -416,7 +416,7 @@ LICENSE+="
 	Unicode-DFS-2016
 " # crates
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 3f7eff645618..2261eaeeae37 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -17,5 +17,5 @@ DIST roctracer-6.1.1.tar.gz 396688 BLAKE2B e332c3a6056d1678e3da511878fd2710a4eaa
 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
-EBUILD roctracer-6.1.1.ebuild 2325 BLAKE2B 4038182909251dfc4d15b499e881fd555909f03886420c67ab2e52cdb9bec35c19bda6531e0af1aa60a76ed8c54b78261465675141cc8fcf49c363f3858a3024 SHA512 c90319f75e904475cc0bea9f06a26809eccf39551737b3443b1f08e3a41c924f0c958e1ff379ad10459e80cf7525940ad218f8cc61ca187275017384d79f7003
+EBUILD roctracer-6.1.1-r1.ebuild 2711 BLAKE2B 24d17a6b91e9877f1326f60e799019632d2a33c1b932ee427d1738da9db084b1bf8fb39ec742768c0f4ce48df11205ae1b4af75a4531f49e320364852a9200d2 SHA512 d735bcfea6fd17391e6236f84abc050a36ec6768a48e5cfc5b39a602bbe59b53ae60c6cd1c0b96c6fa709e2e888bb18a066a189dc5532efb6b53eef2e1263605
 MISC metadata.xml 717 BLAKE2B 9705d469093d1851c10e8f727b43300a1fbe1746057114ddeaa38520a094a8906c1a8bd13869e3f84ffff652b68823f63522685a97ab3d3f0fdcb52283fc27bd SHA512 d6ff1910d66ed3990e965826f0df28c74b9b6287f4dc4d619425c2803a1092bcd1c7d8dc9776e5ae3366a31f3a56d498b0ffaf8f7c336af623df02421de26430
diff --git a/dev-util/roctracer/roctracer-6.1.1.ebuild b/dev-util/roctracer/roctracer-6.1.1-r1.ebuild
index 61a5b02149f2..5ac47938ee4d 100644
--- a/dev-util/roctracer/roctracer-6.1.1.ebuild
+++ b/dev-util/roctracer/roctracer-6.1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 LLVM_COMPAT=( 18 )
 ROCM_VERSION=${PV}
 
-inherit cmake prefix python-any-r1 rocm llvm-r1
+inherit cmake flag-o-matic llvm-r1 prefix python-any-r1 rocm toolchain-funcs
 
 DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
 HOMEPAGE="https://github.com/ROCm/roctracer"
@@ -64,9 +64,21 @@ src_prepare() {
 
 	# bug #892732
 	sed -i -e 's/-Werror//' CMakeLists.txt || die
+
+	# libc++ may have no experimental/filesystem
+	sed -e 's|experimental/||' -e 's|experimental::||' \
+		-i plugin/file/file.cpp src/hip_stats/hip_stats.cpp \
+		src/roctracer/loader.h src/tracer_tool/tracer_tool.cpp || die
 }
 
 src_configure() {
+	rocm_use_hipcc
+
+	if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then
+		# https://releases.llvm.org/9.0.0/projects/libcxx/docs/UsingLibcxx.html#using-filesystem
+		append-libs "-lc++fs"
+	fi
+
 	local mycmakeargs=(
 		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake/hip"
 		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
@@ -75,7 +87,6 @@ src_configure() {
 	)
 	use test && mycmakeargs+=(
 		-DHIP_ROOT_DIR="${EPREFIX}/usr"
-		-DHIP_CLANG_INSTALL_DIR="$(get_llvm_prefix)/bin"
 		-DGPU_TARGETS="$(get_amdgpu_flags)"
 	)
 
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index e4c3a237e9f5..f91d451a7ca3 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -14,5 +14,5 @@ EBUILD spirv-llvm-translator-16.0.0-r1.ebuild 1531 BLAKE2B 07ae6fb702fe5bc915ab9
 EBUILD spirv-llvm-translator-17.0.0-r2.ebuild 1512 BLAKE2B 9e642681cc67196b91532b36b44ec2817161d25423d057f6bd91fedacada2e33d12946257ff54c337143d0fbfc9d11f29816cfb485404685d209be906e75097f SHA512 96961a3225f9c10eb317741b39091341e40202e07b7a07434182e78f9b8ce5451f44b6ae8011d7e9f95b640157f2a5cf04c56b77d6b5647c806dea6fb09c97f1
 EBUILD spirv-llvm-translator-18.1.2.ebuild 1390 BLAKE2B 26808cbccd8d7059134bf78f8846f09c3f8ed85c3153cb10659c01fa3240df851dbe9d9811821b83a2ea7e25f17d8fc1fe3595ca1a0a111c4d41e5a0029772c8 SHA512 78f8439a0fbc203e1723cdb9deb1eafad691cd3a545a9a6f0a530716df020a28d74bb74b529e7129d1c0d301f302fe1b5cf46040f56a6107013e3f18419a89ff
 EBUILD spirv-llvm-translator-18.1.3.ebuild 1377 BLAKE2B 388557ee71b5d4a2fd883137918cb48855818dfff1496f6268ae7cc9c45974ade8f3c76f30474e618d51bec497b1630b185884652f5685d423e65928d0ce6e5e SHA512 31352669defe25bdd064ff1bcec3b479fb72010a10d4caac39754e4d1d6190a7a04cfdc4e24f8348f98e68e085bc6ff8cb127cc5f42987fd494937414b031395
-EBUILD spirv-llvm-translator-18.1.4.ebuild 1379 BLAKE2B 7ff8eb133abbde5f8df3a2037de838b009135bf31143b31345648473c63ff1b834f17c8b27db507b12c3dc7d38462452a5f5485ab933887aabd0c4357bea510e SHA512 b02d7bfe338bbb9118476e7ca0ba0c1165dbeff0491e77f4ddd8e31b5df62232fccad71f6983ff1e0cde32a45cee3bff452fb23ef1d6c1b8bf49f78fb25363cf
+EBUILD spirv-llvm-translator-18.1.4.ebuild 1446 BLAKE2B c6ba1d1876abc6d5eb5466aae1da25168fbc914283b88ef90a9d32fa05ab1d938f752e1fe643de6e932dc46b6a91203fbc79ae84f5489ccba689f0b81bfc63a4 SHA512 8da04df1a765300c894f0d3d7c75e7a78ffe6798ba7990f284501def153e6a8674103c7c587dc0ccded32eb17d8e25e2bf3aadb8620f7a3341dfd075c72ff854
 MISC metadata.xml 445 BLAKE2B 11c5d6b6e94192c6fe1aa0cdce39ddb6e3e0aac1462533b5480136c415cc5d82ac77c4930a07a234d0ae987d3409c8dae590f0d5b99139282a89939d0b65cf4e SHA512 e58ae0f86f23be399eff43be9b90006f9be0f699af67f354f2e5434bc0fd43856863763192e0270fd06f7df65e0bdea2bd0b9d43b5b200d8a0399e0230c86e71
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild
index d14939439935..b397ef0e39b5 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild
@@ -7,7 +7,7 @@ LLVM_COMPAT=( 18 )
 MY_PN="SPIRV-LLVM-Translator"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake flag-o-matic llvm-r1 multiprocessing
+inherit cmake-multilib flag-o-matic llvm-r1 multiprocessing
 
 DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
@@ -21,8 +21,8 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-util/spirv-tools
-	sys-devel/llvm:${SLOT}=
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	sys-devel/llvm:${SLOT}=[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	>=dev-util/spirv-headers-1.3.280
@@ -46,7 +46,7 @@ src_prepare() {
 	sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DCCACHE_ALLOWED="OFF"
 		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
@@ -58,6 +58,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_test() {
+multilib_src_test() {
 	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
 }