From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6737E1382C5 for ; Thu, 18 Jun 2020 19:27:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AB34E08BF; Thu, 18 Jun 2020 19:27:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3635BE08BF for ; Thu, 18 Jun 2020 19:27:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B4D734F369 for ; Thu, 18 Jun 2020 19:27:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2B271EF for ; Thu, 18 Jun 2020 19:27:16 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1592508429.22cceffb61a7dabca058068511f7242740d25e88.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/darktable/darktable-3.0.2-r1.ebuild media-gfx/darktable/darktable-3.0.2.ebuild media-gfx/darktable/darktable-9999.ebuild X-VCS-Directories: media-gfx/darktable/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 22cceffb61a7dabca058068511f7242740d25e88 X-VCS-Branch: master Date: Thu, 18 Jun 2020 19:27:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a7de79f3-5536-4333-991d-69c04c8659b5 X-Archives-Hash: fee0d3810b7f26d9b48bf3f1fea79d9b commit: 22cceffb61a7dabca058068511f7242740d25e88 Author: Marek Szuba gentoo org> AuthorDate: Thu Jun 18 19:23:06 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Thu Jun 18 19:27:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22cceffb media-gfx/darktable: only test the toolchain if [[ ${MERGE_TYPE} != binary ]] Again, not touching 2.6.2. Signed-off-by: Marek Szuba gentoo.org> media-gfx/darktable/darktable-3.0.2-r1.ebuild | 18 ++++++++++-------- media-gfx/darktable/darktable-3.0.2.ebuild | 18 ++++++++++-------- media-gfx/darktable/darktable-9999.ebuild | 16 +++++++++------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/media-gfx/darktable/darktable-3.0.2-r1.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild index 56221e9d71d..a27d9ec520c 100644 --- a/media-gfx/darktable/darktable-3.0.2-r1.ebuild +++ b/media-gfx/darktable/darktable-3.0.2-r1.ebuild @@ -78,14 +78,16 @@ PATCHES=( S="${WORKDIR}/${P/_/~}" pkg_pretend() { - # Bug #695658 - if tc-is-gcc; then - test-flags-CC -floop-block &> /dev/null || \ - die "Please switch to a gcc version built with USE=graphite" - fi - - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" + if [[ ${MERGE_TYPE} != binary ]]; then + # Bug #695658 + if tc-is-gcc; then + test-flags-CC -floop-block &> /dev/null || \ + die "Please switch to a gcc version built with USE=graphite" + fi + + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi fi } diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild index a6af926b835..1584653803c 100644 --- a/media-gfx/darktable/darktable-3.0.2.ebuild +++ b/media-gfx/darktable/darktable-3.0.2.ebuild @@ -77,14 +77,16 @@ PATCHES=( S="${WORKDIR}/${P/_/~}" pkg_pretend() { - # Bug #695658 - if tc-is-gcc; then - test-flags-CC -floop-block &> /dev/null || \ - die "Please switch to a gcc version built with USE=graphite" - fi - - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" + if [[ ${MERGE_TYPE} != binary ]]; then + # Bug #695658 + if tc-is-gcc; then + test-flags-CC -floop-block &> /dev/null || \ + die "Please switch to a gcc version built with USE=graphite" + fi + + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi fi } diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild index 8efe45349c4..422d45185bb 100644 --- a/media-gfx/darktable/darktable-9999.ebuild +++ b/media-gfx/darktable/darktable-9999.ebuild @@ -69,14 +69,16 @@ PATCHES=( ) pkg_pretend() { - # Bug #695658 - if tc-is-gcc; then - test-flags-CC -floop-block &> /dev/null || \ - die "Please switch to a gcc version built with USE=graphite" - fi + if [[ ${MERGE_TYPE} != binary ]]; then + # Bug #695658 + if tc-is-gcc; then + test-flags-CC -floop-block &> /dev/null || \ + die "Please switch to a gcc version built with USE=graphite" + fi - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi fi }