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.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 F21D7158092 for ; 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 E2574E0958; Sat, 14 May 2022 21:30:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9BA3CE0956 for ; 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 D27A1341B98 for ; Sat, 14 May 2022 21:30:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 015DC47B for ; Sat, 14 May 2022 21:30:37 +0000 (UTC) From: "David Seifert" 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" Message-ID: <1652563814.33aa4c20fa753b8a31ebe46446e3e8f501f9a8bb.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/pngquant/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/pngquant/pngquant-2.12.6.ebuild media-gfx/pngquant/pngquant-2.17.0.ebuild X-VCS-Directories: media-gfx/pngquant/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 33aa4c20fa753b8a31ebe46446e3e8f501f9a8bb X-VCS-Branch: master Date: Sat, 14 May 2022 21:30:37 +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: a118e6c9-d748-43bb-9f65-8501e6834ee5 X-Archives-Hash: d9a75be1ab103d2f8ac2e949cfbe1f03 commit: 33aa4c20fa753b8a31ebe46446e3e8f501f9a8bb Author: David Seifert gentoo org> AuthorDate: Sat May 14 21:30:14 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat May 14 21:30:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33aa4c20 media-gfx/pngquant: [QA] tc-has-openmp → tc-check-openmp Signed-off-by: David Seifert gentoo.org> media-gfx/pngquant/pngquant-2.12.6.ebuild | 17 ++++++++++++----- media-gfx/pngquant/pngquant-2.17.0.ebuild | 15 +++++++++++---- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild index ded2693e8e4a..2e645d7f52f3 100644 --- a/media-gfx/pngquant/pngquant-2.12.6.ebuild +++ b/media-gfx/pngquant/pngquant-2.12.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,14 +22,21 @@ RDEPEND=" sys-libs/zlib:= lcms? ( media-libs/lcms:2 ) " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch ) +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + src_prepare() { default @@ -45,7 +52,7 @@ src_configure() { --with-libimagequant \ $(use debug && echo --enable-debug) \ $(use_enable cpu_flags_x86_sse2 sse) \ - $(use openmp && tc-has-openmp && echo --with-openmp) \ + $(use openmp && echo --with-openmp) \ $(use_with lcms lcms2) \ CFLAGS="${CFLAGS} ${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" diff --git a/media-gfx/pngquant/pngquant-2.17.0.ebuild b/media-gfx/pngquant/pngquant-2.17.0.ebuild index dff2d725f4fd..aad64b726dac 100644 --- a/media-gfx/pngquant/pngquant-2.17.0.ebuild +++ b/media-gfx/pngquant/pngquant-2.17.0.ebuild @@ -22,14 +22,21 @@ RDEPEND=" sys-libs/zlib:= lcms? ( media-libs/lcms:2 ) " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch ) +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + src_prepare() { default @@ -45,7 +52,7 @@ src_configure() { --with-libimagequant \ $(use debug && echo --enable-debug) \ $(use_enable cpu_flags_x86_sse2 sse) \ - $(use openmp && tc-has-openmp && echo --with-openmp) \ + $(use openmp && echo --with-openmp) \ $(use_with lcms lcms2) \ CFLAGS="${CFLAGS} ${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}"