[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/

[Mike Frysinger]

commit:     5a0a27e792ee88cd36b92febe0d0c7e52c25f4de
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 02:13:38 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 02:14:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0a27e7

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

 media-libs/netpbm/netpbm-10.70.00.ebuild | 1 +
 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 35fe06c..2775ecb 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 c940abf..225eb63 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