From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1397101-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 E667A158090
for <garchives@archives.gentoo.org>; Mon, 16 May 2022 05:41:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1EDE5E0905;
Mon, 16 May 2022 05:41:29 +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 07F4FE0905
for <gentoo-commits@lists.gentoo.org>; Mon, 16 May 2022 05:41:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 3D08A3415A9
for <gentoo-commits@lists.gentoo.org>; Mon, 16 May 2022 05:41:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 88567DC
for <gentoo-commits@lists.gentoo.org>; Mon, 16 May 2022 05:41:25 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1652678960.436c3cf55dd8a5f8522bc4fee2dd8607d0cbf244.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-astronomy/siril/siril-1.0.1.ebuild sci-astronomy/siril/siril-9999.ebuild
X-VCS-Directories: sci-astronomy/siril/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 436c3cf55dd8a5f8522bc4fee2dd8607d0cbf244
X-VCS-Branch: master
Date: Mon, 16 May 2022 05:41:25 +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: 0e4763cd-2247-4f31-9b2d-db093b794742
X-Archives-Hash: 737631e3b38d49d97dc3ccdf60c510fe
commit: 436c3cf55dd8a5f8522bc4fee2dd8607d0cbf244
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 05:29:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 16 05:29:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436c3cf5
sci-astronomy/siril: fix openmp check
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-astronomy/siril/siril-1.0.1.ebuild | 8 ++++++--
sci-astronomy/siril/siril-9999.ebuild | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/sci-astronomy/siril/siril-1.0.1.ebuild b/sci-astronomy/siril/siril-1.0.1.ebuild
index 822c1fba9bfd..e24c4af5709a 100644
--- a/sci-astronomy/siril/siril-1.0.1.ebuild
+++ b/sci-astronomy/siril/siril-1.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson xdg
+inherit meson toolchain-funcs xdg
DESCRIPTION="A free astronomical image processing software"
HOMEPAGE="https://www.siril.org/"
@@ -54,7 +54,11 @@ PATCHES=(
DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index 822c1fba9bfd..e24c4af5709a 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson xdg
+inherit meson toolchain-funcs xdg
DESCRIPTION="A free astronomical image processing software"
HOMEPAGE="https://www.siril.org/"
@@ -54,7 +54,11 @@ PATCHES=(
DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {