commit: 874964c0135c47678ca1d40cc127f5be086876ba
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:12 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:30:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874964c0
media-gfx/inkscape: [QA] tc-has-openmp → tc-check-openmp
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-gfx/inkscape/inkscape-1.1-r1.ebuild | 9 ++++++---
media-gfx/inkscape/inkscape-1.1.1.ebuild | 9 ++++++---
media-gfx/inkscape/inkscape-1.1.2-r1.ebuild | 9 ++++++---
media-gfx/inkscape/inkscape-1.1.2.ebuild | 9 ++++++---
media-gfx/inkscape/inkscape-9999.ebuild | 9 ++++++---
5 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index 70ed3359e180..57545def31b0 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -101,9 +101,12 @@ RESTRICT="test"
S="${WORKDIR}/${P}_2021-05-24_c4e8f9ed74"
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ python-single-r1_pkg_setup
}
src_prepare() {
diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild
b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index b26f7a2e3ef9..c8815fedb950 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -102,9 +102,12 @@ PATCHES=(
)
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ python-single-r1_pkg_setup
}
src_prepare() {
diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index 380722ee9a7b..372ffec009bb 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -111,9 +111,12 @@ PATCHES=(
)
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ python-single-r1_pkg_setup
}
src_unpack() {
diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild
b/media-gfx/inkscape/inkscape-1.1.2.ebuild
index e5f882642e0f..50ef40cb981d 100644
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -110,9 +110,12 @@ PATCHES=(
)
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ python-single-r1_pkg_setup
}
src_unpack() {
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild
b/media-gfx/inkscape/inkscape-9999.ebuild
index 77b4ae19423d..8f8d1dbdbc7b 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -106,9 +106,12 @@ RESTRICT="!test? ( test )"
S="${WORKDIR}/${MY_P}"
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ python-single-r1_pkg_setup
}
src_unpack() {
