gentoo auto-resync : 26:01:2025 - 22:42:38

15 files changed, 94 insertions, 25 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a093e484074f..e989dee57bd1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/hipBLASLt/Manifest b/sci-libs/hipBLASLt/Manifest
index 24de61ff16dd..7f3b1978843d 100644
--- a/sci-libs/hipBLASLt/Manifest
+++ b/sci-libs/hipBLASLt/Manifest
@@ -7,7 +7,7 @@ AUX hipBLASLt-6.1.1-no-git.patch 365 BLAKE2B 47b7f23a4ce0919cfd6d2d1a946d98822db
 AUX hipBLASLt-6.3.0-min-pip-install.patch 770 BLAKE2B a30eb865998ddd7bb3f1802dcbfd3ecfd3ab614bfb981a464b2981fa71e8e902e95b6b0739e8f71d74c6484c8dc56b44c1f9dba992f1083751ec0b5904216d32 SHA512 9d82f160688f6d0175d9bee84024ac80e6c02af9a371012583af4ab183ba5be3d44553f8794bdfa131f8395cbd6c48c7af08ce4ae2a54c127ece34282c099fd8
 AUX hipBLASLt-6.3.0-no-arch-extra.patch 674 BLAKE2B b02f01364f71824c6bd74c8202c1916156a53a2f41b244c55d18786e576bbf0e0b250ff67194e55c230ec9156e6461839698fb86caedc665a601290bf791155b SHA512 2fbb6fa3d9a6b7f19d326014836efdd9d1c1aa7a5306511700f89b8f1d24acaf336092f33b60de4ddd1fc8d7fd885596e6edf8f5350913adaff27f376cfed78a
 DIST hipBLASLt-6.1.1.tar.gz 78448557 BLAKE2B 08ac9ce45d7d1e4384a36939af22f65589ed87e25b4db77f5f7ff5fbe65b8070e9c55fbb09db3b7bd49be98981dc8bf939e646ea27571bf1d1ccfa52a50b0f92 SHA512 1aa3a1cb8e9c7f653db66909b38be065b7386b97d4bd6b52ecc6c2bf72c6cdfabde6f12ebc6016b5fa195f979359af875eda8d54ea6772329312cb357bc2ebc5
-DIST hipBLASLt-6.3.0.tar.gz 89379233 BLAKE2B 0f63b1f0fb4686b58b102ad2d2b9baa272b07d203736c3972216cbd75eda38ffaf63939d8c25aadb416348a7b1c9b8bac27a3711121d5e584baa7a404babdd2b SHA512 b86613f818a1819668b3fce69422add97d36b09506d1109e3b739a6f86b8463aef9c8ef2434dd603a956f34e76e3f8fb4ddb2b98d5d2e4028f6f44b62aa6a48b
-EBUILD hipBLASLt-6.1.1-r1.ebuild 3319 BLAKE2B 21102ca5fcf97c5fec7d98069797e03e303aafd26f52e1b9018de0b9ce6e4ff73c504731b032f2783f15c3a05853de05106eb48ad067c1d55c66e96096d9b57a SHA512 412caa469ae77c3737b6adb3135212c03137b69ed90ca3ac2b0e09fe5e507735024b7271b7962367af5f529d6b2d6e8d898673bbd72ae6304ded60fe5fdbbe69
-EBUILD hipBLASLt-6.3.0.ebuild 3820 BLAKE2B ce7323a150198a587cf65b44daa56fac93d04020d744b2b20c8903da2ba2e08d5579ad2dcb7738cc89ae118d8cd7ec6d21f50eb1fa40cee4445c8b4a32e9fd00 SHA512 0a4653b72f38080c97866d4a406d2ea0259c9b9b444b8f496e8258df3f49a3848612dc8e6cae1b1b6b0bd9d68b035cb05d990233880f15172d936c4fcfeb3c98
-MISC metadata.xml 416 BLAKE2B 72248e12cd10654326a6685df0e03c508d413d2728d8e687eb8ad3d8dc928e518e3ba21df1ee774282c45363f61eed98b47b862cab2354d743ca530047084281 SHA512 02acf2d17f2c56f09c599fcde965bd5ceb07c335d7c2b4fd57a06a6b1a591a250d22de7a002f299cc99cacd1fd72f183adf51fc1b9ebff1338c6d83450da9c3b
+DIST hipBLASLt-6.3.1.tar.gz 89385330 BLAKE2B 4bcf083e41ad6f22f61321bd066d79a6a387ea677cdb05f96f474e1b409f0b1cc5dc0c61259d7d6456ced2b77191388e1bd4b260bd7d185875241f55246ed1a8 SHA512 7a6443ab7a66bae1d6273945ea91814b2d5f9846d8276040cda7f43ed7ea0c2cb6063009e7fe092742d396c8d87c2cf62ed4cf8249e936eed69c0cad6db02193
+EBUILD hipBLASLt-6.1.1-r1.ebuild 3296 BLAKE2B 26c2c36cfece4e6d5dc59cb32c4b7c4649cf56fbaa831ff19e34f1609801146ab48145a8dc8e37e0aa7c66e0b4fdf4e87ba134803ea09b8f1e7f2651c99b8d56 SHA512 69ce9c6ddc8e97a475a646a10234b53ac7c803f80adf61cd44baee1a21e1254f95300a8e7d10201e39c1a25d6ee10c075dc2dde475414ff834e0f3527f91d4cb
+EBUILD hipBLASLt-6.3.1.ebuild 3918 BLAKE2B 2d63262bb72370f98638dcaab6b36500d9f867614177bdf3f77650d66bd4fd80a30d04b8e4d01c12792c96067208d01a40d49a12dbd20982bee7d626c89c9530 SHA512 f137c4725dd75ffa1653b756dac66973ac994c3fcdec052f4ba7dc53113cdd77a735b339a59ef279f7d11b435147fa57f60ba6bef022b81f5a416de14733f69b
+MISC metadata.xml 500 BLAKE2B 1ff23ba7bd97b462ec9f17174ca25d072bb830651b7f9ebb2ad7b3a269d0ef51789a9f96538ed79981ccc7419bb246658db90df4d2bdea1d57819884602d40a9 SHA512 50c685230927192c701385841afff049c7e297c2b3fe7a4df67294e02186e9d429a41ad60a0fd0b0e3811b030917796b14baf786262e1b83293862a6249bfd1b
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
index b0aed5de521f..5fb50338cee8 100644
--- a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 # gfx941 and gfx942 assembly uses directives of LLVM >= 18.1.0
 LLVM_COMPAT=( 18 )
 
-inherit cmake python-any-r1 llvm-r1 prefix rocm
+inherit cmake python-any-r1 llvm-r1 rocm
 DESCRIPTION="General matrix-matrix operations library for AMD Instinct accelerators"
 HOMEPAGE="https://github.com/ROCm/hipBLASLt"
 SRC_URI="https://github.com/ROCm/hipBLASLt/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
@@ -75,7 +75,7 @@ pkg_pretend() {
 src_prepare() {
 	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \
 		"${FILESDIR}"/${PN}-6.1.1-gentoopath.patch > "${S}"/gentoopath.patch || die
-	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+	eapply "${S}"/gentoopath.patch
 
 	local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die))
 	python_fix_shebang -q ${shebangs[*]}
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.3.0.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.3.1.ebuild
index 3a2f44a97a64..27266b0b717a 100644
--- a/sci-libs/hipBLASLt/hipBLASLt-6.3.0.ebuild
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 
 LLVM_COMPAT=( 19 )
 
-inherit cmake flag-o-matic llvm-r1 prefix python-any-r1 rocm
+inherit cmake flag-o-matic llvm-r1 python-any-r1 rocm
 DESCRIPTION="General matrix-matrix operations library for AMD Instinct accelerators"
 HOMEPAGE="https://github.com/ROCm/hipBLASLt"
 SRC_URI="https://github.com/ROCm/hipBLASLt/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64"
 
 SUPPORTED_GPUS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 )
 IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" )
-IUSE="${IUSE_TARGETS[@]/#/+} test"
+IUSE="${IUSE_TARGETS[@]/#/+} test benchmark"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -43,6 +43,10 @@ BDEPEND="
 		virtual/blas
 		dev-util/rocm-smi:${SLOT}
 	)
+	benchmark? (
+		virtual/blas
+		llvm-runtimes/openmp
+	)
 "
 
 PATCHES=(
@@ -78,7 +82,7 @@ pkg_pretend() {
 src_prepare() {
 	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \
 		"${FILESDIR}"/${PN}-6.1.1-gentoopath.patch > "${S}"/gentoopath.patch || die
-	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+	eapply "${S}"/gentoopath.patch
 
 	local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die))
 	python_fix_shebang -q ${shebangs[*]}
@@ -103,6 +107,7 @@ src_configure() {
 		-DBUILD_WITH_TENSILE="${build_with_tensile}"
 		-DAMDGPU_TARGETS="${targets}"
 		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark ON OFF)"
 		-Wno-dev
 	)
 
diff --git a/sci-libs/hipBLASLt/metadata.xml b/sci-libs/hipBLASLt/metadata.xml
index da84ad53885c..2be6f3bc6ac6 100644
--- a/sci-libs/hipBLASLt/metadata.xml
+++ b/sci-libs/hipBLASLt/metadata.xml
@@ -11,4 +11,7 @@
   <upstream>
     <remote-id type="github">ROCm/hipBLASLt</remote-id>
   </upstream>
+  <use>
+    <flag name="benchmark">Build and install rocblas-bench.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index e6ca0a448489..7e1cb8e7b698 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -3,12 +3,13 @@ AUX rocFFT-5.0.2-add-math-header.patch 468 BLAKE2B 66cedbbc2b7aeaa2e42324e02325d
 AUX rocFFT-5.1.3-add-stdexcept-header.patch 340 BLAKE2B b21454151dd2c41948e00b50360b3adbc93c08e7e849b11c032ba0b8dc76d1159883349065d7c87bf3098d0e67d4da48db220b58934de39fcb3c4d006a902a5e SHA512 a49f2bad5ea87f67a7d5dc7adb820a42ab2b92b0f1436a564c3906dcc4598de154d18247d8b4e8f3e12c3947da05890a4a9ba6f76852bebd1fcf26928ee48e0c
 AUX rocFFT-5.1.3-unbundle-sqlite.patch 2326 BLAKE2B 5a08f2ec7486f0687c4af46e09a01678e8255254bb78ae864436353d10017f86f1b3b557527a32771de43fa24148c3be5d233639bdf3e6746b2d120623bf934d SHA512 c545053741c55abf1dbcda89e9ece1bccb42a5db86c0329499b332299c5c7b73150650634cc7506bef2ee7e16a25bf1aacd5477bf13884e2cb01c48a113b33ab
 AUX rocFFT-5.7.1-fix-rocm-link-path.patch 492 BLAKE2B daf4d865d8b2b5f3dc97a845f262c266588da910f517e31a10cf7896c6bc1c4fd794c01be39c7aa74d5eb80e4066b8d3dd8a8841210e0075ad4e593dc0f85f66 SHA512 b715c08515b6d289f1b045db7053ff08a27aa9cf940beacba47167a72f168d75f4652d98b33fc2bef303832f0689cf51d71f893e415ba4b4cd7a0f21c677de69
+AUX rocFFT-6.1.1-find-hip-use-config.patch 1108 BLAKE2B 9ae46c2dc754d3a9d68863012c46b6642c71459facd75a4425f8942fad1df1df15d3030255e1b54c537152b521ca4becdc8426003e05aceedc92087aeffd14bf SHA512 02322003c1e6385fb4cff1049a9554baa91d2eca75bc0c9869b92e95c6c579d7f5e361b5b2ce98ca2ab5613891c24230833ae13f13a814f863510ef4340b9260
 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43
 DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f
 DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9
 DIST rocFFT-6.3.0.tar.gz 1386056 BLAKE2B 1aab60818328cb3a6448f6d555faf2db3b3839e2b3abd7a37cc48054e67321e7c98c319b2f078dfd351f56263c35731608ae65fca427fc3eaaf06c8410b99d89 SHA512 4ac2dac24e77a9d767fa08a9d393cb2c94bc2a8ca32cb75ea53dd83011989bd344ae3c11c9bfc557e71c645ebea34c53a5e050ce6810259f84287e6baf829c08
 EBUILD rocFFT-5.1.3-r1.ebuild 3926 BLAKE2B ef9cf52ee86139887f87b96f02d28bcb80420af8d3538060596a51b3b8b7369eee5da63d90e8132935acf32cba06024840427cf2e5a2b7662388e75c1b1b4272 SHA512 3a34f05845f726fd6cb71d0315ee6338e1e381910a8dca2d6c655ae80e1ba3f1765a2313f2795be8eb737195fa23e2597bcda89a1e6db778cfddf35485462beb
-EBUILD rocFFT-5.7.1-r2.ebuild 3950 BLAKE2B ecd5ec8e81290c4bc83dd413c7b0dc292712244bbc6a432f593ddb868dfe24a5486acd590315b12ec9e3a074746aa4d84b0c8376aa1db490e8ea96867b7a3fd1 SHA512 48cb8edd4005f616d4e6886dce3b48bcb972b05ba35dc67739bfdca193a19fccba464bd275ca07bd98dff70fe7a237d256e2a45e4c2910ebe8f26648a262a555
-EBUILD rocFFT-6.1.1.ebuild 3747 BLAKE2B 13cf175e01205c53fb7b2541eb00cf1d9326a0eae51e26b96273ca70dc2917294a52414ef1bc2faee3383790e1ce3ac4ca8fac86a7eaf8b052728f779f31fceb SHA512 500a4a7ac83004b143c6742cfc319d6fecda12dc3d56282e0ae940e7ef2be67b14dab3a68dfdc1a6d1ffa24e76cd12ee4621b43434dba8e9a87fc39292321460
-EBUILD rocFFT-6.3.0.ebuild 3721 BLAKE2B 38d1079f818fc86d0c446ce9ab7f80c75ccf579fd05d9627a613ea2ecf0daa2cd9d98eab2fb54f3749901a9784a9bb53bb69e4c12d733692b692e17f2d7f2cd7 SHA512 1095e37ca4808e7ef9cda0bd9e57d09cb3176e1b2b74ce9fa28d553a1195d42f4b302dcf9512bfa2f803369b40b5bab575adb0ebc9271b0b287fa1bfb56edb60
+EBUILD rocFFT-5.7.1-r2.ebuild 4003 BLAKE2B ec65bb2120e61d38bc2a3d8f920c5d1553c4658b99f4171dbdb5b1f6b233652432aa45bc36b61b2c842ff20a20ab288c8b7236cbb6b972ab12647d127dbdabf4 SHA512 12ceadc7a10d718d36aeee65179335f7335a4db15f55b2da6bd6f0df8de3037d021a166c86dc35228efb18cafdd33f0209702e05e2e4ca80d0b9b960c76a0bfa
+EBUILD rocFFT-6.1.1.ebuild 3800 BLAKE2B 54624734bdc9c4583c50dac8f802f3ef648734146a70e5b1fae26f77556e60f97b9a5a7fff2a73782dae3eec8df4578650f0ecf2c6608a3009f5e645ab0bdd2a SHA512 77b86a3ac007c317f6aae00a6fb9895ab1cda1fad9ca4c889812134fa8368e26d2d1f943288c39342977ecf54ae71463a97e449cbc82a102825590cd4d670255
+EBUILD rocFFT-6.3.0.ebuild 3774 BLAKE2B 5dc6cba52c92afc16321ce3ede491a7aceb502a1228a9cf755be11fca6510a7d9330ef9f4e868f246608e0eec321ceba7467864f90a994bf064160093960e9de SHA512 789b6ad1e5ff3a95bdaf32c1aacbfd2495713e5b3c1af77459b5a0f36e1b2ae72601741e05bce8ecbca6f7fc10286bf2e62c4b841cc0365ecfd7b119d04e2ee1
 MISC metadata.xml 764 BLAKE2B 0490d64e75e9269408f31d4ac87f4845f01a306adf829d57d89401cab19c84412896f351c1dc9f6a918679447f1fe62a7fc958bff9c98f1990fe021f99b35e01 SHA512 0135bae193ac9439a86dca5e26a32366eae7b67175c955aace1a1d620f1df5176a3e3a302a5e6f1e6473777e5b51ab772aa67a01ba023e9c8bbb180352ae8e0b
diff --git a/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch b/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch
new file mode 100644
index 000000000000..27353eee35d1
--- /dev/null
+++ b/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch
@@ -0,0 +1,31 @@
+Upstream PR: https://github.com/ROCm/rocFFT/pull/530
+From b29c984bfaaec9d372fb566f5136fe3c473ff22d Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Sun, 20 Oct 2024 23:22:50 +0800
+Subject: [PATCH] Require rocFFT use hip-config.cmake to find HIP
+
+Sometimes rocFFT use FindHIP.cmake which is not desired -- it does not
+have hip::device and hip::host target imported and result in cmake
+generating error.
+
+Reference: https://bugs.gentoo.org/932155
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bcb9819c..da697834 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -186,7 +186,7 @@ set(AMDGPU_TARGETS "${DEFAULT_GPUS}" CACHE STRING "Target default GPUs if AMDGPU
+ rocm_check_target_ids(AMDGPU_TARGETS TARGETS "${AMDGPU_TARGETS}")
+   
+ # HIP is required - library and clients use HIP to access the device
+-find_package( HIP REQUIRED )
++find_package( HIP REQUIRED CONFIG )
+ 
+ # The nvidia backend can be used to compile for CUDA devices.
+ # Specify the CUDA prefix in the CUDA_PREFIX variable.
+-- 
+2.45.2
+
diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
index 0c383fa01164..35da60ceea6b 100644
--- a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -61,6 +61,7 @@ S="${WORKDIR}/rocFFT-rocm-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+	"${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch
 )
 
 required_mem() {
diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
index d1289f597217..da1508311eb7 100644
--- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,6 +59,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+	"${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch
 )
 
 required_mem() {
diff --git a/sci-libs/rocFFT/rocFFT-6.3.0.ebuild b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild
index c1a62e09e1a5..474f33952068 100644
--- a/sci-libs/rocFFT/rocFFT-6.3.0.ebuild
+++ b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,6 +59,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+	"${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch
 )
 
 required_mem() {
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index 7b41aed19296..f2d839a68719 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -2,6 +2,7 @@ AUX rocRAND-5.1.3_no-symlink.patch 1373 BLAKE2B a2909cb5c012c8a1b47ba543f2624195
 AUX rocRAND-5.1.3_stdint-gcc13.patch 1025 BLAKE2B 96e4600eb83bb407c4590084a9cb3464dbeafc070584a40cd94ebd9c67d96b1a0cc5261ab0a7e0cc79f3f14d4af280dcbf320bbc857a6850cd581fbcf7a78688 SHA512 4711fc79ebc9c90db4213c729462a9d622e3eb81b000b1e432702151bb0a56cf693996b28037231d5f968020ec4be1fdb6f99a167a470ecb1253ad7799826b67
 AUX rocRAND-5.4.2_stdint-gcc13.patch 2025 BLAKE2B 373fcb39a4a10505ded1b97e1afde7191fcb94f56b34c6f0134a48199f038439a9911a9b5f8116b5051d331c765b96be7ffa2569892eec9312c3263ba547cdc7 SHA512 8d6cb0da359b27afdfe411fe84a7f6443e20c92753b825348932a407cffc24f8f4f239436ad1ed21966ec5cf4657c4033c821eae440f15737b63bed187023f15
 AUX rocRAND-5.7.1_fix_generator_alignment.patch 622 BLAKE2B 53443aaca64c848864233f443bf4e89c1ab0231ba7071e5b628b0b51bd144c720ea3a801acf449a3410f81bbe6d5f28450d2046b53472ef74307b54077dcc4bd SHA512 368e76a0223e50196727547ca4fad51404e38ec191adb4b39cb7b066c24a28d2c8bfb970e7ffc1cb1b5347bbbddc2014b729c4e66110865a98b0b01fad797aa3
+AUX rocRAND-6.3.0-benchmark-1.8.patch 1216 BLAKE2B 437e940107eef2cd5be67f1488ed6c55fff9f149d4613515983757de4574cf6c043b44a52f88330c657c12fbe00e18ea34e0a6206c374153ef3439b9f1c641c4 SHA512 9dfbf23e444e343baf277f4617659e793f2b57c80f3636aa6da5b0950b451413fe37a7a66b085ace8448d94917cd82c6cbf279ddeee765ddbaab598921950300
 DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894187455cf1da70c486e9efc336a01dc53589c56afe994858b2344c1e74e8d35260f70ad9cd80c5da1103dd9e98da6f5f2bf8e1ddf97023effc8a434a76ce SHA512 cdc70799ddca456c37c2a65875b98acff74800aa2b4f28d77b27c38c32428dd5edb2837bf88bfb6fcc32bdae7f2b27f1b547831bad98101b04959b7ba6b74a85
 DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28
 DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5
@@ -12,5 +13,5 @@ EBUILD rocRAND-5.1.3.ebuild 1983 BLAKE2B ea0f8aeebc7d7eaf8bbfe682ea1b4f52c789df5
 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 1363 BLAKE2B d76f7774ae483209e47b4a9ecfd79e45e800b4f7d37b0294a565ffced89ea4522239aca07b145720060564108f93d8445dd1b239e38047cedca47ce32d6fac39 SHA512 6bb257e6620b24195328b1c6da356e6b8ec20a79c6317e4c8c8f2be503b49def57257f493306598a24b74ccdf579808ca6651f0dcb99b20d68586bd148bec40e
-EBUILD rocRAND-6.3.0.ebuild 1363 BLAKE2B d76f7774ae483209e47b4a9ecfd79e45e800b4f7d37b0294a565ffced89ea4522239aca07b145720060564108f93d8445dd1b239e38047cedca47ce32d6fac39 SHA512 6bb257e6620b24195328b1c6da356e6b8ec20a79c6317e4c8c8f2be503b49def57257f493306598a24b74ccdf579808ca6651f0dcb99b20d68586bd148bec40e
+EBUILD rocRAND-6.3.0.ebuild 1410 BLAKE2B 0aaf8249465e6214b5c45829a720abf4e0daca21736a1c7b17b6f6509e6aab44e4ae0e2786b3eac7136de52032de0fb794f8fe94e663934538aa28b28be3e143 SHA512 53aa1b6f44f05fc4818c9cceaa3670cd3a603500cfa00e5d5dd6d1daed0d084da792d625d1c1763da026c56c8009218112e3d6276a52c209b4b2cdcb0816b6b7
 MISC metadata.xml 672 BLAKE2B 418c0adb9c54e60ffbcfdc6abf3bee2c7ca17a5d4e4022f84ed9cdd654f6470a2bb2336f6fdf01766f9ff42eb599d1a155fa575a658c1459c3580396a21847c4 SHA512 9be6210f28457c4e71adaabf3f66f0f58bf8f1db78bb69ea43ed9e621d8f8115a04f05d8db7814725198f2a3e70dbcb723d89ccf5b88ed08b090c5f15f6e370f
diff --git a/sci-libs/rocRAND/files/rocRAND-6.3.0-benchmark-1.8.patch b/sci-libs/rocRAND/files/rocRAND-6.3.0-benchmark-1.8.patch
new file mode 100644
index 000000000000..a8afeb1e2f8e
--- /dev/null
+++ b/sci-libs/rocRAND/files/rocRAND-6.3.0-benchmark-1.8.patch
@@ -0,0 +1,30 @@
+Backported from https://github.com/ROCm/rocRAND/commit/ad8cdd8dd0dee6ef4166b0b560fe63127c06e08b
+Index: rocRAND-rocm-6.3.0/benchmark/custom_csv_formater.hpp
+===================================================================
+--- rocRAND-rocm-6.3.0.orig/benchmark/custom_csv_formater.hpp
++++ rocRAND-rocm-6.3.0/benchmark/custom_csv_formater.hpp
+@@ -152,10 +152,8 @@ void customCSVReporter::ReportRuns(const
+ void customCSVReporter::PrintRunData(const Run& run)
+ {
+     std::ostream& Out = GetOutputStream();
+-    std::ostream& Err = GetErrorStream();
+ 
+     //get the name of the engine and distribution:
+-
+     std::string temp = run.benchmark_name();
+ 
+     std::string deviceName = std::string(temp.begin(), temp.begin() + temp.find("<"));
+@@ -186,13 +184,6 @@ void customCSVReporter::PrintRunData(con
+ 
+     Out << engineName << "," << disName << "," << mode << ",";
+     Out << CsvEscape(run.benchmark_name()) << ",";
+-    if(run.error_occurred)
+-    {
+-        Err << std::string(elements.size() - 3, ',');
+-        Err << "true,";
+-        Err << CsvEscape(run.error_message) << "\n";
+-        return;
+-    }
+ 
+     // Do not print iteration on bigO and RMS report
+     if(!run.report_big_o && !run.report_rms)
diff --git a/sci-libs/rocRAND/rocRAND-6.3.0.ebuild b/sci-libs/rocRAND/rocRAND-6.3.0.ebuild
index e3b1aa20b634..d5b38455f3d0 100644
--- a/sci-libs/rocRAND/rocRAND-6.3.0.ebuild
+++ b/sci-libs/rocRAND/rocRAND-6.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.1_fix_generator_alignment.patch
+	"${FILESDIR}"/${PN}-6.3.0-benchmark-1.8.patch
 )
 
 RDEPEND="dev-util/hip"
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index ba556b79882c..0bd9efefbd45 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -8,5 +8,5 @@ DIST sqlite-amalgamation-3430200.zip 2676699 BLAKE2B b09c59772c920ddef7ba0b15b17
 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 1313 BLAKE2B 6b420f4a5a8ee338d9ab33288f6fdeb69c3e7c25c6cc73b2fc292b043aea4af3e112fc36592bec1c20239115d3065b736b37d8acb74096f0e816a986e303b62a SHA512 cc6eb3585fccc752b7bd4c2e09a1cd5fdc1ba5a6b5782a85866b5ef89ea5f25a05339eb086514d2b79f3f929fbd9817c548a02009a6d5a462b684a9aa6931e4d
-EBUILD rocThrust-6.3.0.ebuild 1670 BLAKE2B deb8d2635387756e97fb1c791ac5ce64b5ed4cddd8f57885dce1521a27106afebe63e50c2c76706a3242104adff3f7aff99a133b7e6fea70f5af6dbf017ede18 SHA512 1d3e73d1364419e06fa27f12fa09a8b6ecb345d5ae5d8a0d2839fc3593c0aa727ce62cf7b6c4971950902f4091ede07d88854e6e1331d2177218a73418afcb86
+EBUILD rocThrust-6.3.0.ebuild 1558 BLAKE2B 7f81eae26b3b8294450fe5b5b5e73629a33be89229163f1282d475d73105dec443fb8899241525bc72aa294d39be7f39031850576b5ef4aef98ace97d6fb2e79 SHA512 3abe1945a4fc3bf91b74c50e03fa457eaf6b5b3589bc572b82707b37c12a89f1fb96bfb9fdb2acb410813531408e5699c3203bab8dfe3583891b86a3b64d32ef
 MISC metadata.xml 631 BLAKE2B 99edd995566ee67d4e2fb4fdc67eca30299e81bd657d57c24932b0bc0545c805abce9d2542dfcb9d61d7aa5639ac02dc5385a5d90bfa5fcb757b5fab9f1f11d6 SHA512 bc0f9411724711f1806f1681c6c55877b828807e9deb22123a92b1b1cfc19c2f423ddd111978bf04a3993555cdc984f654c049617e5919e18d09a093c4559136
diff --git a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild b/sci-libs/rocThrust/rocThrust-6.3.0.ebuild
index 7850be793886..9588f9f0fc74 100644
--- a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild
+++ b/sci-libs/rocThrust/rocThrust-6.3.0.ebuild
@@ -70,9 +70,3 @@ src_test() {
 	# uses HMM to fit tests to default <512M iGPU VRAM
 	ROCTHRUST_USE_HMM="1" cmake_src_test -j1
 }
-
-src_install() {
-	cmake_src_install
-
-	use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench
-}