Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
Date: Sat, 14 May 2022 21:30:42
Message-Id: 1652563812.874964c0135c47678ca1d40cc127f5be086876ba.soap@gentoo
1 commit: 874964c0135c47678ca1d40cc127f5be086876ba
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:12 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874964c0
7
8 media-gfx/inkscape: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 media-gfx/inkscape/inkscape-1.1-r1.ebuild | 9 ++++++---
13 media-gfx/inkscape/inkscape-1.1.1.ebuild | 9 ++++++---
14 media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 9 ++++++---
15 media-gfx/inkscape/inkscape-1.1.2.ebuild | 9 ++++++---
16 media-gfx/inkscape/inkscape-9999.ebuild | 9 ++++++---
17 5 files changed, 30 insertions(+), 15 deletions(-)
18
19 diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
20 index 70ed3359e180..57545def31b0 100644
21 --- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
22 +++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
23 @@ -101,9 +101,12 @@ RESTRICT="test"
24 S="${WORKDIR}/${P}_2021-05-24_c4e8f9ed74"
25
26 pkg_pretend() {
27 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
28 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
29 - fi
30 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
31 +}
32 +
33 +pkg_setup() {
34 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
35 + python-single-r1_pkg_setup
36 }
37
38 src_prepare() {
39
40 diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
41 index b26f7a2e3ef9..c8815fedb950 100644
42 --- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
43 +++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
44 @@ -102,9 +102,12 @@ PATCHES=(
45 )
46
47 pkg_pretend() {
48 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
49 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
50 - fi
51 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
52 +}
53 +
54 +pkg_setup() {
55 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
56 + python-single-r1_pkg_setup
57 }
58
59 src_prepare() {
60
61 diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
62 index 380722ee9a7b..372ffec009bb 100644
63 --- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
64 +++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
65 @@ -111,9 +111,12 @@ PATCHES=(
66 )
67
68 pkg_pretend() {
69 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
70 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
71 - fi
72 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
73 +}
74 +
75 +pkg_setup() {
76 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
77 + python-single-r1_pkg_setup
78 }
79
80 src_unpack() {
81
82 diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
83 index e5f882642e0f..50ef40cb981d 100644
84 --- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
85 +++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
86 @@ -110,9 +110,12 @@ PATCHES=(
87 )
88
89 pkg_pretend() {
90 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
91 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
92 - fi
93 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
94 +}
95 +
96 +pkg_setup() {
97 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
98 + python-single-r1_pkg_setup
99 }
100
101 src_unpack() {
102
103 diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
104 index 77b4ae19423d..8f8d1dbdbc7b 100644
105 --- a/media-gfx/inkscape/inkscape-9999.ebuild
106 +++ b/media-gfx/inkscape/inkscape-9999.ebuild
107 @@ -106,9 +106,12 @@ RESTRICT="!test? ( test )"
108 S="${WORKDIR}/${MY_P}"
109
110 pkg_pretend() {
111 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
112 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
113 - fi
114 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
115 +}
116 +
117 +pkg_setup() {
118 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
119 + python-single-r1_pkg_setup
120 }
121
122 src_unpack() {