Implement a proper solution for the --without-java issue

Package-Manager: portage-2.0.53_rc6

8 files changed, 105 insertions, 386 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 9ad42872444b..4b9fa800826a 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # 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.148 2005/10/26 20:32:42 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.149 2005/10/28 05:31:45 suka Exp $
+
+  28 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0.diff, -files/2.0.0/Filter.xcu,
+  -files/2.0.0/build-beanshell-fix.diff,
+  +files/2.0.0/buildfix-new-xslt.diff,
+  +files/2.0.0/nojava-fix-stringparam.diff, openoffice-2.0.0.ebuild:
+  Implement a proper solution for the --without-java issue
 
   26 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   files/2.0.0/gentoo-2.0.0.diff, openoffice-2.0.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 95d833fa21f9..29f7f5aea4a8 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 c1b9945d3ff933a2f1b27a38bf3cbe26 ChangeLog 32751
+MD5 2c2c6de0ee096ec3e6de4fce31779daa ChangeLog 33071
 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,13 +31,13 @@ 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 f419a0236d3a5c859af1eba4983ec986 files/2.0.0/build-beanshell-fix.diff 242
-MD5 cc64cbbd4664277f904c7728ac1ed404 files/2.0.0/gentoo-2.0.0.diff 944
+MD5 2871ab2688ee93c187ff98445e5ea0ca files/2.0.0/buildfix-new-xslt.diff 1336
+MD5 b07b1f97c76b5a04e6cd714b6621ea55 files/2.0.0/gentoo-2.0.0.diff 937
+MD5 1aff6980adcc3f4704c3ef5959e0f165 files/2.0.0/nojava-fix-stringparam.diff 1682
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
 MD5 039f6964d10fd36776620f93b84705dd files/digest-openoffice-2.0.0 478
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 189aff586add08cb8e5b97b40bdd95b1 openoffice-2.0.0.ebuild 7205
+MD5 90dbfad1b757e9d6b286796e7e42ca2c openoffice-2.0.0.ebuild 7044
diff --git a/app-office/openoffice/files/2.0.0/Filter.xcu b/app-office/openoffice/files/2.0.0/Filter.xcu
deleted file mode 100644
index 092f49606388..000000000000
--- a/app-office/openoffice/files/2.0.0/Filter.xcu
+++ /dev/null
@@ -1,355 +0,0 @@
-<?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/files/2.0.0/build-beanshell-fix.diff b/app-office/openoffice/files/2.0.0/build-beanshell-fix.diff
deleted file mode 100644
index 96209f48435d..000000000000
--- a/app-office/openoffice/files/2.0.0/build-beanshell-fix.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- beanshell/prj/build.lst 
-+++ beanshell/prj/build.lst 
-@@ -1,4 +1,4 @@
--be	beanshell	:	solenv NULL
-+be	beanshell	:	solenv soltools NULL
- be	beanshell							usr1		-	all	be_mkout				NULL
- be	beanshell							nmake		-	all	be_beanshell		NULL
- 
diff --git a/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff b/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff
new file mode 100644
index 000000000000..26e7fdb5a3eb
--- /dev/null
+++ b/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff
@@ -0,0 +1,41 @@
+--- filter/source/config/fragments/langfilter.xsl.org	2005-10-27 20:38:20.000000000 +0200
++++ filter/source/config/fragments/langfilter.xsl	2005-10-27 20:38:44.000000000 +0200
+@@ -2,19 +2,35 @@
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oor="http://openoffice.org/2001/registry">
+ <xsl:output method="xml" indent="yes" omit-xml-declaration="no" version="1.0" encoding="UTF-8"/>
+ <xsl:param name="lang"/>
+-<xsl:template match="*[.//*[@xml:lang=$lang]] | @*">
++<xsl:template match="*">
++    <xsl:if test="count(.//*[@xml:lang=$lang])&gt;0">
+     <xsl:copy>
+         <xsl:apply-templates select="*|@*"/>
+     </xsl:copy>
++    </xsl:if>
+ </xsl:template>
+ 
+-<xsl:template match="value[@xml:lang=$lang] | text()[../@xml:lang=$lang]">
++<xsl:template match="@*">
++    <xsl:copy>
++        <xsl:apply-templates select="*|@*"/>
++    </xsl:copy>
++</xsl:template>
++
++<xsl:template match="value">
++    <xsl:if test="@xml:lang=$lang">
+     <xsl:copy>
+         <xsl:apply-templates select="@*|text()"/>
+     </xsl:copy>
++    </xsl:if>
+ </xsl:template>
+  
+-<xsl:template match="text()"/>
++<xsl:template match="text()">
++    <xsl:if test="../@xml:lang=$lang">
++        <xsl:copy>
++            <xsl:apply-templates select="@*|text()"/>
++        </xsl:copy>
++    </xsl:if>
++</xsl:template>
+ 
+ 
+ </xsl:stylesheet>
diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
index 93653ada7315..06a9ea343f1b 100644
--- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
+++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
@@ -1,15 +1,15 @@
 --- patches/OOO_2_0/apply 
 +++ patches/OOO_2_0/apply
-@@ -496,6 +496,9 @@
- buildfix-ucb-without-stlport4.diff
- buildfix-svx-without-stlport4.diff
+@@ -742,6 +742,9 @@
+ default-system-fpicker.diff
+ # Fix for build breakage on PPC
+ stlport-ppc-buildfix.diff
++# Fix for broken filters without java i#56619
++nojava-fix-stringparam.diff
++buildfix-new-xslt.diff
  
-+# Fix beanshell dep
-+build-beanshell-fix.diff
-+
- [ ArkOnly ]
- system-db-4.3-use-lpthread.diff
- # FIXME this is generally useful -- currently applied here only because
+ #
+ # NOTE: 64 bit OOo is work in progress!
 --- bin/package-ooo 
 +++ bin/package-ooo 
 @@ -124,11 +124,11 @@
diff --git a/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff b/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff
new file mode 100644
index 000000000000..bff02690aa1a
--- /dev/null
+++ b/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff
@@ -0,0 +1,39 @@
+Index: source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.12
+diff -u -u -r1.12 makefile.mk
+--- filter/source/config/fragments/makefile.mk	8 Sep 2005 21:33:23 -0000	1.12
++++ filter/source/config/fragments/makefile.mk	25 Oct 2005 18:24:46 -0000
+@@ -147,13 +147,20 @@
+ .IF "$(SOLAR_JAVA)"==""
+ #cmc, hack to workaround the java build requirement
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
++PACKLANG := $(XSLTPROC)
++PACKLANG_IN :=
++PACKLANG_PARAM := --stringparam
++PACKLANG_XSL :=
+ .ELSE
+ MERGE    := $(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar
+ .IF "$(JDK)" == "gcj"
+-PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process
+ .ELSE
+-PACKLANG := $(JAVA) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVA) org.apache.xalan.xslt.Process
+ .ENDIF
++PACKLANG_IN := -IN
++PACKLANG_PARAM := -PARAM
++PACKLANG_XSL := -XSL
+ .ENDIF
+ 
+ # -----------------------------------------------------------------------------
+@@ -182,7 +191,7 @@
+      +@echo Building language packages $(@:b:s/Filter_//) for filters
+      +@echo ===================================================================
+      +-$(MKDIRHIER) $(@:d)
+-     +$(PACKLANG) -IN $< -PARAM lang $(@:d:d:d:d:d:d:d:d:b) > $@
++     +$(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $< > $@
+ 
+ $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS_PACKED) : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS)
+ 
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 1aa7a3af1665..14f646810766 100644
--- 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.12 2005/10/26 20:32:42 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.13 2005/10/28 05:31:45 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -125,7 +125,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Additional and new patches get here
-	cp -pPRf ${FILESDIR}/${PV}/build-beanshell-fix.diff ${PATCHDIR}/patches/src680 || die
+	cp -pPRf ${FILESDIR}/${PV}/nojava-fix-stringparam.diff ${PATCHDIR}/patches/src680 || die
+	cp -pPRf ${FILESDIR}/${PV}/buildfix-new-xslt.diff ${PATCHDIR}/patches/src680 || die
 
 	#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"
@@ -212,12 +213,6 @@ src_install() {
 	insinto /usr/share/fonts/TTF/
 	doins ${PATCHDIR}/fonts/*.ttf
 
-	# Temporary, hacky fix for the filetype problem without java
-	if use !java; then
-		for i in ${LINGUAS_OOO}; do
-			cp -pPRf ${FILESDIR}/${PV}/Filter.xcu ${D}/usr/lib/openoffice/share/registry/res/${i}/org/openoffice/TypeDetection/ || die
-		done
-	fi
 }
 
 pkg_postinst() {