Bump to OpenOffice.org 2.3.0

Package-Manager: portage-2.1.3.9

10 files changed, 645 insertions, 5 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 598bae9ca5bd..4ef394b74b84 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.336 2007/08/19 16:22:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.337 2007/09/18 07:27:55 suka Exp $
+
+*openoffice-2.3.0 (18 Sep 2007)
+
+  18 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.3.0/disable-regcomp-java.diff,
+  +files/2.3.0/disable-regcomp-python.diff, +files/2.3.0/ooo-env_log.diff,
+  +files/2.3.0/gentoo-2.3.0.diff, +files/2.3.0/regcompapply.diff,
+  +files/2.3.0/ucb-no-CURL_NO_OLDIES.diff, +openoffice-2.3.0.ebuild:
+  Bump to OpenOffice.org 2.3.0. Two minor notes: This uses internal STLport
+  again for now, as there were some build problems with the external one, also
+  this release forces our own splash screen, as the upstream one is broken.
 
   19 Aug 2007; Andreas Proschofsky <suka@gentoo.org> ChangeLog:
   Raise fontconfig dependency, see bug #187646
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index cd8461ba8323..92995d29d7ee 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -22,27 +22,64 @@ AUX 2.2.1/swregion-gcc42.diff 249 RMD160 223949d7378a47ea087407dc5c7242885e996d4
 MD5 8e94566a37c5205330ead8092b78638e files/2.2.1/swregion-gcc42.diff 249
 RMD160 223949d7378a47ea087407dc5c7242885e996d4e files/2.2.1/swregion-gcc42.diff 249
 SHA256 ab8aa2f8e9cff370e8e264f2e67a7c4d69896620a23102fe0b3acb0201754c08 files/2.2.1/swregion-gcc42.diff 249
+AUX 2.3.0/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
+MD5 c4d90c5fb8d48a5feb3ec4cd6d6e3f38 files/2.3.0/disable-regcomp-java.diff 965
+RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e files/2.3.0/disable-regcomp-java.diff 965
+SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19 files/2.3.0/disable-regcomp-java.diff 965
+AUX 2.3.0/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 SHA1 700513af0ae8eb2a1dcd4b62f06bbf3bc034b339 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1
+MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.3.0/disable-regcomp-python.diff 934
+RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.3.0/disable-regcomp-python.diff 934
+SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.3.0/disable-regcomp-python.diff 934
+AUX 2.3.0/gentoo-2.3.0.diff 2653 RMD160 a8152ba7403904752d9c9155b301733ac37ec16e SHA1 88c19dee13cc065e82e02110f1436d7493c9c4a7 SHA256 3045427fa441d285a3fa5e7a620fc4394884414fdbb21e65abadd0c0b2c513eb
+MD5 bbfe3426dee547b8f48e008e488fb788 files/2.3.0/gentoo-2.3.0.diff 2653
+RMD160 a8152ba7403904752d9c9155b301733ac37ec16e files/2.3.0/gentoo-2.3.0.diff 2653
+SHA256 3045427fa441d285a3fa5e7a620fc4394884414fdbb21e65abadd0c0b2c513eb files/2.3.0/gentoo-2.3.0.diff 2653
+AUX 2.3.0/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+MD5 1f836c5ae6bd978035358290c001c579 files/2.3.0/ooo-env_log.diff 617
+RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e files/2.3.0/ooo-env_log.diff 617
+SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 files/2.3.0/ooo-env_log.diff 617
+AUX 2.3.0/regcompapply.diff 306 RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d SHA1 33bd9823afb40f3477c277c49441546dd5fe4ed4 SHA256 f3a600f6178ab276bf58d69d97acf02200d99be07df00fcdd61442625f3a37ae
+MD5 df1c2b425e5eb0c3f710997078dbab71 files/2.3.0/regcompapply.diff 306
+RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d files/2.3.0/regcompapply.diff 306
+SHA256 f3a600f6178ab276bf58d69d97acf02200d99be07df00fcdd61442625f3a37ae files/2.3.0/regcompapply.diff 306
+AUX 2.3.0/ucb-no-CURL_NO_OLDIES.diff 568 RMD160 e0d5ba94bc4e9ed102a60c5bf65036e5e93f8980 SHA1 f53d649d444c7905baf24cb78967ddb78fa07ee8 SHA256 21f62c57cb5a13a33294e7774981ad876eb71161a8b6a983b1b1dab86624bd3d
+MD5 032326edfaa8de0aaf00c5aafe83e6f2 files/2.3.0/ucb-no-CURL_NO_OLDIES.diff 568
+RMD160 e0d5ba94bc4e9ed102a60c5bf65036e5e93f8980 files/2.3.0/ucb-no-CURL_NO_OLDIES.diff 568
+SHA256 21f62c57cb5a13a33294e7774981ad876eb71161a8b6a983b1b1dab86624bd3d files/2.3.0/ucb-no-CURL_NO_OLDIES.diff 568
 DIST OOo_2.2.1_src_binfilter.tar.bz2 7756778 RMD160 a6194849bb8e2130709a7ff769a8e751a43f86c6 SHA1 aa2c316e0fab13a25c07c2cfd0eafb7a50c96678 SHA256 13f2f6dad82a085a60724fa6dbc58c564a8c496cc27189af3cd7286a6e6adeb8
 DIST OOo_2.2.1_src_core.tar.bz2 123479583 RMD160 fa6775f397bf093ad5be19c28c18d179bb1057b8 SHA1 dad86ea3e8ed2805986c82333cf7a12040696269 SHA256 adc54c88892f5ced9887945709856efeb628fe5f7b5b2f2aa7797c5391b9c7d6
 DIST OOo_2.2.1_src_l10n.tar.bz2 76560727 RMD160 58f56faab079f179348f4c64cdbe176e296345f7 SHA1 f7c1592210c60313464b7f2cec88cb850578aec1 SHA256 d23cc1d5dc97533b03b04336e2a136ee4a359b2bd8239a008bd3e4508eae2b25
 DIST OOo_2.2.1_src_sdk.tar.bz2 29291551 RMD160 4811c952713526efe7e98090fee58b75e1aca7a3 SHA1 081e4b94a027ac76ccb9e82a8e6c7f87ce950d7d SHA256 7d9e28ce43c52b08864e917709b5a6567543c2538b069fe7e3dfb1dd71796415
+DIST OOo_2.3.0_src_binfilter.tar.bz2 6477306 RMD160 441a43c2a2d5418c9d3b55a89790f31598000bde SHA1 a45b356092fc61aba68d0b7536bb3f723cd62937 SHA256 b2a54d9238a5a316151286f007549b9de633d61b216ef258cc0392c5694e9585
+DIST OOo_2.3.0_src_core.tar.bz2 145104450 RMD160 67c7a97aac4652f8a9cfb3019b9649689977b076 SHA1 339453f169e63f531e24f3d5774e6a5da65b26c1 SHA256 830555d47376b6fc842c32addf2d4c827091df1989b05ea7cc03b82171b27d56
+DIST OOo_2.3.0_src_l10n.tar.bz2 78634672 RMD160 a84678c0bf786869464814b0fa21137acb3250a9 SHA1 ca7dcd4d19d1f5df21fb931fe31cdd779128f49c SHA256 d57d03e6c5ba8e160fa3dfd416ac4cd3baaa14d1588604452551b3d420261120
+DIST OOo_2.3.0_src_sdk.tar.bz2 24033163 RMD160 57a9538cd0722747b19505078ab2d92f8b6c7e6a SHA1 6f43be9c013469f5fe4095826f67776fb53d968c SHA256 0b9663b7db893bcde36bf46205361150237ae38f178150645b0d75e20bf30fc7
 DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
 DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
 DIST hunspell_UNO_1.1.tar.gz 13774 RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 SHA1 d72420069de87062b3e5b4f45235a7bc2c1e124a SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149
+DIST libwpg-0.1.0.tar.gz 398724 RMD160 0270b9fdc1a1f4307d2243a10c7163ee3c9150a9 SHA1 0e7cc503bf0015c68f02fd68768ee54b3b91f118 SHA256 78ea2fdcd542144a7336918123f57908b37f1eb2c41274cd675e18d03f0feb68
 DIST libwpg-0.1.0~cvs20070608.tar.gz 396554 RMD160 4ba3f5286ccc0fdea3962912a8f27dbd20f0feda SHA1 ba01c0a01dc85643f1bc1a750d6ae28cb2e502af SHA256 9d7c85a2c494260fe12fb0ec4e64c2670c5bb0e4abe167f032b72ea586f52903
+DIST libwps-0.1.0.tar.gz 555470 RMD160 aabc3b7938baa50c866f769317476893e5cba231 SHA1 c0f063c4d3913ddb6acc0ebb4b2304713eab0a6c SHA256 c3c4e0a63b0d1e2a3063172b44c722dde84608c3675fb124bb6f7e00f270379e
 DIST libwps-0.1.0~svn20070129.tar.gz 426668 RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 SHA1 928c486d53277072e90fec5dcaa762934e8467d6 SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec
+DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1
 DIST ooo-build-2.2.1.tar.gz 4845814 RMD160 73863358dc7866f2ef9b3454591ad39f6612a271 SHA1 1051eb892960fe86ae7ce2b973ee21d1123ed5f7 SHA256 e642aa70c6b5fdfcb5614f9be787538a9e0f7f4f1c67b74f8c43e4bd5f4dcc3d
+DIST ooo-build-2.3.0.1.2.tar.gz 6103972 RMD160 7359a6269662baa8f63853b2597438eeac1f7284 SHA1 cff1d7154612245ec38382f05b9d1c841f59e685 SHA256 f7f4342b470e249e0353789e92aa4704bc26624841bb2a1ca4e4d19c198beac3
+DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
 EBUILD openoffice-2.2.1.ebuild 11889 RMD160 d8f060050e051a083d51b6afc2738903cfe09a18 SHA1 b41e2787d97e336e0c62d299d1a5c7ad8a442441 SHA256 98f7525fe494ff952810acc6ae454c6fba6041462737335790e6ed39b36a625d
 MD5 dac1ed6e687aa78d5b87cce285332fb7 openoffice-2.2.1.ebuild 11889
 RMD160 d8f060050e051a083d51b6afc2738903cfe09a18 openoffice-2.2.1.ebuild 11889
 SHA256 98f7525fe494ff952810acc6ae454c6fba6041462737335790e6ed39b36a625d openoffice-2.2.1.ebuild 11889
-MISC ChangeLog 69724 RMD160 c9204c5124a915b5d4b2f03a9cdf650fcf357926 SHA1 aa5f5ca553ed3d283f63fb50cb9dd7edc099d387 SHA256 661d1208b98cb9b624239818688728454f5ee3af029ece308c155ade8c68ecee
-MD5 5cd41d64ce87bed4029394c15a3485e9 ChangeLog 69724
-RMD160 c9204c5124a915b5d4b2f03a9cdf650fcf357926 ChangeLog 69724
-SHA256 661d1208b98cb9b624239818688728454f5ee3af029ece308c155ade8c68ecee ChangeLog 69724
+EBUILD openoffice-2.3.0.ebuild 11974 RMD160 78d47930a72e27485cad142a36b59e8555a3685a SHA1 369ebbae3c35eda96144791e607a5a0d83b80efc SHA256 983b431916e7f17d06b83499571e130cf8f84b99e76637b3768a3ed95bea0d4c
+MD5 b62b83e85d264115aada78e25a94fb90 openoffice-2.3.0.ebuild 11974
+RMD160 78d47930a72e27485cad142a36b59e8555a3685a openoffice-2.3.0.ebuild 11974
+SHA256 983b431916e7f17d06b83499571e130cf8f84b99e76637b3768a3ed95bea0d4c openoffice-2.3.0.ebuild 11974
+MISC ChangeLog 70294 RMD160 752bec118377e664943ab893fe965b13a9fb78a6 SHA1 3cfb48e296b8d139c7b2cf30e8696e2fb98b6e5d SHA256 49834907d3b267483129ace721924e876f14dd505509b895690df415cf2f7566
+MD5 57bf170699b3b8a46dcdf6ebd3c4fd80 ChangeLog 70294
+RMD160 752bec118377e664943ab893fe965b13a9fb78a6 ChangeLog 70294
+SHA256 49834907d3b267483129ace721924e876f14dd505509b895690df415cf2f7566 ChangeLog 70294
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -50,3 +87,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 f5f90d28e2fa42bdf0564c622b475978 files/digest-openoffice-2.2.1 3265
 RMD160 99b0f8c9c991ccc2ab6e4850bf52d73578f07aef files/digest-openoffice-2.2.1 3265
 SHA256 6ad627f46984c26bf39734c60fc5227e5b1bd1398fab95f261b2e18b016e87de files/digest-openoffice-2.2.1 3265
+MD5 66ea21045288845e5456bd125a2edd11 files/digest-openoffice-2.3.0 3241
+RMD160 9837703b7a82e0ae6bb00b1657558519edd4d231 files/digest-openoffice-2.3.0 3241
+SHA256 2670647bd1b3f250509243013d64c3c3a3a793eddc5d348598e83df4cd96d485 files/digest-openoffice-2.3.0 3241
diff --git a/app-office/openoffice/files/2.3.0/disable-regcomp-java.diff b/app-office/openoffice/files/2.3.0/disable-regcomp-java.diff
new file mode 100644
index 000000000000..f9a1ff10a483
--- /dev/null
+++ b/app-office/openoffice/files/2.3.0/disable-regcomp-java.diff
@@ -0,0 +1,12 @@
+Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
+--- solenv/bin/modules/installer/servicesfile.pm.orig	2006-04-29 11:25:25.000000000 +0200
++++ solenv/bin/modules/installer/servicesfile.pm	2006-04-29 12:24:45.000000000 +0200
+@@ -471,7 +473,7 @@
+ 	$python_error_occured = 0;
+ 
+ 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
+-	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
++	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
+ 	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
+ 		
+ 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
diff --git a/app-office/openoffice/files/2.3.0/disable-regcomp-python.diff b/app-office/openoffice/files/2.3.0/disable-regcomp-python.diff
new file mode 100644
index 000000000000..e63a91f009eb
--- /dev/null
+++ b/app-office/openoffice/files/2.3.0/disable-regcomp-python.diff
@@ -0,0 +1,12 @@
+Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
+--- solenv/bin/modules/installer/servicesfile.pm.orig	2006-10-23 13:49:24.000000000 +0200
++++ solenv/bin/modules/installer/servicesfile.pm	2006-10-23 13:50:04.000000000 +0200
+@@ -472,7 +472,7 @@
+ 
+ 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
+ 	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
+-	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
++	if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
+ 		
+ 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
+ 	
diff --git a/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff b/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
new file mode 100644
index 000000000000..3c1c5420d81c
--- /dev/null
+++ b/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
@@ -0,0 +1,94 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -57,6 +57,7 @@
+ #!/bin/sh
+ export OOO_EXTRA_ARG='$2'
++unset PYTHONPATH
+ $OOINSTBASE/program/ooqstart $3 "\$@"
+ EOT
+     chmod 755 $1
+ }
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -80,8 +80,8 @@
+ Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian, FrugalwareOnly, CalcSolver, OOXML
+ QiLinux: LinuxCommon, GlobalDesktopFiles
+ #Gentoo
+-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5
+-GentooUnstable: GentooBase, GentooExperimental, OOXML, OOXSTLport5
++GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5, OOXML, OOXSTLport5
++GentooUnstable: GentooBase, GentooExperimental
+ Gentoo : GentooBase
+ Gentoo64: GentooBase
+ # rPath Linux
+@@ -719,6 +719,10 @@
+ 
+ # fixes linking dependency in the reportdesign module
+ buildfix-reportdesign-util-dep.diff, i#81550, pmladek
++
++# don't define -DCURL_NO_OLDIES, breaks with curl 7.17.0
++# Debian #442338, Debian #442368
++ucb-no-CURL_NO_OLDIES.diff
+ 
+ [ NovellOnlyWin32 ]
+ SectionOwner => tml
+@@ -1055,18 +1055,8 @@
+ [ GentooExperimental ]
+ SectionOwner => hmth
+ 
+-# deliver - sshhhh....
+-silent_deliver-i79798.diff, i#79798
+ # Gnu JRE paths.
+ gentooexperimental-gnujre.diff
+-# unused java code
+-disable-parser-jaxp.diff
+-# default inc/lib
+-config_office-XINC-XLIB-defaults.diff, i#65976
+-# gdi/font.cxx: stl list error
+-vcl_font-NO_LIST.diff
+-# linux-headers-2.6.22 issue?!
+-linux-headers.diff
+ 
+ [ GentooOnly ]
+ SectionOwner => aprosky
+@@ -1081,6 +1071,17 @@
+ system-db-check.diff, i#65979, hmth
+ # User ~/.ooo-2.0 as user dir
+ scp2-user-config-ooo-2.0.diff, pmladek
++# deliver - sshhhh....
++silent_deliver-i79798.diff, i#79798
++# unused java code
++disable-parser-jaxp.diff
++# default inc/lib
++config_office-XINC-XLIB-defaults.diff, i#65976
++# gdi/font.cxx: stl list error
++vcl_font-NO_LIST.diff
++# linux-headers-2.6.22 issue?!
++linux-headers.diff
++
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
+
+--- distro-configs/Gentoo.conf.in 
++++ distro-configs/Gentoo.conf.in 
+@@ -3,7 +3,6 @@
+ --enable-libsn
+ --enable-xsltproc
+ --with-dynamic-xinerama
+---with-stlport=/usr
+ --with-system-boost
+ --with-system-curl
+ --with-system-db
+--- configure.in 
++++ configure.in 
+@@ -1024,7 +1024,7 @@
+ UPSTREAM_NAME=
+ UPSTREAM_SOURCE=
+ UPSTREAM_URI=
+-if test "$with_tag" = "OOG680_m3" ; then # more milestones to come...
++if test "$with_tag" = "OOG680_m5" ; then # more milestones to come...
+    UPSTREAM_NAME="OOo_2.3.0_src"
+    if test "z$with_mirror" != "z" ; then
+       UPSTREAM_SOURCE="MIRROR"
+
diff --git a/app-office/openoffice/files/2.3.0/ooo-env_log.diff b/app-office/openoffice/files/2.3.0/ooo-env_log.diff
new file mode 100644
index 000000000000..908169ab6c5a
--- /dev/null
+++ b/app-office/openoffice/files/2.3.0/ooo-env_log.diff
@@ -0,0 +1,25 @@
+--- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
++++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
+@@ -21,9 +21,8 @@
+ echo "configuring ...";
+ autoconf || exit 1;
+ 
+-echo "Env for configure:"
+-set
+-echo "Env for configure ends"
++echo "Log Env for configure to `pwd`/env.log"
++set > env.log
+ 
+ eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
+ 
+@@ -88,8 +88,8 @@
+ # similar that gives child nmake's pain.
+ unset MAKEFLAGS
+ 
+-echo "Env:"
+-set
++echo "Log Env to `pwd`/env.log"
++set > env.log
+ 
+ # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
+ # already merged?
diff --git a/app-office/openoffice/files/2.3.0/regcompapply.diff b/app-office/openoffice/files/2.3.0/regcompapply.diff
new file mode 100644
index 000000000000..007a74949a6b
--- /dev/null
+++ b/app-office/openoffice/files/2.3.0/regcompapply.diff
@@ -0,0 +1,13 @@
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -1089,6 +1089,9 @@
+ system-db-check.diff, i#65979, hmth
+ # User ~/.ooo-2.0 as user dir
+ scp2-user-config-ooo-2.0.diff, pmladek
++#fix build on ppc
++disable-regcomp-java.diff
++disable-regcomp-python.diff
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
+
diff --git a/app-office/openoffice/files/2.3.0/ucb-no-CURL_NO_OLDIES.diff b/app-office/openoffice/files/2.3.0/ucb-no-CURL_NO_OLDIES.diff
new file mode 100644
index 000000000000..4ec2d7a0e514
--- /dev/null
+++ b/app-office/openoffice/files/2.3.0/ucb-no-CURL_NO_OLDIES.diff
@@ -0,0 +1,19 @@
+Index: source/ucp/ftp/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/ftp/makefile.mk,v
+retrieving revision 1.13
+retrieving revision 1.12
+diff -u -u -r1.13 -r1.12
+--- ucb/source/ucp/ftp/makefile.mk	20 Sep 2004 14:32:42 -0000	1.13
++++ ucb/source/ucp/ftp/makefile.mk	2 Feb 2004 18:36:22 -0000	1.12
+@@ -75,9 +75,7 @@
+ 
+ .INCLUDE: settings.mk
+ 
+-.IF "$(SYSTEM_CURL)" == "YES"
+-CFLAGS+=-DCURL_NO_OLDIES
+-.ENDIF
++#CFLAGS +=-fno-inline
+ 
+ # --- General -----------------------------------------------------
+ 
diff --git a/app-office/openoffice/files/digest-openoffice-2.3.0 b/app-office/openoffice/files/digest-openoffice-2.3.0
new file mode 100644
index 000000000000..8dc6e7f7ab04
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-2.3.0
@@ -0,0 +1,39 @@
+MD5 27a1406a825ed465c71c39f3abfd622a OOo_2.3.0_src_binfilter.tar.bz2 6477306
+RMD160 441a43c2a2d5418c9d3b55a89790f31598000bde OOo_2.3.0_src_binfilter.tar.bz2 6477306
+SHA256 b2a54d9238a5a316151286f007549b9de633d61b216ef258cc0392c5694e9585 OOo_2.3.0_src_binfilter.tar.bz2 6477306
+MD5 d447057b2af58020234cb9db6c782bfa OOo_2.3.0_src_core.tar.bz2 145104450
+RMD160 67c7a97aac4652f8a9cfb3019b9649689977b076 OOo_2.3.0_src_core.tar.bz2 145104450
+SHA256 830555d47376b6fc842c32addf2d4c827091df1989b05ea7cc03b82171b27d56 OOo_2.3.0_src_core.tar.bz2 145104450
+MD5 f47384bfd7959c9de0d47b2b23544557 OOo_2.3.0_src_l10n.tar.bz2 78634672
+RMD160 a84678c0bf786869464814b0fa21137acb3250a9 OOo_2.3.0_src_l10n.tar.bz2 78634672
+SHA256 d57d03e6c5ba8e160fa3dfd416ac4cd3baaa14d1588604452551b3d420261120 OOo_2.3.0_src_l10n.tar.bz2 78634672
+MD5 0628ba6d36923fe576af6d1dd90b8b25 OOo_2.3.0_src_sdk.tar.bz2 24033163
+RMD160 57a9538cd0722747b19505078ab2d92f8b6c7e6a OOo_2.3.0_src_sdk.tar.bz2 24033163
+SHA256 0b9663b7db893bcde36bf46205361150237ae38f178150645b0d75e20bf30fc7 OOo_2.3.0_src_sdk.tar.bz2 24033163
+MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
+RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
+SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
+MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
+RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
+SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
+MD5 1d9644fb4c90511255c1576b4b30b1d2 libwpg-0.1.0.tar.gz 398724
+RMD160 0270b9fdc1a1f4307d2243a10c7163ee3c9150a9 libwpg-0.1.0.tar.gz 398724
+SHA256 78ea2fdcd542144a7336918123f57908b37f1eb2c41274cd675e18d03f0feb68 libwpg-0.1.0.tar.gz 398724
+MD5 8b026225b968dd0a76dedae844f2f030 libwps-0.1.0.tar.gz 555470
+RMD160 aabc3b7938baa50c866f769317476893e5cba231 libwps-0.1.0.tar.gz 555470
+SHA256 c3c4e0a63b0d1e2a3063172b44c722dde84608c3675fb124bb6f7e00f270379e libwps-0.1.0.tar.gz 555470
+MD5 26b3e95ddf3d9c077c480ea45874b3b8 lp_solve_5.5.0.10_source.tar.gz 769268
+RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 lp_solve_5.5.0.10_source.tar.gz 769268
+SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695 lp_solve_5.5.0.10_source.tar.gz 769268
+MD5 b3d2f355af570accb8b2ac61cdba261e ooo-build-2.3.0.1.2.tar.gz 6103972
+RMD160 7359a6269662baa8f63853b2597438eeac1f7284 ooo-build-2.3.0.1.2.tar.gz 6103972
+SHA256 f7f4342b470e249e0353789e92aa4704bc26624841bb2a1ca4e4d19c198beac3 ooo-build-2.3.0.1.2.tar.gz 6103972
+MD5 42aceb3508ff8b5ed04d0451b30f6ccf oox.2007-09-05.tar.bz2 357665
+RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 oox.2007-09-05.tar.bz2 357665
+SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769 oox.2007-09-05.tar.bz2 357665
+MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
+RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
+SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
+MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
+RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
+SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516
diff --git a/app-office/openoffice/openoffice-2.3.0.ebuild b/app-office/openoffice/openoffice-2.3.0.ebuild
new file mode 100644
index 000000000000..d9eeaf9ec89a
--- /dev/null
+++ b/app-office/openoffice/openoffice-2.3.0.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.1 2007/09/18 07:27:55 suka Exp $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+
+inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
+
+IUSE="binfilter cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav xulrunner"
+
+MY_PV="2.3.0.1.2"
+PATCHLEVEL="OOG680"
+SRC="OOo_${PV}_src"
+S="${WORKDIR}/ooo"
+S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
+CONFFILE="${S}/distro-configs/Gentoo.conf.in"
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+
+SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
+	binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
+	http://go-oo.org/packages/OOG680/ooo-build-${MY_PV}.tar.gz
+	odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
+		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
+	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
+	http://go-oo.org/packages/SRC680/biblio.tar.bz2
+	http://go-oo.org/packages/xt/xt-20051206-src-only.zip
+	http://go-oo.org/packages/SRC680/lp_solve_5.5.0.10_source.tar.gz
+	http://go-oo.org/packages/SRC680/libwps-0.1.0.tar.gz
+	http://go-oo.org/packages/SRC680/libwpg-0.1.0.tar.gz
+	http://go-oo.org/packages/SRC680/oox.2007-09-05.tar.bz2"
+
+LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu_IN he hi_IN hr hu it ja km ko ku lt lv mk ml_IN mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh_YU sk sl sr_CS ss st sv sw_TZ ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
+LANGS="${LANGS1} en en_US"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+for Y in ${LANGS1} ; do
+	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
+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
+	>=dev-lang/perl-5.0
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	gnome? ( >=x11-libs/gtk+-2.10
+		>=gnome-base/gnome-vfs-2.6
+		>=gnome-base/gconf-2.0 )
+	gtk? ( >=x11-libs/gtk+-2.10 )
+	cairo? ( >=x11-libs/cairo-1.0.2
+		>=x11-libs/gtk+-2.10 )
+	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.2 )
+	java? ( >=dev-java/bsh-2.0_beta4
+		>=dev-java/xalan-2.7
+		>=dev-java/xerces-2.7
+		=dev-java/xml-commons-external-1.3* )
+	mono? ( >=dev-lang/mono-1.2.3.1 )
+	firefox? ( >=www-client/mozilla-firefox-1.5-r9
+		>=dev-libs/nspr-4.6.2
+		>=dev-libs/nss-3.11-r1 )
+	!firefox? ( seamonkey? ( www-client/seamonkey
+		>=dev-libs/nspr-4.6.2
+		>=dev-libs/nss-3.11-r1 ) )
+	sound? ( >=media-libs/portaudio-18.1-r5
+			>=media-libs/libsndfile-1.0.9 )
+	webdav? ( >=net-misc/neon-0.24.7 )
+	>=x11-libs/startup-notification-0.5
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.3.0
+	cups? ( net-print/cups )
+	media-libs/jpeg
+	media-libs/libpng
+	sys-devel/flex
+	sys-devel/bison
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	>=app-admin/eselect-oodict-20060706
+	dev-libs/expat
+	>=dev-libs/icu-3.4
+	>=sys-libs/db-4.3
+	>=dev-libs/glib-2.12
+	>=app-text/libwpd-0.8.8
+	>=media-libs/libsvg-0.1.4
+	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
+	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
+
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXrender
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	>=sys-apps/findutils-4.1.20-r1
+	dev-perl/Archive-Zip
+	dev-perl/Compress-Zlib
+	>=dev-perl/Compress-Raw-Zlib-2.002
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=dev-libs/boost-1.33.1
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.0
+	>=net-misc/curl-7.9.8
+	sys-libs/zlib
+	sys-apps/coreutils
+	pam? ( sys-libs/pam )
+	!dev-util/dmake
+	>=dev-lang/python-2.3.4
+	java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* )
+		dev-java/ant-core )
+	ldap? ( net-nds/openldap )"
+
+PROVIDE="virtual/ooo"
+
+if use amd64; then
+	# All available Java 1.5 JDKs are broken, in one way or another, on amd64.
+	# Thus we force the use of a Java 1.4 JDK on amd64 (and amd64 only).
+	export JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
+fi
+
+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
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="256"
+	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
+	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' -e '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 (i.e. help) being disabled. "
+		ewarn " If something you need does not work for you, rebuild with "
+		ewarn " java in your 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
+
+	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
+
+	# Hackish workaround for overlong path problem, see bug #130837
+	mv ${S_OLD} ${S} || die
+
+	#Some fixes for our patchset
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
+	epatch ${FILESDIR}/${PV}/ooo-env_log.diff
+
+	cp -f ${FILESDIR}/${PV}/ucb-no-CURL_NO_OLDIES.diff ${S}/patches/src680 || die
+
+	if use ppc ; then
+		cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die
+		cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die
+		epatch ${FILESDIR}/${PV}/regcompapply.diff
+	fi
+
+	#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-system-beanshell" >> ${CONFFILE}
+		echo "--with-system-xalan" >> ${CONFFILE}
+		echo "--with-system-xerces" >> ${CONFFILE}
+		echo "--with-system-xml-apis" >> ${CONFFILE}
+		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
+		echo "--with-serializer-jar=$(java-pkg_getjar xalan serializer.jar)" >> ${CONFFILE}
+		echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE}
+		echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE}
+		echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE}
+	fi
+
+	# Upstream bitmaps are broken, so force ours for now
+	echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
+
+	echo "`use_enable binfilter`" >> ${CONFFILE}
+
+	if use firefox || use seamonkey || use xulrunner ; then
+		echo "--enable-mozilla" >> ${CONFFILE}
+		local browser
+		use xulrunner && browser="xulrunner"
+		use seamonkey && browser="seamonkey"
+		use firefox && browser="firefox"
+
+		echo "--with-system-mozilla=${browser}" >> ${CONFFILE}
+	else
+		echo "--disable-mozilla" >> ${CONFFILE}
+	fi
+
+	echo "`use_enable cups`" >> ${CONFFILE}
+	echo "`use_enable ldap`" >> ${CONFFILE}
+	echo "`use_with ldap openldap`" >> ${CONFFILE}
+	echo "`use_enable eds evolution2`" >> ${CONFFILE}
+	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
+	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
+	echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
+	echo "`use_enable gstreamer`" >> ${CONFFILE}
+	echo "`use_enable dbus`" >> ${CONFFILE}
+	echo "`use_enable webdav neon`" >> ${CONFFILE}
+	echo "`use_with webdav system-neon`" >> ${CONFFILE}
+
+	echo "`use_enable sound pasf`" >> ${CONFFILE}
+	echo "`use_with sound system-portaudio`" >> ${CONFFILE}
+	echo "`use_with sound system-sndfile`" >> ${CONFFILE}
+
+	echo "`use_enable debug crashdump`" >> ${CONFFILE}
+
+	eautoreconf
+
+}
+
+src_compile() {
+
+	unset LIBC
+	addpredict "/bin"
+	addpredict "/root/.gconfd"
+	addpredict "/root/.gnome"
+
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	export JOBS="1"
+	if [[ "${WANT_MP}" == "true" ]]; then
+		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
+	fi
+
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	filter-flags "-fstack-protector"
+	filter-flags "-fstack-protector-all"
+	filter-flags "-ftracer"
+	filter-flags "-fforce-addr"
+	replace-flags "-O?" "-O2"
+
+	use ppc && append-flags "-D_STLP_STRICT_ANSI"
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# Make sure gnome-users get gtk-support
+	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
+
+	cd ${S}
+	./configure ${MYCONF} \
+		--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="OOG680_m5" \
+		"${GTKFLAG}" \
+		`use_enable kde` \
+		`use_enable cairo` \
+		`use_with cairo system-cairo` \
+		`use_enable gnome quickstart` \
+		`use_enable mono` \
+		`use_enable pam` \
+		`use_enable !debug strip` \
+		`use_enable odk` \
+		`use_with java` \
+		--disable-access \
+		--disable-post-install-scripts \
+		--enable-hunspell \
+		--enable-openxml \
+		--with-system-hunspell \
+		--with-system-libwpd \
+		--with-system-libsvg \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		|| die "Configuration failed!"
+
+	einfo "Building OpenOffice.org..."
+	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 -R root:root ${D}
+
+	# record java libraries
+	use java && java-pkg_regjar ${D}/usr/$(get_libdir)/openoffice/program/classes/*.jar
+
+}
+
+pkg_postinst() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	eselect oodict update --libdir $(get_libdir)
+
+	[[ -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/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+
+	elog " To start OpenOffice.org, run:"
+	elog
+	elog " $ ooffice"
+	elog
+	elog " Also, for individual components, you can use any of:"
+	elog
+	elog " oobase, oocalc, oodraw, oofromtemplate, ooimpress, oomath,"
+	elog " ooweb or oowriter"
+	elog
+	elog " Spell checking is now 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. "
+
+}