cleanup

(Portage version: 2.0.51.22-r2)

15 files changed, 0 insertions, 1163 deletions

diff --git a/app-office/openoffice-ximian/files/1.1.3/STLport-vector.patch b/app-office/openoffice-ximian/files/1.1.3/STLport-vector.patch
deleted file mode 100644
index 1892f1cabeed..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/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-ximian/files/1.1.3/cws-heapbug_CAN-2005-0941.diff b/app-office/openoffice-ximian/files/1.1.3/cws-heapbug_CAN-2005-0941.diff
deleted file mode 100644
index 4ad65421c1a2..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/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-ximian/files/1.1.3/gcc34-gnome.patch b/app-office/openoffice-ximian/files/1.1.3/gcc34-gnome.patch
deleted file mode 100644
index 5ca4ee835c18..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/gcc34-gnome.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ucb/source/ucp/gvfs/directory.hxx   2004-11-09 17:19:07.354395360 +0100
-+++ ucb/source/ucp/gvfs/directory.hxx   2004-11-09 17:24:48.330559104 +0100
-@@ -37,7 +37,7 @@
- };
- 
- 
--struct gvfs::DataSupplier_Impl;
-+struct DataSupplier_Impl;
- class DataSupplier : public ucb::ResultSetDataSupplier
- {
- private:
---- ucb/source/ucp/gvfs/makefile.mk    2004-11-09 18:36:49.317669216 +01
-+++ ucb/source/ucp/gvfs/makefile.mk    2004-11-09 18:44:41.145940416 +01
-@@ -4,6 +4,8 @@
- ENABLE_EXCEPTIONS=TRUE
- NO_BSYMBOLIC=TRUE
- 
-+LINKFLAGSDEFS = # do not fail with missing symbols
-+
- # Version
- UCPGVFS_MAJOR=1
- 
diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34-nojava-fix.patch b/app-office/openoffice-ximian/files/1.1.3/gcc34-nojava-fix.patch
deleted file mode 100644
index 16cf1f495870..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/gcc34-nojava-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- sfx2/source/appl/appcfg.cxx	22 Jul 2003 11:08:41 -0000	1.47
-+++ sfx2/source/appl/appcfg.cxx	7 Nov 2004 15:46:47 -0000
-@@ -1129,6 +1129,7 @@
- 	// AutoSave starten oder anhalten
- 	UpdateAutoSave_Impl();
- 
-+#ifdef SOLAR_JAVA
- 	// INet Session neu aufsetzen
- 	if ( bResetSession )
- 	{
-@@ -1141,6 +1142,7 @@
- 			DBG_ERRORFILE( "SjApplet2::settingsChanged() throws an exception" );
- 		}
- 	}
-+#endif
- 
- 	// geaenderte Daten speichern
- 	aInetOptions.flush();
diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch b/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch
deleted file mode 100644
index 3e3360b2f422..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./sal/osl/unx/process.c.orig	2003-07-02 15:34:17.000000000 +0200
-+++ ./sal/osl/unx/process.c	2004-11-01 15:16:40.976815960 +0100
-@@ -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-ximian/files/1.1.3/gcc34.patch.bz2 b/app-office/openoffice-ximian/files/1.1.3/gcc34.patch.bz2
deleted file mode 100644
index d2c707d90364..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/gcc34.patch.bz2
+++ /dev/null
diff --git a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.6.patch b/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.6.patch
deleted file mode 100644
index 8ba0713be41a..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- patches/OOO_1_1_3/apply 2004-08-20 23:49:28.172509416 +0200
-+++ patches/OOO_1_1_3/apply 2004-08-20 23:49:28.174509112 +0200
-@@ -27,6 +27,9 @@
- NLD  : NovellBase, NLDOnly
- PLD  : PLDOnly, LinuxCommon, KDECommon, GlobalDesktopFiles, NonDebianCommon
- KDE  : LinuxCommon, KDEOnly
-+Gentoo : LinuxCommon, GlobalDesktopFiles, NonDebianCommon
-+GentooGNOME : LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonDebianCommon, NovellOnly
-+GentooKDE : LinuxCommon, KDECommon, GlobalDesktopFiles, NonDebianCommon
- 
- # Odd one, very few patches:
- Ark : ArkOnly, LinuxCommon, GlobalDesktopFiles, ODKFixes, VBABits
diff --git a/app-office/openoffice-ximian/files/1.1.3/gentoo-splash.diff b/app-office/openoffice-ximian/files/1.1.3/gentoo-splash.diff
deleted file mode 100644
index 164b125b1aad..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/gentoo-splash.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: offmgr/source/offapp/intro/ooo.src
-===================================================================
-RCS file: /cvs/framework/offmgr/source/offapp/intro/Attic/ooo.src,v
-retrieving revision 1.44.16.7
-diff -u -p -u -r1.44.16.7 ooo.src
---- offmgr/source/offapp/intro/ooo.src	19 Feb 2004 15:38:23 -0000	1.44.16.7
-+++ offmgr/source/offapp/intro/ooo.src	15 Mar 2004 23:07:54 -0000
-@@ -76,10 +76,10 @@
- #include "app.hrc"
- #include "intro.hrc"
- 
--#ifdef BUILD_SPECIAL
--#define OOO_VENDOR "Sun Microsystems Inc."
-+#if 1
-+#define OOO_VENDOR "Gentoo Foundation"
- #define OOO_LICENSE "LGPL"
--#define OOO_INTRO "openintro_sun.bmp"
-+#define OOO_INTRO "openintro_gentoo.bmp"
- #else
- //#define OOO_VENDOR "my company"
- #define OOO_LICENSE "LGPL"
-@@ -88,7 +88,7 @@
- 
- Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
- {
--	File = "openabout.bmp" ;
-+	File = "openabout_gentoo.bmp" ;
- };
- 
- Bitmap RID_DEFAULTINTRO
diff --git a/app-office/openoffice-ximian/files/1.1.3/getcompver.awk.patch b/app-office/openoffice-ximian/files/1.1.3/getcompver.awk.patch
deleted file mode 100644
index 0fbeb07ee3d6..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/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-ximian/files/1.1.3/newstlportfix.patch b/app-office/openoffice-ximian/files/1.1.3/newstlportfix.patch
deleted file mode 100644
index f88927669a7b..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/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-ximian/files/1.1.3/ximian-openoffice.applications b/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.applications
deleted file mode 100644
index 5e56216d203a..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.applications
+++ /dev/null
@@ -1,8 +0,0 @@
-ximian-openoffice
-        command=xooffice
-        name=Ximian OpenOffice.org
-        can_open_multiple_files=true
-        expects_uris=true
-        uses_gnomevfs=true
-        requires_terminal=false
-        mime_types=application/vnd.lotus-1-2-3,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict
diff --git a/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.keys b/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.keys
deleted file mode 100644
index a669749676f2..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.keys
+++ /dev/null
@@ -1,129 +0,0 @@
-application/vnd.lotus-1-2-3
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.ms-excel
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/rtf
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/msword
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.ms-powerpoint
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.calc
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.chart
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.draw
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.impress
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.mail
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.math
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.writer
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.calc
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.calc.template
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.draw
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.draw.template
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.impress
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.impress.template
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.math
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.writer
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.writer.global
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.writer.template
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-image/x-emf
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-image/x-pcx
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-image/x-photo-cd
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-image/x-pict
-	short_list_application_ids_for_novice_user_level=ximian-openoffice
-	short_list_application_ids_for_intermediate_user_level=ximian-openoffice
-	short_list_application_ids_for_advanced_user_level=ximian-openoffice
diff --git a/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3 b/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3
deleted file mode 100644
index 391327c91680..000000000000
--- a/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3
+++ /dev/null
@@ -1,175 +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 ~/.xversionrc
-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/.xopenoffice/1.1.2" ] ; then
-     mv $HOME/.xopenoffice/1.1.2 $HOME/.xopenoffice/1.1.3
-     sed -i -e s/1.1.2/1.1.3/g $HOME/.xversionrc
-     sed -i -e s/1.1.2/1.1.3/g $HOME/.xopenoffice/1.1.3/user/basic/*.xlc
-     echo "Your user install dir has been moved over to the new version"
-fi
-
-if [ ! -f "/proc/version" ] ; then
-    echo "--- Warning - OO.o will not work without a mounted /proc filesystem ---"
-fi
-
-###
-### Get user settings directory from ~/.xversionrc and echo directory name to stdout
-### get_settings_dir <Version>
-### return: 0 - directory found, 
-###         1 - ~/.xversionrc non existent
-###         2 - entry exists in ~/.xversionrc but directory not found
-###         3 - ~/.xversionrc exists but no entry found
-get_settings_dir()
-{
-  [ -r ${HOME}/.xversionrc ] || exit 1
-  # warning, .xversionrc is DOS encoded so strip ^M
-  settings_dir="`tr -d  '\r' < ~/.xversionrc | 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
-  # .xversionrc contains a version yet the directory does not exist
-    echo "I'm confused because I can't find OpenOffice's user files."
-    echo "Your ~/.xversionrc file tells they should be under $OOHOME,"
-    echo "but they are not. Please fix the situation manually."
-    echo "You may want to edit ~/.xversionrc 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
-
-## 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/ximian-openoffice/autoresponse-<pv>.conf ] && \
-    grep -q DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf ; then
-
-      # first install
-      OOHOME=`grep DESTINATIONPATH /etc/ximian-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 ~/.xversionrc, "
-        echo "yet the directory $OOHOME exists." 
-        echo "Please remove $OOHOME and try again."
-        exit 1
-      fi
-
-      echo "running openoffice.org setup..."
-      if ! /opt/Ximian-OpenOffice/program/setup -R:/etc/ximian-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/ximian-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
-    xoocalc) set -- private:factory/scalc;;
-    xoodraw) set -- private:factory/sdraw;;
-    xooimpress) set -- private:factory/simpress;;
-    xoomath) set -- private:factory/smath;;
-    xooweb) set -- private:factory/swriter/web;;
-    xoowriter) set -- private:factory/swriter;;
-    xoomaster) set -- private:factory/swriter/Global;;
-  esac
-fi
-
-## Previous dead installation?
-[ -d $HOME/.xopenoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.xopenoffice/user - this is no longer used"
-
-if [ ! -s $OOHOME/setup ]; then
-	echo "${OOHOME}/setup links to nothing, resetting link"
-	ln -sf /opt/Ximian-OpenOffice/program/setup ${OOHOME}/setup
-fi
-if [ ! -s $OOHOME/soffice ]; then
-	echo "${OOHOME}/soffice links to nothing, resetting link"
-	ln -sf /opt/Ximian-OpenOffice/program/soffice ${OOHOME}/soffice
-fi
-if [ ! -s $OOHOME/spadmin ]; then
-	echo "${OOHOME}/spadmin links to nothing, resetting link"
-	ln -sf /opt/Ximian-OpenOffice/program/soffice ${OOHOME}/spadmin
-fi
-
-
-##
-## That's it. Launch the beast (with the given args)
-##
-LANG=$LOCALE
-export LANG
-case `basename $0` in
-    xoosetup) exec "$OOHOME/setup"
-    ;;
-    xoopadmin) exec "$OOHOME/spadmin"
-    ;;
-    *) exec "$OOHOME/soffice" "$@"
-    ;;
-esac
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.6-r1 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.6-r1
deleted file mode 100644
index 843f23ef48c1..000000000000
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.6-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 9df288bb534964d4b96efdf7bf029456 OOo_1.1.3-1_source.tar.gz 215360913
-MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958
-MD5 ccc301fcf65a9991d3ec10c905173c58 ooo-build-1.3.6.tar.gz 3154954
-MD5 c3d8c9f5ae2abbe1b7091817265b9ef3 libwpd-snap-20040823.tar.gz 447710
-MD5 07af8dbf461df3e01a30124009f3e1ec OOo-gentoo-splash-1.1.tar.bz2 57631
-MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326
-MD5 05ff784fff01c54cd3dd7b975b46bae2 ooo-KDE_icons-OOO_1_1-0.3.tar.gz 1017540
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.ebuild
deleted file mode 100644
index 7ebb8189e6f0..000000000000
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,585 +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-ximian/openoffice-ximian-1.3.6-r1.ebuild,v 1.4 2005/05/03 06:18:24 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 flag-o-matic eutils toolchain-funcs
-
-IUSE="gnome kde java curl zlib nptl"
-
-OO_VER=1.1.3
-PATCHLEVEL=OOO_1_1_3
-ICON_VER=OOO_1_1-10
-KDE_ICON_VER=OOO_1_1-0.3
-KDE_ICON_PATH=documents/159/1975
-INSTDIR="/opt/Ximian-OpenOffice"
-PATCHDIR=${WORKDIR}/ooo-build-${PV}
-S="${WORKDIR}/OOo_${OO_VER}_src"
-DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite."
-SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}-1_source.tar.gz
-	http://www.stlport.org/archive/STLport-4.6.2.tar.gz
-	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
-	http://ooo.ximian.com/packages/libwpd-snap-20040823.tar.gz
-	mirror://gentoo/OOo-gentoo-splash-1.1.tar.bz2
-	gnome? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )
-	!kde? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )
-	kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )"
-
-HOMEPAGE="http://ooo.ximian.com"
-
-LICENSE="|| ( LGPL-2  SISSL-1.1 )"
-SLOT="0"
-KEYWORDS="~x86 ppc"
-
-RDEPEND="!app-office/openoffice-ximian-bin
-	virtual/x11
-	virtual/libc
-	virtual/lpr
-	!=sys-libs/glibc-2.3.1*
-	>=dev-lang/perl-5.0
-	gnome? ( >=x11-libs/gtk+-2.0
-		>=gnome-base/gnome-vfs-2.0
-		>=dev-libs/libxml2-2.0 )
-	kde? ( kde-base/kdelibs )
-	>=media-libs/libart_lgpl-2.3.13
-	>=x11-libs/startup-notification-0.5
-	>=media-libs/freetype-2.1.4
-	media-libs/fontconfig
-	media-gfx/imagemagick
-	media-libs/libpng
-	sys-devel/flex
-	sys-devel/bison
-	app-arch/zip
-	app-arch/unzip
-	dev-libs/expat
-	java? ( >=virtual/jdk-1.4.1 )
-	ppc? ( >=sys-libs/glibc-2.2.5-r7
-	>=sys-devel/gcc-3.2.1 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/findutils-4.1.20-r1
-	app-shells/tcsh
-	dev-util/pkgconfig
-	dev-util/intltool
-	curl? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-	sys-libs/pam
-	!dev-util/dmake
-	!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 " This version should now also compile fine with gcc 3.4.x "
-	ewarn " If you encounter problems in relation to this, please report "
-	ewarn " them to http://bugs.gentoo.org "
-	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.					               "
-
-	set_languages
-}
-
-set_languages () {
-
-	if [ -z "$LANGUAGE" ]; then
-		LANGUAGE=01
-	fi
-
-	case "$LANGUAGE" in
-		01 | ENUS ) LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default)"
-			;;
-		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
-			;;
-		* )
-			eerror "Unknown LANGUAGE setting!"
-			eerror
-			eerror "Known LANGUAGE settings are:"
-			eerror "  ENUS | PORT | RUSS | GREEK | DTCH | FREN | SPAN | FINN | CAT | ITAL |"
-			eerror "  CZECH | SLOVAK | DAN | SWED | POL | GER | PORTBR | THAI | ESTONIAN |"
-			eerror "  JAPN | KOREAN | CHINSIM | CHINTRAD | TURK | HINDI | ARAB | HEBREW"
-			die
-			;;
-	esac
-}
-
-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}
-
-	#Beginnings of our own patchset
-	cd ${PATCHDIR}
-	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
-
-	#Still needed: The STLport patch
-	cd ${S}
-	cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die
-	epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch
-
-	# fix for bug #82385
-	epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch
-
-	# Security fix, bug #88863
-	epatch ${FILESDIR}/${OO_VER}/cws-heapbug_CAN-2005-0941.diff
-
-	if use ppc; then
-		epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch
-	fi
-
-	#Add our own splash screen
-	epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff
-
-	#Detect which look and patchset we are using
-	export DISTRO="Gentoo"
-	export MYCONF=""
-	export ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
-
-	if use gnome; then
-		export DISTRO="GentooGNOME"
-		export MYCONF="--enable-gtk"
-	fi
-
-	if use kde; then
-		export MYCONF="${MYCONF} --enable-kde"
-		if use !gnome; then
-			export DISTRO="GentooKDE"
-			export MYCONF="--enable-kde"
-			export ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
-		fi
-	fi
-
-	#Finally apply the patches
-	einfo "Applying Ximian OO.org Patches"
-	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
-
-	# GCC 3.4.x fixes
-	if [ "$(gcc-version)" = "3.4" ]
-	then
-		epatch ${FILESDIR}/${OO_VER}/gcc34.patch.bz2
-		use !java && epatch ${FILESDIR}/${OO_VER}/gcc34-nojava-fix.patch
-		use nptl && epatch ${FILESDIR}/${OO_VER}/gcc34-nptl-fix.patch
-		use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch
-	fi
-
-	einfo "Installing / Scaling Icons"
-	${PATCHDIR}/bin/scale-icons ${S} || die
-	cp -af ${ICONDIR}/* ${S} || die
-
-	einfo "Copying splash screens in place"
-	cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die
-
-	einfo "Copying libpwd tarball in build dir"
-	mkdir -p ${S}/libwpd/download/ || die
-	cp -af ${DISTDIR}/libwpd-snap-20040823.tar.gz ${S}/libwpd/download/ || die
-
-	einfo "Munging font mappings ..."
-	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die
-	echo "done munging fonts."
-}
-
-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
-	local buildcmd=""
-
-	# dmake security patch
-	cd ${S}/dmake
-	autoconf || die
-
-	#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)
-	einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..."
-	cd ${S}/config_office
-	rm -f config.cache || die
-	autoconf || die
-	MYCONF="${MYCONF} --enable-libart \
-		--enable-libsn \
-		--enable-crashdump=no \
-		--with-lang=ENUS,${LANGNAME} \
-		--without-fonts \
-		--disable-rpath \
-		--enable-fontconfig \
-		--with-system-freetype \
-		--with-system-xrender \
-		--disable-mozilla"
-
-	./configure ${MYCONF} || die
-
-	cd ${S}
-	get_EnvSet
-
-	# Build as minimal as possible
-	export BUILD_MINIMAL="${LANGNO}"
-
-	#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 ARCH_FLAGS="${CFLAGS}"
-
-	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>/.xopenoffice/<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 Ximian-OpenOffice.org into build root..."
-	dodir ${INSTDIR}
-	cd ${S}/instsetoo/${SOLPATH}/${LANGNO}/normal
-	./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
-
-	#Fix for parallel install
-	sed -i -e s/sversionrc/xversionrc/g ${D}${INSTDIR}/program/bootstraprc ${D}${INSTDIR}/program/instdb.ins || die
-
-	echo
-	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
-
-	# Fix symlinks
-	dosym program/setup ${INSTDIR}/setup
-
-	# Install user autoresponse file
-	insinto /etc/ximian-openoffice
-	sed -e "s|<pv>|${OO_VER}|g" ${T}/rsfile-local > ${T}/autoresponse-${OO_VER}.conf
-	doins ${T}/autoresponse-${OO_VER}.conf
-
-	# Install wrapper script
-	exeinto /usr/bin
-	sed -e "s|<pv>|${OO_VER}|g" \
-		${FILESDIR}/${OO_VER}/xooffice-wrapper-1.3 > ${T}/xooffice
-	doexe ${T}/xooffice
-
-	# Component symlinks
-	for app in calc draw impress html math writer setup; do
-		dosym xooffice /usr/bin/xoo${app}
-	done
-
-	# Install icons and menu shortcuts
-	cd ${PATCHDIR}/desktop/
-	insinto /usr/share/pixmaps
-	doins *.png
-
-	einfo "Installing menu shortcuts"
-	for menu in drawing presentation spreadsheet textdoc; do
-		intltool-merge -d ../po ${menu}.desktop.in xoo-${menu}.desktop;
-	done
-	sed -i -e s/'=oo'/'=xoo'/g *.desktop
-	insinto /usr/share/applications
-	doins *.desktop
-
-	einfo "Installing mime info (need \"gnome\" or \"kde\" in USE)..."
-	if use gnome
-	then
-		insinto /usr/share/application-registry
-		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.applications
-		insinto /usr/share/mime-info
-		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
-	fi
-
-	if use kde
-	then
-		insinto /usr/share/mimelnk/application
-		doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/*
-	fi
-
-	# Install corrected Symbol Font
-	insinto /usr/share/fonts/TTF/
-	doins ${PATCHDIR}/fonts/*.ttf
-
-	# 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() {
-
-	einfo " To start Ximian-OpenOffice.org, run:"
-	einfo
-	einfo "   $ xooffice"
-	einfo
-	einfo " Also, for individual components, you can use any of:"
-	einfo
-	einfo "   xoocalc, xoodraw, xooimpress, xoomath, xooweb or xoowriter"
-}