Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/llpp: llpp-9999.ebuild ChangeLog
Date: Thu, 06 Jun 2013 23:08:08
Message-Id: 20130606230804.B9A632171D@flycatcher.gentoo.org
1 xmw 13/06/06 23:08:04
2
3 Modified: llpp-9999.ebuild ChangeLog
4 Log:
5 Update live ebuild to openjpeg:2 and fix for latest mupdf
6
7 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
8
9 Revision Changes Path
10 1.18 app-text/llpp/llpp-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?rev=1.18&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?rev=1.18&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?r1=1.17&r2=1.18
15
16 Index: llpp-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v
19 retrieving revision 1.17
20 retrieving revision 1.18
21 diff -u -r1.17 -r1.18
22 --- llpp-9999.ebuild 25 Mar 2013 10:07:18 -0000 1.17
23 +++ llpp-9999.ebuild 6 Jun 2013 23:08:04 -0000 1.18
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/app-text/llpp/llpp-9999.ebuild,v 1.17 2013/03/25 10:07:18 xmw Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.18 2013/06/06 23:08:04 xmw Exp $
29
30 EAPI=4
31
32 @@ -19,17 +19,18 @@
33
34 RDEPEND="media-libs/freetype
35 media-libs/jbig2dec
36 - media-libs/openjpeg
37 + media-libs/openjpeg:2
38 virtual/jpeg
39 x11-libs/libX11
40 x11-misc/xsel"
41 DEPEND="${RDEPEND}
42 - >=app-text/mupdf-1.2
43 + =app-text/mupdf-9999
44 dev-lang/ocaml[ocamlopt]
45 dev-ml/lablgl[glut]"
46
47 src_prepare() {
48 - epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
49 + epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch \
50 + "${FILESDIR}"/${P}-mupdf-trailer.patch
51 }
52
53 src_compile() {
54 @@ -37,7 +38,7 @@
55 printf 'let version ="%s";;\n' $(git describe --tags --dirty) >> help.ml || die
56
57 local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
58 - local mycclib="-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX11 -lpthread"
59 + local mycclib="-lfitz -lz -ljpeg -lopenjp2 -ljbig2dec -lfreetype -lX11 -lpthread"
60 ocamlopt.opt -c -o link.o -ccopt "${myccopt}" link.c || die
61 ocamlopt.opt -c -o help.cmx help.ml || die
62 ocamlopt.opt -c -o utils.cmx utils.ml || die
63
64
65
66 1.41 app-text/llpp/ChangeLog
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.41&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.41&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?r1=1.40&r2=1.41
71
72 Index: ChangeLog
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v
75 retrieving revision 1.40
76 retrieving revision 1.41
77 diff -u -r1.40 -r1.41
78 --- ChangeLog 26 Mar 2013 18:16:46 -0000 1.40
79 +++ ChangeLog 6 Jun 2013 23:08:04 -0000 1.41
80 @@ -1,6 +1,10 @@
81 # ChangeLog for app-text/llpp
82 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
83 -# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.40 2013/03/26 18:16:46 ago Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.41 2013/06/06 23:08:04 xmw Exp $
85 +
86 + 06 Jun 2013; Michael Weber <xmw@g.o>
87 + +files/llpp-9999-mupdf-trailer.patch, llpp-9999.ebuild:
88 + Update live ebuild to openjpeg:2 and fix for latest mupdf
89
90 26 Mar 2013; Agostino Sarubbo <ago@g.o> llpp-13_p20121123.ebuild:
91 Stable for ppc, wrt bug #463196