Silent bump to ooo-build-2.4.0.10, only some minor bug fixes

Package-Manager: portage-2.1.5_rc7

11 files changed, 15 insertions, 549 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index b95d8f301939..54a3be7c9bd7 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.394 2008/04/28 16:10:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.395 2008/05/09 14:01:04 suka Exp $
+
+  09 May 2008; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.3.1/regcompapply.diff, -files/2.3.1/gentoo-2.3.1-r1.diff,
+  -files/2.3.1/disable-regcomp-java.diff, -files/2.3.1/ooo-env_log.diff,
+  -files/2.3.1/stlport-ppc-buildfix.diff,
+  -files/2.3.1/disable-regcomp-python.diff,
+  -files/2.3.1/stlport-ppc-buildfix-apply.diff, -openoffice-2.3.1-r1.ebuild,
+  openoffice-2.4.0.ebuild:
+  Silent bump to ooo-build-2.4.0.10, only some minor bugfixes
 
   28 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   openoffice-2.4.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 35cef5f7fa56..5b3316a00bdc 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,35 +1,18 @@
-AUX 2.3.1/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
-AUX 2.3.1/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 SHA1 700513af0ae8eb2a1dcd4b62f06bbf3bc034b339 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1
-AUX 2.3.1/gentoo-2.3.1-r1.diff 381 RMD160 9c6f5727f4ffa1185d110cb25ccda5b171602b01 SHA1 92a48078b6db1a68e8a07cf677b3cd53e1f2ef19 SHA256 6c32bcc344c0405bded86368ab99066ac48fe063e180fe1bef3ce14aa6cf0019
-AUX 2.3.1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
-AUX 2.3.1/regcompapply.diff 312 RMD160 6f92774febf7a78091f2eddf2f589d271f155864 SHA1 a9328d636b94416d9a7ffdd6aa8a94d1cca77aeb SHA256 e6245f28282c5a43bca1c127f2622cf4ea5726bc5761c3d3a7be3dd0bf6068a8
-AUX 2.3.1/stlport-ppc-buildfix-apply.diff 257 RMD160 777695a68b975bf3a584d5f125dfdc16d584a955 SHA1 f3e0df039c00881b02741afceada9676030b4c4e SHA256 dbe5d331fdf44964098791034164b61c2d4911066cd538c8908ca908dfd66da3
-AUX 2.3.1/stlport-ppc-buildfix.diff 2192 RMD160 9f1b5be42101f0abbc0be98570643cb42fe74246 SHA1 d6ad0f4a73778f7d0c29a65c004d8f2c962bce5b SHA256 979ef2431fd40e3142b4213370bd16c7f6b99ff49d43d572164c1b43adba1b1f
 AUX 2.4.0/gentoo-2.4.0.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7
 AUX 2.4.0/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
-DIST OOo_2.3.1_src_binfilter.tar.bz2 6476673 RMD160 497aec1de49ea941ab8305331a9fc9e8e04a5162 SHA1 0643c52da3850a164928342e7651897b7a76ca1f SHA256 9a76f8eae3dd546f42db883c12f8f21823e0e28ed6d43e83871dd1c1e07fff57
-DIST OOo_2.3.1_src_core.tar.bz2 144156134 RMD160 ab75c022d00ed6269eb9437f9c022e44181c6d3a SHA1 de189e03a329cdd334823a52b800fad0c033ab4d SHA256 4c807dd262eb714397de9e78d244d587968a92142a917dbb47f5180c40db6753
-DIST OOo_2.3.1_src_l10n.tar.bz2 79077332 RMD160 bc10b1e05574aced79532fbef316e66dcb810fbf SHA1 004defae1496cf4b953a233abb20fd4c7e162423 SHA256 c4834074b97c39b14b89d35bf87cf06bfd690cdbf5d4473d4e15f8a23ebbdb64
-DIST OOo_2.3.1_src_sdk.tar.bz2 24032680 RMD160 59b245c81e9cc6d43c60070fd5dc78c38d806db6 SHA1 65093dc8224d5b9771c58651f5ae6c6df1a58748 SHA256 11fed832b5a32390885a387cbf9ce2d31b652af8dedebc844ab95a80b5aa5066
 DIST OOo_2.4.0_src_binfilter.tar.bz2 6675120 RMD160 fff7a0a61b19881559e4f20ddd36031565f635e1 SHA1 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8 SHA256 e9ca5f5a744dc39a6785bc54964119c4e7eafa2035c4c2151138749e5e1cc723
 DIST OOo_2.4.0_src_core.tar.bz2 153590855 RMD160 f8be874225a4f8a90bf20d563db175f3381e224e SHA1 1f775a0f2b755ad1c4cb7d14df93d86948424e7f SHA256 77c923ff93fb122ea9fefea21a578f5be825bae7f7e7ab3a88ff9fee87047921
 DIST OOo_2.4.0_src_l10n.tar.bz2 81193819 RMD160 a52ed9e7a7511ad12cf6cef98e64a3ef384dd383 SHA1 3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e SHA256 9aae5acd77e21a6a342e9577136b336d903a883b6707684498fc1863c061ced2
 DIST OOo_2.4.0_src_sdk.tar.bz2 38429 RMD160 a7be6d25e51c240ade4e6c6045cfa2ee737f9fd1 SHA1 74c6a92ddb6694850aaae10fa0e7c485e8083a7e SHA256 117b8a2d0ad4e31745f35e0695fa26e39fcc04b07c42f75ddf3715b40958f368
 DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
 DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
-DIST libwpg-0.1.0.tar.gz 398724 RMD160 0270b9fdc1a1f4307d2243a10c7163ee3c9150a9 SHA1 0e7cc503bf0015c68f02fd68768ee54b3b91f118 SHA256 78ea2fdcd542144a7336918123f57908b37f1eb2c41274cd675e18d03f0feb68
 DIST libwpg-0.1.2.tar.gz 401460 RMD160 9bb39a4b3081277209326c0f553d398c51b4f3bf SHA1 06f4da8fcddaa1987c761f617c41724734e839fa SHA256 1fd363db1debd3f0883b942704809d758f54a3a7d09fc1ddfbd99a1062d4e851
-DIST libwps-0.1.0.tar.gz 555470 RMD160 aabc3b7938baa50c866f769317476893e5cba231 SHA1 c0f063c4d3913ddb6acc0ebb4b2304713eab0a6c SHA256 c3c4e0a63b0d1e2a3063172b44c722dde84608c3675fb124bb6f7e00f270379e
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
 DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
-DIST ooo-build-2.3.1.2.tar.gz 8919121 RMD160 bbf48c05b9bfbd4633bc798b2e92c45c464b40dd SHA1 10c444bbe42a061350551b6d6ee7d65fb3aeb876 SHA256 9b0f77291d48e1fe2a7a6de766f7fc60fae17e1010aacafeb9c42c0d193740bf
-DIST ooo-build-2.4.0.8.tar.gz 8600047 RMD160 092a82967b26ffc441edfe31662577f1b5d529f2 SHA1 f9327d9c72f066ce008258e1146a846ca99999b5 SHA256 9cdf153ce43a85e6141bb6aeb26dbfa72590e5f0f85d1b12a09f973fe9f6601c
-DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
+DIST ooo-build-2.4.0.10.tar.gz 8619575 RMD160 4ddd44ad421519549b38d64641cb684ea62f8fe9 SHA1 b2ab4ec1ca462af8a5c4fe92418dd82f7c127f4b SHA256 b715407892f984e864c14a78136be3a6f3cd3d340951ed8a60c821c119538156
 DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
-DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
-EBUILD openoffice-2.3.1-r1.ebuild 12385 RMD160 15cc21255d3cedf5b16019faf8dcd7d52055b8a9 SHA1 f74bec8f21572caa6eded91662b6c977f2223539 SHA256 e3b877db697ac97d8e1dc12291deab4b25c97343ed8041a30b1b4f8bb322da92
-EBUILD openoffice-2.4.0.ebuild 12711 RMD160 5fc34ae7ddd790783cf98e4791a5d31f59475329 SHA1 563bf867dcaca54f56dd107ef791ffab29d38489 SHA256 47fe0d156bb35301189d7e81f397588b876259d06cdf3c3a5be4a6f0fd370dfa
-MISC ChangeLog 81655 RMD160 831a80aaaf93e8de10f7e6a4a60b5bfd5a61b18b SHA1 5f5c1ef8ddf78c3f7af2a9ceef021af9b160ecc2 SHA256 b6a82166967601c9ce214d975ada69292989961216abb29416a51a77fc6df4c5
+EBUILD openoffice-2.4.0.ebuild 12706 RMD160 16882e0f3f24d109dcf55ac903d2081dc02c340b SHA1 54f646e2a9838a4aa639a3e814ff9919f7ed6292 SHA256 c257ce623dcf4381243f3db7cbeaedf3137a4299f2f291ee640d547b5d379371
+MISC ChangeLog 82097 RMD160 5cf9225cc8e9991614d452f59509ae10e733e6ad SHA1 2dd74491e26f365dcac8771288727371415d6c66 SHA256 9c21f4f635cf7d4dc09190efc411f924034abada8ba4c1e0a3f5177a7de8fb63
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
diff --git a/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff b/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff
deleted file mode 100644
index f9a1ff10a483..000000000000
--- a/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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.1/disable-regcomp-python.diff b/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff
deleted file mode 100644
index e63a91f009eb..000000000000
--- a/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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.1/gentoo-2.3.1-r1.diff b/app-office/openoffice/files/2.3.1/gentoo-2.3.1-r1.diff
deleted file mode 100644
index d7143c73274c..000000000000
--- a/app-office/openoffice/files/2.3.1/gentoo-2.3.1-r1.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
---- distro-configs/Gentoo.conf.in 
-+++ distro-configs/Gentoo.conf.in 
-@@ -3,5 +3,4 @@
- --enable-libsn
- --enable-xsltproc
- --with-dynamic-xinerama
----with-stlport=/usr
- --with-system-boost
- --with-system-curl
-
diff --git a/app-office/openoffice/files/2.3.1/ooo-env_log.diff b/app-office/openoffice/files/2.3.1/ooo-env_log.diff
deleted file mode 100644
index 908169ab6c5a..000000000000
--- a/app-office/openoffice/files/2.3.1/ooo-env_log.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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.1/regcompapply.diff b/app-office/openoffice/files/2.3.1/regcompapply.diff
deleted file mode 100644
index e3554ea16aa8..000000000000
--- a/app-office/openoffice/files/2.3.1/regcompapply.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -1087,6 +1087,9 @@
- [ GentooOnly ]
- SectionOwner => aprosky
- 
-+#fix build on ppc
-+disable-regcomp-java.diff
-+disable-regcomp-python.diff
- # Allow build to proceed with PaX enabled
- gentoo-pax-fix.diff, aprosky
- # support server-only versions of 64bit JDKs
-
diff --git a/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff b/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff
deleted file mode 100644
index 49f69c796699..000000000000
--- a/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -1063,6 +1063,8 @@
- vcl_font-NO_LIST.diff
- # linux-headers-2.6.22 issue?!
- linux-headers.diff
-+# stlport build problem on ppc
-+stlport-ppc-buildfix.diff
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
-
diff --git a/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff b/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff
deleted file mode 100644
index af70e4f26f13..000000000000
--- a/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- stlport/STLport-4.5.patch	2005-01-06 12:26:48.770546592 +1100
-+++ stlport/STLport-4.5.patch	2005-01-06 12:26:01.125789696 +1100
-@@ -509,6 +509,45 @@
-   
-   CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-   CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- misc/build/STLport-4.5/src/gcc-linux.mak.old	2005-01-06 12:22:54.127217800 +1100
-++++ misc/build/STLport-4.5/src/gcc-linux.mak	2005-01-06 12:24:28.192917640 +1100
-+@@ -46,8 +46,8 @@
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
-+ 
-+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC
-+ 
-+ include common_percent_rules.mak
-+ include common_rules.mak
-+--- misc/build/STLport-4.5/src/gcc.mak.old	2005-01-06 15:20:18.840975336 +1100
-++++ misc/build/STLport-4.5/src/gcc.mak	2005-01-06 15:21:00.373661408 +1100
-+@@ -44,8 +44,8 @@
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
-+ 
-+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
-+ 
-+ include common_percent_rules.mak
-+ include common_rules.mak
-+--- misc/build/STLport-4.5/src/gcc-3.0.mak.orig
-++++ misc/build/STLport-4.5/src/gcc-3.0.mak 
-+@@ -43,8 +43,8 @@
-+ 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
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
-+ 
-+ include common_percent_rules.mak
-+ include common_rules.mak
- *** misc/STLport-4.5/stlport/config/stl_gcc.h	Tue Sep  4 19:10:16 2001
- --- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Thu Jul 26 12:13:03 2007
- ***************
-
diff --git a/app-office/openoffice/openoffice-2.3.1-r1.ebuild b/app-office/openoffice/openoffice-2.3.1-r1.ebuild
deleted file mode 100644
index f62269d5306e..000000000000
--- a/app-office/openoffice/openoffice-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1-r1.ebuild,v 1.9 2008/03/24 16:05:36 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.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/${PATCHLEVEL}/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* )
-	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-2*
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 )
-	!firefox? ( seamonkey? ( =www-client/seamonkey-1*
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) )
-	!firefox? ( !seamonkey? ( xulrunner? ( =net-libs/xulrunner-1.8*
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) ) )
-	sound? ( >=media-libs/portaudio-18.1-r5
-			>=media-libs/libsndfile-1.0.9 )
-	webdav? ( =net-misc/neon-0.26* )
-	>=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.8
-	>=sys-libs/db-4.3
-	>=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-perl/IO-Compress-Base
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=dev-libs/boost-1.33.1
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.0
-	dev-util/gperf
-	>=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}-r1.diff"
-	epatch "${FILESDIR}/${PV}/ooo-env_log.diff"
-
-	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"
-		#Fix for internal STLport
-		cp -f "${FILESDIR}/${PV}/stlport-ppc-buildfix.diff" "${S}/patches/src680" || die
-		epatch "${FILESDIR}/${PV}/stlport-ppc-buildfix-apply.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}
-		echo "--without-system-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"
-
-	# Build problems with STLport and regcomp without these
-	use ppc && append-flags "-D_STLP_STRICT_ANSI -fno-schedule-insns"
-
-	# 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}" \
-		--host="${CHOST}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--without-binsuffix \
-		--with-installed-ooo-dirname="openoffice" \
-		--with-tag="OOG680_m9" \
-		"${GTKFLAG}" \
-		`use_enable mono` \
-		`use_enable kde` \
-		`use_enable cairo` \
-		`use_with cairo system-cairo` \
-		`use_enable gnome quickstart` \
-		`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:0 "${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. "
-
-}
diff --git a/app-office/openoffice/openoffice-2.4.0.ebuild b/app-office/openoffice/openoffice-2.4.0.ebuild
index 34d2a1cdbb8e..83efe8b32df8 100644
--- a/app-office/openoffice/openoffice-2.4.0.ebuild
+++ b/app-office/openoffice/openoffice-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.16 2008/04/28 16:10:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.17 2008/05/09 14:01:04 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,7 +9,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk opengl pam seamonkey webdav xulrunner"
 
-MY_PV="2.4.0.8"
+MY_PV="2.4.0.10"
 PATCHLEVEL="OOH680"
 SRC="OOo_${PV}_src"
 MST="OOH680_m12"