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 A6C721581D3 for ; Wed, 8 May 2024 10:45:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2B47E2D54; Wed, 8 May 2024 10:45:45 +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 B400FE2D54 for ; Wed, 8 May 2024 10:45:45 +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 A7ECB3431AC for ; Wed, 8 May 2024 10:45:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 086D91A43 for ; Wed, 8 May 2024 10:45:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1715165115.db6cf7a1354743f4de574963a6d3cb409138896c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/velvet/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/velvet/velvet-1.2.10.ebuild X-VCS-Directories: sci-biology/velvet/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: db6cf7a1354743f4de574963a6d3cb409138896c X-VCS-Branch: master Date: Wed, 8 May 2024 10:45:43 +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: dab1c966-0087-4507-8493-9830ae333bce X-Archives-Hash: d4a85368ca52991a734e1f6e59af6619 commit: db6cf7a1354743f4de574963a6d3cb409138896c Author: Sam James gentoo org> AuthorDate: Wed May 8 10:44:56 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 8 10:45:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6cf7a1 sci-biology/velvet: fixup whitespace & openmp check Signed-off-by: Sam James gentoo.org> sci-biology/velvet/velvet-1.2.10.ebuild | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/sci-biology/velvet/velvet-1.2.10.ebuild b/sci-biology/velvet/velvet-1.2.10.ebuild index bb1a0b441b1e..07b44eb65254 100644 --- a/sci-biology/velvet/velvet-1.2.10.ebuild +++ b/sci-biology/velvet/velvet-1.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,17 +16,26 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc openmp" -BDEPEND="doc? ( virtual/latex-base ) - openmp? ( - || ( - sys-devel/gcc[openmp] - sys-devel/clang-runtime[openmp] - ) - ) +BDEPEND=" + doc? ( virtual/latex-base ) + openmp? ( + || ( + sys-devel/gcc[openmp] + sys-devel/clang-runtime[openmp] + ) + ) " PATCHES=( "${FILESDIR}/${P}-incompatible-pointers.patch" ) +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + src_prepare() { default if ! use doc; then @@ -58,7 +67,7 @@ src_prepare() { CFLAGS="${CFLAGS}" OPT="${CFLAGS}" ) - use openmp && MAKE_XOPTS+=( OPENMP=1 ) && tc-check-openmp + use openmp && MAKE_XOPTS+=( OPENMP=1 ) [[ ! -z "${VELVET_MAXKMERLENGTH}" ]] && MAKE_XOPTS+=( MAXKMERLENGTH=${VELVET_MAXKMERLENGTH} ) [[ ! -z "${VELVET_CATEGORIES}" ]] && MAKE_XOPTS+=( CATEGORIES=${VELVET_CATEGORIES} ) [[ ! -z "${VELVET_BIGASSEMBLY}" ]] && MAKE_XOPTS+=( BIGASSEMBLY=${VELVET_BIGASSEMBLY} )