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

["Craig Andrews" <candrews@gentoo.org>]

commit:     bb1388ddcba362863ab793817e54f67fbe1e3c85
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 14:07:21 2022 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Aug  9 13:11:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1388dd

sci-misc/boinc: remove VIDEO_CARDS USE flag

Closes: https://bugs.gentoo.org/863617
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26737
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../{boinc-9999.ebuild => boinc-7.20.2-r3.ebuild}  | 22 +++-------------------
 sci-misc/boinc/boinc-9999.ebuild                   | 15 +--------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-7.20.2-r3.ebuild
similarity index 88%
copy from sci-misc/boinc/boinc-9999.ebuild
copy to sci-misc/boinc/boinc-7.20.2-r3.ebuild
index bb39d825d04c..7cc390819f18 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-7.20.2-r3.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=8
 
-# For live ebuilds this should be set to the latest available patch in ${FILESDIR}
-# It does not need to reflect the actual internal version reported by BOINC unless that patch is broken.
-MY_PV=7.18
+MY_PV=$(ver_cut 1-2)
 WX_GTK_VER=3.0-gtk3
 
 inherit autotools desktop flag-o-matic linux-info optfeature wxwidgets xdg-utils
@@ -26,19 +24,10 @@ fi
 LICENSE="LGPL-3"
 SLOT="0"
 
-IUSE_VIDEO_CARDS="
-		video_cards_amdgpu
-		video_cards_intel
-		video_cards_nvidia
-		video_cards_radeonsi
-"
-
-IUSE="${IUSE_VIDEO_CARDS} X cuda curl_ssl_gnutls +curl_ssl_openssl opencl"
+IUSE="X cuda curl_ssl_gnutls +curl_ssl_openssl opencl"
 
 REQUIRED_USE="
 	^^ ( curl_ssl_gnutls curl_ssl_openssl )
-	cuda? ( video_cards_nvidia )
-	opencl? ( || ( ${IUSE_VIDEO_CARDS} ) )
 "
 
 # libcurl must not be using an ssl backend boinc does not support.
@@ -51,14 +40,9 @@ DEPEND="
 	)
 	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 )
-		video_cards_radeonsi? ( media-libs/mesa[opencl] )
 	)
 	dev-libs/openssl:=
 	net-misc/curl[curl_ssl_gnutls(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-	sys-apps/util-linux
 	sys-libs/zlib
 	X? (
 		dev-libs/glib:2
@@ -86,7 +70,7 @@ RDEPEND="
 
 PATCHES=(
 	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
-	"${FILESDIR}"/${PN}-${MY_PV}-fix_webview.patch
+	"${FILESDIR}"/${PN}-7.18-fix_webview.patch
 )
 
 pkg_setup() {

diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild
index bb39d825d04c..50cb69b384db 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-9999.ebuild
@@ -26,19 +26,10 @@ fi
 LICENSE="LGPL-3"
 SLOT="0"
 
-IUSE_VIDEO_CARDS="
-		video_cards_amdgpu
-		video_cards_intel
-		video_cards_nvidia
-		video_cards_radeonsi
-"
-
-IUSE="${IUSE_VIDEO_CARDS} X cuda curl_ssl_gnutls +curl_ssl_openssl opencl"
+IUSE="X cuda curl_ssl_gnutls +curl_ssl_openssl opencl"
 
 REQUIRED_USE="
 	^^ ( curl_ssl_gnutls curl_ssl_openssl )
-	cuda? ( video_cards_nvidia )
-	opencl? ( || ( ${IUSE_VIDEO_CARDS} ) )
 "
 
 # libcurl must not be using an ssl backend boinc does not support.
@@ -51,10 +42,6 @@ DEPEND="
 	)
 	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 )
-		video_cards_radeonsi? ( media-libs/mesa[opencl] )
 	)
 	dev-libs/openssl:=
 	net-misc/curl[curl_ssl_gnutls(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]