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

author: V3n3RiX <venerix@koprulu.sector> 2024-06-27 07:59:40 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-06-27 07:59:40 +0100
commit: d2ed973482fdd800013658e83a61709b29e0a80f (patch)
tree: 57ea7666a57b5a05a4c8866e4915e90b4a6e7c94 /sci-libs
parent: 9f6a82a85d400d6ae7de04c43cee88dbc6bc4da0 (diff)
77 files changed, 1994 insertions, 87 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b4c6241b487c..693cb9f0df50 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 08523c57be39..79cf2c8c93df 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -14,7 +14,7 @@ AUX caffe2-2.3.0-rocm-fix-std-cpp17.patch 3378 BLAKE2B 9e88fa1bf68c397c8122ea5b3
 DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c
 DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587
-EBUILD caffe2-2.2.2-r1.ebuild 7452 BLAKE2B 6b4c14a8304ef36349f6442616bb1e2a9563596293ea507ffd1d9083fc01c251dd237db3babbdc9841273b7c31b8ac4b420e3047e6ffd128763ca9afc4b6aa16 SHA512 cfa525d40f3dfbcd4dcf7e31cb772dcd809d528981925b50239961e91ae2147723d261b71f433e5a22e73f59b0bd156a97d84b385d1d5bfffd51db9fc6db2b57
+EBUILD caffe2-2.2.2-r1.ebuild 7452 BLAKE2B 31ef525960d7c3866580985f9ba9736e5419f17c2a63251b8c4fe961a6789a33dee746b14b12fa331c8c20a6c821565b92dd2cb7c6cdd61678bba7ddf5fc7400 SHA512 f232d901c08e3fefd0d6260d07915786747df8f83269c3980c16112c968114c3cdb7daccd8132a6a3850a266a04b38f6df6d2b1f1bc35f473fb9a58d5fff3452
 EBUILD caffe2-2.3.0-r3.ebuild 7542 BLAKE2B 6b230db4d2a033b5078e8c61e40955a0981aa3b6b06734145e4bec8f78719329a3825218045a8f57efce9bfddad7b252ee4447d82cc0637db8656d5f8178b9cc SHA512 d3861111081d26a883790e7a5097ddf77ef2e491eb4471a3cc95d25e659ad8c283c22bda5674cb09d575768da5b6a401ea5347febd4f194dbedd4196d1ac628d
-EBUILD caffe2-2.3.1.ebuild 7563 BLAKE2B 9baa8fc31f572e2f16b193c9e5820d3e8f53d06d2ee4707c275e5070d13d6e90d52cf2df32a13b4566707ddb1e298efad79c80812fb54950486f6b8589915ff1 SHA512 fbbe1d6fdd03e55b9beb63ae5934b873552e68662cff1a5f2eaa9ae35bf326f637b040f4864e4d59775c509d2b4aebef0c11d67c54f3464625a6163ed001df2d
+EBUILD caffe2-2.3.1.ebuild 7563 BLAKE2B 17433295ef6aaf94567a5261e9df6a2b5aeac0b2c18eb4c45375ed828cbba7ac874811c0da8ca51de84482d5e4b62b48ccecd8924ad42c72a1320ff8b3b715c6 SHA512 c6868b614f7a9c3847e32ba054d821e96486d57cdf1d4597d3a6bb6f9045bd19fa65d5462af31c471eafddd4d5e72278d68de59c21cb21ab17df381fd181fe10
 MISC metadata.xml 1225 BLAKE2B ab7fb0bf8b2d37ddaa1a9ecc815eb094e85465d20d3a30af081b42e0b60ade9858d0053b101ba0e7750a90cb48b5b79db9bdc2729bf66d0420732489da62fe54 SHA512 dfb58597fb4bcdd7df0fcc3f2514518e118e8fc9b1cd24868aab60c32a62ff419b8b72a7c294925eff4c8871cc8df606af7fa60bfa99901091d8195101ee1153
diff --git a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
index cd3d8757daa6..6649975ddf2d 100644
--- a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
@@ -62,18 +62,18 @@ RDEPEND="
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
 	rocm? (
-		>=dev-util/hip-5.7
-		>=dev-libs/rccl-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
-		>=sci-libs/miopen-5.7[${ROCM_USEDEP}]
-		>=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+		=dev-util/hip-5.7*
+		=dev-libs/rccl-5.7*[${ROCM_USEDEP}]
+		=sci-libs/rocThrust-5.7*[${ROCM_USEDEP}]
+		=sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipFFT-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipRAND-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipCUB-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipSOLVER-5.7*[${ROCM_USEDEP}]
+		=sci-libs/miopen-5.7*[${ROCM_USEDEP}]
+		=dev-util/roctracer-5.7*[${ROCM_USEDEP}]
 	)
 	distributed? ( sci-libs/tensorpipe[cuda?] )
 	xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
diff --git a/sci-libs/caffe2/caffe2-2.3.1.ebuild b/sci-libs/caffe2/caffe2-2.3.1.ebuild
index 53c270458dd2..51bab7c5dac7 100644
--- a/sci-libs/caffe2/caffe2-2.3.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild
@@ -65,18 +65,18 @@ RDEPEND="
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
 	rocm? (
-		>=dev-util/hip-5.7
-		>=dev-libs/rccl-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
-		>=sci-libs/miopen-5.7[${ROCM_USEDEP}]
-		>=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+		=dev-util/hip-5.7*
+		=dev-libs/rccl-5.7*[${ROCM_USEDEP}]
+		=sci-libs/rocThrust-5.7*[${ROCM_USEDEP}]
+		=sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipFFT-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipRAND-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipCUB-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipSOLVER-5.7*[${ROCM_USEDEP}]
+		=sci-libs/miopen-5.7*[${ROCM_USEDEP}]
+		=dev-util/roctracer-5.7*[${ROCM_USEDEP}]
 	)
 	distributed? ( sci-libs/tensorpipe[cuda?] )
 	xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
diff --git a/sci-libs/composable-kernel/Manifest b/sci-libs/composable-kernel/Manifest
index 316f4e33f9d2..91879beba858 100644
--- a/sci-libs/composable-kernel/Manifest
+++ b/sci-libs/composable-kernel/Manifest
@@ -1,5 +1,10 @@
 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-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 1786 BLAKE2B ca0f01b34ce48f190a57b9e3b0d788f4bd8422ecae782bb7e9d9e21886bdba0dac8776f1183e57b96e9ef824cde482476746d30b1d5cba5fe93eb7cea9453ce9 SHA512 11b806f90b2a4a94d2535a86cd490a992e39ded8aa648c6b327cd407338a326375850935515338b7fd15946799118821e0d40b0c024cdaaac95cd87bdad1c560
-MISC metadata.xml 473 BLAKE2B fdeace65d8ada21cb0b0fd3a7e1c0c48338c10b51cdad675ffb33e4bd8b9da4ef83ffee85606ef436b2f0315ed323266fa28c70ac5553952ee800fe0450fb066 SHA512 38c79eb08baedccfa7e7a46ef138520d7a939379c4120883d1f8b1187624ca78d9c8dfcf5759867a0b78253b4724a4da944f7384ec27bc2f9846198c1386af9d
+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
+MISC metadata.xml 457 BLAKE2B 3ea71ee5eb1ef715b76f1ff2132c8d487f9360d5ea4a062bcb785eda19a997bed1ffcb251a98046661d647c3eac24db5cf5eeb9b3a6792c450c277038ac8c9e3 SHA512 efc4309c8c4ac98a59cb9634d64410d8a0c8b136accc13aff2f943594a0b4fe8d333010fd5ad59b46fbd7c2d29a244839bb3687cfef6e2c880431ffd80ed873b
diff --git a/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild b/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild
index fbaa9356f722..30016b8dbf79 100644
--- a/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild
+++ b/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-BDEPEND="dev-libs/half:0/1
+BDEPEND="
 	dev-build/rocm-cmake
 "
 
diff --git a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
new file mode 100644
index 000000000000..8c096e29135a
--- /dev/null
+++ b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake flag-o-matic rocm
+
+GTEST_COMMIT="b85864c64758dec007208e56af933fc3f52044ee"
+GTEST_FILE="gtest-1.14.0_p20220421.tar.gz"
+
+DESCRIPTION="High Performance Composable Kernel for AMD GPUs"
+HOMEPAGE="https://github.com/ROCm/composable_kernel"
+SRC_URI="https://github.com/ROCm/composable_kernel/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+S="${WORKDIR}/composable_kernel-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	>=dev-db/sqlite-3.17
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	>=dev-libs/boost-1.72
+	dev-cpp/nlohmann_json
+	dev-cpp/frugally-deep
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-build/rocm-cmake
+"
+
+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
+)
+
+src_prepare() {
+	sed -e '/-Werror/d' -i cmake/EnableCompilerWarnings.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		CMAKE_BUILD_TYPE="Release"
+	else
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_DEV=OFF
+		-DGPU_TARGETS="$(get_amdgpu_flags)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DGOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		)
+	fi
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}"/lib cmake_src_test -j1
+}
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch
new file mode 100644
index 000000000000..bedc79c562bd
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -470,7 +470,10 @@ if(NOT DEFINED INSTANCES_ONLY)
+         LIBRARY_NAME composablekernel
+         PACKAGE_NAME examples
+    )
+-   add_subdirectory(example)
++   option(BUILD_EXAMPLES "Build examples" OFF)
++   if(BUILD_EXAMPLES)
++     add_subdirectory(example)
++   endif()
+    if(BUILD_TESTING)
+       add_subdirectory(test)
+    endif()
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch
new file mode 100644
index 000000000000..3a102bec49cd
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch
@@ -0,0 +1,18 @@
+`-fno-offload-uniform-block` flag was added in Clang 18; do not use it if hipcc uses Clang 17
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -144,11 +144,9 @@ else()
+     message("Building CK for the following targets: ${AMDGPU_TARGETS}")
+ endif()
+ find_package(hip)
+-# No assumption that HIP kernels are launched with uniform block size for backward compatibility
+-# SWDEV-413293 and https://reviews.llvm.org/D155213
+-math(EXPR hip_VERSION_FLAT "(${hip_VERSION_MAJOR} * 1000 + ${hip_VERSION_MINOR}) * 100000 + ${hip_VERSION_PATCH}")
+-message("hip_version_flat=${hip_VERSION_FLAT}")
+-if(NOT WIN32 AND ${hip_VERSION_FLAT} GREATER 500723302)
++
++check_cxx_compiler_flag("-x hip -fno-offload-uniform-block" COMPILER_HAS_OPTION_OFFLOAD_UNIFORM_BLOCK)
++if(COMPILER_HAS_OPTION_OFFLOAD_UNIFORM_BLOCK)
+    message("Adding the fno-offload-uniform-block compiler flag")
+    add_compile_options(-fno-offload-uniform-block)
+ endif()
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch
new file mode 100644
index 000000000000..6c6b161b1a14
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch
@@ -0,0 +1,14 @@
+Fix "Could NOT find Git (missing: GIT_EXECUTABLE)", git is not needed for releases
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,9 +84,7 @@ include(getopt)
+ # CK config file to record supported datatypes, etc.
+ configure_file(include/ck/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/ck/config.h)
+ 
+-# CK version file to record release version as well as git commit hash
+-find_package(Git REQUIRED)
+-execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD OUTPUT_VARIABLE COMMIT_ID OUTPUT_STRIP_TRAILING_WHITESPACE)
++# CK version file to record release version
+ configure_file(include/ck/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/ck/version.h)
+ 
+ set(ROCM_SYMLINK_LIBS OFF)
diff --git a/sci-libs/composable-kernel/metadata.xml b/sci-libs/composable-kernel/metadata.xml
index 9236dd2846d7..afd22272458c 100644
--- a/sci-libs/composable-kernel/metadata.xml
+++ b/sci-libs/composable-kernel/metadata.xml
@@ -10,6 +10,6 @@
     <name>Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/composable_kernel</remote-id>
+    <remote-id type="github">ROCm/composable_kernel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest
index eea500c42794..ffcc305f1a9c 100644
--- a/sci-libs/hipBLAS/Manifest
+++ b/sci-libs/hipBLAS/Manifest
@@ -1,7 +1,9 @@
 DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707
 DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8
 DIST hipBLAS-5.7.1.tar.gz 669163 BLAKE2B e065f77eba0bb99d347f71920e733d30b7693f9eaf0c1f2a87a169360ccff23b8294e367eebfd6489440308b9bb1ae662c39617c5bb94275bf9b0ed60d555f85 SHA512 24c074f07865e1a3dfb0aca0b1d494e340a584ecb408813bb5b053f8282437cfd3644d730163f4faf1b93da306626ba68904141f9c3730a29749537fb7fd1a63
+DIST hipBLAS-6.1.1.tar.gz 835570 BLAKE2B dc8a54f3b6c780f63e57f208d67b15e965d3a7c98e20766ef22ecfd41e8780a6b9464e31efad8003b52562222ec7ad06801d93a502ff99f8456f415db09e5ace SHA512 390b9a9bf0238a5c72d51d034c0053ec8c6b007547b1ec9561064828c24335e099ddb0402ad76e60018ec96742d5acfbb29b9d218a613e1c6d54e4b8b05ceca7
 EBUILD hipBLAS-5.1.3.ebuild 1290 BLAKE2B 2d5722359ad1192d245a0d344aa2d3ab794f49be3cf7d6e0e90936d8813c29e7d2b96fb571f0b34aa5cf2883186bf20c5a4e8d974bba148ac20370b032176d1d SHA512 a95a0f8ae694e346aa00d4de3b09938515e8f104e731fa14936dd6f335996c32136d043f326887b8bcde718b5782cb464fc9a23641ea9641492fa21efee4b3a3
 EBUILD hipBLAS-5.4.2.ebuild 929 BLAKE2B ce433ff82d693d8b446bc47ce93e7ded4a4401cb423d45cbe9040d5a6b19bd1daa1b0b62e227c69505f941778fd3832827e867894f1ddb92538aebedddc26f67 SHA512 09813a2e0878222efdee2a5e87401671337dedb76441bbc5cca3c42f2aea3e88281ac503feb93b5ec3d4a904ceebe34bb9344ac577b9fdedb9f65e6678ead8fa
-EBUILD hipBLAS-5.7.1.ebuild 930 BLAKE2B 701197e3a06e56cd231b127cdb10d1a407f9c3ff83549d0f974e168f4aab2dc30565db602221244a18f7e4b6d55c2c192327573575956896b4f33b04ac77936a SHA512 d21079acf0101f779672eb033b0626099b29f18567f5b68697d988122a5ea1b775022625cd397dfb9ff8c6077d19b3fa796cd04ea99ebe80fe7a3dc5e303e2d6
-MISC metadata.xml 550 BLAKE2B f138aed628130d69e0e24f818e407e7ca940c90d3c2b5552fd8371a15ca7d1a4c2d26b4e521b71b67a18804dd31f0287b2d7af285c0cb77c000f2904e0618eae SHA512 6fc45e338865b72a9a876316c5bf9604eba1b8182ebfba2dcd229d4ff09ac02f73e263be63a330dd806a72e0a4e935eeec49fa7fe445e323674ebf2f67342f78
+EBUILD hipBLAS-5.7.1.ebuild 919 BLAKE2B 35676f043ad9ab3f3dc3398915e285fd5d8f15fd7ada8b1f3dc9af667853e7c57f79a51a3868141f91b8804b31353794038c0dd8be4a206ad44843609e385fb3 SHA512 2d825e3e69473d0fb0c8b718b0bc2751363bf0cf6f77f7afef54a9a4d2616cc09d8910a8196e44eb31aac8a3d3db389d702d5f2fa70107eae2ff8b38b72c15e0
+EBUILD hipBLAS-6.1.1.ebuild 877 BLAKE2B ffbb8660064b81317ffef15907d5203d213117787efce6bff92ffece9f47eb923048952113efa74fa187d9516298997ff1a5d78ad1c2481e28d3f17d5b21388c SHA512 c68564244a262ed0f2fd779a7ace6eda8ad65e5e1b43473098a2be4e4818e2ca6f7660924b75b7ab6e6f1b24b23cf5cfbc3d7bccf8c4da7f81a0b1860cd627e5
+MISC metadata.xml 647 BLAKE2B b4e941583a6b55bfa45a58e3173c6cecfcadaffd5e782c052f9cc8a46b37e1a09d9fd48b93fd0bd2977a982ec6752aed254f341caad0035a5dd8d2a1dad98b18 SHA512 d3ca380b71547c0e28be4dfbcc0b568fc2e2d89ae2ed0eca3bd087650d352539e5921d89d28bfd255e1564ec6c79dff5df2cddd3c008f91990f8c6f37ae3f3a8
diff --git a/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild b/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild
index f5afa385cdee..f979363cda25 100644
--- a/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild
+++ b/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,6 @@ RDEPEND="dev-util/hip
 	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
 	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/hipBLAS-rocm-${PV}"
 
diff --git a/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild
new file mode 100644
index 000000000000..439a778540e9
--- /dev/null
+++ b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+DESCRIPTION="ROCm BLAS marshalling library"
+HOMEPAGE="https://github.com/ROCm/hipBLAS"
+SRC_URI="https://github.com/ROCm/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipBLAS-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here
+		-DBUILD_CLIENTS_TESTS=OFF
+		-DBUILD_CLIENTS_BENCHMARKS=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipBLAS/metadata.xml b/sci-libs/hipBLAS/metadata.xml
index 65b9259ded18..128eeacea7f9 100644
--- a/sci-libs/hipBLAS/metadata.xml
+++ b/sci-libs/hipBLAS/metadata.xml
@@ -12,7 +12,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/hipBLAS</remote-id>
+    <remote-id type="github">ROCm/hipBLAS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/hipBLASLt/Manifest b/sci-libs/hipBLASLt/Manifest
new file mode 100644
index 000000000000..23aeb5897dba
--- /dev/null
+++ b/sci-libs/hipBLASLt/Manifest
@@ -0,0 +1,8 @@
+AUX hipBLASLt-6.1.1-clang-19.patch 341 BLAKE2B 7e486930db9a406e3665eb4d276c0df4790018ce4f8f6f7a72bd986da61a0ccfc6619ea0de6a2a488cb1ee64f92470aaa337b4590a5be0044be0bf9a014bad25 SHA512 894596742720d947fb25fd3332c34efbb5cc2fdc790c29919e0d65df85d2add6f1ac2a6c7b8f4796428bc69197af0f6227132a6711f3106e9a7b84f285ecfa83
+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-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
+MISC metadata.xml 416 BLAKE2B 72248e12cd10654326a6685df0e03c508d413d2728d8e687eb8ad3d8dc928e518e3ba21df1ee774282c45363f61eed98b47b862cab2354d743ca530047084281 SHA512 02acf2d17f2c56f09c599fcde965bd5ceb07c335d7c2b4fd57a06a6b1a591a250d22de7a002f299cc99cacd1fd72f183adf51fc1b9ebff1338c6d83450da9c3b
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch
new file mode 100644
index 000000000000..5d082cc704b6
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch
@@ -0,0 +1,11 @@
+Clang 19 is so smart, it can analyze templates before instantiation
+--- a/tensilelite/Tensile/Source/lib/include/Tensile/MasterSolutionLibrary.hpp
++++ b/tensilelite/Tensile/Source/lib/include/Tensile/MasterSolutionLibrary.hpp
+@@ -36,6 +36,7 @@
+ 
+ namespace Tensile
+ {
++    enum class LazyLoadingInit;
+ 
+     /**
+  * \ingroup SolutionLibrary
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch
new file mode 100644
index 000000000000..ef0b8395c527
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch
@@ -0,0 +1,29 @@
+Gentoo uses "msgpack-cxx" as library name and adds important
+MSGPACK_NO_BOOST compile definition when msgpack-cxx us installed with USE=-boost
+--- a/tensilelite/Tensile/Source/lib/CMakeLists.txt
++++ b/tensilelite/Tensile/Source/lib/CMakeLists.txt
+@@ -102,22 +102,9 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+ endif()
+ 
+ if(TENSILE_USE_MSGPACK)
+-    find_package(msgpack REQUIRED)
++    find_package(msgpack-cxx REQUIRED)
+     target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
+-
+-    if(TARGET msgpackc-cxx)
+-        get_target_property(msgpack_inc msgpackc-cxx INTERFACE_INCLUDE_DIRECTORIES)
+-    elseif(TARGET msgpackc)
+-        get_target_property(msgpack_inc msgpackc INTERFACE_INCLUDE_DIRECTORIES)
+-    endif()
+-
+-    if(DEFINED msgpack_inc)
+-        # include C++ headers manually
+-        # External header includes included as system files
+-        target_include_directories(TensileHost
+-            SYSTEM PRIVATE $<BUILD_INTERFACE:${msgpack_inc}>
+-        )
+-    endif()
++    target_link_libraries(TensileHost PRIVATE msgpack-cxx)
+ endif()
+ 
+ if(TENSILE_USE_LLVM)
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch
new file mode 100644
index 000000000000..17c5d9c534c0
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch
@@ -0,0 +1,24 @@
+--- a/tensilelite/Tensile/Ops/gen_assembly.sh
++++ b/tensilelite/Tensile/Ops/gen_assembly.sh
+@@ -32,7 +32,7 @@ if ! [ -z ${ROCM_PATH+x} ]; then
+     rocm_path=${ROCM_PATH}
+ fi
+ 
+-toolchain=${rocm_path}/llvm/bin/clang++
++toolchain=@LLVM_PATH@/bin/clang++
+ 
+ . ${venv}/bin/activate
+ 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,10 +97,6 @@ endif()
+ # hipBLASLt project
+ project(hipblaslt LANGUAGES CXX)
+ 
+-# Force library install path to lib (CentOS 7 defaults to lib64)
+-set(CMAKE_INSTALL_LIBDIR "lib" CACHE INTERNAL "Installation directory for libraries" FORCE)
+-
+-
+ # Build options
+ option(BUILD_SHARED_LIBS "Build hipBLASLt as a shared library" ON)
+ option(BUILD_CLIENTS_TESTS "Build tests (requires googletest)" OFF)
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
new file mode 100644
index 000000000000..6bd608c94d0e
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
@@ -0,0 +1,56 @@
+Add ability to build without specitying any arch.
+This produces dummy library, which can be linked to other project (like caffe2 in pytorch).
+
+Related upstream bug: https://github.com/ROCm/hipBLASLt/issues/535
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,6 +220,10 @@ else()
+     else()
+       find_package(Tensile 4.33.0 EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}")
+     endif()
++    else()  # link to Tensile (required), but don't generate libraries
++      cmake_policy(SET CMP0074 NEW)
++      set(Tensile_ROOT "${CMAKE_SOURCE_DIR}/tensilelite/Tensile")
++      find_package(Tensile REQUIRED HIP LLVM OpenMP)
+     endif()
+ 
+     # setup hipblaslt defines used for both the library and clients
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -75,7 +75,7 @@ add_library(roc::hipblaslt ALIAS hipblaslt)
+ 
+ # Target compile definitions
+ if(NOT BUILD_CUDA)
+-if( BUILD_WITH_TENSILE )
++if( TRUE )  # link with Tensile is always reqiured
+ 
+   if( BUILD_SHARED_LIBS )
+     target_link_libraries( hipblaslt PRIVATE TensileHost )
+@@ -194,7 +194,7 @@ rocm_install_targets(TARGETS hipblaslt
+                        ${CMAKE_BINARY_DIR}/include
+ )
+ 
+-if ( NOT BUILD_CUDA )
++if ( NOT BUILD_CUDA AND BUILD_WITH_TENSILE )
+     if (WIN32)
+       set( HIPBLASLT_TENSILE_LIBRARY_DIR "\${CPACK_PACKAGING_INSTALL_PREFIX}hipblaslt/bin" CACHE PATH "path to tensile library" )
+     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 )
+   set( Tensile_INC
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/Tensile
+   )
++else()
++  set_target_properties( TensileHost PROPERTIES POSITION_INDEPENDENT_CODE ON )
+ 
++  set( Tensile_SRC
++  src/amd_detail/rocblaslt/src/tensile_host.cpp
++  )
++
++  set( Tensile_INC
++  ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/Tensile
++  )
+ endif( ) # BUILD_WITH_TENSILE
+ 
+ set(DL_LIB dl)
+\ No newline at end of file
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch
new file mode 100644
index 000000000000..55c26680673f
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch
@@ -0,0 +1,13 @@
+Git is not used
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -23,9 +23,6 @@
+ 
+ # Dependencies
+ 
+-# Git
+-find_package(Git REQUIRED)
+-
+ # Workaround until hcc & hip cmake modules fixes symlink logic in their config files.
+ # (Thanks to rocBLAS devs for finding workaround for this problem!)
+ list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild
new file mode 100644
index 000000000000..cf2ad2ac5382
--- /dev/null
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+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
+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"
+S="${WORKDIR}/hipBLASLt-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+SUPPORTED_GPUS=( gfx90a gfx940 gfx941 gfx942 )
+IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" )
+IUSE="${IUSE_TARGETS[@]/#/+} test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	dev-cpp/msgpack-cxx
+	sci-libs/hipBLAS:${SLOT}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/rocm-cmake
+	$(python_gen_any_dep '
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
+	')
+	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-arch.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-git.patch
+	"${FILESDIR}"/${PN}-6.1.1-clang-19.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/msgpack[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/joblib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+pkg_pretend() {
+	if [[ "${AMDGPU_TARGETS[@]}" = "" ]]; then
+		ewarn "hipBLASLt supports only few GPUs: ${SUPPORTED_GPUS[@]},"
+		ewarn "but none of them were defined in AMDGPU_TARGETS USE_EXPAND variable."
+		ewarn
+		ewarn "Library will continue to be built in \"dummy\" mode,"
+		ewarn "serving as a non-functional placeholder for end-user applications."
+	fi
+}
+
+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)
+
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die))
+	python_fix_shebang -q ${shebangs[*]}
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local targets="$(get_amdgpu_flags)"
+	local build_with_tensile=$([ "${AMDGPU_TARGETS[@]}" = "" ] && echo OFF || echo ON )
+
+	local mycmakeargs=(
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_WITH_TENSILE="${build_with_tensile}"
+		-DAMDGPU_TARGETS="${targets}"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+	)
+
+	use test && mycmakeargs+=( -DBUILD_FORTRAN_CLIENTS=ON )
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_compile() {
+	local -x ROCM_PATH="${EPREFIX}/usr"
+	# set PYTHONPATH to load Tensile from virtualenv, not the system-wide one
+	local -x PYTHONPATH="${S}_build/virtualenv/lib/${EPYTHON}/site-packages"
+	local -x TENSILE_ROCM_ASSEMBLER_PATH="$(get_llvm_prefix)/bin/clang++"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	# Stop llvm-strip from removing .strtab section from *.hsaco files,
+	# otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes
+	dostrip -x /usr/$(get_libdir)/hipblaslt/library/
+}
+
+src_test() {
+	check_amdgpu
+	cmake_src_test -j1
+}
diff --git a/sci-libs/hipBLASLt/metadata.xml b/sci-libs/hipBLASLt/metadata.xml
new file mode 100644
index 000000000000..da84ad53885c
--- /dev/null
+++ b/sci-libs/hipBLASLt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm/hipBLASLt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index 5ddc70706c77..eb15875aba99 100644
--- a/sci-libs/hipCUB/Manifest
+++ b/sci-libs/hipCUB/Manifest
@@ -1,6 +1,8 @@
 AUX hipCUB-4.3.0-add-memory-header.patch 421 BLAKE2B cd05a027dbf75098fd199783c0abc2c37627e5b55b92f1b4ffb828995fbdb7ebf46f3f1d66a87c37eb35ddd16bd472541537d1ea250474c541bd01b10bd386c5 SHA512 7865f3942b7b157095c477da8790bf9632a630aa3456cde3b1a7b267e62db720a257e1c0e0501b88f8a0b187aa8ec520c4e7693e97af72358a6ff518be1f10a3
 DIST hipCUB-5.1.3.tar.gz 278021 BLAKE2B f30e567370fea80ef63a455c2c27b3f4ff241e7e405688fa4dc33d1e0ce3dffb016a1a1523b20613a7963bff061758eac0c0d110243a9a6cedbc100bb087d7d4 SHA512 dd3ca341b78cf6985ba723feeeb560c0503ab283b63067e9a5e68d12ad42f752a7f56fd60f0f0c26c2853538853e09a102cfc6006c18c31c3162fa7b536ffb9f
 DIST hipCUB-5.7.1.tar.gz 322980 BLAKE2B a9b2a69b47661532858f18e7296ef37be41da814bb4886f7b8b444829e6ad1374d1c3117b57e7599095253ed56ea2403c895bb820dbde9cec77c28a041af3898 SHA512 7cf7dc819a3d8bac2cf70aa077616e65d785d76bae3ad3991db7b940a061f694ac82b1e4219aa16476351f1329e3f0d09a818b0ff0b9c5ad261937879c21dca8
+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
-MISC metadata.xml 625 BLAKE2B 7f927357a005110b37accb6841e4248e22e8080d0e0d6eb28e50e96c84807f663faf2f85dd222e5f5af448211cc05004d371a6d57ac6f17393609e76980bda81 SHA512 7d16cebc8c7df7dcc5d63e02e88e9d16d2321485de688621fd8628b8473d5ae614d63b0578363ee3b47f5e0aa7f45da9a00950b6a09a8cc9c6e3c77ae856c798
+EBUILD hipCUB-6.1.1.ebuild 1265 BLAKE2B 8a64bc81af9c541be86c30e3b1553620f45cc10805102e68d7f85b15bd59ab31d2a8534eb40bf0e6aeedab4adfb79c28bae14d6eaaf8c692466d9b59671cd711 SHA512 5b2f574c4de7089be0554e486421633dc1fa3369adce90316d7d159b6ac95780ad9e8366ea07e3cb878de04f4d9d8778e785a05987f1a7c605a63bf94230e7fb
+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
new file mode 100644
index 000000000000..8a38588c8d4c
--- /dev/null
+++ b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives"
+HOMEPAGE="https://github.com/ROCm/hipCUB"
+SRC_URI="https://github.com/ROCm/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz"
+S="${WORKDIR}/hipCUB-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" \
+		-i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	HIPCUB_USE_HMM="1" cmake_src_test -j1
+}
diff --git a/sci-libs/hipCUB/metadata.xml b/sci-libs/hipCUB/metadata.xml
index 5e18b914d070..64944bcdc745 100644
--- a/sci-libs/hipCUB/metadata.xml
+++ b/sci-libs/hipCUB/metadata.xml
@@ -12,8 +12,12 @@
 		<email>gentoo@holzke.net</email>
 		<name>Wilfried Holzke</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>lockalsash@gmail.com</email>
+		<name>Sv. Lockal</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">ROCm-Developer-Tools/hipCUB</remote-id>
+		<remote-id type="github">ROCm/hipCUB</remote-id>
 	</upstream>
 	<use>
 		<flag name="benchmark">Build and install benchmark binaries.</flag>
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index f8b276e95075..359f9f3077eb 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -5,6 +5,8 @@ AUX hipFFT-5.1.3_hip-config.patch 2792 BLAKE2B 275010cb9b4fe0b2f530bc1fe4fd027e7
 AUX hipFFT-5.7.1_hip-config.patch 1256 BLAKE2B 240423151a9eede7398289049294c28322dca1480038ca6a88b234e5222df12bd56ef1ad1c56939ce695e1aa0161ca838327902a047a92cd509beaa330a9247c SHA512 915b512e847ccaf02466c9f105365c354d4e51a1a54506844cdefc895eca555d10c0e10716686aebbd1e3b5f6a547fa8ab093b56ccf655e172a0154171f4f2c2
 DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
 DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B ee8d6dcb7924c8989987b02533126c4e4419d8dc83067a816f2253efe4537e094f1665d95699d4bf27f30cd13f3fc5df7d3b0062c267ecbdcbb3aad961fab6f6 SHA512 4bfd812fa1e949574b4170833755a435f47e893f0615b65d8d273af6e8f89ea4d28632a208de20321e834c8bc237b11816e2af0363b60adca9af736b9bc87465
+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
-MISC metadata.xml 617 BLAKE2B d5ab7f2a7c98fdafe1e50bff4708e7a2bf58680e9ee2cadaa2eea018b81032b4e1d82849144684a1100acb9a4e2651fb07572c0e46cbda87ef585b290e4b865c SHA512 7859cff3011e71bb1e6a2668c6d1f035cdd47ad214aefe6c0c225a8ac7133081a9e2bad5a7bb7ea94b7a9c3761f131228e5da66b0190e35234cd10c626e01734
+EBUILD hipFFT-6.1.1.ebuild 782 BLAKE2B 772222101b586e9ef1426cdb084a1fd096f398d5dc7cbee73b7684ffa89883c1c9c1dda2b1504883945385385fbaf9aae9f813b9b3bf6ee450c9f732b924a6ac SHA512 d040a4f4c7d622f11d3d7d06dfa073e2a42d4b2edbee9b0f76912944f21b20f8af1030c924590ce33a35a5f54fa1d8d090c65245332a0bbdaf2b10548e46318b
+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
new file mode 100644
index 000000000000..d9700529cd24
--- /dev/null
+++ b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic hip FFT implementation"
+HOMEPAGE="https://github.com/ROCm/hipFFT"
+SRC_URI="https://github.com/ROCm/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipFFT-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_TESTS=OFF
+		-DBUILD_CLIENTS_RIDER=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipFFT/metadata.xml b/sci-libs/hipFFT/metadata.xml
index 54e78eb20141..1e3fd1c52d20 100644
--- a/sci-libs/hipFFT/metadata.xml
+++ b/sci-libs/hipFFT/metadata.xml
@@ -13,7 +13,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/hipFFT</remote-id>
+    <remote-id type="github">ROCm/hipFFT</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest
index 4d04e283f14d..09cdb4661bd7 100644
--- a/sci-libs/hipRAND/Manifest
+++ b/sci-libs/hipRAND/Manifest
@@ -1,5 +1,7 @@
 DIST hipRAND-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2
 DIST hipRAND-rocm-5.7.1.tar.gz 478352 BLAKE2B 5f435cf53d213b1d95ee8b766df2c9bc4b4d590ccf63fe867bd033eeb4b7fef67e2bde22242525686a8dee59fd811363857312481e9cb3575357c612ab519a41 SHA512 b3c51728c1d7cc37760f49f36ab7765c166f105bc5b1b6ce65ac4a1de9bb70f8e2c10f5c41f89040288b09c9257d913d745a416bd4785b71f170a4f57e1f95e2
-EBUILD hipRAND-5.6.0-r1.ebuild 826 BLAKE2B c3018b88618d5f741b45fe5272c1d1ab30a23663b586917f16ce70d8692ff64daee77fb1b1881a1023712cf7fd50facd6d536f3a57865ad0f99d0b2bf2bbcb77 SHA512 6943fc2034c0fbf71eca8c83b33c7fe6b73df66d0af931645ca5372e9cb9a85f6d6957f48e187b44a6373ab659079ce9684380d1f575296faef3d8bd7cb03b4e
-EBUILD hipRAND-5.7.1.ebuild 826 BLAKE2B c3018b88618d5f741b45fe5272c1d1ab30a23663b586917f16ce70d8692ff64daee77fb1b1881a1023712cf7fd50facd6d536f3a57865ad0f99d0b2bf2bbcb77 SHA512 6943fc2034c0fbf71eca8c83b33c7fe6b73df66d0af931645ca5372e9cb9a85f6d6957f48e187b44a6373ab659079ce9684380d1f575296faef3d8bd7cb03b4e
-MISC metadata.xml 489 BLAKE2B 9dbd5a5d1c3d7deeb191eb70c48ec9f4abd11a6362a81f93fb54116a4687edf9cf1113179af884bd346b9bfb4c785437dd674251903b233589ba8556e5316644 SHA512 4f85aa13c08b7ccab6c1db816f805a987a3ee33991dacba683fabf7f40ff7288660f725296dfdda68d9ae9ff5d5150cde9b6e9303f481960665a2085b5f62ef0
+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
+MISC metadata.xml 586 BLAKE2B 98f8745143ec4d1c89f1e12747e1f1abe97ec74bab97f2afeea257f3a900b87c76efccebb39abd500f36ff88eab2284ec73a89db90ff0c5e616dba912f084f11 SHA512 71778ca99fb19bf30fc2f301f188e4ded754eafd2eba8abe1143cbecbf143d7f3cc8ce908592dee9e7cdc242d4f05f4a2d10739893357abb0a30362ec4448b85
diff --git a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild
index 006440bb6a29..1674ad72718f 100644
--- a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild
+++ b/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,6 @@ RESTRICT="test"
 RDEPEND="dev-util/hip
 	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/hipRAND-rocm-${PV}"
 
diff --git a/sci-libs/hipRAND/hipRAND-5.7.1.ebuild b/sci-libs/hipRAND/hipRAND-5.7.1.ebuild
index 006440bb6a29..1674ad72718f 100644
--- a/sci-libs/hipRAND/hipRAND-5.7.1.ebuild
+++ b/sci-libs/hipRAND/hipRAND-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,6 @@ RESTRICT="test"
 RDEPEND="dev-util/hip
 	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/hipRAND-rocm-${PV}"
 
diff --git a/sci-libs/hipRAND/hipRAND-6.1.1.ebuild b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
new file mode 100644
index 000000000000..2a123df19544
--- /dev/null
+++ b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic hip RAND implementation"
+HOMEPAGE="https://github.com/ROCm/hipRAND"
+SRC_URI="https://github.com/ROCm/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipRAND-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
diff --git a/sci-libs/hipRAND/metadata.xml b/sci-libs/hipRAND/metadata.xml
index 27c8916b67d4..c47caac8ebdf 100644
--- a/sci-libs/hipRAND/metadata.xml
+++ b/sci-libs/hipRAND/metadata.xml
@@ -9,7 +9,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/hipRAND</remote-id>
+    <remote-id type="github">ROCm/hipRAND</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/hipSOLVER/Manifest b/sci-libs/hipSOLVER/Manifest
index 6c96ae23564d..2ba646602c30 100644
--- a/sci-libs/hipSOLVER/Manifest
+++ b/sci-libs/hipSOLVER/Manifest
@@ -1,3 +1,6 @@
+AUX hipSOLVER-6.1.1-find-cholmod.patch 965 BLAKE2B 0d4f37dbae67bf2605a981f3a01c9c4fe681953d59c4b17c4abbe9953154dafd94a9e66b710f4384035521e6b2e0d98ebaa63d41a44ba263e53f71725ca7e2f0 SHA512 e22bb5470ed857faa7aed8522fcc67f92994260386f302af6112dc6a7bb8f9ca20b22fe1261f4f7dec87c0e04138a8a1f64894556db003e2fccf924dd5cd4c7b
 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
-MISC metadata.xml 618 BLAKE2B a62e9c459afe2c341849d43f9dbf2304389dfa1f50ace6616c5bd2903488e49d0e1d235808a46dafb782d638a3f209706220d66264fda845b701c19e55febce2 SHA512 c9654b6e8a610638093d3f26710292cf62e0d9e1a9dddc160c4d30e59e7a12f70e39eb965995187fe54b6f3648fb44810ca8b983a886af7a731d62eb06c9464b
+EBUILD hipSOLVER-6.1.1.ebuild 1002 BLAKE2B 463115ba89403b1f0a0788aebd8bba9b48c6c6a39585a79ffe6b3ef8e1602f22e5257949bf2cddf2f3819dc4610981da6efcaff63d699fb6b9c8b7c31e58ed89 SHA512 99c71c0f1b9276331754c9de130b11edbf1a7336a6d42020bb4a9bb5dc5e7591dc6b603821810976d69c7a3a4cce9318635be9b58c9ac90d677240e657924d97
+MISC metadata.xml 727 BLAKE2B d10c0be13cf9f705b7c7c0b223b91da6f0d06faccaf5a7c5e8a6ed03e0c3d32e943a742f1a9feb9452f21f36de99f1b74b3ec91ad2d32a6c7c94088eee66ed22 SHA512 14521a8ef7d65220b9b5ee23c7600f11a8329adb23993bbbda70ccfeb3cc4de5eb25713cb523890f2868983a409ae2a735d4191457b1fd8647b01751193e2cde
diff --git a/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch b/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch
new file mode 100644
index 000000000000..da43f4ff116b
--- /dev/null
+++ b/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch
@@ -0,0 +1,29 @@
+cholmod.h is in /usr/include in Gentoo, use pkg-config to find it
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -221,11 +221,9 @@ if( NOT USE_CUDA )
+   if( BUILD_WITH_SPARSE )
+     list(APPEND hipsolver_pkgdeps "rocsparse >= 2.3.0")
+ 
+-    if( SYSTEM_OS STREQUAL "centos" OR SYSTEM_OS STREQUAL "rhel" )
+-      list(APPEND hipsolver_pkgdeps "suitesparse")
+-    else()
+-      list(APPEND hipsolver_pkgdeps "libcholmod3" "libsuitesparseconfig5")
+-    endif()
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(CHOLMOD REQUIRED IMPORTED_TARGET cholmod)
++    target_link_libraries(hipsolver-common INTERFACE PkgConfig::CHOLMOD)
+   endif( )
+ 
+   rocm_package_add_dependencies(DEPENDS ${hipsolver_pkgdeps})
+--- a/library/src/amd_detail/hipsolver_sparse.cpp
++++ b/library/src/amd_detail/hipsolver_sparse.cpp
+@@ -45,7 +45,7 @@
+ 
+ #ifdef HAVE_ROCSPARSE
+ #include <rocsparse/rocsparse.h>
+-#include <suitesparse/cholmod.h>
++#include <cholmod.h>
+ #endif
+ 
+ #undef TRUE
diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
new file mode 100644
index 000000000000..be450babaed3
--- /dev/null
+++ b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic marshalling library for LAPACK routines on the GPU"
+HOMEPAGE="https://github.com/ROCm/hipSOLVER"
+SRC_URI="https://github.com/ROCm/hipSOLVER/archive/refs/tags/rocm-${PV}.tar.gz -> hipSOLVER-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipSOLVER-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="sparse"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-util/hip
+	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]
+	sparse? (
+		sci-libs/suitesparseconfig
+		sci-libs/cholmod
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-find-cholmod.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_WITH_SPARSE=$(usex sparse ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
diff --git a/sci-libs/hipSOLVER/metadata.xml b/sci-libs/hipSOLVER/metadata.xml
index dfd45574f216..9aa1438b519c 100644
--- a/sci-libs/hipSOLVER/metadata.xml
+++ b/sci-libs/hipSOLVER/metadata.xml
@@ -16,4 +16,7 @@
   <upstream>
     <remote-id type="github">ROCmSoftwarePlatform/hipSOLVER</remote-id>
   </upstream>
+  <use>
+    <flag name="sparse">Build hipSOLVER with sparse functionality (sci-libs/cholmod)</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index 78ab79c4c59b..17a6b95df054 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,6 +1,7 @@
 AUX hipSPARSE-5.0.2-remove-matrices-unpacking.patch 3940 BLAKE2B e3815659b32856206bc3291d09f59514e59dc06c3c33454c24afb68955d6a55411c71535693325be06bdb097e7cedc558ec2b8fa6a2d3886d774d79e038557ad SHA512 39db7d6fe0a085ef5a92f6ec1613376ffd9152d8d31a78f0864c971e7b61d4dfbda2e170940c82dae286d024333621722b249d5bd601399e76e68e8029fc7e81
 DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64
 DIST hipSPARSE-5.7.tar.gz 458521 BLAKE2B 94695ef3cf4294f571723e31ab5d4295b5aaa24528e90838375ee8477cf0957b297663d80e5fe3406762b475b6ef4741f9ccfb4dfb1448ce71ea4014da14b46e SHA512 bb28cd81b7ec298eb2e6462a8588ed93eee7b4892923b11087a91d1c32341f29f488fd4e6797debe51a989f463db31030eae02d07be6512d6b755367ba221aac
+DIST hipSPARSE-6.1.tar.gz 471148 BLAKE2B 18119ac355e180adb5ce38561f44e39119226d209a970ae8cac6b85575bad1ab2a690a3bb72de1c179c1190aa2c29d691e6ce02855f3df89a58f634d42e54103 SHA512 09f9e94c5f976e6f17c07f9be2fde31c2e740871215a6b77b49675644b883bd9994fcaacb19864ace3883bb5aea7a7dc589ddbaf9b6aaf3d9f411c7e452a0b78
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff
@@ -22,4 +23,5 @@ DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b1
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD hipSPARSE-5.1.3-r1.ebuild 3605 BLAKE2B 15ab47a0fd3a822f981021bdfffcf8c5f5f996347ad2c8c00c84e65fec8584f1854a550726e2f6a31f93767071950f8ab533adadde1f813407da73bd6dbd4f45 SHA512 2036a56e753aa80da9ce11bb71ae3539fc16257850d5f58114f696b5bb855101f5994d2016a96e4ab0b7383a3156b919b04dc1ede2e0e4f706751b6b2029d8ce
 EBUILD hipSPARSE-5.7.1.ebuild 3561 BLAKE2B 95ae56d53f834219bae36405315be1bab61d325efd634fbe1e270c5b20ecb1440fcc51daca805530a0d721f852d042ebe7d7eb5b03f3a7f2a9132de73aaf865f SHA512 bfc349c8b1a1f7d66e19db8fdcb5bf23ace3541e99fb3328ea59438587322678e641af121e59e71e2a9b65834b5d985c83f85771592f68346e169ce5b847e993
-MISC metadata.xml 603 BLAKE2B 21c5f53de40b5582b8541e1cef239a4a2eff2eaaaa966a4168439417cd6f80ea00dbd48636bea73aedbaaf580950803768f02ab5f0cca0f76d433d80a80026e1 SHA512 4ff1ebefa7203326a5c2feed7c0deffa10f17383bb4a05fdf3057d8ab1d6f8427a45126ec17aa88e02a93e9114e79f6d89cd4564e72faebf970b7f63814d701a
+EBUILD hipSPARSE-6.1.1.ebuild 3141 BLAKE2B 9a12847d571dd213fe0cfbf5152e65d16104c073e03b22d932901f108f39d961f56de2f48f598e91e9cc098505e7925d8385b4aa59b06b29dcbaf5319ea648e0 SHA512 8c30bfae688927d1e3d3d1ffb177ef4dd230917a7d4a6ad926ee2c397d96192c69c57d467c6016af3560d3776b6359c57818ab50d34871bf0f58f07ac6f2b88c
+MISC metadata.xml 716 BLAKE2B f070df7c312bbe29cf150da488b6f862eb4768ff01385b34c613864da3bc7d44c3adf506e7f92c7beef729c538f176194ec1cb828fe5c97203591873f0aa706a SHA512 cb2bf1a7e03444af8bb5ca08ea3544c974a577c3bab2a194fcaa45750e9cecbc68571adc288b457de01fa84615738130ef8e2a3d002219d2870963d7e53e0570
diff --git a/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
new file mode 100644
index 000000000000..46d70c4b6625
--- /dev/null
+++ b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm toolchain-funcs
+
+DESCRIPTION="ROCm SPARSE marshalling library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"
+# share some test datasets with rocSPARSE
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz
+)"
+S="${WORKDIR}/hipSPARSE-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0"/$(ver_cut 1-2)
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/rocminfo
+		dev-util/hip
+		sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-build/rocm-cmake
+	>=dev-build/cmake-3.22
+	test? ( dev-cpp/gtest )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2bin converter. Do not use any optimization flags!
+		edo $(tc-getCXX) deps/convert.cpp -o deps/convert
+		find "${WORKDIR}" -maxdepth 2 -regextype grep -E -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHIP_RUNTIME="ROCclr"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	edob ./${PN,,}-test
+}
diff --git a/sci-libs/hipSPARSE/metadata.xml b/sci-libs/hipSPARSE/metadata.xml
index 693bc03ef766..db85e1426e8f 100644
--- a/sci-libs/hipSPARSE/metadata.xml
+++ b/sci-libs/hipSPARSE/metadata.xml
@@ -13,6 +13,10 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ROCmSoftwarePlatform/hipSPARSE</remote-id>
   </upstream>
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index 671f703e1bc3..dc22e32055e2 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -9,9 +9,12 @@ AUX miopen-5.1.3-gfx1031.patch 19268 BLAKE2B b3d10c57601fd5f39ae431d101687863de3
 AUX miopen-5.1.3-include-array.patch 343 BLAKE2B 993a8f3e301f4c16088ca216b2d820b17ceb42eeda4550b4291a70e00592281f992bf184407d024a0f8b2207a26fef2d56c26ef95e7a452d3b97090e1335a404 SHA512 887ac13f25c1bfd524bb2a3be701bf688f002a95ef8218cb798e41feaeb0678dbbd2ffaf905c59070a125001093bf5ede1bb6a77fdfe6f7a4ff19cbccfdc6624
 AUX miopen-5.1.3-no-strip.patch 608 BLAKE2B 3173d95219542a48c6dcd2b87e7157dcf483ff714c3d1c1c47aab8fc8af7b1fd4f6ac52b9d8e892cc25bff973597f4a05426fa4714b0764733b810867af59cfe SHA512 201357718203ee9a4062362541c483e069321b825708c6aa0e8892cc7722bcd520808797307e320df34c4fbf0003198f7a46717d5ff3819b1e2c3a5a3a045725
 AUX miopen-5.7.1-fix-miopendriver-gemm.patch 2818 BLAKE2B fd839ec500b297272f70cc1ee2fa87e74b8a70197cc72291c99c1372c9eeb7f2af33de8067fa1dc42d873bd96f93615074521c00f00b0676835c912ec0e2b73b SHA512 22c852082e0de5115acfa208c325cdb7870823dfe3b5984887c848b702a2fc5072c1d1944b218e27776f0e116d391c6039c3f8485ca65282e9699f3fc1885985
+AUX miopen-6.1.1-build-all-tests.patch 548 BLAKE2B be700c5401e288a4da5423047303a316ea82fc928c88e46be3da9cd41ac473bf6e232b68d1791e2fea0534c8233e4c2431c9a7536a24125651ce2f55aea1e667 SHA512 c8df1b24d61c9b7a132b77bddacb3d614653257c61b8b5936ea666a3e130b76a183618d5384abe5b871ae144bf9b2f2cf622850a59e7d5c53cf89adbf9dfa32b
 DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd
 DIST MIOpen-5.7.1.tar.gz 100751593 BLAKE2B c5f847fe4374ab22737c281a65401125012328412d584fc09244b431ea6265d6d5028429115ee15fa8b04cbe0edd020e4e7ac8deb22561183ed76cb8c3d4d9d4 SHA512 3354b3b154f29a6337403abc5a71ec47c0b2558320c5a1b0cbfbbdb370c4fada2db12d4a19a312b5e30ca2e2302ee50ece3390603e84d132b2212a168e9523fa
+DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe57962cac8b7b6b20bc76f136ef29f0441e48112010280c2e674a1ae9fd202ca3e07be47cf4a4bc797234d6dc618be5 SHA512 b8860583919bf2f3e0da7ace30fdb0595ab45b85a367be3737e0b15a22a5565b8d6660c652ee070f21c36ac7d17ef3ba8e2eda7ed89bd6a0c65a4df799626d1a
 DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a
-EBUILD miopen-5.1.3-r1.ebuild 3131 BLAKE2B 70a9e8325d5611aaad84ebba69873c1177bad75b5a7c90ccee74dc26a3283ee555c0826203851b2ea1234837cd0ec26103c8891b5ba6fdca27a18659bcb59e4d SHA512 a61ebfdbe769d5f7d463c293df8b0f17f5a8c5e732c67d6c3be492fe0ffe433a5c9a30d5c735fb6661cdf1ea96a2edce76d7429936ff295b197522017717a36a
-EBUILD miopen-5.7.1-r1.ebuild 3287 BLAKE2B 926b187675d85525e3679a5a95f8c9451bd6e5758ca91d6e65b3341aa624d3c5dbfd2682960ca3d05dc241bde69a447eae8d8d582bb676dd45d7e8b9afc2c47f SHA512 823bfc7f122c9ed91ef3fca2af6ea027b163f1564a87f0d60603348888465770d0c300f97fa46194658dc14002cf78dbb55567c4b4880350f70336788bc1e886
-MISC metadata.xml 549 BLAKE2B 6bf2f670de2b8f61584d0a930dd65c4c36c251a68a232d0de5bdf3a732b242c7cbddff642ee37909fe54506c7f231c86adf53d71816f46469320e90925076fc1 SHA512 f5d23eacb988af92506012ccaa2d32a0b7e3d2c93b10bfce1eee6ac51ae113bc572a39e2386fd4816fe62ed563b0cb384d5480bd2bd44184cf77f5e53d8ded61
+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
+MISC metadata.xml 646 BLAKE2B 76ad8db32707d804dcee5a8ff3adb66444464aa2bef2e3415326b485b67f6b0c26a36e45b30cd632b0e41e96cbcfad9c785f5145ddbf89fcdabe66456b35d22a SHA512 d7b219b8800178385725fc92fe72fe65c291a451963263271731580548e3319f2bac83e73bba66d3a6442aa6f9dfc8ff8955cdbbfd7f057825dda992e8dfe772
diff --git a/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch b/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch
new file mode 100644
index 000000000000..49ec1ccbff3b
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch
@@ -0,0 +1,13 @@
+Normally, MIOpen compiles tests during test phase instead of "compile".
+This patch allows to build testing executables during compile phase.
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -330,7 +330,7 @@ endfunction()
+ separate_arguments(MIOPEN_TEST_FLAGS_ARGS NATIVE_COMMAND ${MIOPEN_TEST_FLAGS})
+ 
+ function(add_test_executable TEST_NAME)
+-    add_executable (${TEST_NAME} EXCLUDE_FROM_ALL ${ARGN})
++    add_executable (${TEST_NAME} ${ARGN})
+     if(WIN32)
+         target_compile_definitions(${TEST_NAME} PRIVATE NOMINMAX)
+     endif()
diff --git a/sci-libs/miopen/metadata.xml b/sci-libs/miopen/metadata.xml
index 08c299887077..e08e7753394d 100644
--- a/sci-libs/miopen/metadata.xml
+++ b/sci-libs/miopen/metadata.xml
@@ -12,7 +12,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/MIOpen</remote-id>
+    <remote-id type="github">ROCm/MIOpen</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/miopen/miopen-5.1.3-r1.ebuild b/sci-libs/miopen/miopen-5.1.3-r1.ebuild
index 2ef5b8fb50b8..7d02435948f7 100644
--- a/sci-libs/miopen/miopen-5.1.3-r1.ebuild
+++ b/sci-libs/miopen/miopen-5.1.3-r1.ebuild
@@ -87,6 +87,7 @@ src_configure() {
 		-DMIOPEN_USE_MLIR=OFF
 		-DBUILD_TESTS=$(usex test ON OFF)
 		-DMIOPEN_TEST_ALL=$(usex test ON OFF)
+		-DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half"
 	)
 
 	if use test; then
diff --git a/sci-libs/miopen/miopen-5.7.1-r1.ebuild b/sci-libs/miopen/miopen-5.7.1-r1.ebuild
index 93bcde8190ae..b13e6354554f 100644
--- a/sci-libs/miopen/miopen-5.7.1-r1.ebuild
+++ b/sci-libs/miopen/miopen-5.7.1-r1.ebuild
@@ -91,6 +91,7 @@ src_configure() {
 		-DBUILD_TESTS=$(usex test ON OFF)
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 		-DROCM_SYMLINK_LIBS=OFF
+		-DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half"
 	)
 
 	if use test; then
diff --git a/sci-libs/miopen/miopen-6.1.1.ebuild b/sci-libs/miopen/miopen-6.1.1.ebuild
new file mode 100644
index 000000000000..7cf62bdcb790
--- /dev/null
+++ b/sci-libs/miopen/miopen-6.1.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+LLVM_COMPAT=( 18 )
+
+inherit cmake flag-o-matic llvm-r1 rocm
+
+DESCRIPTION="AMD's Machine Intelligence Library"
+HOMEPAGE="https://github.com/ROCm/MIOpen"
+SRC_URI="https://github.com/ROCm/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz"
+S="${WORKDIR}/MIOpen-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	>=dev-db/sqlite-3.17
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}]
+	dev-util/roctracer:${SLOT}[${ROCM_USEDEP}]
+	>=dev-libs/boost-1.72
+	dev-cpp/nlohmann_json
+	dev-cpp/frugally-deep
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-libs/half-1.12.0-r1
+	dev-build/rocm-cmake
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-build-all-tests.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/MIOPEN_TIDY_ERRORS ALL/d' \
+		-e 's/FLAGS_RELEASE} -s/FLAGS_RELEASE}/g' \
+		-i CMakeLists.txt || die
+
+	sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" \
+		-i test/CMakeLists.txt || die
+
+	sed -e "s:\${PROJECT_BINARY_DIR}/miopen/include:\${PROJECT_BINARY_DIR}/include:" \
+		-i src/CMakeLists.txt || die
+}
+
+src_configure() {
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		CMAKE_BUILD_TYPE="Release"
+	else
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMIOPEN_BACKEND=HIP
+		-DBoost_USE_STATIC_LIBS=OFF
+		-DMIOPEN_USE_MLIR=OFF
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DMIOPEN_HIP_COMPILER="${ESYSROOT}/usr/bin/hipcc"
+		-DMIOPEN_AMDGCN_ASSEMBLER="$(get_llvm_prefix)/bin/clang"
+		-DHIP_OC_COMPILER="$(get_llvm_prefix)/bin/clang"
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DMIOPEN_TEST_ALL=ON
+			-DMIOPEN_TEST_GDB=OFF
+		)
+		# needed by rocminfo
+		addpredict /dev/random
+		check_amdgpu
+	fi
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}"/lib MIOPEN_SYSTEM_DB_PATH="${BUILD_DIR}"/share/miopen/db/ cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index 9d9423b200c5..3c591309db7a 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -7,12 +7,15 @@ AUX rocBLAS-5.4.2-cpp_lib_filesystem.patch 898 BLAKE2B 403b42f0193f2d21585fe8f8a
 AUX rocBLAS-5.4.2-link-cblas.patch 508 BLAKE2B ab53db7c73cc174039880ebd8987adc88f83d61e84bf024e2a6367f5bc9414ac343843610382bae43b4dcf874f6cf9e91bc3bd865264e37517f280d50881b4ff SHA512 fa91f817a06f517b38d3d3a71110da59d6579bf7915d6f47deefc46c532ca10d17802815662d8909ee52fb155b82339122601793858e52c13c6cc93cac283fc9
 AUX rocBLAS-5.4.2-unbundle-Tensile.patch 1373 BLAKE2B 944771b7511de883aa106016cf59e3cb94248119af472aed75c76c712fc9ee2e9e765d472ef727776d95ee478f1701c12853c37be269ee4940a3cde9e1f41cc7 SHA512 bdf01803a0594b53f248bc57594e7bed2f3f4cc772de8b5a043fa849798887291cb14d273511d33453c0685a113a9064a218a56d57631d2e9c1126eb62853668
 AUX rocBLAS-5.7.1-expand-isa-compatibility.patch 3771 BLAKE2B 3be8a45734c4d3ce0d54981e48685c500d6cf8ba1981b6035f2cb83cad1c221afcf50e5d9fbdaa9966ce64e99845c57b32267adda7983bb9a511fec661a0cfeb SHA512 86eedaa1bf6d0430f4b059d9257539dd95d56bdfc0cb61ceb0d180e29f76e280505c8b0002eba71c8152522c637917cd0b9ac7fb2f07059b3b5b6076f8ac7c59
+AUX rocBLAS-6.0.2-expand-isa-compatibility.patch 3792 BLAKE2B 55a57fad4cce821f83d04156942c33ab1842389dc0c4ad1ceea0c2435a37d9912bf24f0359023735b503bea5505b47e2e707b0798d93cdc5622d34821b1e3950 SHA512 c21de66ddc126b5ac5b588c9e68283e8d32574ec0a28963e62244a176edfb0c9188236a75b3985d2cf9043f4fb919a837326ede94045dce9158e9651228b0c38
 DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fccf1f8829ad41baf15ad31bbbb313b48825841834c7ec1b9f8ece794aebdf9fda42b54a38f642beb1bc1e374f2f3b4e43d8ba9dfd1eb6e3ece5 SHA512 8f6946cf9d68afd195640ae7e0da8dc33341c67f28813813b5361a56531fa2af4453d075703ea52c66d93a1936cf74688b86aa2fa62b52a7ed5f03272290c232
 DIST rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz 1057686 BLAKE2B aa755595bbcd48775713f1d94c18b9bfa6464cae97653dd5beda9e4ed600802b62c4159e6edef7fbd4c92e629bbda1c284e6c48e096c7eaf22bbaad86bdcdace SHA512 cdc928528e7ce5bcc3ae32ec18e3aee48533f24e77c1e42f6e0398858eefebd52b8812caabe01a0ef7fa552e00118b862e025f1675a9642b009f1e38efbcdd53
 DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f
 DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4
 DIST rocm-rocBLAS-5.7.1.tar.gz 55389700 BLAKE2B 9e58b1d29c8a04aa58ce17fdd9b0c2504934261851619dc5b696a04e8c6a79e7c44d86a6db7a9c76a434d76593de8c191cba6f163cf398d01cfc001e5fa32b5a SHA512 cfc73f6c490595a3c153c2ac2a3cb5926c48c2c19baa07ff3dcdf3a7ccaed82cfdff64ed5a3be64c349cb43d654d4b104d9090e2ec9f2061049d6a4921c07722
+DIST rocm-rocBLAS-6.1.1.tar.gz 100103895 BLAKE2B df89a21e47730714b80c62717a86d65ac0d819c2d33b2a3c6252b60b8d7cc9eb5f8f1db27159b0a8dfc87aba7ccad97e2f832bc0044e92d0b69c526d382c745a SHA512 74e847c4ddee16cae7f41e268a815ea03875519c365abe7dfce313a9545df245baa73301b432f64a36cc988281fec7530629a0d72583e9ea287c98ec8a0b3907
 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
-MISC metadata.xml 739 BLAKE2B 38ace9571ca717a5bf7251888b4537522326f34778be98cfe717a06dbbd3a04a2bf905ec1cabafe9bbd3fea90adfb5c25c8b41e46c034a7793363ea5fc0c7f29 SHA512 60f1d5aa2a6ebe17cfcf24780529e1eef521bb7c838e48d18180a52d580cf91430ac1f4fdd0e70b9804ec5f0b5957dbd431149f6e0b0b9033cf8ad683510c582
+EBUILD rocBLAS-6.1.1.ebuild 2833 BLAKE2B 56df33992129fa096291dd2809431de8423ccace0c0ea7ad7162411972ecd9c24460b26b96c29bb0ac6e11407a797222933fe37b06615d62ff6ca214ea75d1de SHA512 b03ccda2a28e6a68081f150a46f248b10fa276d73a2f72d99e9c9203840733b34d114d2f3dfb002cb589b9e3d1dfd9c7bf1d6d9165927ef68d0df35daf567cbd
+MISC metadata.xml 852 BLAKE2B c358ef9128e50c5052fea39876550419dc037a8750c8dd12f10415a02dd2a64893ecd11c4c0ee4acc8db83999a4f709a98da53f6d12f71d0782f98af92a37a96 SHA512 18de129cceb076f84235ccb5706287ee16c5843dab654dc9494013b89b07bbb9f82d1e4980e1c1a8e0c8ce2b0e125633cefef069b0e97b3127e0240071d5a53a
diff --git a/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch b/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch
new file mode 100644
index 000000000000..ca895c4b4ff5
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch
@@ -0,0 +1,96 @@
+--- a/library/src/handle.cpp
++++ b/library/src/handle.cpp
+@@ -21,6 +21,7 @@
+  * ************************************************************************ */
+ #include "handle.hpp"
+ #include <cstdarg>
++#include <cstring>
+ #include <limits>
+ #ifdef WIN32
+ #include <windows.h>
+@@ -80,6 +81,20 @@ static Processor getActiveArch(int deviceId)
+     // strip out xnack/ecc from name
+     std::string deviceFullString(deviceProperties.gcnArchName);
+     std::string deviceString = deviceFullString.substr(0, deviceFullString.find(":"));
++    // coerce to compatible arch
++    int gcnArch = deviceString.substr(0, 3) == "gfx" ? std::stoi(deviceString.substr(3)) : 0;
++    switch(gcnArch)
++    {
++    case 902: case 909: case 912:
++        std::strcpy(deviceProperties.gcnArchName, "gfx900");
++        break;
++    case 1013:
++        std::strcpy(deviceProperties.gcnArchName, "gfx1010");
++        break;
++    case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
++        std::strcpy(deviceProperties.gcnArchName, "gfx1030");
++        break;
++    }
+ 
+     if(deviceString.find("gfx803") != std::string::npos)
+     {
+--- a/library/src/rocblas_auxiliary.cpp
++++ b/library/src/rocblas_auxiliary.cpp
+@@ -24,6 +24,7 @@
+ #include "logging.hpp"
+ #include "rocblas-auxiliary.h"
+ #include <cctype>
++#include <cstring>
+ #include <cstdlib>
+ #include <memory>
+ #include <string>
+@@ -1242,6 +1243,20 @@ std::string rocblas_internal_get_arch_name()
+     hipGetDevice(&deviceId);
+     hipDeviceProp_t deviceProperties;
+     hipGetDeviceProperties(&deviceProperties, deviceId);
++    // coerce to compatible arch
++    int gcnArch = strncmp(deviceProperties.gcnArchName, "gfx", 3) == 0 ? std::stoi(deviceProperties.gcnArchName + 3) : 0;
++    switch(gcnArch)
++    {
++    case 902: case 909: case 912:
++        std::strcpy(deviceProperties.gcnArchName, "gfx900");
++        break;
++    case 1013:
++        std::strcpy(deviceProperties.gcnArchName, "gfx1010");
++        break;
++    case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
++        std::strcpy(deviceProperties.gcnArchName, "gfx1030");
++        break;
++    }
+     return ArchName<hipDeviceProp_t>{}(deviceProperties);
+ }
+ 
+--- a/library/src/tensile_host.cpp
++++ b/library/src/tensile_host.cpp
+@@ -45,6 +45,7 @@ extern "C" void rocblas_shutdown();
+ #include <Tensile/hip/HipUtils.hpp>
+ #include <atomic>
+ #include <complex>
++#include <cstring>
+ #include <exception>
+ #include <future>
+ #include <iomanip>
+@@ -802,6 +803,23 @@ namespace
+                         std::string deviceFullString(prop.gcnArchName);
+                         std::string deviceString
+                             = deviceFullString.substr(0, deviceFullString.find(":"));
++                        // coerce to compatible arch
++                        int gcnArch = deviceString.substr(0, 3) == "gfx" ? std::stoi(deviceString.substr(3)) : 0;
++                        switch(gcnArch)
++                        {
++                        case 902: case 909: case 912:
++                            std::strcpy(prop.gcnArchName, "gfx900");
++                            deviceString = prop.gcnArchName;
++                            break;
++                        case 1013:
++                            std::strcpy(prop.gcnArchName, "gfx1010");
++                            deviceString = prop.gcnArchName;
++                            break;
++                        case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
++                            std::strcpy(prop.gcnArchName, "gfx1030");
++                            deviceString = prop.gcnArchName;
++                            break;
++                        }
+                         m_devicePropMap[deviceString] = std::make_shared<hipDeviceProp_t>(prop);
+                     }
+                 }
diff --git a/sci-libs/rocBLAS/metadata.xml b/sci-libs/rocBLAS/metadata.xml
index 066f5c749e3f..0e8f76b2a76e 100644
--- a/sci-libs/rocBLAS/metadata.xml
+++ b/sci-libs/rocBLAS/metadata.xml
@@ -12,6 +12,10 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <use>
     <flag name="test">Perform rocblas-test to compare the result between rocBLAS and system BLAS.</flag>
     <flag name="benchmark">Build and install rocblas-bench.</flag>
diff --git a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
new file mode 100644
index 000000000000..26bfc2ada24d
--- /dev/null
+++ b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="docs/.doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_VERSION=${PV}
+inherit cmake docs edo multiprocessing rocm
+
+DESCRIPTION="AMD's library for BLAS on ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test video_cards_amdgpu"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+BDEPEND="
+	>=dev-build/rocm-cmake-5.3
+	video_cards_amdgpu? (
+		dev-util/Tensile:${SLOT}
+	)
+	test? ( dev-cpp/gtest )
+"
+
+DEPEND="
+	>=dev-cpp/msgpack-cxx-6.0.0
+	=dev-util/hip-6*
+	test? (
+		virtual/blas
+		dev-cpp/gtest
+		sys-libs/libomp
+	)
+	benchmark? (
+		virtual/blas
+		sys-libs/libomp
+	)
+"
+
+QA_FLAGS_IGNORED="/usr/lib64/rocblas/library/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.2-cpp_lib_filesystem.patch
+	"${FILESDIR}"/${PN}-5.4.2-add-missing-header.patch
+	"${FILESDIR}"/${PN}-5.4.2-link-cblas.patch
+	"${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch
+	)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
+}
+
+src_configure() {
+	addpredict /dev/random
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_WITH_TENSILE="$(usex video_cards_amdgpu)"
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_CLIENTS_TESTS="$(usex test)"
+		-DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark)"
+		-DBUILD_WITH_PIP=OFF
+	)
+
+	if usex video_cards_amdgpu; then
+		mycmakeargs+=(
+			-DTensile_LOGIC="asm_full"
+			-DTensile_COMPILER="hipcc"
+			-DTensile_LIBRARY_FORMAT="msgpack"
+			-DTensile_CODE_OBJECT_VERSION="default"
+			-DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
+			-DTensile_CPU_THREADS="$(makeopts_jobs)"
+		)
+	fi
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_compile() {
+	docs_compile
+	cmake_src_compile
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
+	export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
+	edob "./${PN,,}-test"
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dolib.a clients/librocblas_fortran_client.a
+		dobin clients/staging/rocblas-bench
+	fi
+
+	# Stop llvm-strip from removing .strtab section from *.hsaco files,
+	# otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes
+	dostrip -x "/usr/$(get_libdir)/rocblas/library/"
+}
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index 25de558512b6..bc4c89d928d5 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -5,6 +5,8 @@ AUX rocFFT-5.1.3-unbundle-sqlite.patch 2326 BLAKE2B 5a08f2ec7486f0687c4af46e09a0
 AUX rocFFT-5.7.1-fix-rocm-link-path.patch 492 BLAKE2B daf4d865d8b2b5f3dc97a845f262c266588da910f517e31a10cf7896c6bc1c4fd794c01be39c7aa74d5eb80e4066b8d3dd8a8841210e0075ad4e593dc0f85f66 SHA512 b715c08515b6d289f1b045db7053ff08a27aa9cf940beacba47167a72f168d75f4652d98b33fc2bef303832f0689cf51d71f893e415ba4b4cd7a0f21c677de69
 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
 EBUILD rocFFT-5.1.3-r1.ebuild 3921 BLAKE2B 98eb96a54b1f73e0674299da7300c68ccee073a9a87a27213f865d8cc0b229078416b7fb4a98ade73ea13baa59d3e57c3117c457e59e710177287d726fe6f189 SHA512 a3feeec5c089171f6476bcfe5f1a8d154a1117be087f57151d4efc4403dcefb689dfee8241b7ad3651c8b008106314a7f5f8ae65a5147cc617beef1e63b1b803
 EBUILD rocFFT-5.7.1-r2.ebuild 3945 BLAKE2B e663c5ef2aa609daec68644c943a4b4dbb7963f1506ef6dcd6c907c0b2bf9f5cddb768fb7e37503e5aba02c998655785bb44412205e2c5575fa95cf9b98a4dce SHA512 f49656ba5e5691bd83a3e18c22c343b254bafe3b8ea893b482e32421e6612cd4cb3cf14607751ffd78f8b0bfe56057ad563b624e27036a80b4db4b6e02f94fe9
-MISC metadata.xml 676 BLAKE2B dbf1364ede458c08dde2ebd4a8ca7053a1dc00813f647fc09268ef5a97150945c19b2375f13cc74aec8ff0af831625221bfa675b5ded7769ff5e1a322ae8b5dc SHA512 352c744ece6202b976170615927c09b82513a73669cd5efc5ca626ac2b6929d18f8ecd0b8a91d87bef86aab17713158f1e7efaef0aee01b7ac6e7d6cd2a3a4f3
+EBUILD rocFFT-6.1.1.ebuild 3735 BLAKE2B 4dfc2b602df3707956c3958d6289eb89d9f6e0df1d62faccd9545a2f311ad69304c4a0e2b446bc76076bc5f8922486e72c5ffcc374a1fb2cc0029d793b492cc9 SHA512 a3b20704d3a310106046ea433d93dc23f3365b5848b7e7ece83794960dc07fdb771b27e31d097cde909ee657122246266b92a32527cb307e08f26b755d8bc28a
+MISC metadata.xml 764 BLAKE2B 0490d64e75e9269408f31d4ac87f4845f01a306adf829d57d89401cab19c84412896f351c1dc9f6a918679447f1fe62a7fc958bff9c98f1990fe021f99b35e01 SHA512 0135bae193ac9439a86dca5e26a32366eae7b67175c955aace1a1d620f1df5176a3e3a302a5e6f1e6473777e5b51ab772aa67a01ba023e9c8bbb180352ae8e0b
diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml
index 5774b6a548d7..ab2a20524390 100644
--- a/sci-libs/rocFFT/metadata.xml
+++ b/sci-libs/rocFFT/metadata.xml
@@ -9,11 +9,15 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocFFT</remote-id>
+    <remote-id type="github">ROCm/rocFFT</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install [dyna-]rocfft-rider.</flag>
-        <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install rocfft benchmark tools.</flag>
+    <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
new file mode 100644
index 000000000000..4eef4ea268dc
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=${PV}
+
+inherit cmake check-reqs edo multiprocessing python-r1 rocm
+
+DESCRIPTION="Next generation FFT implementation for ROCm"
+HOMEPAGE="https://github.com/ROCm/rocFFT"
+SRC_URI="https://github.com/ROCm/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask
+RDEPEND="
+perfscripts? (
+	>=media-gfx/asymptote-2.61
+	dev-texlive/texlive-latex
+	dev-tex/latexmk
+	sys-apps/texinfo
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}] )
+${PYTHON_DEPS}"
+
+DEPEND="=dev-util/hip-6*
+	${PYTHON_DEPS}
+	benchmark? (
+		dev-libs/boost
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost
+		>=sci-libs/fftw-3
+		sys-libs/libomp
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+"
+
+BDEPEND="
+	>=dev-build/cmake-3.22
+	dev-build/rocm-cmake
+	dev-db/sqlite
+"
+
+CHECKREQS_DISK_BUILD="7G"
+
+IUSE="benchmark perfscripts test"
+REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+)
+
+required_mem() {
+	if use test; then
+		echo "52G"
+	else
+		if [[ -n "${AMDGPU_TARGETS}" ]]; then
+			# count how many archs user specified in ${AMDGPU_TARGETS}
+			local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1))
+		else
+			# The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future.
+			local NARCH=7
+		fi
+		echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required
+	fi
+}
+
+pkg_pretend() {
+	return # leave the disk space check to pkg_setup phase
+}
+
+pkg_setup() {
+	export CHECKREQS_MEMORY=$(required_mem)
+	check-reqs_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	if use perfscripts; then
+		pushd scripts/perf || die
+		sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir
+		sed -e "/^top/,+1d" -i rocfft-perf suites.py || die
+		sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die
+		sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \
+			-i perflib/pdf.py perflib/generators.py || die
+		popd
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCH=$(usex benchmark ON OFF)
+		-DSQLITE_USE_SYSTEM_PACKAGE=ON
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device
+	edob ./${PN,,}-test
+	edob ./${PN,,}-selftest
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/clients/staging || die
+		dobin dyna-rocfft-bench rocfft-bench
+		dosym dyna-rocfft-bench /usr/bin/dyna-rocfft-rider
+		dosym rocfft-bench /usr/bin/dyna-rocfft-rider
+
+		if ! use perfscripts; then
+			# prevent collision with dev-util/perf
+			rm -rf "${ED}"/usr/bin/perf || die
+		fi
+	fi
+
+	if use perfscripts; then
+		cd "${S}"/scripts/perf || die
+		python_foreach_impl python_doexe rocfft-perf
+		python_moduleinto ${PN}_perflib
+		python_foreach_impl python_domodule perflib/*.py
+		insinto /usr/share/${PN}-perflib
+		doins *.asy suites.py
+	fi
+}
diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest
index 195f501ff097..63daeae9a910 100644
--- a/sci-libs/rocPRIM/Manifest
+++ b/sci-libs/rocPRIM/Manifest
@@ -1,6 +1,8 @@
 AUX rocPRIM-5.7.1-expand-isa-compatibility.patch 1655 BLAKE2B 23392f6237ec706e0763c6165f854b0638757d70b5dc756125b6a5e861f2d5dc9e557362035a57dc2557241a1e32a631cb2e8660d1e8107c73a7aff734af76eb SHA512 f2ffc71c6322b66685de4c78737d546ea27779e36d952d06fd14017e2bf4efb905f2f6da8f56e3a3f5314aa594b624cd3cd9f749bf74c97a425982f264cf82ee
 DIST rocPRIM-5.1.3.tar.gz 374510 BLAKE2B ab6960e7bd2159ac7a0d72ba6d594684f8d47028eca0940eabd35b346ac3d432a734ec575ee71341f339a9d0dead10dfafe81fb651a3b7da681aa900a5132d0e SHA512 54e14f2b40795153b862a64c9b3d336f35feccfda725daad75fae356b0147c577735884b65218c26c370ebec710af0f84aeef3103067a50db077cf9e24d2b64a
 DIST rocPRIM-5.7.1.tar.gz 535649 BLAKE2B 469bf59b5c92c37df96f58bac5a6559dc2cb879e5f82e539881d79bda57d23c25a9b114466042258e87862a88cd53d260155d7785c9a69a1800b0d05e931f56d SHA512 b2f0bc07dbc5cd111dd513f6c05dbc533908c52ea99caf77d6a4dd35db2b28f98c80006bd1f50a232873eab00b70e54231c38bfd1035c8845029d53690fd5e71
+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
-MISC metadata.xml 583 BLAKE2B c7ec5d60d52e656c8e1808803ded22d8a49dba10ea8cfce85c15025cb39ebbc7e66da25c3db8b5281e264167ff860e24ec39ecdab5286a79beaedb4a6d2090b4 SHA512 f89eeedcbfe6a86245fd00bc4114d64b1464d151db3b6b998f5679949310c7513ffdca1c5f320cc7d22f011dc67807d39f5e74e11155b3fbf50f439245e7176b
+EBUILD rocPRIM-6.1.1.ebuild 1536 BLAKE2B 3e96a188cae858765055e6b31daa5f5f92da227f5f782d78b1f9d749a7a80845216ba00031f78b881f2be630839997372d0e0813e3f24a32e1bd5b5d86d5c672 SHA512 a31f2017d7f2fda1cbaebdf3ecdbcaddce1a9d9b1a36f3f8929d628c9f75f873933ae7e1fa07f3ae61fde02f12aa481d0d54d0f3f24f00aabe1b952ac6afecb0
+MISC metadata.xml 672 BLAKE2B 93644f07bd8f34b43e335ec631b69abdfee76bfe55fcccc9c33b772945e72870f4307803a121226d2d87aa55a07f31274f376a6d8a44a9f5996a861d21dc5c38 SHA512 e8f5caa76c96a1ef5affce0a29f07e12fc4a10057c77bbc9f53288fd886488fddde59a713be80fd72dbaa9656abb6d4851995a000e160398c09ed28000a53712
diff --git a/sci-libs/rocPRIM/metadata.xml b/sci-libs/rocPRIM/metadata.xml
index 6d29bd1f8901..b98edd6a4e2b 100644
--- a/sci-libs/rocPRIM/metadata.xml
+++ b/sci-libs/rocPRIM/metadata.xml
@@ -9,10 +9,14 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocPRIM</remote-id>
+    <remote-id type="github">ROCm/rocPRIM</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install benchmark programs.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install benchmark programs.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
new file mode 100644
index 000000000000..cd85f27b6500
--- /dev/null
+++ b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+inherit cmake rocm
+
+DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm"
+HOMEPAGE="https://github.com/ROCm/rocPRIM"
+SRC_URI="https://github.com/ROCm/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz"
+S="${WORKDIR}/rocPRIM-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+
+RDEPEND="dev-util/hip
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )"
+BDEPEND="dev-build/rocm-cmake
+	>=dev-build/cmake-3.22"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch )
+
+src_prepare() {
+	# install benchmark files
+	if use benchmark; then
+		sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \
+			-e "/add_executable/a\  install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	ROCPRIM_USE_HMM="1" cmake_src_test -j1
+}
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index a8e0198de41b..43caf94db9a8 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -6,7 +6,9 @@ DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894
 DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28
 DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5
 DIST rocRAND-5.7.1.tar.gz 23189653 BLAKE2B c70ab6f3b718c2430394f63b93bee15fa72daae704883fdb203b98b0dc4763b46bc27886af64c48bf4ebe8da9b919158b8cd346f70f9b76bf0492ce3b2c1e20e SHA512 4d74bce9fbd3cb45e3f057d38df747270c6986fea7ad524f7a88109b6a53a4ea5dcd60d4bbf2364888501e9444245fb6898bb79fccad0e37b61e819e8c4ed863
+DIST rocRAND-6.1.1.tar.gz 26683143 BLAKE2B 4108584c6372adbf2f9ef887cf1aa08f5afdfa489ba0739d247e693628f3e23978fe023c2896e7bff666b8822b0011fd3f635338b013898f8d76b3f31ec21f6c SHA512 d8df0e6bf843719e59434c952ef56b112ada23d0c226bec9f2974ed762500202ac809f495de61a4086289e35c2f4b670f4ed7dcd7092a158c0a731c368950a44
 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
-MISC metadata.xml 583 BLAKE2B 5713db2187eb2c1c8f40e9f9774215a880b67ad90ffe943f66724619b90cff92ccc06e09e1f6d7092e4d6e374cd26300ca13c8654a3f2ca2cc65d796356b5a42 SHA512 a42e669f1ce6ed3a83a8648f7c43a85cc1223c2bf73fe14e2e06df5c6573dfa55751198b374f151ed36e75ada831406654d7f3d8429e3e05c14036e26057608c
+EBUILD rocRAND-6.1.1.ebuild 1356 BLAKE2B a6cd2febabea79999841a1cdf3973bc6cd0a5ed323b65d906e9c4148d8b0725821fd6c3480d49b54ff6564f4a90ee5c6672d106ff669c2653e981ead0eff8596 SHA512 90f431872013aa462da49b09765ba81ae0e8ad617c9da9bf135a6107911d3fa594d61abaadc02e799d65aa3762c72edc700e4fb7848036dc01a2cd60f49724bd
+MISC metadata.xml 672 BLAKE2B 418c0adb9c54e60ffbcfdc6abf3bee2c7ca17a5d4e4022f84ed9cdd654f6470a2bb2336f6fdf01766f9ff42eb599d1a155fa575a658c1459c3580396a21847c4 SHA512 9be6210f28457c4e71adaabf3f66f0f58bf8f1db78bb69ea43ed9e621d8f8115a04f05d8db7814725198f2a3e70dbcb723d89ccf5b88ed08b090c5f15f6e370f
diff --git a/sci-libs/rocRAND/metadata.xml b/sci-libs/rocRAND/metadata.xml
index 4add606d2dbe..1c9d7fffbee6 100644
--- a/sci-libs/rocRAND/metadata.xml
+++ b/sci-libs/rocRAND/metadata.xml
@@ -9,10 +9,14 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocRAND</remote-id>
+    <remote-id type="github">ROCm/rocRAND</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install benchmark programs.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install benchmark programs.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocRAND/rocRAND-6.1.1.ebuild b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
new file mode 100644
index 000000000000..1cfbcdbd04f3
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCm/rocRAND"
+SRC_URI="https://github.com/ROCm/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1_fix_generator_alignment.patch
+)
+
+RDEPEND="dev-util/hip"
+DEPEND="${RDEPEND}
+	dev-build/rocm-cmake
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )"
+BDEPEND="dev-build/rocm-cmake
+	>=dev-build/cmake-3.22"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/library"
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	ROCRAND_USE_HMM="1" cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/benchmark
+		dobin benchmark_rocrand_*
+	fi
+}
diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index cf0f37d09490..543c7a3b5c20 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -4,7 +4,9 @@ AUX rocSOLVER-5.4.2-libfmt9.patch 1478 BLAKE2B a5f3774483c38bb059873509d326d46a5
 DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753
 DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6
 DIST rocSOLVER-5.7.1.tar.gz 1859403 BLAKE2B f7a40494deda9dd66f2fb2f57e13665688e89e1f82733701ec60a520bc4b9f7d5899ada618a37e73baa3a910757be4f11d5fced5d4d2ad82c56918b34d265511 SHA512 78e0a2b5b069378696afebf5e3e023449b3d7705aa79099eb7721c142d7525255825b41bf413324c33178091315e3909980a1bf0cbb66e0891c85e757858ee1c
+DIST rocSOLVER-6.1.1.tar.gz 2971118 BLAKE2B 2611b6b65704e7cd64df682728013f07d20c6e17e6729cec7befb91dbed57aabaaed2887a252d4ae610fe0bcb336dfcd4b98d63c107694c22e35be06d06363db SHA512 a96901226cbe5b410fa2885023a080b5ca7dc4659be92b363c37e10eba97d3da09d97488ecdc040452a535ad3284017c64b3b68646f258655583302baa009f34
 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
-MISC metadata.xml 761 BLAKE2B 6247276c89fddaf929633dca9a73a6e1a07e0d1fdca8f58d55145e29822917a7fc1a0309632ed9dfe42d57b327bda743be1445f96a86cb557edc7a90f76356cb SHA512 f4eadda6ec691cb0b17969249b4dc18b0fa4f020e929a8ab982e490b1358b569d028f9d054982987d225e88cf3a97914c0557f02381f0272d008dddaed678d36
+EBUILD rocSOLVER-6.1.1.ebuild 1432 BLAKE2B 3a6ff6ec59b749c042241e6e650da23d3afb69cac7b49f9e5bc1e2c52fa54bef0443de18f6f4ee7560b05211145aaa03eab6b3a30afc88c60340aa44dd7459eb SHA512 239f322c030b04ddd92199c13d0cd04f0824ab056fea07d58c2962c1a6127d0f642ddff1b370cf300902815a74f86089de37196dddad00b9302f81c61fa42445
+MISC metadata.xml 846 BLAKE2B 4f740804d76db5a55b3ee7bfc1e4e79edb192a0cb3962bee1e1326af0e1b2cdf9e1e410bf0557d0adc2a8e34592b8bf01eb49b951c50c4af3a97c7275c9e3629 SHA512 c8c0d4b5559b2ebb6323137bb6d7017cf50d674e05fb36533c75d3ffe53711b126798cc787521b0f9920c9e510ac163aaefd723b509fe1563d138f393bccbf2c
diff --git a/sci-libs/rocSOLVER/metadata.xml b/sci-libs/rocSOLVER/metadata.xml
index da8fc11173b1..97b4749ddd6d 100644
--- a/sci-libs/rocSOLVER/metadata.xml
+++ b/sci-libs/rocSOLVER/metadata.xml
@@ -12,11 +12,15 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocSOLVER</remote-id>
+    <remote-id type="github">ROCm/rocSOLVER</remote-id>
   </upstream>
-    <use>
-        <flag name="test">Perform rocsolver-test to compare the result between rocSOLVER and system LAPACK.</flag>
-        <flag name="benchmark">Build and install rocsolver-bench.</flag>
-    </use>
+  <use>
+    <flag name="test">Perform rocsolver-test to compare the result between rocSOLVER and system LAPACK.</flag>
+    <flag name="benchmark">Build and install rocsolver-bench.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
new file mode 100644
index 000000000000..4fe2bbbdaca1
--- /dev/null
+++ b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm
+
+DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform"
+HOMEPAGE="https://github.com/ROCm/rocSOLVER"
+SRC_URI="https://github.com/ROCm/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-rocm-${PV}
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="test benchmark"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]
+	dev-libs/libfmt
+	benchmark? ( virtual/blas )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest
+	>=dev-build/cmake-3.22
+	virtual/blas )"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_SAMPLES=NO
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsolver-bench
+	fi
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index a49bf66b16f3..46296fa11110 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -3,6 +3,7 @@ AUX rocSPARSE-5.0.2-remove-incorrect-assert.patch 1658 BLAKE2B 26aa66d7d61657eb5
 AUX rocSPARSE-5.0.2-remove-matrices-unpacking.patch 1205 BLAKE2B 0d903453692025f6f239c8b5d2f11dd6f9dfe5c09a63395898920326e0dbd6aeff37fdf2dde8e89ea1cbdc60252ab87b7ef020b56a726853d2f7261addcf00c8 SHA512 52ec3913f89f7886d6b8fb9ef54ca313c64e4c9d374507a0d89a8c7cf846e8f8f6b8a4ad266b23015869a79d2eaadb75c5540ca53e40163cb0fbdc2b1819e645
 DIST rocSPARSE-5.1.3.tar.gz 943788 BLAKE2B f9d5fc34d74bc10f3e5bd0a18da41fe9b35a2f01aca3a74979960958fd0e7648fca96493ba9d767119a452dd75ede0733959d0d4bae84615b7a1ff212c8412a3 SHA512 735aa210bbdc3f31b0ed4defe0288606e255788e877f24ed25506d780552a779305fe5bfd692a3e720e9b286073894300fcbcf161d41e1b23abf2110a9536bf3
 DIST rocSPARSE-5.7.1.tar.gz 1167162 BLAKE2B 20ed88c87afbb041a31aa8bf867dca7ee670af093347c9c6a68b0750e70c796e7cfd599f84a58de2b8038f7681524bcb5909230fc340d1575dae3b72089ec650 SHA512 cd48884c51fcddcb26c42920cf477999160b3f06da4ab182f746a18d1fe54f697d89b1e470c550bd2330b26fb596d4a5baadf64366145e0d07f3fd8891f9af59
+DIST rocSPARSE-6.1.1.tar.gz 1367035 BLAKE2B fc981df5913ea527bb4a7d3eba69373ebc7b74319f387e9f42a94feb1ec029ecca15618ea2d5ff7a91cb6e8959f164ab4be57755ee17db5f155f3b0e373cc487 SHA512 f87bd724b92fdb35e1c70cafcf09d95ab65f514bacfe1c59c5f0a2a75a8bae7a7dca2ee093ecd2e05adf542cc00165c0f8bf0a67e98013e2c4c72145ba951db2
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256
@@ -29,4 +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 4962 BLAKE2B 75563a04a39be35abc1dc388026ccba17ed40c389f5c3d6b274035fe06f21cee93d4eb46abaf60e09723243768668ddae38d639b371eec65d0798296862dcbaa SHA512 792b4f541ccb30c32863889565de114a334088e29fadeeee54671a67aa6e69c57ad69054d44a8382bf56cae7af815feea5650f5bafe27348f97f8e9a8f831dd7
 EBUILD rocSPARSE-5.7.1-r2.ebuild 4919 BLAKE2B 68d80886d30d233fdbc601dd5ac0b08f1d3ccc00de1a9bccf79d49012706b9e88a053ee0b99a44d4b87ce8d1fa9f1b1c647d73c678948d61a328eb01b843a2bb SHA512 5007ca4f6b79122fae121ba290356d1f967752a545f89f4263a42cf74b567a4014d32f15761e6d49cb84c1c1d2c05138203cfc292d70ae769d465cadaa0f3f2c
-MISC metadata.xml 580 BLAKE2B be266a810a64b24ad0fdddf97e9ec46036c84e6dc0f7d00bc8e4447062fd78f14d0b73c4dccb542dade7db194b8d9034efd08f518aa913fa5e3ea88ae7972ada SHA512 1063ecc68c4634f2819dcab271fda7d12a32c44074e140503f09b0a80e7d599533f2b3a732215ed66a49b3e653e90c843e0b92c3bf0ec07c0ab749c90d7013ea
+EBUILD rocSPARSE-6.1.1.ebuild 4356 BLAKE2B 266dde88eaaca0bf73c438d5e7126795d0a64f171f1b44445cfa90eba7b160190f24daac96f5a8c42f319b6549cf0c49096b53875ce8b7ee52a86ad375a8968a SHA512 cf940ada8be18c529bb4d7fe943143b07cf217e4efef5e63fe4b98a9827f7b014144772624d052d6c5f8f7d403be4d02c1932b63ed7bb5e4e20e8b2c9068e1ec
+MISC metadata.xml 669 BLAKE2B 62133bd86a945eedaba10a5507a30d2dac62984558e74540860bbde3d12cf971de129d5c6e046b3916f4cf048c60aeb87553385b8f28d50ce0046ec04e90385d SHA512 6717bc1ad49a85001695265b3571c3936da67d3ded431149d6d9c98b094386a8899fcbf2375ca799c3e9c742c48460ac482418a53189097f5a12510f8a3ce628
diff --git a/sci-libs/rocSPARSE/metadata.xml b/sci-libs/rocSPARSE/metadata.xml
index f4e399df67a8..0cc6b903bb24 100644
--- a/sci-libs/rocSPARSE/metadata.xml
+++ b/sci-libs/rocSPARSE/metadata.xml
@@ -9,10 +9,14 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocSPARSE</remote-id>
+    <remote-id type="github">ROCm/rocSPARSE</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install rocblas-bench.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install rocblas-bench.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
new file mode 100644
index 000000000000..093273002e65
--- /dev/null
+++ b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=${PV}
+
+inherit cmake edo python-any-r1 toolchain-funcs rocm
+
+DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
+HOMEPAGE="https://github.com/ROCm/rocSPARSE"
+
+SRC_URI="https://github.com/ROCm/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz
+https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz
+https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz
+)"
+
+S="${WORKDIR}/rocSPARSE-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RDEPEND="=dev-util/hip-6*
+	sci-libs/rocPRIM:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-cpp/gtest
+	>=dev-build/cmake-3.22
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+)
+"
+
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	# use python interpreter specifyied by python-any-r1
+	sed -e "s/\${python}/${EPYTHON}/" \
+	    -i clients/tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	# Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5,
+	# unpack and convert them into csr format
+	# This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage.
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error!
+		edo $(tc-getCXX) deps/convert.cpp -o deps/convert
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./${PN,,}-test
+}
+
+src_install() {
+	cmake_src_install
+
+	# rm unwanted copy
+	rm -rf "${ED}/usr/rocsparse" || die
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsparse-bench
+	fi
+}
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 6643af178e41..61b039b05f9c 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -1,6 +1,8 @@
 AUX rocThrust-4.0-operator_new.patch 1699 BLAKE2B 1f8e4eb035768acd424cc2bae173c2c107b15b7f670c430ff5db5bb3657fdcafcea7933890176537c6147c1bee3cb675464d6d948724ba186868ff277eaa71f2 SHA512 5d9d48561e7feabc9341f13877d7e6bd49b59b140fe249956e87e785ed8afd1222aa1e7d77759af6ad8843e87d21362ba85ac9204bfcf160f30a4bcfb3d2e88b
 DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74
 DIST rocThrust-5.7.1.tar.gz 1122808 BLAKE2B 41a5d57d03c7f95baf861b772c9513c7fbc26eee8a2f388897eb9b9f9fad3cdad81e2a79932c5b9a6d88b4e1596bf64e59e01337943a036ddb792f7b352ecd31 SHA512 52a9640808f0ed78ae2d6f25e741af59ae4e977535a0431f16c0fa1ee9a395e6f389cf29e61c02ac274cf16fcd193e5df6fb2edc340059ab282ed7cd877fc8b4
+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
-MISC metadata.xml 541 BLAKE2B bab886722d16c8fb7095c256dabd189817881b1b9707351efa2d83c327b6a448f7fe829e93c6cc25b3379ae11d121fd6049dcb15d8fa7273bf891f6ae7643a76 SHA512 a3c55751d755b67531a8ba70a6183e50208fe7c5ecf7feb4eef2acb0671803aafe54a6c3d3b430a592e39d3ec15ed964fda3d552c216546af31608cea796a559
+EBUILD rocThrust-6.1.1.ebuild 1306 BLAKE2B 42213722ef4bf3d3e6e47c6a596c75477101e77dab7ccbbf13e5beca42dd85938c7c8ca9c1c7427c05cb00d985c81f3846c24fca8fe5d8e7edde4fe4d93515f8 SHA512 2817565bcdab2c63b91ce55f7a1cdf400d5e57005c47d1d3588ad4eddaeea403af0cf107c5263018e7db60bce2fd65d55bff31b1c7df7658d44406a285f4cb28
+MISC metadata.xml 631 BLAKE2B 99edd995566ee67d4e2fb4fdc67eca30299e81bd657d57c24932b0bc0545c805abce9d2542dfcb9d61d7aa5639ac02dc5385a5d90bfa5fcb757b5fab9f1f11d6 SHA512 bc0f9411724711f1806f1681c6c55877b828807e9deb22123a92b1b1cfc19c2f423ddd111978bf04a3993555cdc984f654c049617e5919e18d09a093c4559136
diff --git a/sci-libs/rocThrust/metadata.xml b/sci-libs/rocThrust/metadata.xml
index 61a33c63bbf4..03efe0482dfe 100644
--- a/sci-libs/rocThrust/metadata.xml
+++ b/sci-libs/rocThrust/metadata.xml
@@ -8,10 +8,14 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/rocThrust</remote-id>
+    <remote-id type="github">ROCm/rocThrust</remote-id>
   </upstream>
-    <use>
-      <flag name="benchmark">Build and install benchmark binary.</flag>
-    </use>
-</pkgmetadata>
+  <use>
+    <flag name="benchmark">Build and install benchmark binary.</flag>
+  </use>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/sci-libs/rocThrust/rocThrust-6.1.1.ebuild b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
new file mode 100644
index 000000000000..7a04d78cbe0f
--- /dev/null
+++ b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="HIP back-end for the parallel algorithm library Thrust"
+HOMEPAGE="https://github.com/ROCm/rocThrust"
+SRC_URI="https://github.com/ROCm/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz"
+S="${WORKDIR}/rocThrust-rocm-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
+	test? ( dev-cpp/gtest )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-build/cmake-3.22"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# 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
+}
diff --git a/sci-libs/rocWMMA/Manifest b/sci-libs/rocWMMA/Manifest
index fcc5b5ff7c23..340a27ed24b0 100644
--- a/sci-libs/rocWMMA/Manifest
+++ b/sci-libs/rocWMMA/Manifest
@@ -1,4 +1,8 @@
 AUX rocWMMA-5.7.1-use-system-googletest.patch 1211 BLAKE2B 2db14b5ef68502ca2aa66507a394eb3959c58802cb6350f40d15c3047d56cab3ee26be3688a4f99b9b7aa3dca687369ebaed0283f2e1af015475147bddc33d7f SHA512 a5d646361a95d96c97c594de4c63dd76d3cb571300446ca90f5b0f5a2e9af5d676fc9cac48b5dd04b921fb34fe951f396a93a7c2e47b09c1f59014a48bc74f7a
+AUX rocWMMA-6.0.2-use-system-googletest.patch 1292 BLAKE2B 358e7024dd80664ffc3f92c0c0442c0a325807cd143135d82c95ab72c006f7607c3ad085db80490dbdb7a1e98908bd6bc827a01f202ca21e03e6b10ffc2e701d SHA512 075da1871a8aabbccaff9155e21be2300c471b52e270c15349359e738c8cd9379bb83aee809a299381370ccc2b8ebe73d52002f5cfcb416aa208d4c910931ce9
+AUX rocWMMA-6.1.1-no-test-install.patch 854 BLAKE2B b8d4c15e578cae34eb116a633819eeb941ec85d98e3209fb0359ae9943e9a82ae905513f9ffdd5eed1f1f33fa613b7acb9544dfd314891863a72c54698d3f9ad SHA512 ae2b22e44092d876ad29c8bcabc01aae2ef4279e0ee8b2e8fa80ff2bae0bf3ef30f8f0d7a3e873d12b8ba876cb3aa7ca8cc4b919167f8d229263fc4f982e3e49
 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
 MISC metadata.xml 468 BLAKE2B 00be6e38c18a77eebb430632acdd9da61aaa299c92cb733735bc7a40e1017e33d778783dd821f4122f46e9f390d7bc37c05c1b43e0abda915586eb83928e5f0a SHA512 9ed778246d9895dfdb2e881b533a2f53a0f6c0361671c33c065ce37e5f2ea4677e9885e28a66466c95e261dea909ec5de9fb79de44d9857520ed269849145247
diff --git a/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch b/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch
new file mode 100644
index 000000000000..de29d5b70410
--- /dev/null
+++ b/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch
@@ -0,0 +1,28 @@
+Add an option to use system PR
+Upstream PR: https://github.com/ROCm/rocWMMA/pull/353
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -29,11 +29,15 @@ include( CMakeDependentOption )
+ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" ON "ROCWMMA_BUILD_TESTS" OFF )
+ cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF )
+ cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF )
++cmake_dependent_option( ROCWMMA_USE_SYSTEM_GOOGLETEST "Use system Google Test library instead of downloading and building it" OFF "ROCWMMA_BUILD_TESTS" OFF )
+ 
+ add_compile_options(-mcmodel=large)
+ add_link_options(-mcmodel=large)
+ 
+ # Test/benchmark requires additional dependencies
++if(ROCWMMA_USE_SYSTEM_GOOGLETEST)
++  find_package(GTest 1.12.1 REQUIRED)
++else()
+ include( FetchContent )
+ 
+ FetchContent_Declare(
+@@ -59,6 +63,7 @@ if(NOT googletest_POPULATED)
+   # Restore shared libs setting
+   set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE)
+ endif()
++endif()
+ 
+ set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
+ set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp
diff --git a/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch b/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch
new file mode 100644
index 000000000000..d4219baf3496
--- /dev/null
+++ b/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch
@@ -0,0 +1,25 @@
+Don't install tests into /usr/bin
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -114,11 +114,6 @@ function(add_rocwmma_test TEST_TARGET TEST_SOURCE)
+   add_test(NAME ${TEST_TARGET} COMMAND ${TEST_TARGET})
+   set_property(TEST ${TEST_TARGET} PROPERTY SKIP_REGULAR_EXPRESSION "no ROCm-capable device" "unsupported host device")
+ 
+-  rocm_install_targets(
+-    TARGETS ${TEST_TARGET}
+-    COMPONENT tests
+-  )
+-
+   get_target_property(EXE_NAME ${TEST_TARGET} RUNTIME_OUTPUT_NAME)
+   if(EXE_NAME STREQUAL "EXE_NAME-NOTFOUND")
+       get_target_property(EXE_NAME ${TEST_TARGET} OUTPUT_NAME)
+@@ -148,9 +143,3 @@ add_subdirectory(gemm)
+ add_subdirectory(unit)
+ add_subdirectory(dlrm)
+ 
+-rocm_install(
+-    FILES "${INSTALL_TEST_FILE}"
+-    DESTINATION "${CMAKE_INSTALL_BINDIR}/${PROJECT_NAME}"
+-    COMPONENT tests
+-    RENAME "CTestTestfile.cmake"
+-)
diff --git a/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
new file mode 100644
index 000000000000..a3f8d61463b1
--- /dev/null
+++ b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+
+inherit cmake rocm flag-o-matic
+
+DESCRIPTION="library for accelerating mixed precision matrix multiply-accumulate operations"
+HOMEPAGE="https://github.com/ROCm/rocWMMA"
+SRC_URI="https://github.com/ROCm/rocWMMA/archive/rocm-${PV}.tar.gz -> rocWMMA-${PV}.tar.gz"
+S="${WORKDIR}/rocWMMA-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+DEPEND="=dev-util/hip-6*"
+
+IUSE_TARGETS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 gfx1102 )
+IUSE_TARGETS=( "${IUSE_TARGETS[@]/#/amdgpu_targets_}" )
+ROCM_USEDEP_OPTFLAGS=${IUSE_TARGETS[*]/%/(-)?}
+ROCM_USEDEP=${ROCM_USEDEP_OPTFLAGS// /,}
+ROCM_REQUIRED_USE=" || ( ${IUSE_TARGETS[*]} )"
+
+BDEPEND="
+	test? (
+		dev-cpp/gtest
+		sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	)
+	dev-build/rocm-cmake
+"
+
+IUSE="${IUSE_TARGETS[*]/#/+} test"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.2-use-system-googletest.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-test-install.patch
+)
+
+src_configure() {
+	# ld.lld bug https://github.com/llvm/llvm-project/issues/61101
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DROCM_SYMLINK_LIBS=OFF
+		-DROCWMMA_BUILD_SAMPLES=OFF
+		-DROCWMMA_BUILD_TESTS="$(usex test)"
+	)
+	use test && mycmakeargs+=(-DROCWMMA_USE_SYSTEM_GOOGLETEST=ON)
+	CC=hipcc CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cmake_src_test -j1
+}
diff --git a/sci-libs/rpp/Manifest b/sci-libs/rpp/Manifest
new file mode 100644
index 000000000000..87c4ef72363a
--- /dev/null
+++ b/sci-libs/rpp/Manifest
@@ -0,0 +1,4 @@
+AUX rpp-6.1.1-skip-install-license.patch 1046 BLAKE2B 3000d90e9d2ccb3191e18cba7b74c4318ded903103cc31a998cca9591297bd3203c578bac2a1415db7980dcd7db0c5678f9f5dbdce66bc0112b4fdbe6405909d SHA512 5b2818a151dd3dd27c1af9ae19a73cbdf3c1bb69ad16d51ad075f50e2488742792bd1ec6f00b38392660e765911942fb41fdea2c5f31bc76998d5f9b5c9fd2db
+DIST rpp-6.1.1.tar.gz 37016755 BLAKE2B 884090ab50e0a4a3aed4e52c5bbd934a8c5b62eca310471c30cf4c5a7cafdd36fed7894320b4d5246620b3c47e90fafd0f8160a7d4ed0295c7668c8d147f4b18 SHA512 a7c10bdd08739eba08209783decf0f4fd7c12194b9ebc63bd16e4cb998645110c089833efb83a77d4bed7f8599cf3a320608be28633f0dc956079f9d70e765f8
+EBUILD rpp-6.1.1.ebuild 2071 BLAKE2B 8be3e4ff071215995b4b0ac07b9d9e2e8f9ad01ebe8d3b7e97ff20861ffae46e0e79cc84f486e33e871fda39159fe5e40b1201d1c2ebc0bdb9c6b07127445cdb SHA512 c617d733d2ab79e6e838a721cf437d0dc187bbf5c3883256cf1a3a29831b777e32be6fcc71d64de266cd9316663717a1c34b8261f4d69f8d97c69e879ee0450c
+MISC metadata.xml 410 BLAKE2B 196192c40a427e78cfb88efe5ba4cd77399a2945bc1c8bb8728f0c43cab51f95ecf992e832c95e6607b48043a04f0680b21cd059cdfca3def9286530a4899e7b SHA512 a66340c6c4d62c10a5fdada9b63cab9784f75973a5132be56e52233341796c93423ed766a58733e3f22091057488aed9e0731e7cedd55caa0721e703df137d31
diff --git a/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch b/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch
new file mode 100644
index 000000000000..2253bb5aed67
--- /dev/null
+++ b/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch
@@ -0,0 +1,17 @@
+Skip installation of license: it will be installed by ebuild to correct place
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -343,13 +343,6 @@ install(FILES ${PROJECT_BINARY_DIR}/include/rpp_backend.h
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/utilities/test_suite/ DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
+ 
+-# set license information
+-set(CPACK_RESOURCE_FILE_LICENSE  "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime)
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan COMPONENT asan)
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-dev COMPONENT dev)
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-test COMPONENT test)
+-
+ # CTest - Needs RPP Installed
+ enable_testing()
+ include(CTest)
diff --git a/sci-libs/rpp/metadata.xml b/sci-libs/rpp/metadata.xml
new file mode 100644
index 000000000000..944efd183177
--- /dev/null
+++ b/sci-libs/rpp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm/rpp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/rpp/rpp-6.1.1.ebuild b/sci-libs/rpp/rpp-6.1.1.ebuild
new file mode 100644
index 000000000000..d38645f9ff56
--- /dev/null
+++ b/sci-libs/rpp/rpp-6.1.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake flag-o-matic rocm
+
+DESCRIPTION="AMD ROCm Performance Primitives (RPP) high-performance computer vision library"
+HOMEPAGE="https://github.com/ROCm/rpp"
+SRC_URI="https://github.com/ROCm/rpp/archive/refs/tags/rocm-${PV}.tar.gz -> rpp-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+# pkgcheck warning: RequiredUseDefaults
+REQUIRED_USE="
+	cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c
+	${ROCM_REQUIRED_USE}
+"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-build/cmake-3.22
+	>=dev-libs/half-1.12.0-r1
+	test? ( dev-cpp/gtest )
+"
+
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-skip-install-license.patch
+)
+
+DOCS=( CHANGELOG.md LICENSE README.md )
+
+rcc_test_wrapper() {
+	local S="${WORKDIR}/${PN}-rocm-${PV}/utilities/rpp-unittests/HIP_NEW"
+	local CMAKE_USE_DIR="${S}"
+	local BUILD_DIR="${BUILD_DIR}/utilities/rpp-unittests/HIP_NEW"
+	cd "${S}" || die
+	$@
+}
+
+src_prepare() {
+	sed -e "s:\${ROCM_PATH}/llvm/bin/clang++:hipcc:" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+	use test && rcc_test_wrapper cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DROCM_PATH=/usr
+		-DBACKEND=HIP
+		-DBUILD_WITH_AMD_ADVANCE=OFF
+	)
+
+	cmake_src_configure
+
+	if use test; then
+		append-cxxflags -I"${S}/include"
+		append-ldflags -L"${BUILD_DIR}/lib64"
+		local mycmakeargs=(-DROCM_PATH=/usr)
+		use test && rcc_test_wrapper cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	use test && rcc_test_wrapper cmake_src_compile
+}
+
+src_test() {
+	check_amdgpu
+
+	cd "${BUILD_DIR}"/utilities/rpp-unittests/HIP_NEW || die
+	for params in "0 0" "0 1" "1 1" "2 1" "5 1" "0 2" "0 3" "0 4" "0 5" "0 8"; do
+		LD_LIBRARY_PATH="${BUILD_DIR}"/lib64 ./uniqueFunctionalities_hip $params || die
+	done
+}
author	V3n3RiX <venerix@koprulu.sector>	2024-06-27 07:59:40 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-06-27 07:59:40 +0100
commit	d2ed973482fdd800013658e83a61709b29e0a80f (patch)
tree	57ea7666a57b5a05a4c8866e4915e90b4a6e7c94 /sci-libs
parent	9f6a82a85d400d6ae7de04c43cee88dbc6bc4da0 (diff)