final release of openoffice-2.0.2

(Portage version: 2.1_pre5-r4)

7 files changed, 42 insertions, 270 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5e42281b74ac..54096312567f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.194 2006/03/09 15:28:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.195 2006/03/10 16:40:57 suka Exp $
+
+*openoffice-2.0.2 (10 Mar 2006)
+
+  10 Mar 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.2/gentoo-2.0.2.diff, -files/2.0.2/buildfix-no-java.diff,
+  -files/2.0.2/buildfix-without-mozilla.diff, -openoffice-2.0.2_rc4.ebuild,
+  +openoffice-2.0.2.ebuild:
+  final release of openoffice-2.0.2
 
   09 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   openoffice-2.0.2_rc4.ebuild:
diff --git a/app-office/openoffice/files/2.0.2/buildfix-no-java.diff b/app-office/openoffice/files/2.0.2/buildfix-no-java.diff
deleted file mode 100644
index 145569d33367..000000000000
--- a/app-office/openoffice/files/2.0.2/buildfix-no-java.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- solenv/inc/unxlngppc.mk.old	2006-01-20 11:50:50.000000000 +0100
-+++ solenv/inc/unxlngppc.mk	2006-02-28 15:06:48.000000000 +0100
-@@ -36,7 +36,7 @@
- ASM=
- AFLAGS=
- 
--SOLAR_JAVA*=TRUE
-+SOLAR_JAVA*=
- JAVAFLAGSDEBUG=-g
- 
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngppc4.mk.old	2006-01-20 11:50:50.000000000 +0100
-+++ solenv/inc/unxlngppc4.mk	2006-02-28 15:06:48.000000000 +0100
-@@ -36,7 +36,7 @@
- ASM=
- AFLAGS=
- 
--SOLAR_JAVA*=TRUE
-+SOLAR_JAVA*=
- JAVAFLAGSDEBUG=-g
- 
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngi4.mk.old	2006-01-20 11:50:50.000000000 +0100
-+++ solenv/inc/unxlngi4.mk	2006-02-28 15:06:48.000000000 +0100
-@@ -36,7 +36,7 @@
- ASM=
- AFLAGS=
- 
--SOLAR_JAVA*=TRUE
-+SOLAR_JAVA*=
- JAVAFLAGSDEBUG=-g
- 
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngi6.mk.old	2006-01-20 11:50:50.000000000 +0100
-+++ solenv/inc/unxlngi6.mk	2006-02-28 15:06:48.000000000 +0100
-@@ -36,7 +36,7 @@
- ASM=
- AFLAGS=
- 
--SOLAR_JAVA*=TRUE
-+SOLAR_JAVA*=
- JAVAFLAGSDEBUG=-g
- 
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngx6.mk.old	2006-01-20 11:50:50.000000000 +0100
-+++ solenv/inc/unxlngx6.mk	2006-02-28 15:06:48.000000000 +0100
-@@ -36,7 +36,7 @@
- ASM=
- AFLAGS=
- 
--SOLAR_JAVA*=TRUE
-+SOLAR_JAVA*=
- JAVAFLAGSDEBUG=-g
- 
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngs.mk.old	2006-01-20 11:50:50.000000000 +0100
-+++ solenv/inc/unxlngs.mk	2006-02-28 15:06:48.000000000 +0100
-@@ -36,7 +36,7 @@
- ASM=
- AFLAGS=
- 
--SOLAR_JAVA*=TRUE
-+SOLAR_JAVA*=
- JAVAFLAGSDEBUG=-g
- 
- # filter for supressing verbose messages from linker
diff --git a/app-office/openoffice/files/2.0.2/buildfix-without-mozilla.diff b/app-office/openoffice/files/2.0.2/buildfix-without-mozilla.diff
deleted file mode 100644
index ecf0ff191cc1..000000000000
--- a/app-office/openoffice/files/2.0.2/buildfix-without-mozilla.diff
+++ /dev/null
@@ -1,151 +0,0 @@
-Index: extensions/source/plugin/base/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/base/makefile.mk,v
-retrieving revision 1.8
-diff -u -p -r1.8 makefile.mk
---- extensions/source/plugin/base/makefile.mk	8 Sep 2005 19:50:31 -0000	1.8
-+++ extensions/source/plugin/base/makefile.mk	25 Jan 2006 14:30:56 -0000
-@@ -41,6 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
- 
- .INCLUDE :  ..$/util$/makefile.pmk
- 
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- SLOFILES=		\
- 				$(SLO)$/plctrl.obj		\
- 				$(SLO)$/service.obj		\
-@@ -53,6 +55,8 @@ SLOFILES=		\
- 				$(SLO)$/multiplx.obj    \
- 				$(SLO)$/plmodel.obj
- 
-+.ENDIF # $(WITH_MOZILLA) != "NO"
-+
- # --- Targets ------------------------------------------------------
- 
- .INCLUDE :  target.mk
-Index: extensions/source/plugin/unx/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/unx/makefile.mk,v
-retrieving revision 1.8
-diff -u -p -r1.8 makefile.mk
---- extensions/source/plugin/unx/makefile.mk	8 Sep 2005 19:55:36 -0000	1.8
-+++ extensions/source/plugin/unx/makefile.mk	25 Jan 2006 14:30:56 -0000
-@@ -42,6 +42,8 @@ TARGETTYPE=CUI
- 
- # --- Files --------------------------------------------------------
- 
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- SLOFILES=\
- 	$(SLO)$/nppapi.obj		\
- 	$(SLO)$/sysplug.obj		\
-@@ -73,6 +75,7 @@ APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ld
- 
- APP1DEF=	$(MISC)$/$(TARGET).def
- 
-+.ENDIF # $(WITH_MOZILLA) != "NO"
- 
- # --- Targets ------------------------------------------------------
- 
-Index: extensions/source/plugin/util/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/util/makefile.mk,v
-retrieving revision 1.12
-diff -u -p -r1.12 makefile.mk
---- extensions/source/plugin/util/makefile.mk	8 Sep 2005 19:57:10 -0000	1.12
-+++ extensions/source/plugin/util/makefile.mk	25 Jan 2006 14:30:56 -0000
-@@ -43,6 +43,9 @@ TARGETTYPE=GUI
- .INCLUDE :  settings.mk
- 
- # --- Files --------------------------------------------------------
-+
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- LIB1TARGET = $(SLB)$/plall.lib
- LIB1FILES  = \
- 	$(SLB)$/plbase.lib	\
-@@ -97,6 +100,8 @@ SHL1STDLIBS+= -lX11
- 
- SHL1STDLIBS+=$(SHL1OWNLIBS)
- 
-+.ENDIF # $(WITH_MOZILLA) != "NO"
-+
- # --- Targets ------------------------------------------------------
- 
- .INCLUDE :  target.mk
-Index: extensions/source/plugin/win/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/win/makefile.mk,v
-retrieving revision 1.4
-diff -u -p -r1.4 makefile.mk
---- extensions/source/plugin/win/makefile.mk	8 Sep 2005 19:58:00 -0000	1.4
-+++ extensions/source/plugin/win/makefile.mk	25 Jan 2006 14:30:56 -0000
-@@ -46,6 +46,8 @@ ENABLE_EXCEPTIONS=TRUE
- 
- # --- Types -------------------------------------
- 
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- #UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)
- #INCPRE+=$(UNOUCROUT)
- 
-@@ -54,7 +56,9 @@ ENABLE_EXCEPTIONS=TRUE
- SLOFILES =	$(SLO)$/winmgr.obj	\
- 			$(SLO)$/sysplug.obj
- 
-+.ENDIF # $(WITH_MOZILLA) != "NO"
- .ENDIF
-+
- # ------------------------------------------------------------------
- 
- 
-Index: extensions/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.177
-diff -u -p -r1.177 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	16 Jan 2006 15:32:35 -0000	1.177
-+++ scp2/source/ooo/file_library_ooo.scp	25 Jan 2006 14:43:34 -0000
-@@ -1513,7 +1513,9 @@ File gid_File_Lib_DeploymentGui
-     PACKED_UNO_LIB_FILE_BODY_PATCH;
- End
- 
-+#ifndef WITHOUT_MOZILLA
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
-+#endif
- 
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Preload, preload)
- 
-Index: scp2/source/ooo/file_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
-retrieving revision 1.134
-diff -u -p -r1.134 file_ooo.scp
---- scp2/source/ooo/file_ooo.scp	5 Jan 2006 14:55:20 -0000	1.134
-+++ scp2/source/ooo/file_ooo.scp	25 Jan 2006 14:43:38 -0000
-@@ -163,6 +163,8 @@ File gid_File_Bin_MsiPkgchk
- End
- #endif
- 
-+#ifndef WITHOUT_MOZILLA
-+
- #if !defined(UNX) || defined(ENABLE_GTK)
- File gid_File_Lib_Npsoplugin
-         BIN_FILE_BODY;
-@@ -184,6 +186,7 @@ File gid_File_Exe_Nsplugin
-   #endif
- End
- #endif
-+#endif
- 
- File gid_File_Bin_Uno
-     BIN_FILE_BODY;
-@@ -291,7 +294,7 @@ File gid_File_Rdb_Gengal
-     Name = "gengal.rdb";
- End
- 
--#ifdef UNX
-+#if !defined(WITHOUT_MOZILLA) && defined(UNX)
- 
- File gid_File_Bin_Pluginapp
-     BIN_FILE_BODY;
diff --git a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
deleted file mode 100644
index c274955036a8..000000000000
--- a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -148,6 +148,11 @@
- # add no-crashreporter sections to testtool default config;
- # also guess office path from testtool.bin path i#FIXME?
- testtool-more-defaults.diff
-+
-+# Build without mozilla is broken i#59729
-+buildfix-without-mozilla.diff
-+# Fix build without java, again, i#62716
-+buildfix-no-java.diff
- 
- [ TemporaryHacks < oob680-m1 ]
- # fix for conflicting declaration NPP_GetValue()
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.2 b/app-office/openoffice/files/digest-openoffice-2.0.2
new file mode 100644
index 000000000000..352edb4e7669
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-2.0.2
@@ -0,0 +1,27 @@
+MD5 c55854ea2a38753813c47019d4332eca OOO_2_0_2-binfilter.tar.bz2 17441735
+RMD160 5343d04151c4dbda707c366ed6751b728fffb763 OOO_2_0_2-binfilter.tar.bz2 17441735
+SHA256 21a7ccc03ca01d63fa78edda0cb254d4b048e9b8bc7990143f3768db6c8e1784 OOO_2_0_2-binfilter.tar.bz2 17441735
+MD5 99d5e8c21c50af94bc5eee8d5e7e6df1 OOO_2_0_2-core.tar.bz2 109279863
+RMD160 894a70c1ec34e6dba7d26baa89475473d515d89d OOO_2_0_2-core.tar.bz2 109279863
+SHA256 e938a4edb6d11ef4a634a18ad55c6d9e9a371a5ab9771d17e71832fbb12cc230 OOO_2_0_2-core.tar.bz2 109279863
+MD5 af0b0b9e629e9ed95693c6b1cecbe8a9 OOO_2_0_2-lang.tar.bz2 58146692
+RMD160 688bbe4cdbd4c418441dbf5156184352e4db676b OOO_2_0_2-lang.tar.bz2 58146692
+SHA256 971054ce48051776a3146a8f6af2bd3701ad77bb7583f7f023b354e8cb533de1 OOO_2_0_2-lang.tar.bz2 58146692
+MD5 a1e4d5f03e2c0c0870847f4de97b8d12 OOO_2_0_2-system.tar.bz2 25712374
+RMD160 06fdb624101d172f432c834d5466cbd7541dd108 OOO_2_0_2-system.tar.bz2 25712374
+SHA256 3666aa042d5ffbeb98637a4518b927ac62c9ad86ca6b10d9f03bef13413acef9 OOO_2_0_2-system.tar.bz2 25712374
+MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
+RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
+SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
+MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
+RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
+SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
+MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
+RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757
+SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757
+MD5 a745d2aedde615ee98b591901161c228 ooo-build-2.0.2.tar.gz 5097547
+RMD160 1ee35eb5cb0eda75de54f28aa079d4d11c7f927f ooo-build-2.0.2.tar.gz 5097547
+SHA256 deec58383939fed182d670a77e2ff09eb79e28e00f5c71728e319e364e011e1e ooo-build-2.0.2.tar.gz 5097547
+MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
+RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
+SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.2_rc4 b/app-office/openoffice/files/digest-openoffice-2.0.2_rc4
deleted file mode 100644
index 55b95b328d59..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.0.2_rc4
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
-RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
-SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
-MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
-RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
-SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
-MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
-RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757
-SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757
-MD5 950cd200241f04d7ad3a323d71c6e728 oob680-m5-binfilter.tar.bz2 17369994
-RMD160 4fc8b03eb824e4a243e59ed53957503220c9fbd9 oob680-m5-binfilter.tar.bz2 17369994
-SHA256 61a9ce1f95524df9d38dc5930533d334142801d78b80f590844cb3b0c02ea001 oob680-m5-binfilter.tar.bz2 17369994
-MD5 2552ae0ca0405a36da30d0e05a513b0e oob680-m5-core.tar.bz2 108773068
-RMD160 1d9d8bfce6fef329e77fc1cb0de3add5cacd45b0 oob680-m5-core.tar.bz2 108773068
-SHA256 c852ba685fbac85f7c0d8cee4427887322433040991d8e5c43dbc3fb641acfc4 oob680-m5-core.tar.bz2 108773068
-MD5 70797bcf786735b56add111632894589 oob680-m5-lang.tar.bz2 58139196
-RMD160 b5fed4703193f28bc7de3c9ca04d54b19668dfa3 oob680-m5-lang.tar.bz2 58139196
-SHA256 b9182456aa09614cf315839e760c745b3144e80c0659111e00d3e8b24c5b9455 oob680-m5-lang.tar.bz2 58139196
-MD5 6dc29fa3d50351d9b82ef239c1e7aaff oob680-m5-system.tar.bz2 25706992
-RMD160 826fc1148e9efb6b1a493df5583867c19a778314 oob680-m5-system.tar.bz2 25706992
-SHA256 7acb13e7f37fc6d5b61529b383be9099264f76c15e8cf62657db67e2c4b694d0 oob680-m5-system.tar.bz2 25706992
-MD5 cc5b39d1d768cc507b2aad71bf854cb8 ooo-build-oob680.5.0.tar.gz 5092868
-RMD160 eac2f318d0adaadc294315ba3647c55b1e4a321c ooo-build-oob680.5.0.tar.gz 5092868
-SHA256 a8e81644f6c17954c48a95bf689cdb966ccad0833119ca2042661ffe269c5b07 ooo-build-oob680.5.0.tar.gz 5092868
-MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
-RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
-SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516
diff --git a/app-office/openoffice/openoffice-2.0.2_rc4.ebuild b/app-office/openoffice/openoffice-2.0.2.ebuild
index 66c713285064..288345d5b942 100644
--- a/app-office/openoffice/openoffice-2.0.2_rc4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2.ebuild
@@ -1,16 +1,14 @@
 # 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.2_rc4.ebuild,v 1.5 2006/03/09 15:28:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2.ebuild,v 1.1 2006/03/10 16:40:57 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
 IUSE="binfilter cairo curl eds firefox gnome gtk java kde ldap mozilla xml2"
 
-MY_PV="${PV/_rc4/}"
-MY_PV2="oob680.5.0"
 PATCHLEVEL="OOB680"
-SRC="oob680-m5"
-S="${WORKDIR}/ooo-build-${MY_PV2}"
+SRC="OOO_2_0_2"
+S="${WORKDIR}/ooo-build-${PV}"
 CONFFILE="${S}/distro-configs/Gentoo.conf.in"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 
@@ -18,7 +16,7 @@ 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-${MY_PV2}.tar.gz
+	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/extras-2.tar.bz2
 	http://go-oo.org/packages/SRC680/hunspell_UNO_1.1.tar.gz
@@ -139,14 +137,11 @@ pkg_setup() {
 
 src_unpack() {
 
-	unpack ooo-build-${MY_PV2}.tar.gz
+	unpack ooo-build-${PV}.tar.gz
 
 	#Some fixes for our patchset
 	cd ${S}
-	cp ${FILESDIR}/${MY_PV}/buildfix-without-mozilla.diff ${S}/patches/src680/ || die
-	cp ${FILESDIR}/${MY_PV}/buildfix-no-java.diff ${S}/patches/src680/ || die
-	epatch ${FILESDIR}/${MY_PV}/removecrystalcheck.diff
-	epatch ${FILESDIR}/${MY_PV}/gentoo-${MY_PV}.diff
+	epatch ${FILESDIR}/${PV}/removecrystalcheck.diff
 
 	#Use flag checks
 	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}