media-libs/netpbm: fix test failures when USE=-jpeg #599940#1

diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index 35fe06c14e808b59a0d3c330bf56f149126229a0..2775ecbf4986c471ea8667f9b1f97968da3d2439 100644 (file)
--- 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 c940abf1f558cea20718ce7290ec5fd9fb493f16..225eb6368fe682d99a5c30125c25c56f52eebd43 100644 (file)
--- 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