diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2006-01-16 15:54:21 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2006-01-16 15:54:21 +0000 |
commit | eb98f2336ea4cbb2df3f930a88d9f6a22d98149f (patch) | |
tree | 446587ab78b759bf827f2cd9a9cdb3eb8c00c8b4 /app-office/openoffice | |
parent | www-apps/swish-e is no longer broken (diff) | |
download | historical-eb98f2336ea4cbb2df3f930a88d9f6a22d98149f.tar.gz historical-eb98f2336ea4cbb2df3f930a88d9f6a22d98149f.tar.bz2 historical-eb98f2336ea4cbb2df3f930a88d9f6a22d98149f.zip |
Multiple updates, most notably adds a new local use flag for legacy StarOffice 5.x file format support
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'app-office/openoffice')
-rw-r--r-- | app-office/openoffice/ChangeLog | 17 | ||||
-rw-r--r-- | app-office/openoffice/Manifest | 8 | ||||
-rw-r--r-- | app-office/openoffice/files/2.0.1/gentoo-gcc-version.diff | 11 | ||||
-rw-r--r-- | app-office/openoffice/files/2.0.1/ooo-build-gentoo-gcc-version.diff | 11 | ||||
-rw-r--r-- | app-office/openoffice/files/digest-openoffice-2.0.1 | 1 | ||||
-rw-r--r-- | app-office/openoffice/openoffice-2.0.1.ebuild | 15 |
6 files changed, 53 insertions, 10 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index d2293f8c30d5..bf164dab4baf 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for app-office/openoffice -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.167 2005/12/27 07:23:36 suka Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.168 2006/01/16 15:54:21 suka Exp $ + + 16 Jan 2006; Andreas Proschofsky <suka@gentoo.org> + +files/2.0.1/gentoo-gcc-version.diff, + +files/2.0.1/ooo-build-gentoo-gcc-version.diff, openoffice-2.0.1.ebuild: + Mulitple Updates: + + *) Add support for legacy StarOffice 5.x file formats. If you want these add + "binfilter" to your use flags. Though be warned, this add considerably to + the build time. Closes bug #117566 + + *) Add patch for problems with gcc-4.1-snapshots, closes bug #117076 + + *) Play safe with the $JOBS-var 27 Dec 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-2.0.1.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index e0439b2964e7..47221bb54267 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,4 @@ -MD5 d2b57b9af42cd5f1ccd53a82117907bb ChangeLog 36095 +MD5 f56939adae134ad0ebe7084f25bd682c ChangeLog 36590 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 @@ -33,13 +33,15 @@ MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222 +MD5 e990584aa63a1636aa84ba22c568383b files/2.0.1/gentoo-gcc-version.diff 361 MD5 88bf8cd578cde25c883e4fd2f9f0ea89 files/2.0.1/noquickstarter.diff 495 +MD5 22c906b692d3cd8ac18549d2a82285e3 files/2.0.1/ooo-build-gentoo-gcc-version.diff 315 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322 MD5 f43c98cba404ee89be6bed4f785dfd00 files/digest-openoffice-2.0.0 478 -MD5 a176fb6a3e97d871bde9e7816e67e168 files/digest-openoffice-2.0.1 476 +MD5 0130abb512287d7604fd27cfd3839dc8 files/digest-openoffice-2.0.1 550 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 MD5 efc84271190bae49c9785f068d0326ff openoffice-2.0.0.ebuild 6916 -MD5 c6534dc33282630ff290b8835a524efd openoffice-2.0.1.ebuild 7152 +MD5 1b1b31ac5d5bd047453f4b8b030a7c48 openoffice-2.0.1.ebuild 7440 diff --git a/app-office/openoffice/files/2.0.1/gentoo-gcc-version.diff b/app-office/openoffice/files/2.0.1/gentoo-gcc-version.diff new file mode 100644 index 000000000000..f4124c74f55d --- /dev/null +++ b/app-office/openoffice/files/2.0.1/gentoo-gcc-version.diff @@ -0,0 +1,11 @@ +--- solenv/bin/getcompver.awk.orig 2005-12-01 03:45:51.000000000 +0100 ++++ solenv/bin/getcompver.awk 2005-12-01 03:46:18.000000000 +0100 +@@ -71,7 +71,7 @@ + CCversion = $0 + } + } +-/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ { ++/^[0-9]*[.][0-9]*[.][0-9]*-.*$/ { + if ( compiler_matched == 0 ) { + CCversion = substr($0, 0, index($0, "-") - 1) + } diff --git a/app-office/openoffice/files/2.0.1/ooo-build-gentoo-gcc-version.diff b/app-office/openoffice/files/2.0.1/ooo-build-gentoo-gcc-version.diff new file mode 100644 index 000000000000..a8ea2f5d47a6 --- /dev/null +++ b/app-office/openoffice/files/2.0.1/ooo-build-gentoo-gcc-version.diff @@ -0,0 +1,11 @@ +--- patches/src680/apply.orig 2005-12-29 10:37:11.000000000 +0200 ++++ patches/src680/apply 2005-12-29 10:37:45.000000000 +0200 +@@ -941,6 +941,8 @@ + stlport-ppc-buildfix.diff + # Re-add DicOOo + gentoo-dicooo.diff ++# Fix for odd compiler versions ++gentoo-gcc-version.diff + + # + # NOTE: 64 bit OOo is work in progress! diff --git a/app-office/openoffice/files/digest-openoffice-2.0.1 b/app-office/openoffice/files/digest-openoffice-2.0.1 index 65514f7af89d..176bb4d8c5b2 100644 --- a/app-office/openoffice/files/digest-openoffice-2.0.1 +++ b/app-office/openoffice/files/digest-openoffice-2.0.1 @@ -1,3 +1,4 @@ +MD5 4e50fd0fb02155edc410e9fea01e5c59 OOO_2_0_1-binfilter.tar.bz2 18062219 MD5 fc0a44c3344c2274b4ea2ee1a8501df5 OOO_2_0_1-core.tar.bz2 109793621 MD5 694a196fbcc4f9eb0bdd84656b6b6b2d OOO_2_0_1-lang.tar.bz2 55193297 MD5 642eaffe89f652358de8261618b3d016 OOO_2_0_1-system.tar.bz2 22499081 diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild index d0dd51a353ff..a19dd2de6335 100644 --- a/app-office/openoffice/openoffice-2.0.1.ebuild +++ b/app-office/openoffice/openoffice-2.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.8 2005/12/27 07:23:36 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.9 2006/01/16 15:54:21 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs -IUSE="curl eds gnome gtk java kde ldap mozilla zlib xml2" +IUSE="binfilter curl eds gnome gtk java kde ldap mozilla zlib xml2" PATCHLEVEL="OOA680" SRC="OOO_2_0_1" @@ -15,6 +15,7 @@ DESCRIPTION="OpenOffice.org, a full office productivity suite." SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2 http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2 http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2 + binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 ) http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz http://go-ooo.org/packages/libwpd/libwpd-0.8.3.tar.gz http://go-oo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2 @@ -131,8 +132,10 @@ src_unpack() { #Some fixes for our patchset cd ${S} - use !gnome && use !gtk && epatch ${FILESDIR}/2.0.1/noquickstarter.diff - epatch ${FILESDIR}/2.0.1/alwayscrystal.diff + use !gnome && use !gtk && epatch ${FILESDIR}/${PV}/noquickstarter.diff + epatch ${FILESDIR}/${PV}/alwayscrystal.diff + cp ${FILESDIR}/${PV}/gentoo-gcc-version.diff ${S}/patches/src680/ || die + epatch ${FILESDIR}/${PV}/ooo-build-gentoo-gcc-version.diff #Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo" @@ -140,6 +143,7 @@ src_unpack() { #Use flag checks use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE} + echo "`use_enable binfilter`" >> ${CONFFILE} echo "`use_with curl system-curl`" >> ${CONFFILE} echo "`use_with xml2 system-libxml`" >> ${CONFFILE} echo "`use_with zlib system-zlib`" >> ${CONFFILE} @@ -162,6 +166,7 @@ src_compile() { addpredict "/root/.gnome" # Should the build use multiprocessing? Not enabled by default, as it tends to break + export JOBS="1" if [ "${WANT_DISTCC}" == "true" ]; then export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` fi |