clean up old version

author: Andreas Proschofsky <suka@gentoo.org> 2004-07-02 07:54:07 +0000
committer: Andreas Proschofsky <suka@gentoo.org> 2004-07-02 07:54:07 +0000
commit: b795fbba83af3fa12173fff3378748caa710682b (patch)
tree: 1660009750c21a184c84811a3b52f5ac2bf95604 /app-office/openoffice-ximian
parent: virtual/glibc -> virtual/libc (Manifest recommit) (diff)
download: gentoo-2-b795fbba83af3fa12173fff3378748caa710682b.tar.gz
gentoo-2-b795fbba83af3fa12173fff3378748caa710682b.tar.bz2
gentoo-2-b795fbba83af3fa12173fff3378748caa710682b.zip
15 files changed, 0 insertions, 2085 deletions
diff --git a/app-office/openoffice-ximian/files/1.1.0/build.patch b/app-office/openoffice-ximian/files/1.1.0/build.patch
deleted file mode 100644
index 3879caf2e4a5..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- solenv/bin/build	2004-04-11 12:13:16.296275784 +0000
-+++ solenv/bin/build.pl	2004-04-11 12:13:37.367072536 +0000
-@@ -1,6 +1,4 @@
--:
--eval 'exec perl -S $0 ${1+"$@"}'
--    if 0;
-+#!/usr/bin/perl
- #*************************************************************************
- #
- #   $RCSfile: build.patch,v $
diff --git a/app-office/openoffice-ximian/files/1.1.0/config.patch b/app-office/openoffice-ximian/files/1.1.0/config.patch
deleted file mode 100644
index 190b28d4c782..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- config_office/configure.in  2003-08-13 17:14:51.000000000 +0200
-+++ config_office/configure.in  2003-08-13 17:14:51.000000000 +0200
-@@ -499,11 +499,6 @@
- 
-    if test "$_gcc_major" = "3"; then
-       USE_GCC3="TRUE"
--      if test "$_gcc_longver"  -eq "030203"; then
--		 if test ENABLE_SYMBOLS -eq "SMALL"; then
--           AC_MSG_ERROR([version "$_gcc_version" gives internal error with small.])
--		 fi
--      fi
-    else
-       USE_GCC3="FALSE"
-       if test "$_gcc_longver"  -lt "029502"; then
diff --git a/app-office/openoffice-ximian/files/1.1.0/neon.patch b/app-office/openoffice-ximian/files/1.1.0/neon.patch
deleted file mode 100644
index d68adb2eb353..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/neon.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- /work/ooo/gnome-ooo/openoffice/build/OOO_1_1_1/neon/neon.patch	2004-03-19 17:32:52.000000000 -0500
-+++ neon/neon.patch	2004-04-05 12:38:42.000000000 -0400
-@@ -135,8 +134,8 @@
- ! #define read _read
- ! 
- ! #endif
--*** misc/neon-0.23.5/src/makefile.mk	Tue Oct 22 17:55:55 2002
----- misc/build/neon-0.23.5/src/makefile.mk	Tue Oct 22 17:35:49 2002
-+*** misc/neon-0.23.5/src/makefile.mk	2004-04-05 12:38:37.706437510 -0400
-+--- misc/build/neon-0.23.5/src/makefile.mk	2004-04-05 12:21:47.810143789 -0400
- ***************
- *** 1 ****
- ! dummy
-@@ -190,8 +189,173 @@
- ! # --- Targets ------------------------------------------------------
- ! 
- ! .INCLUDE :  target.mk
--*** misc/neon-0.23.5/src/ne_props.c	Sun Jul 14 13:18:06 2002
----- misc/build/neon-0.23.5/src/ne_props.c	Tue Oct 22 17:35:49 2002
-+*** misc/neon-0.23.5/src/ne_207.c	2002-06-23 10:04:36.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_207.c	2004-04-05 12:38:18.221460697 -0400
-+***************
-+*** 1,6 ****
-+  /* 
-+     WebDAV 207 multi-status response handling
-+!    Copyright (C) 1999-2002, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+--- 1,6 ----
-+  /* 
-+     WebDAV 207 multi-status response handling
-+!    Copyright (C) 1999-2004, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+***************
-+*** 358,369 ****
-+  	if (ne_get_status(req)->code == 207) {
-+  	    if (!ne_xml_valid(p)) { 
-+  		/* The parse was invalid */
-+! 		ne_set_error(sess, ne_xml_get_error(p));
-+  		ret = NE_ERROR;
-+  	    } else if (ctx.is_error) {
-+  		/* If we've actually got any error information
-+  		 * from the 207, then set that as the error */
-+! 		ne_set_error(sess, ctx.buf->data);
-+  		ret = NE_ERROR;
-+  	    }
-+  	} else if (ne_get_status(req)->klass != 2) {
-+--- 358,369 ----
-+  	if (ne_get_status(req)->code == 207) {
-+  	    if (!ne_xml_valid(p)) { 
-+  		/* The parse was invalid */
-+! 		ne_set_error(sess, "%s", ne_xml_get_error(p));
-+  		ret = NE_ERROR;
-+  	    } else if (ctx.is_error) {
-+  		/* If we've actually got any error information
-+  		 * from the 207, then set that as the error */
-+! 		ne_set_error(sess, "%s", ctx.buf->data);
-+  		ret = NE_ERROR;
-+  	    }
-+  	} else if (ne_get_status(req)->klass != 2) {
-+*** misc/neon-0.23.5/src/ne_auth.c	2002-10-07 16:33:17.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_auth.c	2004-04-05 12:38:18.223460387 -0400
-+***************
-+*** 908,914 ****
-+      if (areq->auth_info_hdr != NULL && 
-+  	verify_response(areq, sess, areq->auth_info_hdr)) {
-+  	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
-+! 	ne_set_error(sess->sess, _(sess->spec->fail_msg));
-+  	ret = NE_ERROR;
-+      } else if (status->code == sess->spec->status_code && 
-+  	       areq->auth_hdr != NULL) {
-+--- 908,914 ----
-+      if (areq->auth_info_hdr != NULL && 
-+  	verify_response(areq, sess, areq->auth_info_hdr)) {
-+  	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
-+! 	ne_set_error(sess->sess, "%s", _(sess->spec->fail_msg));
-+  	ret = NE_ERROR;
-+      } else if (status->code == sess->spec->status_code && 
-+  	       areq->auth_hdr != NULL) {
-+*** misc/neon-0.23.5/src/ne_compress.c	2002-09-18 16:50:34.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_compress.c	2004-04-05 12:38:18.225460077 -0400
-+***************
-+*** 1,6 ****
-+  /* 
-+     Handling of compressed HTTP responses
-+!    Copyright (C) 2001-2002, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+--- 1,6 ----
-+  /* 
-+     Handling of compressed HTTP responses
-+!    Copyright (C) 2001-2004, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+***************
-+*** 252,258 ****
-+  	     * doesn't work, and this does, but I have no idea why..
-+  	     * Google showed me the way. */
-+  	    if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) {
-+! 		ne_set_error(ctx->session, ctx->zstr.msg);
-+  		ctx->state = NE_Z_ERROR;
-+  		return;
-+  	    }
-+--- 252,258 ----
-+  	     * doesn't work, and this does, but I have no idea why..
-+  	     * Google showed me the way. */
-+  	    if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) {
-+! 		ne_set_error(ctx->session, "%s", ctx->zstr.msg);
-+  		ctx->state = NE_Z_ERROR;
-+  		return;
-+  	    }
-+*** misc/neon-0.23.5/src/ne_locks.c	2002-08-05 16:10:53.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_locks.c	2004-04-05 12:38:18.227459766 -0400
-+***************
-+*** 723,729 ****
-+  	}
-+  	else if (parse_failed) {
-+  	    ret = NE_ERROR;
-+! 	    ne_set_error(sess, ne_xml_get_error(parser));
-+  	}
-+  	else if (ne_get_status(req)->code == 207) {
-+  	    ret = NE_ERROR;
-+--- 723,729 ----
-+  	}
-+  	else if (parse_failed) {
-+  	    ret = NE_ERROR;
-+! 	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
-+  	}
-+  	else if (ne_get_status(req)->code == 207) {
-+  	    ret = NE_ERROR;
-+***************
-+*** 792,798 ****
-+      if (ret == NE_OK && ne_get_status(req)->klass == 2) {
-+  	if (parse_failed) {
-+  	    ret = NE_ERROR;
-+! 	    ne_set_error(sess, ne_xml_get_error(parser));
-+  	}
-+  	else if (ne_get_status(req)->code == 207) {
-+  	    ret = NE_ERROR;
-+--- 792,798 ----
-+      if (ret == NE_OK && ne_get_status(req)->klass == 2) {
-+  	if (parse_failed) {
-+  	    ret = NE_ERROR;
-+! 	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
-+  	}
-+  	else if (ne_get_status(req)->code == 207) {
-+  	    ret = NE_ERROR;
-+*** misc/neon-0.23.5/src/ne_props.c	2002-07-14 07:18:06.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_props.c	2004-04-05 12:38:27.458027606 -0400
-+***************
-+*** 1,6 ****
-+  /* 
-+     WebDAV property manipulation
-+!    Copyright (C) 2000-2002, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+--- 1,6 ----
-+  /* 
-+     WebDAV property manipulation
-+!    Copyright (C) 2000-2004, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+***************
-+*** 136,142 ****
-+      if (ret == NE_OK && ne_get_status(req)->klass != 2) {
-+  	ret = NE_ERROR;
-+      } else if (!ne_xml_valid(handler->parser)) {
-+! 	ne_set_error(handler->sess, ne_xml_get_error(handler->parser));
-+  	ret = NE_ERROR;
-+      }
-+  
-+--- 136,142 ----
-+      if (ret == NE_OK && ne_get_status(req)->klass != 2) {
-+  	ret = NE_ERROR;
-+      } else if (!ne_xml_valid(handler->parser)) {
-+! 	ne_set_error(handler->sess, "%s", ne_xml_get_error(handler->parser));
-+  	ret = NE_ERROR;
-+      }
-+  
- ***************
- *** 457,462 ****
- --- 457,465 ----
-@@ -204,3 +368,37 @@
-       /* If we get a non-2xx response back here, we wipe the value for
-        * each of the properties in this propstat, so the caller knows to
-        * look at the status instead. It's annoying, since for each prop
-+*** misc/neon-0.23.5/src/ne_xml.c	2002-10-08 15:11:31.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_xml.c	2004-04-05 12:38:18.232458991 -0400
-+***************
-+*** 1,6 ****
-+  /* 
-+     Higher Level Interface to XML Parsers.
-+!    Copyright (C) 1999-2002, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+--- 1,6 ----
-+  /* 
-+     Higher Level Interface to XML Parsers.
-+!    Copyright (C) 1999-2004, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+***************
-+*** 860,866 ****
-+  
-+  void ne_xml_set_error(ne_xml_parser *p, const char *msg)
-+  {
-+!     ne_snprintf(p->error, ERR_SIZE, msg);
-+  }
-+  
-+  #ifdef HAVE_LIBXML
-+--- 860,866 ----
-+  
-+  void ne_xml_set_error(ne_xml_parser *p, const char *msg)
-+  {
-+!     ne_snprintf(p->error, ERR_SIZE, "%s", msg);
-+  }
-+  
-+  #ifdef HAVE_LIBXML
diff --git a/app-office/openoffice-ximian/files/1.1.0/newstlportfix.patch b/app-office/openoffice-ximian/files/1.1.0/newstlportfix.patch
deleted file mode 100644
index 9b195c50e49f..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/newstlportfix.patch
+++ /dev/null
@@ -1,301 +0,0 @@
---- stlport/STLport-4.5.3.patch	Thu Jan  1 02:00:00 1970
-+++ stlport/STLport-4.5.3.patch	Tue Sep 10 22:50:10 2002
-@@ -0,0 +1,247 @@
-+*** misc/STLport-4.5.3/src/fstream.cpp	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/fstream.cpp	Fri Jan 11 17:22:40 2002
-+***************
-+*** 293,299 ****
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern _CRTIMP ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+--- 293,299 ----
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern __declspec( dllimport ) ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+*** misc/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:48:44 2002
-+--- misc/build/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:47:21 2002
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,59 ----
-+! #
-+! # Note : this makefile is for gcc-3 !
-+! #
-+! 
-+! #
-+! # compiler
-+! #
-+! CC = $(CCCOMP) 
-+! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions
-+! 
-+! #
-+! # Basename for libraries
-+! #
-+! LIB_BASENAME = libstlport_gcc
-+! 
-+! #
-+! # guts for common stuff
-+! #
-+! #
-+! LINK=ar cr
-+! DYN_LINK=$(CXX) --fexceptions -shared -o
-+! 
-+! OBJEXT=o
-+! DYNEXT=so
-+! STEXT=a
-+! RM=rm -rf
-+! PATH_SEP=/
-+! MKDIR=mkdir -p
-+! COMP=GCC$(ARCH)
-+! INSTALL_STEP = install_unix 
-+! 
-+! all:  all_dynamic all_static symbolic_links 
-+! 
-+! include common_macros.mak
-+! 
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+! 
-+! CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+! 
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+! 
-+! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
-+! include common_percent_rules.mak
-+! include common_rules.mak
-+! 
-+! 
-+! #install: all
-+! #	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+! 
-+! #%.s: %.cpp
-+! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-+! 
-+! 
-+*** misc/STLport-4.5.3/src/vc6.mak	Mon Jul 30 00:18:15 2001
-+--- misc/build/STLport-4.5.3/src/vc6.mak	Fri Jan 11 17:41:08 2002
-+***************
-+*** 10,16 ****
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+--- 10,16 ----
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS" /D "_NTSDK" /D "_CRTIMP="
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+*** misc/STLport-4.5.3/src/vc_common.mak	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/vc_common.mak	Fri Jan 11 12:48:14 2002
-+***************
-+*** 62,68 ****
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+--- 62,68 ----
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+***************
-+*** 79,87 ****
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+--- 79,87 ----
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+***************
-+*** 95,101 ****
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+--- 95,101 ----
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+*** misc/STLport-4.5.3/stlport/stdexcept	Tue May 22 02:50:21 2001
-+--- misc/build/STLport-4.5.3/stlport/stdexcept	Mon Jan 14 18:26:09 2002
-+***************
-+*** 49,54 ****
-+--- 49,59 ----
-+  
-+  _STLP_BEGIN_NAMESPACE
-+  
-++ /* maybe limit to gcc 3.x */
-++ #if defined( __GNUC__)
-++ #define _STLP_NOTHROW_INHERENTLY throw()
-++ #endif
-++ 
-+  class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-+  public:
-+    __Named_exception(const string& __str) 
-+*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:04 2002
-+--- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:56 2002
-+***************
-+*** 226,233 ****
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+--- 226,233 ----
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+***************
-+*** 285,298 ****
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+--- 285,298 ----
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+*** misc/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:41:05 2002
-+--- misc/build/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:39:45 2002
-+***************
-+*** 84,90 ****
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  
-+  install_unix :
-+--- 84,90 ----
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  
-+  install_unix :
---- stlport/makefile.mk Tue Sep 10 22:38:00 2002
-+++ stlport/makefile.mk  Tue Sep 10 22:39:11 2002
-@@ -72,8 +72,8 @@
- # --- Files --------------------------------------------------------
- .EXPORT : CC CXX
- .IF "$(COMID)"=="gcc3"
--	TARFILE_NAME=STLport-4.5
--	PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
-+	TARFILE_NAME=STLport-4.5.3
-+	PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch
- .ELSE			# "$(COMID)"=="gcc3"
- 	.IF "$(OS)"=="MACOSX"
- 		# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
-@@ -90,8 +90,8 @@
- TARFILE_NAME=STLport-4.0
- PATCH_FILE_NAME=STLport-4.0.patch
- .ELSE			# "$(CCNUMVER)"<="001300000000"
--TARFILE_NAME=STLport-4.5-0119
--PATCH_FILE_NAME=STLport-4.5-0119.patch
-+TARFILE_NAME=STLport-4.5.3
-+PATCH_FILE_NAME=STLport-4.5.3
- .ENDIF			# "$(CCNUMVER)"<="001300000000"
- .ENDIF
- 
-@@ -150,8 +150,8 @@
- .ENDIF
- 
- .IF "$(OS)"=="IRIX"
--TARFILE_NAME=STLport-4.5
--PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
-+TARFILE_NAME=STLport-4.5.3
-+PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch
- BUILD_ACTION=gmake
- BUILD_FLAGS=-f gcc-3.0.mak
- BUILD_FLAGS+= -j$(MAXPROCESS)
-@@ -189,10 +189,10 @@
- .INCLUDE :	target.mk
- .INCLUDE :	tg_ext.mk
- 
--$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.patch
-+$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.3.patch
- 
--$(MISC)$/STLport-4.5.patch : STLport-4.5.patch
--	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
-+$(MISC)$/STLport-4.5.3.patch : STLport-4.5.3.patch
-+	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.3.patch > $(MISC)$/STLport-4.5.3.patch
- 
- .IF "$(GUI)"=="WNT"
- .IF "$(CCNUMVER)"<="001300000000"
-
-
diff --git a/app-office/openoffice-ximian/files/1.1.0/nptl.patch b/app-office/openoffice-ximian/files/1.1.0/nptl.patch
deleted file mode 100644
index 212ff05c51b6..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/nptl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- oo_1.1rc3_src/sal/osl/unx/semaphor.c.jj	2003-08-28 10:24:23.736357952 +0100
-+++ oo_1.1rc3_src/sal/osl/unx/semaphor.c	2003-08-28 10:24:26.260974152 +0100
-@@ -79,7 +79,7 @@
- /* osl_createSemaphore  */
- /*****************************************************************************/
- 
--#ifdef LINUX
-+#if 0
- /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */ 
- 
- typedef struct {
-@@ -100,7 +100,7 @@
-      * larger of both
-      * XXX
-      */
--#ifdef LINUX
-+#if 0
- 	if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) )
- 		Semaphore= malloc(sizeof(glibc_21_sem_t));
- 	else
---- oo_1.1rc3_src/tools/source/solar/solar.c.jj	2003-08-28 11:50:57.589772216 +0100
-+++ oo_1.1rc3_src/tools/source/solar/solar.c	2003-08-28 11:50:05.167741576 +0100
-@@ -577,7 +577,7 @@
- 
-   {
- 	char* p = NULL;
--	InfoMemoryAccess( p );
-+	/*InfoMemoryAccess( p );*/
- 	p = (char*)&p;
- 	InfoMemoryAccess( p );
- 	InfoMemoryTypeAccess( t_short );
---- oo_1.1_src/neon/neon.patch.jj	2003-10-04 10:32:18.341106008 +0100
-+++ oo_1.1_src/neon/neon.patch	2003-10-04 10:32:49.123426384 +0100
-@@ -19,7 +19,7 @@
- ! 
- ! /* Define as __inline if that's what the C compiler calls it.  */
- ! #ifdef UNX
--! #define inline
-+! #define inline inline
- ! #endif
- ! 
- ! /* Define if you need to in order for stat and other things to work.  */
diff --git a/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch b/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch
deleted file mode 100644
index 15c90b2e456c..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Submitted By: Mark Hymers <markh AT linuxfromscratch DOT org>
-Date: 2003-10-05
-Initial Package Version: 1.1.0
-Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-September/003771.html
-Description: Fixes critical segmentation fault on linux-2.6.0 based systems
---- oo_1.1_src/tools/source/solar/solar.c	2003-04-15 12:55:43.000000000 -0500
-+++ oo_1.1_src/tools/source/solar/solar.c.new	2003-10-05 12:31:58.000000000 -0500
-@@ -76,7 +76,7 @@
- #include <varargs.h>
- #endif
- 
--#define NO_USE_FORK_TO_CHECK
-+#define USE_FORK_TO_CHECK
- #ifdef USE_FORK_TO_CHECK
- #include <sys/wait.h>
- #else
diff --git a/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch b/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch
deleted file mode 100644
index 2455c273a05a..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- oo_1.1_src/solenv/bin/checkdll.sh.org	2003-11-13 10:54:00.000000000 -0600
-+++ oo_1.1_src/solenv/bin/checkdll.sh	2003-11-13 10:54:15.000000000 -0600
-@@ -52,8 +52,8 @@
-         export LD_LIBRARY_PATH;;
-     esac
- 
--    $checkdll "$*"
--    if [ $? -ne 0 ]; then exit 1 ; fi
-+#    $checkdll "$*"
-+#    if [ $? -ne 0 ]; then exit 1 ; fi
-     
-     for parameter in $*; do
-         library=$parameter;
diff --git a/app-office/openoffice-ximian/files/1.1.0/ximian-openoffice.applications b/app-office/openoffice-ximian/files/1.1.0/ximian-openoffice.applications
deleted file mode 100644
index 5e56216d203a..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/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.0/ximian-openoffice.keys b/app-office/openoffice-ximian/files/1.1.0/ximian-openoffice.keys
deleted file mode 100644
index a669749676f2..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/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.0/xooffice-wrapper-1.3 b/app-office/openoffice-ximian/files/1.1.0/xooffice-wrapper-1.3
deleted file mode 100644
index 7dfcf398180d..000000000000
--- a/app-office/openoffice-ximian/files/1.1.0/xooffice-wrapper-1.3
+++ /dev/null
@@ -1,275 +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 [ -x "$HOME/.openoffice" ] ; then
-  SETUPLINK="`readlink $HOME/.openoffice/1.1.0/setup`"
-  if [ "$SETUPLINK" = "/opt/Ximian-OpenOffice/program/setup" ] ; then
-     mv $HOME/.openoffice $HOME/.xopenoffice
-     mv $HOME/.sversionrc $HOME/.xversionrc
-     sed -i -e s/.openoffice/.xopenoffice/g $HOME/.xversionrc $HOME/.xopenoffice/1.1.0/user/basic/*.xlc
-  fi
-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
-
-##
-## Unset SESSION_MANAGER if gnome-session is the session manager
-## See http://www.openoffice.org/issues/show_bug.cgi?id=4494
-##
-SMPID=`echo $SESSION_MANAGER | sed --quiet "s,local.*/,,p"`
-if [ -n "$SMPID" ] && [ -L /proc/"$SMPID"/exe ]; then
-
-  SESMGR="`readlink -f /proc/$SMPID/exe`"
-  case "$SESMGR" in
-      /usr/bin/gnome-session*)
-      echo "Gnome session manager detected - session management disabled"
-      unset SESSION_MANAGER
-      ;;
-  esac
-fi
-
-##
-## Add known Debian fonts locations to search path
-##
-## Please report if you have problems with fonts, or know of non-defoma integrated packages that place fonts in other
-## paths.
-##
-
-# Default font path.  This is used if SAL_FONTPATH_USER is not defined.
-DEBOO_FONTPATH="/usr/lib/X11/fonts/misc/;/usr/lib/X11/fonts/cyrillic/;\
-/usr/lib/X11/fonts/100dpi/:unscaled;/usr/lib/X11/fonts/75dpi/:unscaled;\
-/usr/lib/X11/fonts/Type1/;/usr/lib/X11/fonts/CID;/usr/lib/X11/fonts/Speedo/;\
-/usr/lib/X11/fonts/100dpi/;/usr/lib/X11/fonts/75dpi/;\
-/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType;\
-/usr/lib/X11/fonts/TrueType;\
-/usr/share/fonts/truetype/kochi;\
-/usr/lib/X11/fonts/TrueType/larabie-straight;\
-/usr/lib/X11/fonts/TrueType/larabie-uncommon"
-
-SAL_FONTPATH_USER=${SAL_FONTPATH_USER:-"$DEBOO_FONTPATH"}
-export SAL_FONTPATH_USER
-
-## search LOCALE
-if [ -n "$LC_ALL" ]; then
-  LOCALE="$LC_ALL"
-  # OOo doesn't understand LC_ALL, so set LANG
-  LANG="$LC_ALL"
-elif [ -n "$LANG" ]; then
-  LOCALE="$LANG"
-elif [ -n "$LC_MESSAGES" ]; then
-  LOCALE="$LC_MESSAGES"
-  LANG="$LC_MESSAGES"
-else
-  LOCALE="en_US"
-fi
-
-# Set locale to en_US if locale is C
-if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi
-
-LOCALEOO=`echo $LOCALE | sed 's/_/-/'`
-
-##
-## install OO for this user if needed
-##
-if [ -z "$OOHOME" ] ; then
-  if [ -e /etc/ximian-openoffice/autoresponse-<pv>.conf ] && \
-    grep -q DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf ; then
-
-#	Do not take old settings as migration results in broken behaviour
-#
-#	UPDATEFLAG=""
-#    if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then
-#      OOHOME="$oldhome"
-#      echo "Using settings from 1.0.3: /${oldhome}"
-#      /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.xversionrc
-#		UPDATEFLAG="-update:/$oldhome"
-#    fi
-
-      # 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 ${UPDATEFLAG} -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;;
-    xoowriter) set -- private:factory/swriter;;
-    xoohtml) set -- private:factory/swriter/web;;
-    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 ~/.openoffice/user - this is no longer used"
-
-# There is no locale import file
-## Change the ooLocale key in SETUPFILE acording to LOCALE
-#TMPFILE=`mktemp -t oooLocale.XXXXXXXXXX` && {
-#	cat >${TMPFILE} <<EOF
-#<?xml version="1.0" encoding="UTF-8"?>
-#<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
-# <node oor:name="L10N">
-#  <prop oor:name="ooLocale" oor:type="xs:string">
-#   <value>$LOCALEOO</value>
-#  </prop>
-# </node>
-#</oor:node>
-#EOF
-#	ooconfigimport $TMPFILE >/dev/null
-#	rm -f ${TMPFILE}
-#}
-
-# Check whether the programs actually link to anything, or are from an old
-# version.
-
-if [ ! -s $OOHOME/setup ]; then
-	echo "${OOHOME}/setup links to nothing, resetting link"
-	ln -sf /opt/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
-## Changelog
-# 2003/04/01 halls
-#   * Version 1.1beta
-# 2003/02/03 halls
-#   * Check for nonexistent ooLocale every run
-# 2003/01/09 halls
-#   * Version 1.0.2
-# 12/15 saviot
-#   * Change ooLocale at startup in Setup.xml
-#   <ooLocale cfg:type="string"/> doesn't work for help.
-# 12/03 challs
-#   * Add Debian font paths to user font path
-# 11/14 saviot
-#   * correct handling of UI language
-#   * don't change Linguistic.xml after first startup(#168780)
-#   * TODO: provide better defaults on first startup
-# 10/03 challs
-#   * Fix use with LC_ALL
-# 07/10 challs
-#   * use 1.0.1 directory and improve error checking
-# 07/02 challs
-#   * use readlink in /proc/PID/exe to get
-#     real session manager name
-# 06/12 challs
-#   * merge into main package
-#   * change $@ to "$@"
-#   * source configuration file: 
-#       /etc/openoffice/openoffice.conf
-# 06/12 mquinson
-#   * strace only when DEBUG is set to yes
-#   * readd the $@ to pass the args to soffice
-# 06/06 mquinson
-#   * Make sure the OLDLOCALE is never empty
-#   * handle the case where the locale is C
diff --git a/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.57.patch b/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.57.patch
deleted file mode 100644
index 21e15c29d953..000000000000
--- a/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.57.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- patches/OOO_1_1_1/apply 2004-05-08 08:54:17.055306480 +0200
-+++ patches/OOO_1_1_1/apply 2004-05-08 08:54:17.057306176 +0200
-@@ -25,6 +25,7 @@
- SuSE : SuSEOnly, LinuxCommon, KDEBase, GlobalDesktopFiles, VBABits
- PLD : PLDOnly, LinuxCommon, KDEBase, OOoCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits
- Ark : ArkOnly, LinuxCommon, NativeWidgets, GlobalDesktopFiles, ODKFixes, VBABits, OOoCUPS
-+Gentoo : XimianOnly, LinuxCommon, GnomeVFS, GnomeCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits, NativeWidgets
- # somewhat odder:
- Win32 : Common, ODKFixes, VBABits, Win32Only
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.51-r1 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.51-r1
deleted file mode 100644
index d88951c6ece8..000000000000
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.51-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bec8b41089ebdad2831f3c456973ad4e OOo_1.1.0_source.tar.bz2 189164050
-MD5 bddcc0e8958c85b0191551fceecdcb9c ooo-build-1.1.51.tar.gz 1331222
-MD5 61c9379fa718ee7f36ccd2d70f3649c8 ooo-icons-OOO_1_1-8.tar.gz 1344675
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.57 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.57
deleted file mode 100644
index 5b2ccc19229c..000000000000
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.57
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 3cc04c46514cd4b663cab3ca5637d501 OOo_1.1.1p1_source.tar.bz2 192388698
-MD5 91333259893ffc5c01114df35448561a ooo-build-1.1.57.tar.gz 1986471
-MD5 5157d4453d17cae586ce24989d34357a ooo-KDE_icons-OOO_1_1-0.1.tar.gz 1037481
-MD5 32a0e62f89ef36a91437fc705fbe6440 ooo-icons-OOO_1_1-9.tar.gz 1561812
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild
deleted file mode 100644
index 223f17a93444..000000000000
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# Copyright 1999-2004 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.1.51-r1.ebuild,v 1.8 2004/06/29 17:45:02 agriffis Exp $
-
-# IMPORTANT:  This is extremely alpha!!!
-
-# Notes:
-#
-#   This will take a HELL of a long time to compile, be warned.
-#   According to openoffice.org, it takes approximately 12 hours on a
-#   P3/600 with 256mb ram.  And thats where building is its only task.
-#
-#   It takes about 6 hours on my P4 1.8 with 512mb memory, and the
-#   build only needs about 2.1GB of disk space - Azarah.
-#
-#   You will also need a bucketload of diskspace ... in the order of
-#   4-5 gb free to store all the compiled files and installation
-#   directories.
-#
-#   The information on how to build and what is required comes from:
-#   http://www.openoffice.org/dev_docs/source/build_linux.html
-#   http://tools.openoffice.org/ext_comp.html
-#
-# Todo:
-#
-#   Get support going for installing a custom language pack.  Also
-#   need to be able to install more than one language pack.
-
-inherit flag-o-matic eutils gcc
-
-# We want gcc3 if possible!!!!
-export WANT_GCC_3="yes"
-
-# Set $ECPUS to amount of processes multiprocessing build should use.
-# NOTE:  Setting this too high might cause dmake to segfault!!
-#        Setting this to anything but "1" on my pentium4 causes things
-#        to segfault :(
-[ -z "${ECPUS}" ] && export ECPUS="1"
-
-OO_VER=1.1.0
-PATCHLEVEL=OOO_1_1_0
-ICON_VER=OOO_1_1-8
-INSTDIR="/opt/Ximian-OpenOffice"
-PATCHDIR=${WORKDIR}/ooo-build-${PV}
-ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
-S="${WORKDIR}/oo_${OO_VER/1.1.0/1.1}_src"
-DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite."
-SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}_source.tar.bz2
-	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
-	http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz"
-
-HOMEPAGE="http://ooo.ximian.com"
-
-LICENSE="LGPL-2 | SISSL-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="gnome kde"
-
-RDEPEND="virtual/libc
-	!=sys-libs/glibc-2.3.1*
-	>=dev-lang/perl-5.0
-	>=x11-libs/gtk+-2.0
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/gnome-vfs-2.0
-	>=net-print/libgnomecups-0.1.4
-	>=net-print/gnome-cups-manager-0.16
-	>=dev-libs/libxml2-2.0
-	>=media-libs/libart_lgpl-2.3.13
-	>=x11-libs/startup-notification-0.5
-	media-fonts/ttf-bitstream-vera
-	media-libs/fontconfig
-	media-gfx/imagemagick
-	media-libs/libpng
-	sys-devel/flex
-	sys-devel/bison
-	virtual/x11
-	app-arch/zip
-	app-arch/unzip
-	dev-libs/expat
-	virtual/lpr
-	!app-office/openoffice-ximian-bin
-	ppc? ( >=sys-libs/glibc-2.2.5-r7
-		>=sys-devel/gcc-3.2.1 )
-	>=media-libs/freetype-2.1.4"
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh
-	>=sys-apps/findutils-4.1.20-r1
-	dev-libs/libxslt
-	net-misc/curl
-	!dev-util/dmake
-	dev-util/intltool"
-
-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.					               "
-	ewarn "****************************************************************"
-
-	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
-
-	export NEW_GCC="0"
-
-	if [ -x /usr/sbin/gcc-config ]
-	then
-		# Do we have a gcc that use the new layout and gcc-config ?
-		if /usr/sbin/gcc-config --get-current-profile &> /dev/null
-		then
-			export NEW_GCC="1"
-			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
-
-			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != 3.2 -a "$(gcc-version)" != "3.3" ]
-			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.1 or later!"
-					eerror
-					eerror "Use gcc-config to change your gcc profile:"
-					eerror
-					eerror "  # gcc-config $CHOST-3.2.1"
-					eerror
-					eerror "or whatever gcc version is relevant."
-					die
-				fi
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-
-	oo_setup
-
-	cd ${WORKDIR}
-	unpack OOo_${OO_VER}_source.tar.bz2 ooo-build-${PV}.tar.gz ooo-icons-${ICON_VER}.tar.gz
-
-	#Still needed: The STLport patch
-	cd ${S}
-	rm stlport/STLport-4.5.3.patch
-	epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch
-
-	#Fix compilation with gcc 3.2.x	
-	epatch ${FILESDIR}/${OO_VER}/config.patch
-
-	#Fix nptl compile issues
-	epatch ${FILESDIR}/${OO_VER}/nptl.patch
-
-	#Additional patch for Kernel 2.6
-	epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-linux-2.6-fix.patch
-
-	#Work around recent portage sandbox troubles
-	epatch ${FILESDIR}/${OO_VER}/build.patch
-
-	if [ ${ARCH} = "sparc" ]; then
-		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
-	fi
-
-	#Security fix
-	epatch ${FILESDIR}/${OO_VER}/neon.patch
-
-	einfo "Applying Ximian OO.org Patches"
-	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed"
-
-	einfo "Installing / Scaling Icons"
-	${PATCHDIR}/bin/scale-icons ${S}
-	cp -avf ${ICONDIR}/* ${S}
-
-	einfo "Munging font mappings ..."
-	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
-	echo "done munging fonts."
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fomit-frame-pointer"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	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
-
-	#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
-}
-
-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() {
-
-	addpredict /bin
-	addpredict /root/.gconfd
-	local buildcmd=""
-
-	set_languages
-
-	oo_setup
-
-	# dmake security patch
-	cd ${S}/dmake
-	autoconf || die
-
-	# 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
-	autoconf
-	./configure \
-		--enable-libart \
-		--enable-libsn \
-		--enable-crashdump=no \
-		--with-lang=ENUS,${LANGNAME} \
-		--without-fonts \
-		--disable-rpath \
-		--enable-fontconfig \
-		--with-system-zlib \
-		--with-system-freetype \
-		--with-system-curl \
-		--disable-java || die
-
-	cd ${S}
-	get_EnvSet
-
-	# Build as minimal as possible
-	export BUILD_MINIMAL="${LANGNO}"
-
-	# Should the build use multiprocessing?
-	if [ "${ECPUS}" -gt 1 ]
-	then
-		buildcmd="${S}/solenv/bin/build.pl --all -P${ECPUS} product=full strip=true --dlv_switch link"
-	else
-		buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link"
-	fi
-
-	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
-	then
-		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
-		export CCCOMP="$(gcc-getCC)"
-		export CXXCOMP="$(gcc-getCXX)"
-	fi
-
-	einfo "Bootstrapping OpenOffice.org..."
-	# Get things ready for bootstrap (Az)
-	chmod 0755 ${S}/solenv/bin/*.pl
-	# Bootstrap ...
-	./bootstrap
-
-	einfo "Building OpenOffice.org..."
-	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${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"
-
-	set_languages
-
-	get_EnvSet
-
-	# The install part should now be relatively OK compared to
-	# what it was.  Basically we use autoresponse files to install
-	# unattended.  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
-
-	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
-
-	echo
-	einfo "Removing build root from registry..."
-	# Remove totally useless stuff.
-	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
-	# Remove build root from registry and co
-	egrep -rl "${D}" ${D}${INSTDIR}/* | \
-		xargs -i perl -pi -e "s|${D}||g" {} || :
-
-	einfo "Fixing permissions..."
-	# Fix permissions
-	find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
-	chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
-
-	# Fix symlinks
-	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 ximian icons
-	cd ${PATCHDIR}/desktop/
-	insinto /usr/share/pixmaps
-	doins *.png
-	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
-
-	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if use gnome
-	then
-		insinto /usr/share/applications
-		doins *.desktop
-		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/applnk/Ximian-OpenOffice.org
-		doins *.desktop
-		insinto /usr/share/mimelnk/application
-		doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/*
-	fi
-
-	# Install corrected Symbol Font
-	insinto /usr/X11R6/lib/X11/fonts/truetype/
-	doins ${PATCHDIR}/fonts/*.ttf
-
-	# Remove unneeded stuff
-	rm -rf ${D}${INSTDIR}/share/cde
-
-	# Make sure these do not get nuked.
-	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
-	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
-	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
-}
-
-pkg_postinst() {
-
-	einfo "******************************************************************"
-	einfo " To start 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"
-	einfo
-	einfo "******************************************************************"
-}
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.57.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.57.ebuild
deleted file mode 100644
index a63c49a09b1c..000000000000
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.57.ebuild
+++ /dev/null
@@ -1,524 +0,0 @@
-# Copyright 1999-2004 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.1.57.ebuild,v 1.6 2004/06/29 17:45:02 agriffis Exp $
-
-# IMPORTANT:  This is extremely alpha!!!
-
-# Notes:
-#
-#   This will take a HELL of a long time to compile, be warned.
-#   According to openoffice.org, it takes approximately 12 hours on a
-#   P3/600 with 256mb ram.  And thats where building is its only task.
-#
-#   It takes about 6 hours on my P4 1.8 with 512mb memory, and the
-#   build only needs about 2.1GB of disk space - Azarah.
-#
-#   You will also need a bucketload of diskspace ... in the order of
-#   4-5 gb free to store all the compiled files and installation
-#   directories.
-#
-#   The information on how to build and what is required comes from:
-#   http://www.openoffice.org/dev_docs/source/build_linux.html
-#   http://tools.openoffice.org/ext_comp.html
-#
-# Todo:
-#
-#   Get support going for installing a custom language pack.  Also
-#   need to be able to install more than one language pack.
-
-inherit flag-o-matic eutils gcc
-
-IUSE="gnome kde ooo-kde"
-
-OO_VER=1.1.1
-PATCHLEVEL=OOO_1_1_1
-ICON_VER=OOO_1_1-9
-KDE_ICON_VER=OOO_1_1-0.1
-KDE_ICON_PATH=documents/159/1785
-INSTDIR="/opt/Ximian-OpenOffice"
-PATCHDIR=${WORKDIR}/ooo-build-${PV}
-S="${WORKDIR}/oo_${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}p1_source.tar.bz2
-	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
-	ooo-kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )
-	!ooo-kde? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )"
-
-HOMEPAGE="http://ooo.ximian.com"
-
-LICENSE="LGPL-2 | SISSL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-RDEPEND="virtual/libc
-	!=sys-libs/glibc-2.3.1*
-	>=dev-lang/perl-5.0
-	!ooo-kde? ( >=x11-libs/gtk+-2.0
-		>=gnome-base/libgnome-2.2
-		>=gnome-base/gnome-vfs-2.0
-		>=net-print/libgnomecups-0.1.4
-		>=net-print/gnome-cups-manager-0.16
-		>=dev-libs/libxml2-2.0 )
-	>=media-libs/libart_lgpl-2.3.13
-	>=x11-libs/startup-notification-0.5
-	media-fonts/ttf-bitstream-vera
-	media-libs/fontconfig
-	media-gfx/imagemagick
-	media-libs/libpng
-	sys-devel/flex
-	sys-devel/bison
-	virtual/x11
-	app-arch/zip
-	app-arch/unzip
-	dev-libs/expat
-	virtual/lpr
-	!app-office/openoffice-ximian-bin
-	ppc? ( >=sys-libs/glibc-2.2.5-r7
-	>=sys-devel/gcc-3.2.1 )
-	>=media-libs/freetype-2.1.4
-	ooo-kde? ( kde-base/kdelibs )"
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh
-	>=sys-apps/findutils-4.1.20-r1
-	dev-libs/libxslt
-	net-misc/curl
-	!dev-util/dmake
-	dev-util/intltool"
-
-pkg_setup() {
-
-	ewarn "****************************************************************"
-	ewarn " This ebuild now also includes optional support for kde "
-	ewarn " integration. If you want to use it you will have to put "
-	ewarn " 'ooo-kde' into your USE FLAGS. "
-	ewarn
-	ewarn " It is important to note that OpenOffice.org is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again.					               "
-	ewarn "****************************************************************"
-
-	set_languages
-}
-
-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
-
-	# We want gcc3 if possible!!!!
-	export WANT_GCC_3="yes"
-
-	export NEW_GCC="0"
-
-	if [ -x /usr/sbin/gcc-config ]
-	then
-		# Do we have a gcc that use the new layout and gcc-config ?
-		if /usr/sbin/gcc-config --get-current-profile &> /dev/null
-		then
-			export NEW_GCC="1"
-			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
-
-			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != 3.2 -a "$(gcc-version)" != "3.3" ]
-			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.1 or later!"
-					eerror
-					eerror "Use gcc-config to change your gcc profile:"
-					eerror
-					eerror "  # gcc-config $CHOST-3.2.1"
-					eerror
-					eerror "or whatever gcc version is relevant."
-					die
-				fi
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-
-	oo_setup
-
-	cd ${WORKDIR}
-	unpack ${A}
-
-	#Fix Sandbox problems with scale-icons script
-	cd ${PATCHDIR}
-	epatch ${FILESDIR}/${OO_VER}/fixscale.patch
-
-	#Beginnings of our own patchset
-	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
-
-	#Still needed: The STLport patch
-	cd ${S}
-	rm stlport/STLport-4.5.3.patch
-	epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch
-
-	#Fix nptl compile issues
-	epatch ${FILESDIR}/${OO_VER}/nptl.patch
-
-	#Additional patch for Kernel 2.6
-	epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-linux-2.6-fix.patch
-
-	if [ ${ARCH} = "sparc" ]; then
-		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
-	fi
-
-	if use ooo-kde; then
-		DISTRO=KDE
-		ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
-		WIDGETSET=kde
-	else
-		DISTRO=Gentoo
-		ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
-		WIDGETSET=gtk
-	fi
-
-	einfo "Applying Ximian OO.org Patches"
-	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
-
-	einfo "Installing / Scaling Icons"
-	${PATCHDIR}/bin/scale-icons ${S}
-	cp -avf ${ICONDIR}/* ${S}
-
-	einfo "Copying splash screens in place"
-	cp ${PATCHDIR}/src/open*.bmp ${S}/offmgr/res/
-
-	einfo "Munging font mappings ..."
-	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
-	echo "done munging fonts."
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fomit-frame-pointer"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	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
-
-	#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
-}
-
-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() {
-
-	addpredict /bin
-	addpredict /root/.gconfd
-	local buildcmd=""
-
-	# dmake security patch
-	cd ${S}/dmake
-	autoconf || die
-
-	# 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}..."
-	einfo "Using Native widgest set for ${WIDGETSET}"
-	cd ${S}/config_office
-	rm -f config.cache
-	autoconf
-	local myconf
-	myconf="--enable-libart \
-		--enable-libsn \
-		--enable-crashdump=no \
-		--with-lang=ENUS,${LANGNAME} \
-		--without-fonts \
-		--disable-rpath \
-		--enable-fontconfig \
-		--with-system-zlib \
-		--with-system-freetype \
-		--with-system-curl \
-		--with-system-xrender \
-		--disable-java \
-		--with-widgetset=${WIDGETSET}"
-	./configure ${myconf} || die
-
-	cd ${S}
-	get_EnvSet
-
-	# Build as minimal as possible
-	export BUILD_MINIMAL="${LANGNO}"
-
-	# Set $ECPUS to amount of processes multiprocessing build should use.
-	# NOTE:  Setting this too high might cause dmake to segfault!!
-	#        Setting this to anything but "1" on my pentium4 causes things
-	#        to segfault :(
-	[ -z "${ECPUS}" ] && export ECPUS="1"
-
-	# Should the build use multiprocessing?
-	if [ "${ECPUS}" -gt 1 ]
-	then
-		buildcmd="${S}/solenv/bin/build.pl --all -P${ECPUS} product=full strip=true --dlv_switch link"
-	else
-		buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link"
-	fi
-
-	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
-	then
-		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
-		export CCCOMP="$(gcc-getCC)"
-		export CXXCOMP="$(gcc-getCXX)"
-	fi
-
-	einfo "Bootstrapping OpenOffice.org..."
-	# Get things ready for bootstrap (Az)
-	chmod 0755 ${S}/solenv/bin/*.pl
-	# Bootstrap ...
-	./bootstrap
-
-	einfo "Building OpenOffice.org..."
-	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${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"
-
-	# 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
-
-	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
-
-	echo
-	einfo "Removing build root from registry..."
-	# Remove totally useless stuff.
-	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
-	# Remove build root from registry and co
-	egrep -rl "${D}" ${D}${INSTDIR}/* | \
-		xargs -i perl -pi -e "s|${D}||g" {} || :
-
-	einfo "Fixing permissions..."
-	# Fix permissions
-	find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
-	chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
-
-	# Fix symlinks
-	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 ximian icons
-	cd ${PATCHDIR}/desktop/
-	insinto /usr/share/pixmaps
-	doins *.png
-	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
-
-	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if use gnome
-	then
-		insinto /usr/share/applications
-		doins *.desktop
-		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/applnk/Ximian-OpenOffice.org
-		doins *.desktop
-		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
-
-	# 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 "******************************************************************"
-	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"
-	einfo
-	einfo "******************************************************************"
-}
author	Andreas Proschofsky <suka@gentoo.org>	2004-07-02 07:54:07 +0000
committer	Andreas Proschofsky <suka@gentoo.org>	2004-07-02 07:54:07 +0000
commit	b795fbba83af3fa12173fff3378748caa710682b (patch)
tree	1660009750c21a184c84811a3b52f5ac2bf95604 /app-office/openoffice-ximian
parent	virtual/glibc -> virtual/libc (Manifest recommit) (diff)
download	gentoo-2-b795fbba83af3fa12173fff3378748caa710682b.tar.gz gentoo-2-b795fbba83af3fa12173fff3378748caa710682b.tar.bz2 gentoo-2-b795fbba83af3fa12173fff3378748caa710682b.zip