Fix bug #65379

4 files changed, 49 insertions, 29 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 02ad79ae42c5..404916ac7b46 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.80 2004/08/21 19:32:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.81 2004/09/27 08:40:17 pauldv Exp $
+
+  27 Sep 2004; <pauldv@gentoo.org> +files/1.1.2/gcc-instlib.patch,
+  openoffice-1.1.2.ebuild:
+  Fix language issues (bug #65379) thanks to Mark Kusch 
+  <foobar@init-0.org> for providing the patch.
 
   21 Aug 2004; suka@gentoo.org openoffice-1.0.3-r2.ebuild,
   openoffice-1.1.0-r4.ebuild, openoffice-1.1.0-r5.ebuild,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 914f474e22f5..43ce1d71e04b 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,50 +1,51 @@
-MD5 7225e010bbc593b8e01d482ef8818875 openoffice-1.1.0-r5.ebuild 15938
+MD5 edc47ec3671fe4965360aca2c4b2f34c ChangeLog 18469
+MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 28d3297e6fc089384cd28d18a2499265 openoffice-1.0.3-r2.ebuild 21279
-MD5 05a5b4255da4c9aff8bdeffea8704978 openoffice-1.1.1-r1.ebuild 16285
 MD5 69b88c47b0426b1c2815c75ff4afb888 openoffice-1.1.0-r4.ebuild 20322
-MD5 55e9a281a369ceaefbdd350483a23947 ChangeLog 18268
-MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 026c9fc7d96618c4df8d847295040e2d openoffice-1.1.2.ebuild 15881
-MD5 2e1cecfeaa8a5134d03b75149ca35ef4 files/digest-openoffice-1.1.2 127
+MD5 7225e010bbc593b8e01d482ef8818875 openoffice-1.1.0-r5.ebuild 15938
+MD5 05a5b4255da4c9aff8bdeffea8704978 openoffice-1.1.1-r1.ebuild 16285
+MD5 39bc49277cbae980b301dcaa6d3a16af openoffice-1.1.2.ebuild 15928
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r2 330
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r4 195
 MD5 601e987d3fa97d8dfc4cdd052b0e9832 files/digest-openoffice-1.1.0-r5 128
 MD5 8382af8b277f267e568feab0f7976f3c files/digest-openoffice-1.1.1-r1 130
-MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
+MD5 2e1cecfeaa8a5134d03b75149ca35ef4 files/digest-openoffice-1.1.2 127
 MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
+MD5 dd135842f6a731897bccac3282866e8f files/1.0.3/neon.patch 12963
 MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
 MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
-MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
+MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
+MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
 MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
-MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
-MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
-MD5 dd135842f6a731897bccac3282866e8f files/1.0.3/neon.patch 12963
-MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
 MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
-MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
-MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
 MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
+MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
+MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
 MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
+MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
+MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
+MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
+MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
+MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
 MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
-MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.0/openoffice-java.patch 2092
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
-MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
 MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.0/neon.patch 8300
+MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
 MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741
 MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
-MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
-MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1/openoffice-java.patch 2092
+MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
+MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.0/openoffice-java.patch 2092
+MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330
 MD5 866e4e913af8431072dab7ec53269c31 files/1.1.1/linux-sparc.patch 14494
 MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.1/neon.patch 8300
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
-MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330
 MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.1/newstlportfix.patch 10032
-MD5 04f76dc323b7b7b9600ef1ccffd1d04a files/1.1.2/ooffice-wrapper-1.3 9471
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.2/openoffice-java.patch 2092
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
+MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1/openoffice-java.patch 2092
 MD5 866e4e913af8431072dab7ec53269c31 files/1.1.2/linux-sparc.patch 14494
 MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.2/newstlportfix.patch 10032
+MD5 04f76dc323b7b7b9600ef1ccffd1d04a files/1.1.2/ooffice-wrapper-1.3 9471
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.2/openoffice-java.patch 2092
+MD5 9300339c3d1238dee2521d4e0dc14f40 files/1.1.2/gcc-instlib.patch 442
diff --git a/app-office/openoffice/files/1.1.2/gcc-instlib.patch b/app-office/openoffice/files/1.1.2/gcc-instlib.patch
new file mode 100644
index 000000000000..ac789f43ed7c
--- /dev/null
+++ b/app-office/openoffice/files/1.1.2/gcc-instlib.patch
@@ -0,0 +1,12 @@
+diff -urN oo_1.1.2_src.orig/solenv/bin/gccinstlib.pl oo_1.1.2_src/solenv/bin/gccinstlib.pl
+--- oo_1.1.2_src.orig/solenv/bin/gccinstlib.pl	2004-03-16 11:15:42.000000000 +0100
++++ oo_1.1.2_src/solenv/bin/gccinstlib.pl	2004-09-27 10:36:02.338394960 +0200
+@@ -63,7 +63,7 @@
+ #
+ #*************************************************************************
+ 
+-$ENV{'LC_MESSAGES'} = 'C';
++$ENV{'LC_ALL'} = 'C';
+ 
+ %SearchDirs = GetGccSearchDirs ();
+ 
diff --git a/app-office/openoffice/openoffice-1.1.2.ebuild b/app-office/openoffice/openoffice-1.1.2.ebuild
index 88e2569277ef..3c11a425c4d1 100644
--- a/app-office/openoffice/openoffice-1.1.2.ebuild
+++ b/app-office/openoffice/openoffice-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.2.ebuild,v 1.5 2004/08/21 19:32:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.2.ebuild,v 1.6 2004/09/27 08:40:18 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -250,6 +250,8 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PV}/openoffice-java.patch
 
+	epatch ${FILESDIR}/${PV}/gcc-instlib.patch
+
 	# Linux/SPARC fixes
 	use sparc && epatch ${FILESDIR}/${PV}/linux-sparc.patch