diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-11-26 21:13:38 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-11-26 21:14:16 -0500 |
| commit | 5a0a27e792ee88cd36b92febe0d0c7e52c25f4de (patch) | |
| tree | c14e900f6eb4075d4516b9c43c71b3906a85b16d /media-libs/netpbm | |
| parent | dev-perl/Math-BigInt-GMP: remove old masked version (diff) | |
| download | gentoo-5a0a27e792ee88cd36b92febe0d0c7e52c25f4de.tar.gz gentoo-5a0a27e792ee88cd36b92febe0d0c7e52c25f4de.tar.bz2 gentoo-5a0a27e792ee88cd36b92febe0d0c7e52c25f4de.zip | |
media-libs/netpbm: fix test failures when USE=-jpeg #599940#1
Diffstat (limited to 'media-libs/netpbm')
| -rw-r--r-- | media-libs/netpbm/netpbm-10.70.00.ebuild | 1 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.76.00.ebuild | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild index 35fe06c14e80..2775ecbf4986 100644 --- a/media-libs/netpbm/netpbm-10.70.00.ebuild +++ b/media-libs/netpbm/netpbm-10.70.00.ebuild @@ -73,6 +73,7 @@ src_prepare() { fi del=( pnmtofiasco fiascotopnm # We always disable fiasco + $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg') $(usex jbig '' 'jbigtopnm pnmtojbig') $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k') $(usex rle '' 'pnmtorle rletopnm') diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild index c940abf1f558..225eb6368fe6 100644 --- a/media-libs/netpbm/netpbm-10.76.00.ebuild +++ b/media-libs/netpbm/netpbm-10.76.00.ebuild @@ -71,14 +71,16 @@ src_prepare() { fi del=( pnmtofiasco fiascotopnm # We always disable fiasco + $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg') $(usex jbig '' 'jbigtopnm pnmtojbig') $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k') $(usex rle '' 'pnmtorle rletopnm') $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') ) if [[ ${#del[@]} -gt 0 ]] ; then - sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die - sed -i '/^$/d' test/all-in-place.ok || die + sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") \ + test/{all-in-place,legacy-names}.{ok,test} || die + sed -i '/^$/d' test/{all-in-place,legacy-names}.ok || die fi # take care of the importinc stuff ourselves by only doing it once |