summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/netpbm')
-rw-r--r--media-libs/netpbm/netpbm-10.70.00.ebuild1
-rw-r--r--media-libs/netpbm/netpbm-10.76.00.ebuild6
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