[gentoo-commits] repo/gentoo:master commit in: sci-biology/velvet/

[Sam James]

commit:     db6cf7a1354743f4de574963a6d3cb409138896c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 10:44:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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} )