gentoo resync : 20.03.2022

4 files changed, 70 insertions, 71 deletions

diff --git a/sci-libs/clblast/Manifest b/sci-libs/clblast/Manifest
index 900b0cf73a16..a5944c57135c 100644
--- a/sci-libs/clblast/Manifest
+++ b/sci-libs/clblast/Manifest
@@ -1,3 +1,3 @@
-DIST clblast-0.10.0.tar.gz 508763 BLAKE2B 9b0089963e41b0d0f193ec05d3ba31a2b8b1cb70a38fcbf2fb6240d96cfb81d566068a35a9e35014f84196edd4e622befac76d9ba5d49660eda8992be14d622e SHA512 da1fc659dd470c02c25be0a009b7f5e2333bc590715ac6b90e09e57a25d764479d7e4ecf398f17d0ac0e6bb2eaf24c09082c7f047fb7b3044f4a987e294494ee
-EBUILD clblast-0.10.0.ebuild 1531 BLAKE2B 1434744476f6e65ff023fe2d92ceda12e1cf7f4ba276c3fdd24e1e8773afa1253d6d021ba3fe7fc6a34c52c97ba6a88ac2b17ce89bf0be7be99b852a690d07bc SHA512 85e3781571f40ff7c7c0c4fe6af96987d647fe9d85a89df9cdc0ea03594280325cc0a9ccf1aaff4cb777c0bde4cc6fe0e963844562d5ebb863a7afb39d6532ae
-MISC metadata.xml 955 BLAKE2B 88938cf9807aab74913022c3715b9640c85855bc77da89877702400185c02c9e6150fd939a8f018eabd1790c2994e8f2769d04c549ec7812a44a11b7ad9b9920 SHA512 df4013e7119236b8fc4da8ad22b9ed65aa2b155c4cb0286207d1c8dc53c3a1401a8c90a9a374fdcd9da519158c39c12dded9ccec5fbabdb2457788b2172b6ff7
+DIST clblast-1.5.2.tar.gz 419730 BLAKE2B 9954e39b490b75f3d989969260146ff9e9f5311865f13779e0ee8bc70578d6c51fd7c5e27af777a9d6c9703992d5acb164211aec39568f2f0ba1cf10db211b24 SHA512 6693704321bb7623a632ebfc71dcf07bbe4ba6c6f03a2ecf52bc10b401ae546bf82cdd3f6cc28aa9ea10f40dc7b2e86a6530f32cfbd522e24d4cf6a75c8c1100
+EBUILD clblast-1.5.2.ebuild 1320 BLAKE2B 0f0790cc4a4c3efb58c50c054942d2b2fc45b69f24f3dc4fcc35013c6c9442641d63d0ca4d1e4627654e0d75fc8d34b19fdd611b7f317985d04981362f567991 SHA512 e36a668a500acbcdc7a86652b1a75d46777c13a93d9a40e1eac1ca8dec0b89d7f1b41e77512662fbef0f2cea699cf9821425bfeebbafdc623630884d69c2a6db
+MISC metadata.xml 1123 BLAKE2B 76dfa4ab586b6d019a6ab22e8433a226f1bf03caa36da63355a702c47ce1de882b5a7049c872d759f869c679425fb4f4355b3c113dae574f1e77129f5fb30706 SHA512 8e0fbc24d8d8cc8f53869610d9b8533ea590cf1e7f3205445caa371f882efdde84a27abe8510764cd63daef83c4e62439b9e88cf439aacbd998e0f940d965b5d
diff --git a/sci-libs/clblast/clblast-0.10.0.ebuild b/sci-libs/clblast/clblast-0.10.0.ebuild
deleted file mode 100644
index d3ef4a3ebb03..000000000000
--- a/sci-libs/clblast/clblast-0.10.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs
-
-MYPN="CLBlast"
-
-DESCRIPTION="Tuned OpenCL BLAS"
-HOMEPAGE="https://github.com/CNugteren/CLBlast"
-SRC_URI="https://github.com/CNugteren/${MYPN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="client doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/opencl"
-DEPEND="${RDEPEND}
-	test? (
-	  virtual/cblas
-	  virtual/pkgconfig
-	)
-"
-S="${WORKDIR}/${MYPN}-${PV}"
-
-src_prepare() {
-	# no forced optimisation, libdir
-	sed -e 's/-O3//g' \
-		-e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DSAMPLES=OFF
-		-DCLIENTS="$(usex client)"
-		-DTESTS="$(usex test)"
-	)
-	if use test || use client; then
-		mycmakeargs+=(
-			-DNETLIB=ON
-			-DCBLAS_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I cblas| awk '{print $1}' | sed 's/-I//')"
-			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs cblas)"
-			-DREF_LIBRARIES="$($(tc-getPKG_CONFIG) --libs cblas)"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test alltests
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md CONTRIBUTING.md CHANGELOG
-	use doc && dodoc -r doc
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/clblast/clblast-1.5.2.ebuild b/sci-libs/clblast/clblast-1.5.2.ebuild
new file mode 100644
index 000000000000..59f05f82ded7
--- /dev/null
+++ b/sci-libs/clblast/clblast-1.5.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MYPN="CLBlast"
+
+DESCRIPTION="Tuned OpenCL BLAS"
+HOMEPAGE="https://github.com/CNugteren/CLBlast"
+SRC_URI="https://github.com/CNugteren/${MYPN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MYPN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Cuda is still beta, default to opencl
+IUSE="client cuda examples +opencl test"
+REQUIRED_USE="
+	^^ ( cuda opencl )
+	test? ( client )
+"
+# Tests require write access to /dev/dri/renderD...
+RESTRICT="test"
+# RESTRICT="!test? ( test )"
+
+RDEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	client? ( virtual/cblas )
+	opencl? ( virtual/opencl )
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# no forced optimisation, libdir
+	sed -e 's/-O3//g' \
+		-e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g' \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=ON
+		-DSAMPLES="$(usex examples)"
+		-DCLIENTS="$(usex client)"
+		-DNETLIB="$(usex client)"
+		-DTESTS="$(usex test)"
+		-DOPENCL="$(usex opencl)"
+		-DCUDA="$(usex cuda)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README.md ROADMAP.md CONTRIBUTING.md CHANGELOG
+	dodoc -r doc
+}
diff --git a/sci-libs/clblast/metadata.xml b/sci-libs/clblast/metadata.xml
index e02c949bf653..8525f0a2541e 100644
--- a/sci-libs/clblast/metadata.xml
+++ b/sci-libs/clblast/metadata.xml
@@ -18,6 +18,12 @@
     <flag name="client">
       Enable compilation of the clients to test and compare performance with reference libraries
     </flag>
+    <flag name="cuda">
+      Build with support for cuda instead of opencl (beta!)
+    </flag>
+    <flag name="opencl">
+      Build with support for opencl
+    </flag>
   </use>
   <upstream>
     <remote-id type="github">CNugteren/CLBlast</remote-id>