| 1 |
commit: 5a0a27e792ee88cd36b92febe0d0c7e52c25f4de |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 27 02:13:38 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 27 02:14:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0a27e7 |
| 7 |
|
| 8 |
media-libs/netpbm: fix test failures when USE=-jpeg #599940#1 |
| 9 |
|
| 10 |
media-libs/netpbm/netpbm-10.70.00.ebuild | 1 + |
| 11 |
media-libs/netpbm/netpbm-10.76.00.ebuild | 6 ++++-- |
| 12 |
2 files changed, 5 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild |
| 15 |
index 35fe06c..2775ecb 100644 |
| 16 |
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild |
| 17 |
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild |
| 18 |
@@ -73,6 +73,7 @@ src_prepare() { |
| 19 |
fi |
| 20 |
del=( |
| 21 |
pnmtofiasco fiascotopnm # We always disable fiasco |
| 22 |
+ $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg') |
| 23 |
$(usex jbig '' 'jbigtopnm pnmtojbig') |
| 24 |
$(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k') |
| 25 |
$(usex rle '' 'pnmtorle rletopnm') |
| 26 |
|
| 27 |
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild |
| 28 |
index c940abf..225eb63 100644 |
| 29 |
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild |
| 30 |
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild |
| 31 |
@@ -71,14 +71,16 @@ src_prepare() { |
| 32 |
fi |
| 33 |
del=( |
| 34 |
pnmtofiasco fiascotopnm # We always disable fiasco |
| 35 |
+ $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg') |
| 36 |
$(usex jbig '' 'jbigtopnm pnmtojbig') |
| 37 |
$(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k') |
| 38 |
$(usex rle '' 'pnmtorle rletopnm') |
| 39 |
$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') |
| 40 |
) |
| 41 |
if [[ ${#del[@]} -gt 0 ]] ; then |
| 42 |
- sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die |
| 43 |
- sed -i '/^$/d' test/all-in-place.ok || die |
| 44 |
+ sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") \ |
| 45 |
+ test/{all-in-place,legacy-names}.{ok,test} || die |
| 46 |
+ sed -i '/^$/d' test/{all-in-place,legacy-names}.ok || die |
| 47 |
fi |
| 48 |
|
| 49 |
# take care of the importinc stuff ourselves by only doing it once |
Archives