From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1396527-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id F0EB9158091
for <garchives@archives.gentoo.org>; Sat, 14 May 2022 21:30:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DCAC7E0956;
Sat, 14 May 2022 21:30:40 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8B0BCE0952
for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2022 21:30:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A736E341B75
for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2022 21:30:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CE908475
for <gentoo-commits@lists.gentoo.org>; Sat, 14 May 2022 21:30:36 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1652563812.874964c0135c47678ca1d40cc127f5be086876ba.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/inkscape/inkscape-1.1-r1.ebuild media-gfx/inkscape/inkscape-1.1.1.ebuild media-gfx/inkscape/inkscape-1.1.2-r1.ebuild media-gfx/inkscape/inkscape-1.1.2.ebuild media-gfx/inkscape/inkscape-9999.ebuild
X-VCS-Directories: media-gfx/inkscape/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 874964c0135c47678ca1d40cc127f5be086876ba
X-VCS-Branch: master
Date: Sat, 14 May 2022 21:30:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7c8de033-ef7b-4dea-b268-93809a2b7176
X-Archives-Hash: 036d6f6cede95ec5716f4e46a1cd07df
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() {