gentoo resync : 12.05.2022

3 files changed, 79 insertions, 3 deletions

diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index 053911d0ddf3..1667787d0e08 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-4.0.0.tar.gz 137513 BLAKE2B b7ef4d53037fba04771162ae8993def648f5e1401654286ffc6987bbb4b25baa1b1b14bc37035e1afe46eeffe3e564f244e339cdfd0e5a242574d248bf4683db SHA512 e778b94c86e09bf3b0bc043fb15ed8725387b875e8631a7e8599aee8da2d8085190effc9681d742fc0d286cc0c20762341f1f24699c8a52e9734611c716530d5
 DIST hipCUB-4.3.0.tar.gz 154097 BLAKE2B 68a46f1416c969e4bf8e245c2aa8aee626f1e8089182ffb8f5090d540efe98606a616499d52b14da3733b3a6f4da690ea1718ea58fb6166351f4b4807f1b8228 SHA512 7c0abcf034d885615a9a4f05e6ca906e99b0ffbe36ae3d4b9d9d79b01d21077dc86be659548b45dad8498b84bec24dc0a5be78040c1ab21ca458d22fa7fae43d
+DIST hipCUB-5.0.2.tar.gz 243032 BLAKE2B 68256c0868bd23dbd78075ab286fc0738dc90f330a7e99186803e7920b3366f5608986dd9e3f4c5a045f9ec3f2461a66ab5b708d5d1d3fc748d042dd929a7993 SHA512 ae4d55fcf513eb5dd1316e335a0de30f6098eba70e877b41905bc59f3fb500ad9a46a28de77b74b914a15ffc38ad5c5f4dbdf36139505c26b94c43ffa5c90e01
 EBUILD hipCUB-4.0.0-r1.ebuild 1099 BLAKE2B 93fb8305ce51fa26eae6be6d26ef05fa5916c7c7f8975d1694209e25d9bb5d69b55ef45175b65a957b79b32f61de6a76b7661f1cca1e2248dce0ce3b7048e6e5 SHA512 59440f40bc7f8600665c30f6098afd18d9219ad9e18db2a43edf654ad4a3d86241f0e12680721d16d056573d690ceae96f0bcb08b6d251d7963c829c9807fa3b
-EBUILD hipCUB-4.3.0.ebuild 2100 BLAKE2B 662199083665c19b5af56354dab656f55e8a814d08bab527e2a54a6dd36ffba6ccc0ee89a350337561263464dfab3fcf673b1f0f37454bf725f1723a520535c9 SHA512 44699b75b4be7ed839971d1de56f72bb04a9bde58d0d5d9526d3ecf58a05e56c32134d36982e34b9e5ff7d6a4e78af76c31f759b78d58ae3a321b5646bf40502
+EBUILD hipCUB-4.3.0-r1.ebuild 2092 BLAKE2B b5c4dcaa01e66cb04e946492048ccb2f412f50c6e244b8d9493dd539feec633dd2365de878e33a8e99e9d2970d639b424f7f0cb7b7aca9df256504564fd7b2e3 SHA512 b0a9f49b805fc4863732fd208cff95a2421ab332f623eb3d8dd6312bf273e663f36ba37fa196a0ac9506f13cf55dabd0757480408bf8c63c0b2cf0b75a56165e
+EBUILD hipCUB-5.0.2.ebuild 1980 BLAKE2B ecc6d6ad49c835b120300c112895a661d9a123ac9bedfe293ed435e9960c1324b44875a667406bfabf8c1c4586740c5748eac189f2c5b9cbe7cd45842f99576f SHA512 e3e5ef45778e10426693c0bf9c01183ad58f49ec0cace2a065af848e29ffe67685c9abb5cc900b185bd03af092d1f0a7697b503beee6d5cd627838b169f8f2c8
 MISC metadata.xml 625 BLAKE2B 7f927357a005110b37accb6841e4248e22e8080d0e0d6eb28e50e96c84807f663faf2f85dd222e5f5af448211cc05004d371a6d57ac6f17393609e76980bda81 SHA512 7d16cebc8c7df7dcc5d63e02e88e9d16d2321485de688621fd8628b8473d5ae614d63b0578363ee3b47f5e0aa7f45da9a00950b6a09a8cc9c6e3c77ae856c798
diff --git a/sci-libs/hipCUB/hipCUB-4.3.0.ebuild b/sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
index 0b57014f6d15..65b61c2352cc 100644
--- a/sci-libs/hipCUB/hipCUB-4.3.0.ebuild
+++ b/sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="benchmark test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocPRIM:${SLOT}
 	benchmark? ( dev-cpp/benchmark )"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/hipCUB/hipCUB-5.0.2.ebuild b/sci-libs/hipCUB/hipCUB-5.0.2.ebuild
new file mode 100644
index 000000000000..176c254b3384
--- /dev/null
+++ b/sci-libs/hipCUB/hipCUB-5.0.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipCUB"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/hipCUB-rocm-${PV}"
+
+PATCHES="${FILESDIR}/${PN}-4.3.0-add-memory-header.patch"
+
+src_prepare() {
+	sed -e "/PREFIX hipcub/d" \
+		-e "/DESTINATION/s:hipcub/include/:include/:" \
+		-e "/rocm_install_symlink_subdir(hipcub)/d" \
+		-e "/<INSTALL_INTERFACE/s:hipcub/include/:include/hipcub/:" -i hipcub/CMakeLists.txt || die
+
+	sed	-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	# disable downloading googletest and googlebenchmark
+	sed  -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# remove GIT dependency
+	sed  -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	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
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	MAKEOPTS="-j1" cmake_src_test
+}