Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-16.ebuild llpp-15.ebuild llpp-9999.ebuild ChangeLog
Date: Thu, 29 Aug 2013 05:54:17
Message-Id: 20130829055407.589112004C@flycatcher.gentoo.org
1 xmw 13/08/29 05:54:07
2
3 Modified: llpp-15.ebuild llpp-9999.ebuild ChangeLog
4 Added: llpp-16.ebuild
5 Log:
6 Version bump
7
8 (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
9
10 Revision Changes Path
11 1.10 app-text/llpp/llpp-15.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-15.ebuild?rev=1.10&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-15.ebuild?rev=1.10&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-15.ebuild?r1=1.9&r2=1.10
16
17 Index: llpp-15.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v
20 retrieving revision 1.9
21 retrieving revision 1.10
22 diff -u -r1.9 -r1.10
23 --- llpp-15.ebuild 28 Aug 2013 09:56:16 -0000 1.9
24 +++ llpp-15.ebuild 29 Aug 2013 05:54:07 -0000 1.10
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.9 2013/08/28 09:56:16 xmw Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.10 2013/08/29 05:54:07 xmw Exp $
30
31 EAPI=5
32
33 @@ -15,7 +15,7 @@
34 KEYWORDS="~amd64 ~ppc ~x86"
35 IUSE="+ocamlopt static"
36
37 -LIB_DEPEND="=app-text/mupdf-1.2*:=[static-libs]
38 +LIB_DEPEND="~app-text/mupdf-1.2:=[static-libs]
39 media-libs/openjpeg:0[static-libs]
40 media-libs/freetype:2[static-libs]
41 media-libs/jbig2dec[static-libs]
42
43
44
45 1.27 app-text/llpp/llpp-9999.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?rev=1.27&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?rev=1.27&content-type=text/plain
49 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-9999.ebuild?r1=1.26&r2=1.27
50
51 Index: llpp-9999.ebuild
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v
54 retrieving revision 1.26
55 retrieving revision 1.27
56 diff -u -r1.26 -r1.27
57 --- llpp-9999.ebuild 13 Jul 2013 23:16:59 -0000 1.26
58 +++ llpp-9999.ebuild 29 Aug 2013 05:54:07 -0000 1.27
59 @@ -1,6 +1,6 @@
60 # Copyright 1999-2013 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62 -# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.26 2013/07/13 23:16:59 xmw Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.27 2013/08/29 05:54:07 xmw Exp $
64
65 EAPI=5
66
67 @@ -15,7 +15,7 @@
68 KEYWORDS=""
69 IUSE="+ocamlopt static"
70
71 -LIB_DEPEND=">=app-text/mupdf-9999:=[static-libs]
72 +LIB_DEPEND=">=app-text/mupdf-1.3:=[static-libs]
73 media-libs/openjpeg:2[static-libs]
74 media-libs/freetype:2[static-libs]
75 media-libs/jbig2dec[static-libs]
76
77
78
79 1.50 app-text/llpp/ChangeLog
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.50&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.50&content-type=text/plain
83 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?r1=1.49&r2=1.50
84
85 Index: ChangeLog
86 ===================================================================
87 RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v
88 retrieving revision 1.49
89 retrieving revision 1.50
90 diff -u -r1.49 -r1.50
91 --- ChangeLog 28 Aug 2013 09:56:16 -0000 1.49
92 +++ ChangeLog 29 Aug 2013 05:54:07 -0000 1.50
93 @@ -1,6 +1,12 @@
94 # ChangeLog for app-text/llpp
95 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
96 -# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.49 2013/08/28 09:56:16 xmw Exp $
97 +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.50 2013/08/29 05:54:07 xmw Exp $
98 +
99 +*llpp-16 (29 Aug 2013)
100 +
101 + 29 Aug 2013; Michael Weber <xmw@g.o> +llpp-16.ebuild, llpp-15.ebuild,
102 + llpp-9999.ebuild:
103 + Version bump
104
105 28 Aug 2013; Michael Weber <xmw@g.o> llpp-15.ebuild:
106 Adjust depend to =app-text/mupdf-1.2*
107
108
109
110 1.1 app-text/llpp/llpp-16.ebuild
111
112 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-16.ebuild?rev=1.1&view=markup
113 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-16.ebuild?rev=1.1&content-type=text/plain
114
115 Index: llpp-16.ebuild
116 ===================================================================
117 # Copyright 1999-2013 Gentoo Foundation
118 # Distributed under the terms of the GNU General Public License v2
119 # $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-16.ebuild,v 1.1 2013/08/29 05:54:07 xmw Exp $
120
121 EAPI=5
122
123 inherit eutils multilib toolchain-funcs vcs-snapshot
124
125 DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
126 HOMEPAGE="http://repo.or.cz/w/llpp.git"
127 SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/8855b8a50acf02257773469578c5ddaaf12eff9f.tar.gz -> ${P}.tar.gz"
128
129 LICENSE="GPL-3"
130 SLOT="0"
131 KEYWORDS="~amd64 ~ppc ~x86"
132 IUSE="+ocamlopt static"
133
134 LIB_DEPEND="~app-text/mupdf-1.3_pre20130704:=[static-libs]
135 media-libs/openjpeg:2[static-libs]
136 media-libs/freetype:2[static-libs]
137 media-libs/jbig2dec[static-libs]
138 sys-libs/zlib[static-libs]
139 virtual/jpeg:0[static-libs]
140 x11-libs/libX11[static-libs]"
141 RDEPEND="x11-misc/xsel
142 !static? ( ${LIB_DEPEND//\[static-libs]} )"
143 DEPEND="${RDEPEND}
144 static? ( ${LIB_DEPEND}
145 app-arch/bzip2[static-libs]
146 media-libs/libXcm[static-libs]
147 x11-libs/libXau[static-libs]
148 x11-libs/libXdmcp[static-libs]
149 x11-libs/libXmu[static-libs] )
150 dev-lang/ocaml[ocamlopt?]
151 dev-ml/lablgl[glut,ocamlopt?]"
152
153 RESTRICT="!ocamlopt? ( strip )"
154
155 src_prepare() {
156 epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
157 }
158
159 src_compile() {
160 local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
161 local cmo=$(usex ocamlopt cmx cmo)
162 local cma=$(usex ocamlopt cmxa cma)
163 local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
164 if use static ; then
165 local cclib=""
166 local slib=""
167 local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
168 for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
169 case ${slib} in
170 -lm|-ldl|-lpthread)
171 einfo "${slib}: shared"
172 cclib+="${slib} " ;;
173 *)
174 local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
175 einfo "${slib}: use ${ccnew}"
176 cclib+="${ccnew} " ;;
177 esac
178 done
179 else
180 local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
181 fi
182
183 verbose() { echo "$@" >&2 ; "$@" || die ; }
184 verbose ocaml str.cma keystoml.ml < KEYS > help.ml
185 verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
186 verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
187 verbose ${ocaml} -c -o help.${cmo} help.ml
188 verbose ${ocaml} -c -o utils.${cmo} utils.ml
189 verbose ${ocaml} -c -o wsi.cmi wsi.mli
190 verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
191 verbose ${ocaml} -c -o parser.${cmo} parser.ml
192 verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
193 verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
194 str.${cma} unix.${cma} lablgl.${cma} link.o \
195 -cclib "${cclib}" \
196 help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
197 }
198
199 src_install() {
200 dobin ${PN}
201 dodoc KEYS README Thanks fixme
202 }
Report Message
Find on MARC Find on Google Groups