[gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/

[David Seifert]

commit:     cc1873206d3ed3507221a9fdba01f6702c447ee7
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:13 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:30:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc187320

media-gfx/luminance-hdr: [QA] tc-has-openmp → tc-check-openmp

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild | 16 +++++++++-------
 media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild  | 14 ++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild 
b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
index 0a3b97a457c2..fe779b1d1abb 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,14 @@ PATCHES=(
 )
 
 pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
        if use cpu_flags_x86_sse2 ; then
                append-flags -msse2
        else
@@ -63,12 +71,6 @@ pkg_pretend() {
                die "SSE2 support missing"
        fi
 
-       if use openmp ; then
-               tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-       fi
-}
-
-src_configure() {
        local mycmakeargs=(
                $(cmake_use_find_package fits CFITSIO)
                -DUSE_OPENMP="$(usex openmp)"

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild 
b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
index 063d91bee932..03ff1211b910 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
@@ -57,6 +57,14 @@ PATCHES=(
 )
 
 pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
        if use cpu_flags_x86_sse2 ; then
                append-flags -msse2
        else
@@ -64,14 +72,8 @@ pkg_pretend() {
                die "SSE2 support missing"
        fi
 
-       if use openmp ; then
-               tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-       fi
-
        append-flags -std=c++17
-}
 
-src_configure() {
        local mycmakeargs=(
                $(cmake_use_find_package fits CFITSIO)
                -DUSE_OPENMP="$(usex openmp)"