[patch] netpbm-10.62.06.ebuild.diff

netpbm-10.62.06.ebuild.diff (text/plain), 1.16 KB, created by Andreas Sturmlechner on 2013-05-26 12:42:02 UTC

--- media-libs/netpbm/netpbm-10.61.00.ebuild	2013-05-12 23:31:21.000000000 +0200
+++ media-libs/netpbm/netpbm-10.62.06.ebuild	2013-05-26 14:24:16.782808125 +0200
@@ -56,6 +56,9 @@
 src_prepare() {
 	epatch "${FILESDIR}"/netpbm-10.31-build.patch
 
+	# remove fiascotopnm test with unique -v flag
+	epatch "${FILESDIR}"/netpbm-10.61-remove-fiascotopnm-test.patch
+
 	# make sure we use system urt
 	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
 	rm -rf urt
@@ -63,16 +66,19 @@
 	# disable certain tests based on active USE flags
 	local del=(
 		$(usex rle '' utahrle-roundtrip)
+		$(usex jbig '' 'jbigtopnm pnmtojbig')
 	)
 	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 rle '' 'pnmtorle rletopnm')
+		$(usex jbig '' 'jbigtopnm pnmtojbig')
 	)
 	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