Temporary fix for the build without java, see bug #110131.

Package-Manager: portage-2.0.53_rc6

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index b70e589f219a5ad149f7383e936104994f772e91..e513bef626bddd0cd2d84c262b69dcd5aa2f5a32 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.141 2005/10/23 12:42:56 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.142 2005/10/25 05:21:58 suka Exp $
+
+  25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/Filter.xcu, openoffice-2.0.0.ebuild:
+  Temporary fix for the build without java, see bug #110131. Real solution
+  should replace this asap
 
   23 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.0.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 7ef1e61e00031e0a553a00775bc6979b32513e90..ef8153bb51eeb597e164294e0f4a569659cb2ec3 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 d99c048992be4c75aa29c32264b974c2 ChangeLog 31154
+MD5 7df0ae7eca96ca1a616dea9f69501f44 ChangeLog 31362
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
@@ -31,10 +31,11 @@ MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
 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 dad70b7af2b749a7dde536de033f991b files/2.0.0/Filter.xcu 10709
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
 MD5 c45a70a1b4109bc275d7e55083b85d44 files/digest-openoffice-2.0.0 476
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 803f8ad94f19403199a2ec279c30b133 openoffice-2.0.0.ebuild 6876
+MD5 fa6a80e00004e1c28cc9c03db634caab openoffice-2.0.0.ebuild 7077

diff --git a/app-office/openoffice/files/2.0.0/Filter.xcu b/app-office/openoffice/files/2.0.0/Filter.xcu
new file mode 100644 (file)
index 0000000..092f496
--- /dev/null
+++ b/app-office/openoffice/files/2.0.0/Filter.xcu
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.TypeDetection" oor:name="Filter">
+<node oor:name="Filters">
+<node oor:name="StarOffice XML (Base)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Database</value>
+</prop>
+</node>
+<node oor:name="HTML (StarWriter)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">HTML Document (%productname% Writer)</value>
+</prop>
+</node>
+<node oor:name="MS Word 95 Vorlage">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft Word 95 Template</value>
+</prop>
+</node>
+<node oor:name="MS Word 97 Vorlage">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft Word 97/2000/XP Template</value>
+</prop>
+</node>
+<node oor:name="StarOffice XML (Writer)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Text Document</value>
+</prop>
+</node>
+<node oor:name="StarWriter 3.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarWriter 3.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarWriter 4.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarWriter 4.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarWriter 5.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarWriter 5.0 Template</value>
+</prop>
+</node>
+<node oor:name="Text">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Text</value>
+</prop>
+</node>
+<node oor:name="Text (encoded)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Text Encoded</value>
+</prop>
+</node>
+<node oor:name="writer_JustSystem_Ichitaro_10_template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Ichitaro 8/9/10/11 Template</value>
+</prop>
+</node>
+<node oor:name="writer_StarOffice_XML_Writer_Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Text Document Template</value>
+</prop>
+</node>
+<node oor:name="writer8">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Text</value>
+</prop>
+</node>
+<node oor:name="writer8_template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Text Template</value>
+</prop>
+</node>
+<node oor:name="MS Word 2003 XML">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft Word 2003 XML</value>
+</prop>
+</node>
+<node oor:name="HTML">
+<prop oor:name="UIName">
+<value xml:lang="en-US">HTML Document</value>
+</prop>
+</node>
+<node oor:name="StarWriter/Web 4.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarWriter/Web 4.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarWriter/Web 5.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarWriter/Web 5.0 Template</value>
+</prop>
+</node>
+<node oor:name="Text (StarWriter/Web)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Text (%productname% Writer/Web)</value>
+</prop>
+</node>
+<node oor:name="Text (encoded) (StarWriter/Web)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Text Encoded (%productname% Writer/Web)</value>
+</prop>
+</node>
+<node oor:name="writer_web_StarOffice_XML_Writer">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
+</prop>
+</node>
+<node oor:name="writer_web_StarOffice_XML_Writer_Web_Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% HTML Template</value>
+</prop>
+</node>
+<node oor:name="writerweb8_writer_template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">HTML Document Template</value>
+</prop>
+</node>
+<node oor:name="writerweb8_writer">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% Text (%productname% Writer/Web)</value>
+</prop>
+</node>
+<node oor:name="StarWriter 4.0/GlobalDocument">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarWriter 4.0 Master Document</value>
+</prop>
+</node>
+<node oor:name="StarWriter 5.0/GlobalDocument">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarWriter 5.0 Master Document</value>
+</prop>
+</node>
+<node oor:name="Text (encoded) (StarWriter/GlobalDocument)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Text Encoded (%productname% Master Document)</value>
+</prop>
+</node>
+<node oor:name="writer_globaldocument_StarOffice_XML_Writer">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Text Document</value>
+</prop>
+</node>
+<node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Master Document</value>
+</prop>
+</node>
+<node oor:name="writerglobal8">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Master Document</value>
+</prop>
+</node>
+<node oor:name="writerglobal8_writer">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Text</value>
+</prop>
+</node>
+<node oor:name="HTML (StarCalc)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">HTML Document (%productname% Calc)</value>
+</prop>
+</node>
+<node oor:name="MS Excel 4.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft Excel 4.0 Template</value>
+</prop>
+</node>
+<node oor:name="MS Excel 5.0/95 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft Excel 5.0 Template</value>
+</prop>
+</node>
+<node oor:name="MS Excel 95 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft Excel 95 Template</value>
+</prop>
+</node>
+<node oor:name="MS Excel 97 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft Excel 97/2000/XP Template</value>
+</prop>
+</node>
+<node oor:name="StarCalc 3.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarCalc 3.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarCalc 4.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarCalc 4.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarCalc 5.0 Vorlage/Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarCalc 5.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarOffice XML (Calc)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Spreadsheet</value>
+</prop>
+</node>
+<node oor:name="Text - txt - csv (StarCalc)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Text CSV</value>
+</prop>
+</node>
+<node oor:name="calc_HTML_WebQuery">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Web Page Query (%productname% Calc)</value>
+</prop>
+</node>
+<node oor:name="calc_StarOffice_XML_Calc_Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Spreadsheet Template</value>
+</prop>
+</node>
+<node oor:name="calc8">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Spreadsheet</value>
+</prop>
+</node>
+<node oor:name="calc8_template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Spreadsheet Template</value>
+</prop>
+</node>
+<node oor:name="MS Excel 2003 XML">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft Excel 2003 XML</value>
+</prop>
+</node>
+<node oor:name="StarDraw 3.0 Vorlage">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarDraw 3.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarDraw 5.0 Vorlage">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarDraw 5.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarOffice XML (Draw)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Drawing</value>
+</prop>
+</node>
+<node oor:name="draw_StarOffice_XML_Draw_Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Drawing Template</value>
+</prop>
+</node>
+<node oor:name="draw8">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Drawing</value>
+</prop>
+</node>
+<node oor:name="draw8_template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Drawing Template</value>
+</prop>
+</node>
+<node oor:name="MS PowerPoint 97 Vorlage">
+<prop oor:name="UIName">
+<value xml:lang="en-US">Microsoft PowerPoint 97/2000/XP Template</value>
+</prop>
+</node>
+<node oor:name="StarDraw 3.0 Vorlage (StarImpress)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarDraw 3.0 Template (%productname% Impress)</value>
+</prop>
+</node>
+<node oor:name="StarDraw 5.0 Vorlage (StarImpress)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarDraw 5.0 Template (%productname% Impress)</value>
+</prop>
+</node>
+<node oor:name="impress_StarOffice_XML_Draw">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Drawing (%productname% Impress)</value>
+</prop>
+</node>
+<node oor:name="StarImpress 4.0 Vorlage">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarImpress 4.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarImpress 5.0 Vorlage">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarImpress 5.0 Template</value>
+</prop>
+</node>
+<node oor:name="StarImpress 5.0 (packed)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">StarImpress 5.0 Packed</value>
+</prop>
+</node>
+<node oor:name="StarOffice XML (Impress)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Presentation</value>
+</prop>
+</node>
+<node oor:name="impress_StarOffice_XML_Impress_Template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Presentation Template</value>
+</prop>
+</node>
+<node oor:name="impress8">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Presentation</value>
+</prop>
+</node>
+<node oor:name="impress8_template">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Presentation Template</value>
+</prop>
+</node>
+<node oor:name="impress8_draw">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Drawing (Impress)</value>
+</prop>
+</node>
+<node oor:name="StarOffice XML (Chart)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Chart</value>
+</prop>
+</node>
+<node oor:name="chart8">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Chart</value>
+</prop>
+</node>
+<node oor:name="StarOffice XML (Math)">
+<prop oor:name="UIName">
+<value xml:lang="en-US">%productname% %formatversion% Formula</value>
+</prop>
+</node>
+<node oor:name="math8">
+<prop oor:name="UIName">
+<value xml:lang="en-US">OpenDocument Formula</value>
+</prop>
+</node>
+<node oor:name="draw_html_Export">
+<prop oor:name="UIName">
+<value xml:lang="en-US">HTML Document (%productname% Draw)</value>
+</prop>
+</node>
+<node oor:name="impress_html_Export">
+<prop oor:name="UIName">
+<value xml:lang="en-US">HTML Document (%productname% Impress)</value>
+</prop>
+</node>
+</node>
+</oor:component-data>

diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 58f987502d843d8fe4ac9fd4ce5abaf120854006..8f7b6de7c45f00e39f13b4f49c269fc7b299ac07 100644 (file)
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.5 2005/10/23 12:42:56 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.6 2005/10/25 05:21:58 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -207,6 +207,9 @@ src_install() {
        insinto /usr/share/fonts/TTF/
        doins ${PATCHDIR}/fonts/*.ttf
 
+       # Temporary, hacky fix for the filetype problem without java
+       use !java && cp -pPRf ${FILESDIR}/${PV}/Filter.xcu ${D}/usr/lib/openoffice/share/registry/res/en-US/org/openoffice/TypeDetection/ || die
+
 }
 
 pkg_postinst() {