| 1 |
vapier 13/05/29 15:15:05 |
| 2 |
|
| 3 |
Modified: netpbm-10.61.00.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Disable jbig tests when USE=-jbig and fix all-in-place test failure due to fiascotopnm #450530#6 by Andreas Sturmlechner. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 media-libs/netpbm/netpbm-10.61.00.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: netpbm-10.61.00.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- netpbm-10.61.00.ebuild 12 May 2013 21:25:01 -0000 1.3 |
| 23 |
+++ netpbm-10.61.00.ebuild 29 May 2013 15:15:05 -0000 1.4 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild,v 1.3 2013/05/12 21:25:01 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild,v 1.4 2013/05/29 15:15:05 vapier Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -55,6 +55,7 @@ |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
epatch "${FILESDIR}"/netpbm-10.31-build.patch |
| 36 |
+ epatch "${FILESDIR}"/netpbm-10.61-test.patch |
| 37 |
|
| 38 |
# make sure we use system urt |
| 39 |
sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die |
| 40 |
@@ -62,17 +63,20 @@ |
| 41 |
|
| 42 |
# disable certain tests based on active USE flags |
| 43 |
local del=( |
| 44 |
- $(usex rle '' utahrle-roundtrip) |
| 45 |
+ $(usex jbig '' 'jbigtopnm pnmtojbig') |
| 46 |
+ $(usex rle '' 'utahrle-roundtrip') |
| 47 |
) |
| 48 |
if [[ ${#del[@]} -gt 0 ]] ; then |
| 49 |
sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die |
| 50 |
fi |
| 51 |
del=( |
| 52 |
- pnmtofiasco # We always disable fiasco |
| 53 |
+ pnmtofiasco fiascotopnm # We always disable fiasco |
| 54 |
+ $(usex jbig '' 'jbigtopnm pnmtojbig') |
| 55 |
$(usex rle '' 'pnmtorle rletopnm') |
| 56 |
) |
| 57 |
if [[ ${#del[@]} -gt 0 ]] ; then |
| 58 |
sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die |
| 59 |
+ sed -i '/^$/d' test/all-in-place.ok || die |
| 60 |
fi |
| 61 |
|
| 62 |
# take care of the importinc stuff ourselves by only doing it once |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.270 media-libs/netpbm/ChangeLog |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/ChangeLog?rev=1.270&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/ChangeLog?rev=1.270&content-type=text/plain |
| 70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/ChangeLog?r1=1.269&r2=1.270 |
| 71 |
|
| 72 |
Index: ChangeLog |
| 73 |
=================================================================== |
| 74 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v |
| 75 |
retrieving revision 1.269 |
| 76 |
retrieving revision 1.270 |
| 77 |
diff -u -r1.269 -r1.270 |
| 78 |
--- ChangeLog 12 May 2013 21:25:01 -0000 1.269 |
| 79 |
+++ ChangeLog 29 May 2013 15:15:05 -0000 1.270 |
| 80 |
@@ -1,6 +1,11 @@ |
| 81 |
# ChangeLog for media-libs/netpbm |
| 82 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 83 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.269 2013/05/12 21:25:01 vapier Exp $ |
| 84 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.270 2013/05/29 15:15:05 vapier Exp $ |
| 85 |
+ |
| 86 |
+ 29 May 2013; Mike Frysinger <vapier@g.o> |
| 87 |
+ +files/netpbm-10.61-test.patch, netpbm-10.61.00.ebuild: |
| 88 |
+ Disable jbig tests when USE=-jbig and fix all-in-place test failure due to |
| 89 |
+ fiascotopnm #450530#6 by Andreas Sturmlechner. |
| 90 |
|
| 91 |
12 May 2013; Mike Frysinger <vapier@g.o> netpbm-10.61.00.ebuild: |
| 92 |
Install local set of libs before testing #467198 by Patrick Lauer. |
Archives