Disable jbig tests when USE=-jbig and fix all-in-place test failure due to fiascotopnm #450530#6 by Andreas Sturmlechner.

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

3 files changed, 33 insertions, 4 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index a8666b1eb99f..291c9514ff7a 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.269 2013/05/12 21:25:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.270 2013/05/29 15:15:05 vapier Exp $
+
+  29 May 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.61-test.patch, netpbm-10.61.00.ebuild:
+  Disable jbig tests when USE=-jbig and fix all-in-place test failure due to
+  fiascotopnm #450530#6 by Andreas Sturmlechner.
 
   12 May 2013; Mike Frysinger <vapier@gentoo.org> netpbm-10.61.00.ebuild:
   Install local set of libs before testing #467198 by Patrick Lauer.
diff --git a/media-libs/netpbm/files/netpbm-10.61-test.patch b/media-libs/netpbm/files/netpbm-10.61-test.patch
new file mode 100644
index 000000000000..efa88130c889
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.61-test.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/450530
+
+we disable fiascotopnm all the time, so delete the test too
+
+--- a/test/all-in-place.test
++++ b/test/all-in-place.test
+@@ -103,13 +103,6 @@
+ 
+ 
+ 
+-# Test fiascotopnm, which has a unique -v flag.
+-
+-${PBM_TESTPREFIX}fiascotopnm -v 2> /dev/null
+-    testExitStatus fiascotopnm 2 $?
+-
+-
+-
+ # Test manweb and pnmmargin, which support --help.
+ 
+ ${PBM_TESTPREFIX}manweb --help > /dev/null
diff --git a/media-libs/netpbm/netpbm-10.61.00.ebuild b/media-libs/netpbm/netpbm-10.61.00.ebuild
index 744ddfe9784e..df79a66fec6c 100644
--- a/media-libs/netpbm/netpbm-10.61.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.61.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild,v 1.3 2013/05/12 21:25:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild,v 1.4 2013/05/29 15:15:05 vapier Exp $
 
 EAPI="4"
 
@@ -55,6 +55,7 @@ netpbm_config() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/netpbm-10.61-test.patch
 
 	# make sure we use system urt
 	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
@@ -62,17 +63,20 @@ src_prepare() {
 
 	# disable certain tests based on active USE flags
 	local del=(
-		$(usex rle '' utahrle-roundtrip)
+		$(usex jbig '' 'jbigtopnm pnmtojbig')
+		$(usex rle '' 'utahrle-roundtrip')
 	)
 	if [[ ${#del[@]} -gt 0 ]] ; then
 		sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die
 	fi
 	del=(
-		pnmtofiasco # We always disable fiasco
+		pnmtofiasco fiascotopnm # We always disable fiasco
+		$(usex jbig '' 'jbigtopnm pnmtojbig')
 		$(usex rle '' 'pnmtorle rletopnm')
 	)
 	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
 	fi
 
 	# take care of the importinc stuff ourselves by only doing it once