Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice: ChangeLog openoffice-3.1.1.ebuild openoffice-3.1.1_beta2.ebuild
Date: Wed, 02 Sep 2009 13:58:45
Message-Id: E1MivAw-0006Og-M5@stork.gentoo.org
1 suka 09/09/02 19:07:22
2
3 Modified: ChangeLog
4 Added: openoffice-3.1.1.ebuild
5 Removed: openoffice-3.1.1_beta2.ebuild
6 Log:
7 Bump to OpenOffice.org 3.1.1, mostly bugfixes, also adds KDE4 support
8 (Portage version: 2.2_rc40/cvs/Linux i686)
9
10 Revision Changes Path
11 1.477 app-office/openoffice/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.477&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.477&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.476&r2=1.477
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v
20 retrieving revision 1.476
21 retrieving revision 1.477
22 diff -u -r1.476 -r1.477
23 --- ChangeLog 20 Aug 2009 10:30:25 -0000 1.476
24 +++ ChangeLog 2 Sep 2009 19:07:22 -0000 1.477
25 @@ -1,6 +1,14 @@
26 # ChangeLog for app-office/openoffice
27 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.476 2009/08/20 10:30:25 scarabeus Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.477 2009/09/02 19:07:22 suka Exp $
30 +
31 +*openoffice-3.1.1 (02 Sep 2009)
32 +
33 + 02 Sep 2009; Andreas Proschofsky <suka@g.o>
34 + -openoffice-3.1.1_beta2.ebuild, +openoffice-3.1.1.ebuild,
35 + -files/gentoo-3.1.1_beta2.diff, +files/gentoo-3.1.1.diff,
36 + +files/gentoo-pythonpath.diff:
37 + Bump to OpenOffice.org 3.1.1, mostly bugfixes, also adds KDE4 support
38
39 20 Aug 2009; Tomáš Chvátal <scarabeus@g.o>
40 openoffice-3.1.1_beta2.ebuild:
41
42
43
44 1.1 app-office/openoffice/openoffice-3.1.1.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: openoffice-3.1.1.ebuild
50 ===================================================================
51 # Copyright 1999-2009 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.1 2009/09/02 19:07:22 suka Exp $
54
55 WANT_AUTOMAKE="1.9"
56 EAPI="2"
57 KDE_REQUIRED="optional"
58 WANT_CMAKE="false"
59
60 inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs
61
62 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
63
64 MY_PV=3.1.1.1
65 PATCHLEVEL=OOO310
66 SRC=OOo_${PV}_src
67 MST=ooo310-m19
68 DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST}
69 S=${WORKDIR}/ooo
70 S_OLD=${WORKDIR}/ooo-build-${MY_PV}
71 CONFFILE=${S}/distro-configs/Gentoo.conf.in
72 BASIS=basis3.1
73 DESCRIPTION="OpenOffice.org, a full office productivity suite."
74
75 SRC_URI="${DEVPATH}-artwork.tar.bz2
76 ${DEVPATH}-base.tar.bz2
77 ${DEVPATH}-bootstrap.tar.bz2
78 ${DEVPATH}-calc.tar.bz2
79 ${DEVPATH}-components.tar.bz2
80 ${DEVPATH}-extensions.tar.bz2
81 ${DEVPATH}-extras.tar.bz2
82 ${DEVPATH}-filters.tar.bz2
83 ${DEVPATH}-help.tar.bz2
84 ${DEVPATH}-impress.tar.bz2
85 ${DEVPATH}-libs-core.tar.bz2
86 ${DEVPATH}-libs-extern.tar.bz2
87 ${DEVPATH}-libs-extern-sys.tar.bz2
88 ${DEVPATH}-libs-gui.tar.bz2
89 ${DEVPATH}-postprocess.tar.bz2
90 ${DEVPATH}-sdk.tar.bz2
91 ${DEVPATH}-testing.tar.bz2
92 ${DEVPATH}-ure.tar.bz2
93 ${DEVPATH}-writer.tar.bz2
94 templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
95 http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
96 http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
97 http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
98 http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt )
99 http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
100 odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
101 http://download.go-oo.org/SRC680/extras-3.tar.bz2
102 http://download.go-oo.org/SRC680/biblio.tar.bz2
103 http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
104 http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
105 http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz
106 http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
107 http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz"
108
109 LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
110 LANGS="${LANGS1} en en_US"
111
112 for X in ${LANGS} ; do
113 IUSE="${IUSE} linguas_${X}"
114 done
115
116 HOMEPAGE="http://go-oo.org"
117
118 LICENSE="LGPL-2"
119 SLOT="0"
120 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
121
122 COMMON_DEPEND="!app-office/openoffice-bin
123 x11-libs/libXaw
124 x11-libs/libXinerama
125 x11-libs/libXrandr
126 >=dev-lang/perl-5.0
127 >=dev-libs/glib-2.18
128 dbus? ( >=dev-libs/dbus-glib-0.71 )
129 gnome? ( >=x11-libs/gtk+-2.10
130 >=gnome-base/gconf-2.0
131 >=x11-libs/cairo-1.0.2 )
132 gtk? ( >=x11-libs/gtk+-2.10
133 >=x11-libs/cairo-1.0.2 )
134 eds? ( >=gnome-extra/evolution-data-server-1.2 )
135 gstreamer? ( >=media-libs/gstreamer-0.10
136 >=media-libs/gst-plugins-base-0.10 )
137 java? ( >=dev-java/bsh-2.0_beta4
138 >=dev-db/hsqldb-1.8.0.9
139 dev-java/lucene:2.3
140 dev-java/lucene-analyzers:2.3
141 dev-java/rhino:1.5 )
142 mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
143 nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
144 >=dev-libs/nspr-4.6.6
145 >=dev-libs/nss-3.11-r1 )
146 opengl? ( virtual/opengl
147 virtual/glu )
148 >=net-misc/neon-0.24.7
149 >=dev-libs/openssl-0.9.8g
150 >=media-libs/freetype-2.1.10-r2
151 >=media-libs/fontconfig-2.3.0
152 cups? ( net-print/cups )
153 media-libs/jpeg
154 media-libs/libpng
155 app-arch/zip
156 app-arch/unzip
157 >=app-text/hunspell-1.1.4-r1
158 dev-libs/expat
159 >=dev-libs/icu-4.0
160 >=sys-libs/db-4.3
161 >=app-text/libwpd-0.8.8
162 >=dev-libs/redland-1.0.8
163 >=media-libs/vigra-1.4
164 >=virtual/poppler-0.8.0"
165
166 RDEPEND="java? ( >=virtual/jre-1.5 )
167 ${COMMON_DEPEND}"
168
169 DEPEND="${COMMON_DEPEND}
170 x11-libs/libXrender
171 x11-libs/libXtst
172 x11-proto/printproto
173 x11-proto/xextproto
174 x11-proto/xproto
175 x11-proto/xineramaproto
176 >=sys-apps/findutils-4.1.20-r1
177 dev-perl/Archive-Zip
178 virtual/perl-IO-Compress
179 >=virtual/perl-Compress-Raw-Zlib-2.002
180 dev-util/pkgconfig
181 dev-util/intltool
182 >=dev-libs/boost-1.33.1
183 sys-devel/flex
184 sys-devel/bison
185 dev-libs/libxslt
186 >=dev-libs/libxml2-2.0
187 >=dev-util/gperf-3
188 >=net-misc/curl-7.12
189 sys-libs/zlib
190 sys-apps/coreutils
191 pam? ( sys-libs/pam
192 sys-apps/shadow[pam] )
193 >=dev-lang/python-2.3.4[threads]
194 java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
195 >=dev-java/ant-core-1.7 )
196 ldap? ( net-nds/openldap )"
197
198 PROVIDE="virtual/ooo"
199
200 pkg_setup() {
201
202 ewarn
203 ewarn " It is important to note that OpenOffice.org is a very fragile "
204 ewarn " build when it comes to CFLAGS. A number of flags have already "
205 ewarn " been filtered out. If you experience difficulty merging this "
206 ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to "
207 ewarn " merge again. Also note that building OOo takes a lot of time and "
208 ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
209 ewarn " the minimum requirements. If you have less, use openoffice-bin "
210 ewarn " instead. "
211 ewarn
212 ewarn " Also if you experience a build break, please make sure to retry "
213 ewarn " with MAKEOPTS="-j1" before filing a bug. "
214 ewarn
215
216 # Check if we have enough RAM and free diskspace to build this beast
217 CHECKREQS_MEMORY="512"
218 use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="6144"
219 check_reqs
220
221 strip-linguas ${LANGS}
222
223 if [[ -z "${LINGUAS}" ]]; then
224 export LINGUAS_OOO="en-US"
225 ewarn
226 ewarn " To get a localized build, set the according LINGUAS variable(s). "
227 ewarn
228 else
229 export LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/g;s/_/-/g')
230 fi
231
232 if use !java; then
233 ewarn " You are building with java-support disabled, this results in some "
234 ewarn " of the OpenOffice.org functionality being disabled. "
235 ewarn " If something you need does not work for you, rebuild with "
236 ewarn " java in your USE-flags. "
237 ewarn
238 fi
239
240 if use !gtk && use !gnome; then
241 ewarn " If you want the OpenOffice.org systray quickstarter to work "
242 ewarn " activate either the 'gtk' or 'gnome' use flags. "
243 ewarn
244 fi
245
246 if is-flagq -ffast-math ; then
247 eerror " You are using -ffast-math, which is known to cause problems. "
248 eerror " Please remove it from your CFLAGS, using this globally causes "
249 eerror " all sorts of problems. "
250 eerror " After that you will also have to - at least - rebuild python otherwise "
251 eerror " the openoffice build will break. "
252 die
253 fi
254
255 if use nsplugin; then
256 if pkg-config --exists libxul; then
257 BRWS="libxul"
258 elif pkg-config --exists xulrunner-xpcom; then
259 BRWS="xulrunner"
260 elif pkg-config --exists seamonkey-xpcom; then
261 BRWS="seamonkey"
262 else
263 die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!"
264 fi
265 fi
266
267 java-pkg-opt-2_pkg_setup
268
269 # sys-libs/db version used
270 local db_ver=$(db_findver '>=sys-libs/db-4.3')
271
272 kde4-base_pkg_setup
273
274 }
275
276 src_unpack() {
277
278 unpack ooo-build-${MY_PV}.tar.gz
279
280 }
281
282 src_prepare() {
283
284 # Hackish workaround for overlong path problem, see bug #130837
285 mv "${S_OLD}" "${S}" || die
286
287 #Some fixes for our patchset
288 cd "${S}"
289 epatch "${FILESDIR}/gentoo-${PV}.diff"
290 epatch "${FILESDIR}/gentoo-pythonpath.diff"
291 epatch "${FILESDIR}/ooo-env_log.diff"
292 cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
293 cp -f "${FILESDIR}/xulrunner-1.9.1.diff" "${S}/patches/hotfixes" || die
294
295 #Use flag checks
296 if use java ; then
297 echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
298 echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
299 echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
300 echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
301 echo "--with-system-beanshell" >> ${CONFFILE}
302 echo "--with-system-hsqldb" >> ${CONFFILE}
303 echo "--with-system-lucene" >> ${CONFFILE}
304 echo "--with-system-rhino" >> ${CONFFILE}
305 echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
306 echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
307 echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
308 echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
309 echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
310 fi
311
312 if use nsplugin ; then
313 echo "--enable-mozilla" >> ${CONFFILE}
314 echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE}
315 else
316 echo "--disable-mozilla" >> ${CONFFILE}
317 echo "--without-system-mozilla" >> ${CONFFILE}
318 fi
319
320 echo $(use_enable binfilter) >> ${CONFFILE}
321 echo $(use_enable cups) >> ${CONFFILE}
322 echo $(use_enable dbus) >> ${CONFFILE}
323 echo $(use_enable eds evolution2) >> ${CONFFILE}
324 echo $(use_enable gnome gconf) >> ${CONFFILE}
325 echo $(use_enable gnome gio) >> ${CONFFILE}
326 echo "--disable-gnome-vfs" >> ${CONFFILE}
327 echo $(use_enable gnome lockdown) >> ${CONFFILE}
328 echo $(use_enable gstreamer) >> ${CONFFILE}
329 echo $(use_enable gtk systray) >> ${CONFFILE}
330 echo $(use_enable ldap) >> ${CONFFILE}
331 echo $(use_enable opengl) >> ${CONFFILE}
332 echo $(use_with ldap openldap) >> ${CONFFILE}
333 echo $(use_enable debug crashdump) >> ${CONFFILE}
334 echo $(use_enable debug strip-solver) >> ${CONFFILE}
335
336 # Extension stuff
337 echo "--with-extension-integration" >> ${CONFFILE}
338 echo "--enable-minimizer" >> ${CONFFILE}
339 echo "--enable-pdfimport" >> ${CONFFILE}
340 echo "--enable-presenter-console" >> ${CONFFILE}
341
342 echo "--without-writer2latex" >> ${CONFFILE}
343
344 # Use splash screen without Sun logo
345 echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
346
347 # Upstream this
348 echo "--with-system-redland" >> ${CONFFILE}
349
350 }
351
352 src_configure() {
353
354 # Use multiprocessing by default now, it gets tested by upstream
355 export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
356
357 # Compile problems with these ...
358 filter-flags "-funroll-loops"
359 filter-flags "-fprefetch-loop-arrays"
360 filter-flags "-fno-default-inline"
361 filter-flags "-ftracer"
362 filter-flags "-fforce-addr"
363
364 filter-flags "-O[s2-9]"
365
366 if [[ $(gcc-major-version) -lt 4 ]]; then
367 filter-flags "-fstack-protector"
368 filter-flags "-fstack-protector-all"
369 replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
370 fi
371
372 # Build with NVidia cards breaks otherwise
373 use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
374
375 # Now for our optimization flags ...
376 export ARCH_FLAGS="${CXXFLAGS}"
377 use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
378
379 # Make sure gnome-users get gtk-support
380 local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
381 { use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
382
383 cd "${S}"
384 ./configure --with-distro="Gentoo" \
385 --with-arch="${ARCH}" \
386 --with-srcdir="${DISTDIR}" \
387 --with-lang="${LINGUAS_OOO}" \
388 --with-num-cpus="${JOBS}" \
389 --without-binsuffix \
390 --with-installed-ooo-dirname="openoffice" \
391 --with-tag="${MST}" \
392 --with-drink="True Blood" \
393 ${GTKFLAG} \
394 $(use_enable mono) \
395 --disable-kde \
396 $(use_enable kde kde4) \
397 $(use_enable !debug strip) \
398 $(use_enable odk) \
399 $(use_enable pam) \
400 $(use_with java) \
401 $(use_with templates sun-templates) \
402 --disable-access \
403 --disable-post-install-scripts \
404 --enable-extensions \
405 --with-system-libwpd \
406 --mandir=/usr/share/man \
407 --libdir=/usr/$(get_libdir) \
408 || die "Configuration failed!"
409
410 }
411
412 src_compile() {
413
414 make || die "Build failed"
415
416 }
417
418 src_install() {
419
420 export PYTHONPATH=""
421
422 einfo "Preparing Installation"
423 make DESTDIR="${D}" install || die "Installation failed!"
424
425 # Fix the permissions for security reasons
426 chown -RP root:0 "${D}"
427
428 # record java libraries
429 if use java; then
430 java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
431 java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
432 fi
433
434 # Upstream places the bash-completion module in /etc. Gentoo places them in
435 # /usr/share/bash-completion. bug 226061
436 dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
437 rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
438
439 }
440
441 pkg_postinst() {
442
443 fdo-mime_desktop_database_update
444 fdo-mime_mime_database_update
445 BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst
446
447 [[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
448
449 # Add available & useful jars to openoffice classpath
450 use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
451
452 elog
453 elog " Spell checking is provided through our own myspell-ebuilds, "
454 elog " if you want to use it, please install the correct myspell package "
455 elog " according to your language needs. "
456 elog
457
458 elog " Some aditional functionality can be installed via Extension Manager: "
459 elog " *) PDF Import "
460 elog " *) Presentation Console "
461 elog " *) Presentation Minimizer "
462 elog
463 elog " Please use the packages provided in "
464 elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
465 elog " instead of those from the SUN extension site. "
466 elog
467
468 kde4-base_pkg_postinst
469
470 }