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/johntheripper-jumbo/
Date: Sat, 14 May 2022 21:30:39
Message-Id: 1652563804.f7ef3949041a92d4d9aadd8f26c33ac8f6d23198.soap@gentoo
1 commit: f7ef3949041a92d4d9aadd8f26c33ac8f6d23198
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:04 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ef3949
7
8 app-crypt/johntheripper-jumbo: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 .../johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild | 10 ++++++----
13 .../johntheripper-jumbo-1.9.0_p20210920.ebuild | 10 ++++++----
14 .../johntheripper-jumbo-1.9.0_p20211129.ebuild | 8 +++++---
15 app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild | 8 +++++---
16 4 files changed, 22 insertions(+), 14 deletions(-)
17
18 diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
19 index 632f59d7a16f..f17408ea8cf3 100644
20 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
21 +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2021 Gentoo Authors
24 +# Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28 @@ -45,10 +45,12 @@ PATCHES=(
29 "${FILESDIR}/${P}-gcc11.patch"
30 )
31
32 +pkg_pretend() {
33 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
34 +}
35 +
36 pkg_setup() {
37 - if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
38 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
39 - fi
40 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
41 }
42
43 src_prepare() {
44
45 diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
46 index df228200cfd7..a77f1fbf4199 100644
47 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
48 +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
49 @@ -1,4 +1,4 @@
50 -# Copyright 1999-2021 Gentoo Authors
51 +# Copyright 1999-2022 Gentoo Authors
52 # Distributed under the terms of the GNU General Public License v2
53
54 EAPI=7
55 @@ -45,10 +45,12 @@ PATCHES=(
56 "${FILESDIR}"/${PN}-1.9.0-fix-bashism.patch
57 )
58
59 +pkg_pretend() {
60 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
61 +}
62 +
63 pkg_setup() {
64 - if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
65 - tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
66 - fi
67 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
68 }
69
70 src_prepare() {
71
72 diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
73 index 6f4a38509974..5143d68af9a3 100644
74 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
75 +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
76 @@ -53,10 +53,12 @@ PATCHES=(
77 "${FILESDIR}"/${P}-fix-bashism.patch
78 )
79
80 +pkg_pretend() {
81 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
82 +}
83 +
84 pkg_setup() {
85 - if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
86 - tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
87 - fi
88 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
89 }
90
91 src_prepare() {
92
93 diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
94 index 90eb1c9135c3..0b2c68d044c4 100644
95 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
96 +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
97 @@ -49,10 +49,12 @@ RDEPEND="${DEPEND}
98 dev-perl/Digest-GOST
99 !app-crypt/johntheripper"
100
101 +pkg_pretend() {
102 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
103 +}
104 +
105 pkg_setup() {
106 - if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
107 - tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
108 - fi
109 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
110 }
111
112 src_prepare() {