Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/
Date: Mon, 16 May 2022 05:41:29
Message-Id: 1652678960.436c3cf55dd8a5f8522bc4fee2dd8607d0cbf244.sam@gentoo
1 commit: 436c3cf55dd8a5f8522bc4fee2dd8607d0cbf244
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 16 05:29:20 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 16 05:29:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436c3cf5
7
8 sci-astronomy/siril: fix openmp check
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sci-astronomy/siril/siril-1.0.1.ebuild | 8 ++++++--
13 sci-astronomy/siril/siril-9999.ebuild | 8 ++++++--
14 2 files changed, 12 insertions(+), 4 deletions(-)
15
16 diff --git a/sci-astronomy/siril/siril-1.0.1.ebuild b/sci-astronomy/siril/siril-1.0.1.ebuild
17 index 822c1fba9bfd..e24c4af5709a 100644
18 --- a/sci-astronomy/siril/siril-1.0.1.ebuild
19 +++ b/sci-astronomy/siril/siril-1.0.1.ebuild
20 @@ -3,7 +3,7 @@
21
22 EAPI=8
23
24 -inherit meson xdg
25 +inherit meson toolchain-funcs xdg
26
27 DESCRIPTION="A free astronomical image processing software"
28 HOMEPAGE="https://www.siril.org/"
29 @@ -54,7 +54,11 @@ PATCHES=(
30 DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
31
32 pkg_pretend() {
33 - use openmp && tc-check-openmp
34 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
35 +}
36 +
37 +pkg_setup() {
38 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
39 }
40
41 src_configure() {
42
43 diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
44 index 822c1fba9bfd..e24c4af5709a 100644
45 --- a/sci-astronomy/siril/siril-9999.ebuild
46 +++ b/sci-astronomy/siril/siril-9999.ebuild
47 @@ -3,7 +3,7 @@
48
49 EAPI=8
50
51 -inherit meson xdg
52 +inherit meson toolchain-funcs xdg
53
54 DESCRIPTION="A free astronomical image processing software"
55 HOMEPAGE="https://www.siril.org/"
56 @@ -54,7 +54,11 @@ PATCHES=(
57 DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
58
59 pkg_pretend() {
60 - use openmp && tc-check-openmp
61 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
62 +}
63 +
64 +pkg_setup() {
65 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
66 }
67
68 src_configure() {