From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1352854-garchives=archives.gentoo.org@lists.gentoo.org>
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 552A1158086
for <garchives@archives.gentoo.org>; Sun, 26 Dec 2021 14:14:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 632142BC025;
Sun, 26 Dec 2021 14:14:53 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 90AF52BC025
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 14:14:52 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B07F1342CBE
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 14:14:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 22C821FB
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 14:14:49 +0000 (UTC)
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
Message-ID: <1640528080.24f95ca3827040b3cac0d00bdd1f3ad010693fd8.andrewammerlaan@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/relion/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-chemistry/relion/metadata.xml sci-chemistry/relion/relion-3.1.1.ebuild
X-VCS-Directories: sci-chemistry/relion/
X-VCS-Committer: andrewammerlaan
X-VCS-Committer-Name: Andrew Ammerlaan
X-VCS-Revision: 24f95ca3827040b3cac0d00bdd1f3ad010693fd8
X-VCS-Branch: master
Date: Sun, 26 Dec 2021 14:14:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5ef5ea9c-0820-4175-85c9-64d54251d769
X-Archives-Hash: 6e75dfa99dc534c6d44e8c629ce2c02f
commit: 24f95ca3827040b3cac0d00bdd1f3ad010693fd8
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 14:14:40 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 14:14:40 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=24f95ca3
sci-chemistry/relion: drop USE cuda
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-chemistry/relion/metadata.xml | 1 -
sci-chemistry/relion/relion-3.1.1.ebuild | 18 ++++++++----------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/sci-chemistry/relion/metadata.xml b/sci-chemistry/relion/metadata.xml
index 8fe354309..cdabe7f2c 100644
--- a/sci-chemistry/relion/metadata.xml
+++ b/sci-chemistry/relion/metadata.xml
@@ -11,6 +11,5 @@
</maintainer>
<use>
<flag name="gui">Enable relion gui</flag>
- <flag name="cuda">Enable CUDA support</flag>
</use>
</pkgmetadata>
diff --git a/sci-chemistry/relion/relion-3.1.1.ebuild b/sci-chemistry/relion/relion-3.1.1.ebuild
index db5753988..39e4ab229 100644
--- a/sci-chemistry/relion/relion-3.1.1.ebuild
+++ b/sci-chemistry/relion/relion-3.1.1.ebuild
@@ -12,20 +12,18 @@ SRC_URI="https://github.com/3dem/relion/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+gui cuda"
+IUSE="+gui"
DEPEND="
- gui? ( x11-libs/fltk )
- dev-cpp/tbb
- sci-libs/fftw:3.0
- media-libs/tiff
- virtual/mpi
- cuda? ( dev-util/nvidia-cuda-toolkit )
- "
+ gui? ( x11-libs/fltk )
+ dev-cpp/tbb
+ sci-libs/fftw:3.0
+ media-libs/tiff
+ virtual/mpi
+"
RDEPEND="
${DEPEND}
sci-chemistry/ctffind
- cuda? ( sci-chemistry/MotionCor2 )
"
BDEPEND="${DEPEND}"
@@ -37,7 +35,7 @@ src_configure() {
-DFORCE_OWN_FFTW=OFF
-DFORCE_OWN_FLTK=OFF
-DFORCE_OWN_TBB=OFF
- -DCUDA=$(usex cuda)
+ -DCUDA=OFF
-DGUI=$(usex gui)
)
cmake_src_configure