Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/libb2/
Date: Sat, 14 May 2022 21:30:43
Message-Id: 1652563806.92c1cf96a0581b3a05a92c1aaf59f757a0777126.soap@gentoo
1 commit: 92c1cf96a0581b3a05a92c1aaf59f757a0777126
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:06 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:06 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c1cf96
7
8 app-crypt/libb2: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 app-crypt/libb2/libb2-0.98.1-r2.ebuild | 11 ++++++-----
13 app-crypt/libb2/libb2-0.98.1-r3.ebuild | 9 +++++----
14 2 files changed, 11 insertions(+), 9 deletions(-)
15
16 diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
17 index e51689e6a0e3..046c9525d1f6 100644
18 --- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
19 +++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2021 Gentoo Authors
22 +# Copyright 1999-2022 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -24,11 +24,12 @@ RDEPEND="${DEPEND}"
27
28 S=${WORKDIR}/${PN}-${GITHASH}
29
30 +pkg_pretend() {
31 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
32 +}
33 +
34 pkg_setup() {
35 - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
36 - ewarn "You are using a compiler without OpenMP support"
37 - die "Need an OpenMP capable compiler"
38 - fi
39 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
40 }
41
42 src_prepare() {
43
44 diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
45 index 24a130333c1a..c0da5c1930f6 100644
46 --- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
47 +++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
48 @@ -26,11 +26,12 @@ S=${WORKDIR}/${PN}-${GITHASH}
49
50 PATCHES=( "${FILESDIR}"/${P}-distcc.patch )
51
52 +pkg_pretend() {
53 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
54 +}
55 +
56 pkg_setup() {
57 - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
58 - ewarn "You are using a compiler without OpenMP support"
59 - die "Need an OpenMP capable compiler"
60 - fi
61 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
62 }
63
64 src_prepare() {