New version

21 files changed, 2979 insertions, 409 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 04fd8a3ddded..9c072b853b35 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.5 2002/08/06 20:38:38 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.6 2002/09/15 18:12:49 azarah Exp $
+
+*openoffice-1.0.1 (15 Sep 2002)
+
+  15 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.  New install method.  Install menu shortcuts.
+  Lots of cleanups and other stuff I forgot.
 
 *openoffice-1.0.0-r2 (15 Jul 2002)
 
diff --git a/app-office/openoffice/files/1.0.1/ooffice-wrapper b/app-office/openoffice/files/1.0.1/ooffice-wrapper
new file mode 100644
index 000000000000..4791ddd4b191
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/ooffice-wrapper
@@ -0,0 +1,201 @@
+#!/bin/sh
+#
+# Wrapper script for openoffice
+#
+# (C) Peter 'Nidd' Novodvorsky, 2001,2002
+# (C) Martin 'empty' Quinson, 2002.
+#     Modifications by Chris Halls
+
+# 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
+OOVERSION="OpenOffice.org <pv>"
+
+##
+## Source system configuration file
+##
+[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
+
+##
+## where does OO live for this user ?
+##
+OOHOME=""
+if [ -e ~/.sversionrc ] && grep -q "$OOVERSION" ~/.sversionrc ; then
+  # already installed for this user (warning, .sversionrc is DOS encoded)
+  OOHOME=`grep "^$OOVERSION=" ~/.sversionrc| \
+          sed "s|^$OOVERSION=file://||"  | \
+	  xargs echo`
+  if [ ! -e $OOHOME ] ; then
+    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
+fi
+
+##
+## Unset SESSION_MANAGER if gnome-session is the session manager
+## See http://www.openoffice.org/issues/show_bug.cgi?id=4494
+##
+SMPID=`echo $SESSION_MANAGER | sed --quiet "s,local.*/,,p"`
+if [ -n "$SMPID" ] && [ -L /proc/"$SMPID"/exe ]; then
+  SESMGR="`readlink -f /proc/$SMPID/exe`"
+  if [ "$SESMGR" = "/usr/bin/gnome-session" ]; then
+      echo "Gnome session manager detected - session management disabled"
+      unset SESSION_MANAGER
+  fi
+fi
+
+##
+## install OO for this user if needed
+##
+if [ -z "$OOHOME" ] ; then
+  if [ -e /etc/openoffice/autoresponse.conf ] && \
+    grep -q DESTINATIONPATH /etc/openoffice/autoresponse.conf ; then
+    # first install
+    OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse.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<pv>/program/setup -R:/etc/openoffice/autoresponse.conf ; 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.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;;
+    oowriter) set -- private:factory/swriter;;
+  esac
+fi
+
+##
+##
+## Change the config files to conform to current locale used
+##
+
+# Fix some variable to make the paths shorter in the rest
+LINGFILE="$OOHOME/user/config/registry/instance/org/openoffice/Office/Linguistic.xml"
+SETUPFILE="$OOHOME/user/config/registry/instance/org/openoffice/Setup.xml"
+
+
+# Search the right locale
+OLDLOCALE=""
+if [ -e $LINGFILE ] ; then
+  OLDLOCALE=`grep 'DefaultLocale cfg' $LINGFILE|sed 's/<[^>]*>//g'|sed 's/[[:blank:]]//g'`
+fi 
+if [ -z $OLDLOCALE ]; then  OLDLOCALE="en-US";  fi
+if [ "x$OLDLOCALE" = "xC" ]; then  OLDLOCALE="en-US";  fi
+
+LOCALE=$LC_ALL
+if [ -z $LOCALE ] ; then LOCALE="$LC_MESSAGES"; fi
+if [ -z $LOCALE ] ; then LOCALE="$LANG"; fi
+if [ -z $LOCALE ] ; then LOCALE="en-US"; fi
+if [ "x$LOCALE" = "xC" ] ; then LOCALE="en-US"; fi
+
+if [ $LOCALE != $OLDLOCALE ] ; then 
+
+  # Change instdb.ins
+  cp $OOHOME/instdb.ins $OOHOME/instdb.ins.$OLDLOCALE
+  sed "s/>$OLDLOCALE</>$LOCALE</" $OOHOME/instdb.ins.$OLDLOCALE > $OOHOME/instdb.ins
+  
+  # Create Linguistic.xml if don't exists
+  if [ ! -e $LINGFILE.$OLDLOCALE ] ; then
+    # get a default one, and change en-US to OLDLOCALE inside. I guess this is a noop, but I'm not sure
+    sed "s/>en-US</>$OLDLOCALE</" \
+      < /opt/OpenOffice.org<pv>/share/config/registry/instance/org/openoffice/Office/Linguistic.xml \
+      > $LINGFILE.$OLDLOCALE
+  fi
+  
+  # change Linguistic.xml
+  sed "s/>$OLDLOCALE</>$LOCALE</" $LINGFILE.$OLDLOCALE > $LINGFILE
+
+  # Change Setup.xml
+  if grep -q '<ooLocale cfg:type' $SETUPFILE ; then 
+    cp $SETUPFILE $SETUPFILE.$OLDLOCALE
+    sed "s/>$OLDLOCALE</>$LOCALE</" $SETUPFILE.$OLDLOCALE > $SETUPFILE
+  else # ooLocale entry does not exists in Setup.xml
+    cp $SETUPFILE $SETUPFILE.tmp
+     
+    cat $SETUPFILE.tmp | \
+      perl -e "while (<>) { /<Office>/ && print \"<L10N>\n<ooLocale cfg:type=\\\"string\\\">$LOCALE</ooLocale>\n</L10N>\n\";print \$_;}" > \
+      $SETUPFILE 
+    # this perl command is to add a <L10N> section if it does not exists.
+    # On my machine, it produce the following patch:
+    
+    # <Setup state="modified" cfg:package="org.openoffice" xmlns="http://openoffice.org/2000/registry/components/Setup" xmlns:cfg="http://openoffice.org/2000/registry/instance" xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance">
+    #+ <L10N>
+    #+  <ooLocale cfg:type="string">fr_FR@euro</ooLocale>
+    #+ </L10N>
+    #  <Office>
+   
+    rm $SETUPFILE.tmp
+  fi # change Setup.xml
+  
+fi # LOCALE != OLDLOCALE
+
+## 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"
+
+##
+## That's it. Launch the beast (with the given args)
+##
+case `basename $0` in
+  oosetup) exec "$OOHOME/setup" ;;
+  oopadmin) exec "$OOHOME/spadmin" ;;
+  *) exec "$OOHOME/soffice" "$@" ;;
+esac
+	  
+## Changelog
+# 07/10 challs
+#   * use 1.0.1 directory and improve error checking
+# 07/02 challs
+#   * use readlink in /proc/PID/exe to get
+#     real session manager name
+# 06/12 challs
+#   * merge into main package
+#   * change $@ to "$@"
+#   * source configuration file: 
+#       /etc/openoffice/openoffice.conf
+# 06/12 mquinson
+#   * strace only when DEBUG is set to yes
+#   * readd the $@ to pass the args to soffice
+# 06/06 mquinson
+#   * Make sure the OLDLOCALE is never empty
+#   * handle the case where the locale is C
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-configure.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-configure.patch
new file mode 100644
index 000000000000..9b48befffc26
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-configure.patch
@@ -0,0 +1,36 @@
+diff -urNd oo_641d_src/config_office/configure.in oo_641d_src/config_office/configure.in.new
+--- oo_641d_src/config_office/configure.in	Sat Mar 30 23:18:04 2002
++++ oo_641d_src/config_office/configure.in.new	Sat Mar 30 22:31:31 2002
+@@ -808,10 +808,14 @@
+    if test "$_os" = "Linux" -a "$_machine_type" = "i686"; then
+       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+       _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
++      _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'`
+ 
+       if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
+          _jdk_minor="true"
+       fi
++      if test "$_jdk_middle" = "false" -a "$_jdk_middle4" = "true"; then
++         _jdk_minor="true"
++      fi
+    fi
+    if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
+       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+diff -urNd oo_641d_src/config_office/configure oo_641d_src/config_office/configure.new
+--- oo_641d_src/config_office/configure	Sat Mar 30 23:18:02 2002
++++ oo_641d_src/config_office/configure.new	Sat Mar 30 22:31:26 2002
+@@ -2296,10 +2296,14 @@
+    if test "$_os" = "Linux" -a "$_machine_type" = "i686"; then
+       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+       _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
++      _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'`
+ 
+       if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
+          _jdk_minor="true"
+       fi
++      if test "$_jdk_middle" = "false" -a "$_jdk_middle4" = "true"; then
++         _jdk_minor="true"
++      fi
+    fi
+    if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
+       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-fix-nostdin-bug-on-PPC.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-fix-nostdin-bug-on-PPC.patch
new file mode 100644
index 000000000000..ac482f222a7a
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-fix-nostdin-bug-on-PPC.patch
@@ -0,0 +1,11 @@
+--- oo_stable1_cvs20020418_src/solenv/inc/unxlngppc.mk~	Fri Apr 19 00:09:21 2002
++++ oo_stable1_cvs20020418_src/solenv/inc/unxlngppc.mk	Fri Apr 19 00:24:30 2002
+@@ -31,7 +31,7 @@
+ cc=$(CCCOMP)
+ 
+ # source code is still not signed versus unsigned char clean 
+-CFLAGS=-fsigned-char -w -nostdinc -c $(INCLUDE) -I$(SOLARENV)/unxlngppc/usr/include 
++CFLAGS=-fsigned-char -w -c $(INCLUDE) -I$(SOLARENV)/unxlngppc/usr/include 
+ CFLAGSCC=-fsigned-char
+ 
+ # Flags for enabling exception handling
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.0-zipdep-not-found.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-zipdep-not-found.patch
new file mode 100644
index 000000000000..3803e159c1ee
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.0-zipdep-not-found.patch
@@ -0,0 +1,23 @@
+--- oo_641c_src/solenv/inc/_tg_zip.mk.zipdep	Fri Nov  2 18:59:44 2001
++++ oo_641c_src/solenv/inc/_tg_zip.mk	Sat Feb 16 16:59:57 2002
+@@ -163,7 +163,8 @@
+ 	+-zipdep $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+ .ENDIF			# "$(ZIP2DIR)" != ""
+ .ENDIF			# "$(common_build_zip)"!=""
+-	@+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
++# (gb) workaround for setup2/script/makefile.mk
++#	@+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+ .ENDIF			# "$(make_zip_deps)" != ""
+ .ENDIF
+ 
+--- oo_641c_src/tools/bootstrp/makefile.mk.zipdep	Tue Oct 16 16:21:13 2001
++++ oo_641c_src/tools/bootstrp/makefile.mk	Fri Feb 15 17:02:24 2002
+@@ -147,7 +147,7 @@
+ APP4LIBS=       $(LB)$/bootstrp.lib
+ APP4DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
+ 
+-#APP5TARGET= zipdep
++APP5TARGET= zipdep
+ APP5OBJS=	$(OBJ)$/zipdep.obj
+ APP5LIBS=	$(LB)$/bootstrp.lib
+ APP5STDLIBS=$(STATIC_LIBS) 
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-braindamage.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-braindamage.patch
new file mode 100644
index 000000000000..32e2a170f3cb
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-braindamage.patch
@@ -0,0 +1,484 @@
+--- oo_1.0_src/sd/source/ui/app/makefile.mk.suxx	Fri Jun 14 11:29:42 2002
++++ oo_1.0_src/sd/source/ui/app/makefile.mk	Fri Jun 14 11:33:27 2002
+@@ -132,15 +132,15 @@
+ $(INCCOM)$/sddll0.hxx: makefile.mk
+ 	+@echo $@
+ .IF "$(GUI)"=="OS2"
+-	echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX)" >$@
++	echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX)\" >$@
+ .ELSE
+ .IF "$(GUI)"=="MAC"
+ 	echo "$(HASHMARK)define DLL_NAME ¶"sd$(UPD)$(DLLPOSTFIX).dll¶"" > $@
+ .ELSE
+ .IF "$(GUI)"=="UNX"
+-	echo #define DLL_NAME \"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
++	echo "#define DLL_NAME "\"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ELSE
+-	echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX).DLL" >$@
++	echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX).DLL\" >$@
+ .ENDIF
+ .ENDIF
+ .ENDIF
+--- oo_1.0_src/sch/source/ui/app/makefile.mk.suxx	Fri Jun 14 11:29:53 2002
++++ oo_1.0_src/sch/source/ui/app/makefile.mk	Fri Jun 14 11:34:03 2002
+@@ -113,16 +113,16 @@
+ 
+ $(INCCOM)$/schlib.hxx: makefile.mk
+ .IF "$(GUI)"=="OS2"
+-	echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)" >$@
++	echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)\" >$@
+ .ELSE
+ .IF "$(GUI)"=="MAC"
+ 	echo "$(HASHMARK)define DLL_NAME ¶"sch$(UPD)$(DLLPOSTFIX).dll¶"" > $@
+ .ELSE
+ .IF "$(GUI)"=="UNX"
+ 	$(RM) $@
+-	echo #define DLL_NAME \"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
++	echo "#define DLL_NAME "\"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ELSE
+-	echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
++	echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ENDIF
+ .ENDIF
+ .ENDIF
+--- oo_1.0_src/sal/util/makefile.mk.suxx	Fri Jun 14 11:30:06 2002
++++ oo_1.0_src/sal/util/makefile.mk	Fri Jun 14 11:35:42 2002
+@@ -245,14 +245,14 @@
+ .IF "$(GUI)"=="WNT"
+ 
+ $(OUT)$/inc$/udkversion.h: 
+-	echo #ifndef _SAL_UDKVERSION_H_           >  $@
+-	echo #define _SAL_UDKVERSION_H_           >> $@
+-	echo.                                     >> $@
+-	echo #define SAL_UDK_MAJOR "$(UDK_MAJOR)" >> $@
+-	echo #define SAL_UDK_MINOR "$(UDK_MINOR)" >> $@
+-	echo #define SAL_UDK_MICRO "$(UDK_MICRO)" >> $@
+-	echo.                                     >> $@
+-	echo #endif                               >> $@
++	echo "#ifndef _SAL_UDKVERSION_H_"         >  $@
++	echo "#define _SAL_UDKVERSION_H_"         >> $@
++	echo                                      >> $@
++	echo "#define SAL_UDK_MAJOR $(UDK_MAJOR)" >> $@
++	echo "#define SAL_UDK_MINOR $(UDK_MINOR)" >> $@
++	echo "#define SAL_UDK_MICRO $(UDK_MICRO)" >> $@
++	echo                                      >> $@
++	echo "#endif"                             >> $@
+ 
+ .ELSE
+ 
+--- oo_1.0_src/sc/source/ui/app/makefile.mk.suxx	Fri Jun 14 11:30:24 2002
++++ oo_1.0_src/sc/source/ui/app/makefile.mk	Fri Jun 14 11:36:11 2002
+@@ -115,15 +115,15 @@
+ 
+ $(INCCOM)$/scdll0.hxx: makefile.mk
+ .IF "$(GUI)"=="OS2"
+-	echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)" >$@
++	echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)\" >$@
+ .ELSE
+ .IF "$(GUI)"=="MAC"
+ 	echo "$(HASHMARK)define DLL_NAME ¶"sc$(UPD)$(DLLPOSTFIX).dll¶"" > $@
+ .ELSE
+ .IF "$(GUI)"=="UNX"
+-	echo #define DLL_NAME \"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
++	echo "#define DLL_NAME "\"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ELSE
+-	echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
++	echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ENDIF
+ .ENDIF
+ .ENDIF
+--- oo_1.0_src/basctl/source/basicide/makefile.mk.suxx	Fri Jun 14 05:11:03 2002
++++ oo_1.0_src/basctl/source/basicide/makefile.mk	Fri Jun 14 05:12:32 2002
+@@ -153,7 +153,7 @@
+ .ELSE
+ .IF "$(GUI)"=="UNX"
+ 	$(RM) $@
+-        echo #define DLL_NAME \"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
++	echo "#define DLL_NAME "\"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ELSE
+         echo #define DLL_NAME "basctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
+ .ENDIF
+--- oo_1.0_src/sw/source/ui/app/makefile.mk.suxx	Fri Jun 14 11:30:36 2002
++++ oo_1.0_src/sw/source/ui/app/makefile.mk	Fri Jun 14 11:36:31 2002
+@@ -152,12 +152,12 @@
+ 
+ .IF "$(GUIBASE)"=="WIN"
+ $(INCCOM)$/swdll0.hxx: makefile.mk
+-	echo #define DLL_NAME "sw$(UPD)$(DLLPOSTFIX).DLL" >$@
++	echo "#define DLL_NAME "\"sw$(UPD)$(DLLPOSTFIX).DLL\" >$@
+ .ENDIF
+ 
+ .IF "$(GUI)"=="UNX"
+ $(INCCOM)$/swdll0.hxx: makefile.mk
+-	echo #define DLL_NAME \"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
++	echo "#define DLL_NAME "\"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ENDIF
+ 
+ 
+--- oo_1.0_src/starmath/source/makefile.mk.suxx	Fri Jun 14 11:30:45 2002
++++ oo_1.0_src/starmath/source/makefile.mk	Fri Jun 14 11:36:46 2002
+@@ -140,9 +140,9 @@
+ $(INCCOM)$/dllname.hxx: makefile.mk
+ .IF "$(GUI)"=="UNX"
+ 	$(RM) $@
+-	echo #define DLL_NAME \"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
++	echo "#define DLL_NAME "\"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ELSE
+-	echo #define DLL_NAME "sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
++	echo "#define DLL_NAME "\"sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ .ENDIF
+ 
+ $(SRS)$/smres.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
+--- oo_1.0_src/solenv/inc/_tg_app.mk.suxx	Fri Jun 14 11:30:57 2002
++++ oo_1.0_src/solenv/inc/_tg_app.mk	Fri Jun 14 11:39:21 2002
+@@ -113,8 +113,8 @@
+ 	@-+echo 1 ICON $(APP1ICON) >> $(MISC)$/$(APP1LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP1VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
+-	@-+echo #include  "$(APP1VERINFO)" >> $(MISC)$/$(APP1LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP1LINKRES:b).rc
++	@-+echo "#include  "\"$(APP1VERINFO)\" >> $(MISC)$/$(APP1LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
+ .ENDIF			# "$(APP1LINKRES)" != ""
+@@ -309,8 +309,8 @@
+ 	@-+echo 1 ICON $(APP2ICON) >> $(MISC)$/$(APP2LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP2VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
+-	@-+echo #include  "$(APP2VERINFO)" >> $(MISC)$/$(APP2LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP2LINKRES:b).rc
++	@-+echo "#include  "\"$(APP2VERINFO)\" >> $(MISC)$/$(APP2LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
+ .ENDIF			# "$(APP2LINKRES)" != ""
+@@ -505,8 +505,8 @@
+ 	@-+echo 1 ICON $(APP3ICON) >> $(MISC)$/$(APP3LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP3VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
+-	@-+echo #include  "$(APP3VERINFO)" >> $(MISC)$/$(APP3LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP3LINKRES:b).rc
++	@-+echo "#include  "\"$(APP3VERINFO)\" >> $(MISC)$/$(APP3LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
+ .ENDIF			# "$(APP3LINKRES)" != ""
+@@ -701,8 +701,8 @@
+ 	@-+echo 1 ICON $(APP4ICON) >> $(MISC)$/$(APP4LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP4VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
+-	@-+echo #include  "$(APP4VERINFO)" >> $(MISC)$/$(APP4LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP4LINKRES:b).rc
++	@-+echo "#include  "\"$(APP4VERINFO)\" >> $(MISC)$/$(APP4LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
+ .ENDIF			# "$(APP4LINKRES)" != ""
+@@ -897,8 +897,8 @@
+ 	@-+echo 1 ICON $(APP5ICON) >> $(MISC)$/$(APP5LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP5VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
+-	@-+echo #include  "$(APP5VERINFO)" >> $(MISC)$/$(APP5LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP5LINKRES:b).rc
++	@-+echo "#include  \"$(APP5VERINFO)\" >> $(MISC)$/$(APP5LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
+ .ENDIF			# "$(APP5LINKRES)" != ""
+@@ -1093,8 +1093,8 @@
+ 	@-+echo 1 ICON $(APP6ICON) >> $(MISC)$/$(APP6LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP6VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
+-	@-+echo #include  "$(APP6VERINFO)" >> $(MISC)$/$(APP6LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP6LINKRES:b).rc
++	@-+echo "#include  "\"$(APP6VERINFO)\" >> $(MISC)$/$(APP6LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
+ .ENDIF			# "$(APP6LINKRES)" != ""
+@@ -1289,8 +1289,8 @@
+ 	@-+echo 1 ICON $(APP7ICON) >> $(MISC)$/$(APP7LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP7VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
+-	@-+echo #include  "$(APP7VERINFO)" >> $(MISC)$/$(APP7LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP7LINKRES:b).rc
++	@-+echo "#include  "\"$(APP7VERINFO)\" >> $(MISC)$/$(APP7LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
+ .ENDIF			# "$(APP7LINKRES)" != ""
+@@ -1485,8 +1485,8 @@
+ 	@-+echo 1 ICON $(APP8ICON) >> $(MISC)$/$(APP8LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP8VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
+-	@-+echo #include  "$(APP8VERINFO)" >> $(MISC)$/$(APP8LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP8LINKRES:b).rc
++	@-+echo "#include  "\"$(APP8VERINFO)\" >> $(MISC)$/$(APP8LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
+ .ENDIF			# "$(APP8LINKRES)" != ""
+@@ -1681,8 +1681,8 @@
+ 	@-+echo 1 ICON $(APP9ICON) >> $(MISC)$/$(APP9LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP9VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
+-	@-+echo #include  "$(APP9VERINFO)" >> $(MISC)$/$(APP9LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP9LINKRES:b).rc
++	@-+echo "#include  "\"$(APP9VERINFO)\" >> $(MISC)$/$(APP9LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
+ .ENDIF			# "$(APP9LINKRES)" != ""
+@@ -1877,8 +1877,8 @@
+ 	@-+echo 1 ICON $(APP10ICON) >> $(MISC)$/$(APP10LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP10VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
+-	@-+echo #include  "$(APP10VERINFO)" >> $(MISC)$/$(APP10LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP10LINKRES:b).rc
++	@-+echo "#include  "\"$(APP10VERINFO)\" >> $(MISC)$/$(APP10LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
+ .ENDIF			# "$(APP10LINKRES)" != ""
+--- oo_1.0_src/solenv/inc/_tg_shl.mk.suxx	Fri Jun 14 11:31:07 2002
++++ oo_1.0_src/solenv/inc/_tg_shl.mk	Fri Jun 14 11:43:39 2002
+@@ -226,10 +226,10 @@
+ 	@-+echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL1TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL1TARGET:b)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL1DEFAULTRES)"!=""
+@@ -651,10 +651,10 @@
+ 	@-+echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL2TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL2TARGET:b)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL2DEFAULTRES)"!=""
+@@ -1076,10 +1076,10 @@
+ 	@-+echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL3TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL3TARGET:b)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL3DEFAULTRES)"!=""
+@@ -1501,10 +1501,10 @@
+ 	@-+echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL4TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL4TARGET:b)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL4DEFAULTRES)"!=""
+@@ -1926,10 +1926,10 @@
+ 	@-+echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL5TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL5TARGET:b)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL5DEFAULTRES)"!=""
+@@ -2351,10 +2351,10 @@
+ 	@-+echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL6TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL6TARGET:b)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL6DEFAULTRES)"!=""
+@@ -2776,10 +2776,10 @@
+ 	@-+echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL7TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL7TARGET:b)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL7DEFAULTRES)"!=""
+@@ -3201,10 +3201,10 @@
+ 	@-+echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL8TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL8TARGET:b)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL8DEFAULTRES)"!=""
+@@ -3626,10 +3626,10 @@
+ 	@-+echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL9TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL9TARGET:b)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL9DEFAULTRES)"!=""
+@@ -4051,10 +4051,10 @@
+ 	@-+echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL10TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL10TARGET:b)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL10DEFAULTRES)"!=""
+--- oo_1.0_src/solenv/inc/settings.mk.suxx	Fri Jun 14 11:31:14 2002
++++ oo_1.0_src/solenv/inc/settings.mk	Fri Jun 14 11:43:58 2002
+@@ -617,14 +617,14 @@
+ .IF "$(GUI)"=="UNX"
+ 	@+echo \# > $(OUT)$/inc$/myworld.mk
+ .ELSE			# "$(GUI)"=="UNX"
+-	@+echo # > $(OUT)$/inc$/myworld.mk
++	@+echo "#" > $(OUT)$/inc$/myworld.mk
+ .ENDIF			# "$(GUI)"=="UNX"
+ .IF "$(common_build)"!=""
+ 	@+$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
+ .IF "$(GUI)"=="UNX"
+ 	@+echo \# > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
+ .ELSE			# "$(GUI)"=="UNX"
+-	@+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
++	@+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
+ .ENDIF			# "$(GUI)"=="UNX"
+ .ENDIF			# "$(common_build)"!=""
+ 
+@@ -638,10 +638,10 @@
+ 
+ %worldremote.mk :
+ 	@+$(MKOUT) -r $(ROUT)
+-	@+echo # > $(OUT)$/inc$/myworldremote.mk
++	@+echo "#" > $(OUT)$/inc$/myworldremote.mk
+ .IF "$(common_build)"!=""
+ 	@+$(MKOUT) -r $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
+-	@+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
++	@+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
+ .ENDIF			# "$(common_build)"!=""
+ 
+ .INCLUDE .IGNORE : $(OUT)$/inc$/myworldremote.mk
+--- oo_1.0_src/solenv/inc/tg_app.mk.suxx	Fri Jun 14 11:31:29 2002
++++ oo_1.0_src/solenv/inc/tg_app.mk	Fri Jun 14 11:44:23 2002
+@@ -208,8 +208,8 @@
+ 	@-+echo 1 ICON $(APP$(TNR)ICON) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+ .ENDIF
+ .IF "$(APP$(TNR)VERINFO)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+-	@-+echo #include  "$(APP$(TNR)VERINFO)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
++	@-+echo "#include  "\"$(APP$(TNR)VERINFO)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+ .ENDIF
+ 	$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+ .ENDIF			# "$(APP$(TNR)LINKRES)" != ""
+--- oo_1.0_src/solenv/inc/tg_dep.mk.suxx	Fri Jun 14 11:31:37 2002
++++ oo_1.0_src/solenv/inc/tg_dep.mk	Fri Jun 14 11:44:35 2002
+@@ -124,9 +124,9 @@
+ 	@echo "#" > $(MISC)$/$(TARGET).dpw
+ .ENDIF
+ .ELSE			# "$(GUI)"=="UNX"
+-	@echo # > $(MISC)$/$(TARGET).dpc
++	@echo "#" > $(MISC)$/$(TARGET).dpc
+ .IF "$(GROUP)"=="WRITER"
+-	@echo # > $(MISC)$/$(TARGET).dpw
++	@echo "#" > $(MISC)$/$(TARGET).dpw
+ .ENDIF
+ .ENDIF			# "$(GUI)"=="UNX"
+ 
+--- oo_1.0_src/solenv/inc/tg_shl.mk.suxx	Fri Jun 14 11:31:45 2002
++++ oo_1.0_src/solenv/inc/tg_shl.mk	Fri Jun 14 11:45:07 2002
+@@ -326,10 +326,10 @@
+ 	@-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ .ENDIF
+ .IF "$(use_shl_versions)" != ""
+-	@-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+-	@-+echo #define ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+-	@-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+-	 @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++	@-+echo "#define VERVARIANT	$(BUILD)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++	@-+echo "#define ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++	@-+echo "#define INTERNAL_NAME $(SHL$(TNR)TARGET:b)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++	 @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ .ENDIF			# "$(use_shl_versions)" != ""
+ 	$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ .ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
+--- oo_1.0_src/tools/os2/source/wps/makefile.mk.suxx	Fri Jun 14 11:47:53 2002
++++ oo_1.0_src/tools/os2/source/wps/makefile.mk	Fri Jun 14 11:48:23 2002
+@@ -211,8 +211,8 @@
+     @+if exist $(INCCOM)$/wpsdll.h rm -f $(INCCOM)$/wpsdll.h
+     @echo ----------------------------
+     @echo Making: $@
+-    @echo #define _WPS_DLL_NAME "$(SHL1TARGET).dll" > $(INCCOM)$/wpsdll.h
+-    @echo #define _TEMPLATES_DLL_NAME "$(SHL2TARGET)" >> $(INCCOM)$/wpsdll.h
++    @echo "#define _WPS_DLL_NAME "\"$(SHL1TARGET).dll\" > $(INCCOM)$/wpsdll.h
++    @echo "#define _TEMPLATES_DLL_NAME "\"$(SHL2TARGET)\" >> $(INCCOM)$/wpsdll.h
+ 
+ $(SHL1DEF):
+     @echo ----------------------------
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-bridge-fix-on-PPC.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-bridge-fix-on-PPC.patch
new file mode 100644
index 000000000000..a96de2cdfe40
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-bridge-fix-on-PPC.patch
@@ -0,0 +1,31 @@
+--- oo_1.0_src/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx~	Tue Jul 16 20:19:57 2002
++++ oo_1.0_src/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	Tue Jul 16 20:46:22 2002
+@@ -736,16 +736,16 @@
+                 // get method
+                 *slots = code;
+                 codeSnippet( (long *)code, vtable_pos++, simple_ret );
++		flush_range( code, nSnippetSize );
+                 code += nSnippetSize;
+-                flush_range((char *) slots, nSnippetSize);
+                 slots++;
+                 if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly)
+                 {
+                     // set method
+                     *slots = code;
+                     codeSnippet( (long *)code, vtable_pos++, true );
++		    flush_range( code, nSnippetSize );
+                     code += nSnippetSize;
+-                    flush_range((char *) slots, nSnippetSize);
+                     slots++;
+                 }
+             }
+@@ -755,8 +755,8 @@
+                     ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass );
+                 *slots = code;
+                 codeSnippet( (long *)code, vtable_pos++, simple_ret );
++		flush_range( code, nSnippetSize );
+                 code += nSnippetSize;
+-                flush_range((char *) slots, nSnippetSize);
+                 slots++;
+             }
+             TYPELIB_DANGER_RELEASE( pTD );
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-compiler-flags.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-compiler-flags.patch
new file mode 100644
index 000000000000..9500d07402b2
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-compiler-flags.patch
@@ -0,0 +1,35 @@
+Index: oo_cvs/solenv/inc/unxlngi4.mk
+===================================================================
+RCS file: /cvs/oo/tools/solenv/inc/unxlngi4.mk,v
+retrieving revision 1.13
+diff -u -3 -p -u -r1.13 unxlngi4.mk
+--- oo_cvs/solenv/inc/unxlngi4.mk	2002/03/04 15:53:59	1.13
++++ oo_cvs/solenv/inc/unxlngi4.mk	2002/08/12 08:59:08
+@@ -96,14 +96,14 @@ CFLAGS=
+ .ENDIF
+ CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+ # flags for the C++ Compiler
+-CFLAGSCC= -pipe -mcpu=pentiumpro
++CFLAGSCC= -pipe
+ # Flags for enabling exception handling
+ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+ # Flags for disabling exception handling
+ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+ 
+ # -fpermissive should be removed as soon as possible
+-CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti 
++CFLAGSCXX= -pipe -fno-for-scope -fpermissive 
+ 
+ # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers
+ .IF "$(BUILD_SOSL)"==""
+--- oo_1.0.1_src/solenv/inc/unxlngppc4.mk~	2002-08-20 09:50:00.000000000 +0200
++++ oo_1.0.1_src/solenv/inc/unxlngppc4.mk	2002-08-20 10:25:18.000000000 +0200
+@@ -107,7 +107,7 @@
+ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+ 
+ # -fpermissive should be removed as soon as possible
+-CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive -fno-rtti 
++CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive
+ 
+ 
+ # Compiler flags for compiling static object in single threaded environment with graphical user interface
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-dont-unset-home.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-dont-unset-home.patch
new file mode 100644
index 000000000000..454b1d2a7de1
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-dont-unset-home.patch
@@ -0,0 +1,21 @@
+Index: oo_cvs/config_office/set_soenv.1
+===================================================================
+RCS file: /cvs/oo/tools/config_office/set_soenv.1,v
+retrieving revision 1.61.2.7
+diff -u -3 -p -r1.61.2.7 set_soenv.1
+--- oo_cvs/config_office/set_soenv.1	2002/06/25 15:41:17	1.61.2.7
++++ oo_cvs/config_office/set_soenv.1	2002/06/28 11:03:55
+@@ -1551,12 +1551,12 @@ if (( $platform eq "$Winnt" ) and ( $USE
+   $tempstring="perl ".WinFormat(${SOLARENV}.${BIN}.${ds}."zipdep.pl");
+   if ( $perl_os =~ /cygwin/ ) { $tempstring =~ s#\\#\\\\#g; }
+   ToFile( "set ZIPDEP=$tempstring", $empty, "x" );
++  ToFile( "HOME",              $WIN_HOME,          "e" );
+ } else {
+   ToFile( "DELIVER",           "deliver.pl",       "e" );
+   ToFile( "MKOUT",             "mkout.pl",         "e" );
+   ToFile( "ZIPDEP",            "zipdep.pl",         "e" );
+ }
+-ToFile( "HOME",              $WIN_HOME,          "e" );
+ ToFile( "USE_SHELL",         $USE_SHELL,         "e" );
+ #
+ # Writing the aliases to file.
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-asm.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-asm.patch
new file mode 100644
index 000000000000..476cd704bfec
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-asm.patch
@@ -0,0 +1,86 @@
+--- oo_1.0_src/sal/osl/unx/interlck.c.jj	Wed May  2 17:03:13 2001
++++ oo_1.0_src/sal/osl/unx/interlck.c	Thu May 30 10:45:19 2002
+@@ -83,9 +83,11 @@ oslInterlockedCount SAL_CALL osl_increme
+ 		"lock\n\t" 
+ 		"xadd %0, %2\n\t"
+ 		"incl %0"
+-	:	"=a" (nCount), "=m" (*pCount)
++	:	"=&r" (nCount), "=m" (*pCount)
+ 	:	"m" (*pCount)
+ 	:	"memory");
++
++	return nCount;
+ }
+ 
+ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
+@@ -97,9 +99,11 @@ oslInterlockedCount SAL_CALL osl_decreme
+ 		"lock\n\t"
+ 		"xadd %0, %2\n\t"
+ 		"decl %0"
+-	:	"=a" (nCount), "=m" (*pCount)
++	:	"=&r" (nCount), "=m" (*pCount)
+ 	:	"m" (*pCount)
+ 	:	"memory");
++
++	return nCount;
+ }
+ 
+ #elif defined ( GCC ) && defined ( POWERPC )
+@@ -117,7 +121,7 @@ oslInterlockedCount SAL_CALL osl_increme
+ 		"   addi    %0,%0,1\n\t"
+ 		"   stwcx.  %0,0,%2\n\t"
+ 		"   bne-    1b"
+-		: "=r" (nCount), "=m" (*pCount)
++		: "=&r" (nCount), "=m" (*pCount)
+ 		: "r" (pCount)
+ 		: "r4", "memory");
+ 
+@@ -134,7 +138,7 @@ oslInterlockedCount SAL_CALL osl_decreme
+ 		"   subi  	%0,%0,1\n\t"
+ 		"   stwcx.  %0,0,%2\n\t"
+ 		"   bne-    1b"
+-		: "=r" (nCount), "=m" (*pCount)
++		: "=&r" (nCount), "=m" (*pCount)
+ 		: "r" (pCount)
+ 		: "r4", "memory");
+ 
+--- oo_1.0_src/bridges/source/c_uno/intelx86.cxx.jj	Wed Apr 18 13:05:48 2001
++++ oo_1.0_src/bridges/source/c_uno/intelx86.cxx	Thu May 30 11:37:26 2002
+@@ -95,24 +95,21 @@ Lcopy:	sub		eax, 4
+ 		add		esp, eax
+ 	}
+ #elif GCC
++	int ecx, edx;
++
+ 	__asm__
+ 	(
+-		"mov %2, %%eax\n\t"
+-		"mov %%eax, %%ecx\n\t"
+-		"shl $2, %%eax\n\t"
+-		"add %1, %%eax\n"
+-		"Lcopy:\n\t"
+-		"sub $4, %%eax\n\t"
+-		"pushl (%%eax)\n\t"
+-		"dec %%ecx\n\t"
+-		"jne Lcopy\n\t"
+-		"mov %0, %%eax\n\t"
+-		"call *%%eax\n\t"
+-		"mov %%eax, %3\n"
+-		"mov %2, %%eax\n\t"
+-		"shl $2, %%eax\n\t"
+-		"add %%eax, %%esp\n\t"
+-		: : "m"(fptr), "m"(pParams), "m"(nParams), "m"(retVal)
++		"1:\n\t"
++		"subl $4, %0\n\t"
++		"pushl (%0)\n\t"
++		"decl %1\n\t"
++		"jne 1b\n\t"
++		"call *%2\n\t"
++		"leal 0(%%esp,%3,4), %%esp\n\t"
++		: "=a"(retVal), "=c"(ecx), "=d"(edx)
++		: "S"(nParams),
++		  "0" (((int *) pParams) + nParams), "1" (nParams), "2"(fptr)
++		: "memory", "cc"
+ 	);
+ #else
+ #error "### unsupported x86 compiler!"
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-gcc-version-check.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-gcc-version-check.patch
new file mode 100644
index 000000000000..1040e54e5702
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-gcc-version-check.patch
@@ -0,0 +1,74 @@
+--- oo_1.0_src/config_office/configure.in~	Tue Jun 25 22:44:47 2002
++++ oo_1.0_src/config_office/configure.in	Tue Jun 25 23:27:46 2002
+@@ -241,18 +241,16 @@
+ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
+    AC_PROG_CC
+ fi
+-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
++if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$GCC" = "gcc" \) ; then
+    dnl ******************************************
+    dnl Testing for GNU compiler and version...
+    dnl ******************************************
+    dnl Check whether the gnu gcc compiler is used.
+    if test -z "$with_gcc_home"; then
+-      if test "$CC" = "gcc"; then
+-         AC_PATH_PROG(GCC, gcc)
+-         COMPATH=`echo $GCC | $SED -n "s/\/gcc//p"`
+-         _gcc_include_start=/usr/lib/gcc-lib
+-         _gxx_include_start=/usr/include
+-      fi
++      AC_PROG_CC
++      COMPATH=`echo $CC | $SED -n "s,/[^/]\+$,,p"`
++      _gcc_include_start=/usr/lib/gcc-lib
++      _gxx_include_start=/usr/include
+    else
+       dnl Compiler has been installed to its own directory and it's home is arg with_gcc_home
+       _gcc_path="$with_gcc_home/bin/gcc"
+@@ -343,7 +343,7 @@
+                               AC_MSG_WARN([found multiple g++-2 directories, please rename so you have one distinct]) >> warn
+                            fi
+                         else
+-                           _gxx_include_path3=`find $_gxx_include_start -name "g++" -print 2> /dev/null`
++			   _gxx_include_path3=`find $_gxx_include_start -name "g++-v3*" -print 2> /dev/null`
+                            if test "$_gxx_include_path3"; then
+                               _multiple=`echo $_gxx_include_path3 | $AWK '{ if ($2) print "true"; else print "false" }'`
+                               if test "$_multiple" = "false"; then
+@@ -758,7 +756,8 @@ if test -d "$with_stlport4_home"; then
+ 				fi
+ 			fi
+ 		else
+-			if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
++			_stl_suffix="gcc`$CC -dumpversion`"
++			if test -f "$STLPORT4/lib/libstlport_$_stl_suffix.so"; then
+ 				AC_MSG_RESULT([checked])
+ 			else
+ 				AC_MSG_ERROR([STLport4 libraries not found])
+@@ -821,6 +820,12 @@ if test "$JAVA"; then
+    fi
+    if test "$_os" = "Linux" -a "$_machine_type" = "ppc"; then
+       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
++      _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
++
++      if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
++         _jdk_minor="true"
++      fi
++
+    fi
+    if test "$_os" = "Linux" -a "$_machine_type" = "armv4l"; then
+       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+@@ -1197,12 +1198,14 @@
+ echo "\$MINGWIN32="$WITH_MINGWIN
+ echo "\$with_use_shell="$with_use_shell
+ echo "\$USE_GCC3="$USE_GCC3
++echo "\$CC="$CC
++echo "\$CXX="$CXX
+ echo
+ fi
+ 
+ # Executing the set_soenv script to setup the environment variables.
+ if test -z "$enable_check_only"; then
+-   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
++   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 "$CC" "$CXX"
+ else
+    echo
+    echo Test Complete
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-no-mozab.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-no-mozab.patch
new file mode 100644
index 000000000000..542253fb1b86
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-no-mozab.patch
@@ -0,0 +1,68 @@
+--- oo_1.0_src/connectivity/prj/build.lst.no-mozab	2001-11-07 12:00:01.000000000 +0100
++++ oo_1.0_src/connectivity/prj/build.lst	2002-05-02 13:25:49.000000000 +0200
+@@ -1,4 +1,4 @@
+-cn	connectivity	:	comphelper moz svtools NULL
++cn	connectivity	:	comphelper svtools NULL
+ cn	connectivity							usr1	-	all	cn_mkout NULL
+ cn	connectivity\source\types				nmake	-	all	cn_types NULL
+ cn	connectivity\source\commontools			nmake	-	all	cn_cmtools cn_types NULL
+@@ -7,8 +7,6 @@ cn	connectivity\source\cpool				nmake	-	
+ cn	connectivity\source\resource			nmake	-	all	cn_res NULL
+ cn	connectivity\source\sdbcx				nmake	-	all	cn_sdbcx cn_types NULL
+ cn	connectivity\source\drivers\ado			nmake	-	w	cn_ado cn_dbtools NULL
+-cn	connectivity\source\drivers\mozab\mozillasrc		nmake	-	all	cn_mozab_mozillasrc cn_file NULL
+-cn	connectivity\source\drivers\mozab	nmake	-	all	cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
+ cn	connectivity\source\drivers\calc		nmake	-	all	cn_calc cn_file NULL
+ cn	connectivity\source\drivers\odbc		nmake	-	all	cn_odbc cn_dbtools NULL
+ cn	connectivity\source\drivers\jdbc		nmake	-	all	cn_jdbc cn_dbtools NULL
+--- oo_1.0_src/scp/source/office/files.scp.no-mozab	2002-04-17 10:18:19.000000000 +0200
++++ oo_1.0_src/scp/source/office/files.scp	2002-05-06 11:13:47.000000000 +0200
+@@ -453,17 +453,6 @@ File GID_FILE_LIB_DBODBCBASE
+     Dir             = GID_DIR_PROGRAM;
+ 	Styles			= (PACKED);
+ End
+-File GID_FILE_LIB_MOZABDRV
+-	BIN_FILE_BODY;
+-	#ifdef UNX
+-    Name            = "libmozabdrv2.so";
+-	#else
+-    Name            = "mozabdrv2.dll";
+-	#endif
+-    Dir             = GID_DIR_PROGRAM;
+-	Styles			= (PACKED);
+-End
+-
+ 
+ STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
+ STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
+@@ -852,18 +841,6 @@ File GID_FILE_LIB_ODBC_2
+         #endif
+ End
+ 
+-File GID_FILE_LIB_MOZAB_2
+-        BIN_FILE_BODY;
+-        Styles          = (PACKED,UNO_COMPONENT);
+-        RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
+-        Dir             = GID_DIR_PROGRAM;
+-        #ifdef UNX
+-        Name            = "libmozab2.so";
+-        #else
+-        Name            = "mozab2.dll";
+-        #endif
+-End
+-
+ File GID_FILE_LIB_SDBC_2
+         BIN_FILE_BODY;
+         Styles          = (PACKED,UNO_COMPONENT);
+@@ -2954,11 +2931,3 @@ End
+ #endif
+ 
+ #endif                                  // of #ifdef SOLAR_JAVA
+-
+-File GID_FILE_MOZILLA_RUNTIME
+-        BIN_FILE_BODY;
+-        Styles = (ARCHIVE);
+-        Dir    = GID_DIR_PROGRAM;
+-        Name	= "mozruntime.zip";
+-End
+-
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-parallel-build.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-parallel-build.patch
new file mode 100644
index 000000000000..febeb479afc0
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-parallel-build.patch
@@ -0,0 +1,908 @@
+Index: oo_cvs/solenv/bin/build.pl
+===================================================================
+RCS file: /cvs/oo/tools/solenv/bin/build.pl,v
+retrieving revision 1.41
+retrieving revision 1.61
+diff -u -3 -p -u -r1.41 -r1.61
+--- oo_cvs/solenv/bin/build.pl	2002/01/10 17:18:59	1.41
++++ oo_cvs/solenv/bin/build.pl	2002/07/05 12:54:19	1.61
+@@ -1,13 +1,13 @@
+ :
+-eval 'exec perl -wS $0 ${1+"$@"}'
++eval 'exec perl -S $0 ${1+"$@"}'
+     if 0;
+ #*************************************************************************
+ #
+ #   $RCSfile: build.pl,v $
+ #
+-#   $Revision: 1.41 $
++#   $Revision: 1.61 $
+ #
+-#   last change: $Author: vg $ $Date: 2002/01/10 17:18:59 $
++#   last change: $Author: vg $ $Date: 2002/07/05 12:54:19 $
+ #
+ #   The Contents of this file are made available subject to the terms of
+ #   either of the following licenses
+@@ -67,61 +67,115 @@ eval 'exec perl -wS $0 ${1+"$@"}'
+ # build - build entire project 
+ #
+ 
++use Config;
++use POSIX;
+ use Cwd;
+ 
+ #### script id #####
+ 
+ ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; 
+ 
+-$id_str = ' $Revision: 1.41 $ ';
++$id_str = ' $Revision: 1.61 $ ';
+ $id_str =~ /Revision:\s+(\S+)\s+\$/
+   ? ($script_rev = $1) : ($script_rev = "-");
+ 
+ print "$script_name -- version: $script_rev\n";
+ 
++if ($ENV{GUI} eq 'UNX') {
++	use Cwd 'chdir';
++};
++
+ #########################
+ #                       #
+ #   Globale Variablen   #
+ #                       #
+ #########################
+ $QuantityToBuild = 0;
++# delete $pid when not needed
++%projects_deps_hash = ();	# hash of undependent projects,
++							# that could be built now
++%broken_build = ();			# hash of hashes of the modules, 
++							# where build was broken (error occurred)
++%folders_hashes = ();
++%running_children = ();
++$dependencies_hash = 0;
++$handler_set = 0;
++$cmd_file = '';
+ $BuildAllParents = 0;
+ $show = 0;
+ $deliver = 0;
+ %LocalDepsHash = ();
+-%DepsArchive = ();
+ %BuildQueue = ();
+ %PathHash = ();
+ %PlatformHash = ();
+-%DeadDependencies = ();
+ %AliveDependencies = ();
+ %ParentDepsHash = (); # hash of dependencies of the current project
+ @UnresolvedParents = ();
+ @dmake_args = ();
+ %DeadParents = ();
+ $CurrentPrj = '';
++$no_projects = 0;
++$only_dependent = 0;
+ $StandDir = &get_stand_dir();
+ $build_from = '';
+ $build_from_opt = '';
+ $build_since = '';
++$dlv_switch = '';
++$child = 0;
++%processes_hash = ();
++%module_annonced = ();
++
+ &get_options;
++
++$deliver_commando = $ENV{DELIVER};
++$deliver_commando .= ' '. $dlv_switch if ($dlv_switch);
+ $ENV{mk_tmp}++;
+ %prj_platform = ();
+-
++$check_error_string = '';
++$dmake = '';
++$echo = '';
++$new_line = "\n";
+ #### main ####
+ 
+-$dmake = &GetDmakeCommando();
++&get_commands();
++unlink ($cmd_file);
++if ($cmd_file) {
++	if (open (CMD_FILE, ">>$cmd_file")) {
++		select CMD_FILE;
++		$echo = 'echo ';
++		$new_line = $echo."\"\"\n";
++		print "\@$echo off\npushd\n" if ($ENV{GUI} ne 'UNX');
++	} else {
++		&print_error ("Cannot open file $cmd_file");
++	};
++} elsif ($show) {
++	select STDERR;
++};
++
++print $new_line;
++
+ &BuildAll();
+ @TotenEltern = keys %DeadParents;
+ if ($#TotenEltern != -1) {
+ 	my ($DeadPrj);
+-	print "\nWARNING! Project(s):\n\n";
++	print $new_line.$new_line;
++	print $echo."WARNING! Project(s):\n";
+ 	foreach $DeadPrj (@TotenEltern) {
+-		print "$DeadPrj\n";
++		print $echo."$DeadPrj\n";
+ 	};
+-	print "\nnot found and couldn't be built. Correct build.lsts.\n";
++	print $new_line;
++	print $echo."not found and couldn't be built. Correct build.lsts.\n";
++	print $new_line;
++};
++if (($ENV{GUI} ne 'UNX') && $cmd_file) {
++	print "popd\n";
+ };
+ $ENV{mk_tmp} = '';
++if ($cmd_file) {
++	close CMD_FILE;
++	print STDOUT "Script $cmd_file generated\n";
++};
++exit(0);
+ 
+ #########################
+ #                       #
+@@ -171,6 +225,10 @@ sub BuildAll {
+ 		if ($build_from) {
+ 			&remove_extra_prjs(\%ParentDepsHash);
+ 		};
++		if ($QuantityToBuild) {
++			&build_multiprocessing;
++			return;
++		};
+ 		while ($Prj = &PickPrjToBuild(\%ParentDepsHash)) {
+ 			if ($build_from_opt) {
+ 				if ($build_from_opt ne $Prj) {
+@@ -189,56 +247,62 @@ sub BuildAll {
+ 				};
+ 				next;
+ 			};
+-			print "\n=============\n";	
+-			print "Building project $Prj\n";
+-			print   "=============\n";	
++			print $new_line;
++			print $echo.	"=============\n";	
++			print $echo.	"Building project $Prj\n";
++			print $echo.	"=============\n";	
+ 			$PrjDir = &CorrectPath($StandDir.$Prj);
+-			if ($ENV{GUI} eq "UNX") {
+-				use Cwd 'chdir';
++			&get_deps_hash($PrjDir, \%LocalDepsHash);
++			&BuildDependent(\%LocalDepsHash);
++			if ($cmd_file) {
++				print "$deliver_commando\n";
++			} else {
++				system ("$deliver_commando") if (!$show && ($Prj ne $CurrentPrj));
+ 			};
+-			chdir $PrjDir;
+-			cwd();
+-			&BuildPrj($PrjDir) if (!$deliver);
+-			system ("$ENV{DELIVER}") if (!$show);
++			print $check_error_string;
+ 			&RemoveFromDependencies($Prj, \%ParentDepsHash);
++        	$no_projects = 0;
+ 		};
+ 	} else {
+-		&BuildPrj('.');
++		&get_deps_hash('.', \%LocalDepsHash);
++		&BuildDependent(\%LocalDepsHash);
+ 	};
+ };
+ 
+ #
+ # Start build given project
+ #
+-sub MakeDir {
+-	my ($DirToBuild, $BuildDir, $error);
+-	$DirToBuild = shift;
+-	$BuildDir = &CorrectPath($StandDir.$PathHash{$DirToBuild});
+-	if ($ENV{GUI} eq 'UNX') {
+-		use Cwd 'chdir';
+-	};
+-	if (chdir ($BuildDir)) {
+-		print "$BuildDir\n";
++sub dmake_dir {
++	my ($folder_nick, $BuildDir);
++	$folder_nick = shift;
++	$BuildDir = &CorrectPath($StandDir . $PathHash{$folder_nick});
++	&print_error("\n$BuildDir not found!!\n") if (!(-d $BuildDir));
++	if ($cmd_file) {
++		print "cd $BuildDir\n";
++		print $check_error_string;
++		print $echo.$BuildDir."\n";
++		print "$dmake\n";
++		print $check_error_string;
+ 	} else {
+-		&print_error("\n$BuildDir not found!!\n");
+-		exit (1);
++		print "$BuildDir\n";
+ 	};
+-	cwd();
+-	if (!$show) {
+-		$error = system ("$dmake");
+-		if (!$error) {
+-			&RemoveFromDependencies($DirToBuild, \%LocalDepsHash);
+-		} else {
+-			&print_error("Error $error occurred while making $BuildDir");
+-			$ENV{mk_tmp} = '';
+-			exit(1);
++	&RemoveFromDependencies($folder_nick, \%LocalDepsHash) if (!$child);
++	if (!$cmd_file && !$show) {
++		chdir $BuildDir;
++		cwd();
++		system ("$dmake");
++		if ($? && ($? != -1) && (!$child)) {
++			&print_error("Error $? occurred while making $BuildDir");
+ 		};
+-	} else {
+-		&RemoveFromDependencies($DirToBuild, \%LocalDepsHash);	
+ 	};
++    if ($child) {
++        my $oldfh = select STDERR;
++        $| = 1;
++        _exit($? >> 8) if ($? && ($? != -1));
++		_exit(0);
++    };
+ };
+ 
+-
+ #
+ # Get string (list) of parent projects to build
+ #
+@@ -246,10 +310,8 @@ sub GetParentsString {
+ 	my ($PrjDir);
+ 	$PrjDir = shift;
+ 	$PrjDir = '.' if ($PrjDir eq $CurrentPrj);
+-	if (!open (PrjBuildFile, $PrjDir.'/prj/build.lst')) {
+-		return '';
+-	};
+-	while (<PrjBuildFile>) {
++	return '' if (!open (BUILD_LST, $PrjDir.'/prj/build.lst'));
++	while (<BUILD_LST>) {
+ 		if ($_ =~ /#/) {
+ 			if ($`) {
+ 				$_ = $`;
+@@ -259,11 +321,11 @@ sub GetParentsString {
+ 		};
+ 		s/\r\n//;
+ 		if ($_ =~ /\:+\s+/) {
+-			close PrjBuildFile;
++			close BUILD_LST;
+ 			return $';
+ 		};
+ 	};
+-	close PrjBuildFile;
++	close BUILD_LST;
+ 	return 'NULL';
+ };
+ 
+@@ -272,37 +334,45 @@ sub GetParentsString {
+ #
+ sub get_prj_platform {
+ 	my ($prj_alias, $line);
+-	while(<PrjBuildFile>) {
++	while(<BUILD_LST>) {
+ 		s/\r\n//;
+ 		$line++;
+ 		if ($_ =~ /nmake/) {
+ 			if ($' =~ /\s+-\s+(\w+)[,\S+]*\s+(\S+)/ ) {
+ 				my $platform = $1;
+ 				my $alias = $2;
+-				if ($alias eq 'NULL') {
+-					&print_error ("There is no correct alias set in the line $line!");
+-					exit (1);
+-				};
++				&print_error ("There is no correct alias set in the line $line!") if ($alias eq 'NULL');
+ 				&mark_platform($alias, $platform);
+ 			} else {
+ 				&print_error("Misspelling in line: \n$_");
+-				exit(1);
+ 			};
+ 		};
+ 	};
+-	seek(PrjBuildFile, 0, 0);
++	seek(BUILD_LST, 0, 0);
+ };
+ 
+ #
+ # Getting hashes of all internal dependencies and additional 
+ # infos for given project
+ #
+-sub BuildPrj {
++sub get_deps_hash {
+ 	my ($dummy, $PrjToBuild);
++	%DeadDependencies = ();
+ 	$PrjToBuild = shift;
+-	open (PrjBuildFile, 'prj/build.lst');
++	my $dependencies_hash = shift;
++	chdir $PrjToBuild;
++	cwd();
++	if ($deliver) {
++		if ($cmd_file) {
++			print "$deliver_commando\n";
++		} else {
++			system ("$deliver_commando") if (!$show);
++		};
++		return;
++	};
++	open (BUILD_LST, 'prj/build.lst');
+ 	&get_prj_platform;
+-	while (<PrjBuildFile>) {
++	while (<BUILD_LST>) {
+ 		if ($_ =~ /#/) {
+ 			if ($`) {
+ 				$_ = $`;
+@@ -331,22 +401,20 @@ sub BuildPrj {
+ 			};
+ 			$PlatformHash{$DirAlias}++;
+ 			$Dependencies = $';
+-			@Array = GetDependenciesArray($Dependencies);
+-			$LocalDepsHash{$DirAlias} = [@Array];
++			@Array = &GetDependenciesArray($Dependencies);
++			$$dependencies_hash{$DirAlias} = [@Array];
+ 			$BuildQueue{$DirAlias}++;
+ 			$PathHash{$DirAlias} = $Dir;
+ 		};
+ 	};
+-	close PrjBuildFile;
+-	%DepsArchive = %LocalDepsHash;
++	close BUILD_LST;
+ 	foreach $Dir (keys %DeadDependencies) {
+ 		next if defined $AliveDependencies{$Dir};
+ 		if (!&IsHashNative($Dir)) {
+-			&RemoveFromDependencies($Dir, \%LocalDepsHash);
++			&RemoveFromDependencies($Dir, $dependencies_hash);
+ 			delete $DeadDependencies{$Dir};
+ 		};
+ 	};
+-	&BuildDependent();
+ };
+ 
+ #  
+@@ -361,33 +429,40 @@ sub mark_platform {
+ 	};
+ };
+ 
+-
+ #
+ # Convert path from abstract (with '\' and/or '/' delimiters) 
+ # to system-independent
+ #
+ sub CorrectPath {
+ 	$_ = shift;
+-	s/\\/\//g;
++	if (($ENV{GUI} ne 'UNX') && $cmd_file) {
++		s/\//\\/g;
++	} else {;
++		s/\\/\//g;
++	};
+ 	return $_;
+ };
+ 
+ 
+ #
+-# Get platform-dependent dmake commando 
++# Get platform-dependent commands 
+ #
+-sub GetDmakeCommando {
+-	my ($dmake, $arg);
+-	
++sub get_commands {
++	my $arg = '';
+ 	# Setting alias for dmake
+ 	$dmake = 'dmake';
+ 	while ($arg = pop(@dmake_args)) {
+ 		$dmake .= ' '.$arg;
+ 	};
+-	return $dmake;
++	if ($cmd_file) {
++		if ($ENV{GUI} eq 'UNX') {
++			$check_error_string = "if \"\$?\" != \"0\" exit\n";
++		} else {
++			$check_error_string = "if \"\%?\" != \"0\" quit\n";
++		};
++	};
+ };
+ 
+-
+ #
+ # Procedure prooves if current dir is a root dir of the drive	
+ #
+@@ -408,7 +483,6 @@ sub IsRootDir {
+ 	};
+ };
+ 
+-
+ #
+ # Procedure retrieves list of projects to be built from build.lst	
+ #
+@@ -420,33 +494,21 @@ sub get_stand_dir {
+ 	my ($StandDir);
+ 	do {
+ 		$StandDir = cwd();
+-		if (open(PrjBuildFile, 'prj/build.lst')) {
++		if (open(BUILD_LST, 'prj/build.lst')) {
+ 			$StandDir =~ /(\w+$)/;
+ 			$StandDir = $`;
+ 			$CurrentPrj = $1;
+-			close(PrjBuildFile);
++			close(BUILD_LST);
+ 			return $StandDir;
+ 		} elsif (&IsRootDir($StandDir)) {
+ 			$ENV{mk_tmp} = '';
+ 			&print_error ('Found no project to build');
+-			exit (1);
+ 		};
+ 	}
+ 	while (chdir '..');
+ };
+ 
+ #
+-# Build the entire project according to queue of dependencies
+-#
+-sub BuildDependent {
+-	my ($Dir);
+-	while ($Dir = &PickPrjToBuild(\%LocalDepsHash)) {
+-		&MakeDir($Dir);
+-		$Dir = '';
+-	};
+-};
+-
+-#
+ # Removes projects which it is not necessary to build
+ #
+ sub remove_extra_prjs {
+@@ -467,11 +529,11 @@ sub PickPrjToBuild {
+ 	my ($Prj, $DepsHash);
+ 	$DepsHash = shift;
+ 	$Prj = &FindIndepPrj($DepsHash);
+-	delete $$DepsHash{$Prj};
++	delete $$DepsHash{$Prj} if (defined $$DepsHash{$Prj});
++    #print "$Prj removed from dependencies hash\n";
+ 	return $Prj;
+ };
+ 
+-
+ #
+ # Make a decision if the project should be built on this platform
+ #
+@@ -487,7 +549,7 @@ sub CheckPlatform {
+ 		return 1;
+ 	} elsif	(($ENV{GUI} eq 'UNX') && ($Platform eq 'u')) {
+ 		return 1;
+-	} elsif	(($ENV{GUI} eq 'MACOSX') && ($Platform eq 'm')) {
++	} elsif	(($ENV{GUI} eq 'MAC') && ($Platform eq 'm')) {
+ 		return 1;
+ 	} elsif	(($ENV{GUI} eq 'OS2') && ($Platform eq 'p')) {
+ 		return 1;
+@@ -495,7 +557,6 @@ sub CheckPlatform {
+ 	return 0;
+ };
+ 
+-
+ #
+ # Remove project to build ahead from dependencies and make an array
+ # of all from given project dependent projects
+@@ -515,12 +576,13 @@ sub RemoveFromDependencies {
+ 	};
+ };
+ 
+-
+ #
+ # Find undependent project 
+ #
+ sub FindIndepPrj {
+ 	my ($Prj, @Prjs, @PrjDeps, $Dependencies, $i);
++	my $children = &children_number;
++	return '' if ($children && ($children >= $QuantityToBuild));
+ 	$Dependencies = shift;
+ 	@Prjs = keys %$Dependencies;
+ 	if ($#Prjs != -1) {
+@@ -528,21 +590,19 @@ sub FindIndepPrj {
+ 			if (&IsHashNative($Prj)) {
+ 				next;
+ 			};
+-			if (!(defined $$Dependencies{$Prj})) {
+-				return $Prj;
+-			};
+ 			@PrjDeps = @{$$Dependencies{$Prj}};
+-			if ($#PrjDeps == -1) {
+-				return $Prj;
+-			};
++			return $Prj if ($#PrjDeps == -1);
+ 		};
+ 		# If there are only dependent projects in hash - generate error
+-		return '' if ($build_from);
++		return '' if ($BuildAllParents);
++        if ($children) {
++            $only_dependent = 1;
++            return '';
++        };
+ 		print STDERR "\nError: projects";
+-		DeadPrjLoop:
+ 		foreach $Prj (keys %$Dependencies) {
+-			if (IsHashNative($Prj)) {
+-				next DeadPrjLoop;
++			if (&IsHashNative($Prj)) {
++				next;
+ 			};
+ 			$i = 0;
+ 			print STDERR "\n$Prj depends on:";
+@@ -551,12 +611,12 @@ sub FindIndepPrj {
+ 			};
+ 		};
+ 		&print_error ("\nhave dead or circular dependencies\n");
+-		$ENV{mk_tmp} = '';
+-		exit (1);
+-	};
++	} else {
++        $no_projects = 1;
++        return '';
++    };
+ };
+ 
+-
+ #
+ # Check if given entry is HASH-native, that is not a user-defined data
+ #
+@@ -570,7 +630,6 @@ sub IsHashNative {
+ 	};
+ };
+ 
+-
+ #
+ # Getting array of dependencies from the string given
+ #
+@@ -581,10 +640,7 @@ sub GetDependenciesArray {
+ 	$string = $DepString;
+ 	$prj = shift;
+ 	while (!($DepString =~ /^NULL/)) {
+-		if (!$DepString) {
+-			&print_error("Project $prj has wrong written dependencies string:\n $string");
+-			exit (1);
+-		};
++		&print_error("Project $prj has wrong written dependencies string:\n $string") if (!$DepString);
+ 		$DepString =~ /(\S+)\s*/;
+ 		$ParentPrj = $1;
+ 		$DepString = $';
+@@ -593,17 +649,13 @@ sub GetDependenciesArray {
+ 			if (($prj_platform{$ParentPrj} ne $1) && 
+ 				($prj_platform{$ParentPrj} ne 'all')) {
+ 				&print_error ("$ParentPrj\.$1 is a wrong dependency identifier!\nCheck if it is platform dependent");
+-				exit (1);
+ 			};
+-			if (&CheckPlatform($1)) {
+-				$AliveDependencies{$ParentPrj}++;
+-			}
++			$AliveDependencies{$ParentPrj}++ if (&CheckPlatform($1));
+ 			push(@Dependencies, $ParentPrj);
+ 		} else {
+ 			if ((exists($prj_platform{$ParentPrj})) && 
+ 				($prj_platform{$ParentPrj} ne 'all') ) {
+ 				&print_error("$ParentPrj is a wrong used dependency identifier!\nCheck if it is platform dependent");
+-				exit (1);
+ 			};
+ 			push(@Dependencies, $ParentPrj);
+ 		};
+@@ -624,59 +676,284 @@ sub GetDirectoryList {
+ 	return @DirectoryList;
+ };
+ 
++sub print_error {
++    my $message = shift;
++    print STDERR "\nERROR: $message\n";
++	$ENV{mk_tmp} = '';
++	close CMD_FILE if ($cmd_file);
++	unlink ($cmd_file);
++	exit(1) if (!$child);
++};
++
++sub usage {
++	print STDERR "\nbuild\n";
++    print STDERR "Syntax:	build [--help|-all|-from|-from_opt|since prj_name|-file file_name|-PP processes|-dlv[_switch] dlvswitch] \n";
++    print STDERR "Example:	build -from sfx2\n";
++    print STDERR "				- build all projects including current one from sfx2\n";
++    print STDERR "Example:	build -from_opt sfx2\n";
++    print STDERR "				- the same as -from, but skip all projects that could have been built (no secure way, use ONLY when -all or -from is already been run and there no external dependencies\' changes occurred)\n";
++    print STDERR "Keys:		-all		- build all projects from very beginning till current one\n";
++    print STDERR "		-from		- build all projects beginning from the specified till current one\n";
++    print STDERR "		-from_opt	- build all projects beginning from the specified till current one (optimized version)\n";
++    print STDERR "		-since		- build all projects beginning from the specified till current one (optimized version, skips specified project)\n";
++    print STDERR "		-show		- show what is going to be built\n";
++    print STDERR "		-file		- generate command file file_name\n";
++    print STDERR "		-deliver	- only deliver, no build (usable for \'-all\' and \'-from\' keys)\n";
++    print STDERR "		-PP			- start multiprocessing build, with number of processes passed (UNIXes only)\n";
++    print STDERR "		-dlv[_switch]	- use deliver with the switch specified\n";
++    print STDERR "		--help		- print help info\n";
++    print STDERR "Default:			- build current project\n";
++    print STDERR "Keys that are not listed above would be passed to dmake\n";
++};
++
+ #
+ # Get all options passed
+ #
+ sub get_options {
+ 	my $arg;
+-	#&usage() && exit(0) if ($#ARGV == -1);
+-	#$QuantityToBuild
+ 	while ($arg = shift @ARGV) {
+-		$arg =~ /^PP$/			and $QuantityToBuild = shift @ARGV 	and next;
++		$arg =~ /^-PP$/			and $QuantityToBuild = shift @ARGV 	and next;
++		$arg =~ /^-PP(\d+)$/			and $QuantityToBuild = $1 and next;
+ 		$arg =~ /^-all$/		and $BuildAllParents = 1 			and next;
+ 		$arg =~ /^-show$/		and $show = 1			 			and next;
+ 		$arg =~ /^-deliver$/	and $deliver = 1		 			and next;
++		$arg =~ /^-dlv_switch$/	and $dlv_switch = &get_switch_options	and next;
++		$arg =~ /^-dlv$/		and $dlv_switch = &get_switch_options	and next;
++		$arg =~ /^-file$/		and $cmd_file = shift @ARGV	 		and next;
+ 		$arg =~ /^-from$/		and $BuildAllParents = 1 
+ 								and $build_from = shift @ARGV 		and next;
+ 		$arg =~ /^-from_opt$/	and $BuildAllParents = 1 
+ 								and $build_from_opt = shift @ARGV	and next;
+ 		
+-		$arg =~ /^-since$/	and $BuildAllParents = 1 
++		$arg =~ /^-since$/		and $BuildAllParents = 1 
+ 								and $build_since = shift @ARGV 		and next;
+-		$arg =~ /^-help$/		and &usage							and exit(0);
++		$arg =~ /^--help$/		and &usage							and exit(0);
+ 		push (@dmake_args, $arg);
+-	};
+-	if ($build_from && $build_from_opt) {
+-		&print_error('Switches -from an -from_opt collision');
+-		exit(1);
+ 	};
++	&print_error('Switches -from and -from_opt collision') if ($build_from && $build_from_opt);
+ 	
+-	if ($build_from && $build_since) {
+-		&print_error('Switches -from an -since collision');
+-		exit(1);
+-	};
++	&print_error('Switches -from and -since collision') if ($build_from && $build_since);
+ 	@ARGV = @dmake_args;
++	$cmd_file = '' if ($show);
++	if (($ENV{GUI} eq 'WNT') && $QuantityToBuild) {
++		$QuantityToBuild = 0;
++		&print_error('-PP switch is unusable under windows!\n');
++	};
+ };
+ 
+-sub print_error {
+-    my $message = shift;
+-    print STDERR "\nERROR: $message\n";
++#
++# get all options without '-'
++#
++sub get_switch_options {
++	my $string = '';
++	my $option = '';
++	while ($option = shift @ARGV) {
++		if (!($option =~ /^-/)) {
++			$string .= '-' . $option;
++			$string .= ' ';
++		} else {
++			unshift(@ARGV, $option);
++			last;
++		};
++	};
++	$string =~ s/\s$//;
++	return $string;
+ };
+ 
+-sub usage {
+-	print STDERR "\nbuild\n";
+-    print STDERR "Syntax:	build [-help|-all|-from|-from_opt|since prj_name] \n";
+-    print STDERR "Example:	build -from sfx2\n";
+-    print STDERR "				- build all projects including current one from sfx2\n";
+-    print STDERR "Example:	build -from_opt sfx2\n";
+-    print STDERR "				- the same as -from, but skip all projects that could have been built (no secure way, use ONLY when -all or -from is already been run and there no external dependensies\' changes occurred)\n";
+-    print STDERR "Keys:		-all		- build all projects from very beginning till current one\n";
+-    print STDERR "		-from		- build all projects beginning from the specified till current one\n";
+-    print STDERR "		-from_opt	- build all projects beginning from the specified till current one (optimized version)\n";
+-    print STDERR "		-since		- build all projects beginning from the specified till current one (optimized version, skips specified project)\n";
+-    print STDERR "		-show		- show what is gonna be built\n";
+-    print STDERR "		-deliver	- only deliver, no build (usable for \'-all\' and \'-from\' keys)\n";
+-    print STDERR "		-help		- print help info\n";
+-    print STDERR "Default:			- build current project\n";
+-    print STDERR "Keys that are not listed above would be passed to dmake\n";
++#
++# cancel build when one of children has error exit code
++#
++sub cancel_build {
++	while (&children_number) {sleep(1)};
++	print STDERR "\n";
++	foreach (keys %broken_build) {
++		print STDERR "ERROR: error $_ occurred while making ", $broken_build{$_}, "\n";
++	};
++    exit(1);
++};
++
++#
++# Function for storing error in multiprocessing AllParents build
++#
++sub store_error {
++	my ($pid, $error_code) = @_;
++	my $child_nick = $processes_hash{$pid};
++	$broken_build {$error_code} = &CorrectPath($StandDir . $PathHash{$child_nick});
+ };
++
++#
++# child handler (clears (or stores info about) the terminated child)
++#
++sub handle_dead_child {
++    my $pid = 0;
++    foreach (keys %processes_hash) {
++        if (($pid = waitpid($_, &WNOHANG)) > 0) {
++			&store_error($pid, $?) if ($?);
++			&clear_from_child($pid);
++        };
++    };
++};
++
++sub clear_from_child {
++    my $pid = shift;
++	my $child_nick = $processes_hash{$pid};
++  	&RemoveFromDependencies($child_nick, 
++                            $folders_hashes{$child_nick});
++	$running_children{$folders_hashes{$child_nick}}--; 
++    delete $processes_hash{$pid};
++	$only_dependent = 0;
++};
++
++#
++# Register signal handler & unblock SIGALRM
++# 
++sub register_signal_handler {
++	$sigaction = POSIX::SigAction->new('main::handle_dead_child');
++	sigaction(SIGCHLD, $sigaction);
++	$handler_set = 1;
++};
++
++#
++# Build the entire project according to queue of dependencies
++#
++sub BuildDependent {
++	$dependencies_hash = shift;
++	my $pid = 0;
++	my $child_nick = '';
++	while ($child_nick = &PickPrjToBuild($dependencies_hash)) {
++        if (($QuantityToBuild) ) { # multyprocessing not for $BuildAllParents (-all etc)!!
++			&register_signal_handler if (!$handler_set);
++            do {
++                # start current child & all
++				# that could be started now				
++                &start_child($child_nick) if ($child_nick);	 
++				sleep if (&children_number() >= $QuantityToBuild);
++    			$child_nick = &PickPrjToBuild($dependencies_hash);
++				if ($only_dependent) {
++					return if ($BuildAllParents);
++					sleep; 
++				}; 
++            } while (!$no_projects);
++			return if ($BuildAllParents);
++            while (&children_number()) {
++                sleep(5);
++            };
++            print STDERR "Multiprocessing build is finished\n";
++        } else {
++		    &dmake_dir($child_nick);
++        };
++		$child_nick = '';
++	};
++};
++
++sub children_number {
++	return scalar (keys %processes_hash);
++};
++
++sub start_child {
++	&cancel_build if (scalar keys %broken_build);
++	my $child_nick = shift;
++	my $pid;
++	if ($pid = fork) { # parent
++        $processes_hash{$pid} = $child_nick;
++		print 'Running processes: ', &children_number(), "\n";
++		$folders_hashes{$child_nick} = $dependencies_hash;
++		$running_children{$dependencies_hash}++; 
++		sleep(1) if ($BuildAllParents);
++	} elsif (defined $pid) { # child
++		$child = 1;
++		#print "$child_nick\n";
++		&dmake_dir($child_nick);
++	};
++};
++
++#
++# Build everything that should be built multiprocessing version 
++#
++sub build_multiprocessing {
++	my $Prj;
++	my @build_queue = ();		# array, containing queue of projects
++								# to build
++	do {
++		while ($Prj = &PickPrjToBuild(\%ParentDepsHash)) {
++			if ($build_from_opt) {
++				if ($build_from_opt ne $Prj) {
++					&RemoveFromDependencies($Prj, \%ParentDepsHash);
++					next;
++				} else {
++					$build_from_opt = '';
++				};
++			};
++			if ($build_since) {
++				if ($build_since ne $Prj) {
++					&RemoveFromDependencies($Prj, \%ParentDepsHash);
++				} else {
++					&RemoveFromDependencies($Prj, \%ParentDepsHash);
++					$build_since = '';
++				};
++				next;
++			};
++			push @build_queue, $Prj;
++			$projects_deps_hash{$Prj} = {};
++			&get_deps_hash(&CorrectPath($StandDir.$Prj), $projects_deps_hash{$Prj});
++		};
++		sleep(1) if (!$Prj);
++		&build_actual_queue(\@build_queue);
++	} while (scalar (keys %ParentDepsHash));
++    while (&children_number()) {
++        sleep(5);
++    };
++	&cancel_build if (scalar keys %broken_build);
++    print STDERR "Multiprocessing build is finished\n";
++	exit(0);
++};
++
++#
++# Here the built queue is built as long as possible
++#
++sub build_actual_queue {
++	my $build_queue = shift;
++	my $i = 0;
++	do {
++		while ($i <= (scalar(@$build_queue) - 1)) {
++			&cancel_build if (scalar keys %broken_build);
++			$Prj = $$build_queue[$i];
++			&annonce_module($Prj) if (!(defined $module_annonced{$Prj}));
++			$only_dependent = 0;
++			$no_projects = 0;
++			&BuildDependent($projects_deps_hash{$Prj});
++			if ($no_projects && ($running_children{$projects_deps_hash{$Prj}} == 0)) {
++				chdir(&CorrectPath($StandDir.$Prj));
++				system ("$deliver_commando") if (!$show && ($Prj ne $CurrentPrj));
++				delete $projects_deps_hash{$Prj};
++				&RemoveFromDependencies($Prj, \%ParentDepsHash);
++				splice (@$build_queue, $i, 1);
++				next;
++			};
++			$i++;
++		};
++		$i = 0;
++	} while (!&are_all_dependent($build_queue));
++};
++
++#
++# Print announcement for module just started
++#
++sub annonce_module {
++	my $Prj = shift;
++	print $echo.	"=============\n";	
++	print $echo.	"Building project $Prj\n";
++	print $echo.	"=============\n";	
++	$module_annonced{$Prj}++;
++};
++
++sub are_all_dependent {
++	my $build_queue = shift;
++	my $folder = '';
++	foreach my $prj (@$build_queue) {
++		$folder = &FindIndepPrj($projects_deps_hash{$prj});
++		return '' if ($folder);
++	};
++	return '1';
++};
++
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-set-compiler-vars.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-set-compiler-vars.patch
new file mode 100644
index 000000000000..389258da07dc
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-set-compiler-vars.patch
@@ -0,0 +1,39 @@
+diff -ur oo_cvs/config_office/set_soenv.1 oo_stable1_cvs20020411_src/config_office/set_soenv.1
+--- oo_cvs/config_office/set_soenv.1	Wed Mar 20 19:10:58 2002
++++ oo_stable1_cvs20020411_src/config_office/set_soenv.1	Fri Apr 12 16:45:11 2002
+@@ -40,7 +40,7 @@
+ #
+ # Set this value equal to the corresponding amount of
+ # command line arguments. 
+-my $numArgs = 20;
++my $numArgs = 22;
+ # Determining the amount of arguments in the call.
+ my $numEnter = $#ARGV + 1;
+ if ( $numEnter != $numArgs ) 
+@@ -96,7 +96,7 @@
+      $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
+      $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, 
+      $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
+-     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 );
++     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $CC, $CXX );
+ #
+ #-------------------------------------------
+ # IId. Declaring the aliases.
+@@ -146,6 +146,8 @@
+ $MINGWIN32	= $ARGV [ 17 ];     # use MINGWIN32
+ $use_shell	= $ARGV [ 18 ];     # preferred shell
+ $USE_GCC3	= $ARGV [ 19 ];     # use gcc3 (only for unxlngi4 at the moment)
++$CC		= '"'.$ARGV [ 20 ].'"'; # C compiler
++$CXX		= '"'.$ARGV [ 21 ].'"'; # C++ compiler
+ #
+ #---------------------------------------------------------------
+ # IIIb. Initialising the variables for the system commands, etc.
+@@ -1464,6 +1466,8 @@
+ ToFile( "SOLARINC",          $SOLARINC,          "e" );
+ ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
+ ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
++ToFile( "CCCOMP",            $CC,                "e" );
++ToFile( "CXXCOMP",           $CXX,               "e" );
+ ToFile( "BISON_HAIRY",       $BISON_HAIRY,       "e" );
+ ToFile( "BISON_SIMPLE",      $BISON_SIMPLE,      "e" );
+ ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,"e" );
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3.patch
new file mode 100644
index 000000000000..2a4baf0cf6bc
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-STLport-4.5.3.patch
@@ -0,0 +1,265 @@
+diff -urN stlport/STLport-4.5.3.patch stlport.azarah/STLport-4.5.3.patch
+--- stlport/STLport-4.5.3.patch	Thu Jan  1 02:00:00 1970
++++ stlport.azarah/STLport-4.5.3.patch	Tue Sep 10 22:50:10 2002
+@@ -0,0 +1,247 @@
++*** misc/STLport-4.5.3/src/fstream.cpp	Tue Sep  4 19:10:12 2001
++--- misc/build/STLport-4.5.3/src/fstream.cpp	Fri Jan 11 17:22:40 2002
++***************
++*** 293,299 ****
++  #ifdef __MINGW32__
++   __MINGW_IMPORT ioinfo * __pioinfo[];
++  #else
++!   extern _CRTIMP ioinfo * __pioinfo[];
++  #endif
++  
++  } // extern "C"
++--- 293,299 ----
++  #ifdef __MINGW32__
++   __MINGW_IMPORT ioinfo * __pioinfo[];
++  #else
++!   extern __declspec( dllimport ) ioinfo * __pioinfo[];
++  #endif
++  
++  } // extern "C"
++*** misc/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:48:44 2002
++--- misc/build/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:47:21 2002
++***************
++*** 1 ****
++! dummy
++--- 1,59 ----
++! #
++! # Note : this makefile is for gcc-3 !
++! #
++! 
++! #
++! # compiler
++! #
++! CC = $(CCCOMP) 
++! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions
++! 
++! #
++! # Basename for libraries
++! #
++! LIB_BASENAME = libstlport_gcc
++! 
++! #
++! # guts for common stuff
++! #
++! #
++! LINK=ar cr
++! DYN_LINK=$(CXXCOMP) --fexceptions -shared -o
++! 
++! OBJEXT=o
++! DYNEXT=so
++! STEXT=a
++! RM=rm -rf
++! PATH_SEP=/
++! MKDIR=mkdir -p
++! COMP=GCC$(ARCH)
++! INSTALL_STEP = install_unix 
++! 
++! all:  all_dynamic all_static symbolic_links 
++! 
++! include common_macros.mak
++! 
++! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
++! 
++! CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
++! 
++! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
++! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
++! 
++! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
++! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
++! 
++! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++! 
++! include common_percent_rules.mak
++! include common_rules.mak
++! 
++! 
++! #install: all
++! #	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
++! 
++! #%.s: %.cpp
++! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
++! 
++! 
++*** misc/STLport-4.5.3/src/vc6.mak	Mon Jul 30 00:18:15 2001
++--- misc/build/STLport-4.5.3/src/vc6.mak	Fri Jan 11 17:41:08 2002
++***************
++*** 10,16 ****
++  COMP=VC6
++  
++  # EXTRA_COMMON_FLAGS=/D "_MBCS"
++! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
++  EXTRA_DEBUG_FLAGS=
++  EXTRA_NDEBUG_FLAGS=
++  
++--- 10,16 ----
++  COMP=VC6
++  
++  # EXTRA_COMMON_FLAGS=/D "_MBCS"
++! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS" /D "_NTSDK" /D "_CRTIMP="
++  EXTRA_DEBUG_FLAGS=
++  EXTRA_NDEBUG_FLAGS=
++  
++*** misc/STLport-4.5.3/src/vc_common.mak	Tue Sep  4 19:10:12 2001
++--- misc/build/STLport-4.5.3/src/vc_common.mak	Fri Jan 11 12:48:14 2002
++***************
++*** 62,68 ****
++  LDFLAGS_RELEASE=/opt:ref
++  
++  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
++! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no
++  
++  
++  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
++--- 62,68 ----
++  LDFLAGS_RELEASE=/opt:ref
++  
++  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
++! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no
++  
++  
++  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
++***************
++*** 79,87 ****
++  
++  
++  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
++! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
++  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
++! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
++  
++  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
++  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
++--- 79,87 ----
++  
++  
++  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
++! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
++  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
++! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
++  
++  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
++  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
++***************
++*** 95,101 ****
++  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
++  
++  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
++! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
++  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
++  
++  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
++--- 95,101 ----
++  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
++  
++  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
++! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
++  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
++  
++  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
++*** misc/STLport-4.5.3/stlport/stdexcept	Tue May 22 02:50:21 2001
++--- misc/build/STLport-4.5.3/stlport/stdexcept	Mon Jan 14 18:26:09 2002
++***************
++*** 49,54 ****
++--- 49,59 ----
++  
++  _STLP_BEGIN_NAMESPACE
++  
+++ /* maybe limit to gcc 3.x */
+++ #if defined( __GNUC__)
+++ #define _STLP_NOTHROW_INHERENTLY throw()
+++ #endif
+++ 
++  class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
++  public:
++    __Named_exception(const string& __str) 
++*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:04 2002
++--- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:56 2002
++***************
++*** 226,233 ****
++  
++  # if (__GNUC__ >= 3)
++  
++! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
++! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
++  
++  # elif (__GNUC_MINOR__ < 8)
++  
++--- 226,233 ----
++  
++  # if (__GNUC__ >= 3)
++  
++! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
++! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v32/backward
++  
++  # elif (__GNUC_MINOR__ < 8)
++  
++***************
++*** 285,298 ****
++  # if defined(__DJGPP)
++  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
++  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
++! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
++  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
++! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-3
++  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
++  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
++  // depending on a platform
++  #   ifdef __hpux
++! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-3
++  #   else
++  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
++  #   endif
++--- 285,298 ----
++  # if defined(__DJGPP)
++  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
++  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
++! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v32
++  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
++! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
++  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
++  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
++  // depending on a platform
++  #   ifdef __hpux
++! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
++  #   else
++  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
++  #   endif
++*** misc/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:41:05 2002
++--- misc/build/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:39:45 2002
++***************
++*** 84,90 ****
++  	$(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)
++  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
++  
++  install_unix :
++--- 84,90 ----
++  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
++  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
++  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
++! 	-ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
++  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
++  
++  install_unix :
+diff -urN stlport/makefile.mk stlport.azarah/makefile.mk
+--- stlport/makefile.mk	Tue Sep 10 22:38:00 2002
++++ stlport.azarah/makefile.mk	Tue Sep 10 22:39:11 2002
+@@ -83,8 +83,8 @@
+ TARFILE_NAME=STLport-4.0
+ PATCH_FILE_NAME=STLport-4.0.patch
+ .ELSE
+-TARFILE_NAME=STLport-4.5
+-PATCH_FILE_NAME=STLport-4.5.patch
++TARFILE_NAME=STLport-4.5.3
++PATCH_FILE_NAME=STLport-4.5.3.patch
+ .ENDIF
+ 
+ .IF "$(GUI)"=="WNT"
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-compiler-vars.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-compiler-vars.patch
new file mode 100644
index 000000000000..581770a87466
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-compiler-vars.patch
@@ -0,0 +1,96 @@
+diff -ru oo_cvs/solenv/inc/unxlngi3.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngi3.mk
+--- oo_cvs/solenv/inc/unxlngi3.mk	Wed Oct 24 19:21:47 2001
++++ oo_stable1_cvs20020411_src/solenv/inc/unxlngi3.mk	Fri Apr 12 21:15:30 2002
+@@ -85,9 +85,9 @@
+ .ENDIF 
+ 
+ # name of C++ Compiler
+-CC=g++
++CC=$(CXXCOMP)
+ # name of C Compiler
+-cc=gcc
++cc=$(CCCOMP)
+ # flags for C and C++ Compiler
+ # do not use standard header search paths
+ # if installed elsewhere
+@@ -138,7 +138,7 @@
+ DYNAMIC		= -Wl,-Bdynamic
+ 
+ # name of linker
+-LINK=gcc
++LINK=$(CXXCOMP)
+ # default linker flags
+ LINKFLAGS=
+ 
+Only in oo_stable1_cvs20020411_src/solenv/inc: unxlngi3.mk.orig
+diff -ru oo_cvs/solenv/inc/unxlngi4.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngi4.mk
+--- oo_cvs/solenv/inc/unxlngi4.mk	Fri Dec 21 13:24:32 2001
++++ oo_stable1_cvs20020411_src/solenv/inc/unxlngi4.mk	Fri Apr 12 19:58:42 2002
+@@ -85,9 +85,9 @@
+ .ENDIF 
+ 
+ # name of C++ Compiler
+-CC=g++
++CC=$(CXXCOMP)
+ # name of C Compiler
+-cc=gcc
++cc=$(CCCOMP)
+ # flags for C and C++ Compiler
+ # do not use standard header search paths
+ # if installed elsewhere
+@@ -147,7 +147,7 @@
+ DYNAMIC		= -Wl,-Bdynamic
+ 
+ # name of linker
+-LINK=gcc
++LINK=$(CXXCOMP)
+ # default linker flags
+ LINKFLAGS=
+ 
+diff -ru oo_cvs/solenv/inc/unxlngppc.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngppc.mk
+--- oo_cvs/solenv/inc/unxlngppc.mk	Thu Feb 28 21:39:42 2002
++++ oo_stable1_cvs20020411_src/solenv/inc/unxlngppc.mk	Fri Apr 12 21:14:54 2002
+@@ -26,9 +26,9 @@
+ 
+ 
+ # name of C++ Compiler
+-CC=g++ 
++CC=$(CXXCOMP)
+ # name of C Compiler
+-cc=gcc
++cc=$(CCCOMP)
+ 
+ # source code is still not signed versus unsigned char clean 
+ CFLAGS=-fsigned-char -w -nostdinc -c $(INCLUDE) -I$(SOLARENV)/unxlngppc/usr/include 
+@@ -81,7 +81,7 @@
+ DYNAMIC = -Wl,-Bdynamic 
+ 
+ # name of linker
+-LINK=gcc 
++LINK=$(CXXCOMP) 
+ # default linker flags
+ LINKFLAGS= 
+ 
+--- oo_1.0_src/solenv/inc/unxlngppc4.mk~	Wed Jun 26 01:40:37 2002
++++ oo_1.0_src/solenv/inc/unxlngppc4.mk	Wed Jun 26 01:46:15 2002
+@@ -85,9 +85,9 @@
+ .ENDIF 
+ 
+ # name of C++ Compiler
+-CC=g++
++CC=$(CXXCOMP)
+ # name of C Compiler
+-cc=gcc
++cc=$(CCCOMP)
+ 
+ # flags for C and C++ Compiler
+ # do not use standard header search paths
+@@ -151,7 +151,7 @@
+ DYNAMIC		= -Wl,-Bdynamic
+ 
+ # name of linker
+-LINK=gcc
++LINK=$(CXXCOMP)
+ # default linker flags
+ LINKFLAGS=
+ 
diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.0.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.0.patch
new file mode 100644
index 000000000000..975335a0173a
--- /dev/null
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-use-libstdc++-5.0.0.patch
@@ -0,0 +1,64 @@
+--- oo_1.0.1_src/product/util/makefile.mk	Mon Apr  8 10:34:21 2002
++++ oo_1.0.1_src.azarah/product/util/makefile.mk	Wed Apr 10 18:18:09 2002
+@@ -113,12 +113,12 @@
+ BINDINGDLL=$(COMNAME)_uno
+ 
+ .IF "$(COMID)"=="gcc3"
+-.IF "$(CCNUMVER)">="000300010000"
++.IF "$(CCNUMVER)">="000300020000"
+ ADDITIONAL_DLLS= \
+        $(DESTDIRDLL)$/libgcc_s.so.1            \
+        $(DESTDIRDLL)$/libgcc_s.so              \
+-       $(DESTDIRDLL)$/libstdc++.so.4           \
+-       $(DESTDIRDLL)$/libstdc++.so.4.0.0
++       $(DESTDIRDLL)$/libstdc++.so.5           \
++       $(DESTDIRDLL)$/libstdc++.so.5.0.0
+ .ELSE
+ ADDITIONAL_DLLS= \
+ 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
+@@ -498,15 +498,15 @@
+ #---------------------------------------------------------
+ # special targets for linux gcc3
+ 
+-.IF "$(CCNUMVER)">="000300010000"
++.IF "$(CCNUMVER)">="000300020000"
+ 
+-$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
++$(DESTDIRDLL)$/libstdc++.so.5.0.0 : $(DLLOUT)$/libstdc++.so.5.0.0 $(DIRLIST)
+        -rm -f $@
+-       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
++       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.5.0.0 $@
+ 
+-$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
++$(DESTDIRDLL)$/libstdc++.so.5 : $(DESTDIRDLL)$/libstdc++.so.5.0.0 $(DIRLIST)
+        -rm -f $@
+-       +ln -s libstdc++.so.4.0.0 $@
++       +ln -s libstdc++.so.5.0.0 $@
+ 
+ .ELSE
+  
+--- oo_1.0.1_src/product/inc/scp/udk_basefiles.scp	Wed Sep 11 08:18:10 2002
++++ oo_1.0.1_src.azarah/product/inc/scp/udk_basefiles.scp	Wed Sep 11 08:18:40 2002
+@@ -11,11 +11,11 @@
+     Styles		= (PACKED, SETUPZIP);
+ End
+ 
+-#if ( CCNUMVER >= 000300010000 )
++#if ( CCNUMVER >= 000300020000 )
+ 
+ File gid_File_Lib_Stdc
+     BIN_FILE_BODY;
+-    Name               = STRING(libstdc++.so.4.0.0);
++    Name               = STRING(libstdc++.so.5.0.0);
+     Dir                        = GCFG_BINARY_DIR;
+     Styles             = (PACKED, SETUPZIP);
+ End
+@@ -24,7 +24,7 @@
+ Shortcut gid_Shortcut_Lib_Stdc
+     FileID      = gid_File_Lib_Stdc;
+     Dir         = GCFG_BINARY_DIR;
+-    Name        = STRING(libstdc++.so.4);
++    Name        = STRING(libstdc++.so.5);
+     Styles      = (NETWORK,RELATIVE);
+ End
+ 
diff --git a/app-office/openoffice/files/digest-openoffice-1.0.0-r1 b/app-office/openoffice/files/digest-openoffice-1.0.0-r1
deleted file mode 100644
index f4fc1a3a92db..000000000000
--- a/app-office/openoffice/files/digest-openoffice-1.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f5dbcf74a3b025280a2afd3e5913da16 OOo_1.0.0_source.tar.bz2 116723632
-MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
-MD5 7f19c3b07938ebeeada00c968d048264 openoffice-1.0.0-registry.tbz2 126826
diff --git a/app-office/openoffice/files/digest-openoffice-1.0.1 b/app-office/openoffice/files/digest-openoffice-1.0.1
new file mode 100644
index 000000000000..12d7d05015e5
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-1.0.1
@@ -0,0 +1,3 @@
+MD5 34f2ca644b7d70573148c82d64eb6064 OOo_1.0.1_source.tar.bz2 136458398
+MD5 cd4dd34b623a8704fbc800de79705171 STLport-4.5.3.tar.gz 739943
+MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
diff --git a/app-office/openoffice/openoffice-1.0.0-r1.ebuild b/app-office/openoffice/openoffice-1.0.0-r1.ebuild
deleted file mode 100644
index f4ca41958b2a..000000000000
--- a/app-office/openoffice/openoffice-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,405 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.0-r1.ebuild,v 1.4 2002/08/01 13:09:06 seemant Exp $
-
-# IMPORTANT:  This is extremely alpha!!!
-
-# Note for gcc-3.1 users:  The produced build do not look as stable as it should
-#                          be ... there are some weird glitches and crashes.
-
-# notes:
-# This will take a HELL of a long time to compile, be warned.
-# According to openoffice.org, it takes approximately 12 hours on a
-# P3/600 with 256mb ram.  And thats where building is its only task.
-#
-# It takes about 6 hours on my P4 1.8 with 512mb memory, and the
-# build only needs about 2.1GB of disk space - Azarah.
-#
-# You will also need a bucketload of diskspace ... in the order of
-# 4-5 gb free to store all the compiled files and installation
-# directories.
-#
-# The information on how to build and what is required comes from:
-# http://www.openoffice.org/dev_docs/source/build_linux.html
-# http://tools.openoffice.org/ext_comp.html
-#
-# todo:
-# Some kind of install process.  Works mostly, but the xml registry
-# needs to be updated via a script or some program, not a tarball.
-
-SLOT="0"
-LICENSE="LGPL-2 | SISSL-1.1"
-KEYWORDS="x86"
-
-LOC="/opt"
-#MAIN_VER="`echo ${PV} |sed -e "s:[a-z]::g"`"
-MAIN_VER="641"
-S="${WORKDIR}/oo_$(echo ${PV} |cut -d '.' -f 1,2)_src"
-DESCRIPTION="OpenOffice productivity suite"
-SRC_URI="http://ny1.mirror.openoffice.org/${PV}/OOo_${PV}_source.tar.bz2
-	http://sf1.mirror.openoffice.org/${PV}/OOo_${PV}_source.tar.bz2
-	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z
-	http://www.ibiblio.org/gentoo/distfiles/${PN}-${PV}-registry.tbz2"
-HOMEPAGE="http://www.openoffice.org"
-
-COMMONDEPEND=">=sys-libs/glibc-2.1
-	>=sys-devel/perl-5.0
-	virtual/x11
-	app-arch/zip
-	app-arch/unzip
-	>=virtual/jdk-1.3.1"
-
-# All these are included with the source archive ...
-#       >=media-libs/nas-1.4.1
-#       >=media-libs/jpeg-6b
-#       >=media-gfx/sane-frontends-1.0.0
-#       >=dev-libs/expat-1.95.1
-#       >=sys-libs/zlib-1.1.3
-#       >=net-misc/neon-0.3.1
-
-# We need gcc-3.0 or greater, as the Mozilla runtime libs is compiled with
-# gcc3, and the build segfault with gcc-2.95.3 if we recompile mozilla
-# with gcc-2.95.3.
-#
-# Azarah -- 14 April 2002
-RDEPEND="${COMMONDEPEND}"
-#	>=sys-devel/gcc-3.0.4-r6"
-DEPEND="${COMMONDEPEND}
-	app-shells/tcsh"
-#	>=sys-devel/gcc-3.0.4-r6"
-
-# All these are included with the source archive ...
-#       >=dev-util/dmake-3.2.1
-
-SLOT="0"
-
-# fix a bug with tcsh and dircolors
-#
-# Azarah -- 10 April 2002
-export LS_COLORS=""
-
-gcc-version() {
-
-	local CC="gcc"
-	
-	if [ "`eval echo \`${CC} -dumpversion\` | cut -f1 -d.`" -ne 3 ]
-	then
-		# We use the dual/multiple install of gcc-3.x if the user
-		# have 2.95.3 as base
-		if [ -x /usr/bin/gcc-3.1 ]
-		then
-			CC="gcc-3.1"
-		elif [ -x /usr/bin/gcc-3.0 ]
-		then
-			CC="gcc-3.0"
-		fi
-	fi
-	
-	echo "`${CC} -dumpversion | cut -f1,2 -d.`"
-}
-
-src_unpack() {
-
-	cd ${WORKDIR}
-	unpack OOo_${PV}_source.tar.bz2 gpc231.tar.Z
-	cd ${WORKDIR}/gpc231
-	cp gpc.* ${S}/external/gpc
-	cd ${S}
-
-	# This allows JDK 1.4.0 to be used
-	patch -p1 <${FILESDIR}/${PV}/${P}-configure.patch || die
-
-	# Debian patches to fix build problems with gcc-3.x
-	#
-	# Azarah -- 23 April 2002
-	patch -p1 <${FILESDIR}/${PV}/${P}-exception-sprecs.patch || die
-	patch -p1 <${FILESDIR}/${PV}/${P}-clk-tck-gcc-3.patch || die
-	patch -p1 <${FILESDIR}/${PV}/${P}-define-XSetIMValues.patch || die
-	if [ "`gcc-version`" = "3.1" ]
-	then
-		patch -p1 <${FILESDIR}/${PV}/${P}-use-libstdc++-4.0.0.patch || die
-	else
-		patch -p1 <${FILESDIR}/${PV}/${P}-use-libstdc++-3.0.4.patch || die
-	fi
-	patch -p1 <${FILESDIR}/${PV}/${P}-class-SwpHtStart-SAR.patch || die
-
-
-	# Debian patch to enable build of zipdep
-	#
-	# Azarah -- 14 April 2002
-	patch -p1 <${FILESDIR}/${PV}/${P}-zipdep-not-found.patch || die
-
-	# Some Debian patches to get the build to use $CC and $CXX,
-	# thanks to nidd from #openoffice.org
-	#
-	# Azarah -- 14 April 2002
-	patch -p1 <${FILESDIR}/${PV}/${P}-gcc-version-check.patch || die
-	patch -p1 <${FILESDIR}/${PV}/${P}-set-compiler-vars.patch || die
-	patch -p1 <${FILESDIR}/${PV}/${P}-use-compiler-vars.patch || die
-	patch -p1 <${FILESDIR}/${PV}/${P}-ran-autoconf.patch || die
-
-	# Misc Debian patches to fixup build
-	#
-	# Azarah -- 22 April 2002
-	if [ "`gcc-version`" = "3.1" ]
-	then
-		patch -p1 <${FILESDIR}/${PV}/${P}-no-mozab.patch || die
-	fi
-	patch -p1 <${FILESDIR}/${PV}/${P}-remove-libstdc-from-scp.patch || die
-
-	# Fix STLport to use gcc-3.x/g++-3.x as compilter
-	#
-	# Azarah -- 15 April 2002
-	patch -p1 <${FILESDIR}/${PV}/${P}-STLport-gcc2-gcc3.patch || die
-	if [ "`gcc-version`" = "3.1" ]
-	then
-		patch -p1 <${FILESDIR}/${PV}/${P}-STLport-gcc31.patch || die
-	fi
-
-	# Some gcc-3.1 only fixes
-	if [ "`gcc-version`" = "3.1" ]
-	then
-		# Fix ./configure for gcc-3.1
-		cd ${S}/config_office
-		cp configure configure.orig
-		sed -e 's:CC --version:CC -dumpversion:g' \
-			-e 's:_gccincname1="g++-v3":_gccincname1="g++-v31":g' \
-			configure.orig > configure
-
-		cd ${S}
-		# Fix awk script to correctly compute the version string for gcc-3.1
-		patch -p1 <${FILESDIR}/${PV}/${P}-gcc31-getcompver.patch || die
-
-		# Fix header not supporting 3.1
-		cd ${S}/cppu/inc/uno
-		cp lbnames.h lbnames.h.orig
-		sed -e 's:__GNUC_MINOR__ == 0:__GNUC_MINOR__ == 1:g' \
-			lbnames.h.orig > lbnames.h
-	fi
-
-	# Now for our optimization flags ...
-	cd ${S}/solenv/inc
-	cp unxlngi3.mk unxlngi3.mk.orig
-	cp unxlngi4.mk unxlngi4.mk.orig
-	sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=${CFLAGS}:g" \
-		unxlngi3.mk.orig >unxlngi3.mk
-	sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=${CFLAGS}:g" \
-		unxlngi4.mk.orig >unxlngi4.mk
-}
-
-src_compile() {
-
-	local myargs="--enable-gcc3"
-	if [ "`gcc -dumpversion | cut -f1 -d.`" -eq 2 ]
-	then
-		# We use the dual/multiple install of gcc-3.x if the user
-		# have 2.95.3 as base
-		#
-		# Azarah -- 15 April 2002
-		if [ -x /usr/bin/gcc-3.1 ]
-		then
-			export CC="gcc-3.1"
-			export CXX="g++-3.1"
-		elif [ -x /usr/bin/gcc-3.0 ]
-		then
-			export CC="gcc-3.0"
-			export CXX="g++-3.0"
-		else
-			die "Cannot find gcc version 3.0 or later"
-		fi
-	fi
-
-	# Workaround for missing libs with GCC3 (thanks to Debian)
-	#
-	# Azarah -- 15 April 2002
-	mkdir -p ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
-	if [ "`gcc-version`" = "3.1" ]
-	then
-		cp -f /usr/lib/libstdc++.so.4* ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
-		cp -f /lib/libgcc_s-3.1.so.1 ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
-		cd ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
-		ln -s libgcc_s-3.1.so.1 libgcc_s.so
-		ln -s libgcc_s-3.1.so.1 libgcc_s.so.1
-		cd ${S}
-	else
-		cp -f /usr/lib/libstdc++.so.3* ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
-		cp -f /lib/libgcc_s-3.0.4.so.1 ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
-		cd ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
-		ln -s libgcc_s-3.0.4.so.1 libgcc_s.so
-		ln -s libgcc_s-3.0.4.so.1 libgcc_s.so.1
-		cd ${S}
-	fi
-
-	# Do NOT compile with a external STLport, as gcc-2.95.3 users will
-	# get linker errors due to the ABI being different (STLport will be
-	# compiled with 2.95.3, while OO is compiled with 3.x).
-	#
-	# Azarah -- 15 April 2002
-	cd ${S}/config_office
-	rm -f config.cache
-	./configure ${myargs} \
-		--with-jdk-home=${JAVA_HOME} \
-		--with-lang=ENUS \
-		--with-x || die
-
-	cd ${S}
-	./bootstrap || die "Bootstrap failed!"
-
-	tcsh -c "source LinuxIntelEnv.Set; dmake" || die "Build failed!"
-
-	GVERDIR="`grep GVERDIR LinuxIntelEnv.Set | awk '{print $3}'`"
-	[ -d ${S}/instsetoo/${GVERDIR} ] || die "Cannot find build directory!"
-}
-
-pkg_setup() {
-
-	if [ "`gcc-version`" = "2.95" ]
-	then
-		eerror
-		eerror "This build needs gcc-3.0.4 or later, but due to profile"
-		eerror "settings, it cannot DEPEND on it, so please merge it"
-		eerror "manually:"
-		eerror
-		eerror "  ebuild /usr/portage/sys-devel/gcc/gcc-3.\?.ebuild merge"
-		eerror
-		eerror "As of writing, gcc-3.0.4 seemed to create the most stable"
-		eerror "builds (more so than gcc-3.1)."
-		eerror
-		die
-	fi
-
-	# This gets in our way ... we MUST use the JDK version, not gcj's
-	if [ -f /usr/include/jni.h ]
-	then
-		mv /usr/include/jni.h /usr/include/jni.h.oo_compile
-	fi
-}
-
-pkg_preinst() {
-
-	# Restore it if we exiled it before ...
-	if [ -f /usr/include/jni.h.oo_compile ]
-	then
-		mv /usr/include/jni.h.oo_compile /usr/include/jni.h
-	fi
-}
-
-src_install() {
-	# This allows us to change languages without editing the ebuild.
-	[ -z "$LANGUAGE" ] && LANGUAGE=01
-
-	GVERDIR="`grep GVERDIR LinuxIntelEnv.Set | awk '{print $3}'`"
-
-	# This next lot is not really tested, and could fail horridly.
-	# what I basically do, is generate three scripts with
-	# Preston A. Elder's read_ins.pl script.  The first is just
-	# the install part extracted, with install location in ${D}.
-	# The second is just the db generation, and third is component
-	# registration, which will be done in pkg_postinst() and have
-	# the *live* ${ROOT} as target.
-	#
-	# NOTE: this is just temporary until I can come up with a better
-	#       solution (or somebody else).  There is a way to make setup
-	#       use a template, but as far as I can tell, the fact that
-	#       we use ${D} to install, will nuke component registration.
-	#
-	# Azarah -- 16 April 2002
-
-	# Generate a install script
-	PREFIX=${D}
-	REGCOMP=${S}/solver/${MAIN_VER}/${GVERDIR}/bin/regcomp
-	INSTDIR=${S}/instsetoo/${GVERDIR}/${LANGUAGE}/normal
-	DESTDIR=${D}${LOC}/OpenOffice-${PV}
-	export PREFIX REGCOMP INSTDIR DESTDIR
-	export RUNARGS="install"
-	${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-install.sh
-	chmod 0755 ${S}/gentoo-install.sh
-
-	# Generate createdb and register scripts
-	PREFIX=""
-	REGCOMP=${LOC}/OpenOffice-${PV}/program/regcomp
-	INSTDIR=${S}/instsetoo/${GVERDIR}/${LANGUAGE}/normal
-	DESTDIR=${LOC}/OpenOffice-${PV}
-	export PREFIX REGCOMP INSTDIR DESTDIR
-	export RUNARGS="register"
-	${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-register.sh || die
-	chmod 0755 ${S}/gentoo-register.sh
-	export RUNARGS="createdb"
-	${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-createdb.sh || die
-	chmod 0755 ${S}/gentoo-createdb.sh
-
-	# Install to ${D}
-	${S}/gentoo-install.sh || die "Failed to install data to ${D}!"
-		
-	# Leave for now ... need for figuring the language selection
-	#
-	# Azarah -- 16 April 2002
-	# 01  03  07  30  31  33  34  39  45  46  48  49  81  82  86  88  90  96
-
-	# Copy regcomp and needed libraries to install directory.  We
-	# need them for pkg_postinst component registration.
-	cd ${S}/solver/${MAIN_VER}/${GVERDIR}
-	mkdir -p ${D}${LOC}/OpenOffice-${PV}/program
-	cp bin/regcomp ${D}${LOC}/OpenOffice-${PV}/program
-
-	# NOTE!!!! We need to fix the registry for network install somehow.
-	#
-	# Crappy solution for now:
-	# Unpack the registry needed for NETWORK installation.
-	# This my need to be updated for future versions of OO.
-	# Install binary with "./setup -net" to generate.
-	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry
-	rm -rf *
-	tar -jxpf ${DISTDIR}/${PN}-${PV}-registry.tbz2 || \
-		die "Could not unpack registry!"
-	# Fix paths
-	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry/instance/org/openoffice/Office
-	cp Common.xml Common.xml.orig
-	sed -e "s:/opt/OpenOffice.org641:${LOC}/OpenOffice-${PV}:g" \
-		Common.xml.orig >Common.xml
-	rm -f Common.xml.orig
-
-	# Generate ISO resource files.
-	cd ${D}${LOC}/OpenOffice-${PV}/program/resource
-	for x in ooo*.res
-	do
-		cp ${x} ${x/ooo/iso}
-	done
-
-	# Create the global fonts.dir file
-	cd ${D}${LOC}/OpenOffice-${PV}/share/fonts/truetype
-	cp -f fonts.dir  fonts_dir.global
-
-	# Create misc directories
-	cd ${D}${LOC}/OpenOffice-${PV}
-	mkdir -p user/config/registry/instance/org/openoffice/{Office,ucb}
-	mkdir -p user/psprint/{driver,fontmetric}
-	mkdir -p user/{autocorr,backup,plugin,store,temp,template}
-
-	# Move the register and createdb scripts to ${D}
-	cp -f ${S}/gentoo-register.sh ${D}${LOC}/OpenOffice-${PV}/program
-	cp -f ${S}/gentoo-createdb.sh ${D}${LOC}/OpenOffice-${PV}/program
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		for x in bootstraprc configmgrrc instdb.ins sofficerc unorc
-		do
-			if [ -e ${LOC}/OpenOffice-${PV}/program/${x} ]
-			then
-				rm -f ${LOC}/OpenOffice-${PV}/program/${x} >/dev/null
-			fi
-		done
-		${LOC}/OpenOffice-${PV}/program/gentoo-createdb.sh || die
-		echo ">>> Registering components (this may take a few minutes)..."
-		${LOC}/OpenOffice-${PV}/program/gentoo-register.sh &>/dev/null || die
-	fi
-
-	# Make sure these do not get nuked.
-	cd ${ROOT}${LOC}/OpenOffice-${PV}
-	mkdir -p user/config/registry/instance/org/openoffice/{Office,ucb}
-	mkdir -p user/psprint/{driver,fontmetric}
-	mkdir -p user/{autocorr,backup,plugin,store,temp,template}
-}
-
diff --git a/app-office/openoffice/openoffice-1.0.1.ebuild b/app-office/openoffice/openoffice-1.0.1.ebuild
new file mode 100644
index 000000000000..b7d48bef4c05
--- /dev/null
+++ b/app-office/openoffice/openoffice-1.0.1.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1.ebuild,v 1.1 2002/09/15 18:12:49 azarah Exp $
+
+# IMPORTANT:  This is extremely alpha!!!
+
+# Notes:
+#
+#   This will take a HELL of a long time to compile, be warned.
+#   According to openoffice.org, it takes approximately 12 hours on a
+#   P3/600 with 256mb ram.  And thats where building is its only task.
+#
+#   It takes about 6 hours on my P4 1.8 with 512mb memory, and the
+#   build only needs about 2.1GB of disk space - Azarah.
+#
+#   You will also need a bucketload of diskspace ... in the order of
+#   4-5 gb free to store all the compiled files and installation
+#   directories.
+#
+#   The information on how to build and what is required comes from:
+#   http://www.openoffice.org/dev_docs/source/build_linux.html
+#   http://tools.openoffice.org/ext_comp.html
+#
+# Todo:
+#
+#   Get support going for installing a custom language pack.  Also
+#   need to be able to install more than one language pack.
+
+inherit flag-o-matic
+# Compile problems with these ...
+filter-flags "-funroll-loops"
+filter-flags "-fomit-frame-pointer"
+replace-flags "-O3" "-O2"
+# Needed to stop segfaults in tools
+append-flags "-fno-strict-aliasing"
+
+inherit gcc
+# We want gcc3 if possible!!!!
+export WANT_GCC_3="yes"
+
+inherit virtualx
+
+# Set $ECPUS to amount of processes multiprocessing build should use.
+# NOTE:  Setting this too high might cause dmake to segfault!!
+#        Setting this to anything but "1" on my pentium4 causes things
+#        to segfault :(
+[ -z "${ECPUS}" ] && export ECPUS="1"
+
+
+LOC="/opt"
+STLP_VER="4.5.3"
+
+INSTDIR="${LOC}/OpenOffice.org${PV}"
+S="${WORKDIR}/oo_${PV}_src"
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+SRC_URI="http://ny1.mirror.openoffice.org/${PV}/OOo_${PV}_source.tar.bz2
+	http://sf1.mirror.openoffice.org/${PV}/OOo_${PV}_source.tar.bz2
+	http://www.stlport.org/archive/STLport-${STLP_VER}.tar.gz
+	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"
+HOMEPAGE="http://www.openoffice.org/"
+
+LICENSE="LGPL-2 | SISSL-1.1"
+SLOT="0"
+KEYWORDS="x86"
+
+RDEPEND=">=sys-libs/glibc-2.1
+	>=sys-devel/perl-5.0
+	virtual/x11
+	app-arch/zip
+	app-arch/unzip
+	dev-libs/expat
+	>=virtual/jdk-1.3.1"
+
+DEPEND="${RDEPEND}
+	app-shells/tcsh"
+
+# fix a bug with tcsh and dircolors
+#
+# Azarah -- 10 April 2002
+export LS_COLORS=""
+
+
+pkg_setup() {
+
+	if [ "$(gcc-version)" != "3.2" ]
+	then
+		eerror
+		eerror "This build needs gcc-3.2 or later, but due to profile"
+		eerror "settings, it cannot DEPEND on it, so please merge it"
+		eerror "manually:"
+		eerror
+		eerror " #  ebuild /usr/portage/sys-devel/gcc/gcc-3.2-r1.ebuild merge"
+		eerror
+		eerror "Please make sure that you use the latest availible revision of"
+		eerror "gcc-3.2.  Thus if there is already a gcc-3.2-r2 out, use this"
+		eerror "rather than -r1."
+		eerror
+		eerror "As of writing, gcc-3.2 seemed to create the most stable builds."
+		eerror "Also, because OO is such a complex build, ONLY gcc-3.2 will be"
+		eerror "supported!"
+		eerror
+		die
+	fi
+
+	if [ -z "$(echo ${JDK_HOME} | grep "blackdown")" ] && [ "${FORCE_JAVA}" != "yes" ]
+	then
+		eerror
+		eerror "This ebuild has only been tested with the blackdown port of"
+		eerror "java.  If you use another java implementation, it could fail"
+		eerror "horribly, so please merge the blackdown-jdk and set it as"
+		eerror "system VM before proceeding:"
+		eerror
+		eerror " # emerge blackdown-jdk"
+		eerror " # java-config --set-system-vm=blackdown-jdk-1.3.1"
+		eerror " # env-update"
+		eerror " # source /etc/profile"
+		eerror
+		eerror "At the time of writing, this was version 1.3.1, so please"
+		eerror "adjust the version according to the version installed in"
+		eerror "/opt."
+		eerror
+		eerror "If you however want to test another JDK (not officially supported),"
+		eerror "you could do the following:"
+		eerror
+		eerror " # export FORCE_JAVA=yes"
+		eerror
+		die
+	fi
+
+	ewarn "****************************************************************"
+	ewarn " To get this thing to build at all, I had to use less agressive"
+	ewarn " CFLAGS and CXXFLAGS.  If this build thus fails, and you edited"
+	ewarn " this ebuild at all, or used too agressive compiler flags ..."
+	ewarn
+	ewarn "   You HAVE been Warned!"
+	ewarn
+	ewarn "****************************************************************"
+}
+
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack OOo_${PV}_source.tar.bz2 gpc231.tar.Z
+
+	# Install gpc
+	cd ${WORKDIR}/gpc231
+	cp gpc.* ${S}/external/gpc
+
+	cd ${S}
+
+	einfo "Applying patches..."
+	# This allows JDK 1.4.0 to be used (Prez)
+	patch -p1 < ${FILESDIR}/${PV}/${PN}-1.0.0-configure.patch || die
+
+	# Get OO to build with gcc-3.2's libstdc++.so (Az)
+	if [ "$(gcc-version)" = "3.2" ]
+	then
+		patch -p1 < ${FILESDIR}/${PV}/${P}-use-libstdc++-5.0.0.patch || die
+	fi
+
+	# Debian patch to enable build of zipdep
+	patch -p1 < ${FILESDIR}/${PV}/${PN}-1.0.0-zipdep-not-found.patch || die
+
+	# Some Debian patches to get the build to use $CC and $CXX,
+	# thanks to nidd from #openoffice.org
+	patch -p1 < ${FILESDIR}/${PV}/${P}-gcc-version-check.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-set-compiler-vars.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-use-compiler-vars.patch || die
+	# Update configure before we do anything else.
+	cd ${S}/config_office; autoconf || die; cd ${S}
+
+	# This resolves missing symbols (Debian)
+	patch -p1 < ${FILESDIR}/${PV}/${P}-compiler-flags.patch || die
+
+	# Enable ccache and distcc (Debian)
+	patch -p1 < ${FILESDIR}/${PV}/${P}-parallel-build.patch || die
+	# If $HOME is not set, ccache breaks. (Debian)
+	patch -p1 < ${FILESDIR}/${PV}/${P}-dont-unset-home.patch || die
+
+	if [ "$(use ppc)" ]
+	then
+		# Not sure about this .. PPC guys will have to verify.
+		patch -p1 < ${FILESDIR}/${PV}/${P}-bridge-fix-on-PPC.patch || die
+	fi
+
+	# Misc Debian patches to fixup build
+	patch -p1 < ${FILESDIR}/${PV}/${PN}-1.0.1-no-mozab.patch || die
+	echo "moz     moz : NULL" > ${S}/moz/prj/build.lst
+
+	# Misc patches from Mandrake
+	patch -p1 < ${FILESDIR}/${PV}/${P}-braindamage.patch || die
+	patch -p1 < ${FILESDIR}/${PV}/${P}-fix-asm.patch || die
+
+	# Get OO to use STLport-4.5.3 (Az)
+	cp ${DISTDIR}/STLport-${STLP_VER}.tar.gz ${S}/stlport/download || die
+	cd ${S}/stlport
+	patch -p1 < ${FILESDIR}/${PV}/${P}-use-STLport-4.5.3.patch || die
+
+	# More gcc3 related fixes
+	if [ "$(gcc-major-version)" -eq 3 ] && [ "$(gcc-minor-version)" -ne 0 ]
+	then
+		local incver="$(gcc-version)"
+		local minver="$(gcc-minor-version)"
+	
+		# Fix ./configure for gcc3 (Az)
+		perl -pi -e 's|CC --version|CC -dumpversion|g' \
+			${S}/config_office/configure
+#		perl -pi -e "s|_gccincname1=\"g++-v3\"|_gccincname1=\"g++-v${incver/\.}\"|g" \
+#			${S}/config_office/configure
+
+		# Fix header not supporting 3.2 and up (Az)
+		perl -pi -e "s|__GNUC_MINOR__ == 0|__GNUC_MINOR__ == ${minver}|g" \
+			${S}/cppu/inc/uno/lbnames.h
+	fi
+
+	# Now for our optimization flags ...
+	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
+		${S}/solenv/inc/unxlngi3.mk
+	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
+		${S}/solenv/inc/unxlngi4.mk
+
+	# Some makefiles are not multiprocess ready (Mandrake)
+	cd ${S}; einfo "Fixing makefiles for multiprocess builds..."
+	for x in io/source/stm dtrans/source/X11 idlc/source nas zlib toolkit/util \
+		comphelper/util padmin/source svtools/util bridges/source/prot_uno \
+		ucb/source/ucp/ftpproxy framework/util framework/source/unotypes
+	do
+		perl -pi -e "s/^(PRJNAME)/MAXPROCESS=1\n\1/" ${x}/makefile.mk
+	done
+}
+
+get_EnvSet() {
+
+	# Determine what Env file we should be using (Az)
+	export LinuxEnvSet="LinuxIntelEnv.Set"
+	use sparc && export LinuxEnvSet="LinuxSparcEnv.Set"
+	use sparc64 && export LinuxEnvSet="LinuxSparcEnv.Set"
+	use ppc && export LinuxEnvSet="LinuxPPCEnv.Set"
+	use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set"
+
+	# Get build specific stuff (Az)
+	export SOLVER="$(awk '/^setenv UPD / {print $3}' ${LinuxEnvSet})"
+	export SOLPATH="$(awk '/^setenv INPATH / {print $3}' ${LinuxEnvSet})"
+}
+
+src_compile() {
+
+	local buildcmd=""
+
+	# Setup default compilers (We overide gcc2 if that is default here)
+	export CC="$(gcc-getCC)"
+	export CXX="$(gcc-getCXX)"
+
+	# Create aliases to normal gcc binary names to make sure we compile
+	# everything with the same version of gcc, and avoid possible
+	# segfaults.  This is only done if gcc binaries with non standard
+	# names are used. (Az)
+	[ "${CC}" != "gcc" ] && ln -s $(which ${CC}) ${S}/solenv/bin/gcc
+	[ "${CXX}" != "gcc" -a "${CXX}" != "g++" ] && {\
+		ln -s $(which ${CXX}) ${S}/solenv/bin/g++
+		ln -s $(which ${CXX}) ${S}/solenv/bin/c++
+		ln -s $(which ${CXX}) ${S}/solenv/bin/cpp
+	}
+
+	# Enable distcc for this build (Az)
+	if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
+	     "${FEATURES/distcc/}" != "${FEATURES}" -a \
+		 -x /usr/bin/distcc ]
+	then
+		# Do not bump ECPUS if the user did not touch it, as currently
+		# it -PP do not work properly (segfaulting). (Az)
+		[ "$(echo ${DISTCC_HOSTS} | wc -w)" -gt 1 -a "${ECPUS}" -qt 1 ] && \
+			export ECPUS="$(echo ${DISTCC_HOSTS} | wc -w)"
+
+		export CC="distcc ${CC}"
+		export CXX="distcc ${CXX}"
+	fi
+
+	# Enable ccache for this build (Az)
+	if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
+	     "${FEATURES/ccache/}" != "${FEATURES}" -a \
+		 -d /usr/bin/ccache -a -x /usr/bin/ccache/ccache ]
+	then
+		# Build uses its own env with $PATH, etc, so
+		# we take the easy way out. (Az)
+		export CC="/usr/bin/ccache/ccache ${CC}"
+		export CXX="/usr/bin/ccache/ccache ${CXX}"
+	fi
+	
+	# Do NOT compile with a external STLport, as gcc-2.95.3 users will
+	# get linker errors due to the ABI being different (STLport will be
+	# compiled with 2.95.3, while OO is compiled with 3.x). (Az)
+	einfo "Configuring OpenOffice.org..."
+	cd ${S}/config_office
+	rm -f config.cache
+	./configure --enable-gcc3 \
+		--with-jdk-home=${JAVA_HOME} \
+		--with-lang=ENUS \
+		--with-x || die
+	
+	cd ${S}
+	get_EnvSet
+	
+	# Workaround for missing libs with GCC3 (thanks to Debian) (Az)
+	if [ "$(gcc-major-version)" -eq 3 ]
+	then
+		einfo "Installing GCC related libs..."
+
+		mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/lib
+
+		cd ${S}/solver/${SOLVER}/${SOLPATH}/lib
+		cp $(gcc-libpath)/libstdc++.so.$(gcc-libstdcxx-major-version)* . || \
+			die "Could not copy gcc-libs!"
+		cp $(gcc-libpath)/libgcc_s.so* . || die "Could not copy gcc-libs!"
+		cd ${S}
+	fi
+
+	# Do not include /usr/include in header search path, and
+	# same thing for internal gcc include dir, as gcc3 handles
+	# it correctly by default! (Az)
+	perl -pi -e "s| -I/usr/include||g" ${LinuxEnvSet}
+#	perl -pi -e "s| -I$(gcc-libpath)/include||g" ${LinuxEnvSet}
+
+	# Should the build use multiprocessing?
+	# We use build.pl directly, as dmake tends to segfault. (Az)
+	if [ "${ECPUS}" -gt 1 ]
+	then
+		buildcmd="${S}/solenv/bin/build.pl -all -PP${ECPUS} product=full"
+	else
+		buildcmd="${S}/solenv/bin/build.pl -all product=full"
+	fi
+		
+	einfo "Bootstrapping OpenOffice.org..."
+	# Get things ready for bootstrap (Az)
+	chmod 0755 ${S}/solenv/bin/*.pl
+	mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/inc
+	touch ${S}/solver/${SOLVER}/${SOLPATH}/inc/minormkchanged.flg
+	# Bootstrap ...
+	./bootstrap
+	
+	einfo "Building OpenOffice.org..."
+	# Setup virtualmake
+	export maketype="tcsh"
+	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.tcsh
+	# Build needs X to compile! (Az)
+	virtualmake build.tcsh || die "Build failed!"
+
+	[ -d ${S}/instsetoo/${SOLPATH} ] || die "Cannot find build directory!"
+}
+
+src_install() {
+
+	# This allows us to change languages without editing the ebuild.
+	#
+	#   languages1="ENUS,FREN,GERM,SPAN,ITAL,DTCH,PORT,SWED,POL,RUSS"
+	#   languages2="DAN,GREEK,TURK,CHINSIM,CHINTRAD,JAPN,KOREAN,CZECH,CAT"
+	#
+	# Supported languages for localized help files
+	#
+	#   helplangs="ENUS,FREN,GERM,SPAN,ITAL,SWED"
+	#
+	[ -z "${LANGUAGE}" ] && LANGUAGE=01
+
+	get_EnvSet
+	
+	# The install part should now be relatively OK compared to
+	# what it was.  Basically we use autoresponse files to install
+	# unattended, running under a Xvfb if needed.  Afterwards we
+	# just cleanout ${D} from the registry, etc.  This way we
+	# do not need pre-generated registry, and also fixes some weird
+	# bugs related to the old way we did things.
+	#
+	# <azarah@gentoo.org> (9 Sep 2002)
+
+	# Autoresponse file for main installation
+	cat > ${T}/rsfile-global <<-"END_RS"
+		[ENVIRONMENT]
+		INSTALLATIONMODE=INSTALL_NETWORK
+		INSTALLATIONTYPE=STANDARD
+		DESTINATIONPATH=<destdir>
+		OUTERPATH=
+		LOGFILE=
+		LANGUAGELIST=<LANGUAGE>
+
+		[JAVA]
+		JavaSupport=preinstalled_or_none
+	END_RS
+	
+	# Autoresponse file for user isntallation
+	cat > ${T}/rsfile-local <<-"END_RS"
+		[ENVIRONMENT]
+		INSTALLATIONMODE=INSTALL_WORKSTATION
+		INSTALLATIONTYPE=WORKSTATION
+		DESTINATIONPATH=<home>/.openoffice/<pv>
+
+		[JAVA]
+		JavaSupport=none
+	END_RS
+
+	# Fixing install location in response file
+	sed -e "s|<destdir>|${D}${INSTDIR}|" \
+		${T}/rsfile-global > ${T}/autoresponse
+
+	einfo "Installing OpenOffice.org into build root..."
+	dodir ${INSTDIR}
+	cd ${S}/instsetoo/${SOLPATH}/${LANGUAGE}/normal
+	# Setup virtualmake
+	export maketype="./setup"
+	# We need X to install...
+	virtualmake "-v -r:${T}/autoresponse"
+
+	echo
+	einfo "Removing build root from registy..."
+	# Remove totally useless stuff.
+	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
+	# Remove build root from registry and co
+	egrep -rl "${D}" ${D}${INSTDIR}/* | \
+		xargs -i perl -pi -e "s|${D}||g" {} || :
+
+	einfo "Fixing permissions..."
+	# Fix permissions
+	find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
+	chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
+
+	# Fix symlinks
+	for x in "soffice program/spadmin" \
+		"program/setup setup" \
+		"program/spadmin spadmin"
+	do
+		dosym $(echo ${x} | awk '{print $1}') \
+			${INSTDIR}/$(echo ${x} | awk '{print $2}')
+	done
+
+	# Install user autoresponse file
+	insinto /etc/openoffice
+	sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse.conf
+	doins ${T}/autoresponse.conf
+	
+	# Install wrapper script
+	exeinto /usr/bin
+	sed -e "s|<pv>|${PV}|g" \
+		${FILESDIR}/${PV}/ooffice-wrapper > ${T}/ooffice
+	doexe ${T}/ooffice
+	# Component symlinks
+	dosym ooffice /usr/bin/oocalc
+	dosym ooffice /usr/bin/oodraw
+	dosym ooffice /usr/bin/ooimpress
+	dosym ooffice /usr/bin/oomath
+	dosym ooffice /usr/bin/oowriter
+	dosym ooffice /usr/bin/oosetup
+	dosym ooffice /usr/bin/oopadmin
+
+	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
+	if [ -n "`use gnome`" ]
+	then
+		insinto /usr/share/gnome/apps/OpenOffice.org
+		# Install the files needed for the catagory
+		doins ${D}${INSTDIR}/share/gnome/net/.directory
+		doins ${D}${INSTDIR}/share/gnome/net/.order
+		
+		for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
+		do
+			# We have to handle setup differently
+			perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
+			# Now fix the rest
+			perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
+			doins ${x}
+		done
+	fi
+
+	if [ -n "`use kde`" ]
+	then
+		local kdeloc="${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org${PV}"
+	
+		# Portage do not work with the space ..
+		mv ${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org\ ${PV} ${kdeloc}
+		
+		insinto /usr/share/applnk/OpenOffice.org
+		# Install the files needed for the catagory
+		doins ${kdeloc}/.directory
+		doins ${kdeloc}/.order
+		dodir /usr/share
+		# Install the icons and mime info
+		cp -a ${D}${INSTDIR}/share/kde/net/mimelnk/share/* ${D}/usr/share
+		
+		for x in ${kdeloc}/*.desktop
+		do
+			# We have to handle setup differently
+			perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
+			# Now fix the rest
+			perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
+			doins ${x}
+		done
+	fi
+
+	# Unneeded, as they get installed into /usr/share...
+	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
+
+	# Make sure these do not get nuked.
+	keepdir ${INSTDIR}/user/config/registry/instance/org/openoffice/{Office,ucb}
+	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
+	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
+}
+
+pkg_preinst() {
+
+	# The one with OO-1.0.0 was not valid
+	if [ -f ${ROOT}/etc/openoffice/autoresponse.conf ]
+	then
+		rm -f ${ROOT}/etc/openoffice/autoresponse.conf
+	fi
+}
+
+pkg_postinst() {
+
+	einfo "******************************************************************"
+	einfo " To start OpenOffice.org, run:"
+	einfo
+	einfo "   $ ooffice"
+	einfo
+	einfo " Also, for individual components, you can use any of:"
+	einfo
+	einfo "   oocalc, oodraw, ooimpress, oomath or oowriter"
+	einfo
+	einfo "******************************************************************"
+}   
+