Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 450530 | Differences between
and this patch

Collapse All | Expand All

(-)media-libs/netpbm/netpbm-10.61.00.ebuild (-1 / +7 lines)
Lines 56-61 Link Here
56
src_prepare() {
56
src_prepare() {
57
	epatch "${FILESDIR}"/netpbm-10.31-build.patch
57
	epatch "${FILESDIR}"/netpbm-10.31-build.patch
58
58
59
	# remove fiascotopnm test with unique -v flag
60
	epatch "${FILESDIR}"/netpbm-10.61-remove-fiascotopnm-test.patch
61
59
	# make sure we use system urt
62
	# make sure we use system urt
60
	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
63
	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
61
	rm -rf urt
64
	rm -rf urt
Lines 63-78 Link Here
63
	# disable certain tests based on active USE flags
66
	# disable certain tests based on active USE flags
64
	local del=(
67
	local del=(
65
		$(usex rle '' utahrle-roundtrip)
68
		$(usex rle '' utahrle-roundtrip)
69
		$(usex jbig '' 'jbigtopnm pnmtojbig')
66
	)
70
	)
67
	if [[ ${#del[@]} -gt 0 ]] ; then
71
	if [[ ${#del[@]} -gt 0 ]] ; then
68
		sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die
72
		sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die
69
	fi
73
	fi
70
	del=(
74
	del=(
71
		pnmtofiasco # We always disable fiasco
75
		pnmtofiasco fiascotopnm # We always disable fiasco
72
		$(usex rle '' 'pnmtorle rletopnm')
76
		$(usex rle '' 'pnmtorle rletopnm')
77
		$(usex jbig '' 'jbigtopnm pnmtojbig')
73
	)
78
	)
74
	if [[ ${#del[@]} -gt 0 ]] ; then
79
	if [[ ${#del[@]} -gt 0 ]] ; then
75
		sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die
80
		sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die
81
		sed -i '/^$/d' test/all-in-place.ok || die
76
	fi
82
	fi
77
83
78
	# take care of the importinc stuff ourselves by only doing it once
84
	# take care of the importinc stuff ourselves by only doing it once

Return to bug 450530