Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.99.3.ebuild ChangeLog libreoffice-3.4.99.2.ebuild
Date: Wed, 11 Jan 2012 11:16:22
Message-Id: 20120111111610.878A32004B@flycatcher.gentoo.org
1 scarabeus 12/01/11 11:16:10
2
3 Modified: ChangeLog
4 Added: libreoffice-3.4.99.3.ebuild
5 Removed: libreoffice-3.4.99.2.ebuild
6 Log:
7 Bump to beta3.
8
9 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.225 app-office/libreoffice/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.225&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.225&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.224&r2=1.225
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
21 retrieving revision 1.224
22 retrieving revision 1.225
23 diff -u -r1.224 -r1.225
24 --- ChangeLog 8 Jan 2012 14:25:01 -0000 1.224
25 +++ ChangeLog 11 Jan 2012 11:16:10 -0000 1.225
26 @@ -1,6 +1,12 @@
27 # ChangeLog for app-office/libreoffice
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.224 2012/01/08 14:25:01 dilfridge Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.225 2012/01/11 11:16:10 scarabeus Exp $
31 +
32 +*libreoffice-3.4.99.3 (11 Jan 2012)
33 +
34 + 11 Jan 2012; Tomáš Chvátal <scarabeus@g.o>
35 + -libreoffice-3.4.99.2.ebuild, +libreoffice-3.4.99.3.ebuild:
36 + Bump to beta3.
37
38 08 Jan 2012; Andreas K. Huettel <dilfridge@g.o>
39 +files/libreoffice-kde48.patch, libreoffice-3.4.5.2.ebuild,
40
41
42
43 1.1 app-office/libreoffice/libreoffice-3.4.99.3.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.99.3.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.99.3.ebuild?rev=1.1&content-type=text/plain
47
48 Index: libreoffice-3.4.99.3.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.99.3.ebuild,v 1.1 2012/01/11 11:16:10 scarabeus Exp $
53
54 EAPI=4
55
56 KDE_REQUIRED="optional"
57 KDE_SCM="git"
58 CMAKE_REQUIRED="never"
59
60 PYTHON_DEPEND="2"
61 PYTHON_USE_WITH="threads,xml"
62
63 # experimental ; release ; old
64 # Usually the tarballs are moved a lot so this should make
65 # everyone happy.
66 DEV_URI="
67 http://dev-builds.libreoffice.org/pre-releases/src
68 http://download.documentfoundation.org/libreoffice/src
69 http://download.documentfoundation.org/libreoffice/old/src
70 "
71 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
72 ADDONS_URI="http://dev-www.libreoffice.org/src/"
73
74 BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
75 # PATCHSET="${P}-patchset-01.tar.xz"
76
77 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
78 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
79 unset SCM_ECLASS
80
81 DESCRIPTION="LibreOffice, a full office productivity suite."
82 HOMEPAGE="http://www.libreoffice.org"
83 SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
84 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
85
86 # Split modules following git/tarballs
87 # Core MUST be first!
88 MODULES="core binfilter"
89 # Only release has the tarballs
90 if [[ ${PV} != *9999* ]]; then
91 for i in ${DEV_URI}; do
92 for mod in ${MODULES}; do
93 if [[ ${mod} == binfilter ]]; then
94 SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
95 else
96 SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
97 fi
98 done
99 unset mod
100 done
101 unset i
102 fi
103 unset DEV_URI
104
105 # Really required addons
106 # These are bundles that can't be removed for now due to huge patchsets.
107 # If you want them gone, patches are welcome.
108 ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
109 ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
110 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
111 ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
112 ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
113 ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
114 ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
115 SRC_URI+=" ${ADDONS_SRC}"
116
117 unset ADDONS_URI
118 unset EXT_URI
119 unset ADDONS_SRC
120
121 IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
122 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
123 +webdav +xmlsec"
124 LICENSE="LGPL-3"
125 SLOT="0"
126 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
127
128 NSS_DEPEND="
129 >=dev-libs/nspr-4.8.8
130 >=dev-libs/nss-3.12.9
131 "
132
133 COMMON_DEPEND="
134 app-arch/zip
135 app-arch/unzip
136 >=app-text/hunspell-1.3.2-r3
137 app-text/mythes
138 >=app-text/libexttextcat-3.2
139 app-text/libwpd:0.9[tools]
140 app-text/libwpg:0.2
141 >=app-text/libwps-0.2.2
142 dev-cpp/libcmis
143 dev-db/unixODBC
144 dev-libs/expat
145 >=dev-libs/glib-2.28
146 >=dev-libs/hyphen-2.7.1
147 >=dev-libs/icu-4.8.1-r1
148 >=dev-lang/perl-5.0
149 >=dev-libs/openssl-1.0.0d
150 >=dev-libs/redland-1.0.14[ssl]
151 >=media-libs/fontconfig-2.8.0
152 media-libs/freetype:2
153 >=media-libs/libpng-1.4
154 media-libs/libvisio
155 net-print/cups
156 sci-mathematics/lpsolve
157 >=sys-libs/db-4.8
158 virtual/jpeg
159 >=x11-libs/cairo-1.10.0
160 x11-libs/libXinerama
161 x11-libs/libXrandr
162 x11-libs/libXrender
163 dbus? ( >=dev-libs/dbus-glib-0.92 )
164 eds? ( gnome-extra/evolution-data-server )
165 gnome? (
166 gnome-base/gconf:2
167 gnome-base/orbit
168 )
169 gtk? ( >=x11-libs/gtk+-2.24:2 )
170 gtk3? ( >=x11-libs/gtk+-3.2:3 )
171 graphite? ( media-gfx/graphite2 )
172 gstreamer? (
173 >=media-libs/gstreamer-0.10
174 >=media-libs/gst-plugins-base-0.10
175 )
176 java? (
177 >=dev-java/bsh-2.0_beta4
178 dev-java/lucene:2.9
179 dev-java/lucene-analyzers:2.3
180 )
181 jemalloc? ( dev-libs/jemalloc )
182 mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
183 opengl? ( virtual/opengl )
184 pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
185 postgres? ( >=dev-db/postgresql-base-8.4.0 )
186 svg? ( gnome-base/librsvg )
187 webdav? ( net-libs/neon )
188 xmlsec? ( ${NSS_DEPEND} )
189 "
190
191 RDEPEND="${COMMON_DEPEND}
192 !app-office/libreoffice-bin
193 !app-office/openoffice-bin
194 !app-office/openoffice
195 media-fonts/libertine-ttf
196 media-fonts/liberation-fonts
197 java? ( >=virtual/jre-1.6 )
198 "
199
200 PDEPEND="
201 >=app-office/libreoffice-l10n-3.5.0
202 "
203
204 # FIXME: cppunit should be moved to test conditional
205 # after everything upstream is under gbuild
206 # as dmake execute tests right away
207 DEPEND="${COMMON_DEPEND}
208 >=dev-libs/boost-1.46
209 >=dev-libs/libxml2-2.7.8
210 dev-libs/libxslt
211 dev-perl/Archive-Zip
212 dev-util/cppunit
213 >=dev-util/gperf-3
214 dev-util/intltool
215 dev-util/mdds
216 >=dev-util/pkgconfig-0.26
217 media-libs/sampleicc
218 >=net-misc/curl-7.21.4
219 net-misc/npapi-sdk
220 >=sys-apps/findutils-4.4.2
221 sys-devel/bison
222 sys-apps/coreutils
223 sys-devel/flex
224 sys-devel/gettext
225 >=sys-devel/make-3.82
226 sys-libs/zlib
227 x11-libs/libXtst
228 x11-proto/randrproto
229 x11-proto/xextproto
230 x11-proto/xineramaproto
231 x11-proto/xproto
232 java? (
233 =virtual/jdk-1.6*
234 >=dev-java/ant-core-1.7
235 test? ( dev-java/junit:4 )
236 )
237 "
238
239 PATCHES=(
240 )
241
242 REQUIRED_USE="
243 nsplugin? ( gtk )
244 gnome? ( gtk )
245 eds? ( gnome )
246 "
247
248 S="${WORKDIR}/${PN}-core-${PV}"
249
250 pkg_pretend() {
251 local pgslot
252
253 if [[ ${MERGE_TYPE} != binary ]]; then
254 CHECKREQS_MEMORY="512M"
255 use debug && CHECKREQS_DISK_BUILD="10G" || CHECKREQS_DISK_BUILD="6G"
256 check-reqs_pkg_pretend
257
258 if [[ $(gcc-major-version) -lt 4 ]]; then
259 eerror "Compilation with gcc older than 4.0 is not supported"
260 die "Too old gcc found."
261 fi
262 fi
263
264 # ensure pg version
265 if use postgres; then
266 pgslot=$(postgresql-config show)
267 if [[ ${pgslot//.} < 90 ]] ; then
268 eerror "PostgreSQL slot must be set to 9.0 or higher."
269 eerror " postgresql-config set 9.0"
270 die "PostgreSQL slot is not set to 9.0 or higher."
271 fi
272 fi
273 }
274
275 pkg_setup() {
276 java-pkg-opt-2_pkg_setup
277 kde4-base_pkg_setup
278
279 python_set_active_version 2
280 python_pkg_setup
281
282 if ! use gtk; then
283 ewarn "If you want the LibreOffice systray quickstarter to work"
284 ewarn "activate the 'gtk' use flag."
285 ewarn
286 fi
287 }
288
289 src_unpack() {
290 local mod dest tmplfile tmplname mypv
291
292 [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
293 if use branding; then
294 unpack "${BRANDING}"
295 fi
296
297 if [[ ${PV} != *9999* ]]; then
298 for mod in ${MODULES}; do
299 if [[ ${mod} == binfilter ]] && ! use binfilter; then
300 continue
301 fi
302 unpack "${PN}-${mod}-${PV}.tar.xz"
303 if [[ ${mod} != core ]]; then
304 mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
305 rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
306 fi
307 done
308 else
309 for mod in ${MODULES}; do
310 if [[ ${mod} == binfilter ]] && ! use binfilter; then
311 continue
312 fi
313 mypv=${PV/.9999}
314 [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
315 EGIT_PROJECT="${PN}/${mod}"
316 EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
317 EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
318 EGIT_NOUNPACK="true"
319 git-2_src_unpack
320 if [[ ${mod} != core ]]; then
321 mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
322 rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
323 fi
324 done
325 unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
326 fi
327 }
328
329 src_prepare() {
330 # optimization flags
331 export ARCH_FLAGS="${CXXFLAGS}"
332 export LINKFLAGSOPTIMIZE="${LDFLAGS}"
333
334 # patchset
335 if [[ -n ${PATCHSET} ]]; then
336 EPATCH_FORCE="yes" \
337 EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
338 EPATCH_SUFFIX="patch" \
339 epatch
340 fi
341
342 base_src_prepare
343 eautoreconf
344 # hack in the autogen.sh
345 touch autogen.lastrun
346 }
347
348 src_configure() {
349 local java_opts
350 local internal_libs
351 local themes="default"
352 local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
353
354 # recheck that there is some value in jobs
355 [[ -z ${jbs} ]] && jbs="1"
356
357 # expand themes we are going to build based on DE useflags
358 use gnome && themes+=" tango"
359 use kde && themes+=" oxygen"
360
361 # sane: just sane.h header that is used for scan in writer, not
362 # linked or anything else, worthless to depend on
363 # vigra: just uses templates from there
364 # it is serious pain in the ass for packaging
365 # should be replaced by boost::gil if someone interested
366 internal_libs+="
367 --without-system-sane
368 --without-system-vigra
369 "
370
371 if use java; then
372 # hsqldb: system one is too new
373 # saxon: system one does not work properly
374 java_opts="
375 --without-system-hsqldb
376 --without-system-saxon
377 --with-ant-home="${ANT_HOME}"
378 --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
379 --with-java-target-version=$(java-pkg_get-target)
380 --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
381 --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
382 --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
383 --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
384 "
385 if use test; then
386 java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
387 else
388 java_opts+=" --without-junit"
389 fi
390 fi
391
392 if use branding; then
393 internal_libs+="
394 --with-about-bitmap="${WORKDIR}/branding-about.png"
395 --with-intro-bitmap="${WORKDIR}/branding-intro.png"
396 "
397 fi
398
399 # system headers/libs/...: enforce using system packages
400 # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
401 # --enable-cairo: ensure that cairo is always required
402 # --enable-*-link: link to the library rather than just dlopen on runtime
403 # --enable-release-build: build the libreoffice as release
404 # --disable-fetch-external: prevent dowloading during compile phase
405 # --disable-gnome-vfs: old gnome virtual fs support
406 # --disable-kdeab: kde3 adressbook
407 # --disable-kde: kde3 support
408 # --disable-ldap: ldap requires internal mozilla stuff, same like mozab
409 # --disable-mozilla: disable mozilla build that is used for adresbook, not
410 # affecting the nsplugin that is always ON
411 # --disable-pch: precompiled headers cause build crashes
412 # --disable-rpath: relative runtime path is not desired
413 # --disable-static-gtk: ensure that gtk is linked dynamically
414 # --disable-ugly: disable ugly pieces of code
415 # --disable-zenity: disable build icon
416 # --enable-extension-integration: enable any extension integration support
417 # --with-{max-jobs,num-cpus}: ensuring parallel building
418 # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
419 # --without-stlport: disable deprecated extensions framework
420 # --disable-ext-report-builder: too much java packages pulled in
421 econf \
422 --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
423 --with-system-headers \
424 --with-system-libs \
425 --with-system-jars \
426 --with-system-dicts \
427 --enable-cairo-canvas \
428 --enable-largefile \
429 --enable-python=system \
430 --enable-randr \
431 --enable-randr-link \
432 --enable-release-build \
433 --enable-unix-qstart-libpng \
434 --disable-ccache \
435 --disable-crashdump \
436 --disable-dependency-tracking \
437 --disable-epm \
438 --disable-fetch-external \
439 --disable-gnome-vfs \
440 --disable-ext-report-builder \
441 --disable-kdeab \
442 --disable-kde \
443 --disable-ldap \
444 --disable-mozilla \
445 --disable-online-update \
446 --disable-pch \
447 --disable-rpath \
448 --disable-static-gtk \
449 --disable-strip-solver \
450 --disable-ugly \
451 --disable-zenity \
452 --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
453 --with-build-version="Gentoo official package" \
454 --enable-extension-integration \
455 --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
456 --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
457 --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
458 --with-external-tar="${DISTDIR}" \
459 --with-lang="" \
460 --with-max-jobs=${jbs} \
461 --with-num-cpus=${jbs} \
462 --with-theme="${themes}" \
463 --with-unix-wrapper=libreoffice \
464 --with-vendor="Gentoo Foundation" \
465 --with-x \
466 --without-afms \
467 --without-fonts \
468 --without-myspell-dicts \
469 --without-ppds \
470 --without-stlport \
471 --without-system-mozilla \
472 --without-help \
473 --without-helppack-integration \
474 --without-sun-templates \
475 $(use_enable binfilter) \
476 $(use_enable dbus) \
477 $(use_enable debug crashdump) \
478 $(use_enable eds evolution2) \
479 $(use_enable gnome gconf) \
480 $(use_enable gnome gio) \
481 $(use_enable gnome lockdown) \
482 $(use_enable graphite) \
483 $(use_enable gstreamer) \
484 $(use_enable gtk) \
485 $(use_enable gtk3) \
486 $(use_enable gtk systray) \
487 $(use_enable java ext-scripting-beanshell) \
488 $(use_enable kde kde4) \
489 $(use_enable mysql ext-mysql-connector) \
490 $(use_enable nsplugin) \
491 $(use_enable odk) \
492 $(use_enable opengl) \
493 $(use_enable pdfimport ext-pdfimport) \
494 $(use_enable postgres ext-postgresql-sdbc) \
495 $(use_enable svg librsvg system) \
496 $(use_enable test linkoo) \
497 $(use_enable vba) \
498 $(use_enable vba activex-component) \
499 $(use_enable webdav neon) \
500 $(use_enable xmlsec) \
501 $(use_with java) \
502 $(use_with mysql system-mysql-cppconn) \
503 ${internal_libs} \
504 ${java_opts}
505 }
506
507 src_compile() {
508 # this is not a proper make script and the jobs are passed during configure
509 make build || die
510 }
511
512 src_test() {
513 make check || die
514 }
515
516 src_install() {
517 # This is not Makefile so no buildserver
518 make DESTDIR="${D}" distro-pack-install -o build -o check || die
519
520 # Fix bash completion placement
521 newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
522 rm -rf "${ED}"/etc/
523
524 # symlink the nsplugin to system location
525 if use nsplugin; then
526 inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
527 fi
528
529 if use branding; then
530 insinto /usr/$(get_libdir)/${PN}/program
531 newins "${WORKDIR}/branding-sofficerc" sofficerc
532 fi
533 }
534
535 pkg_preinst() {
536 # Cache updates - all handled by kde eclass for all environments
537 kde4-base_pkg_preinst
538 }
539
540 pkg_postinst() {
541 kde4-base_pkg_postinst
542
543 pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
544 }
545
546 pkg_postrm() {
547 kde4-base_pkg_postrm
548 }