New upstream release: 1.1.5

Package-Manager: portage-2.0.52-r1

16 files changed, 556 insertions, 0 deletions

diff --git a/app-office/openoffice/files/1.1.5/STLport-vector.patch b/app-office/openoffice/files/1.1.5/STLport-vector.patch
new file mode 100644
index 000000000000..1892f1cabeed
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/STLport-vector.patch
@@ -0,0 +1,32 @@
+--- stlport/STLport-4.6.2.patch	2005-01-06 12:26:48.770546592 +1100
++++ stlport/STLport-4.6.2.patch	2005-01-06 12:26:01.125789696 +1100
+@@ -69,3 +69,29 @@
+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
+  
+  install_unix :
++--- misc/build/STLport-4.6.2/src/gcc-linux.mak.old	2005-01-06 12:22:54.127217800 +1100
+++++ misc/build/STLport-4.6.2/src/gcc-linux.mak	2005-01-06 12:24:28.192917640 +1100
++@@ -46,8 +46,8 @@
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
++ 
++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC
++ 
++ include common_percent_rules.mak
++ include common_rules.mak
++--- misc/build/STLport-4.6.2/src/gcc.mak.old	2005-01-06 15:20:18.840975336 +1100
+++++ misc/build/STLport-4.6.2/src/gcc.mak	2005-01-06 15:21:00.373661408 +1100
++@@ -44,8 +44,8 @@
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
++ 
++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
++ 
++ include common_percent_rules.mak
++ include common_rules.mak
diff --git a/app-office/openoffice/files/1.1.5/freetype-217.patch b/app-office/openoffice/files/1.1.5/freetype-217.patch
new file mode 100644
index 000000000000..12ed2b2f8691
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/freetype-217.patch
@@ -0,0 +1,24 @@
+--- oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx.ft217	2004-01-08 03:36:33.000000000 -0500
++++ oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx	2004-01-08 11:02:21.000000000 -0500
+@@ -77,7 +77,8 @@
+ #include <osl/file.hxx>
+ #include <osl/thread.hxx>
+ 
+-#include "freetype/freetype.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include "freetype/ftglyph.h"
+ #include "freetype/ftoutln.h"
+ #include "freetype/tttables.h"
+--- oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx.217	2004-01-08 03:36:46.000000000 -0500
++++ oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx	2004-01-08 11:03:04.000000000 -0500
+@@ -68,7 +68,8 @@
+ #endif
+ 
+ #ifndef _SV_GCACHFTYP_HXX
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <gcach_ftyp.hxx>
+ #endif
+ 
diff --git a/app-office/openoffice/files/1.1.5/gcc-instlib.patch b/app-office/openoffice/files/1.1.5/gcc-instlib.patch
new file mode 100644
index 000000000000..99e424abed01
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/gcc-instlib.patch
@@ -0,0 +1,12 @@
+diff -urN solenv/bin/gccinstlib.pl oo_1.1.2_src/solenv/bin/gccinstlib.pl
+--- solenv/bin/gccinstlib.pl	2004-03-16 11:15:42.000000000 +0100
++++ 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/files/1.1.5/gcc34-nojava-fix.patch b/app-office/openoffice/files/1.1.5/gcc34-nojava-fix.patch
new file mode 100644
index 000000000000..73017c1bae19
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/gcc34-nojava-fix.patch
@@ -0,0 +1,11 @@
+--- sfx2/util/makefile.mk	2004-11-06 18:49:27.753988376 +0100
++++ sfx2/util/makefile.mk	2004-11-06 18:39:19.706425656 +0100
+@@ -70,6 +70,8 @@
+ GEN_HID=TRUE
+ GEN_HID_OTHER=TRUE
+ 
++LINKFLAGSDEFS = # do not fail with missing symbols
++
+ # --- Settings -----------------------------------------------------
+ 
+ .INCLUDE :  settings.mk
diff --git a/app-office/openoffice/files/1.1.5/gcc34-sal-link-to-libsupc++.diff b/app-office/openoffice/files/1.1.5/gcc34-sal-link-to-libsupc++.diff
new file mode 100644
index 000000000000..dd823ee024c3
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/gcc34-sal-link-to-libsupc++.diff
@@ -0,0 +1,13 @@
+--- sal/util/makefile.mk.foo	2004-12-21 14:38:37.314521336 -0500
++++ sal/util/makefile.mk	2004-12-21 14:46:52.495159848 -0500
+@@ -146,6 +146,10 @@
+ SHL1STDLIBS+=-init InitLibrary -term ExitLibrary
+ .ENDIF # MAC
+ 
++.IF "$(OS)"=="LINUX"
++SHL1STDLIBS+= -Wl,-Bstatic -lsupc++ -Wl,-Bdynamic -lgcc_s
++.ENDIF
++
+ .IF "$(GUI)"=="UNX"
+ .IF "$(OS)"=="SOLARIS"
+ # libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7)
diff --git a/app-office/openoffice/files/1.1.5/gcc34.patch.bz2 b/app-office/openoffice/files/1.1.5/gcc34.patch.bz2
new file mode 100644
index 000000000000..2c3a4e355949
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/gcc34.patch.bz2
diff --git a/app-office/openoffice/files/1.1.5/getcompver.awk.patch b/app-office/openoffice/files/1.1.5/getcompver.awk.patch
new file mode 100644
index 000000000000..0fbeb07ee3d6
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/getcompver.awk.patch
@@ -0,0 +1,14 @@
+--- solenv/bin/getcompver.awk.orig	2005-02-22 00:24:46.976743123 +0100
++++ solenv/bin/getcompver.awk	2005-02-22 00:34:16.624045985 +0100
+@@ -98,6 +98,11 @@
+         CCversion = $0
+     }
+ }
++/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ {
++    if ( compiler_matched == 0 ) {
++        CCversion = substr($0, 0, index($0, "-") - 1)
++    }
++}
+ END {
+     if ( num == "true" ) {
+         tokencount = split (CCversion,vertoken,".")
diff --git a/app-office/openoffice/files/1.1.5/hardened-link.patch b/app-office/openoffice/files/1.1.5/hardened-link.patch
new file mode 100644
index 000000000000..83c707dc106d
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/hardened-link.patch
@@ -0,0 +1,14 @@
+diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
+--- solenv.orig/inc/unxlngi4.mk	2004-10-23 20:09:29.344518376 +0200
++++ solenv/inc/unxlngi4.mk	2004-10-23 20:09:43.084429592 +0200
+@@ -156,8 +156,8 @@
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
diff --git a/app-office/openoffice/files/1.1.5/javafix.patch b/app-office/openoffice/files/1.1.5/javafix.patch
new file mode 100644
index 000000000000..e2d9ccf723b1
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/javafix.patch
@@ -0,0 +1,27 @@
+--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
++++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+@@ -184,7 +184,12 @@
+ 	{
+ 		jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;");
+ 		if(id)
+-			return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL));
++			return copyArrayAndDelete(
++		t.pEnv,
++		(jobjectArray)t.pEnv->GetObjectField( object, id),
++		static_cast< const ::rtl::OUString* >( NULL ),
++		static_cast< const java_lang_String* >( NULL )
++		);
+ 	} //t.pEnv
+ 	return Sequence< ::rtl::OUString>();
+ }
+--- connectivity/source/inc/java/tools.hxx
++++ connectivity/source/inc/java/tools.hxx
+@@ -101,7 +101,7 @@
+ 
+ 	java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ 
+-    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const  T& _rD1,const  JT& _rD2)
++    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* )
+ 	{
+                 ::com::sun::star::uno::Sequence< T > xOut;
+ 		if(_Array)
diff --git a/app-office/openoffice/files/1.1.5/newstlportfix.patch b/app-office/openoffice/files/1.1.5/newstlportfix.patch
new file mode 100644
index 000000000000..f88927669a7b
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/newstlportfix.patch
@@ -0,0 +1,100 @@
+--- stlport/makefile.mk.orig	2004-01-28 11:52:04.000000000 +0100
++++ stlport/makefile.mk	2004-11-04 15:36:38.158427224 +0100
+@@ -72,11 +72,12 @@
+ # --- Files --------------------------------------------------------
+ .EXPORT : CC CXX
+ .IF "$(COMID)"=="gcc3"
+-	TARFILE_NAME=STLport-4.5
+        .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103"
++               TARFILE_NAME=STLport-4.5
+                PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch
+        .ELSE
+-               PATCH_FILE_NAME=STLport-4.5.patch
++               TARFILE_NAME=STLport-4.6.2
++               PATCH_FILE_NAME=STLport-4.6.2.patch
+        .ENDIF
+ .ELSE			# "$(COMID)"=="gcc3"
+ 	.IF "$(OS)"=="MACOSX"
+@@ -127,7 +128,7 @@
+ 		.ELIF "$(OS)"=="MACOSX"
+ 			BUILD_FLAGS=-f gcc-3.0-macosx.mak
+ 		.ELSE
+-			BUILD_FLAGS=-f gcc-3.0.mak
++			BUILD_FLAGS=-f gcc.mak
+		.ENDIF
+ 	.ELSE # "$(COMID)"=="gcc3"
+ 		# MacOS X/Darwin need a special makefile
+--- /dev/null	2004-10-28 17:21:08.585283768 +0200
++++ stlport/STLport-4.6.2.patch	2004-11-04 21:27:55.986110360 +0100
+@@ -0,0 +1,71 @@
++--- misc/build/STLport-4.6.2/src/num_get_float.cpp	2003-11-02 09:58:50.000000000 +0100
+++++ misc/build/STLport-4.6.2/src/num_get_float.cpp	2004-11-04 15:26:12.605525720 +0100
++@@ -770,18 +770,18 @@
++ 
++ void  _STLP_CALL
++ __string_to_float(const string& v, float& val) {
++-    val = _Stl_string_to_double(v.data());
+++    val = _Stl_string_to_double(v.c_str());
++ }
++ 
++ void  _STLP_CALL
++ __string_to_float(const string& v, double& val) {
++-    val = _Stl_string_to_double(v.data());
+++    val = _Stl_string_to_double(v.c_str());
++ }
++ 
++ #ifndef _STLP_NO_LONG_DOUBLE
++ void  _STLP_CALL
++ __string_to_float(const string& v, long double& val) {
++-    val = _Stl_string_to_long_double(v.data());
+++    val = _Stl_string_to_long_double(v.c_str());
++ }
++ #endif
++ 
++--- misc/build/STLport-4.6.2/stlport/config/stl_gcc.h	2003-11-02 09:59:11.000000000 +0100
+++++ misc/build/STLport-4.6.2/stlport/config/stl_gcc.h	2004-11-04 15:26:12.342565696 +0100
++@@ -7,7 +7,9 @@
++ # define _STLP_USE_GLIBC
++ #endif
++ 
+++#if (__GNUC__ >= 3) && (__GNUC_MAJOR__ >= 4)
++ #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+++#endif
++ 
++ # if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) )
++ #  define _STLP_NO_WCHAR_T
++@@ -263,7 +265,7 @@
++ 
++ # if (__GNUC__ >= 3)
++ 
++-#  if ((__GNUC_MINOR__ == 0) || (__APPLE__))
+++#  if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__))
++ #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
++ #   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
++ #  else
++--- misc/build/STLport-4.6.2/stlport/stdexcept	2003-11-02 09:59:01.000000000 +0100
+++++ misc/build/STLport-4.6.2/stlport/stdexcept	2004-11-04 15:26:12.474545632 +0100
++@@ -60,6 +60,11 @@
++ # endif
++ #  define _STLP_EXCEPTION_BASE exception
++ 
+++#if (__GNUC__ >= 3)
+++#undef _STLP_NOTHROW_INHERENTLY
+++#define _STLP_NOTHROW_INHERENTLY throw()
+++#endif
+++
++ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
++ public:
++   __Named_exception(const string& __str) 
++--- misc/build/STLport-4.6.2/src/common_rules.mak	2004-11-04 21:25:58.322997872 +0100
+++++ misc/build/STLport-4.6.2/src/common_rules.mak	2004-11-04 21:26:15.731351400 +0100
++@@ -84,7 +84,8 @@
++ 	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
++ 	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
++ 	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
++-	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
+++# not needed ?
+++#	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
++ 	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
++ 
++ install_unix :
diff --git a/app-office/openoffice/files/1.1.5/nptl.patch b/app-office/openoffice/files/1.1.5/nptl.patch
new file mode 100644
index 000000000000..996a7ceec67d
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/nptl.patch
@@ -0,0 +1,25 @@
+--- tools/source/solar/solar.c.orig
++++ tools/source/solar/solar.c
+@@ -577,7 +577,7 @@
+ 
+   {
+ 	char* p = NULL;
+-	InfoMemoryAccess( p );
++	/*InfoMemoryAccess( p );*/
+ 	p = (char*)&p;
+ 	InfoMemoryAccess( p );
+ 	InfoMemoryTypeAccess( t_short );
+*** sal/osl/unx/process.c.orig
+--- sal/osl/unx/process.c
+@@ -1017,11 +1017,6 @@
+ 			for (i = 0; data.m_pszEnv[i] != NULL; i++)
+ 	     		putenv(data.m_pszEnv[i]);
+ 
+-#if defined(LINUX)
+-            /* mfe: linux likes to have just one thread when the exec family is called */
+-            /*      this np function has this purpose ...                              */
+-            pthread_kill_other_threads_np();
+-#endif
+             OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
+      
+ 			/* Connect std IO to pipe ends */
diff --git a/app-office/openoffice/files/1.1.5/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.5/ooffice-wrapper-1.3
new file mode 100644
index 000000000000..78b242ca2c9a
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/ooffice-wrapper-1.3
@@ -0,0 +1,197 @@
+#!/bin/sh
+#
+# Wrapper script for openoffice
+#
+# (C) Peter 'Nidd' Novodvorsky, 2001,2002
+# (C) Martin 'empty' Quinson, 2002.
+#     Modifications by Chris Halls
+#     Modifications by Lucien Saviot
+
+# This program is free software; you can redistribute it and/or modify         
+# it under the terms of the GNU General Public License as published by         
+# the Free Software Foundation; either version 2 of the License, or            
+# (at your option) any later version.                                          
+#                                                                             
+# This program is distributed in the hope that it will be useful,              
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             
+# General Public License for more details.                                     
+#                                                                             
+# You should have received a copy of the GNU General Public License            
+# along with this program; if not, write to the Free Software                  
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA      
+
+# this string should be exactly as in ~/.sversionrc
+PV=<pv>
+OOVERSION="OpenOffice.org ${PV}"
+
+##
+## Source system configuration file
+##
+[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
+
+# Migration to new user install dir
+if [ -d "$HOME/.openoffice/1.1.4" ] ; then
+     mv $HOME/.openoffice/1.1.4 $HOME/.openoffice/1.1.5
+     sed -i -e s/'.openoffice\/1.1.4'/'.openoffice\/1.1.5'/g $HOME/.sversionrc 
+     sed -i -e s/1.1.4/1.1.5/g $HOME/.openoffice/1.1.5/user/basic/*.xlc
+     echo "Your user install dir has been moved over to the new version"
+fi
+
+#Make smooth up- and downgrading between minor versions possible
+if [ -e "$HOME/.sversionrc" ] ; then
+     sed -i -e s/1.1.4/1.1.5/g $HOME/.sversionrc
+fi
+
+if [ ! -f "/proc/version" ] ; then
+    echo "--- Warning - OO.o will not work without a mounted /proc filesystem ---"
+fi
+
+###
+### Get user settings directory from ~/.sversionrc and echo directory name to stdout
+### get_settings_dir <Version>
+### return: 0 - directory found, 
+###         1 - ~/.sversionrc non existent
+###         2 - entry exists in ~/.sversionrc but directory not found
+###         3 - ~/.sversionrc exists but no entry found
+get_settings_dir()
+{
+  [ -r ${HOME}/.sversionrc ] || exit 1
+  # warning, .sversionrc is DOS encoded so strip ^M
+  settings_dir="`tr -d  '\r' < ~/.sversionrc | sed -n "/^$1=/s%^$1=file://\(.*\)$%\1%p"`"
+  echo "$settings_dir"
+  [ -n "$settings_dir" ] || exit 3
+  [ -d "$settings_dir" ] || exit 2
+}
+
+##
+## where does OO live for this user ?
+##
+OOHOME="`get_settings_dir "$OOVERSION"`"
+if [ $? -eq 2 ] ; then
+  # .sversionrc contains a version yet the directory does not exist
+    echo "I'm confused because I can't find OpenOffice's user files."
+    echo "Your ~/.sversionrc file tells they should be under $OOHOME,"
+    echo "but they are not. Please fix the situation manually."
+    echo "You may want to edit ~/.sversionrc to indicate where is OO"
+    echo "installed, or remove it if you did remove your installation"
+    echo "directory manually (you bad one)."
+    exit 1
+fi
+
+##
+## Add /usr/share/fonts to font search path
+##
+
+# Default font path.  This is used if SAL_FONTPATH_PRIVATE is not defined.
+
+GENTOO_FONTPATH=""
+for d in `find /usr/share/fonts -maxdepth 1 -mindepth 1 -type d` ; do
+    GENTOO_FONTPATH="$GENTOO_FONTPATH;$d"
+done
+
+SAL_FONTPATH_PRIVATE=${SAL_FONTPATH_PRIVATE:-"$GENTOO_FONTPATH"}
+export SAL_FONTPATH_PRIVATE
+
+## search LOCALE
+if [ -n "$LC_ALL" ]; then
+  LOCALE="$LC_ALL"
+  # OOo doesn't understand LC_ALL, so set LANG
+  LANG="$LC_ALL"
+elif [ -n "$LANG" ]; then
+  LOCALE="$LANG"
+elif [ -n "$LC_MESSAGES" ]; then
+  LOCALE="$LC_MESSAGES"
+  LANG="$LC_MESSAGES"
+else
+  LOCALE="en_US"
+fi
+
+# Set locale to en_US if locale is C
+if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi
+
+LOCALEOO=`echo $LOCALE | sed 's/_/-/'`
+
+##
+## install OO for this user if needed
+##
+if [ -z "$OOHOME" ] ; then
+  if [ -e /etc/openoffice/autoresponse-<pv>.conf ] && \
+    grep -q DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf ; then
+
+      # first install
+      OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \
+             sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
+
+      if [ -d "$OOHOME" ]; then
+        echo "openoffice.org:  You have no entry for $OOVERSION in ~/.sversionrc, "
+        echo "yet the directory $OOHOME exists." 
+        echo "Please remove $OOHOME and try again."
+        exit 1
+      fi
+
+      echo "running openoffice.org setup..."
+      if ! /opt/OpenOffice.org/program/setup -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
+        echo "setup failed.. abort"
+        exit 1
+      fi
+
+    echo "Setup complete.  Running openoffice.org..."
+
+else
+    echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break"
+    echo "the /etc/openoffice/autoresponse-<pv>.conf file manually ?"
+    echo "This file should contain DESTINATIONPATH"
+    exit 1
+  fi
+fi
+
+##
+## If no file is specified on the command line, which application to start?  
+## The wrapper can be called from several links in /usr/bin
+##
+if [ $# = 0 ]; then
+  case `basename $0` in
+    oocalc) set -- private:factory/scalc;;
+    oodraw) set -- private:factory/sdraw;;
+    ooimpress) set -- private:factory/simpress;;
+    oomath) set -- private:factory/smath;;
+    ooweb) set -- private:factory/swriter/web;;
+    oowriter) set -- private:factory/swriter;;
+    oomaster) set -- private:factory/swriter/Global;;
+  esac
+fi
+
+## Previous dead installation?
+[ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used"
+
+# Check whether the programs actually link to anything, or are from an old
+# version.
+
+if [ ! -s $OOHOME/setup ]; then
+	echo "${OOHOME}/setup links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org/program/setup ${OOHOME}/setup
+fi
+if [ ! -s $OOHOME/soffice ]; then
+	echo "${OOHOME}/soffice links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/soffice
+fi
+if [ ! -s $OOHOME/spadmin ]; then
+	echo "${OOHOME}/spadmin links to nothing, resetting link"
+	ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/spadmin
+fi
+
+
+##
+## That's it. Launch the beast (with the given args)
+##
+LANG=$LOCALE
+export LANG
+case `basename $0` in
+    oosetup) exec "$OOHOME/setup"
+    ;;
+    oopadmin) exec "$OOHOME/spadmin"
+    ;;
+    *) exec "$OOHOME/soffice" "$@"
+    ;;
+esac
diff --git a/app-office/openoffice/files/1.1.5/openoffice-java.patch b/app-office/openoffice/files/1.1.5/openoffice-java.patch
new file mode 100644
index 000000000000..46a6e9734aa6
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/openoffice-java.patch
@@ -0,0 +1,36 @@
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2004-02-10 01:00:11.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2004-02-09 11:19:53.000000000 +0100
+@@ -200,7 +200,7 @@
+         index--;
+     }
+     
+-    public org.openide.WizardDescriptor$Panel current() {
++    public org.openide.WizardDescriptor.Panel current() {
+         return panels[index];
+     }
+     
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2004-02-10 01:00:48.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2004-02-09 11:20:15.000000000 +0100
+@@ -207,7 +207,7 @@
+    index--;
+   }
+ 
+-  public org.openide.WizardDescriptor$Panel current()
++  public org.openide.WizardDescriptor.Panel current()
+    {
+      return panels[index];
+    }
+diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java
+--- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2004-02-10 01:01:29.000000000 +0100
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2004-02-09 11:20:35.000000000 +0100
+@@ -214,7 +214,7 @@
+         index--;
+     }
+     
+-    public org.openide.WizardDescriptor$Panel current() {
++    public org.openide.WizardDescriptor.Panel current() {
+         return panels[index];
+     }
+     
diff --git a/app-office/openoffice/files/1.1.5/pthreadlink-fix.patch b/app-office/openoffice/files/1.1.5/pthreadlink-fix.patch
new file mode 100644
index 000000000000..ffd0a647faa8
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/pthreadlink-fix.patch
@@ -0,0 +1,32 @@
+diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
+--- solenv.orig/inc/unxlngi4.mk	2004-10-23 20:07:59.714144264 +0200
++++ solenv/inc/unxlngi4.mk	2004-10-23 20:08:36.190599000 +0200
+@@ -151,13 +151,13 @@
+ LINK*=$(CC)
+ 
+ # default linker flags
+-LINKFLAGSDEFS*=-z defs
++LINKFLAGSDEFS*=-Wl,-z,defs
+ LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+-LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic
++LINKFLAGSAPPCUI= -Wl,-export-dynamic
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+@@ -198,8 +198,8 @@
+ 
+ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+ 
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -lstdc++
++LIBSTLPORTST=$(STATIC) -lstlport_gcc -lpthread $(DYNAMIC)
+ 
+ #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+ 
diff --git a/app-office/openoffice/files/1.1.5/pyunolink-fix.patch b/app-office/openoffice/files/1.1.5/pyunolink-fix.patch
new file mode 100644
index 000000000000..6d8ce6323868
--- /dev/null
+++ b/app-office/openoffice/files/1.1.5/pyunolink-fix.patch
@@ -0,0 +1,14 @@
+--- pyuno.orig/source/module/makefile.mk	2005-01-18 11:59:23.462336464 +0100
++++ pyuno/source/module/makefile.mk	2005-01-18 11:59:42.289474304 +0100
+@@ -82,9 +82,9 @@
+ # so this library cannot be checked
+ SHL1NOCHECK=yes
+ PYUNORC=pyunorc
+-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
++#.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
+ PYTHONLIB=-lpython
+-.ENDIF
++#.ENDIF
+ .ELSE
+ # on windows, the python executable also uses the shared library,
+ # so we link pyuno directly to it
diff --git a/app-office/openoffice/files/digest-openoffice-1.1.5 b/app-office/openoffice/files/digest-openoffice-1.1.5
new file mode 100644
index 000000000000..d34f4d2ebceb
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-1.1.5
@@ -0,0 +1,5 @@
+MD5 1c8e860adae05087a53bdba5646962a9 OOo_1.1.5_src.tar.gz 223418209
+MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958
+MD5 072736926e5c04aba26b2fedaaf413fb LINUXGCCPinc.zip 4145981
+MD5 6cfa9ea26afd1effaee4497a7c82ef89 LINUXGCCPlib.zip 496451
+MD5 e77e91543d95353f742942af8f8d01b3 LINUXGCCPruntime.zip 2533976