Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/oyranos: ChangeLog oyranos-0.3.2.ebuild
Date: Wed, 08 Feb 2012 05:49:30
Message-Id: 20120208054919.DD5F62004B@flycatcher.gentoo.org
1 xmw 12/02/08 05:49:19
2
3 Modified: ChangeLog oyranos-0.3.2.ebuild
4 Log:
5 Fix tests (bug 402623)
6
7 (Portage version: 2.1.10.44/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-libs/oyranos/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?r1=1.1&r2=1.2
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- ChangeLog 6 Feb 2012 02:33:55 -0000 1.1
23 +++ ChangeLog 8 Feb 2012 05:49:19 -0000 1.2
24 @@ -1,6 +1,10 @@
25 # ChangeLog for media-libs/oyranos
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.1 2012/02/06 02:33:55 xmw Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.2 2012/02/08 05:49:19 xmw Exp $
29 +
30 + 08 Feb 2012; Michael Weber <xmw@g.o> oyranos-0.3.2.ebuild,
31 + +files/oyranos-0.3.2-test.patch:
32 + Fix tests (bug 402623)
33
34 *oyranos-0.3.2 (05 Feb 2012)
35
36
37
38
39 1.3 media-libs/oyranos/oyranos-0.3.2.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.3.2.ebuild?rev=1.3&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.3.2.ebuild?rev=1.3&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.3.2.ebuild?r1=1.2&r2=1.3
44
45 Index: oyranos-0.3.2.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.3.2.ebuild,v
48 retrieving revision 1.2
49 retrieving revision 1.3
50 diff -u -r1.2 -r1.3
51 --- oyranos-0.3.2.ebuild 6 Feb 2012 05:49:52 -0000 1.2
52 +++ oyranos-0.3.2.ebuild 8 Feb 2012 05:49:19 -0000 1.3
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2012 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.3.2.ebuild,v 1.2 2012/02/06 05:49:52 mr_bones_ Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.3.2.ebuild,v 1.3 2012/02/08 05:49:19 xmw Exp $
58
59 EAPI=4
60
61 @@ -23,27 +23,31 @@
62 media-libs/libpng:0
63 media-libs/libraw
64 media-libs/libXcm
65 - X? (
66 - x11-libs/fltk:1
67 + X? ( x11-libs/fltk:1
68 x11-libs/libXfixes
69 x11-libs/libXrandr
70 x11-libs/libXxf86vm
71 - xinerama? ( x11-libs/libXinerama )
72 - )"
73 + xinerama? ( x11-libs/libXinerama ) )"
74 DEPEND="${RDEPEND}
75 - app-doc/doxygen"
76 + app-doc/doxygen
77 + test? ( media-libs/icc-profiles-basiccolor-printing2009
78 + media-libs/icc-profiles-openicc )"
79
80 src_prepare() {
81 einfo remove bundled elektra yajl
82 rm -rf elektra* yajl || die
83 #keep bundled libXNVCtrl
84
85 - epatch "${FILESDIR}"/${P}-buildsystem.patch
86 + epatch "${FILESDIR}"/${P}-buildsystem.patch \
87 + "${FILESDIR}"/${P}-test.patch
88
89 if ! use X ; then
90 sed -e '/FLTK_GUI =/s:=.*:=:' \
91 -i makefile.in || die
92 fi
93 +
94 + sed -e '/#include/s:alpha/oyranos_alpha.h:oyranos_alpha.h:' \
95 + -i examples/libraw/oyranos_file.cpp || die
96 }
97
98 src_configure() {