Finally get rid of the old 1.1.x-versions, as all archs are now on 2.0.x

Package-Manager: portage-2.1_pre3-r1

23 files changed, 15 insertions, 1437 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 37067bf792fe..e75f79f3213b 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.174 2006/01/21 18:59:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.175 2006/01/22 09:34:01 suka Exp $
+
+  22 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/1.1.4/gcc-instlib.patch, -files/1.1.4/getcompver.awk.patch,
+  -files/1.1.4/freetype-217.patch, -files/1.1.4/STLport-vector.patch,
+  -files/1.1.4/gcc34-nojava-fix.patch, -files/1.1.4/hardened-link.patch,
+  -files/1.1.4/gcc34-sal-link-to-libsupc++.diff, -files/1.1.4/javafix.patch,
+  -files/1.1.4/cws-heapbug_CAN-2005-0941.diff,
+  -files/1.1.4/build-new-xslt.diff, -files/1.1.4/gcc34.patch.bz2,
+  -files/1.1.4/newstlportfix.patch, -files/1.1.4/nptl.patch,
+  -files/1.1.4/openoffice-java.patch, -files/1.1.4/ooffice-wrapper-1.3,
+  -files/1.1.4/pthreadlink-fix.patch, -files/1.1.4/pyunolink-fix.patch,
+  -openoffice-1.1.4-r1.ebuild, -openoffice-2.0.0.ebuild:
+  Finally get rid of the old 1.1.x-versions, as all archs are now on 2.0.x
 
   21 Jan 2006; Joseph Jezak <josejx@gentoo.org> openoffice-2.0.1.ebuild:
   Marked ppc stable for bug #119587.
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index b4503e71e8d3..09949d805ca7 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,28 +1,7 @@
-MD5 f22075d388231d3797899e4ac490c018 ChangeLog 37472
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
-MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
-MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
-MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
-MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
-MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.4/gcc34-sal-link-to-libsupc++.diff 405
-MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
-MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
-MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
-MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
-MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785
-MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
-MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
+MD5 77d15408009d3151c1dbd70ed8b75aa5 ChangeLog 38263
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 MD5 e990584aa63a1636aa84ba22c568383b files/2.0.1/gentoo-gcc-version.diff 361
 MD5 22c906b692d3cd8ac18549d2a82285e3 files/2.0.1/ooo-build-gentoo-gcc-version.diff 315
-MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
-MD5 f43c98cba404ee89be6bed4f785dfd00 files/digest-openoffice-2.0.0 478
 MD5 5cba4a6aa38cbfc6b9b91671aa500dd6 files/digest-openoffice-2.0.1 552
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 cf56fa1d50f391d7db442a0bfc0a9279 openoffice-1.1.4-r1.ebuild 16862
-MD5 4c67b1f81407d32f32e55300d7a4b559 openoffice-2.0.0.ebuild 7235
 MD5 51eb9a3681cdcf1c8b8323026160df88 openoffice-2.0.1.ebuild 7508
diff --git a/app-office/openoffice/files/1.1.4/STLport-vector.patch b/app-office/openoffice/files/1.1.4/STLport-vector.patch
deleted file mode 100644
index 1892f1cabeed..000000000000
--- a/app-office/openoffice/files/1.1.4/STLport-vector.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- stlport/STLport-4.6.2.patch	2005-01-06 12:26:48.770546592 +1100
-+++ stlport/STLport-4.6.2.patch	2005-01-06 12:26:01.125789696 +1100
-@@ -69,3 +69,29 @@
-  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-  
-  install_unix :
-+--- misc/build/STLport-4.6.2/src/gcc-linux.mak.old	2005-01-06 12:22:54.127217800 +1100
-++++ misc/build/STLport-4.6.2/src/gcc-linux.mak	2005-01-06 12:24:28.192917640 +1100
-+@@ -46,8 +46,8 @@
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
-+ 
-+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC
-+ 
-+ include common_percent_rules.mak
-+ include common_rules.mak
-+--- misc/build/STLport-4.6.2/src/gcc.mak.old	2005-01-06 15:20:18.840975336 +1100
-++++ misc/build/STLport-4.6.2/src/gcc.mak	2005-01-06 15:21:00.373661408 +1100
-+@@ -44,8 +44,8 @@
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
-+ 
-+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
-+ 
-+ include common_percent_rules.mak
-+ include common_rules.mak
diff --git a/app-office/openoffice/files/1.1.4/build-new-xslt.diff b/app-office/openoffice/files/1.1.4/build-new-xslt.diff
deleted file mode 100644
index 972ac902af21..000000000000
--- a/app-office/openoffice/files/1.1.4/build-new-xslt.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- officecfg/util/resource.xsl.orig	2005-09-23 14:00:56.000000000 +0200
-+++ officecfg/util/resource.xsl	2005-09-23 14:02:14.000000000 +0200
-@@ -84,7 +84,8 @@
-     </xsl:template>
- 
-     <!-- match all elements that could possibly contain info elements -->
--    <xsl:template match="info/desc[@xml:lang=$locale]|info/label[@xml:lang=$locale]">
-+    <xsl:template match="info/desc|info/label">
-+    <xsl:if test="@xml:lang=$locale">
- 
-         <!-- print TPF's path to current node -->
-         <xsl:for-each select="ancestor-or-self::*">
-@@ -108,6 +109,7 @@
- 
-         <xsl:apply-templates/>
- 
-+    </xsl:if>
-     </xsl:template>
- 
- </xsl:transform>
diff --git a/app-office/openoffice/files/1.1.4/cws-heapbug_CAN-2005-0941.diff b/app-office/openoffice/files/1.1.4/cws-heapbug_CAN-2005-0941.diff
deleted file mode 100644
index 4ad65421c1a2..000000000000
--- a/app-office/openoffice/files/1.1.4/cws-heapbug_CAN-2005-0941.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: source/sdstor/stgole.cxx
-===================================================================
-RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v
-retrieving revision 1.4
-retrieving revision 1.4.206.1
-diff -u -u -r1.4 -r1.4.206.1
---- sot/source/sdstor/stgole.cxx	22 Jul 2002 12:28:43 -0000	1.4
-+++ sot/source/sdstor/stgole.cxx	11 Apr 2005 16:22:26 -0000	1.4.206.1
-@@ -156,6 +156,8 @@
- 		*this >> aClsId;
- 		INT32 nLen1 = 0;
- 		*this >> nLen1;
-+		// the higher bits are ignored
-+		nLen1 &= 0xFFFF;
- 		sal_Char* p = new sal_Char[ (USHORT) nLen1 ];
- 		if( Read( p, nLen1 ) == (ULONG) nLen1 )
- 		{
diff --git a/app-office/openoffice/files/1.1.4/freetype-217.patch b/app-office/openoffice/files/1.1.4/freetype-217.patch
deleted file mode 100644
index 12ed2b2f8691..000000000000
--- a/app-office/openoffice/files/1.1.4/freetype-217.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx.ft217	2004-01-08 03:36:33.000000000 -0500
-+++ oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx	2004-01-08 11:02:21.000000000 -0500
-@@ -77,7 +77,8 @@
- #include <osl/file.hxx>
- #include <osl/thread.hxx>
- 
--#include "freetype/freetype.h"
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include "freetype/ftglyph.h"
- #include "freetype/ftoutln.h"
- #include "freetype/tttables.h"
---- oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx.217	2004-01-08 03:36:46.000000000 -0500
-+++ oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx	2004-01-08 11:03:04.000000000 -0500
-@@ -68,7 +68,8 @@
- #endif
- 
- #ifndef _SV_GCACHFTYP_HXX
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <gcach_ftyp.hxx>
- #endif
- 
diff --git a/app-office/openoffice/files/1.1.4/gcc-instlib.patch b/app-office/openoffice/files/1.1.4/gcc-instlib.patch
deleted file mode 100644
index 99e424abed01..000000000000
--- a/app-office/openoffice/files/1.1.4/gcc-instlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN solenv/bin/gccinstlib.pl oo_1.1.2_src/solenv/bin/gccinstlib.pl
---- solenv/bin/gccinstlib.pl	2004-03-16 11:15:42.000000000 +0100
-+++ solenv/bin/gccinstlib.pl	2004-09-27 10:36:02.338394960 +0200
-@@ -63,7 +63,7 @@
- #
- #*************************************************************************
- 
--$ENV{'LC_MESSAGES'} = 'C';
-+$ENV{'LC_ALL'} = 'C';
- 
- %SearchDirs = GetGccSearchDirs ();
- 
diff --git a/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch b/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch
deleted file mode 100644
index 73017c1bae19..000000000000
--- a/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sfx2/util/makefile.mk	2004-11-06 18:49:27.753988376 +0100
-+++ sfx2/util/makefile.mk	2004-11-06 18:39:19.706425656 +0100
-@@ -70,6 +70,8 @@
- GEN_HID=TRUE
- GEN_HID_OTHER=TRUE
- 
-+LINKFLAGSDEFS = # do not fail with missing symbols
-+
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :  settings.mk
diff --git a/app-office/openoffice/files/1.1.4/gcc34-sal-link-to-libsupc++.diff b/app-office/openoffice/files/1.1.4/gcc34-sal-link-to-libsupc++.diff
deleted file mode 100644
index dd823ee024c3..000000000000
--- a/app-office/openoffice/files/1.1.4/gcc34-sal-link-to-libsupc++.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- sal/util/makefile.mk.foo	2004-12-21 14:38:37.314521336 -0500
-+++ sal/util/makefile.mk	2004-12-21 14:46:52.495159848 -0500
-@@ -146,6 +146,10 @@
- SHL1STDLIBS+=-init InitLibrary -term ExitLibrary
- .ENDIF # MAC
- 
-+.IF "$(OS)"=="LINUX"
-+SHL1STDLIBS+= -Wl,-Bstatic -lsupc++ -Wl,-Bdynamic -lgcc_s
-+.ENDIF
-+
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="SOLARIS"
- # libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7)
diff --git a/app-office/openoffice/files/1.1.4/gcc34.patch.bz2 b/app-office/openoffice/files/1.1.4/gcc34.patch.bz2
deleted file mode 100644
index 2c3a4e355949..000000000000
--- a/app-office/openoffice/files/1.1.4/gcc34.patch.bz2
+++ /dev/null
diff --git a/app-office/openoffice/files/1.1.4/getcompver.awk.patch b/app-office/openoffice/files/1.1.4/getcompver.awk.patch
deleted file mode 100644
index 0fbeb07ee3d6..000000000000
--- a/app-office/openoffice/files/1.1.4/getcompver.awk.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- solenv/bin/getcompver.awk.orig	2005-02-22 00:24:46.976743123 +0100
-+++ solenv/bin/getcompver.awk	2005-02-22 00:34:16.624045985 +0100
-@@ -98,6 +98,11 @@
-         CCversion = $0
-     }
- }
-+/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ {
-+    if ( compiler_matched == 0 ) {
-+        CCversion = substr($0, 0, index($0, "-") - 1)
-+    }
-+}
- END {
-     if ( num == "true" ) {
-         tokencount = split (CCversion,vertoken,".")
diff --git a/app-office/openoffice/files/1.1.4/hardened-link.patch b/app-office/openoffice/files/1.1.4/hardened-link.patch
deleted file mode 100644
index 83c707dc106d..000000000000
--- a/app-office/openoffice/files/1.1.4/hardened-link.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
---- solenv.orig/inc/unxlngi4.mk	2004-10-23 20:09:29.344518376 +0200
-+++ solenv/inc/unxlngi4.mk	2004-10-23 20:09:43.084429592 +0200
-@@ -156,8 +156,8 @@
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
--LINKFLAGSAPPGUI= -Wl,-export-dynamic
--LINKFLAGSAPPCUI= -Wl,-export-dynamic
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,-z,execheap
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,-z,execheap
- 
- # linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
diff --git a/app-office/openoffice/files/1.1.4/javafix.patch b/app-office/openoffice/files/1.1.4/javafix.patch
deleted file mode 100644
index e2d9ccf723b1..000000000000
--- a/app-office/openoffice/files/1.1.4/javafix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
-+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
-@@ -184,7 +184,12 @@
- 	{
- 		jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;");
- 		if(id)
--			return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL));
-+			return copyArrayAndDelete(
-+		t.pEnv,
-+		(jobjectArray)t.pEnv->GetObjectField( object, id),
-+		static_cast< const ::rtl::OUString* >( NULL ),
-+		static_cast< const java_lang_String* >( NULL )
-+		);
- 	} //t.pEnv
- 	return Sequence< ::rtl::OUString>();
- }
---- connectivity/source/inc/java/tools.hxx
-+++ connectivity/source/inc/java/tools.hxx
-@@ -101,7 +101,7 @@
- 
- 	java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- 
--    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const  T& _rD1,const  JT& _rD2)
-+    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* )
- 	{
-                 ::com::sun::star::uno::Sequence< T > xOut;
- 		if(_Array)
diff --git a/app-office/openoffice/files/1.1.4/newstlportfix.patch b/app-office/openoffice/files/1.1.4/newstlportfix.patch
deleted file mode 100644
index f88927669a7b..000000000000
--- a/app-office/openoffice/files/1.1.4/newstlportfix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- stlport/makefile.mk.orig	2004-01-28 11:52:04.000000000 +0100
-+++ stlport/makefile.mk	2004-11-04 15:36:38.158427224 +0100
-@@ -72,11 +72,12 @@
- # --- Files --------------------------------------------------------
- .EXPORT : CC CXX
- .IF "$(COMID)"=="gcc3"
--	TARFILE_NAME=STLport-4.5
-        .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103"
-+               TARFILE_NAME=STLport-4.5
-                PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch
-        .ELSE
--               PATCH_FILE_NAME=STLport-4.5.patch
-+               TARFILE_NAME=STLport-4.6.2
-+               PATCH_FILE_NAME=STLport-4.6.2.patch
-        .ENDIF
- .ELSE			# "$(COMID)"=="gcc3"
- 	.IF "$(OS)"=="MACOSX"
-@@ -127,7 +128,7 @@
- 		.ELIF "$(OS)"=="MACOSX"
- 			BUILD_FLAGS=-f gcc-3.0-macosx.mak
- 		.ELSE
--			BUILD_FLAGS=-f gcc-3.0.mak
-+			BUILD_FLAGS=-f gcc.mak
-		.ENDIF
- 	.ELSE # "$(COMID)"=="gcc3"
- 		# MacOS X/Darwin need a special makefile
---- /dev/null	2004-10-28 17:21:08.585283768 +0200
-+++ stlport/STLport-4.6.2.patch	2004-11-04 21:27:55.986110360 +0100
-@@ -0,0 +1,71 @@
-+--- misc/build/STLport-4.6.2/src/num_get_float.cpp	2003-11-02 09:58:50.000000000 +0100
-++++ misc/build/STLport-4.6.2/src/num_get_float.cpp	2004-11-04 15:26:12.605525720 +0100
-+@@ -770,18 +770,18 @@
-+ 
-+ void  _STLP_CALL
-+ __string_to_float(const string& v, float& val) {
-+-    val = _Stl_string_to_double(v.data());
-++    val = _Stl_string_to_double(v.c_str());
-+ }
-+ 
-+ void  _STLP_CALL
-+ __string_to_float(const string& v, double& val) {
-+-    val = _Stl_string_to_double(v.data());
-++    val = _Stl_string_to_double(v.c_str());
-+ }
-+ 
-+ #ifndef _STLP_NO_LONG_DOUBLE
-+ void  _STLP_CALL
-+ __string_to_float(const string& v, long double& val) {
-+-    val = _Stl_string_to_long_double(v.data());
-++    val = _Stl_string_to_long_double(v.c_str());
-+ }
-+ #endif
-+ 
-+--- misc/build/STLport-4.6.2/stlport/config/stl_gcc.h	2003-11-02 09:59:11.000000000 +0100
-++++ misc/build/STLport-4.6.2/stlport/config/stl_gcc.h	2004-11-04 15:26:12.342565696 +0100
-+@@ -7,7 +7,9 @@
-+ # define _STLP_USE_GLIBC
-+ #endif
-+ 
-++#if (__GNUC__ >= 3) && (__GNUC_MAJOR__ >= 4)
-+ #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
-++#endif
-+ 
-+ # if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) )
-+ #  define _STLP_NO_WCHAR_T
-+@@ -263,7 +265,7 @@
-+ 
-+ # if (__GNUC__ >= 3)
-+ 
-+-#  if ((__GNUC_MINOR__ == 0) || (__APPLE__))
-++#  if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__))
-+ #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ #   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+ #  else
-+--- misc/build/STLport-4.6.2/stlport/stdexcept	2003-11-02 09:59:01.000000000 +0100
-++++ misc/build/STLport-4.6.2/stlport/stdexcept	2004-11-04 15:26:12.474545632 +0100
-+@@ -60,6 +60,11 @@
-+ # endif
-+ #  define _STLP_EXCEPTION_BASE exception
-+ 
-++#if (__GNUC__ >= 3)
-++#undef _STLP_NOTHROW_INHERENTLY
-++#define _STLP_NOTHROW_INHERENTLY throw()
-++#endif
-++
-+ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-+ public:
-+   __Named_exception(const string& __str) 
-+--- misc/build/STLport-4.6.2/src/common_rules.mak	2004-11-04 21:25:58.322997872 +0100
-++++ misc/build/STLport-4.6.2/src/common_rules.mak	2004-11-04 21:26:15.731351400 +0100
-+@@ -84,7 +84,8 @@
-+ 	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+ 	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+ 	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+-	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-++# not needed ?
-++#	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+ 	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+ 
-+ install_unix :
diff --git a/app-office/openoffice/files/1.1.4/nptl.patch b/app-office/openoffice/files/1.1.4/nptl.patch
deleted file mode 100644
index 996a7ceec67d..000000000000
--- a/app-office/openoffice/files/1.1.4/nptl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- tools/source/solar/solar.c.orig
-+++ tools/source/solar/solar.c
-@@ -577,7 +577,7 @@
- 
-   {
- 	char* p = NULL;
--	InfoMemoryAccess( p );
-+	/*InfoMemoryAccess( p );*/
- 	p = (char*)&p;
- 	InfoMemoryAccess( p );
- 	InfoMemoryTypeAccess( t_short );
-*** sal/osl/unx/process.c.orig
---- sal/osl/unx/process.c
-@@ -1017,11 +1017,6 @@
- 			for (i = 0; data.m_pszEnv[i] != NULL; i++)
- 	     		putenv(data.m_pszEnv[i]);
- 
--#if defined(LINUX)
--            /* mfe: linux likes to have just one thread when the exec family is called */
--            /*      this np function has this purpose ...                              */
--            pthread_kill_other_threads_np();
--#endif
-             OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
-      
- 			/* Connect std IO to pipe ends */
diff --git a/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3
deleted file mode 100644
index c12d92e91bd1..000000000000
--- a/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3
+++ /dev/null
@@ -1,197 +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}"
-
-##
-## Source system configuration file
-##
-[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
-
-# Migration to new user install dir
-if [ -d "$HOME/.openoffice/1.1.3" ] ; then
-     mv $HOME/.openoffice/1.1.3 $HOME/.openoffice/1.1.4
-     sed -i -e s/'.openoffice\/1.1.3'/'.openoffice\/1.1.4'/g $HOME/.sversionrc 
-     sed -i -e s/1.1.3/1.1.4/g $HOME/.openoffice/1.1.4/user/basic/*.xlc
-     echo "Your user install dir has been moved over to the new version"
-fi
-
-#Make smooth up- and downgrading between minor versions possible
-if [ -e "$HOME/.sversionrc" ] ; then
-     sed -i -e s/1.1.3/1.1.4/g $HOME/.sversionrc
-fi
-
-if [ ! -f "/proc/version" ] ; then
-    echo "--- Warning - OO.o will not work without a mounted /proc filesystem ---"
-fi
-
-###
-### Get user settings directory from ~/.sversionrc and echo directory name to stdout
-### get_settings_dir <Version>
-### return: 0 - directory found, 
-###         1 - ~/.sversionrc non existent
-###         2 - entry exists in ~/.sversionrc but directory not found
-###         3 - ~/.sversionrc exists but no entry found
-get_settings_dir()
-{
-  [ -r ${HOME}/.sversionrc ] || exit 1
-  # warning, .sversionrc is DOS encoded so strip ^M
-  settings_dir="`tr -d  '\r' < ~/.sversionrc | sed -n "/^$1=/s%^$1=file://\(.*\)$%\1%p"`"
-  echo "$settings_dir"
-  [ -n "$settings_dir" ] || exit 3
-  [ -d "$settings_dir" ] || exit 2
-}
-
-##
-## where does OO live for this user ?
-##
-OOHOME="`get_settings_dir "$OOVERSION"`"
-if [ $? -eq 2 ] ; then
-  # .sversionrc contains a version yet the directory does not exist
-    echo "I'm confused because I can't find OpenOffice's user files."
-    echo "Your ~/.sversionrc file tells they should be under $OOHOME,"
-    echo "but they are not. Please fix the situation manually."
-    echo "You may want to edit ~/.sversionrc to indicate where is OO"
-    echo "installed, or remove it if you did remove your installation"
-    echo "directory manually (you bad one)."
-    exit 1
-fi
-
-##
-## Add /usr/share/fonts to font search path
-##
-
-# Default font path.  This is used if SAL_FONTPATH_PRIVATE is not defined.
-
-GENTOO_FONTPATH=""
-for d in `find /usr/share/fonts -maxdepth 1 -mindepth 1 -type d` ; do
-    GENTOO_FONTPATH="$GENTOO_FONTPATH;$d"
-done
-
-SAL_FONTPATH_PRIVATE=${SAL_FONTPATH_PRIVATE:-"$GENTOO_FONTPATH"}
-export SAL_FONTPATH_PRIVATE
-
-## search LOCALE
-if [ -n "$LC_ALL" ]; then
-  LOCALE="$LC_ALL"
-  # OOo doesn't understand LC_ALL, so set LANG
-  LANG="$LC_ALL"
-elif [ -n "$LANG" ]; then
-  LOCALE="$LANG"
-elif [ -n "$LC_MESSAGES" ]; then
-  LOCALE="$LC_MESSAGES"
-  LANG="$LC_MESSAGES"
-else
-  LOCALE="en_US"
-fi
-
-# Set locale to en_US if locale is C
-if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi
-
-LOCALEOO=`echo $LOCALE | sed 's/_/-/'`
-
-##
-## install OO for this user if needed
-##
-if [ -z "$OOHOME" ] ; then
-  if [ -e /etc/openoffice/autoresponse-<pv>.conf ] && \
-    grep -q DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf ; then
-
-      # first install
-      OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \
-             sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
-
-      if [ -d "$OOHOME" ]; then
-        echo "openoffice.org:  You have no entry for $OOVERSION in ~/.sversionrc, "
-        echo "yet the directory $OOHOME exists." 
-        echo "Please remove $OOHOME and try again."
-        exit 1
-      fi
-
-      echo "running openoffice.org setup..."
-      if ! /opt/OpenOffice.org/program/setup -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
-        echo "setup failed.. abort"
-        exit 1
-      fi
-
-    echo "Setup complete.  Running openoffice.org..."
-
-else
-    echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break"
-    echo "the /etc/openoffice/autoresponse-<pv>.conf file manually ?"
-    echo "This file should contain DESTINATIONPATH"
-    exit 1
-  fi
-fi
-
-##
-## If no file is specified on the command line, which application to start?  
-## The wrapper can be called from several links in /usr/bin
-##
-if [ $# = 0 ]; then
-  case `basename $0` in
-    oocalc) set -- private:factory/scalc;;
-    oodraw) set -- private:factory/sdraw;;
-    ooimpress) set -- private:factory/simpress;;
-    oomath) set -- private:factory/smath;;
-    ooweb) set -- private:factory/swriter/web;;
-    oowriter) set -- private:factory/swriter;;
-    oomaster) set -- private:factory/swriter/Global;;
-  esac
-fi
-
-## Previous dead installation?
-[ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used"
-
-# Check whether the programs actually link to anything, or are from an old
-# version.
-
-if [ ! -s $OOHOME/setup ]; then
-	echo "${OOHOME}/setup links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org/program/setup ${OOHOME}/setup
-fi
-if [ ! -s $OOHOME/soffice ]; then
-	echo "${OOHOME}/soffice links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/soffice
-fi
-if [ ! -s $OOHOME/spadmin ]; then
-	echo "${OOHOME}/spadmin links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/spadmin
-fi
-
-
-##
-## That's it. Launch the beast (with the given args)
-##
-LANG=$LOCALE
-export LANG
-case `basename $0` in
-    oosetup) exec "$OOHOME/setup"
-    ;;
-    oopadmin) exec "$OOHOME/spadmin"
-    ;;
-    *) exec "$OOHOME/soffice" "$@"
-    ;;
-esac
diff --git a/app-office/openoffice/files/1.1.4/openoffice-java.patch b/app-office/openoffice/files/1.1.4/openoffice-java.patch
deleted file mode 100644
index 46a6e9734aa6..000000000000
--- a/app-office/openoffice/files/1.1.4/openoffice-java.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java
---- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2004-02-10 01:00:11.000000000 +0100
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2004-02-09 11:19:53.000000000 +0100
-@@ -200,7 +200,7 @@
-         index--;
-     }
-     
--    public org.openide.WizardDescriptor$Panel current() {
-+    public org.openide.WizardDescriptor.Panel current() {
-         return panels[index];
-     }
-     
-diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java
---- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2004-02-10 01:00:48.000000000 +0100
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2004-02-09 11:20:15.000000000 +0100
-@@ -207,7 +207,7 @@
-    index--;
-   }
- 
--  public org.openide.WizardDescriptor$Panel current()
-+  public org.openide.WizardDescriptor.Panel current()
-    {
-      return panels[index];
-    }
-diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java
---- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2004-02-10 01:01:29.000000000 +0100
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2004-02-09 11:20:35.000000000 +0100
-@@ -214,7 +214,7 @@
-         index--;
-     }
-     
--    public org.openide.WizardDescriptor$Panel current() {
-+    public org.openide.WizardDescriptor.Panel current() {
-         return panels[index];
-     }
-     
diff --git a/app-office/openoffice/files/1.1.4/pthreadlink-fix.patch b/app-office/openoffice/files/1.1.4/pthreadlink-fix.patch
deleted file mode 100644
index ffd0a647faa8..000000000000
--- a/app-office/openoffice/files/1.1.4/pthreadlink-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
---- solenv.orig/inc/unxlngi4.mk	2004-10-23 20:07:59.714144264 +0200
-+++ solenv/inc/unxlngi4.mk	2004-10-23 20:08:36.190599000 +0200
-@@ -151,13 +151,13 @@
- LINK*=$(CC)
- 
- # default linker flags
--LINKFLAGSDEFS*=-z defs
-+LINKFLAGSDEFS*=-Wl,-z,defs
- LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
--LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
--LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic
- 
- # linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
-@@ -198,8 +198,8 @@
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -lstdc++
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc -lpthread $(DYNAMIC)
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
diff --git a/app-office/openoffice/files/1.1.4/pyunolink-fix.patch b/app-office/openoffice/files/1.1.4/pyunolink-fix.patch
deleted file mode 100644
index 6d8ce6323868..000000000000
--- a/app-office/openoffice/files/1.1.4/pyunolink-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- pyuno.orig/source/module/makefile.mk	2005-01-18 11:59:23.462336464 +0100
-+++ pyuno/source/module/makefile.mk	2005-01-18 11:59:42.289474304 +0100
-@@ -82,9 +82,9 @@
- # so this library cannot be checked
- SHL1NOCHECK=yes
- PYUNORC=pyunorc
--.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
-+#.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
- PYTHONLIB=-lpython
--.ENDIF
-+#.ENDIF
- .ELSE
- # on windows, the python executable also uses the shared library,
- # so we link pyuno directly to it
diff --git a/app-office/openoffice/files/digest-openoffice-1.1.4-r1 b/app-office/openoffice/files/digest-openoffice-1.1.4-r1
deleted file mode 100644
index 179a6c7801b2..000000000000
--- a/app-office/openoffice/files/digest-openoffice-1.1.4-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 20c10db97865ae4c51dc827d668b8939 OOo_1.1.4_source.tar.gz 219743530
-MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958
-MD5 072736926e5c04aba26b2fedaaf413fb LINUXGCCPinc.zip 4145981
-MD5 6cfa9ea26afd1effaee4497a7c82ef89 LINUXGCCPlib.zip 496451
-MD5 e77e91543d95353f742942af8f8d01b3 LINUXGCCPruntime.zip 2533976
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.0 b/app-office/openoffice/files/digest-openoffice-2.0.0
deleted file mode 100644
index 7bf691b2fa3d..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.0.0
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 6a6b1dfa8fd068b1c5f9b341b35ab99d OOO_2_0_0-core.tar.bz2 157108531
-MD5 8aa0c6463dc517723f9f4d4a3f0191a0 OOO_2_0_0-lang.tar.bz2 33103772
-MD5 a6f4b2ef7d1fae927cedbd45e6dd403d OOO_2_0_0-system.tar.bz2 19324775
-MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
-MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
-MD5 ecbbc059d9913d54be592fdab9e91785 ooo-build-2.0.0.2.tar.gz 4350834
-MD5 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 1308872
diff --git a/app-office/openoffice/openoffice-1.1.4-r1.ebuild b/app-office/openoffice/openoffice-1.1.4-r1.ebuild
deleted file mode 100644
index 6304eff8aebd..000000000000
--- a/app-office/openoffice/openoffice-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,574 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.11 2006/01/21 20:47:48 suka Exp $
-
-# 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 eutils fdo-mime flag-o-matic toolchain-funcs
-
-IUSE="curl hardened java kde nptl zlib"
-
-INSTDIR="/opt/OpenOffice.org"
-S="${WORKDIR}"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-
-SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}_source.tar.gz
-		http://www.stlport.org/archive/STLport-4.6.2.tar.gz
-		ppc? ( http://www.openoffice.org/files/documents/111/2112/LINUXGCCPinc.zip
-			   http://www.openoffice.org/files/documents/111/2113/LINUXGCCPlib.zip
-			   http://www.openoffice.org/files/documents/111/2114/LINUXGCCPruntime.zip )"
-
-HOMEPAGE="http://www.openoffice.org/"
-
-LICENSE="|| ( LGPL-2  SISSL-1.1 )"
-SLOT="0"
-KEYWORDS="x86 ppc -sparc"
-
-RDEPEND="!app-office/openoffice-bin
-	|| ( (
-			x11-libs/libXaw
-			x11-libs/libXinerama
-		)
-		virtual/x11 )
-	virtual/libc
-	virtual/lpr
-	>=dev-lang/perl-5.0
-	>=media-libs/libart_lgpl-2.3.13
-	>=x11-libs/startup-notification-0.5
-	>=media-libs/freetype-2.1.4
-	app-arch/zip
-	app-arch/unzip
-	dev-libs/expat
-	java? ( >=virtual/jre-1.4.1 )
-	ppc? ( >=sys-devel/gcc-3.2.1 )
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
-
-DEPEND="${RDEPEND}
-	|| ( (
-			x11-libs/libXrender
-			x11-proto/printproto
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/xineramaproto
-		)
-		virtual/x11 )
-	>=sys-apps/findutils-4.1.20-r1
-	app-shells/tcsh
-	dev-util/pkgconfig
-	curl? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-	sys-libs/pam
-	!dev-util/dmake
-	java? ( >=virtual/jdk-1.4.1 )
-	!java? ( dev-libs/libxslt )"
-
-PROVIDE="virtual/ooo"
-
-pkg_setup() {
-
-	if use java
-	then
-		if [ -z "${JDK_HOME}" ] || [ ! -d "${JDK_HOME}" ]
-		then
-			eerror "In order to compile java sources you have to set the"
-			eerror "\$JDK_HOME environment properly."
-			eerror ""
-			eerror "You can achieve this by using the java-config tool:"
-			eerror "  emerge java-config"
-			die "Couldn't find a valid JDK home"
-		fi
-	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
-	ewarn " Please note that this package now uses the LINGUAS environment "
-	ewarn " variable to provide localization. The old LANGUAGE=ENUS|PORT..."
-	ewarn " system does NOT work anymore."
-	ewarn
-	ewarn " If you want localized helpcontent, please download the correct file "
-	ewarn " for your language from an OpenOffice.org-mirror "
-	ewarn " (directory /contrib/helpcontent/ e.g.) and put it in your "
-	ewarn " /usr/portage/distfiles, the ebuild will use it automatically. "
-	ewarn
-
-	set_languages
-}
-
-set_languages () {
-
-	strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
-	if [ -n "${LINGUAS}" ] ; then
-		# use the leftmost value
-		temp_lang=( ${LINGUAS} )
-		primary_lang=${temp_lang[0]}
-	else
-		primary_lang="en"
-	fi
-
-	case "${primary_lang}" in
-		en ) OOLANGNO=01; OOLANGNAME=ENUS; OOLFULLNAME="US English (default)"
-			;;
-		pt ) OOLANGNO=03; OOLANGNAME=PORT; OOLFULLNAME=Portuguese
-			;;
-		ru ) OOLANGNO=07; OOLANGNAME=RUSS; OOLFULLNAME=Russian
-			;;
-		el ) OOLANGNO=30; OOLANGNAME=GREEK; OOLFULLNAME=Greek
-			;;
-		nl ) OOLANGNO=31; OOLANGNAME=DTCH; OOLFULLNAME=Dutch
-			;;
-		fr ) OOLANGNO=33; OOLANGNAME=FREN; OOLFULLNAME=French
-			;;
-		es ) OOLANGNO=34; OOLANGNAME=SPAN; OOLFULLNAME=Spanish
-			;;
-		fi ) OOLANGNO=35; OOLANGNAME=FINN; OOLFULLNAME=Finnish
-			;;
-		hu ) OOLANGNO=36; OOLANGNAME=HUNG; OOLFULLNAME=Hungarian
-			;;
-		ca ) OOLANGNO=37; OOLANGNAME=CAT; OOLFULLNAME=Catalan
-			;;
-		it ) OOLANGNO=39; OOLANGNAME=ITAL; OOLFULLNAME=Italian
-			;;
-		cs ) OOLANGNO=42; OOLANGNAME=CZECH; OOLFULLNAME=Czech
-			;;
-		sk ) OOLANGNO=43; OOLANGNAME=SLOVAK; OOLFULLNAME=Slovak
-			;;
-		da ) OOLANGNO=45; OOLANGNAME=DAN; OOLFULLNAME=Danish
-			;;
-		sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish
-			;;
-		no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
-			;;
-		pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish
-			;;
-		de ) OOLANGNO=49; OOLANGNAME=GER; OOLFULLNAME=German
-			;;
-		sl ) OOLANGNO=50; OOLANGNAME=SLOVENIAN; OOLFULLNAME=Slovenian
-			;;
-		pt_BR ) OOLANGNO=55; OOLANGNAME=PORTBR; OOLFULLNAME="Portuguese brazilian"
-			;;
-		th ) OOLANGNO=66; OOLANGNAME=THAI; OOLFULLNAME=Thai
-			;;
-		et ) OOLANGNO=77; OOLANGNAME=ESTONIAN; OOLFULLNAME=Estonian
-			;;
-		ja ) OOLANGNO=81; OOLANGNAME=JAPN; OOLFULLNAME="Japanese"
-			;;
-		ko ) OOLANGNO=82; OOLANGNAME=KOREAN; OOLFULLNAME=Korean
-			;;
-		zh_CN ) OOLANGNO=86; OOLANGNAME=CHINSIM; OOLFULLNAME="Simplified Chinese (PRC)"
-			;;
-		zh_TW ) OOLANGNO=88; OOLANGNAME=CHINTRAD; OOLFULLNAME="Traditional Chinese (taiwan)"
-			;;
-		tr ) OOLANGNO=90; OOLANGNAME=TURK; OOLFULLNAME=Turkish
-			;;
-		hi_IN ) OOLANGNO=91; OOLANGNAME=HINDI; OOLFULLNAME=Hindi
-			;;
-		ar ) OOLANGNO=96; OOLANGNAME=ARAB; OOLFULLNAME=Arabic
-			;;
-		he ) OOLANGNO=97; OOLANGNAME=HEBREW; OOLFULLNAME=Hebrew
-			;;
-	esac
-
-	einfo "Installing OpenOffice.org for ${OOLFULLNAME} environment."
-
-}
-
-oo_setup() {
-
-	unset LANGUAGE
-	unset LANG
-	unset LC_ALL
-
-	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 GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
-
-			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ] && [ "$(gcc-version)" != "3.4" ]
-			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, gcc-3.3 or gcc-3.4!"
-					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
-}
-
-src_unpack() {
-
-	oo_setup
-
-	cd ${WORKDIR}
-	unpack ${A}
-	cd ${S}
-
-	# Fix for missing ppc mozilla includes bug #71268
-	if use ppc; then
-		cp ${DISTDIR}/LINUXGCCPinc.zip ${S}/moz/zipped || die
-		cp ${DISTDIR}/LINUXGCCPlib.zip ${S}/moz/zipped || die
-		cp ${DISTDIR}/LINUXGCCPruntime.zip ${S}/moz/zipped || die
-	fi
-
-	#Still needed: The STLport patch
-	cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die
-	epatch ${FILESDIR}/${PV}/newstlportfix.patch
-
-	epatch ${FILESDIR}/${PV}/gcc-instlib.patch
-
-	#Another java problem
-	epatch ${FILESDIR}/${PV}/javafix.patch
-
-	# fix for bug #84548
-	epatch ${FILESDIR}/${PV}/getcompver.awk.patch
-
-	# Security fix, bug #88863
-	epatch ${FILESDIR}/${PV}/cws-heapbug_CAN-2005-0941.diff
-
-	# Workaround for bug #73940, may break debug use flag on ppc
-	if use ppc; then
-		epatch ${FILESDIR}/${PV}/STLport-vector.patch
-	fi
-	#Allow building with libxslt >= 1.1.15
-	use java || epatch ${FILESDIR}/${PV}/build-new-xslt.diff
-
-	#Fixes for nptl
-	if use nptl; then
-		epatch ${FILESDIR}/${PV}/nptl.patch
-	fi
-
-	#Fix for newer Freetype
-	epatch ${FILESDIR}/${PV}/freetype-217.patch
-
-	epatch ${FILESDIR}/${PV}/openoffice-java.patch
-
-	#GCC 3.4 fixes, also needed for hardened
-	epatch ${FILESDIR}/${PV}/gcc34.patch.bz2
-	epatch ${FILESDIR}/${PV}/gcc34-sal-link-to-libsupc++.diff
-	use !java && epatch ${FILESDIR}/${PV}/gcc34-nojava-fix.patch
-
-	#Fixes for hardened
-	if use hardened; then
-		epatch ${FILESDIR}/${PV}/pthreadlink-fix.patch
-		epatch ${FILESDIR}/${PV}/hardened-link.patch
-		epatch ${FILESDIR}/${PV}/pyunolink-fix.patch
-	fi
-
-	#Do our own branding by setting gentoo linux as the vendor
-	sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux," ${S}/offmgr/source/offapp/intro/ooo.src || die
-}
-
-get_EnvSet() {
-
-	# Determine what Env file we should be using (Az)
-	export LinuxEnvSet="LinuxIntelEnv.Set.sh"
-	use sparc && export LinuxEnvSet="LinuxSparcEnv.Set.sh"
-	use ppc && export LinuxEnvSet="LinuxPPCEnv.Set.sh"
-	use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set.sh"
-
-	# Get build specific stuff (Az)
-	export SOLVER="$(awk '/^UPD=/ {gsub(/\"/, ""); gsub(/UPD=/, ""); print $0}' ${LinuxEnvSet})"
-	export SOLPATH="$(awk '/^INPATH=/ {gsub(/\"/, ""); gsub(/INPATH=/, ""); print $0}' ${LinuxEnvSet})"
-}
-
-src_compile() {
-
-	unset LIBC
-	addpredict /bin
-	addpredict /root/.gconfd
-	export MYCONF=""
-
-	#Check if we use java
-	if use java
-	then
-		MYCONF="${MYCONF} --with-jdk-home=${JAVA_HOME}"
-	else
-		MYCONF="${MYCONF} --disable-java"
-	fi
-
-	#See if we use system-curl
-	if use curl
-	then
-		MYCONF="${MYCONF} --with-system-curl"
-	fi
-
-	#See if we use system-zlib
-	if use zlib
-	then
-		MYCONF="${MYCONF} --with-system-zlib"
-	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)
-	cd ${S}/config_office
-	rm -f config.cache || die
-	autoconf || die
-
-	if [ "OOLANGNAME" != "ENUS" ]; then
-		OOLANGNAME="${OOLANGNAME},ENUS"
-	fi
-
-	use sparc && MYCONF="${MYCONF} --disable-mozilla"
-
-	MYCONF="${MYCONF} --enable-libart \
-		--enable-libsn \
-		--with-lang=${OOLANGNAME} \
-		--without-fonts \
-		--with-system-freetype"
-
-	./configure ${MYCONF} || die
-
-	cd ${S}
-	get_EnvSet
-
-	# unpack help files if present
-	if [ -f ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz ]; then
-		einfo "Using helpcontent for ${OOLFULLNAME}"
-		mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/pck
-		tar -xzf ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck
-	fi
-
-	# Build as minimal as possible
-	export BUILD_MINIMAL="${OOLANGNO}"
-
-	# Embedded python dies without Home set
-	if test "z${HOME}" = "z"; then
-		export HOME=""
-	fi
-
-	#Get info for parallel build
-	export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-
-	if [ "${JOBS}" -gt 10 ]
-	then
-		export JOBS="10"
-		einfo "dmake fails with too much parallel jobs, so limiting to 10"
-	fi
-
-	export buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link"
-
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	if [ "${WANT_DISTCC}" == "true" ]
-	then
-		if [ "${JOBS}" -gt 1 ]
-		then
-			export buildcmd="${buildcmd} -P${JOBS}"
-			einfo "Using distcc, Good Luck"
-		fi
-	fi
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fomit-frame-pointer"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-fstack-protector"
-	filter-flags "-ftracer"
-	append-flags "-fno-strict-aliasing"
-	replace-flags "-O3" "-O2"
-	replace-flags "-Os" "-O2"
-
-	if [ "$(gcc-version)" == "3.2" ]; then
-		einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
-		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
-	fi
-
-	# Now for our optimization flags ...
-	export CXXFLAGS="${CXXFLAGS} -fno-for-scope -fpermissive -fno-rtti"
-	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
-		${S}/solenv/inc/unxlngi4.mk
-	perl -pi -e "s|^CFLAGSCXX=.*|CFLAGSCXX=${CXXFLAGS}|g" \
-		${S}/solenv/inc/unxlngi4.mk
-
-	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
-	then
-		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
-		export CCCOMP="$(tc-getCC)"
-		export CXXCOMP="$(tc-getCXX)"
-	fi
-
-	einfo "Bootstrapping OpenOffice.org..."
-	# Get things ready for bootstrap (Az)
-	chmod 0755 ${S}/solenv/bin/*.pl
-	# Bootstrap ...
-	./bootstrap || die
-
-	einfo "Building OpenOffice.org..."
-	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && LINK=g++ ${buildcmd}" > build.sh
-	sh build.sh || 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"
-	addpredict "/opt/OpenOffice.org/foo.tmp"
-	addpredict "/opt/OpenOffice.org/delme"
-
-	# The install part should now be relatively OK compared to
-	# what it was.  Basically we use autoresponse files to install
-	# unattended.  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 installation
-	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 || die
-
-	einfo "Installing OpenOffice.org into build root..."
-	dodir ${INSTDIR}
-	cd ${S}/instsetoo/${SOLPATH}/${OOLANGNO}/normal
-	./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
-
-	einfo "Removing build root from registry..."
-	# Remove totally useless stuff.
-	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh} || die
-	# 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
-
-	# Install user autoresponse file
-	insinto /etc/openoffice
-	sed -e "s|<pv>|${PV}|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
-	for app in calc draw impress math web writer setup padmin; do
-		dosym ooffice /usr/bin/oo${app}
-	done
-
-	einfo "Installing menu shortcuts..."
-	dodir /usr/share
-	cp -pPR ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
-
-	use kde && cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
-
-	for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
-		# We have to handle soffice and setup differently
-		sed -i -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
-		sed -i -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x}
-		# Now fix the rest
-		sed -i -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
-		echo "Categories=Application;Office;" >> ${x}
-		domenu ${x}
-		rm ${x}
-	done
-
-	# Remove unneeded stuff
-	rm -rf ${D}${INSTDIR}/share/cde || die
-
-	# Fix instdb.ins, to *not* install local copies of these
-	for entry in Kdeapplnk Kdemimetext Kdeicons Gnome_Apps Gnome_Icons Gnome2_Apps; do
-		perl -pi -e "/^File gid_File_Extra_$entry/ .. /^End/ and (\
-			s|^\tSize\s+\= .*|\tSize\t\t = 0;\r| or \
-			s|^\tArchiveFiles\s+\= .*|\tArchiveFiles\t = 0;\r| or \
-			s|^\tArchiveSize\s+\= .*|\tArchiveSize\t = 0;\r| or \
-			s|^\tContains\s+\= .*|\tContains\t = ();\r| or \
-			s|\t\t\t\t\t\".*|\r|g)" \
-			${D}${INSTDIR}/program/instdb.ins
-	done
-
-	# Make sure these do not get nuked.
-	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	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"
-}
-
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
deleted file mode 100644
index 7780b0016b89..000000000000
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.25 2006/01/21 20:47:48 suka Exp $
-
-inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
-
-IUSE="curl eds gnome gtk java kde ldap mozilla nas zlib xml2"
-
-MY_PV="${PV}.2"
-PATCHLEVEL="OOO680"
-SRC="OOO_2_0_0"
-S="${WORKDIR}/ooo-build-${MY_PV}"
-CONFFILE="${S}/distro-configs/Gentoo.conf.in"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-
-SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
-	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2
-	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
-	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	http://go-ooo.org/packages/libwpd/libwpd-0.8.3.tar.gz
-	kde? ( http://go-oo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2 )
-	http://go-oo.org/packages/SRC680/extras-2.tar.bz2"
-
-HOMEPAGE="http://go-oo.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
-
-RDEPEND="!app-office/openoffice-bin
-	!app-office/openoffice-ximian
-	|| ( (
-			x11-libs/libXaw
-			x11-libs/libXinerama
-		)
-		virtual/x11 )
-	virtual/libc
-	>=dev-lang/perl-5.0
-	gnome? ( >=x11-libs/gtk+-2.4
-		>=gnome-base/gnome-vfs-2.6
-		>=gnome-base/gconf-2.0 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	kde? ( kde-base/kdelibs )
-	mozilla? ( >=www-client/mozilla-1.7.10 )
-	>=x11-libs/startup-notification-0.5
-	>=media-libs/freetype-2.1.4
-	>=media-libs/fontconfig-2.2.0
-	media-libs/libpng
-	sys-devel/flex
-	sys-devel/bison
-	app-arch/zip
-	app-arch/unzip
-	dev-libs/expat
-	java? ( =virtual/jre-1.4* )
-	>=sys-devel/gcc-3.2.1
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
-
-DEPEND="${RDEPEND}
-	|| ( (
-			x11-libs/libXrender
-			x11-proto/printproto
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/xineramaproto
-		)
-		virtual/x11 )
-	net-print/cups
-	>=sys-apps/findutils-4.1.20-r1
-	app-shells/tcsh
-	dev-perl/Archive-Zip
-	dev-util/pkgconfig
-	dev-util/intltool
-	curl? ( >=net-misc/curl-7.9.8 )
-	nas? ( >=media-libs/nas-1.6 )
-	zlib? ( sys-libs/zlib )
-	sys-libs/pam
-	!dev-util/dmake
-	>=dev-lang/python-2.3.4
-	java? ( =virtual/jdk-1.4*
-		dev-java/ant-core
-		>=dev-java/java-config-1.2.11-r1 )
-	!java? ( dev-libs/libxslt
-		>=dev-libs/libxml2-2.0 )
-	ldap? ( net-nds/openldap )
-	xml2? ( >=dev-libs/libxml2-2.0 )"
-
-PROVIDE="virtual/ooo"
-
-pkg_setup() {
-
-	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. Also note that building OOo takes a lot of time and "
-	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
-	ewarn " the minimum requirements. If you have less, use openoffice-bin "
-	ewarn " instead. "
-	ewarn
-
-	strip-linguas af ar be_BY bg bn br ca cs cy da de el en en_GB en_US es et fi fr ga gu_IN he hi_IN hr hu it ja km ko lt nb ne nl nn ns pa_IN pl pt pt_BR ru sh_YU sk sl sr_CS sv th tn tr vi xh zh_CN zh_TW zu
-
-	if [ -z "${LINGUAS}" ]; then
-		export LINGUAS_OOO="en-US"
-		ewarn " To get a localized build, set the according LINGUAS variable(s). "
-		ewarn
-	else
-		export LINGUAS_OOO="${LINGUAS//en/en_US}"
-		export LINGUAS_OOO="${LINGUAS_OOO//en_US_GB/en_GB}"
-		export LINGUAS_OOO="${LINGUAS_OOO//en_US_US/en_US}"
-		export LINGUAS_OOO="${LINGUAS_OOO//_/-}"
-	fi
-
-	if use !java; then
-		ewarn " You are building with java-support disabled, this results in some "
-		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
-		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags. Also the xml2 use-flag is disabled with "
-		ewarn " -java to prevent build breakage. "
-		ewarn
-	elif use sparc; then
-		ewarn " Java support on sparc is very flaky, we don't recommend "
-		ewarn " building openoffice this way."
-		ebeep 5
-		epause 10
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ooo-build-${MY_PV}.tar.gz
-
-	#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
-	use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"
-
-	#Use flag checks
-	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
-	use nas && echo "--with-system-nas" >> ${CONFFILE} || echo "--without-nas" >> ${CONFFILE}
-
-	echo "`use_with curl system-curl`" >> ${CONFFILE}
-	echo "`use_with xml2 system-libxml`" >> ${CONFFILE}
-	echo "`use_with zlib system-zlib`" >> ${CONFFILE}
-
-	echo "`use_with mozilla system-mozilla`" >> ${CONFFILE}
-	echo "`use_enable mozilla`" >> ${CONFFILE}
-
-	echo "`use_enable ldap openldap`" >> ${CONFFILE}
-	echo "`use_enable eds evolution2`" >> ${CONFFILE}
-	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
-	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
-
-}
-
-src_compile() {
-
-	unset LIBC
-	addpredict "/bin"
-	addpredict "/root/.gconfd"
-	addpredict "/root/.gnome"
-
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	if [ "${WANT_DISTCC}" == "true" ]; then
-		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-	fi
-
-	# Make sure gnome-users get gtk-support
-	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
-
-	cd ${S}
-	autoconf || die
-	./configure ${MYCONF} \
-		--with-distro="${DISTRO}" \
-		--with-vendor="Gentoo" \
-		--with-arch="${ARCH}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--with-binsuffix="2" \
-		--with-installed-ooo-dirname="openoffice" \
-		"${GTKFLAG}" \
-		`use_enable kde` \
-		--disable-access \
-		--disable-mono \
-		--disable-cairo \
-		--disable-post-install-scripts \
-		--mandir=/usr/share/man \
-		|| die "Configuration failed!"
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fomit-frame-pointer"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-fstack-protector"
-	filter-flags "-ftracer"
-	append-flags "-fno-strict-aliasing"
-	replace-flags "-O3" "-O2"
-	replace-flags "-Os" "-O2"
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CFLAGS}"
-
-	einfo "Building OpenOffice.org..."
-	use kde && set-kdedir 3
-	make || die "Build failed"
-
-}
-
-src_install() {
-
-	einfo "Preparing Installation"
-	make DESTDIR=${D} install || die "Installation failed!"
-
-	# Install corrected Symbol Font
-	insinto /usr/share/fonts/TTF/
-	doins fonts/*.ttf
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	[ -x /sbin/chpax ] && [ -e /usr/lib/openoffice/program/soffice.bin ] && chpax -zm /usr/lib/openoffice/program/soffice.bin
-
-	einfo " To start OpenOffice.org, run:"
-	einfo
-	einfo " $ ooffice2"
-	einfo
-	einfo " Also, for individual components, you can use any of:"
-	einfo
-	einfo " oobase2, oocalc2, oodraw2, oofromtemplate2, ooimpress2, oomath2,"
-	einfo " ooweb2 or oowriter2"
-}