Another shot at the quick fix for --without-java

Package-Manager: portage-2.0.53_rc6

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index a9257b18c8836c897e0acaa2e772e6fbae8fa548..5d8819ec7f57a5c749d76db432e5fdf412d74115 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.143 2005/10/25 06:35:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.144 2005/10/25 16:02:03 suka Exp $
+
+  25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Another shot at the quick fix for -java to make it also work for other 
+  languages than en_US. The only downside remaining atm is that the 
+  descriptions for the filters are not translated. Still a hack though.
 
   25 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 f502f94181137ac1fcc206537b7d68a8b0eacc5f..2deb6a2cceed216825ef2d75a75eaf0e96907df3 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 5fbfbef77ac9f7d737254bfbf4bc5b0d ChangeLog 31492
+MD5 74a59549d942c7bf4539241491a40c69 ChangeLog 31788
 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
@@ -38,4 +38,4 @@ 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 c2ad744b08571c0378f341591cd3e4bf openoffice-2.0.0.ebuild 7129
+MD5 83a87183dc12fe34b1a1b83924fac410 openoffice-2.0.0.ebuild 7177

diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 29855ff6717ae485ed28d42874fdca7e3adc03d5..4a944a1d7a417f4117b89935b4e67efe31491fde 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.7 2005/10/25 06:35:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.8 2005/10/25 16:02:03 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -209,8 +209,11 @@ src_install() {
        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
-
+       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() {