[gentoo-commits] repo/gentoo:master commit in: media-gfx/pngquant/

[David Seifert]

commit:     33aa4c20fa753b8a31ebe46446e3e8f501f9a8bb
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:14 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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}"