| 1 |
commit: 33aa4c20fa753b8a31ebe46446e3e8f501f9a8bb |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 14 21:30:14 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 21:30:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33aa4c20 |
| 7 |
|
| 8 |
media-gfx/pngquant: [QA] tc-has-openmp → tc-check-openmp |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
media-gfx/pngquant/pngquant-2.12.6.ebuild | 17 ++++++++++++----- |
| 13 |
media-gfx/pngquant/pngquant-2.17.0.ebuild | 15 +++++++++++---- |
| 14 |
2 files changed, 23 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild |
| 17 |
index ded2693e8e4a..2e645d7f52f3 100644 |
| 18 |
--- a/media-gfx/pngquant/pngquant-2.12.6.ebuild |
| 19 |
+++ b/media-gfx/pngquant/pngquant-2.12.6.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2021 Gentoo Authors |
| 22 |
+# Copyright 1999-2022 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI="7" |
| 26 |
@@ -22,14 +22,21 @@ RDEPEND=" |
| 27 |
sys-libs/zlib:= |
| 28 |
lcms? ( media-libs/lcms:2 ) |
| 29 |
" |
| 30 |
-DEPEND="${RDEPEND} |
| 31 |
- virtual/pkgconfig |
| 32 |
-" |
| 33 |
+DEPEND="${RDEPEND}" |
| 34 |
+BDEPEND="virtual/pkgconfig" |
| 35 |
|
| 36 |
RESTRICT="!test? ( test )" |
| 37 |
|
| 38 |
PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch ) |
| 39 |
|
| 40 |
+pkg_pretend() { |
| 41 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 42 |
+} |
| 43 |
+ |
| 44 |
+pkg_setup() { |
| 45 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 46 |
+} |
| 47 |
+ |
| 48 |
src_prepare() { |
| 49 |
default |
| 50 |
|
| 51 |
@@ -45,7 +52,7 @@ src_configure() { |
| 52 |
--with-libimagequant \ |
| 53 |
$(use debug && echo --enable-debug) \ |
| 54 |
$(use_enable cpu_flags_x86_sse2 sse) \ |
| 55 |
- $(use openmp && tc-has-openmp && echo --with-openmp) \ |
| 56 |
+ $(use openmp && echo --with-openmp) \ |
| 57 |
$(use_with lcms lcms2) \ |
| 58 |
CFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
| 59 |
LDFLAGS="${LDFLAGS}" |
| 60 |
|
| 61 |
diff --git a/media-gfx/pngquant/pngquant-2.17.0.ebuild b/media-gfx/pngquant/pngquant-2.17.0.ebuild |
| 62 |
index dff2d725f4fd..aad64b726dac 100644 |
| 63 |
--- a/media-gfx/pngquant/pngquant-2.17.0.ebuild |
| 64 |
+++ b/media-gfx/pngquant/pngquant-2.17.0.ebuild |
| 65 |
@@ -22,14 +22,21 @@ RDEPEND=" |
| 66 |
sys-libs/zlib:= |
| 67 |
lcms? ( media-libs/lcms:2 ) |
| 68 |
" |
| 69 |
-DEPEND="${RDEPEND} |
| 70 |
- virtual/pkgconfig |
| 71 |
-" |
| 72 |
+DEPEND="${RDEPEND}" |
| 73 |
+BDEPEND="virtual/pkgconfig" |
| 74 |
|
| 75 |
RESTRICT="!test? ( test )" |
| 76 |
|
| 77 |
PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch ) |
| 78 |
|
| 79 |
+pkg_pretend() { |
| 80 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 81 |
+} |
| 82 |
+ |
| 83 |
+pkg_setup() { |
| 84 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 85 |
+} |
| 86 |
+ |
| 87 |
src_prepare() { |
| 88 |
default |
| 89 |
|
| 90 |
@@ -45,7 +52,7 @@ src_configure() { |
| 91 |
--with-libimagequant \ |
| 92 |
$(use debug && echo --enable-debug) \ |
| 93 |
$(use_enable cpu_flags_x86_sse2 sse) \ |
| 94 |
- $(use openmp && tc-has-openmp && echo --with-openmp) \ |
| 95 |
+ $(use openmp && echo --with-openmp) \ |
| 96 |
$(use_with lcms lcms2) \ |
| 97 |
CFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
| 98 |
LDFLAGS="${LDFLAGS}" |
Archives