From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-913576-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id CFC051395E2
for <garchives@archives.gentoo.org>; Sun, 27 Nov 2016 02:14:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CD336E0AA8;
Sun, 27 Nov 2016 02:14:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B18E9E0AA8
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2016 02:14:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D5A8234125C
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2016 02:14:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EAA94A6
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2016 02:14:24 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1480212856.5a0a27e792ee88cd36b92febe0d0c7e52c25f4de.vapier@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/netpbm/netpbm-10.70.00.ebuild media-libs/netpbm/netpbm-10.76.00.ebuild
X-VCS-Directories: media-libs/netpbm/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 5a0a27e792ee88cd36b92febe0d0c7e52c25f4de
X-VCS-Branch: master
Date: Sun, 27 Nov 2016 02:14:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a79099cc-4c97-4fa1-9b34-fd220e257bfb
X-Archives-Hash: 3db907837cc138445177d760673eb5e3
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