gentoo resync : 12.05.2022

3 files changed, 15 insertions, 13 deletions

diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 135c25d12f73..f929f866144d 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -2,7 +2,8 @@ AUX rocThrust-4.0-operator_new.patch 1699 BLAKE2B 1f8e4eb035768acd424cc2bae173c2
 AUX rocThrust-4.3.0-deprecate-hcc_detail.patch 492 BLAKE2B cde3fb2210e482f6b76e2d38375141b11998c05101518dbc5d75c34da3343dae6448c88cb27e5d67b23cd986f712651f9cc8fe7632b8440bc171385ed1da6de2 SHA512 5f2783ae20d4870860c812b3b996ef6b7aeb7f45bfba5482b80eba3acb9347fd3bf63e8acae21a69f700721371eb1f3a115a0f59a5f93941fe3af8990d2f9ca9
 DIST rocThrust-4.0.0.tar.gz 1166346 BLAKE2B 02c89e0c4ab2c888a20b7c956a73012157f2735e6ec76369a1f75fbc17bb3f995d1914106ec58562f28243fbe5f019ac230ac3313b6aacb4d8b868f3ac1f091e SHA512 476aa5706487c5801cc91908806a1a1fcb550171f63e0b2debd9b59b18c7435c484578ec456ccfabc140dd7bca7d9bb432a7ba223946b1fca22e72e7d053af2d
 DIST rocThrust-4.3.0.tar.gz 1156832 BLAKE2B a462cfaa31883253fabba584ca77622cc5a7234bd9979472a84ec77b91c60f48f1064149b86d624aaedd70262fb65fb6aadb03cc6e00939d4eed6cd11bfc0090 SHA512 8c6aa3aefd59c87cc8278930bf90021867f519c356c86a3c3ebfcdf90887b8631250b6a9a8156f77c0cbf7ddbad7881e5e1b802f1cd1305cc3a2e7d95ef4e6f3
+DIST rocThrust-5.0.2.tar.gz 1183550 BLAKE2B 88021266dc9ffcb8f5e803acfe767c52aaa04b2348d0dcb204eb74bdf44ed26eb6d98f8d85324b90fe73228b52a0ad22686b87274c868ef19ec8ded825b58ea9 SHA512 3599b9498db392d480c08873d9e84ff1c05e5417e14e43e56f190fe4490873fec37c944a3c252942d6275a4fa4af85c82d39b62b0fdb5daa82023a2df8a3228f
 EBUILD rocThrust-4.0.0-r1.ebuild 1244 BLAKE2B 4f8019ccf296a915a305a405d3e80d2de348ac7717782671b76306882872a6e356bdbdb63316094ce8ccc8410fced42db56423b4d96f8d690ec6838d3721612e SHA512 40671932493ab5a2a2597a4181d03c666a9272ed881d053ecc8d8285aa8a5b68b9527b4fa0e29b6acff3f31fdfafd9cc060b9e098b16a12a7370eaa37542f5de
-EBUILD rocThrust-4.3.0-r1.ebuild 2062 BLAKE2B 15a1efc0555989c16108f62d6c6c689fac172101565e771f32c36c5765a10105a7fd78cb90098e3746928b35271e3652b1a6880f451f087dc731950e237de40d SHA512 476c3cedfb959ff5764aa2893810ed9a09db58c172cc36ae91f215a35efb13354f3a363be6bd2ac1d5987739028930ce9d4ba73e36699973b7c413215462f713
-EBUILD rocThrust-4.3.0.ebuild 2082 BLAKE2B 414354d8137a09e987b908bc901d404c0025cdd77df7753a602a04b14391637f9c04cb831f0819f61b53b01e12ad01e883547fb7135034dee57a4cd22980b444 SHA512 77fbb475bceb103df10f6dfe50fc74631337fb6e72473edb7a3db03f98ce5f1f66458a501cde22f6c79232107b810a0496323166fd11814e4ee4b694f8206a4d
+EBUILD rocThrust-4.3.0-r2.ebuild 1992 BLAKE2B 67a34d8a87ede7599a72217dbcb97541dc498ca1523569b275e3f2673f2ce0236affe9ef33e04c5c37565f0a875222540c9269bea202fb4f58c14b9791f71cad SHA512 b183e41584615b0ee97ee1ec8401f83d3f229abec959e948e50b06b1b5b4449b8af1ed709ab1e1d402f62af1c2dbd42dd0bfaf3c0bf94bdebe251e7c91aa159f
+EBUILD rocThrust-5.0.2.ebuild 1953 BLAKE2B 90a7a87091b47fc790d3c90138bfd97044c4529b59ccbde5fccfb89d88d33acacea99ab5c8910ffd8ade670a1da2aa4b851a19f8dffeed7b139c03d40dee07b7 SHA512 b24a9ab688a4dab197dd9666f39f16e1e3ab498f10789563b6fe983691d7106785992fb0db6577f8336f4e150b957a79d20f368a44844ab2895c2df827b53282
 MISC metadata.xml 656 BLAKE2B cdcee7af9e0c2f8e0553cc0d41ea208dbaa27aae0847f90b048e4c8791a9be511a84c7fb5ba8dc4c0409266d5a8a855fd4ebf578ad55c5882a000fbb4c5b05c0 SHA512 adefa0bbe1487a7c29a3b175c8d27e694c5464b0f7a3f20afcfd07952ef95cb54a789f7ae174053493d893338f52cf175f4b1939b998e850b62a7fd435dc592a
diff --git a/sci-libs/rocThrust/rocThrust-4.3.0-r1.ebuild b/sci-libs/rocThrust/rocThrust-4.3.0-r2.ebuild
index fc6045bf31f2..ff4a85ba172d 100644
--- a/sci-libs/rocThrust/rocThrust-4.3.0-r1.ebuild
+++ b/sci-libs/rocThrust/rocThrust-4.3.0-r2.ebuild
@@ -16,9 +16,11 @@ IUSE="benchmark test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocPRIM:${SLOT}"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND=">=dev-util/cmake-3.22"
 
 S="${WORKDIR}/rocThrust-rocm-${PV}"
 
@@ -56,7 +58,6 @@ src_configure() {
 		-DBUILD_TEST=$(usex test ON OFF)
 		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
 		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
 	)
 
 	cmake_src_configure
diff --git a/sci-libs/rocThrust/rocThrust-4.3.0.ebuild b/sci-libs/rocThrust/rocThrust-5.0.2.ebuild
index 5063cf4dbce5..8e043631657f 100644
--- a/sci-libs/rocThrust/rocThrust-4.3.0.ebuild
+++ b/sci-libs/rocThrust/rocThrust-5.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -17,19 +17,20 @@ IUSE="benchmark test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-util/hip:${SLOT}
-	sci-libs/rocPRIM:${SLOT}"
+	sci-libs/rocPRIM:${SLOT}
+	test? ( dev-cpp/gtest )"
 DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/cmake-3.22"
 
 S="${WORKDIR}/rocThrust-rocm-${PV}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch"
-	"${FILESDIR}/${P}-deprecate-hcc_detail.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" )
 
 src_prepare() {
 	sed -e "/PREFIX rocthrust/d" \
-		-e "/DESTINATION/s:rocthrust/include/thrust:include/rocthrust/thrust:" \
+		-e "/DESTINATION/s:rocthrust/include/thrust:include/thrust:" \
 		-e "/rocm_install_symlink_subdir(rocthrust)/d" \
-		-e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/rocthrust/:" -i thrust/CMakeLists.txt || die
+		-e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/:" -i thrust/CMakeLists.txt || die
 
 	sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/rocthrust:" \
 		-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
@@ -56,7 +57,6 @@ src_configure() {
 		-DBUILD_TEST=$(usex test ON OFF)
 		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
 		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
 	)
 
 	cmake_src_configure