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: openoffice-2.3.0.ebuild ChangeLog openoffice-2.3.1_rc1.ebuild
Date: Sun, 02 Dec 2007 20:32:21
Message-Id: E1IyvU2-00087x-91@stork.gentoo.org
1 suka 07/12/02 20:32:10
2
3 Modified: openoffice-2.3.0.ebuild ChangeLog
4 Added: openoffice-2.3.1_rc1.ebuild
5 Log:
6 Add masked release candidate for openoffice 2.3.1
7 (Portage version: 2.1.4_rc4)
8
9 Revision Changes Path
10 1.15 app-office/openoffice/openoffice-2.3.0.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild?rev=1.15&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild?rev=1.15&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild?r1=1.14&r2=1.15
15
16 Index: openoffice-2.3.0.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v
19 retrieving revision 1.14
20 retrieving revision 1.15
21 diff -u -r1.14 -r1.15
22 --- openoffice-2.3.0.ebuild 20 Oct 2007 19:43:55 -0000 1.14
23 +++ openoffice-2.3.0.ebuild 2 Dec 2007 20:32:09 -0000 1.15
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2007 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.14 2007/10/20 19:43:55 dertobi123 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.15 2007/12/02 20:32:09 suka Exp $
29
30 WANT_AUTOCONF="2.5"
31 WANT_AUTOMAKE="1.9"
32 @@ -351,7 +351,7 @@
33 make DESTDIR=${D} install || die "Installation failed!"
34
35 # Fix the permissions for security reasons
36 - chown -R root:root ${D}
37 + chown -R root:0 ${D}
38
39 # record java libraries
40 use java && java-pkg_regjar ${D}/usr/$(get_libdir)/openoffice/program/classes/*.jar
41
42
43
44 1.354 app-office/openoffice/ChangeLog
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.354&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.354&content-type=text/plain
48 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.353&r2=1.354
49
50 Index: ChangeLog
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v
53 retrieving revision 1.353
54 retrieving revision 1.354
55 diff -u -r1.353 -r1.354
56 --- ChangeLog 21 Oct 2007 07:04:28 -0000 1.353
57 +++ ChangeLog 2 Dec 2007 20:32:09 -0000 1.354
58 @@ -1,6 +1,19 @@
59 # ChangeLog for app-office/openoffice
60 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
61 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.353 2007/10/21 07:04:28 suka Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.354 2007/12/02 20:32:09 suka Exp $
63 +
64 +*openoffice-2.3.1_rc1 (02 Dec 2007)
65 +
66 + 02 Dec 2007; Andreas Proschofsky <suka@g.o>
67 + +files/2.3.1_rc1/regcompapply.diff,
68 + +files/2.3.1_rc1/gentoo-2.3.1_rc1.diff,
69 + +files/2.3.1_rc1/disable-regcomp-java.diff,
70 + +files/2.3.1_rc1/ooo-env_log.diff,
71 + +files/2.3.1_rc1/stlport-ppc-buildfix.diff,
72 + +files/2.3.1_rc1/disable-regcomp-python.diff,
73 + +files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff, openoffice-2.3.0.ebuild,
74 + +openoffice-2.3.1_rc1.ebuild:
75 + Add masked release candidate for openoffice 2.3.1
76
77 21 Oct 2007; Andreas Proschofsky <suka@g.o>
78 -files/2.2.1/ooo-env_log.diff, -files/2.2.1/gentoo-2.2.1.diff,
79
80
81
82 1.1 app-office/openoffice/openoffice-2.3.1_rc1.ebuild
83
84 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.3.1_rc1.ebuild?rev=1.1&view=markup
85 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.3.1_rc1.ebuild?rev=1.1&content-type=text/plain
86
87 Index: openoffice-2.3.1_rc1.ebuild
88 ===================================================================
89 # Copyright 1999-2007 Gentoo Foundation
90 # Distributed under the terms of the GNU General Public License v2
91 # $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1_rc1.ebuild,v 1.1 2007/12/02 20:32:09 suka Exp $
92
93 WANT_AUTOCONF="2.5"
94 WANT_AUTOMAKE="1.9"
95
96 inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
97
98 IUSE="binfilter cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav xulrunner"
99
100 MY_PV="2.3.0.7"
101 MY_PV2="2.3.1rc1"
102 PATCHLEVEL="OOG680"
103 SRC="OOo_${MY_PV2}_src"
104 S="${WORKDIR}/ooo"
105 S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
106 CONFFILE="${S}/distro-configs/Gentoo.conf.in"
107 DESCRIPTION="OpenOffice.org, a full office productivity suite."
108
109 SRC_URI="mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_core.tar.bz2
110 binfilter? ( mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_binfilter.tar.bz2 )
111 http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
112 odk? ( mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_sdk.tar.bz2
113 java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
114 http://go-oo.org/packages/SRC680/extras-2.tar.bz2
115 http://go-oo.org/packages/SRC680/biblio.tar.bz2
116 http://go-oo.org/packages/xt/xt-20051206-src-only.zip
117 http://go-oo.org/packages/SRC680/lp_solve_5.5.0.10_source.tar.gz
118 http://go-oo.org/packages/SRC680/libwps-0.1.0.tar.gz
119 http://go-oo.org/packages/SRC680/libwpg-0.1.0.tar.gz
120 http://go-oo.org/packages/SRC680/oox.2007-09-05.tar.bz2"
121
122 LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu_IN he hi_IN hr hu it ja km ko ku lt lv mk ml_IN mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh_YU sk sl sr_CS ss st sv sw_TZ ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
123 LANGS="${LANGS1} en en_US"
124
125 for X in ${LANGS} ; do
126 IUSE="${IUSE} linguas_${X}"
127 done
128
129 for Y in ${LANGS1} ; do
130 SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/contrib/rc/${PV}/${SRC}_l10n.tar.bz2 )"
131 done
132
133 HOMEPAGE="http://go-oo.org"
134
135 LICENSE="LGPL-2"
136 SLOT="0"
137 KEYWORDS="~amd64 ~ppc -sparc ~x86"
138
139 COMMON_DEPEND="!app-office/openoffice-bin
140 x11-libs/libXaw
141 x11-libs/libXinerama
142 >=dev-lang/perl-5.0
143 dbus? ( >=dev-libs/dbus-glib-0.71 )
144 gnome? ( >=x11-libs/gtk+-2.10
145 >=gnome-base/gnome-vfs-2.6
146 >=gnome-base/gconf-2.0 )
147 gtk? ( >=x11-libs/gtk+-2.10 )
148 cairo? ( >=x11-libs/cairo-1.0.2
149 >=x11-libs/gtk+-2.10 )
150 eds? ( >=gnome-extra/evolution-data-server-1.2 )
151 gstreamer? ( >=media-libs/gstreamer-0.10
152 >=media-libs/gst-plugins-base-0.10 )
153 kde? ( >=kde-base/kdelibs-3.2 )
154 java? ( >=dev-java/bsh-2.0_beta4
155 >=dev-java/xalan-2.7
156 >=dev-java/xerces-2.7
157 =dev-java/xml-commons-external-1.3* )
158 mono? ( >=dev-lang/mono-1.2.3.1 )
159 firefox? ( >=www-client/mozilla-firefox-1.5-r9
160 >=dev-libs/nspr-4.6.6
161 >=dev-libs/nss-3.11-r1 )
162 !firefox? ( seamonkey? ( www-client/seamonkey
163 >=dev-libs/nspr-4.6.6
164 >=dev-libs/nss-3.11-r1 ) )
165 !firefox? ( !seamonkey? ( xulrunner? ( net-libs/xulrunner
166 >=dev-libs/nspr-4.6.6
167 >=dev-libs/nss-3.11-r1 ) ) )
168 sound? ( >=media-libs/portaudio-18.1-r5
169 >=media-libs/libsndfile-1.0.9 )
170 webdav? ( >=net-misc/neon-0.24.7 )
171 >=x11-libs/startup-notification-0.5
172 >=media-libs/freetype-2.1.10-r2
173 >=media-libs/fontconfig-2.3.0
174 cups? ( net-print/cups )
175 media-libs/jpeg
176 media-libs/libpng
177 sys-devel/flex
178 sys-devel/bison
179 app-arch/zip
180 app-arch/unzip
181 >=app-text/hunspell-1.1.4-r1
182 >=app-admin/eselect-oodict-20060706
183 dev-libs/expat
184 >=dev-libs/icu-3.6
185 >=sys-libs/db-4.3
186 >=dev-libs/STLport-5.1.2
187 >=app-text/libwpd-0.8.8
188 >=media-libs/libsvg-0.1.4
189 linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
190 linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
191 linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
192
193 RDEPEND="java? ( >=virtual/jre-1.4 )
194 ${COMMON_DEPEND}"
195
196 DEPEND="${COMMON_DEPEND}
197 x11-libs/libXrender
198 x11-proto/printproto
199 x11-proto/xextproto
200 x11-proto/xproto
201 x11-proto/xineramaproto
202 >=sys-apps/findutils-4.1.20-r1
203 dev-perl/Archive-Zip
204 dev-perl/Compress-Zlib
205 >=dev-perl/Compress-Raw-Zlib-2.002
206 dev-perl/IO-Compress-Base
207 dev-util/pkgconfig
208 dev-util/intltool
209 >=dev-libs/boost-1.33.1
210 dev-libs/libxslt
211 >=dev-libs/libxml2-2.0
212 dev-util/gperf
213 >=net-misc/curl-7.9.8
214 sys-libs/zlib
215 sys-apps/coreutils
216 pam? ( sys-libs/pam )
217 !dev-util/dmake
218 >=dev-lang/python-2.3.4
219 java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* )
220 dev-java/ant-core )
221 ldap? ( net-nds/openldap )"
222
223 PROVIDE="virtual/ooo"
224
225 if use amd64; then
226 # All available Java 1.5 JDKs are broken, in one way or another, on amd64.
227 # Thus we force the use of a Java 1.4 JDK on amd64 (and amd64 only).
228 export JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
229 fi
230
231 pkg_setup() {
232
233 ewarn
234 ewarn " It is important to note that OpenOffice.org is a very fragile "
235 ewarn " build when it comes to CFLAGS. A number of flags have already "
236 ewarn " been filtered out. If you experience difficulty merging this "
237 ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to "
238 ewarn " merge again. Also note that building OOo takes a lot of time and "
239 ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
240 ewarn " the minimum requirements. If you have less, use openoffice-bin "
241 ewarn " instead. "
242 ewarn
243
244 # Check if we have enough RAM and free diskspace to build this beast
245 CHECKREQS_MEMORY="256"
246 use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
247 check_reqs
248
249 strip-linguas ${LANGS}
250
251 if [[ -z "${LINGUAS}" ]]; then
252 export LINGUAS_OOO="en-US"
253 ewarn
254 ewarn " To get a localized build, set the according LINGUAS variable(s). "
255 ewarn
256 else
257 export LINGUAS_OOO=`echo ${LINGUAS} | \
258 sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
259 fi
260
261 if use !java; then
262 ewarn " You are building with java-support disabled, this results in some "
263 ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
264 ewarn " If something you need does not work for you, rebuild with "
265 ewarn " java in your USE-flags. "
266 ewarn
267 fi
268
269 if is-flagq -ffast-math ; then
270 eerror " You are using -ffast-math, which is known to cause problems. "
271 eerror " Please remove it from your CFLAGS, using this globally causes "
272 eerror " all sorts of problems. "
273 eerror " After that you will also have to - at least - rebuild python otherwise "
274 eerror " the openoffice build will break. "
275 die
276 fi
277
278 java-pkg-opt-2_pkg_setup
279
280 # sys-libs/db version used
281 local db_ver="$(db_findver '>=sys-libs/db-4.3')"
282
283 }
284
285 src_unpack() {
286
287 unpack ooo-build-${MY_PV}.tar.gz
288
289 # Hackish workaround for overlong path problem, see bug #130837
290 mv ${S_OLD} ${S} || die
291
292 #Some fixes for our patchset
293 cd ${S}
294 epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
295 epatch ${FILESDIR}/${PV}/ooo-env_log.diff
296
297 if use ppc ; then
298 cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die
299 cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die
300 epatch ${FILESDIR}/${PV}/regcompapply.diff
301 #Fix for internal STLport
302 cp -f ${FILESDIR}/${PV}/stlport-ppc-buildfix.diff ${S}/patches/src680 || die
303 epatch ${FILESDIR}/${PV}/stlport-ppc-buildfix-apply.diff
304 fi
305
306 #Use flag checks
307 if use java ; then
308 echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
309 echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
310 echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
311 echo "--with-system-beanshell" >> ${CONFFILE}
312 echo "--with-system-xalan" >> ${CONFFILE}
313 echo "--with-system-xerces" >> ${CONFFILE}
314 echo "--with-system-xml-apis" >> ${CONFFILE}
315 echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
316 echo "--with-serializer-jar=$(java-pkg_getjar xalan serializer.jar)" >> ${CONFFILE}
317 echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE}
318 echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE}
319 echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE}
320 fi
321
322 # Upstream bitmaps are broken, so force ours for now
323 echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
324
325 echo "`use_enable binfilter`" >> ${CONFFILE}
326
327 if use firefox || use seamonkey || use xulrunner ; then
328 echo "--enable-mozilla" >> ${CONFFILE}
329 local browser
330 use xulrunner && browser="xulrunner"
331 use seamonkey && browser="seamonkey"
332 use firefox && browser="firefox"
333
334 echo "--with-system-mozilla=${browser}" >> ${CONFFILE}
335 else
336 echo "--disable-mozilla" >> ${CONFFILE}
337 echo "--without-system-mozilla" >> ${CONFFILE}
338 fi
339
340 echo "`use_enable cups`" >> ${CONFFILE}
341 echo "`use_enable ldap`" >> ${CONFFILE}
342 echo "`use_with ldap openldap`" >> ${CONFFILE}
343 echo "`use_enable eds evolution2`" >> ${CONFFILE}
344 echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
345 echo "`use_enable gnome lockdown`" >> ${CONFFILE}
346 echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
347 echo "`use_enable gstreamer`" >> ${CONFFILE}
348 echo "`use_enable dbus`" >> ${CONFFILE}
349 echo "`use_enable webdav neon`" >> ${CONFFILE}
350 echo "`use_with webdav system-neon`" >> ${CONFFILE}
351
352 echo "`use_enable sound pasf`" >> ${CONFFILE}
353 echo "`use_with sound system-portaudio`" >> ${CONFFILE}
354 echo "`use_with sound system-sndfile`" >> ${CONFFILE}
355
356 echo "`use_enable debug crashdump`" >> ${CONFFILE}
357
358 eautoreconf
359
360 }
361
362 src_compile() {
363
364 unset LIBC
365 addpredict "/bin"
366 addpredict "/root/.gconfd"
367 addpredict "/root/.gnome"
368
369 # Should the build use multiprocessing? Not enabled by default, as it tends to break
370 export JOBS="1"
371 if [[ "${WANT_MP}" == "true" ]]; then
372 export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
373 fi
374
375 # Compile problems with these ...
376 filter-flags "-funroll-loops"
377 filter-flags "-fprefetch-loop-arrays"
378 filter-flags "-fno-default-inline"
379 filter-flags "-fstack-protector"
380 filter-flags "-fstack-protector-all"
381 filter-flags "-ftracer"
382 filter-flags "-fforce-addr"
383 replace-flags "-O?" "-O2"
384
385 # Build problems with STLport and regcomp without these
386 use ppc && append-flags "-D_STLP_STRICT_ANSI -fno-schedule-insns"
387
388 # Now for our optimization flags ...
389 export ARCH_FLAGS="${CXXFLAGS}"
390 use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
391
392 # Make sure gnome-users get gtk-support
393 export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
394
395 # We have to disable mono-support for ppc, it's broken
396 export MYCONF="`use_enable mono`"
397 use ppc && MYCONF="--disable-mono" && ewarn "Mono support is currently broken on ppc, so disabling it"
398
399 cd ${S}
400 ./configure ${MYCONF} \
401 --with-distro="Gentoo" \
402 --with-arch="${ARCH}" \
403 --host="${CHOST}" \
404 --with-srcdir="${DISTDIR}" \
405 --with-lang="${LINGUAS_OOO}" \
406 --with-num-cpus="${JOBS}" \
407 --without-binsuffix \
408 --with-installed-ooo-dirname="openoffice" \
409 --with-tag="OOG680_m9" \
410 "${GTKFLAG}" \
411 `use_enable kde` \
412 `use_enable cairo` \
413 `use_with cairo system-cairo` \
414 `use_enable gnome quickstart` \
415 `use_enable pam` \
416 `use_enable !debug strip` \
417 `use_enable odk` \
418 `use_with java` \
419 --disable-access \
420 --disable-post-install-scripts \
421 --enable-hunspell \
422 --enable-openxml \
423 --with-system-hunspell \
424 --with-system-libwpd \
425 --with-system-libsvg \
426 --mandir=/usr/share/man \
427 --libdir=/usr/$(get_libdir) \
428 || die "Configuration failed!"
429
430 einfo "Building OpenOffice.org..."
431 use kde && set-kdedir 3
432 make || die "Build failed"
433
434 }
435
436 src_install() {
437
438 export PYTHONPATH=""
439
440 einfo "Preparing Installation"
441 make DESTDIR=${D} install || die "Installation failed!"
442
443 # Fix the permissions for security reasons
444 chown -R root:0 ${D}
445
446 # record java libraries
447 use java && java-pkg_regjar ${D}/usr/$(get_libdir)/openoffice/program/classes/*.jar
448
449 }
450
451 pkg_postinst() {
452
453 fdo-mime_desktop_database_update
454 fdo-mime_mime_database_update
455
456 eselect oodict update --libdir $(get_libdir)
457
458 [[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
459
460 # Add available & useful jars to openoffice classpath
461 use java && /usr/$(get_libdir)/openoffice/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
462
463 elog " To start OpenOffice.org, run:"
464 elog
465 elog " $ ooffice"
466 elog
467 elog " Also, for individual components, you can use any of:"
468 elog
469 elog " oobase, oocalc, oodraw, oofromtemplate, ooimpress, oomath,"
470 elog " ooweb or oowriter"
471 elog
472 elog " Spell checking is now provided through our own myspell-ebuilds, "
473 elog " if you want to use it, please install the correct myspell package "
474 elog " according to your language needs. "
475
476 }
477
478
479
480 --
481 gentoo-commits@g.o mailing list