Further security related cleanup

(Portage version: 2.2_rc43/cvs/Linux i686)

5 files changed, 7 insertions, 724 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 1360e05174b4..f79b204dbac6 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.490 2009/10/04 12:38:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.491 2009/10/04 12:44:06 suka Exp $
+
+  04 Oct 2009; Andreas Proschofsky <suka@gentoo.org>
+  -files/buildfix-gcc44.diff, -openoffice-3.1.0-r1.ebuild,
+  -files/hunspell-one-dir-nocrash.diff,
+  -files/solenv.workaround-for-the-kde-mess.diff:
+  Further security related cleanup
 
   04 Oct 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/files/buildfix-gcc44.diff b/app-office/openoffice/files/buildfix-gcc44.diff
deleted file mode 100644
index 5da661e1f2d4..000000000000
--- a/app-office/openoffice/files/buildfix-gcc44.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- sw/source/core/doc/docbm.cxx	2009-05-17 16:41:34.765483089 -0500
-+++ sw/source/core/doc/docbm.cxx	2009-05-17 16:41:39.141355157 -0500
-@@ -33,6 +33,7 @@
- #include "precompiled_sw.hxx"
- 
- 
-+#include <cstdio>
- #include <tools/pstm.hxx>
- #include <svx/linkmgr.hxx>
- #include <fmtanchr.hxx>
---- sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-17 17:06:33.556313757 -0500
-+++ sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-17 17:06:46.964547351 -0500
-@@ -32,6 +32,7 @@
- #include "precompiled_sw.hxx"
- 
- #include <iostream> 
-+#include <cstdio>
- #include "WW8TableInfo.hxx"
- #include "swtable.hxx"
- #include "pam.hxx"
diff --git a/app-office/openoffice/files/hunspell-one-dir-nocrash.diff b/app-office/openoffice/files/hunspell-one-dir-nocrash.diff
deleted file mode 100644
index 85fa3e8fc304..000000000000
--- a/app-office/openoffice/files/hunspell-one-dir-nocrash.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-? unxlngx6.pro
-Index: source/lingutil/lingutil.cxx
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/lingutil.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 lingutil.cxx
---- lingucomponent/source/lingutil/lingutil.cxx	13 Jun 2008 14:02:52 -0000	1.4
-+++ lingucomponent/source/lingutil/lingutil.cxx	24 Oct 2008 15:01:43 -0000
-@@ -322,11 +322,15 @@
- 		{
- 			LanguageType nLang = MsLangId::convertIsoStringToLanguage( aIt2->aLocaleNames[0] );
- 
-+            if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE)
-+            {
-+                DBG_ERROR( "old style dictionary with invalid language found!" );
-+                continue;
-+            }
-+
- 			// language not yet added?
- 			if (aNewStyleLanguages.count( nLang ) == 0)
--			{
- 				rNewStyleDics.push_back( *aIt2 );
--			}
- 		}
- 		else
- 		{
diff --git a/app-office/openoffice/files/solenv.workaround-for-the-kde-mess.diff b/app-office/openoffice/files/solenv.workaround-for-the-kde-mess.diff
deleted file mode 100644
index 714709e21c8e..000000000000
--- a/app-office/openoffice/files/solenv.workaround-for-the-kde-mess.diff
+++ /dev/null
@@ -1,262 +0,0 @@
-unchanged:
---- solenv/inc/_tg_shl.mk
-+++ solenv/inc/_tg_shl.mk
-@@ -441,10 +441,10 @@ $(SHL1TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
--	@echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
-+	@echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
- 	$(SHL1VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -981,10 +981,10 @@ $(SHL2TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
--	@echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
-+	@echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
- 	$(SHL2VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -1521,10 +1521,10 @@ $(SHL3TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
--	@echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
-+	@echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
- 	$(SHL3VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -2061,10 +2061,10 @@ $(SHL4TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
--	@echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
-+	@echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
- 	$(SHL4VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -2601,10 +2601,10 @@ $(SHL5TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
--	@echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
-+	@echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
- 	$(SHL5VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -3141,10 +3141,10 @@ $(SHL6TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
--	@echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
-+	@echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
- 	$(SHL6VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -3681,10 +3681,10 @@ $(SHL7TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
--	@echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
-+	@echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
- 	$(SHL7VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -4221,10 +4221,10 @@ $(SHL8TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
--	@echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
-+	@echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
- 	$(SHL8VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -4761,10 +4761,10 @@ $(SHL9TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
--	@echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
-+	@echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
- 	$(SHL9VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -5301,10 +5301,10 @@ $(SHL10TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
--	@echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
-+	@echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
- 	$(SHL10VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-+	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
- .IF "$(UPDATER)"=="YES"
-diff -u solenv/inc/_tg_app.mk solenv/inc/_tg_app.mk
---- solenv/inc/_tg_app.mk	(working copy)
-+++ solenv/inc/_tg_app.mk
-@@ -116,10 +116,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
--	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
--	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@ls -l $@
-@@ -400,10 +400,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
--	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
--	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@ls -l $@
-@@ -684,10 +684,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
--	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
--	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@ls -l $@
-@@ -968,10 +968,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
--	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
--	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@ls -l $@
-@@ -1252,10 +1252,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
--	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
--	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@ls -l $@
-@@ -1536,10 +1536,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
--	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
--	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@ls -l $@
-@@ -1820,10 +1820,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
--	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
--	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@ls -l $@
-@@ -2104,10 +2104,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
--	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
--	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@ls -l $@
-@@ -2388,10 +2388,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
--	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
--	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@ls -l $@
-@@ -2672,7 +2672,7 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
--	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
diff --git a/app-office/openoffice/openoffice-3.1.0-r1.ebuild b/app-office/openoffice/openoffice-3.1.0-r1.ebuild
deleted file mode 100644
index 8ac8e217471a..000000000000
--- a/app-office/openoffice/openoffice-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0-r1.ebuild,v 1.3 2009/09/03 15:24:08 suka Exp $
-
-WANT_AUTOMAKE="1.9"
-EAPI="2"
-
-inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
-
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
-
-MY_PV=3.1.0.6
-PATCHLEVEL=OOO310
-SRC=OOo_${PV}_src
-MST=ooo310-m11
-DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST}
-S=${WORKDIR}/ooo
-S_OLD=${WORKDIR}/ooo-build-${MY_PV}
-CONFFILE=${S}/distro-configs/Gentoo.conf.in
-BASIS=basis3.1
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-
-SRC_URI="${DEVPATH}-artwork.tar.bz2
-	${DEVPATH}-base.tar.bz2
-	${DEVPATH}-bootstrap.tar.bz2
-	${DEVPATH}-calc.tar.bz2
-	${DEVPATH}-components.tar.bz2
-	${DEVPATH}-extensions.tar.bz2
-	${DEVPATH}-extras.tar.bz2
-	${DEVPATH}-filters.tar.bz2
-	${DEVPATH}-help.tar.bz2
-	${DEVPATH}-impress.tar.bz2
-	${DEVPATH}-libs-core.tar.bz2
-	${DEVPATH}-libs-extern.tar.bz2
-	${DEVPATH}-libs-extern-sys.tar.bz2
-	${DEVPATH}-libs-gui.tar.bz2
-	${DEVPATH}-postprocess.tar.bz2
-	${DEVPATH}-sdk.tar.bz2
-	${DEVPATH}-testing.tar.bz2
-	${DEVPATH}-ure.tar.bz2
-	${DEVPATH}-writer.tar.bz2
-	templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
-		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
-		http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
-		http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
-		http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt )
-	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
-	http://download.go-oo.org/SRC680/extras-3.tar.bz2
-	http://download.go-oo.org/SRC680/biblio.tar.bz2
-	http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
-	http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
-	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
-	http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz"
-
-LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
-LANGS="${LANGS1} en en_US"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-HOMEPAGE="http://go-oo.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-COMMON_DEPEND="!app-office/openoffice-bin
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	>=dev-lang/perl-5.0
-	>=dev-libs/glib-2.18
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	gnome? ( >=x11-libs/gtk+-2.10
-		>=gnome-base/gconf-2.0
-		>=x11-libs/cairo-1.0.2 )
-	gtk? ( >=x11-libs/gtk+-2.10
-		>=x11-libs/cairo-1.0.2 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	gstreamer? ( >=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
-	kde? ( kde-base/kdelibs:3.5 )
-	java? ( >=dev-java/bsh-2.0_beta4
-		>=dev-db/hsqldb-1.8.0.9
-		dev-java/lucene:2.3
-		dev-java/lucene-analyzers:2.3
-		dev-java/rhino:1.5 )
-	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
-	nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 )
-	opengl? ( virtual/opengl
-		virtual/glu )
-	>=net-misc/neon-0.24.7
-	>=dev-libs/openssl-0.9.8g
-	>=media-libs/freetype-2.1.10-r2
-	>=media-libs/fontconfig-2.3.0
-	cups? ( net-print/cups )
-	media-libs/jpeg
-	media-libs/libpng
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.1.4-r1
-	dev-libs/expat
-	>=dev-libs/icu-4.0
-	>=sys-libs/db-4.3
-	>=app-text/libwpd-0.8.8
-	>=dev-libs/redland-1.0.8
-	>=media-libs/vigra-1.4
-	>=virtual/poppler-0.8.0"
-
-RDEPEND="java? ( >=virtual/jre-1.5 )
-	${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-proto/printproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	>=sys-apps/findutils-4.1.20-r1
-	dev-perl/Archive-Zip
-	virtual/perl-IO-Compress
-	>=virtual/perl-Compress-Raw-Zlib-2.002
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=dev-libs/boost-1.33.1
-	sys-devel/flex
-	sys-devel/bison
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.0
-	>=dev-util/gperf-3
-	>=net-misc/curl-7.12
-	sys-libs/zlib
-	sys-apps/coreutils
-	pam? ( sys-libs/pam
-		sys-apps/shadow[pam] )
-	>=dev-lang/python-2.3.4[threads]
-	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
-		>=dev-java/ant-core-1.7 )
-	ldap? ( net-nds/openldap )"
-
-PROVIDE="virtual/ooo"
-
-pkg_setup() {
-
-	ewarn
-	ewarn " It is important to note that OpenOffice.org is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again. Also note that building OOo takes a lot of time and "
-	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
-	ewarn " the minimum requirements. If you have less, use openoffice-bin "
-	ewarn " instead. "
-	ewarn
-	ewarn " Also if you experience a build break, please make sure to retry "
-	ewarn " with MAKEOPTS="-j1" before filing a bug. "
-	ewarn
-
-	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="6144"
-	check_reqs
-
-	strip-linguas ${LANGS}
-
-	if [[ -z "${LINGUAS}" ]]; then
-		export LINGUAS_OOO="en-US"
-		ewarn
-		ewarn " To get a localized build, set the according LINGUAS variable(s). "
-		ewarn
-	else
-		export LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/g;s/_/-/g')
-	fi
-
-	if use !java; then
-		ewarn " You are building with java-support disabled, this results in some "
-		ewarn " of the OpenOffice.org functionality being disabled. "
-		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags. "
-		ewarn
-	fi
-
-	if use !gtk && use !gnome; then
-		ewarn " If you want the OpenOffice.org systray quickstarter to work "
-		ewarn " activate either the 'gtk' or 'gnome' use flags. "
-		ewarn
-	fi
-
-	if is-flagq -ffast-math ; then
-		eerror " You are using -ffast-math, which is known to cause problems. "
-		eerror " Please remove it from your CFLAGS, using this globally causes "
-		eerror " all sorts of problems. "
-		eerror " After that you will also have to - at least - rebuild python otherwise "
-		eerror " the openoffice build will break. "
-		die
-	fi
-
-	if use nsplugin; then
-		if pkg-config --exists libxul; then
-			BRWS="libxul"
-		elif pkg-config --exists xulrunner-xpcom; then
-			BRWS="xulrunner"
-		elif pkg-config --exists seamonkey-xpcom; then
-			BRWS="seamonkey"
-		else
-			die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!"
-		fi
-	fi
-
-	java-pkg-opt-2_pkg_setup
-
-	# sys-libs/db version used
-	local db_ver=$(db_findver '>=sys-libs/db-4.3')
-
-}
-
-src_unpack() {
-
-	unpack ooo-build-${MY_PV}.tar.gz
-
-}
-
-src_prepare() {
-
-	# Hackish workaround for overlong path problem, see bug #130837
-	mv "${S_OLD}" "${S}" || die
-
-	#Some fixes for our patchset
-	cd "${S}"
-	epatch "${FILESDIR}/gentoo-pythonpath.diff"
-	epatch "${FILESDIR}/ooo-env_log.diff"
-	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
-	cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
-	cp -f "${FILESDIR}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/hotfixes" || die
-	cp -f "${FILESDIR}/xulrunner-1.9.1.diff" "${S}/patches/hotfixes" || die
-
-	#Use flag checks
-	if use java ; then
-		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
-		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
-		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
-		echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
-		echo "--with-system-beanshell" >> ${CONFFILE}
-		echo "--with-system-hsqldb" >> ${CONFFILE}
-		echo "--with-system-lucene" >> ${CONFFILE}
-		echo "--with-system-rhino" >> ${CONFFILE}
-		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
-		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
-		echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
-		echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
-		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
-	fi
-
-	if use nsplugin ; then
-		echo "--enable-mozilla" >> ${CONFFILE}
-		echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE}
-	else
-		echo "--disable-mozilla" >> ${CONFFILE}
-		echo "--without-system-mozilla" >> ${CONFFILE}
-	fi
-
-	echo $(use_enable binfilter) >> ${CONFFILE}
-	echo $(use_enable cups) >> ${CONFFILE}
-	echo $(use_enable dbus) >> ${CONFFILE}
-	echo $(use_enable eds evolution2) >> ${CONFFILE}
-	echo $(use_enable gnome gconf) >> ${CONFFILE}
-	echo $(use_enable gnome gio) >> ${CONFFILE}
-	echo "--disable-gnome-vfs" >> ${CONFFILE}
-	echo $(use_enable gnome lockdown) >> ${CONFFILE}
-	echo $(use_enable gstreamer) >> ${CONFFILE}
-	echo $(use_enable gtk systray) >> ${CONFFILE}
-	echo $(use_enable ldap) >> ${CONFFILE}
-	echo $(use_enable opengl) >> ${CONFFILE}
-	echo $(use_with ldap openldap) >> ${CONFFILE}
-	echo $(use_enable debug crashdump) >> ${CONFFILE}
-	echo $(use_enable debug strip-solver) >> ${CONFFILE}
-
-	# Extension stuff
-	echo "--with-extension-integration" >> ${CONFFILE}
-	echo "--enable-minimizer" >> ${CONFFILE}
-	echo "--enable-pdfimport" >> ${CONFFILE}
-	echo "--enable-presenter-console" >> ${CONFFILE}
-
-	echo "--without-writer2latex" >> ${CONFFILE}
-
-	# Use splash screen without Sun logo
-	echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
-
-	# Upstream this
-	echo "--with-system-redland" >> ${CONFFILE}
-
-}
-
-src_configure() {
-
-	# Use multiprocessing by default now, it gets tested by upstream
-	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-ftracer"
-	filter-flags "-fforce-addr"
-
-	filter-flags "-O[s2-9]"
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		filter-flags "-fstack-protector"
-		filter-flags "-fstack-protector-all"
-		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
-	fi
-
-	# Build with NVidia cards breaks otherwise
-	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# Make sure gnome-users get gtk-support
-	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
-	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
-
-	cd "${S}"
-	./configure --with-distro="Gentoo" \
-		--with-arch="${ARCH}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--without-binsuffix \
-		--with-installed-ooo-dirname="openoffice" \
-		--with-tag="${MST}" \
-		--with-drink="True Blood" \
-		${GTKFLAG} \
-		$(use_enable mono) \
-		$(use_enable kde) \
-		$(use_enable !debug strip) \
-		$(use_enable odk) \
-		$(use_enable pam) \
-		$(use_with java) \
-		$(use_with templates sun-templates) \
-		--disable-access \
-		--disable-post-install-scripts \
-		--enable-extensions \
-		--with-system-libwpd \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		|| die "Configuration failed!"
-
-}
-
-src_compile() {
-
-	use kde && set-kdedir 3
-	make || die "Build failed"
-
-}
-
-src_install() {
-
-	export PYTHONPATH=""
-
-	einfo "Preparing Installation"
-	make DESTDIR="${D}" install || die "Installation failed!"
-
-	# Fix the permissions for security reasons
-#	chown -RP root:0 "${D}"
-
-	# record java libraries
-	if use java; then
-			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
-			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
-	fi
-
-	# Upstream places the bash-completion module in /etc. Gentoo places them in
-	# /usr/share/bash-completion. bug 226061
-	dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
-	rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst
-
-	[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
-
-	# Add available & useful jars to openoffice classpath
-	use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
-
-	elog
-	elog " Spell checking is provided through our own myspell-ebuilds, "
-	elog " if you want to use it, please install the correct myspell package "
-	elog " according to your language needs. "
-	elog
-
-	elog " Some aditional functionality can be installed via Extension Manager: "
-	elog " *) PDF Import "
-	elog " *) Presentation Console "
-	elog " *) Presentation Minimizer "
-	elog
-	elog " Please use the packages provided in "
-	elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
-	elog " instead of those from the SUN extension site. "
-	elog
-
-}