[gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/

["Florian Schmaus" <flow@gentoo.org>]

commit:     3257d73e3a2bc5076a4ee2646de0ef530dbd36b5
Author:     Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Wed Jul 27 11:48:04 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 08:34:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3257d73e

sci-misc/boinc: Untangle CUDA/OpenCL for nvidia and fix dependencies

* OpenCL is not needed to run CUDA apps
* BOINC can use CUDA via nvidia-drivers, dev-util/nvidia-cuda-toolkit
  is not neccessary
* BOINC can use OpenCL via nvidia-drivers,
  media-gfx/nvidia-cg-toolkit is not neccessary
* USE flag "opencl" pulls in virtual/opencl instead.

Bug: https://bugs.gentoo.org/819378
Closes: https://bugs.gentoo.org/819378
Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sci-misc/boinc/boinc-7.20.2-r2.ebuild | 6 +++---
 sci-misc/boinc/boinc-9999.ebuild      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-misc/boinc/boinc-7.20.2-r2.ebuild b/sci-misc/boinc/boinc-7.20.2-r2.ebuild
index 2375df6ac7ea..5c03102ff4aa 100644
--- a/sci-misc/boinc/boinc-7.20.2-r2.ebuild
+++ b/sci-misc/boinc/boinc-7.20.2-r2.ebuild
@@ -35,7 +35,7 @@ IUSE="${IUSE_VIDEO_CARDS} X cuda curl_ssl_gnutls +curl_ssl_openssl opencl"
 
 REQUIRED_USE="
 	^^ ( curl_ssl_gnutls curl_ssl_openssl )
-	cuda? ( opencl video_cards_nvidia )
+	cuda? ( video_cards_nvidia )
 	opencl? ( || ( ${IUSE_VIDEO_CARDS} ) )
 "
 
@@ -45,13 +45,13 @@ DEPEND="
 	acct-user/boinc
 	app-misc/ca-certificates
 	cuda? (
-		dev-util/nvidia-cuda-toolkit
 		x11-drivers/nvidia-drivers
 	)
 	opencl? (
+		virtual/opencl
 		video_cards_amdgpu?   ( amd64? ( dev-libs/rocm-opencl-runtime ) )
 		video_cards_intel?    ( amd64? ( dev-libs/intel-compute-runtime ) )
-		video_cards_nvidia?   ( x11-drivers/nvidia-drivers media-gfx/nvidia-cg-toolkit )
+		video_cards_nvidia?   ( x11-drivers/nvidia-drivers )
 		video_cards_radeonsi? ( media-libs/mesa[opencl] )
 	)
 	dev-libs/openssl:=

diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild
index 9689e98c8f56..08e8f1f9530c 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-9999.ebuild
@@ -37,7 +37,7 @@ IUSE="${IUSE_VIDEO_CARDS} X cuda curl_ssl_gnutls +curl_ssl_openssl opencl"
 
 REQUIRED_USE="
 	^^ ( curl_ssl_gnutls curl_ssl_openssl )
-	cuda? ( opencl video_cards_nvidia )
+	cuda? ( video_cards_nvidia )
 	opencl? ( || ( ${IUSE_VIDEO_CARDS} ) )
 "
 
@@ -47,13 +47,13 @@ DEPEND="
 	acct-user/boinc
 	app-misc/ca-certificates
 	cuda? (
-		dev-util/nvidia-cuda-toolkit
 		x11-drivers/nvidia-drivers
 	)
 	opencl? (
+		virtual/opencl
 		video_cards_amdgpu?   ( amd64? ( dev-libs/rocm-opencl-runtime ) )
 		video_cards_intel?    ( amd64? ( dev-libs/intel-compute-runtime ) )
-		video_cards_nvidia?   ( x11-drivers/nvidia-drivers media-gfx/nvidia-cg-toolkit )
+		video_cards_nvidia?   ( x11-drivers/nvidia-drivers )
 		video_cards_radeonsi? ( media-libs/mesa[opencl] )
 	)
 	dev-libs/openssl:=