gentoo resync : 25.03.2022

3 files changed, 3 insertions, 126 deletions

diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index b380f561e5e3..80428255e333 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -26,6 +26,5 @@ DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b6
 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD rocSPARSE-4.0.0-r1.ebuild 1166 BLAKE2B fc45fdaaf8d5f20afcc0d477eac01d30100a3ac3355ddae786ee934f46ef55b4f6ac3b284875fc905f75452cbfbb655ad4cfb9f916905e1a6091e8b97a14f141 SHA512 221e3aea6c45e7d7a6edc3b96db32ed9d2deb040f1f4cafa9cbb139a146aa7500d4619e6e8db39683fed9c0bc34053dc8ede22525340457c1774f6ea90297a98
-EBUILD rocSPARSE-4.3.0-r1.ebuild 5018 BLAKE2B 7d529f0964c0953b459d97f20afe94a6f72e00c36cf300e5515d592c581e8cb040795835ecb16067966601d383aac902ac5bec58cd93ce70c5275fc2350c74c6 SHA512 663b7d87202e88f66b8e0236f848cd099426c5467da0c171cba522bfcccdb8ab92a902e721e339983f176a7956f7bd3a0497336bb8eda8573b85f6c50a8c4315
-EBUILD rocSPARSE-4.3.0.ebuild 4557 BLAKE2B 0ca53de6d519bc369b25ba573c6aacc5adf7a554bad514698a719c4794af236909cc4be8650bf84327ed6965d7e86ca9a96fd31240c06a1e49723f7b303001e5 SHA512 f746cda86084c8e6ccfc7ff9635332440663ffec3082ddb78052204f5210110a81edc0fb19d6616166bea1962d20c746e0ee92160468aa670433bfd1d567ba9f
+EBUILD rocSPARSE-4.3.0-r2.ebuild 4922 BLAKE2B dff11f74e26d9f73f44fcb3687e621d7b5f833e20493473350d1dcca4e70af1d3137ac09c03c4d7cda890c0c20a4b0b78068812f6b7879e67463a1880a4471cd SHA512 b65c660c562d831ede3ac4ebf5dfbe968ebc72156020a54861a23ae8fff52125785bf4c3fea3dd0db4d0b968ecf0e68f9d16be6fb38c560ca2056a4e244ea2f9
 MISC metadata.xml 695 BLAKE2B db1c67ff216cd9c9a972c9b388f85f6e762e0a7bddffca1336219ce6ebe39f6a841da4c8c78084d91f48a5bb6a26ad0047a2a1a60915da5110b3a41977f3b641 SHA512 2f246ec382d78e414a00aedcd7a2c871ccf5b74d25d160a0f7d6012feb51c6c12861b5152cac32d3e46d0d1acea7e8b10f42f4b501abb9d778cd3c886331f59c
diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild
index 7c554093db97..208d02f6cc3d 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.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
@@ -48,6 +48,7 @@ RDEPEND="dev-util/hip:${SLOT}
 DEPEND="${RDEPEND}"
 BDEPEND="test? (
 	dev-cpp/gtest
+	>=dev-util/cmake-3.22
 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 )
 benchmark? ( app-admin/chrpath )
@@ -114,7 +115,6 @@ src_configure() {
 		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
 		-DBUILD_CLIENTS_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/rocSPARSE/rocSPARSE-4.3.0.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild
deleted file mode 100644
index 6683c6a0517d..000000000000
--- a/sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE"
-
-SRC_URI="https://github.com/ROCmSoftwarePlatform/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
-)"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-IUSE="benchmark test"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="dev-util/hip:${SLOT}
-	sci-libs/rocPRIM:${SLOT}"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )
-benchmark? ( app-admin/chrpath )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/rocSPARSE-rocm-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.3.0-remove-matrices-unpacking.patch" )
-
-src_prepare() {
-	sed -e "s/PREFIX rocsparse//" \
-		-e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \
-		-e "/rocm_install_symlink_subdir(rocsparse)/d" \
-		-e "s:rocsparse/include:include/rocsparse:" \
-		-i "${S}/library/CMakeLists.txt" || die
-
-	# remove GIT dependency
-	sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die
-
-	# 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}"/matrices
-		# compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error!
-		ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert"
-		$(tc-getCXX) deps/convert.cpp -o deps/convert
-		eend $?
-		find "${WORKDIR}" -maxdepth 2 -name "*.mtx" -print0 |
-			while IFS= read -r -d '' mtxfile; do
-				destination=${BUILD_DIR}/matrices/$(basename -s '.mtx' ${mtxfile}).csr
-				ebegin "Converting ${mtxfile} to ${destination}"
-				deps/convert ${mtxfile} ${destination}
-				eend $?
-			done
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Grant access to the device to omit a sandbox violation
-	addwrite /dev/kfd
-	addpredict /dev/dri/
-
-	# Compiler to use
-	export CXX=hipcc
-
-	local mycmakeargs=(
-		-DBUILD_CLIENTS_SAMPLES=OFF
-		-DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
-		-DCMAKE_SKIP_RPATH="ON"
-		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
-		-DBUILD_CLIENTS_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
-}
-
-src_test() {
-	addwrite /dev/kfd
-	addwrite /dev/dri/
-	cd "${BUILD_DIR}/clients/staging" || die
-	./rocsparse-test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use benchmark; then
-		local rocsparse_bench="${BUILD_DIR}/clients/staging/rocsparse-bench"
-		chrpath -d "${rocsparse_bench}"
-		dobin "${rocsparse_bench}"
-	fi
-}