From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F659158095 for ; Tue, 9 Aug 2022 13:12:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8227E0CBD; Tue, 9 Aug 2022 13:12:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5B6AE0CBD for ; Tue, 9 Aug 2022 13:12:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68027340FAB for ; Tue, 9 Aug 2022 13:12:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0EB2559 for ; Tue, 9 Aug 2022 13:12:08 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1660050719.bb1388ddcba362863ab793817e54f67fbe1e3c85.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-misc/boinc/boinc-7.20.2-r3.ebuild sci-misc/boinc/boinc-9999.ebuild X-VCS-Directories: sci-misc/boinc/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: bb1388ddcba362863ab793817e54f67fbe1e3c85 X-VCS-Branch: master Date: Tue, 9 Aug 2022 13:12:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a0129fea-7686-46d4-93a9-3869f698fc19 X-Archives-Hash: 85f0c4301d7a82144054be8aee4b831f commit: bb1388ddcba362863ab793817e54f67fbe1e3c85 Author: Craig Andrews gentoo org> AuthorDate: Thu Aug 4 14:07:21 2022 +0000 Commit: Craig Andrews gentoo 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/26737 Signed-off-by: Craig Andrews 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(-)]