Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-4.3.9999.ebuild libreoffice-4.4.9999.ebuild libreoffice-4.4.0.3.ebuild libreoffice-9999.ebuild libreoffice-4.2.9999.ebuild ChangeLog
Date: Sun, 08 Feb 2015 22:42:22
Message-Id: 20150208224218.144B71158E@oystercatcher.gentoo.org
1 dilfridge 15/02/08 22:42:18
2
3 Modified: libreoffice-4.3.9999.ebuild
4 libreoffice-4.4.9999.ebuild libreoffice-9999.ebuild
5 libreoffice-4.2.9999.ebuild ChangeLog
6 Added: libreoffice-4.4.0.3.ebuild
7 Log:
8 Version bump (without keywords so far); update live ebuilds to git-r3.eclass; backport DPI patch for bug 523822 to the 4.3 branch. Thanks to Andreas Sturmlechner.
9
10 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
11
12 Revision Changes Path
13 1.13 app-office/libreoffice/libreoffice-4.3.9999.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild?rev=1.13&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild?rev=1.13&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild?r1=1.12&r2=1.13
18
19 Index: libreoffice-4.3.9999.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v
22 retrieving revision 1.12
23 retrieving revision 1.13
24 diff -u -r1.12 -r1.13
25 --- libreoffice-4.3.9999.ebuild 8 Feb 2015 18:53:59 -0000 1.12
26 +++ libreoffice-4.3.9999.ebuild 8 Feb 2015 22:42:18 -0000 1.13
27 @@ -1,6 +1,6 @@
28 # Copyright 1999-2015 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.12 2015/02/08 18:53:59 dilfridge Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.13 2015/02/08 22:42:18 dilfridge Exp $
32
33 EAPI=5
34
35 @@ -26,7 +26,7 @@
36 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
37 # PATCHSET="${P}-patchset-01.tar.xz"
38
39 -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
40 +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
41 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
42 unset SCM_ECLASS
43
44 @@ -252,6 +252,7 @@
45 "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178
46 "${FILESDIR}/${PN}-4.3.5.2-system-opencollada.patch"
47 "${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch"
48 + "${FILESDIR}/${PN}-4.3.5.2-DPI.patch"
49
50 # from master branch
51
52 @@ -325,12 +326,10 @@
53 for mod in ${MODULES}; do
54 mypv=${PV/.9999}
55 [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
56 - EGIT_PROJECT="${PN}/${mod}"
57 - EGIT_SOURCEDIR="${WORKDIR}/${P}"
58 - [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
59 + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
60 + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
61 EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
62 - EGIT_NOUNPACK="true"
63 - git-2_src_unpack
64 + git-r3_src_unpack
65 if [[ ${mod} != core ]]; then
66 mod2=${mod}
67 # mapping does not match on help
68 @@ -340,7 +339,7 @@
69 rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
70 fi
71 done
72 - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
73 + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
74 fi
75 }
76
77
78
79
80 1.3 app-office/libreoffice/libreoffice-4.4.9999.ebuild
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild?rev=1.3&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild?rev=1.3&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild?r1=1.2&r2=1.3
85
86 Index: libreoffice-4.4.9999.ebuild
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v
89 retrieving revision 1.2
90 retrieving revision 1.3
91 diff -u -r1.2 -r1.3
92 --- libreoffice-4.4.9999.ebuild 8 Feb 2015 18:59:16 -0000 1.2
93 +++ libreoffice-4.4.9999.ebuild 8 Feb 2015 22:42:18 -0000 1.3
94 @@ -1,6 +1,6 @@
95 # Copyright 1999-2015 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.2 2015/02/08 18:59:16 dilfridge Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.3 2015/02/08 22:42:18 dilfridge Exp $
99
100 EAPI=5
101
102 @@ -26,7 +26,7 @@
103 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
104 # PATCHSET="${P}-patchset-01.tar.xz"
105
106 -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
107 +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
108 inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
109 unset SCM_ECLASS
110
111 @@ -243,6 +243,9 @@
112 PATCHES=(
113 # not upstreamable stuff
114 "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
115 +
116 + # from master branch
117 + "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
118 )
119
120 REQUIRED_USE="
121 @@ -311,12 +314,10 @@
122 for mod in ${MODULES}; do
123 mypv=${PV/.9999}
124 [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
125 - EGIT_PROJECT="${PN}/${mod}"
126 - EGIT_SOURCEDIR="${WORKDIR}/${P}"
127 - [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
128 + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
129 + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
130 EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
131 - EGIT_NOUNPACK="true"
132 - git-2_src_unpack
133 + git-r3_src_unpack
134 if [[ ${mod} != core ]]; then
135 mod2=${mod}
136 # mapping does not match on help
137 @@ -326,7 +327,7 @@
138 rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
139 fi
140 done
141 - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
142 + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
143 fi
144 }
145
146
147
148
149 1.27 app-office/libreoffice/libreoffice-9999.ebuild
150
151 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild?rev=1.27&view=markup
152 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild?rev=1.27&content-type=text/plain
153 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild?r1=1.26&r2=1.27
154
155 Index: libreoffice-9999.ebuild
156 ===================================================================
157 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v
158 retrieving revision 1.26
159 retrieving revision 1.27
160 diff -u -r1.26 -r1.27
161 --- libreoffice-9999.ebuild 8 Feb 2015 18:59:16 -0000 1.26
162 +++ libreoffice-9999.ebuild 8 Feb 2015 22:42:18 -0000 1.27
163 @@ -1,6 +1,6 @@
164 # Copyright 1999-2015 Gentoo Foundation
165 # Distributed under the terms of the GNU General Public License v2
166 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.26 2015/02/08 18:59:16 dilfridge Exp $
167 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.27 2015/02/08 22:42:18 dilfridge Exp $
168
169 EAPI=5
170
171 @@ -26,7 +26,7 @@
172 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
173 # PATCHSET="${P}-patchset-01.tar.xz"
174
175 -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
176 +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
177 inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
178 unset SCM_ECLASS
179
180 @@ -311,12 +311,10 @@
181 for mod in ${MODULES}; do
182 mypv=${PV/.9999}
183 [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
184 - EGIT_PROJECT="${PN}/${mod}"
185 - EGIT_SOURCEDIR="${WORKDIR}/${P}"
186 - [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
187 + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
188 + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
189 EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
190 - EGIT_NOUNPACK="true"
191 - git-2_src_unpack
192 + git-r3_src_unpack
193 if [[ ${mod} != core ]]; then
194 mod2=${mod}
195 # mapping does not match on help
196 @@ -326,7 +324,7 @@
197 rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
198 fi
199 done
200 - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
201 + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
202 fi
203 }
204
205
206
207
208 1.34 app-office/libreoffice/libreoffice-4.2.9999.ebuild
209
210 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?rev=1.34&view=markup
211 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?rev=1.34&content-type=text/plain
212 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?r1=1.33&r2=1.34
213
214 Index: libreoffice-4.2.9999.ebuild
215 ===================================================================
216 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v
217 retrieving revision 1.33
218 retrieving revision 1.34
219 diff -u -r1.33 -r1.34
220 --- libreoffice-4.2.9999.ebuild 8 Feb 2015 18:53:59 -0000 1.33
221 +++ libreoffice-4.2.9999.ebuild 8 Feb 2015 22:42:18 -0000 1.34
222 @@ -1,6 +1,6 @@
223 # Copyright 1999-2015 Gentoo Foundation
224 # Distributed under the terms of the GNU General Public License v2
225 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.33 2015/02/08 18:53:59 dilfridge Exp $
226 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.34 2015/02/08 22:42:18 dilfridge Exp $
227
228 EAPI=5
229
230 @@ -26,7 +26,7 @@
231 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
232 # PATCHSET="${P}-patchset-01.tar.xz"
233
234 -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
235 +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
236 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
237 unset SCM_ECLASS
238
239 @@ -313,12 +313,10 @@
240 for mod in ${MODULES}; do
241 mypv=${PV/.9999}
242 [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
243 - EGIT_PROJECT="${PN}/${mod}"
244 - EGIT_SOURCEDIR="${WORKDIR}/${P}"
245 - [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
246 + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
247 + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
248 EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
249 - EGIT_NOUNPACK="true"
250 - git-2_src_unpack
251 + git-r3_src_unpack
252 if [[ ${mod} != core ]]; then
253 mod2=${mod}
254 # mapping does not match on help
255 @@ -328,7 +326,7 @@
256 rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
257 fi
258 done
259 - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
260 + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
261 fi
262 }
263
264
265
266
267 1.611 app-office/libreoffice/ChangeLog
268
269 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.611&view=markup
270 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.611&content-type=text/plain
271 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.610&r2=1.611
272
273 Index: ChangeLog
274 ===================================================================
275 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
276 retrieving revision 1.610
277 retrieving revision 1.611
278 diff -u -r1.610 -r1.611
279 --- ChangeLog 8 Feb 2015 18:59:16 -0000 1.610
280 +++ ChangeLog 8 Feb 2015 22:42:18 -0000 1.611
281 @@ -1,6 +1,18 @@
282 # ChangeLog for app-office/libreoffice
283 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
284 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.610 2015/02/08 18:59:16 dilfridge Exp $
285 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.611 2015/02/08 22:42:18 dilfridge Exp $
286 +
287 +*libreoffice-4.4.0.3 (08 Feb 2015)
288 +
289 + 08 Feb 2015; Andreas K. Huettel <dilfridge@g.o>
290 + +files/libreoffice-4.3.5.2-DPI.patch,
291 + +files/libreoffice-4.4.0.3-telepathy-build-fix.patch,
292 + +libreoffice-4.4.0.3.ebuild, libreoffice-4.2.9999.ebuild,
293 + libreoffice-4.3.9999.ebuild, libreoffice-4.4.9999.ebuild,
294 + libreoffice-9999.ebuild:
295 + Version bump (without keywords so far); update live ebuilds to git-r3.eclass;
296 + backport DPI patch for bug 523822 to the 4.3 branch. Thanks to Andreas
297 + Sturmlechner.
298
299 08 Feb 2015; Andreas K. Huettel <dilfridge@g.o>
300 libreoffice-4.4.9999.ebuild, libreoffice-9999.ebuild:
301
302
303
304 1.1 app-office/libreoffice/libreoffice-4.4.0.3.ebuild
305
306 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.4.0.3.ebuild?rev=1.1&view=markup
307 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.4.0.3.ebuild?rev=1.1&content-type=text/plain
308
309 Index: libreoffice-4.4.0.3.ebuild
310 ===================================================================
311 # Copyright 1999-2015 Gentoo Foundation
312 # Distributed under the terms of the GNU General Public License v2
313 # $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.0.3.ebuild,v 1.1 2015/02/08 22:42:18 dilfridge Exp $
314
315 EAPI=5
316
317 KDE_REQUIRED="optional"
318 QT_MINIMAL="4.7.4"
319 KDE_SCM="git"
320 CMAKE_REQUIRED="never"
321
322 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
323 PYTHON_REQ_USE="threads,xml"
324
325 # experimental ; release ; old
326 # Usually the tarballs are moved a lot so this should make
327 # everyone happy.
328 DEV_URI="
329 http://dev-builds.libreoffice.org/pre-releases/src
330 http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
331 http://download.documentfoundation.org/libreoffice/old/${PV}/
332 "
333 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
334 ADDONS_URI="http://dev-www.libreoffice.org/src/"
335
336 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
337 # PATCHSET="${P}-patchset-01.tar.xz"
338
339 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
340 inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
341 unset SCM_ECLASS
342
343 DESCRIPTION="LibreOffice, a full office productivity suite"
344 HOMEPAGE="http://www.libreoffice.org"
345 SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
346 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
347
348 # Split modules following git/tarballs
349 # Core MUST be first!
350 # Help is used for the image generator
351 MODULES="core help"
352 # Only release has the tarballs
353 if [[ ${PV} != *9999* ]]; then
354 for i in ${DEV_URI}; do
355 for mod in ${MODULES}; do
356 if [[ ${mod} == core ]]; then
357 SRC_URI+=" ${i}/${P}.tar.xz"
358 else
359 SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
360 fi
361 done
362 unset mod
363 done
364 unset i
365 fi
366 unset DEV_URI
367
368 # Really required addons
369 # These are bundles that can't be removed for now due to huge patchsets.
370 # If you want them gone, patches are welcome.
371 ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
372 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
373 ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
374 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
375 ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
376 ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
377 ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
378 ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
379 SRC_URI+=" ${ADDONS_SRC}"
380
381 unset ADDONS_URI
382 unset EXT_URI
383 unset ADDONS_SRC
384
385 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
386 +gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
387
388 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
389 # Unpackaged separate extensions:
390 # diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
391 # hunart: only on ooo extensions -> fubared download path somewhere on sf
392 # numbertext, typo, validator, watch-window: ^^
393 # oooblogger: no homepage or anything
394 # Extensions that need extra work:
395 for lo_xt in ${LO_EXTS}; do
396 IUSE+=" libreoffice_extensions_${lo_xt}"
397 done
398 unset lo_xt
399
400 LICENSE="|| ( LGPL-3 MPL-1.1 )"
401 SLOT="0"
402 #[[ ${PV} == *9999* ]] || \ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
403 # temporarily
404 COMMON_DEPEND="
405 ${PYTHON_DEPS}
406 app-arch/zip
407 app-arch/unzip
408 >=app-text/hunspell-1.3.2-r3
409 app-text/mythes
410 >=app-text/libabw-0.1.0
411 >=app-text/libexttextcat-3.2
412 >=app-text/libebook-0.1.1
413 >=app-text/libetonyek-0.1.1
414 app-text/liblangtag
415 >=app-text/libmspub-0.1.0
416 >=app-text/libmwaw-0.3.4
417 >=app-text/libodfgen-0.1.0
418 app-text/libwpd:0.10[tools]
419 app-text/libwpg:0.3
420 >=app-text/libwps-0.3.0
421 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
422 >=dev-cpp/clucene-2.3.3.4-r2
423 =dev-cpp/libcmis-0.5*
424 dev-db/unixODBC
425 >=dev-libs/boost-1.55:=
426 dev-libs/expat
427 >=dev-libs/hyphen-2.7.1
428 >=dev-libs/icu-4.8.1.1:=
429 >=dev-libs/liborcus-0.7.0
430 >=dev-libs/librevenge-0.0.1
431 >=dev-libs/nspr-4.8.8
432 >=dev-libs/nss-3.12.9
433 >=dev-lang/perl-5.0
434 >=dev-libs/openssl-1.0.0d:0
435 >=dev-libs/redland-1.0.16
436 media-gfx/graphite2
437 >=media-libs/fontconfig-2.8.0
438 media-libs/freetype:2
439 >=media-libs/glew-1.10
440 >=media-libs/harfbuzz-0.9.18:=[icu(+)]
441 media-libs/lcms:2
442 >=media-libs/libpng-1.4
443 >=media-libs/libcdr-0.1.0
444 >=media-libs/libfreehand-0.1.0
445 media-libs/libpagemaker
446 >=media-libs/libvisio-0.1.0
447 >=net-misc/curl-7.21.4
448 net-libs/neon
449 net-nds/openldap
450 sci-mathematics/lpsolve
451 virtual/jpeg:0
452 >=x11-libs/cairo-1.10.0[X]
453 x11-libs/libXinerama
454 x11-libs/libXrandr
455 x11-libs/libXrender
456 virtual/glu
457 virtual/opengl
458 bluetooth? ( net-wireless/bluez )
459 coinmp? ( sci-libs/coinor-mp )
460 collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
461 cups? ( net-print/cups )
462 dbus? ( >=dev-libs/dbus-glib-0.92 )
463 eds? ( gnome-extra/evolution-data-server )
464 firebird? ( >=dev-db/firebird-2.5 )
465 gltf? ( media-libs/libgltf )
466 gnome? ( gnome-base/gconf:2 )
467 gtk? (
468 x11-libs/gdk-pixbuf[X]
469 >=x11-libs/gtk+-2.24:2
470 )
471 gtk3? ( >=x11-libs/gtk+-3.2:3 )
472 gstreamer? (
473 media-libs/gstreamer:1.0
474 media-libs/gst-plugins-base:1.0
475 )
476 jemalloc? ( dev-libs/jemalloc )
477 libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
478 libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
479 libreoffice_extensions_wiki-publisher? (
480 dev-java/commons-codec:0
481 dev-java/commons-httpclient:3
482 dev-java/commons-lang:2.1
483 dev-java/commons-logging:0
484 dev-java/tomcat-servlet-api:3.0
485 )
486 mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
487 postgres? ( >=dev-db/postgresql-9.0[kerberos] )
488 telepathy? (
489 dev-libs/glib:2
490 >=net-libs/telepathy-glib-0.18.0
491 >=x11-libs/gtk+-2.24:2
492 )
493 "
494
495 RDEPEND="${COMMON_DEPEND}
496 !app-office/libreoffice-bin
497 !app-office/libreoffice-bin-debug
498 !<app-office/openoffice-bin-3.4.0-r1
499 !app-office/openoffice
500 media-fonts/libertine-ttf
501 media-fonts/liberation-fonts
502 media-fonts/urw-fonts
503 java? ( >=virtual/jre-1.6 )
504 vlc? ( media-video/vlc )
505 "
506
507 if [[ ${PV} != *9999* ]]; then
508 PDEPEND="~app-office/libreoffice-l10n-${PV}"
509 else
510 # Translations are not reliable on live ebuilds
511 # rather force people to use english only.
512 PDEPEND="!app-office/libreoffice-l10n"
513 fi
514
515 # FIXME: cppunit should be moved to test conditional
516 # after everything upstream is under gbuild
517 # as dmake execute tests right away
518 DEPEND="${COMMON_DEPEND}
519 >=dev-libs/libatomic_ops-7.2d
520 >=dev-libs/libxml2-2.7.8
521 dev-libs/libxslt
522 dev-perl/Archive-Zip
523 dev-util/cppunit
524 >=dev-util/gperf-3
525 dev-util/intltool
526 >=dev-util/mdds-0.10.3:=
527 media-libs/glm
528 net-misc/npapi-sdk
529 >=sys-apps/findutils-4.4.2
530 sys-devel/bison
531 sys-apps/coreutils
532 sys-devel/flex
533 sys-devel/gettext
534 >=sys-devel/make-3.82
535 sys-devel/ucpp
536 sys-libs/zlib
537 virtual/pkgconfig
538 x11-libs/libXt
539 x11-libs/libXtst
540 x11-proto/randrproto
541 x11-proto/xextproto
542 x11-proto/xineramaproto
543 x11-proto/xproto
544 java? (
545 >=virtual/jdk-1.6
546 >=dev-java/ant-core-1.7
547 )
548 odk? ( >=app-doc/doxygen-1.8.4 )
549 test? ( dev-util/cppunit )
550 "
551
552 PATCHES=(
553 # not upstreamable stuff
554 "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
555
556 # from master branch
557 "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
558 )
559
560 REQUIRED_USE="
561 ${PYTHON_REQUIRED_USE}
562 bluetooth? ( dbus )
563 collada? ( gltf )
564 gnome? ( gtk )
565 eds? ( gnome )
566 telepathy? ( gtk )
567 libreoffice_extensions_nlpsolver? ( java )
568 libreoffice_extensions_scripting-beanshell? ( java )
569 libreoffice_extensions_scripting-javascript? ( java )
570 libreoffice_extensions_wiki-publisher? ( java )
571 "
572
573 CHECKREQS_MEMORY="512M"
574 CHECKREQS_DISK_BUILD="6G"
575
576 pkg_pretend() {
577 local pgslot
578
579 if [[ ${MERGE_TYPE} != binary ]]; then
580 check-reqs_pkg_pretend
581
582 if [[ $(gcc-major-version) -lt 4 ]] || \
583 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
584 ; then
585 eerror "Compilation with gcc older than 4.6 is not supported"
586 die "Too old gcc found."
587 fi
588 fi
589
590 # Ensure pg version but we have to be sure the pg is installed (first
591 # install on clean system)
592 if use postgres && has_version dev-db/postgresql; then
593 pgslot=$(postgresql-config show)
594 if [[ ${pgslot//.} < 90 ]] ; then
595 eerror "PostgreSQL slot must be set to 9.0 or higher."
596 eerror " postgresql-config set 9.0"
597 die "PostgreSQL slot is not set to 9.0 or higher."
598 fi
599 fi
600 }
601
602 pkg_setup() {
603 java-pkg-opt-2_pkg_setup
604 kde4-base_pkg_setup
605 python-single-r1_pkg_setup
606
607 [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
608 }
609
610 src_unpack() {
611 local mod mod2 dest tmplfile tmplname mypv
612
613 [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
614 use branding && unpack "${BRANDING}"
615
616 if [[ ${PV} != *9999* ]]; then
617 unpack "${P}.tar.xz"
618 for mod in ${MODULES}; do
619 [[ ${mod} == core ]] && continue
620 unpack "${PN}-${mod}-${PV}.tar.xz"
621 done
622 else
623 for mod in ${MODULES}; do
624 mypv=${PV/.9999}
625 [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
626 EGIT_PROJECT="${PN}/${mod}"
627 EGIT_SOURCEDIR="${WORKDIR}/${P}"
628 [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
629 EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
630 EGIT_NOUNPACK="true"
631 git-2_src_unpack
632 if [[ ${mod} != core ]]; then
633 mod2=${mod}
634 # mapping does not match on help
635 [[ ${mod} == help ]] && mod2="helpcontent2"
636 mkdir -p "${S}/${mod2}/" || die
637 mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
638 rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
639 fi
640 done
641 unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
642 fi
643 }
644
645 src_prepare() {
646 # optimization flags
647 export GMAKE_OPTIONS="${MAKEOPTS}"
648 # System python 2.7 enablement:
649 export PYTHON_CFLAGS=$(python_get_CFLAGS)
650 export PYTHON_LIBS=$(python_get_LIBS)
651
652 if use collada; then
653 export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
654 export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
655 fi
656
657 # patchset
658 if [[ -n ${PATCHSET} ]]; then
659 EPATCH_FORCE="yes" \
660 EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
661 EPATCH_SUFFIX="patch" \
662 epatch
663 fi
664
665 base_src_prepare
666
667 AT_M4DIR="m4" eautoreconf
668 # hack in the autogen.sh
669 touch autogen.lastrun
670
671 # system pyuno mess
672 sed \
673 -e "s:%eprefix%:${EPREFIX}:g" \
674 -e "s:%libdir%:$(get_libdir):g" \
675 -i pyuno/source/module/uno.py \
676 -i pyuno/source/officehelper.py || die
677 # sed in the tests
678 sed -i \
679 -e 's#all : build unitcheck#all : build#g' \
680 solenv/gbuild/Module.mk || die
681 sed -i \
682 -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
683 -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
684 Makefile.in || die
685
686 if use branding; then
687 # hack...
688 mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
689 fi
690 }
691
692 src_configure() {
693 local java_opts
694 local internal_libs
695 local lo_ext
696 local ext_opts
697
698 # sane: just sane.h header that is used for scan in writer, not
699 # linked or anything else, worthless to depend on
700 # vigra: just uses templates from there
701 # it is serious pain in the ass for packaging
702 # should be replaced by boost::gil if someone interested
703 internal_libs+="
704 --without-system-sane
705 --without-system-vigra
706 "
707
708 # libreoffice extensions handling
709 for lo_xt in ${LO_EXTS}; do
710 if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
711 ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
712 else
713 ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
714 fi
715 done
716
717 if use java; then
718 # hsqldb: system one is too new
719 java_opts="
720 --without-junit
721 --without-system-hsqldb
722 --with-ant-home="${ANT_HOME}"
723 --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
724 --with-jvm-path="${EPREFIX}/usr/lib/"
725 "
726
727 use libreoffice_extensions_scripting-beanshell && \
728 java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
729
730 use libreoffice_extensions_scripting-javascript && \
731 java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
732
733 if use libreoffice_extensions_wiki-publisher; then
734 java_opts+="
735 --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
736 --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
737 --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
738 --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
739 --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
740 "
741 fi
742 fi
743
744 # system headers/libs/...: enforce using system packages
745 # --enable-cairo: ensure that cairo is always required
746 # --enable-graphite: disabling causes build breakages
747 # --enable-*-link: link to the library rather than just dlopen on runtime
748 # --enable-release-build: build the libreoffice as release
749 # --disable-fetch-external: prevent dowloading during compile phase
750 # --disable-gnome-vfs: old gnome virtual fs support
751 # --disable-kdeab: kde3 adressbook
752 # --disable-kde: kde3 support
753 # --disable-systray: quickstarter does not actually work at all so do not
754 # promote it
755 # --enable-extension-integration: enable any extension integration support
756 # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
757 # --disable-report-builder: too much java packages pulled in without pkgs
758 econf \
759 --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
760 --with-system-headers \
761 --with-system-libs \
762 --with-system-jars \
763 --with-system-dicts \
764 --enable-cairo-canvas \
765 --enable-graphite \
766 --enable-largefile \
767 --enable-mergelibs \
768 --enable-neon \
769 --enable-python=system \
770 --enable-randr \
771 --enable-randr-link \
772 --enable-release-build \
773 --disable-hardlink-deliver \
774 --disable-ccache \
775 --disable-crashdump \
776 --disable-dependency-tracking \
777 --disable-epm \
778 --disable-fetch-external \
779 --disable-gnome-vfs \
780 --disable-gstreamer-0-10 \
781 --disable-report-builder \
782 --disable-kdeab \
783 --disable-kde \
784 --disable-online-update \
785 --disable-systray \
786 --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
787 --with-build-version="Gentoo official package" \
788 --enable-extension-integration \
789 --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
790 --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
791 --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
792 --with-external-tar="${DISTDIR}" \
793 --with-lang="" \
794 --with-parallelism=$(makeopts_jobs) \
795 --with-system-ucpp \
796 --with-vendor="Gentoo Foundation" \
797 --with-x \
798 --without-fonts \
799 --without-myspell-dicts \
800 --without-help \
801 --with-helppack-integration \
802 --without-sun-templates \
803 $(use_enable bluetooth sdremote-bluetooth) \
804 $(use_enable coinmp) \
805 $(use_enable collada) \
806 $(use_enable cups) \
807 $(use_enable debug) \
808 $(use_enable dbus) \
809 $(use_enable eds evolution2) \
810 $(use_enable firebird firebird-sdbc) \
811 $(use_enable gltf) \
812 $(use_enable gnome gconf) \
813 $(use_enable gnome gio) \
814 $(use_enable gnome lockdown) \
815 $(use_enable gstreamer gstreamer-1-0) \
816 $(use_enable gtk) \
817 $(use_enable gtk3) \
818 $(use_enable kde kde4) \
819 $(use_enable mysql ext-mariadb-connector) \
820 $(use_enable odk) \
821 $(use_enable postgres postgresql-sdbc) \
822 $(use_enable telepathy) \
823 $(use_enable vlc) \
824 $(use_with coinmp system-coinmp) \
825 $(use_with collada system-opencollada) \
826 $(use_with gltf system-libgltf) \
827 $(use_with java) \
828 $(use_with mysql system-mysql-cppconn) \
829 $(use_with odk doxygen) \
830 ${internal_libs} \
831 ${java_opts} \
832 ${ext_opts}
833 }
834
835 src_compile() {
836 # hack for offlinehelp, this needs fixing upstream at some point
837 # it is broken because we send --without-help
838 # https://bugs.freedesktop.org/show_bug.cgi?id=46506
839 (
840 grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
841 source "${T}/config_host.mk" 2&> /dev/null
842
843 local path="${WORKDIR}/helpcontent2/source/auxiliary/"
844 mkdir -p "${path}" || die
845
846 echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
847 perl "${S}/helpcontent2/helpers/create_ilst.pl" \
848 -dir=icon-themes/galaxy/res/helpimg \
849 > "${path}/helpimg.ilst"
850 [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
851 )
852
853 local target
854 use test && target="build" || target="build-nocheck"
855
856 # this is not a proper make script
857 make ${target} || die
858 }
859
860 src_test() {
861 make unitcheck || die
862 make slowcheck || die
863 }
864
865 src_install() {
866 # This is not Makefile so no buildserver
867 make DESTDIR="${D}" distro-pack-install -o build -o check || die
868
869 # Fix bash completion placement
870 newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
871 bashcomp_alias \
872 libreoffice \
873 unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
874 rm -rf "${ED}"/etc/ || die
875
876 if use branding; then
877 insinto /usr/$(get_libdir)/${PN}/program
878 newins "${WORKDIR}/branding-sofficerc" sofficerc
879 dodir /etc/env.d
880 echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
881 fi
882
883 # Hack for offlinehelp, this needs fixing upstream at some point.
884 # It is broken because we send --without-help
885 # https://bugs.freedesktop.org/show_bug.cgi?id=46506
886 insinto /usr/$(get_libdir)/libreoffice/help
887 doins xmlhelp/util/*.xsl
888
889 # Remove desktop files for support to old installs that can't parse mime
890 rm -rf "${ED}"/usr/share/mimelnk/
891
892 # FIXME: Hack add missing file
893 insinto /usr/$(get_libdir)/${PN}/program
894 doins "${S}"/instdir/program/libsaxlo.so
895
896 pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
897 pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
898 }
899
900 pkg_preinst() {
901 # Cache updates - all handled by kde eclass for all environments
902 kde4-base_pkg_preinst
903 }
904
905 pkg_postinst() {
906 kde4-base_pkg_postinst
907
908 use java || \
909 ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
910 }
911
912 pkg_postrm() {
913 kde4-base_pkg_postrm
914 }