Fix java version and gentoo name

11 files changed, 30 insertions, 1574 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 6223c687baac..438da1aeed18 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.43 2003/10/19 11:22:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.44 2003/10/21 09:33:45 pauldv Exp $
 
   19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> openoffice-1.1.0-r1.ebuild,
   openoffice-1.1.0.ebuild, openoffice-1.1_rc3.ebuild:
   fixed DUTCH 03 -> 31
 
+  19 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild,
+  openoffice-1.1.0.ebuild, openoffice-1.1_rc3.ebuild:
+  Fix jdk dependency to depend on 1.4.1 or greater
+
 *openoffice-1.1.0-r1 (17 Oct 2003)
 
   17 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6608c7bd1680..a2bfc88a40f0 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,37 +1,30 @@
-MD5 7564812fd1fe3da72c7bf49ca9df4f6d openoffice-1.0.3-r1.ebuild 21884
-MD5 b2d5bb42a289f3aa4e22d3da8587b540 openoffice-1.1.0-r1.ebuild 19191
-MD5 09a005aff6b234e2f9f3eedeac296600 openoffice-1.1.0.ebuild 19633
-MD5 8dae538de6383902db268339b8dcd19c openoffice-1.1_rc3.ebuild 19359
-MD5 7b0b2d2adf0fc2f292ce3353e5b35689 ChangeLog 10605
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 a6c9d8c5763378f5bae1e4ac50a2ecaf files/digest-openoffice-1.1_rc3 196
+MD5 559167d44fac462ce4d610182bf3c6aa ChangeLog 10789
+MD5 7564812fd1fe3da72c7bf49ca9df4f6d openoffice-1.0.3-r1.ebuild 21884
+MD5 bf6f41ea8c21f155049b8b0e31422dca openoffice-1.1.0-r1.ebuild 19186
+MD5 6c346ff67c1da3d5fd3001bfc71fcba5 openoffice-1.1.0.ebuild 19628
+MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r1 195
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0 195
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
-MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r1 195
-MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
+MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
+MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741
+MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
+MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
 MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
 MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
 MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
-MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
+MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
+MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
 MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
+MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
 MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
-MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
 MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
-MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
-MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
-MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
-MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
 MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
+MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
+MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
-MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
-MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
-MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
-MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
-MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1_rc3/fixed-gcc.patch 644
-MD5 3bafc5905c895a72e47bbb4bc3fdefaf files/1.1_rc3/ooffice-wrapper-1.3 8981
-MD5 309ec50c6facc777068caebd51640c92 files/1.1_rc3/no-mozab.patch 2741
-MD5 05f4a9a183f27d99857d415c3ebc0e8d files/1.1_rc3/no-crashrep.patch 1777
-MD5 9baa362ffea862df332e2495985d3bdd files/1.1_rc3/newstlportfix.patch 17655
+MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
+MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
+MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
+MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
diff --git a/app-office/openoffice/files/1.1_rc3/fixed-gcc.patch b/app-office/openoffice/files/1.1_rc3/fixed-gcc.patch
deleted file mode 100644
index 3f2ee40700af..000000000000
--- a/app-office/openoffice/files/1.1_rc3/fixed-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- config_office/configure.orig	2003-08-13 15:03:11.000000000 +0200
-+++ config_office/configure	2003-08-13 15:03:46.000000000 +0200
-@@ -2895,13 +2895,6 @@
- 
-    if test "$_gcc_major" = "3"; then
-       USE_GCC3="TRUE"
--      if test "$_gcc_longver"  -eq "030203"; then
--         { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\"
--		 	gives internal error, use another version please." >&5
--echo "$as_me: error: found version \"$_gcc_version\"
--		 	gives internal error, use another version please." >&2;}
--   { (exit 1); exit 1; }; }
--      fi
-    else
-       USE_GCC3="FALSE"
-       if test "$_gcc_longver"  -lt "029502"; then
diff --git a/app-office/openoffice/files/1.1_rc3/newstlportfix.patch b/app-office/openoffice/files/1.1_rc3/newstlportfix.patch
deleted file mode 100644
index 557a724b4cd6..000000000000
--- a/app-office/openoffice/files/1.1_rc3/newstlportfix.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-diff -urN stlport.orig/STLport-4.5.3.patch stlport/STLport-4.5.3.patch
---- stlport.orig/STLport-4.5.3.patch	1970-01-01 01:00:00.000000000 +0100
-+++ stlport/STLport-4.5.3.patch	2003-08-13 14:10:51.000000000 +0200
-@@ -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=$(CXX) --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++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/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++-v3
-+  # 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++-v3
-+  #   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.orig/makefile.mk stlport/makefile.mk
---- stlport.orig/makefile.mk	2003-08-13 14:09:29.000000000 +0200
-+++ stlport/makefile.mk	2003-08-13 14:12:38.000000000 +0200
-@@ -72,8 +72,8 @@
- # --- Files --------------------------------------------------------
- .EXPORT : CC CXX
- .IF "$(COMID)"=="gcc3"
--	TARFILE_NAME=STLport-4.5
--	PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
-+	TARFILE_NAME=STLport-4.5.3
-+	PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch
- .ELSE			# "$(COMID)"=="gcc3"
- 	.IF "$(OS)"=="MACOSX"
- 		# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
-@@ -189,10 +189,10 @@
- .INCLUDE :	target.mk
- .INCLUDE :	tg_ext.mk
- 
--$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.patch
-+$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.3.patch
- 
--$(MISC)$/STLport-4.5.patch : STLport-4.5.patch
--	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
-+$(MISC)$/STLport-4.5.3.patch : STLport-4.5.3.patch
-+	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.3.patch > $(MISC)$/STLport-4.5.3.patch
- 
- .IF "$(GUI)"=="WNT"
- .IF "$(CCNUMVER)"<="001300000000"
-diff -urN stlport.orig/makefile.mk.orig stlport/makefile.mk.orig
---- stlport.orig/makefile.mk.orig	1970-01-01 01:00:00.000000000 +0100
-+++ stlport/makefile.mk.orig	2003-08-13 14:10:17.000000000 +0200
-@@ -0,0 +1,228 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: newstlportfix.patch,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: pauldv $ $Date: 2003/08/20 07:57:01 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library 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
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=.
-+
-+PRJNAME=so_stlport
-+TARGET=so_stlport
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :	settings.mk
-+
-+# --- Files --------------------------------------------------------
-+.EXPORT : CC CXX
-+.IF "$(COMID)"=="gcc3"
-+	TARFILE_NAME=STLport-4.5
-+	PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
-+.ELSE			# "$(COMID)"=="gcc3"
-+	.IF "$(OS)"=="MACOSX"
-+		# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
-+		TARFILE_NAME=STLport-4.0
-+		PATCH_FILE_NAME=STLport-4.0.macosx.patch
-+	.ELSE
-+		TARFILE_NAME=STLport-4.0
-+		PATCH_FILE_NAME=STLport-4.0.patch
-+	.ENDIF			# "$(OS)"=="MACOSX"
-+.ENDIF			# "$(COMID)"=="gcc3"
-+
-+.IF "$(GUI)"=="WNT"
-+.IF "$(CCNUMVER)"<="001300000000"
-+TARFILE_NAME=STLport-4.0
-+PATCH_FILE_NAME=STLport-4.0.patch
-+.ELSE			# "$(CCNUMVER)"<="001300000000"
-+TARFILE_NAME=STLport-4.5-0119
-+PATCH_FILE_NAME=STLport-4.5-0119.patch
-+.ENDIF			# "$(CCNUMVER)"<="001300000000"
-+.ENDIF
-+
-+.IF "$(USE_SHELL)"=="4nt"
-+TAR_EXCLUDES=*/SC5/*
-+.ENDIF          # "$(USE_SHELL)"=="4nt"
-+
-+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak
-+
-+
-+CONFIGURE_ACTION=none
-+CONFIGURE_FLAGS=
-+
-+BUILD_DIR=src
-+
-+.IF "$(COM)"=="MSC"
-+BUILD_ACTION=nmake
-+.IF "$(CCNUMVER)"<="001300000000"
-+BUILD_FLAGS=-f vc6.mak
-+.ELSE			# "$(CCNUMVER)"<="001300000000"
-+BUILD_FLAGS=-f vc7.mak
-+.ENDIF			# "$(CCNUMVER)"<="001300000000"
-+.ENDIF
-+
-+.IF "$(COM)"=="GCC"
-+	.IF "$(COMID)"=="gcc3"
-+		# FreeBSD needs a special makefile
-+		.IF "$(OS)"=="FREEBSD"
-+			BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-+		.ELIF "$(OS)"=="MACOSX"
-+			BUILD_FLAGS=-f gcc-3.0-macosx.mak
-+		.ELSE
-+			BUILD_FLAGS=-f gcc-3.0.mak
-+		.ENDIF
-+	.ELSE # "$(COMID)"=="gcc3"
-+		# MacOS X/Darwin need a special makefile
-+		.IF "$(OS)"=="MACOSX"
-+			BUILD_FLAGS=-f gcc-apple-macosx.mak
-+		.ELIF "$(OS)"=="FREEBSD"
-+			BUILD_FLAGS=-f gcc-freebsd.mak
-+		.ELSE # "$(OS)"=="MACOSX"
-+			BUILD_FLAGS=-f gcc.mak
-+		.ENDIF # "$(OS)"=="MACOSX"
-+	.ENDIF # "$(COMID)"=="gcc3"
-+	BUILD_ACTION=$(GNUMAKE)
-+	# build in parallel
-+	BUILD_FLAGS+= -j$(MAXPROCESS)
-+.ENDIF
-+
-+.IF "$(COM)"=="C52"
-+BUILD_ACTION=make
-+BUILD_FLAGS=-f sunpro6.mak
-+
-+OUT2INC= \
-+    stlport$/SC5$/*.SUNWCCh
-+.ENDIF
-+
-+.IF "$(OS)"=="IRIX"
-+TARFILE_NAME=STLport-4.5
-+PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
-+BUILD_ACTION=gmake
-+BUILD_FLAGS=-f gcc-3.0.mak
-+BUILD_FLAGS+= -j$(MAXPROCESS)
-+.ENDIF
-+
-+OUTDIR2INC= \
-+    stlport
-+
-+.IF "$(GUI)"=="WNT"
-+
-+OUT2LIB= \
-+    lib$/*.lib
-+
-+OUT2BIN= \
-+    lib$/*.dll \
-+    lib$/*.pdb
-+
-+.ELSE          # "$(GUI)"=="WNT"
-+
-+OUT2LIB= \
-+    lib$/lib*
-+
-+.ENDIF          # "$(GUI)"=="WNT"
-+
-+# --- Targets ------------------------------------------------------
-+
-+.IF "$(STLPORT4)"!="NO_STLPORT4"
-+all :
-+       @echo "         An already available installation of STLport has been chosen in the configure process."
-+       @echo "         Therefore the version provided here does not need to be built in addition."
-+       +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
-+.ENDIF
-+
-+.INCLUDE : set_ext.mk
-+.INCLUDE :	target.mk
-+.INCLUDE :	tg_ext.mk
-+
-+$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.patch
-+
-+$(MISC)$/STLport-4.5.patch : STLport-4.5.patch
-+	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
-+
-+.IF "$(GUI)"=="WNT"
-+.IF "$(CCNUMVER)"<="001300000000"
-+
-+$(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches
-+avoid_win32_patches :
-+	@+$(ECHONL)
-+	@+echo ERROR! this module can't use automated patch creation
-+	@+echo on windows.
-+	@+$(ECHONL)
-+	force_dmake_to_error
-+
-+$(PACKAGE_DIR)$/so_custom_patch :  $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-+.IF "$(USE_SHELL)"=="4nt"
-+    +win32_custom.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-+.ELSE			# "$(USE_SHELL)"=="4nt"
-+    +win32_custom.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-+.ENDIF			# "$(USE_SHELL)"=="4nt"
-+
-+$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch
-+
-+.IF "$(USE_NEW_SDK)"!=""
-+$(PACKAGE_DIR)$/win32_sdk_patch :  $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-+.IF "$(USE_SHELL)"=="4nt"
-+    +win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-+.ELSE			# "$(USE_SHELL)"=="4nt"
-+    +win32_sdk.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-+.ENDIF			# "$(USE_SHELL)"=="4nt"
-+
-+$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
-+.ENDIF			# "$(USE_NEW_SDK)"!=""
-+.ENDIF			# COMVER<=001300000000
-+.ENDIF          # "$(GUI)"=="WNT"
diff --git a/app-office/openoffice/files/1.1_rc3/no-crashrep.patch b/app-office/openoffice/files/1.1_rc3/no-crashrep.patch
deleted file mode 100644
index 867daf5e3fc4..000000000000
--- a/app-office/openoffice/files/1.1_rc3/no-crashrep.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN oo_1.1rc3_src.orig/scp/prj/build.lst oo_1.1rc3_src/scp/prj/build.lst
---- oo_1.1rc3_src.orig/scp/prj/build.lst	2003-08-17 20:49:09.000000000 +0200
-+++ oo_1.1rc3_src/scp/prj/build.lst	2003-08-17 20:53:27.000000000 +0200
-@@ -12,10 +12,9 @@
- cp	scp\source\math							nmake	-	all	cp_math NULL
- cp	scp\source\chart						nmake	-	all	cp_chart NULL
- cp	scp\source\psprint						nmake	-	all	cp_psprint NULL
--cp	scp\source\crashrep						nmake	-	all	cp_crashrep NULL
- cp	scp\source\cde							nmake	-	u	cp_cde NULL
- cp	scp\source\kde							nmake	-	u	cp_kde NULL
- cp	scp\source\gnome						nmake	-	u	cp_gnome NULL
- cp	scp\source\lingu						nmake	-	all	cp_lingu NULL
- cp	scp\source\python						nmake   -       all     cp_python NULL
--cp	scp\util								nmake	-	all	cp_util cp_crashrep cp_calc cp_chart cp_draw cp_fonts cp_gbl cp_grffilt cp_impress cp_javafilter cp_math cp_off cp_office_root cp_lingu cp_cde.u cp_kde.u cp_gnome.u cp_python NULL
-+cp	scp\util								nmake	-	all	cp_util cp_calc cp_chart cp_draw cp_fonts cp_gbl cp_grffilt cp_impress cp_javafilter cp_math cp_off cp_office_root cp_lingu cp_cde.u cp_kde.u cp_gnome.u cp_python NULL
-diff -urN oo_1.1rc3_src.orig/scp/util/makefile.mk oo_1.1rc3_src/scp/util/makefile.mk
---- oo_1.1rc3_src.orig/scp/util/makefile.mk	2003-07-15 16:36:52.000000000 +0200
-+++ oo_1.1rc3_src/scp/util/makefile.mk	2003-08-17 20:54:45.000000000 +0200
-@@ -152,18 +152,6 @@
- 
- .ENDIF
- 
--.IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" != "FULL" 
--SCP1FILES += \
--        crashrep_dynamic.par
--.ENDIF
--
--.IF "$(GUI)"=="UNX"
--.IF "$(ENABLE_CRASHDUMP)" == "STATIC" || "$(PRODUCT)" != "FULL"
--SCP1FILES += \
--        crashrep_static.par
--.ENDIF
--.ENDIF
--
- # --- target -------------------------------------------------------------
- .INCLUDE :  target.mk
- 
diff --git a/app-office/openoffice/files/1.1_rc3/no-mozab.patch b/app-office/openoffice/files/1.1_rc3/no-mozab.patch
deleted file mode 100644
index f8ccda1bda3b..000000000000
--- a/app-office/openoffice/files/1.1_rc3/no-mozab.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urN oo_1.1rc2_src/connectivity/prj/build.lst oo_1.1rc2_src.new/connectivity/prj/build.lst
---- oo_1.1rc2_src/connectivity/prj/build.lst	2003-06-02 09:53:47.000000000 +0200
-+++ oo_1.1rc2_src.new/connectivity/prj/build.lst	2003-08-08 11:56:21.000000000 +0200
-@@ -1,4 +1,4 @@
--cn	connectivity	:	comphelper moz svtools unixODBC NULL
-+cn	connectivity	:	comphelper svtools unixODBC 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_parse cn_types NULL
-@@ -7,8 +7,6 @@
- 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\evoab	nmake	-	all	cn_evoab cn_dbtools cn_file 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
-diff -urN oo_1.1rc2_src/scp/source/office/files.scp oo_1.1rc2_src.new/scp/source/office/files.scp
---- oo_1.1rc2_src/scp/source/office/files.scp	2003-07-16 16:37:14.000000000 +0200
-+++ oo_1.1rc2_src.new/scp/source/office/files.scp	2003-08-08 12:15:21.000000000 +0200
-@@ -433,19 +433,6 @@
- 	Styles			= (PACKED);
- End
- 
--#ifndef MACOSX
--File GID_FILE_LIB_MOZABDRV
--	TXT_FILE_BODY;
--	#ifdef UNX
--    Name            = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX));
--	#else
--    Name            = "mozabdrv2.dll";
--	#endif
--    Dir             = GID_DIR_PROGRAM;
--	Styles			= (PACKED);
--End
--#endif
--
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
- 
-@@ -795,20 +782,6 @@
-         #endif
- End
- 
--#ifndef MACOSX
--File GID_FILE_LIB_MOZAB_2
--        TXT_FILE_BODY;
--        Styles          = (PACKED,UNO_COMPONENT);
--        RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
--        Dir             = GID_DIR_PROGRAM;
--        #ifdef UNX
--        Name            = STRING(CONCAT2(libmozab2,UNXSUFFIX));
--        #else
--        Name            = "mozab2.dll";
--        #endif
--End
--#endif
--
- #ifdef UNX
- 
- File GID_FILE_LIB_EVOAB_1
-@@ -3241,15 +3214,6 @@
- #endif
- 
- #endif
--                                  // of #ifdef SOLAR_JAVA
--#ifndef MACOSX
--File GID_FILE_MOZILLA_RUNTIME
--        TXT_FILE_BODY;
--        Styles = (ARCHIVE);
--        Dir    = GID_DIR_PROGRAM;
--        Name	= "mozruntime.zip";
--End
--#endif
- 
- File GID_FILE_HTML_THIRDPARTYLICENSEREADME
-         Name   = "THIRDPARTYLICENSEREADME.html";
diff --git a/app-office/openoffice/files/1.1_rc3/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1_rc3/ooffice-wrapper-1.3
deleted file mode 100644
index 2b2c88fc97b0..000000000000
--- a/app-office/openoffice/files/1.1_rc3/ooffice-wrapper-1.3
+++ /dev/null
@@ -1,266 +0,0 @@
-#!/bin/sh
-#
-# Wrapper script for openoffice
-#
-# (C) Peter 'Nidd' Novodvorsky, 2001,2002
-# (C) Martin 'empty' Quinson, 2002.
-#     Modifications by Chris Halls
-#     Modifications by Lucien Saviot
-
-# This program is free software; you can redistribute it and/or modify         
-# it under the terms of the GNU General Public License as published by         
-# the Free Software Foundation; either version 2 of the License, or            
-# (at your option) any later version.                                          
-#                                                                             
-# This program is distributed in the hope that it will be useful,              
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             
-# General Public License for more details.                                     
-#                                                                             
-# You should have received a copy of the GNU General Public License            
-# along with this program; if not, write to the Free Software                  
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA      
-
-# this string should be exactly as in ~/.sversionrc
-PV=<pv>
-OOVERSION="OpenOffice.org ${PV//_rc3/.0}"
-
-##
-## Source system configuration file
-##
-[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
-
-###
-### Get user settings directory from ~/.sversionrc and echo directory name to stdout
-### get_settings_dir <Version>
-### return: 0 - directory found, 
-###         1 - ~/.sversionrc non existent
-###         2 - entry exists in ~/.sversionrc but directory not found
-###         3 - ~/.sversionrc exists but no entry found
-get_settings_dir()
-{
-  [ -r ${HOME}/.sversionrc ] || exit 1
-  # warning, .sversionrc is DOS encoded so strip ^M
-  settings_dir="`tr -d  '\r' < ~/.sversionrc | sed -n "/^$1=/s%^$1=file://\(.*\)$%\1%p"`"
-  echo "$settings_dir"
-  [ -n "$settings_dir" ] || exit 3
-  [ -d "$settings_dir" ] || exit 2
-}
-
-##
-## where does OO live for this user ?
-##
-OOHOME="`get_settings_dir "$OOVERSION"`"
-if [ $? -eq 2 ] ; then
-  # .sversionrc contains a version yet the directory does not exist
-    echo "I'm confused because I can't find OpenOffice's user files."
-    echo "Your ~/.sversionrc file tells they should be under $OOHOME,"
-    echo "but they are not. Please fix the situation manually."
-    echo "You may want to edit ~/.sversionrc to indicate where is OO"
-    echo "installed, or remove it if you did remove your installation"
-    echo "directory manually (you bad one)."
-    exit 1
-fi
-
-##
-## 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`"
-  case "$SESMGR" in
-      /usr/bin/gnome-session*)
-      echo "Gnome session manager detected - session management disabled"
-      unset SESSION_MANAGER
-      ;;
-  esac
-fi
-
-##
-## Add known Debian fonts locations to search path
-##
-## Please report if you have problems with fonts, or know of non-defoma integrated packages that place fonts in other
-## paths.
-##
-
-# Default font path.  This is used if SAL_FONTPATH_USER is not defined.
-DEBOO_FONTPATH="/usr/lib/X11/fonts/misc/;/usr/lib/X11/fonts/cyrillic/;\
-/usr/lib/X11/fonts/100dpi/:unscaled;/usr/lib/X11/fonts/75dpi/:unscaled;\
-/usr/lib/X11/fonts/Type1/;/usr/lib/X11/fonts/CID;/usr/lib/X11/fonts/Speedo/;\
-/usr/lib/X11/fonts/100dpi/;/usr/lib/X11/fonts/75dpi/;\
-/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType;\
-/usr/lib/X11/fonts/TrueType;\
-/usr/share/fonts/truetype/kochi;\
-/usr/lib/X11/fonts/TrueType/larabie-straight;\
-/usr/lib/X11/fonts/TrueType/larabie-uncommon"
-
-SAL_FONTPATH_USER=${SAL_FONTPATH_USER:-"$DEBOO_FONTPATH"}
-export SAL_FONTPATH_USER
-
-## search LOCALE
-if [ -n "$LC_ALL" ]; then
-  LOCALE="$LC_ALL"
-  # OOo doesn't understand LC_ALL, so set LANG
-  LANG="$LC_ALL"
-elif [ -n "$LANG" ]; then
-  LOCALE="$LANG"
-elif [ -n "$LC_MESSAGES" ]; then
-  LOCALE="$LC_MESSAGES"
-  LANG="$LC_MESSAGES"
-else
-  LOCALE="en_US"
-fi
-
-# Set locale to en_US if locale is C
-if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi
-
-LOCALEOO=`echo $LOCALE | sed 's/_/-/'`
-
-##
-## install OO for this user if needed
-##
-if [ -z "$OOHOME" ] ; then
-  if [ -e /etc/openoffice/autoresponse-<pv>.conf ] && \
-    grep -q DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf ; then
-
-#	Do not take old settings as migration results in broken behaviour
-#
-#	UPDATEFLAG=""
-#    if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then
-#      OOHOME="$oldhome"
-#      echo "Using settings from 1.0.3: /${oldhome}"
-#      /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.sversionrc
-#		UPDATEFLAG="-update:/$oldhome"
-#    fi
-      # first install
-      OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \
-             sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
-
-      if [ -d "$OOHOME" ]; then
-        echo "openoffice.org:  You have no entry for $OOVERSION in ~/.sversionrc, "
-        echo "yet the directory $OOHOME exists." 
-        echo "Please remove $OOHOME and try again."
-        exit 1
-      fi
-
-      echo "running openoffice.org setup..."
-      if ! /opt/OpenOffice.org${PV}/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
-        echo "setup failed.. abort"
-        exit 1
-      fi
-
-
-#    fi
-    
-    echo "Setup complete.  Running openoffice.org..."
-
-else
-    echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break"
-    echo "the /etc/openoffice/autoresponse-<pv>.conf file manually ?"
-    echo "This file should contain DESTINATIONPATH"
-    exit 1
-  fi
-fi
-
-##
-## If no file is specified on the command line, which application to start?  
-## The wrapper can be called from several links in /usr/bin
-##
-if [ $# = 0 ]; then
-  case `basename $0` in
-    oocalc) set -- private:factory/scalc;;
-    oodraw) set -- private:factory/sdraw;;
-    ooimpress) set -- private:factory/simpress;;
-    oomath) set -- private:factory/smath;;
-    oowriter) set -- private:factory/swriter;;
-    oohtml) set -- private:factory/swriter/web;;
-    oomaster) set -- private:factory/swriter/Global;;
-  esac
-fi
-
-## Previous dead installation?
-[ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used"
-
-# There is no locale import file
-## Change the ooLocale key in SETUPFILE acording to LOCALE
-#TMPFILE=`mktemp -t oooLocale.XXXXXXXXXX` && {
-#	cat >${TMPFILE} <<EOF
-#<?xml version="1.0" encoding="UTF-8"?>
-#<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
-# <node oor:name="L10N">
-#  <prop oor:name="ooLocale" oor:type="xs:string">
-#   <value>$LOCALEOO</value>
-#  </prop>
-# </node>
-#</oor:node>
-#EOF
-#	ooconfigimport $TMPFILE >/dev/null
-#	rm -f ${TMPFILE}
-#}
-
-# Check whether the programs actually link to anything, or are from an old
-# version.
-
-if [ ! -s $OOHOME/setup ]; then
-	echo "${OOHOME}/setup links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org${PV}/program/setup ${OOHOME}/setup
-fi
-if [ ! -s $OOHOME/soffice ]; then
-	echo "${OOHOME}/soffice links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/soffice
-fi
-if [ ! -s $OOHOME/spadmin ]; then
-	echo "${OOHOME}/spadmin links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/spadmin
-fi
-
-
-##
-## That's it. Launch the beast (with the given args)
-##
-LANG=$LOCALE
-export LANG
-case `basename $0` in
-    oosetup) exec "$OOHOME/setup"
-    ;;
-    oopadmin) exec "$OOHOME/spadmin"
-    ;;
-    *) exec "$OOHOME/soffice" "$@"
-    ;;
-esac
-## Changelog
-# 2003/04/01 halls
-#   * Version 1.1beta
-# 2003/02/03 halls
-#   * Check for nonexistent ooLocale every run
-# 2003/01/09 halls
-#   * Version 1.0.2
-# 12/15 saviot
-#   * Change ooLocale at startup in Setup.xml
-#   <ooLocale cfg:type="string"/> doesn't work for help.
-# 12/03 challs
-#   * Add Debian font paths to user font path
-# 11/14 saviot
-#   * correct handling of UI language
-#   * don't change Linguistic.xml after first startup(#168780)
-#   * TODO: provide better defaults on first startup
-# 10/03 challs
-#   * Fix use with LC_ALL
-# 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/digest-openoffice-1.1_rc3 b/app-office/openoffice/files/digest-openoffice-1.1_rc3
deleted file mode 100644
index e93b1b4647e9..000000000000
--- a/app-office/openoffice/files/digest-openoffice-1.1_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6cb585688d18a7bd35efd2ba058326e6 OOo_1.1rc3_source.tar.bz2 184661932
-MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
-MD5 1fc0b188f1fe1216776e5855d2da141f freetype-2.1.4.tar.bz2 806647
diff --git a/app-office/openoffice/openoffice-1.1.0-r1.ebuild b/app-office/openoffice/openoffice-1.1.0-r1.ebuild
index 35dfd85ff72f..42e2c334069b 100644
--- a/app-office/openoffice/openoffice-1.1.0-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r1.ebuild,v 1.2 2003/10/19 11:22:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r1.ebuild,v 1.3 2003/10/21 09:33:46 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -72,7 +72,7 @@ RDEPEND=">=sys-libs/glibc-2.1
 	app-arch/zip
 	app-arch/unzip
 	dev-libs/expat
-	>=virtual/jdk-1.3.1
+	>=virtual/jdk-1.4.1
 	virtual/lpr
 	ppc? ( >=sys-libs/glibc-2.2.5-r7
 	>=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced
@@ -290,7 +290,7 @@ src_unpack() {
 	done
 
 	#Do our own branding by setting gentoo linux as the vendor
-	sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux Inc.," ${S}/offmgr/source/offapp/intro/ooo.src
+	sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux," ${S}/offmgr/source/offapp/intro/ooo.src
 }
 
 get_EnvSet() {
diff --git a/app-office/openoffice/openoffice-1.1.0.ebuild b/app-office/openoffice/openoffice-1.1.0.ebuild
index ba525130c772..56646f0ce03c 100644
--- a/app-office/openoffice/openoffice-1.1.0.ebuild
+++ b/app-office/openoffice/openoffice-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0.ebuild,v 1.5 2003/10/19 11:22:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0.ebuild,v 1.6 2003/10/21 09:33:46 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -72,7 +72,7 @@ RDEPEND=">=sys-libs/glibc-2.1
 	app-arch/zip
 	app-arch/unzip
 	dev-libs/expat
-	>=virtual/jdk-1.3.1
+	>=virtual/jdk-1.4.1
 	virtual/lpr
 	ppc? ( >=sys-libs/glibc-2.2.5-r7
 	>=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced
@@ -297,7 +297,7 @@ src_unpack() {
 	done
 
 	#Do our own branding by setting gentoo linux as the vendor
-	sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux Inc.," ${S}/offmgr/source/offapp/intro/ooo.src
+	sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux," ${S}/offmgr/source/offapp/intro/ooo.src
 }
 
 get_EnvSet() {
diff --git a/app-office/openoffice/openoffice-1.1_rc3.ebuild b/app-office/openoffice/openoffice-1.1_rc3.ebuild
deleted file mode 100644
index 6b2092f450be..000000000000
--- a/app-office/openoffice/openoffice-1.1_rc3.ebuild
+++ /dev/null
@@ -1,630 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_rc3.ebuild,v 1.4 2003/10/19 11:22:27 lanius 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 eutils
-# Compile problems with these ...
-filter-flags "-funroll-loops"
-filter-flags "-fomit-frame-pointer"
-replace-flags "-O3" "-O2"
-
-# Enable Bytecode Interpreter for freetype ...
-append-flags "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
-
-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"
-FT_VER="2.1.4"
-STLP_VER="4.5.3"
-MY_PV="${PV/_rc/rc}"
-INSTDIR="${LOC}/OpenOffice.org${PV}"
-S="${WORKDIR}/oo_${MY_PV}_src"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-SRC_URI="mirror://openoffice/stable/${MY_PV}/OOo_${MY_PV}_source.tar.bz2
-	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z
-	mirror://sourceforge/freetype/freetype-${FT_VER}.tar.bz2"
-HOMEPAGE="http://www.openoffice.org/"
-
-LICENSE="LGPL-2 | SISSL-1.1"
-SLOT="0"
-KEYWORDS="-x86 -ppc"
-IUSE="gnome kde"
-
-RDEPEND=">=sys-libs/glibc-2.1
-	!=sys-libs/glibc-2.3.1*
-	>=dev-lang/perl-5.0
-	virtual/x11
-	app-arch/zip
-	app-arch/unzip
-	dev-libs/expat
-	>=virtual/jdk-1.3.1
-	virtual/lpr
-	ppc? ( >=sys-libs/glibc-2.2.5-r7
-	>=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh
-	!app-office/openoffice-bin
-	!sys-apps/star"
-
-# 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.x, but due to profile"
-		eerror "settings, it cannot DEPEND on it, so please merge it"
-		eerror "manually:"
-		eerror
-		eerror " #  ebuild ${PORTDIR}/sys-devel/gcc/gcc-3.2.1.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.1-r2 out, use this"
-		eerror "rather than 3.2.1, etc."
-		eerror
-		eerror "As of writing, gcc-3.2.3-r1 seemed to create the most stable builds."
-		eerror "Also, because OO is such a complex build, ONLY gcc-3.2.3-r1 will be"
-		eerror "supported!"
-		eerror
-		eerror "This process is not highly recomended, as upgrading your compiler"
-		eerror "without upgrading your distribution can be detrimental to your "
-		eerror "installation of gentoo, unless you know what you're getting into"
-		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-<VERSION>"
-		eerror " # env-update"
-		eerror " # source /etc/profile"
-		eerror
-		eerror "Please adjust <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 " It is important to note that OpenOffice.org is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again.					               "
-	ewarn "****************************************************************"
-
-
-}
-
-set_languages () {
-	case "$LANGUAGE" in
-		03 | PORT ) LANGNO=03; LANGNAME=PORT; LFULLNAME=Portuguese
-			;;
-		07 | RUSS ) LANGNO=07; LANGNAME=RUSS; LFULLNAME=Russian
-			;;
-		30 | GREEK ) LANGNO=30; LANGNAME=GREEK; LFULLNAME=Greek
-			;;
-		31 | DTCH ) LANGNO=31; LANGNAME=DTCH; LFULLNAME=Dutch
-			;;
-		33 | FREN ) LANGNO=33; LANGNAME=FREN; LFULLNAME=French
-			;;
-		34 | SPAN ) LANGNO=34; LANGNAME=SPAN; LFULLNAME=Spanish
-			;;
-		35 | FINN ) LANGNO=35; LANGNAME=FINN; LFULLNAME=Finnish
-			;;
-		37 | CAT ) LANGNO=37; LANGNAME=CAT; LFULLNAME=Catalan
-			;;
-		39 | ITAL ) LANGNO=39; LANGNAME=ITAL; LFULLNAME=Italian
-			;;
-		42 | CZECH ) LANGNO=42; LANGNAME=CZECH; LFULLNAME=Czech
-			;;
-		43 | SLOVAK ) LANGNO=43; LANGNAME=SLOVAK; LFULLNAME=Slovak
-			;;
-		45 | DAN ) LANGNO=45; LANGNAME=DAN; LFULLNAME=Danish
-			;;
-		46 | SWED ) LANGNO=46; LANGNAME=SWED; LFULLNAME=Swedish
-			;;
-		48 | POL ) LANGNO=48; LANGNAME=POL; LFULLNAME=Polish
-			;;
-		49 | GER ) LANGNO=49; LANGNAME=GER; LFULLNAME=German
-			;;
-		55 | PORTBR ) LANGNO=55; LANGNAME=PORTBR; LFULLNAME="Portuguese brazilian"
-			;;
-		66 | THAI ) LANGNO=66; LANGNAME=THAI; LFULLNAME=Thai
-			;;
-		77 | ESTONIAN ) LANGNO=77; LANGNAME=ESTONIAN; LFULLNAME=Estonian
-			;;
-		81 | JAPN ) LANGNO=81; LANGNAME=JAPN; LFULLNAME="Japanese"
-			;;
-		82 | KOREAN ) LANGNO=82; LANGNAME=KOREAN; LFULLNAME=Korean
-			;;
-		86 | CHINSIM ) LANGNO=86; LANGNAME=CHINSIM; LFULLNAME="Simplified Chinese (PRC)"
-			;;
-		88 | CHINTRAD ) LANGNO=88; LANGNAME=CHINTRAD; LFULLNAME="Traditional Chinese (taiwan)"
-			;;
-		90 | TURK ) LANGNO=90; LANGNAME=TURK; LFULLNAME=Turkish
-			;;
-		91 | HINDI ) LANGNO=91; LANGNAME=HINDI; LFULLNAME=Hindi
-			;;
-		96 | ARAB ) LANGNO=96; LANGNAME=ARAB; LFULLNAME=Arabic
-			;;
-		97 | HEBREW ) LANGNO=97; LANGNAME=HEBREW; LFULLNAME=Hebrew
-			;;
-		* )
-			LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default)"
-			;;
-	esac
-}
-
-oo_setup() {
-
-	unset LANGUAGE
-	unset LANG
-
-	export NEW_GCC="0"
-
-	if [ -x /usr/sbin/gcc-config ]
-	then
-		# Do we have a gcc that use the new layout and gcc-config ?
-		if /usr/sbin/gcc-config --get-current-profile &> /dev/null
-		then
-			export NEW_GCC="1"
-			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
-
-			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != "3.2" ]
-			then
-				# See if we can get a gcc profile we know is proper ...
-				if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
-				then
-					export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1):${PATH}"
-					export GCC_PROFILE="${CHOST}-3.2.1"
-				else
-					eerror "This build needs gcc-3.2 or later!"
-					eerror
-					eerror "Use gcc-config to change your gcc profile:"
-					eerror
-					eerror "  # gcc-config $CHOST-3.2.1"
-					eerror
-					eerror "or whatever gcc version is relevant."
-					die
-				fi
-			fi
-		fi
-	fi
-
-	export JAVA_BINARY="`which java`"
-}
-
-src_unpack() {
-
-	oo_setup
-
-	cd ${WORKDIR}
-	unpack OOo_${MY_PV}_source.tar.bz2 gpc231.tar.Z
-
-	# Install gpc
-	cd ${WORKDIR}/gpc231
-	cp gpc.* ${S}/external/gpc
-
-	cd ${S}
-
-	cd ${S}/stlport
-	rm STLport-4.5.3.patch
-	epatch ${FILESDIR}/${PV}/newstlportfix.patch
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/no-mozab.patch
-
-	#The gcc-3.2.3 version in gentoo is fixed for the internal error that
-	#blocks compilation with it, so remove the check from the configure script
-	epatch ${FILESDIR}/${PV}/fixed-gcc.patch
-
-	epatch ${FILESDIR}/${PV}/no-crashrep.patch
-
-	einfo "Fixing up crashrep/source/unx/makefile.mk"
-	sed -i -e "s,\(PRODUCT[^a-zA-Z]*\)\(FULL\),\1full," ${S}/crashrep/source/unx/makefile.mk||die
-	einfo "Removing crashrep from the installed set"
-	sed -i -e "s,\(crashrep \),," ${S}/instsetoo/prj/build.lst
-
-
-
-	# 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 \
-		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 / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})"
-	export SOLPATH="$(awk '/^setenv INPATH / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})"
-}
-
-src_compile() {
-	addpredict /bin
-	local buildcmd=""
-
-	set_languages
-
-	oo_setup
-
-	# Setup default compilers (We overide gcc2 if that is default here)
-	export CC="$(gcc-getCC)"
-	export CXX="$(gcc-getCXX)"
-
-	# 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
-
-	# Enable new ccache for this build
-	if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
-	     "${FEATURES/ccache/}" != "${FEATURES}" -a \
-	     -x /usr/bin/ccache ]
-	then
-		# Build uses its own env with $PATH, etc, so
-		# we take the easy way out. (Az)
-		export CC="/usr/bin/ccache ${CC}"
-		export CXX="/usr/bin/ccache ${CXX}"
-	fi
-
-	# 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
-
-	# 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 with language support for ${LFULLNAME}..."
-	cd ${S}/config_office
-	rm -f config.cache
-	./configure --enable-gcc3 \
-		--with-jdk-home=${JAVA_HOME} \
-		--with-lang=${LANGNAME}\
-		--with-x || die
-
-	cd ${S}
-	get_EnvSet
-
-	# 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}
-
-	if [ "${NEW_GCC}" -eq "1" ]
-	then
-		local gcc_path="$(/usr/sbin/gcc-config --get-bin-path ${GCC_PROFILE})"
-
-		# Setup path for new gcc layout in $LinuxEnvSet, else the build
-		# environment will not find gcc ... (Az)
-		perl -pi -e "s|PATH \.:\$SOLARVER|PATH \.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet}
-		# New builds start quoting stuff ...
-		perl -pi -e "s|PATH \"\.:\$SOLARVER|PATH \"\.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet}
-	fi
-
-	# 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 -P ${ECPUS} product=full"
-	else
-		buildcmd="${S}/solenv/bin/build.pl --all product=full"
-	fi
-
-	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
-	then
-		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
-		echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
-		echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
-	fi
-
-	if [ "$(gcc-major-version)" -eq 3 ]
-	then
-		mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/{lib,inc}
-
-		einfo "Installing GCC related libs..."
-		# Workaround for missing libs with GCC3 (thanks to Debian) (Az)
-		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
-
-	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
-
-	if [ "$(gcc-major-version)" -eq 3 ]
-	then
-		local LIBFILE="$(readlink `gcc-libpath`/libstdc++.so.`gcc-libstdcxx-major-version`)"
-		local LIBVERSION="$(echo ${LIBFILE} | sed -e 's|libstdc++\.so\.||g')"
-		# Get this beast to use the right version of libstdc++ ... (Az)
-		echo "LIBSTDCPP3:=${LIBVERSION}" >> \
-			${S}/solver/${SOLVER}/${SOLPATH}/inc/comp_ver.mk
-		cd ${S}
-	fi
-
-	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() {
-
-	# Sandbox issues; bug #11838
-	addpredict "/user"
-	addpredict "/share"
-	addpredict "/dev/dri"
-	addpredict "/usr/bin/soffice"
-	addpredict "/pspfontcache"
-
-	# 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"
-	#
-	set_languages
-
-	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}/${LANGNO}/normal
-	# Setup virtualmake
-	export maketype="./setup"
-	# We need X to install...
-	virtualmake "-v -r:${T}/autoresponse" ||die
-
-	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//_rc3/.0}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
-	doins ${T}/autoresponse-${PV}.conf
-
-	# Install wrapper script
-	exeinto /usr/bin
-	sed -e "s|<pv>|${PV}|g" \
-		${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${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/ooweb
-	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/"
-
-		insinto /usr/share/applnk/OpenOffice.org\ 1.1
-		# Install the files needed for the catagory
-		doins ${kdeloc}/.directory
-		dodir /usr/share
-		# Install the icons and mime info
-		cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${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...
-	# They are needed else user installation fails.
-#	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
-	rm -rf ${D}${INSTDIR}/share/cde
-#
-#	for f in ${D}/usr/share/gnome/apps/OpenOffice.org/* ; do
-#		echo 'Categories=Application;Office;' >> ${f}
-#	done
-
-	# Make sure these do not get nuked.
-	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
-	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
-	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
-}
-
-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, ooweb or oowriter"
-	einfo
-	einfo " If the fonts appear garbled in the user interface refer to "
-	einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
-	einfo
-	einfo "******************************************************************"
-}
-