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

34 files changed, 149 insertions, 37 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7d0a166d411c..9956226f05f9 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/composable-kernel/Manifest b/sci-libs/composable-kernel/Manifest
index 91879beba858..52fbc7b635e5 100644
--- a/sci-libs/composable-kernel/Manifest
+++ b/sci-libs/composable-kernel/Manifest
@@ -1,10 +1,11 @@
 AUX composable-kernel-5.7.1-enable-test-examples.patch 507 BLAKE2B aae585262ad83f2a4e4f07e00e79a99d8cddae9c590e503f8ea1d3ffef84b3d829e61526a8c9b7977a6d604b5310cce521fb179155aba2ffc620c45db76c51cc SHA512 447ee2ec28442d610f185af4d6733d86d183a8f451fca00eafb0d6950d0a65f5d5396a8edcb4a3a1dd4733a6524ba4b9da9ca08b1bcdbd7ecaf7600bf0b14c60
 AUX composable-kernel-6.1.1-enable-examples.patch 379 BLAKE2B 38c3909c98686f97d527f01801043923d26f9f1352a66136cc0c3ce79fabfc7780c822cda7a7e3cc06b36637f6dc5cb5d2c2f055fd79641d3b03f57c241278db SHA512 32d362da7138a7f4c687cbb8ba8be6910d0a562ac79d26ecb7322ecae34e892fc19a79e7be32edbec8290632cef1d97f577accccde2a024e10445fd4cd71f93a
 AUX composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch 918 BLAKE2B 04a17e4e9fd1a2c340a3d93a41f072ad24a836dcf5956644e3eeccb9269f7058a18135f324327aadf48f0e4369bcce8af900a72344515b46992c6deb68b15c71 SHA512 f8ac68ecc9d42673b1b66d3ddde80d042dab2e548a89ebeb50db153c3ec60308f1019a67d1a644d3320435936af0aef4e744b1c12a9f504dc32b18b808921767
+AUX composable-kernel-6.1.1-fix-libcxx.patch 1383 BLAKE2B e1b77cb7926d843e71f8b3cc3642966ea1f5612cef527e08b7eddeca7dccbc7af2992d9bea9d61e84acd0dcb523fecbb5f8055a3f5916f6e5e56faa57c060a5b SHA512 fa2a5bb0f9347da46d509c47026f9af38933cb7d883c28f86c880b397341eb3f98fd67ecd46d4ddb857b16b3294933c18887abb99d221db558c5337bd224f841
 AUX composable-kernel-6.1.1-no-git-no-hash.patch 688 BLAKE2B e3588a306816cf4380bf8987a6fc1660a70a6fc29b811d31381bae4aa2a00b55340d13f43246b70bbc439a462fcb8f664505bfaaac0e4cab793f2e4cb0611aed SHA512 94c59971b95b48e267280989d332240e236cea4cda8b6153945940f01c8f367a8da569403d802d733b7d46728861110b1d916b32be797e62c7a927a42b7b72b7
 DIST composable-kernel-5.7.1.tar.gz 2158402 BLAKE2B 660c205c2a99cd17f29a9077e9e7b8b88e41f42ab40d92d0a235e7a60683a04234cce6b2eb6110265c2f461dd132c40151b2521b7d64df4cebb7f27094d8b2b0 SHA512 3931c5dbcab59513541103ebf7446311a1e318421a9e12aeafa7a98cf0717a75e1519140e6b2fbcaf4cb90829a11f03a724ff3ccc6636139c61667ac82558c55
 DIST composable-kernel-6.1.1.tar.gz 2520967 BLAKE2B 549d76c5c36b0a273a4c51159abd162403ad035520f97c43dd4b66560ad30021199d2f4cf7e2c12ffe33beee2fb49604db6d7c40b3b33fdcbfde111b9d4833aa SHA512 3f7667cea91760447c3f6ac0bfc261c0bca95abafbfce209d1c889e04f01ec29849e8d7f0e1cb1d77a4309ac06b3c2557721a773e4a67be383de91668cb279b2
 DIST gtest-1.14.0_p20220421.tar.gz 849107 BLAKE2B e9c32d9c1d98959583b696430a6be411f5d69e3db96669b16cffc0f1dcad42512391c0a4733f6e829c82953ff33fa243ee782f3cf6e86436f0d290f45d1a3db7 SHA512 967aac7d85da0e216fe13b17d10f894a31d763d9b88201bac7d3dfc37600552b5472d30a166a6ef27f2778677e73fd3e43d082695a48f47824262eb9cd4fcd2f
 EBUILD composable-kernel-5.7.1-r1.ebuild 1769 BLAKE2B 4e51c1eb8f331df322d9427b00d2cb8cba81f10b335533bc131142719d224d9bc89f98a0b54ec20d65f9622a081ab74d2a6bbae9289d1807958a9ded7f08fe4a SHA512 610bc66d4a374c6de7a0afb15a84255dae71911175c05674550478f5850b20f99a5bd0f5c40103c17e42ca774c80423d6a68b5bd0307be9c0ef3eaffa2912a58
-EBUILD composable-kernel-6.1.1.ebuild 1826 BLAKE2B 51c50ead79442a5d3beb92deac4555ae5b74e18e1ad95f27ee0522dc7afa190b307f26e5a0d0e54ffe557d2d91da4ed4a1b501a7fdf8308d8473101312facd2f SHA512 2334d9bb2ce3858ca07b54dbd07b3dac6039ff0afe25b85efa56340866c02852d4b92ccce30298d97029763ea0554518304e82f8d6f1d84d5eda23e0e2227836
+EBUILD composable-kernel-6.1.1.ebuild 1877 BLAKE2B 22e3ef40648776eee7c698a57a5c280dacc8b54ef8c55897e17f9c02e258e795844dd3b61e396ae8fd528b9270fc799da6475cfb0d0e77d0fd9ab3dfa78c89a4 SHA512 bbd1a01db84259a430bae47d768091b081a7a0ca04f809649290cd568e5b7e12d77a2b06f9909b5fc2cc12446c06a60751d89a702e05ebf18301ca4c949ddd86
 MISC metadata.xml 457 BLAKE2B 3ea71ee5eb1ef715b76f1ff2132c8d487f9360d5ea4a062bcb785eda19a997bed1ffcb251a98046661d647c3eac24db5cf5eeb9b3a6792c450c277038ac8c9e3 SHA512 efc4309c8c4ac98a59cb9634d64410d8a0c8b136accc13aff2f943594a0b4fe8d333010fd5ad59b46fbd7c2d29a244839bb3687cfef6e2c880431ffd80ed873b
diff --git a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
index 8c096e29135a..44abf5d59c81 100644
--- a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
+++ b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.1-enable-examples.patch
 	"${FILESDIR}"/${PN}-6.1.1-fix-clang-17-no-offload-uniform-block.patch
 	"${FILESDIR}"/${PN}-6.1.1-no-git-no-hash.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-libcxx.patch
 )
 
 src_prepare() {
@@ -51,6 +52,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	if ! use debug; then
 		append-cflags "-DNDEBUG"
 		append-cxxflags "-DNDEBUG"
@@ -73,7 +76,7 @@ src_configure() {
 		)
 	fi
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-libcxx.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-libcxx.patch
new file mode 100644
index 000000000000..c73dafc02420
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-libcxx.patch
@@ -0,0 +1,25 @@
+libc++ has no std::numeric_limits<__Float16> implementation and treats f8_t as is_integral.
+
+Bug for is_integral: https://github.com/llvm/llvm-project/issues/102767
+Bug for numeric_limits: https://github.com/ROCm/composable_kernel/issues/1460
+--- a/library/include/ck/library/utility/check_err.hpp
++++ b/library/include/ck/library/utility/check_err.hpp
+@@ -146,7 +146,7 @@ check_err(const Range& out,
+     bool res{true};
+     int err_count  = 0;
+     double err     = 0;
+-    double max_err = std::numeric_limits<ranges::range_value_t<Range>>::min();
++    double max_err = NumericLimits<ranges::range_value_t<Range>>::Min();
+     for(std::size_t i = 0; i < ref.size(); ++i)
+     {
+         const double o = type_convert<float>(*std::next(std::begin(out), i));
+@@ -178,7 +178,8 @@ check_err(const Range& out,
+ template <typename Range, typename RefRange>
+ std::enable_if_t<(std::is_same_v<ranges::range_value_t<Range>, ranges::range_value_t<RefRange>> &&
+                   std::is_integral_v<ranges::range_value_t<Range>> &&
+-                  !std::is_same_v<ranges::range_value_t<Range>, bhalf_t>)
++                  !std::is_same_v<ranges::range_value_t<Range>, bhalf_t> &&
++                  !std::is_same_v<ranges::range_value_t<Range>, f8_t>)
+ #ifdef CK_EXPERIMENTAL_BIT_INT_EXTENSION_INT4
+                      || std::is_same_v<ranges::range_value_t<Range>, int4_t>
+ #endif
diff --git a/sci-libs/hipBLASLt/Manifest b/sci-libs/hipBLASLt/Manifest
index 23aeb5897dba..76c27c7af0a5 100644
--- a/sci-libs/hipBLASLt/Manifest
+++ b/sci-libs/hipBLASLt/Manifest
@@ -1,8 +1,9 @@
 AUX hipBLASLt-6.1.1-clang-19.patch 341 BLAKE2B 7e486930db9a406e3665eb4d276c0df4790018ce4f8f6f7a72bd986da61a0ccfc6619ea0de6a2a488cb1ee64f92470aaa337b4590a5be0044be0bf9a014bad25 SHA512 894596742720d947fb25fd3332c34efbb5cc2fdc790c29919e0d65df85d2add6f1ac2a6c7b8f4796428bc69197af0f6227132a6711f3106e9a7b84f285ecfa83
+AUX hipBLASLt-6.1.1-fix-libcxx.patch 2165 BLAKE2B 59b8e635bb9211453c3b18e960f3b773e62d30ec1c3a2cfc158feceb8042c0383d5b1deb6c133fda09504e2c633b934ec60f04a07a8372ec7d72eea6d60ef0ce SHA512 ae7763385b80cd475aa10a23ba4aa156d500cd7dfca0607a8b55f2b4c26bbfa5cf1a03fc15a5d74be91ebb3510fbc4e577a05003b55bc109c3fdf835f0f017f0
 AUX hipBLASLt-6.1.1-fix-msgpack-dependency.patch 1094 BLAKE2B 9606ba01ead2aefd52ec2d2f424c735d361ffab67fc1bc2a6800cd81a34ae7e8d3a189fa79ef84f2caf4d6186687d6eddd8083ca8a912beaa0bce0ae72ad0393 SHA512 8b1b383611a88d9af6be546b985d4d460be830c370ec149eb7c4ae56dfedb57583ea463470029d099a779161f8b582637cf62ec0fbbd3617023002cc903cf82c
 AUX hipBLASLt-6.1.1-gentoopath.patch 724 BLAKE2B ac3acc8c444de7a8072337cadb3c9976d94cd019a1ecf51a18a4ccd59500efd4de798f710738c818f495dd018d0c8885e8754fede2d308a50c355f2a39236370 SHA512 59358f5d0c22d9188cf4e70215c0e42415831b0e804709f1c97d42fce15049edb3e58320c252b413b016490ed72fc27ab59660880fe71e4226bace0808529b32
-AUX hipBLASLt-6.1.1-no-arch.patch 1967 BLAKE2B d73ede48e0254a99df1b632437a4d820d1f639600bdda216d38c74dca38e6234a3ef4dd8bdc3a1e0450cfd64e07c9c2806f5378ec1097be0e130f6f6b5c4b934 SHA512 a4aae7c3117821e72ce63b72b2017eedb414046c9e0f52c2cb16c8a6c7aa84efcd1960adfe85dd89f3a247c8f7bccc7a586e36d494c6e9bc1a8fbd39f6febe87
+AUX hipBLASLt-6.1.1-no-arch.patch 2082 BLAKE2B c71e2c112c24f0c82170852f7fe5381e99e13501656e3519cd8438fe0ae369c95b16b9f4339d2ff0dc42eaf4f4a8cbdbac57c0b72856a9db6bd5344cf3fa8548 SHA512 a758ba61f52080ecae8be8e879a9e56a71b672b7fa1514573f4498520113d40fd1fb323baeeba28a4239e2a66dced478430a2c556510c4d70d8a0d4b2add2386
 AUX hipBLASLt-6.1.1-no-git.patch 365 BLAKE2B 47b7f23a4ce0919cfd6d2d1a946d98822db912571d908c82d35d734ea2bfee15a1e537f50e8fb2ada474e819274654462b26f97fcb5dc010354df9f6ba30c377 SHA512 a44aa357bdc035ffcfe4d30fb81db205dfcfd28c00543a4c55f7f61f5a90ae228bcfce71be2f4290e842f60f534287b2f25a4cd2a27369ddbbaf1e0d1171a7d5
 DIST hipBLASLt-6.1.1.tar.gz 78448557 BLAKE2B 08ac9ce45d7d1e4384a36939af22f65589ed87e25b4db77f5f7ff5fbe65b8070e9c55fbb09db3b7bd49be98981dc8bf939e646ea27571bf1d1ccfa52a50b0f92 SHA512 1aa3a1cb8e9c7f653db66909b38be065b7386b97d4bd6b52ecc6c2bf72c6cdfabde6f12ebc6016b5fa195f979359af875eda8d54ea6772329312cb357bc2ebc5
-EBUILD hipBLASLt-6.1.1.ebuild 3260 BLAKE2B c22ce042c79793e78b9e91bea880ec853d6faa6cda427393729f39ba8fd9af491454da04cfd6330c85cb6bf7b8bd1034c7dac120d2dba1d1be0956c56d40b761 SHA512 f640b0c0db0089627341f102b87c23b892874cd90d49d89b3257234c65105db2c377c835b8e2876d3034401112303a7f17d025f7a268c410a948f9cb38b77814
+EBUILD hipBLASLt-6.1.1-r1.ebuild 3311 BLAKE2B ca125cd335e79d204cfbab86bfb9a1a7313fbb25af68fc71beb0a3ee94ada2475639e5e5b2b766aca46b014d9771d2529edc2f551e7cb55abf162dbda58a050f SHA512 14a459eac3bce051a35fd0a4c4d99c9352e63fa79c9e77b03ffc6dce00d005c145bd64c2cde6826001fd9d1ae231fc4bc3d9b8f08f567fe7682da05f6f39f6ab
 MISC metadata.xml 416 BLAKE2B 72248e12cd10654326a6685df0e03c508d413d2728d8e687eb8ad3d8dc928e518e3ba21df1ee774282c45363f61eed98b47b862cab2354d743ca530047084281 SHA512 02acf2d17f2c56f09c599fcde965bd5ceb07c335d7c2b4fd57a06a6b1a591a250d22de7a002f299cc99cacd1fd72f183adf51fc1b9ebff1338c6d83450da9c3b
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-libcxx.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-libcxx.patch
new file mode 100644
index 000000000000..32aa65127e84
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-libcxx.patch
@@ -0,0 +1,57 @@
+# libc++ issue: https://github.com/llvm/llvm-project/issues/98734
+diff --git a/library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp b/library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp
+index 82cc81f..94e62d4 100644
+--- a/library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp
++++ b/library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp
+@@ -28,6 +28,7 @@
+ #include "handle.h"
+ #include "rocblaslt_mat_utils.hpp"
+ #include "tensile_host.hpp"
++#include <array>
+ 
+ #include <hip/hip_runtime_api.h>
+ 
+@@ -602,7 +603,7 @@ rocblaslt_status
+     std::vector<int64_t>            ldc_vec, batch_stride_c_vec, num_batches_c_vec;
+     std::vector<int64_t>            ldd_vec, batch_stride_d_vec, num_batches_d_vec;
+     std::vector<int64_t>            lde_vec, batch_stride_e_vec, num_batches_e_vec;
+-    std::vector<int8_t[16]>         alpha_1(matmul_descr.size());
++    std::vector<std::array<int8_t, 16>>         alpha_1(matmul_descr.size());
+ 
+     std::vector<bool> gradient_vec;
+ 
+@@ -692,10 +693,10 @@ rocblaslt_status
+             return validArgs;
+ 
+         const void* alphaTmp = nullptr;
+-        memset(alpha_1[i], 0, sizeof(int8_t) * 16);
++        memset(alpha_1[i].data(), 0, sizeof(int8_t) * 16);
+         if(scaleAlphaVec)
+         {
+-            setTo1(compute_type, (void*)alpha_1[i], &alphaTmp);
++            setTo1(compute_type, (void*)alpha_1[i].data(), &alphaTmp);
+         }
+         else
+         {
+@@ -867,7 +868,7 @@ rocblaslt_status
+     std::vector<int64_t> lde_vec, batch_stride_e_vec, num_batches_e_vec;
+     std::vector<bool>    gradient_vec;
+ 
+-    std::vector<int8_t[16]> alpha_1(m.size());
++    std::vector<std::array<int8_t, 16>> alpha_1(m.size());
+ 
+     for(int i = 0; i < m.size(); i++)
+     {
+@@ -924,10 +925,10 @@ rocblaslt_status
+             return validArgs;
+ 
+         const void* alphaTmp = nullptr;
+-        memset(alpha_1[i], 0, sizeof(int8_t) * 16);
++        memset(alpha_1[i].data(), 0, sizeof(int8_t) * 16);
+         if(scaleAlphaVec)
+         {
+-            setTo1(compute_type, (void*)alpha_1[i], &alphaTmp);
++            setTo1(compute_type, (void*)alpha_1[i].data(), &alphaTmp);
+         }
+         else
+         {
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
index 6bd608c94d0e..7f1e61d2dc0f 100644
--- a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
@@ -37,7 +37,7 @@ Related upstream bug: https://github.com/ROCm/hipBLASLt/issues/535
      else()
 --- a/library/src/amd_detail/rocblaslt/src/CMakeLists.txt
 +++ b/library/src/amd_detail/rocblaslt/src/CMakeLists.txt
-@@ -100,7 +100,16 @@ if( BUILD_WITH_TENSILE )
+@@ -100,7 +100,17 @@ if( BUILD_WITH_TENSILE )
    set( Tensile_INC
      ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/Tensile
    )
@@ -45,7 +45,8 @@ Related upstream bug: https://github.com/ROCm/hipBLASLt/issues/535
 +  set_target_properties( TensileHost PROPERTIES POSITION_INDEPENDENT_CODE ON )
  
 +  set( Tensile_SRC
-+  src/amd_detail/rocblaslt/src/tensile_host.cpp
++  ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/tensile_host.cpp
++  ${PROJECT_SOURCE_DIR}/tensilelite/Tensile/Source/lib/source/msgpack/MessagePack.cpp
 +  )
 +
 +  set( Tensile_INC
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
index cf2ad2ac5382..574f185be5d7 100644
--- a/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.1-no-arch.patch
 	"${FILESDIR}"/${PN}-6.1.1-no-git.patch
 	"${FILESDIR}"/${PN}-6.1.1-clang-19.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-libcxx.patch
 )
 
 python_check_deps() {
@@ -83,6 +84,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	local targets="$(get_amdgpu_flags)"
 	local build_with_tensile=$([ "${AMDGPU_TARGETS[@]}" = "" ] && echo OFF || echo ON )
 
@@ -95,7 +98,7 @@ src_configure() {
 
 	use test && mycmakeargs+=( -DBUILD_FORTRAN_CLIENTS=ON )
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index eb15875aba99..fe84e09a757d 100644
--- a/sci-libs/hipCUB/Manifest
+++ b/sci-libs/hipCUB/Manifest
@@ -4,5 +4,5 @@ DIST hipCUB-5.7.1.tar.gz 322980 BLAKE2B a9b2a69b47661532858f18e7296ef37be41da814
 DIST hipCUB-6.1.1.tar.gz 343181 BLAKE2B 3943278597c5e9d41c225ad86c3cdcc113f35cf1bf218ba357a112c25ae14df8d0e3f385aacd82ab4c694ae2382012aea06c02d40d982d00929d03d0d3908b55 SHA512 37297f6791146cc9db11d3d494555672c021dea06bec1e8a780ca926df1e5de140c8ee560657668df6221279a0418af9e34a235b3b52df3df2a66adabea7ca6f
 EBUILD hipCUB-5.1.3.ebuild 1930 BLAKE2B 9a686ada92902f9ee2fed32ac68e5599a38fd25ab639a22316293efe868701399d6d26c401d9c09b328139d94fe4fccbe8a33e6dd3eb675b7b9704c906af3ce9 SHA512 91a0e1284bb43502525120d031586b12238a71c28583135848b824e555c5ed84ab7d2258eb38945090a00def1ba060ae2ba8aefa7c2fe5cd35ae38808b4df94d
 EBUILD hipCUB-5.7.1-r1.ebuild 1303 BLAKE2B b5702011d5ef9ffc482cec9a74bf6b05bc952d8d071b38d7dfe8ae5aa48d8944ec248d23eef9bbdf25e25085cb99e5b578a291b206fb6dfb97f2ca257245b515 SHA512 97e716391c5f75d05396b46cf05f73130eefc12566c07f550d25ed38fb764a02d3bee0b77ab0cdb849261bce8dba0fe66d01e9d261a110e4a06dbde1d201ffe5
-EBUILD hipCUB-6.1.1.ebuild 1265 BLAKE2B 8a64bc81af9c541be86c30e3b1553620f45cc10805102e68d7f85b15bd59ab31d2a8534eb40bf0e6aeedab4adfb79c28bae14d6eaaf8c692466d9b59671cd711 SHA512 5b2f574c4de7089be0554e486421633dc1fa3369adce90316d7d159b6ac95780ad9e8366ea07e3cb878de04f4d9d8778e785a05987f1a7c605a63bf94230e7fb
+EBUILD hipCUB-6.1.1.ebuild 1272 BLAKE2B 6bc38cd3d84b2c88e3926a54f52f7e3918f5fb2f9e723bb9fa4ce766b9b847890a42238d30c2c982ccd64ff95960ebb43da0fb83893f206b54eab6ed0771462f SHA512 aedac3ee24b853953f22d6beeddcbeff4e62acd5f33e69c5d1c85e4b7c398b25d466afdf95a90634aae1a3572eb9544ef19cfd7a5fadb2f80cd1d7d3fc1c5be7
 MISC metadata.xml 716 BLAKE2B 433c3fdc53e3748b67a65d62ce8380044a4c5456191a14cc723e614d90da63b2e4bf4ff6d8f1fd9a7595041f6380a17c502d3bb5f17d8d0c08e0b7b1205ac8f5 SHA512 5130451d65a122a242bc9c553efed4289f54aa3e7bd56c1b3ac636ae902ce0df4502d9bbdca61e58c4a94bb4ea8adb00d94baacced1e487ed563c6c489377587
diff --git a/sci-libs/hipCUB/hipCUB-6.1.1.ebuild b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
index 8a38588c8d4c..ab990f284e87 100644
--- a/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
+++ b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
@@ -37,6 +37,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DBUILD_TEST=$(usex test ON OFF)
@@ -44,7 +46,7 @@ src_configure() {
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index 359f9f3077eb..84e65a05f5d8 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -8,5 +8,5 @@ DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B ee8d6dcb7924c8989987b02533126c4e441
 DIST hipFFT-rocm-6.1.1.tar.gz 170796 BLAKE2B 8c957db8e7e2548918539c94262d912c2f33b70d8482b727c78c13323bdb6822c3e95439854b8ab4fed970d21ed0c6fd2ab8c2805db59d3a3606d73e7eb47468 SHA512 531be32b12ed5f0f2352e3e0a893ca988a4c8492e66fc9347b6754ae4e769549d6f638a760de35cb15ef2d301ab4200a76c832d769ecb0cd55e9e42f839a1876
 EBUILD hipFFT-5.1.3-r1.ebuild 1055 BLAKE2B 421cdf532e119730b6d3115b40d304b24156b0724f80188dd6059e0bcc017b66744bb66c52e520349e5423d80edd6c9c7eec57476a7553cfbef3965777c51caa SHA512 fe8dfd3e06dcec747dd182bd9eba449f5947d72214d2865c2789cfa0ded17e9394762d8e4a4b307de45169461cbbc6facaaa188f5f0c8b68a9b48be77c297a2e
 EBUILD hipFFT-5.7.1-r1.ebuild 988 BLAKE2B 8a15335790603e3499c1824bfc0dd5aa4fb305320bacc37dc17579fab895b1d7dbfca8da3a47efdf8a8fc1f32d7eca72db24d59fc764fc5c09997e2e1a232ff1 SHA512 7af50918064c2792e194ad9da8e00b96c84f275c2f38f8ad831109024d16e92c0aaad059e4da7bb3862368e1b776b416628b743e5ff7e7831fa9253cce11f645
-EBUILD hipFFT-6.1.1.ebuild 782 BLAKE2B 772222101b586e9ef1426cdb084a1fd096f398d5dc7cbee73b7684ffa89883c1c9c1dda2b1504883945385385fbaf9aae9f813b9b3bf6ee450c9f732b924a6ac SHA512 d040a4f4c7d622f11d3d7d06dfa073e2a42d4b2edbee9b0f76912944f21b20f8af1030c924590ce33a35a5f54fa1d8d090c65245332a0bbdaf2b10548e46318b
+EBUILD hipFFT-6.1.1.ebuild 936 BLAKE2B 180d9f0d4d9f83d8b161f1d8d8b7ac83bb6ab9a1c7accb28b0957a24dd72076d0cd02b2e718c1ed7fe9794df7054c706ab591c0af4c7126a1e0441214906228c SHA512 6911033e816d9c914be257781d778914996b21dbbcfaf9e58b8435e7a995dfe092c95138ae2da6d3a9fae667e0a18272af2a9e38971a6c84aa212727ed1da8b3
 MISC metadata.xml 714 BLAKE2B 092bc9b24f4f4471096402455b42f65bc7850a46a08dc1e5721d25d630a9dbfd3ba9e770e7c529187cb483161a47e6fd0bdbd617e54b80280704c58a6c6256e8 SHA512 4da0b797299b620d14b2f1ce5dd2c7adcad555dacf11a5f1aa991773895730330c381759e29f43b2a2bbd3d3f50995b1cbb654fdd0d2e8b622db1e1385b9a8d1
diff --git a/sci-libs/hipFFT/hipFFT-6.1.1.ebuild b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
index d9700529cd24..8cc68e63e149 100644
--- a/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
+++ b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
@@ -25,6 +25,10 @@ RDEPEND="dev-util/hip
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	# Note: hipcc is enforced; clang fails when libc++ is enabled
+	# with an error similar to https://github.com/boostorg/config/issues/392
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DROCM_SYMLINK_LIBS=OFF
 		-DBUILD_CLIENTS_TESTS=OFF
diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest
index 09cdb4661bd7..d521bf64ca13 100644
--- a/sci-libs/hipRAND/Manifest
+++ b/sci-libs/hipRAND/Manifest
@@ -3,5 +3,5 @@ DIST hipRAND-rocm-5.7.1.tar.gz 478352 BLAKE2B 5f435cf53d213b1d95ee8b766df2c9bc4b
 DIST hipRAND-rocm-6.1.1.tar.gz 119063 BLAKE2B dc314d8b09c15351075594335d14f65024be54597e7cbdfb7671ebea29fa208c9a33530a2d406a8a2a9d8738f0aae7e9fc25d8c39304ef2ef27aaf8b327b5975 SHA512 4c350c8a75e6b4064e22cd73679f66e5caf28f7922fc47ef9670c1023b58b36bf3a2a35580463ee7c89e26ed924aaaa68166a11f64823b99f2f8302f80d6e87a
 EBUILD hipRAND-5.6.0-r1.ebuild 815 BLAKE2B 568be23ee847e47d5aeee9cb63b318961057a6787140ef54ce5bce289703b0b611cb52f501bc6fc73c2365549af482ba7483a6edda9e91b5cbe419f5b9cfb07f SHA512 8e8eabb6d74cdaffb3e8c9c41fddb166e8b49317285c4f79574253854b70c8f7b43689df767a3b8117f0591a9ea9f2a0652c1b7696b8cbfb04481a41c61de37b
 EBUILD hipRAND-5.7.1.ebuild 815 BLAKE2B 568be23ee847e47d5aeee9cb63b318961057a6787140ef54ce5bce289703b0b611cb52f501bc6fc73c2365549af482ba7483a6edda9e91b5cbe419f5b9cfb07f SHA512 8e8eabb6d74cdaffb3e8c9c41fddb166e8b49317285c4f79574253854b70c8f7b43689df767a3b8117f0591a9ea9f2a0652c1b7696b8cbfb04481a41c61de37b
-EBUILD hipRAND-6.1.1.ebuild 783 BLAKE2B f16cf94ffd74feade782c956cef6b01a19d59667dd1b14c75a8dfa266cf0252d90859fa4c6de477df161665fb55837f45b6cfadbbee794ea0acd1bc0a0d34b12 SHA512 418859dfe9690ecef18d85a6437902ea590607677d506bad73e9d2df74238925c6dc4b995cffd99f45f26db2efaf67adbf1e27b0db1a5063b6e3bf71b7c3cbab
+EBUILD hipRAND-6.1.1.ebuild 790 BLAKE2B 1eac4994b7c6dc84110e1bf3163f82ee201173588002a1524f413290b7de6bf1c7289af0e07e91d4a3658d0288feed0b5e360f5ca89ee0ee0e620fb2591fca9c SHA512 4dec1a6d7b6a180dfe6a44b5cdd75775fb6599b696ca39197edd6ac46e9a64f286ae0db8345f14c5c2fb25a0f9a8165ab701007d9cfe86ea8bb2237e478e9896
 MISC metadata.xml 586 BLAKE2B 98f8745143ec4d1c89f1e12747e1f1abe97ec74bab97f2afeea257f3a900b87c76efccebb39abd500f36ff88eab2284ec73a89db90ff0c5e616dba912f084f11 SHA512 71778ca99fb19bf30fc2f301f188e4ded754eafd2eba8abe1143cbecbf143d7f3cc8ce908592dee9e7cdc242d4f05f4a2d10739893357abb0a30362ec4448b85
diff --git a/sci-libs/hipRAND/hipRAND-6.1.1.ebuild b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
index 2a123df19544..30e218be3a80 100644
--- a/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
+++ b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
@@ -25,11 +25,13 @@ RDEPEND="dev-util/hip
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 		-DROCM_SYMLINK_LIBS=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/hipSOLVER/Manifest b/sci-libs/hipSOLVER/Manifest
index 2ba646602c30..94f827df39fb 100644
--- a/sci-libs/hipSOLVER/Manifest
+++ b/sci-libs/hipSOLVER/Manifest
@@ -2,5 +2,5 @@ AUX hipSOLVER-6.1.1-find-cholmod.patch 965 BLAKE2B 0d4f37dbae67bf2605a981f3a01c9
 DIST hipSOLVER-rocm-5.7.1.tar.gz 1516012 BLAKE2B 8d0966d34877978784b9872150283719602465c85036c3a74a72a2fe7c516b6029af3f4aefbc022088b2cf37bb1e0a450c0221aef0ac3227018020de340adfcd SHA512 f9c14b51ea582f17d1b323c7d066d9c0c95f4250f08515768d7a11067774fd2841fa3dec7354d3c98e56bd8dd53cff3b993c68b1d7df4b24f562b3afe9c4625e
 DIST hipSOLVER-rocm-6.1.1.tar.gz 2553462 BLAKE2B 77731b876a7fe5f80f79e5af5128a84d8a5d4dee6d511f3e1cf4964845b636380f7f1e19f07e84ed24b98e99c3bdfbba623b97b48cf4ea1bc09a4c1bd3dccaed SHA512 4f28ecd807717013318f293df8c48d7674f64fd3a538c2b827f4188a00a36165f48277d5ac50e806461d52a8a3b6d626cab91ff7c6687b17fea2580461e08de9
 EBUILD hipSOLVER-5.7.1.ebuild 820 BLAKE2B 2e172aea78616bb75696b6dcf81e7ebee8902ff15335a5d7d36e9728e74eb20c320124491bccfb6cef9b4804e14fd7c58accacce500d13c043f6a104407f0c77 SHA512 83d99abbb856cfe7ce029fd8c7529fdd07be56e60a4ce6f00b662c5a6c3c829e99e66081fa907e61ee673320991fcbccca26b493022cdcae5e6d12dac04b62ea
-EBUILD hipSOLVER-6.1.1.ebuild 1002 BLAKE2B 463115ba89403b1f0a0788aebd8bba9b48c6c6a39585a79ffe6b3ef8e1602f22e5257949bf2cddf2f3819dc4610981da6efcaff63d699fb6b9c8b7c31e58ed89 SHA512 99c71c0f1b9276331754c9de130b11edbf1a7336a6d42020bb4a9bb5dc5e7591dc6b603821810976d69c7a3a4cce9318635be9b58c9ac90d677240e657924d97
+EBUILD hipSOLVER-6.1.1.ebuild 1009 BLAKE2B 3640afa3a791393c5fffe3ed8bfb3a4ca1217e1410929028d828f32d09eec158d23f6c670764b4861558f12f73e98696152a722fcef1dc1e67b11d0438f37240 SHA512 56a1115e0b9eaacb723054082a3272f23e001c77f43d191a699925a327d99c8e0503233f2b02ebbbb54a1d3873fc53649b904fdca63274a125e825bad005ed3c
 MISC metadata.xml 727 BLAKE2B d10c0be13cf9f705b7c7c0b223b91da6f0d06faccaf5a7c5e8a6ed03e0c3d32e943a742f1a9feb9452f21f36de99f1b74b3ec91ad2d32a6c7c94088eee66ed22 SHA512 14521a8ef7d65220b9b5ee23c7600f11a8329adb23993bbbda70ccfeb3cc4de5eb25713cb523890f2868983a409ae2a735d4191457b1fd8647b01751193e2cde
diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
index be450babaed3..99c4a9c0ca41 100644
--- a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
+++ b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
@@ -36,6 +36,8 @@ PATCHES=(
 )
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
@@ -43,5 +45,5 @@ src_configure() {
 		-DBUILD_WITH_SPARSE=$(usex sparse ON OFF)
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index dc22e32055e2..5f2d233001b2 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -16,5 +16,5 @@ DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe579
 DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a
 EBUILD miopen-5.1.3-r1.ebuild 3182 BLAKE2B a6ae78e487ea88d31693fcf1b96a7ce6a1cb0505311c2f101be498bcafce5436cc678ca83e10dafc27549b3121c01cbf0c5d2a35e7f6117de086879002ecc138 SHA512 2165e4d250f125f699963bc7b6f1c22598467e962c9aac1bb7eeff24d6091fa3b72a696a11e1ab80ea18710525ef00f99889cc5b972068e23340c4eb14b621ef
 EBUILD miopen-5.7.1-r1.ebuild 3338 BLAKE2B bbd84a39a04c4ef9e1b2dc42ff1bbe7b7e4ceda90ca0c82f416a05a55b1324727418e1c2c1446fe7a82800d23380cfb9a3e30463289a18e9af20ab10239cbfc7 SHA512 5a8ddf01d2c088325fd377499f80b3c1f84881d52596b53450f2ce07714e53a552304bd8a24aecf394a57ee039fd6f364642f93e7920d8d9df63bb7dd312057e
-EBUILD miopen-6.1.1.ebuild 2332 BLAKE2B 04154b1c66d6e91dca12201e4e61dfaed46b60e10d31809906ca6f43a75b34d8334944da3f2223a14684f9a1ff0ed2a58b3e5878c25a54721ab4ec25f017ec70 SHA512 2e90d3a0d51e3206b6e90fb0e435d4ec2ac5ddaa94b155e27750902942f5e0c2dca139acfcf1bbf45183fb9f8ecb68461650688be0e929eb60b978f7e87fe6a2
+EBUILD miopen-6.1.1.ebuild 2339 BLAKE2B ffc1c4e15f8762046b8cf5bad5f36c311132913b92d1da4f994ad4ce2e8010ae7c12614b09e1e5b1fb5701a3cd2ba11f95592137603a64ae245084fc04e76072 SHA512 3e22489631a1116e9ab02cd9cef39964ba5be9a1af71daef2d4b002a420f607ee6358552d830f12e4bfe3ce4b869157599bd907f5bfac5ed5bad04c4f0f1d841
 MISC metadata.xml 646 BLAKE2B 76ad8db32707d804dcee5a8ff3adb66444464aa2bef2e3415326b485b67f6b0c26a36e45b30cd632b0e41e96cbcfad9c785f5145ddbf89fcdabe66456b35d22a SHA512 d7b219b8800178385725fc92fe72fe65c291a451963263271731580548e3319f2bac83e73bba66d3a6442aa6f9dfc8ff8955cdbbfd7f057825dda992e8dfe772
diff --git a/sci-libs/miopen/miopen-6.1.1.ebuild b/sci-libs/miopen/miopen-6.1.1.ebuild
index 7cf62bdcb790..f272f435ece8 100644
--- a/sci-libs/miopen/miopen-6.1.1.ebuild
+++ b/sci-libs/miopen/miopen-6.1.1.ebuild
@@ -58,6 +58,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	if ! use debug; then
 		append-cflags "-DNDEBUG"
 		append-cxxflags "-DNDEBUG"
@@ -91,7 +93,7 @@ src_configure() {
 		check_amdgpu
 	fi
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index 3c591309db7a..57d7363b9c60 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -17,5 +17,5 @@ DIST rocm-rocBLAS-6.1.1.tar.gz 100103895 BLAKE2B df89a21e47730714b80c62717a86d65
 EBUILD rocBLAS-5.1.3-r4.ebuild 3050 BLAKE2B 79866dab3479b657dc21aabf7140d465c144b8ea778f1f620a6dad8425883b8a2feb6eff15e936074c5947d44be104e5c391732596c185cb360592981f4cf461 SHA512 b14cf2ec87859a56f314f161fdb6f96695e6f68838699406365f619e56481c99559e6a5e115f16376ea323b9cbf6b57307c2b8531d6bb31a6339639d1eb2d734
 EBUILD rocBLAS-5.4.2-r3.ebuild 2689 BLAKE2B a3713d44891b79166ff1bcf5e2290853b85545a7cbe4a0605ace885f350d8de2ba119090c9bc9ac15bd768ebb7e58ae450cd31e58402f87e3ad0ca5344aeabc7 SHA512 95da8f3dd111894bfc18f522c44bd92e34e91a3215ef89e2bc24ffa63e6fd320d04ee2c98d9261482793e583064a7d77ed364a0ad0a72270009f302c6de28703
 EBUILD rocBLAS-5.7.1-r2.ebuild 2718 BLAKE2B 78b35d4032fd97fa5ff63273c213ecde3b7d7900b4002da27355ce1ab8f4af2a6e796560b955df6fb3b1d517752a153ccf4a9980e31733a141b880a11f676db7 SHA512 943f734ef9a089b5a16032614813b8e528de81a4b81c81734814ab4a986e3c01a3d9e6f0bdee32efd850f476f83380cb445ac3da2a6dc102cbd18414ff19a1db
-EBUILD rocBLAS-6.1.1.ebuild 2833 BLAKE2B 56df33992129fa096291dd2809431de8423ccace0c0ea7ad7162411972ecd9c24460b26b96c29bb0ac6e11407a797222933fe37b06615d62ff6ca214ea75d1de SHA512 b03ccda2a28e6a68081f150a46f248b10fa276d73a2f72d99e9c9203840733b34d114d2f3dfb002cb589b9e3d1dfd9c7bf1d6d9165927ef68d0df35daf567cbd
+EBUILD rocBLAS-6.1.1.ebuild 2772 BLAKE2B bb88111a645e950628ae2f097d62c91ea1e24c2c6cf8ff8ffb16adfe8c40a662840bd8397215ef8d485260c327699428c14d0065f6d4fe976ab7ef6b705c6bc2 SHA512 8c83e9a6eb2faaa594412ab985db00799bf4dfb5661de18d00e5031d361edce8ffad03e92d4600ddd7c5d61f2d879831a874b7d9d0b9b410a508e8ae34ace3bd
 MISC metadata.xml 852 BLAKE2B c358ef9128e50c5052fea39876550419dc037a8750c8dd12f10415a02dd2a64893ecd11c4c0ee4acc8db83999a4f709a98da53f6d12f71d0782f98af92a37a96 SHA512 18de129cceb076f84235ccb5706287ee16c5843dab654dc9494013b89b07bbb9f82d1e4980e1c1a8e0c8ce2b0e125633cefef069b0e97b3127e0240071d5a53a
diff --git a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
index 26bfc2ada24d..b4fe232ecfe8 100644
--- a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
@@ -58,9 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /dev/random
-	addpredict /dev/kfd
-	addpredict /dev/dri/
+	rocm_use_hipcc
 
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
@@ -86,7 +84,7 @@ src_configure() {
 		)
 	fi
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index bc4c89d928d5..8e355853590e 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -8,5 +8,5 @@ DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e
 DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9
 EBUILD rocFFT-5.1.3-r1.ebuild 3921 BLAKE2B 98eb96a54b1f73e0674299da7300c68ccee073a9a87a27213f865d8cc0b229078416b7fb4a98ade73ea13baa59d3e57c3117c457e59e710177287d726fe6f189 SHA512 a3feeec5c089171f6476bcfe5f1a8d154a1117be087f57151d4efc4403dcefb689dfee8241b7ad3651c8b008106314a7f5f8ae65a5147cc617beef1e63b1b803
 EBUILD rocFFT-5.7.1-r2.ebuild 3945 BLAKE2B e663c5ef2aa609daec68644c943a4b4dbb7963f1506ef6dcd6c907c0b2bf9f5cddb768fb7e37503e5aba02c998655785bb44412205e2c5575fa95cf9b98a4dce SHA512 f49656ba5e5691bd83a3e18c22c343b254bafe3b8ea893b482e32421e6612cd4cb3cf14607751ffd78f8b0bfe56057ad563b624e27036a80b4db4b6e02f94fe9
-EBUILD rocFFT-6.1.1.ebuild 3735 BLAKE2B 4dfc2b602df3707956c3958d6289eb89d9f6e0df1d62faccd9545a2f311ad69304c4a0e2b446bc76076bc5f8922486e72c5ffcc374a1fb2cc0029d793b492cc9 SHA512 a3b20704d3a310106046ea433d93dc23f3365b5848b7e7ece83794960dc07fdb771b27e31d097cde909ee657122246266b92a32527cb307e08f26b755d8bc28a
+EBUILD rocFFT-6.1.1.ebuild 3742 BLAKE2B 33244227fe7fccc079f0a38e16fa797f8af862eda12f792e786f8e8a579a48c0c1fd91b3b9d85de44afb2fc9a3f4db6a7e741204cfceb03f9c42862377e031fe SHA512 9c52a7ac3128ecf5fb17631e0a6ac56a54936948472b2d9e090f564c734a40a68c861e1926807eb93d292ac638ad3f615e1bbe0a337fed5ab817cb95b2c60726
 MISC metadata.xml 764 BLAKE2B 0490d64e75e9269408f31d4ac87f4845f01a306adf829d57d89401cab19c84412896f351c1dc9f6a918679447f1fe62a7fc958bff9c98f1990fe021f99b35e01 SHA512 0135bae193ac9439a86dca5e26a32366eae7b67175c955aace1a1d620f1df5176a3e3a302a5e6f1e6473777e5b51ab772aa67a01ba023e9c8bbb180352ae8e0b
diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
index 4eef4ea268dc..99709902c496 100644
--- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
@@ -101,6 +101,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -112,7 +114,7 @@ src_configure() {
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest
index 63daeae9a910..705ca7510043 100644
--- a/sci-libs/rocPRIM/Manifest
+++ b/sci-libs/rocPRIM/Manifest
@@ -4,5 +4,5 @@ DIST rocPRIM-5.7.1.tar.gz 535649 BLAKE2B 469bf59b5c92c37df96f58bac5a6559dc2cb879
 DIST rocPRIM-6.1.1.tar.gz 611372 BLAKE2B 984df214179a6d2c90b31bd30ec9472a0b985d9d488ea195968f25df4cac97ce48bfa4c322f2d578771ac63caeafc2c69c9dae911bc3a9d920ab9558ba7d6e15 SHA512 298eebc8a5d3fd7da71ab98a22fd39183436b3d9e14945e450f0fb35e38ea8fb99c5f2b342f1f77f21899a14d506ce96a965fbdb24f106ec9638dcd6afe6ae98
 EBUILD rocPRIM-5.1.3.ebuild 2012 BLAKE2B db384e213038bbe8dc5e925905b9637bf5dc14de1b59f1f574abcc0f46aebe876484c0b9704acd0bf447a01727e1a94b388de9989669f64569043bf46cfb6e5e SHA512 3cf65a5a20fcb5b90cc871e266df7d96e791c70f82c33f088349a5cf03a39f0b114972a7fbf25ce8df4d80fc47af379f8cc0bd0466d261a1acee79e4ca7b3dbe
 EBUILD rocPRIM-5.7.1.ebuild 2234 BLAKE2B 504db3f20d2bc78f46e3a93d5eac96b275197444448185b0ebce64df866f6e27aa966cc940be9d91cdb3756bfaad2bb00e76cea40fe489e7603e63571d50f590 SHA512 bb10e2ded213c8e5554707e25cde78205cd0b6eb217e68242def0c2126fcd2dbc1dd0182c56df65e6bba5ed7c1931637079106d012a748cf3c53eeb13589e04a
-EBUILD rocPRIM-6.1.1.ebuild 1536 BLAKE2B 3e96a188cae858765055e6b31daa5f5f92da227f5f782d78b1f9d749a7a80845216ba00031f78b881f2be630839997372d0e0813e3f24a32e1bd5b5d86d5c672 SHA512 a31f2017d7f2fda1cbaebdf3ecdbcaddce1a9d9b1a36f3f8929d628c9f75f873933ae7e1fa07f3ae61fde02f12aa481d0d54d0f3f24f00aabe1b952ac6afecb0
+EBUILD rocPRIM-6.1.1.ebuild 1543 BLAKE2B 70aebece6353eed300659e250f714964d9d3565b165e0f43b670e881f7fe13ed9f7e2998500e7ccdc518f6832bc1ef6920b5b7aae67ecb943619392e4a1f8e91 SHA512 36134f4158d97463a798686d2e5e5881c55f96b2ec91b81f402476a2d0ed9a0fe0d2cdb6cd156d1ef4319e8ea635c0706248706b3e5aafa3e180c1e92b06c428
 MISC metadata.xml 672 BLAKE2B 93644f07bd8f34b43e335ec631b69abdfee76bfe55fcccc9c33b772945e72870f4307803a121226d2d87aa55a07f31274f376a6d8a44a9f5996a861d21dc5c38 SHA512 e8f5caa76c96a1ef5affce0a29f07e12fc4a10057c77bbc9f53288fd886488fddde59a713be80fd72dbaa9656abb6d4851995a000e160398c09ed28000a53712
diff --git a/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
index cd85f27b6500..5829c9167987 100644
--- a/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
+++ b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
@@ -42,6 +42,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -51,7 +53,7 @@ src_configure() {
 		-DROCM_SYMLINK_LIBS=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index 43caf94db9a8..d62116184ab6 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -10,5 +10,5 @@ DIST rocRAND-6.1.1.tar.gz 26683143 BLAKE2B 4108584c6372adbf2f9ef887cf1aa08f5afdf
 EBUILD rocRAND-5.1.3.ebuild 1983 BLAKE2B ea0f8aeebc7d7eaf8bbfe682ea1b4f52c789df5250b05cba6728db6af46c30f852d783c9c5254bde7f7eec36854ab857a18ab0d3536db50ebd0bc016bf82bbb6 SHA512 f4a139505f8b64ae36d912730ac40c78b14dee492cc75499536f8b0697bc3fdaa31c37efc1572faba02ff10952cef0f489a90a72904fc589cd71f5a222f2e2aa
 EBUILD rocRAND-5.6.0-r1.ebuild 1381 BLAKE2B 398870e0a0a5d68eaccf173fca87e1d5086e8818e45b56a9811113e3d2038add46bf370af35771079928dfd0770575c74d79aeff92cc149eacf4dbf55ee67643 SHA512 a0d94616f9b63904aab41dbee8e73ba013a6e1e59a8be3526d7f48ec0c7b2463b7282c66f6ad1c0984ee254b9a13d39ae40ea9a272cf9f2213c1a0b5d680a586
 EBUILD rocRAND-5.7.1.ebuild 1512 BLAKE2B 52baabeaa5bf7af55555cde6afb2165f36a409150a5d64a0662145d59cff880352a10a42c352b1d989626283295061222be87c9ecff74b998bc3bd4adff98488 SHA512 a909992ee8631bbd0fc4b875d5bc10ca9cb2f6aaead2611978632f0df55a078cf784e9833613c45b28916e6806de5bfecdeb9872784eba7eea990b9c3f720884
-EBUILD rocRAND-6.1.1.ebuild 1356 BLAKE2B a6cd2febabea79999841a1cdf3973bc6cd0a5ed323b65d906e9c4148d8b0725821fd6c3480d49b54ff6564f4a90ee5c6672d106ff669c2653e981ead0eff8596 SHA512 90f431872013aa462da49b09765ba81ae0e8ad617c9da9bf135a6107911d3fa594d61abaadc02e799d65aa3762c72edc700e4fb7848036dc01a2cd60f49724bd
+EBUILD rocRAND-6.1.1.ebuild 1363 BLAKE2B d76f7774ae483209e47b4a9ecfd79e45e800b4f7d37b0294a565ffced89ea4522239aca07b145720060564108f93d8445dd1b239e38047cedca47ce32d6fac39 SHA512 6bb257e6620b24195328b1c6da356e6b8ec20a79c6317e4c8c8f2be503b49def57257f493306598a24b74ccdf579808ca6651f0dcb99b20d68586bd148bec40e
 MISC metadata.xml 672 BLAKE2B 418c0adb9c54e60ffbcfdc6abf3bee2c7ca17a5d4e4022f84ed9cdd654f6470a2bb2336f6fdf01766f9ff42eb599d1a155fa575a658c1459c3580396a21847c4 SHA512 9be6210f28457c4e71adaabf3f66f0f58bf8f1db78bb69ea43ed9e621d8f8115a04f05d8db7814725198f2a3e70dbcb723d89ccf5b88ed08b090c5f15f6e370f
diff --git a/sci-libs/rocRAND/rocRAND-6.1.1.ebuild b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
index 1cfbcdbd04f3..e3b1aa20b634 100644
--- a/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
+++ b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
@@ -33,6 +33,8 @@ BDEPEND="dev-build/rocm-cmake
 	>=dev-build/cmake-3.22"
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -42,7 +44,7 @@ src_configure() {
 		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index 543c7a3b5c20..ee28a681e3df 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -8,5 +8,5 @@ DIST rocSOLVER-6.1.1.tar.gz 2971118 BLAKE2B 2611b6b65704e7cd64df682728013f07d20c
 EBUILD rocSOLVER-5.1.3-r1.ebuild 1939 BLAKE2B 5106e36577bdfbbba5039de1007a9d96587354bb634f2ae4cec76c644144ab6b5527082ba96a0039c42c2e0984c1abf99cc30c6d8bb3a3867c45348245ced66f SHA512 8d6abd695f2596fef6f6c2fb66e168ba5b087b71360ffebfd4a0aaa3796d21b9e9deb215e4368ca36a42ede7ac91415ed6641e20e4ac1d40fa420bbdf1cf44b9
 EBUILD rocSOLVER-5.4.2.ebuild 1537 BLAKE2B 8881bd0881366f2315011b8fca3562bf85f2fbed0c5522b47b18794366e6d26bf800da60a5f1d73f74b0f4397b6407cea042e6ed9e10595017e51441fe221ea6 SHA512 b9d212bc359301a901750ce682f4658a9ba927950800f5e4692f26991ee1aee86d0465e9a7af5eeef61750fe5799a7e4e636dffd097a8a604208ef8764e961b9
 EBUILD rocSOLVER-5.7.1.ebuild 1536 BLAKE2B c85b59fc74642843d586c33e81b6d0e3504e8b53d639072eb65a46112ca56fb229fa6a312b5b2f7e3d8061e89716530b38a4f497ed1c0a512117312c81cafc67 SHA512 36f9bcff6650fe09fbe4227904d1b05259208fed1935f4b8a29e297102e81d77ded767c3392a78b126790ea56413fc56e6828774881bc4313a2714c2a0b9ef2c
-EBUILD rocSOLVER-6.1.1.ebuild 1432 BLAKE2B 3a6ff6ec59b749c042241e6e650da23d3afb69cac7b49f9e5bc1e2c52fa54bef0443de18f6f4ee7560b05211145aaa03eab6b3a30afc88c60340aa44dd7459eb SHA512 239f322c030b04ddd92199c13d0cd04f0824ab056fea07d58c2962c1a6127d0f642ddff1b370cf300902815a74f86089de37196dddad00b9302f81c61fa42445
+EBUILD rocSOLVER-6.1.1.ebuild 1439 BLAKE2B 637f2a432d41dc71231021e419c46303f0882820d268b68b03dacb386b0bb58d7deecba8d8fa2a2b6be80f7040df244ccea90da5546f69f84d348367d7f18e5a SHA512 704a0ba8930b519afd224f6f7713d6ee743ea6d40f9c3bc7a53ffe449b2e9a6fb1ad4c1407891ea2129d43ebbc04308db235e6cc3ff558f9456068499a13fa05
 MISC metadata.xml 846 BLAKE2B 4f740804d76db5a55b3ee7bfc1e4e79edb192a0cb3962bee1e1326af0e1b2cdf9e1e410bf0557d0adc2a8e34592b8bf01eb49b951c50c4af3a97c7275c9e3629 SHA512 c8c0d4b5559b2ebb6323137bb6d7017cf50d674e05fb36533c75d3ffe53711b126798cc787521b0f9920c9e510ac163aaefd723b509fe1563d138f393bccbf2c
diff --git a/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
index 4fe2bbbdaca1..c2fdccf5764b 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
@@ -32,6 +32,8 @@ BDEPEND="test? ( dev-cpp/gtest
 RESTRICT="!test? ( test )"
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -43,7 +45,7 @@ src_configure() {
 		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index a6d8495096d6..5d1f55c658cd 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -30,5 +30,5 @@ DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b1
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD rocSPARSE-5.1.3-r1.ebuild 4960 BLAKE2B db6aa536d619dcadf79787ea73d5cae6098b9344c30d290423f582cdeff23df09d493e9df698c79c768afc9f6c61143db14835ae8ccff1f66a9eaa764605b812 SHA512 2a713a8630a399292646191b1ae7dee2acddcffddc1cbbff2ed66408715e64b7bf370ace80a3206c47f1560a51385f9413f4b61e4516d56b3934d921ef3bc111
 EBUILD rocSPARSE-5.7.1-r2.ebuild 4917 BLAKE2B 0f671c24cbdaaab4f2c5f41394a0164bb152b82c45c9f55c169c4785bb7ec51c82ebc47911cdc1d5fd1285a809c860f609437cefb19c34a37a02285102211c2a SHA512 055e7eca53225cd1b14e2fb6c86a30505506dd83c1cbe3b84abd9b2081fb06f993e54376a1f04e4ef4322a9c4cbe8367a6cc797993bd5f104acba8e9422c0de6
-EBUILD rocSPARSE-6.1.1.ebuild 4356 BLAKE2B 266dde88eaaca0bf73c438d5e7126795d0a64f171f1b44445cfa90eba7b160190f24daac96f5a8c42f319b6549cf0c49096b53875ce8b7ee52a86ad375a8968a SHA512 cf940ada8be18c529bb4d7fe943143b07cf217e4efef5e63fe4b98a9827f7b014144772624d052d6c5f8f7d403be4d02c1932b63ed7bb5e4e20e8b2c9068e1ec
+EBUILD rocSPARSE-6.1.1.ebuild 4319 BLAKE2B e46bdae6c3c2b29fbddee9152b930d021c752622c4f2fce93ca20a8f63cc111bb20f5ae9bb4b640f136e255ea89e22dcaf1754bc98181f8f6b258c8108e4b656 SHA512 29949ce5def2c52c93c6f85d00dc84d3978ba1425070d4a32639002a6840604742d68664ff196846f43f60ce5b3b780d886994c9a5df2dc3c62aa78cadb1a7f2
 MISC metadata.xml 669 BLAKE2B 62133bd86a945eedaba10a5507a30d2dac62984558e74540860bbde3d12cf971de129d5c6e046b3916f4cf048c60aeb87553385b8f28d50ce0046ec04e90385d SHA512 6717bc1ad49a85001695265b3571c3936da67d3ded431149d6d9c98b094386a8899fcbf2375ca799c3e9c742c48460ac482418a53189097f5a12510f8a3ce628
diff --git a/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
index 093273002e65..2e3168095ed5 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
@@ -90,8 +90,7 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /dev/kfd
-	addpredict /dev/dri/
+	rocm_use_hipcc
 
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
@@ -103,7 +102,7 @@ src_configure() {
 		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 61b039b05f9c..7365f9ccfb6b 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -4,5 +4,5 @@ DIST rocThrust-5.7.1.tar.gz 1122808 BLAKE2B 41a5d57d03c7f95baf861b772c9513c7fbc2
 DIST rocThrust-6.1.1.tar.gz 1147635 BLAKE2B e71288a4666ba1f23cf85d2d269f61f9085efaeb2921b7f3142c5ce0808380b27a8c07945a44b6a651747046020b412838a667232b1ba65308fd7fd336b840b4 SHA512 30eeb6df73ee0dc2361879337faae09cf19cd151510c6e22d774c22b4be19272f9980cc6ba2b2e42f43738a1e475f49fcb4384d66b24639746a05685a90e37d4
 EBUILD rocThrust-5.1.3.ebuild 1929 BLAKE2B 04ef6dbe75793a05c9d2f994eb82d7816ec99abed0415e0a3a555aeda4e09267adac4db686d76c409a942c636f035433d33d0727e9c793cf3afdf8bfeaedc371 SHA512 e3867e21e481ccfb13318cb2ba02596e81be6e86b5026083b7091916adc850fe74a926cb98c129a3dbe6ee0ea9c12665849979d63628e081fe56465f746098c4
 EBUILD rocThrust-5.7.1.ebuild 2054 BLAKE2B 16f51ff532eb679fa80ab0494066e3113962d01f7fd0927fa70efc923017cabcf09149df2f730a15d17fbd2f95162f051fa8b9b71cd984109236c0be090f2574 SHA512 ca20c3485ab1a0a5f19d15f0275a440176671a808411352582460c203ff00dcd8cde327cf70b54227b2e7eb3ae29005a00eb5e9b6f2a492080086b620a88d1d9
-EBUILD rocThrust-6.1.1.ebuild 1306 BLAKE2B 42213722ef4bf3d3e6e47c6a596c75477101e77dab7ccbbf13e5beca42dd85938c7c8ca9c1c7427c05cb00d985c81f3846c24fca8fe5d8e7edde4fe4d93515f8 SHA512 2817565bcdab2c63b91ce55f7a1cdf400d5e57005c47d1d3588ad4eddaeea403af0cf107c5263018e7db60bce2fd65d55bff31b1c7df7658d44406a285f4cb28
+EBUILD rocThrust-6.1.1.ebuild 1313 BLAKE2B 6b420f4a5a8ee338d9ab33288f6fdeb69c3e7c25c6cc73b2fc292b043aea4af3e112fc36592bec1c20239115d3065b736b37d8acb74096f0e816a986e303b62a SHA512 cc6eb3585fccc752b7bd4c2e09a1cd5fdc1ba5a6b5782a85866b5ef89ea5f25a05339eb086514d2b79f3f929fbd9817c548a02009a6d5a462b684a9aa6931e4d
 MISC metadata.xml 631 BLAKE2B 99edd995566ee67d4e2fb4fdc67eca30299e81bd657d57c24932b0bc0545c805abce9d2542dfcb9d61d7aa5639ac02dc5385a5d90bfa5fcb757b5fab9f1f11d6 SHA512 bc0f9411724711f1806f1681c6c55877b828807e9deb22123a92b1b1cfc19c2f423ddd111978bf04a3993555cdc984f654c049617e5919e18d09a093c4559136
diff --git a/sci-libs/rocThrust/rocThrust-6.1.1.ebuild b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
index 7a04d78cbe0f..c63a53337467 100644
--- a/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
+++ b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
@@ -32,6 +32,8 @@ BDEPEND=">=dev-build/cmake-3.22"
 PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" )
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -40,7 +42,7 @@ src_configure() {
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocWMMA/Manifest b/sci-libs/rocWMMA/Manifest
index 340a27ed24b0..99fdb97f5768 100644
--- a/sci-libs/rocWMMA/Manifest
+++ b/sci-libs/rocWMMA/Manifest
@@ -4,5 +4,5 @@ AUX rocWMMA-6.1.1-no-test-install.patch 854 BLAKE2B b8d4c15e578cae34eb116a633819
 DIST rocWMMA-5.7.1.tar.gz 3163060 BLAKE2B 47ca55c0cd388ca51ad3843e656a31ce04d9e07988c26bfb69a7c61bfe497609408cfd20dcbe9c6698bd79b800a114ab67d582ced43dc6f1c4db4072e2901d99 SHA512 92c9c634fdf1f5319d34fabbf691df45600abdc5285a76b40255e7d6d260553076f65baa1eda566a163725e2a0cec0a85372eb07add39c65368e84505c176f50
 DIST rocWMMA-6.1.1.tar.gz 3189782 BLAKE2B fd96d8f3ba8f21ee3544d532a59ffdefa1aefc94d73401f48d470f7f699e28771d5495e98c1ee316d8379167b70b945220be6670dee2757a62af162276a2fb0f SHA512 db2bfe805a4f33c48ee98c821efe0b261eca474af9e954843c83faa3335459bfe635326ba2cfc7b8b8ece2cf0f2c418f49ff6aa81537f8d3747cc729738a6b18
 EBUILD rocWMMA-5.7.1.ebuild 1212 BLAKE2B e0bd4413db21ddf0c3933154fd60c561462f21f054bac0990ce3788de9d437a51d128447cf38a59ba29f352e8a39d9e66f3c27ee1eb794f09edcdbf757a9a32f SHA512 cd78d160bee5e49c085b33defc407c26d493e4c9405003dc4d09a5f3fcde7fa22a0db140a6a0736e21e59bd8af39758dd519ba7d8c52c924799fc56bd55808b8
-EBUILD rocWMMA-6.1.1.ebuild 1540 BLAKE2B 49a7d2d9ebc1ecc4d692dd54f23d2ff670564c04656d81ec3034458a5b131959c11ba56ef91c379849350a800f1939ee949afaf45b171d14e4fbda16fd8d0622 SHA512 84362a0f54fa252ab5e900bdfb7043e3b002d3cb769553e65fed3f9572251e8aee13c96bd2a136746e871d36b5433408e468ef2eb21ab6ba63e7b1d88678e115
+EBUILD rocWMMA-6.1.1.ebuild 1538 BLAKE2B 83267e2a8db5b56fa922592b5e99af37decc33f1b0061a893f73466329adea7b4f1366533b9c1d09a80d96d97c18bac435eef6dc1fc19d09a02920c2f38bf1a7 SHA512 f8c8e9263651f573e22a5f789604de21b56b99e1da7d270c185b450bbb87e589a2c32fb0f098776131d5b59837ce37e06bad87bc8236d28d25a6e00f6987b553
 MISC metadata.xml 468 BLAKE2B 00be6e38c18a77eebb430632acdd9da61aaa299c92cb733735bc7a40e1017e33d778783dd821f4122f46e9f390d7bc37c05c1b43e0abda915586eb83928e5f0a SHA512 9ed778246d9895dfdb2e881b533a2f53a0f6c0361671c33c065ce37e5f2ea4677e9885e28a66466c95e261dea909ec5de9fb79de44d9857520ed269849145247
diff --git a/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
index a3f8d61463b1..3122ab799976 100644
--- a/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
+++ b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
@@ -44,6 +44,8 @@ PATCHES=(
 )
 
 src_configure() {
+	rocm_use_hipcc
+
 	# ld.lld bug https://github.com/llvm/llvm-project/issues/61101
 	filter-lto
 
@@ -55,7 +57,7 @@ src_configure() {
 		-DROCWMMA_BUILD_TESTS="$(usex test)"
 	)
 	use test && mycmakeargs+=(-DROCWMMA_USE_SYSTEM_GOOGLETEST=ON)
-	CC=hipcc CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {