Final release of OOo 2.0.4, should be unmasked soonish

(Portage version: 2.1.2_pre2-r9)
 (Unsigned Manifest commit)

4 files changed, 24 insertions, 382 deletions

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index b580270043c9..9ef11d5ef333 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,39 +2,43 @@ AUX 2.0.3/gentoo-2.0.3.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9
 MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.3/gentoo-2.0.3.diff 523
 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.3/gentoo-2.0.3.diff 523
 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.3/gentoo-2.0.3.diff 523
-AUX 2.0.4_rc2/gentoo-2.0.4_rc2.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 SHA1 84f3aa66994463524e53fceac8d6e3fc143f00d1 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527
-MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.4_rc2/gentoo-2.0.4_rc2.diff 523
-RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.4_rc2/gentoo-2.0.4_rc2.diff 523
-SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.4_rc2/gentoo-2.0.4_rc2.diff 523
+AUX 2.0.4/gentoo-2.0.4.diff 889 RMD160 c32c3187d475f93616e1ba83de5620d16dd3217b SHA1 91f68516051282588138053277ee54520a856e67 SHA256 ce23c9c02eb24ff3a233b7624fedd8637bdce5428c0380b6e271eb11780d6247
+MD5 2d44ca48ed3839810221347e0c269f06 files/2.0.4/gentoo-2.0.4.diff 889
+RMD160 c32c3187d475f93616e1ba83de5620d16dd3217b files/2.0.4/gentoo-2.0.4.diff 889
+SHA256 ce23c9c02eb24ff3a233b7624fedd8637bdce5428c0380b6e271eb11780d6247 files/2.0.4/gentoo-2.0.4.diff 889
+AUX 2.0.4/system-icu.diff 15718 RMD160 d083662ab42bd2871d5579da13e2f0370eb4dc6a SHA1 2d9b26e6dd127607f7b5a4561bc7d3b2b4069a41 SHA256 022c95ff7ccc24ce4d2a59180c252729801e61643a599d4353742dd7dd7fd9ef
+MD5 1b9d5379352595c6ceb0cb042413c4a9 files/2.0.4/system-icu.diff 15718
+RMD160 d083662ab42bd2871d5579da13e2f0370eb4dc6a files/2.0.4/system-icu.diff 15718
+SHA256 022c95ff7ccc24ce4d2a59180c252729801e61643a599d4353742dd7dd7fd9ef files/2.0.4/system-icu.diff 15718
 DIST OOO_2_0_3-binfilter.tar.bz2 17307831 RMD160 a8bb291789bee4692804f8fc3b32ce204689d7a3 SHA1 fa89f8f7c1414b365b78467dc4007d802e9ffd68 SHA256 eeb478603262ea62bc749f6698512bf0463d66cc2a5669db6ecedeb937577864
 DIST OOO_2_0_3-core.tar.bz2 109469286 RMD160 d40a11614ef9d25b6af96485877a347ffb6cefd0 SHA1 2ec6cee1fad05c128eb8c0b4e4ab7d9ca1b2c71f SHA256 0d6889e0426590e58c546ca03d227f266ced7de41bc55bcec7ff6f3cfd238c2d
 DIST OOO_2_0_3-lang.tar.bz2 64201627 RMD160 f893f84ad3c3526c15eb935163d7d98c201d225d SHA1 7525407d609a40ff1edb2c3b74642fd5e83d7921 SHA256 d9120ed91073ec624e60e604872611ecbde204300762874cf5a673addfda4dd8
 DIST OOO_2_0_3-system.tar.bz2 28225148 RMD160 19f74a40c7901172d53adc2847de2b3770542c3b SHA1 9007110b99cf4055da26104ce7728f3dd2220777 SHA256 00b5e13cf9442a6c6c1848690394fcb06d972caded72c33b15ac6860b525d3a3
+DIST OOO_2_0_4-binfilter.tar.bz2 16802527 RMD160 2574dd0cef9d6976b62e0a16d75b577d8002b139 SHA1 706032793396dcfbe462c8eff212d11a15b54a03 SHA256 45bf3993ddeab5a1bc724111f6066933cac9129493db24204ffe35840842af35
+DIST OOO_2_0_4-core.tar.bz2 121332967 RMD160 bc57ce5f6ff0a4ef714cbf7097b319d61d7ffc25 SHA1 19adc4be9306d3d05ed6da23f2d9c66bcededa51 SHA256 010dfa7b87a426ccea82a14c53877280a771448b9d935a49a636e82512e58cff
+DIST OOO_2_0_4-lang.tar.bz2 71585371 RMD160 acc3c0507011bad12a8c423e73bf5ea4750500e1 SHA1 aa517e80b6bdf3c80d738b6dd18aee85588f19ab SHA256 f22f54afe7a8bc4aae9b0714b5028600911bc8bd2b54b4c4f40839c508daaa5f
+DIST OOO_2_0_4-system.tar.bz2 28794627 RMD160 f47a7d516f79ac4734e04cf6cbbcb7424a573d59 SHA1 af844362349ffd45bbf7071448bf3c1ae3ebf08f SHA256 4601d6dd0483b1df1f975bc3ccae1f6c354a4e083ade94483e8a31842bd9da5c
 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 libwpd-0.8.3.tar.gz 482757 RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 SHA1 397b33bf77a6bfbab71ca3de7e42bc99ab80fdd6 SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c
 DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1
-DIST ood680-m4-binfilter.tar.bz2 16800760 RMD160 a864e9929d0156330371bffcc37b77facfc906db SHA1 fc86485f7bf8a9d4b0a51a21ccb66a1a8b2915df SHA256 430d5d164e8f48ae600b130868586e5b50b7c4c98f3138b2333be9c4590388e4
-DIST ood680-m4-core.tar.bz2 121412930 RMD160 5bcaaa997e1eb0a1e7e2335f8aaa4076a1f5ae13 SHA1 a75db6d477285ea04d2bfe689a8380a07161d410 SHA256 e79b733e61990557d6bd05b3955c6f3a4e817d18aa767e8c54384875efd974d3
-DIST ood680-m4-lang.tar.bz2 71589219 RMD160 25e5208245ea87f00582113c6b05961e120843ae SHA1 8f90d2d49a41a1794fc8838dc27c74b36a46a26c SHA256 5ba171ec5b49b04505ce71b2a734d94166262fcfd0594f9dd070681ce7d84522
-DIST ood680-m4-system.tar.bz2 28791586 RMD160 b78b0f0c236d6135aef06e9ae75e6bf7139feca4 SHA1 2e6149c46576504dce2da99aa60ad03985be1846 SHA256 fb19326a3843d7a493440d53dc7b6153d4286354a5c30ccc4d4881f4547923df
 DIST ooo-build-2.0.3.0.tar.gz 5158406 RMD160 45eb102b17f4b55b1b44f0eb08a933b75b9eb3dc SHA1 a8d5c3d264819620bcb0122342558debc50c8729 SHA256 b425013aa40d1fd4e3d596a38b2add86ae9c4d7e84cc23e1b2b5e924553efd7c
-DIST ooo-build-ood680-m4.tar.gz 4349611 RMD160 7c21d2df4cd08542e12f0b98bbce3403f37b5cbf SHA1 6aeee510f15379f4f42a810a633fc6feea0e9fb9 SHA256 668c654b7d73a44d19c6529b6cdc5b6a8f3dcdad0fdee4a56dbef56c43a2214d
+DIST ooo-build-2.0.4.tar.gz 4446745 RMD160 5d85d32b892f90c3a888ad0a340758d85d5ae4cb SHA1 efcd1674a118ce0d9904d5138a6cae8ae2c1afe2 SHA256 11a80c4a76bce4c831aa459745779c295a22b169403e553285e187705e96d5b5
 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.0.3.ebuild 9145 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb SHA1 d42a09fee83af8596c59250f711d2618b93b10b3 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30
 MD5 59f7b5eb1b353c0bbd22dc07607acfcf openoffice-2.0.3.ebuild 9145
 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb openoffice-2.0.3.ebuild 9145
 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30 openoffice-2.0.3.ebuild 9145
-EBUILD openoffice-2.0.4_rc2.ebuild 9530 RMD160 946ab7a358a0466eb92061acb02cbec4fcbfafff SHA1 fa069a35a3adc34b4704b5fe3f934fa132a8658f SHA256 829d67afd8ddda3cdd50bcaf988a1b197418f21dd4c96d0fa342d221eaf3c6d8
-MD5 ce280854fd7294cd9bf39a482c4bcdd2 openoffice-2.0.4_rc2.ebuild 9530
-RMD160 946ab7a358a0466eb92061acb02cbec4fcbfafff openoffice-2.0.4_rc2.ebuild 9530
-SHA256 829d67afd8ddda3cdd50bcaf988a1b197418f21dd4c96d0fa342d221eaf3c6d8 openoffice-2.0.4_rc2.ebuild 9530
-MISC ChangeLog 54521 RMD160 adb2d6b2c17d16a949b672120bf3a91689149485 SHA1 b20836c3270ddbdd96ad6dddef251919a902273a SHA256 dbb90020b9abc658bd14d71bad510212879286d7c1b4ecee621e59d4a26dda3d
-MD5 c1d8f615a0472d8ee22fe3ed437af5a1 ChangeLog 54521
-RMD160 adb2d6b2c17d16a949b672120bf3a91689149485 ChangeLog 54521
-SHA256 dbb90020b9abc658bd14d71bad510212879286d7c1b4ecee621e59d4a26dda3d ChangeLog 54521
+EBUILD openoffice-2.0.4.ebuild 9643 RMD160 25d709aea6e1a5e19014ca0b3147de19da3b740a SHA1 bae4d53d5696d63b67ee1a9b2d7437aaf2b87333 SHA256 588e3600f8e187d102b5b598ca8c2198c9722387727b2b3db0b9f7a9bc9c9908
+MD5 965cb28bc8f6c9c18ef80fb9c78b3332 openoffice-2.0.4.ebuild 9643
+RMD160 25d709aea6e1a5e19014ca0b3147de19da3b740a openoffice-2.0.4.ebuild 9643
+SHA256 588e3600f8e187d102b5b598ca8c2198c9722387727b2b3db0b9f7a9bc9c9908 openoffice-2.0.4.ebuild 9643
+MISC ChangeLog 54830 RMD160 ed71abadc400d170bc6f4b8f345e07ffbe7d65ef SHA1 8d02bda55c74b8890e9b9b05653113913a2ea9de SHA256 91fce4ace88b0a3350cdb6744998d85a21a3af5aac218ecd5ee33f5cad869d23
+MD5 35b7842c3dc963f0a5619874cb9c0651 ChangeLog 54830
+RMD160 ed71abadc400d170bc6f4b8f345e07ffbe7d65ef ChangeLog 54830
+SHA256 91fce4ace88b0a3350cdb6744998d85a21a3af5aac218ecd5ee33f5cad869d23 ChangeLog 54830
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -42,6 +46,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 f9a102aadbdca7178bbd6e999c927fa1 files/digest-openoffice-2.0.3 2494
 RMD160 1da3fb19c062a849391223360384da3dd4089361 files/digest-openoffice-2.0.3 2494
 SHA256 411493117843e817aad3c972ce94b2f9ca92f59a815b20b985e875c32da8cdba files/digest-openoffice-2.0.3 2494
-MD5 75b74ff4b9a3165e6fe405637b2168f6 files/digest-openoffice-2.0.4_rc2 2693
-RMD160 ee0f3fd40eb5643f246369f889bf5a176e3ee5e2 files/digest-openoffice-2.0.4_rc2 2693
-SHA256 c244c34a70154f901b10d53e823524261c280b1634bd59c82b76177903636457 files/digest-openoffice-2.0.4_rc2 2693
+MD5 314f75d3986e19a42c8488550886725d files/digest-openoffice-2.0.4 2681
+RMD160 fa0410aec51a2682e033e5e3bb68cfb9d978aec1 files/digest-openoffice-2.0.4 2681
+SHA256 7aa1616b192f08aba28d042d51872cb3343baad34ba169d2c5f01bd284a170ed files/digest-openoffice-2.0.4 2681
diff --git a/app-office/openoffice/files/2.0.4_rc2/gentoo-2.0.4_rc2.diff b/app-office/openoffice/files/2.0.4_rc2/gentoo-2.0.4_rc2.diff
deleted file mode 100644
index a64755cbb2d1..000000000000
--- a/app-office/openoffice/files/2.0.4_rc2/gentoo-2.0.4_rc2.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
- }
---- bin/ooo-wrapper.in 
-+++ bin/ooo-wrapper.in 
-@@ -92,6 +89,9 @@
-     print STDERR "\n\n --- Warning - OO.o will not work without a mounted /proc filesystem --- \n\n\n";
- }
- 
-+# Clear PYTHONPATH, otherwise Python scripting does not work
-+delete $ENV{'PYTHONPATH'};
-+
- # And here we go.
- exec "$SystemInstallDir/program/$Binary", @ooo_argv
- 
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4_rc2 b/app-office/openoffice/files/digest-openoffice-2.0.4_rc2
deleted file mode 100644
index 07125f58a60d..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.0.4_rc2
+++ /dev/null
@@ -1,33 +0,0 @@
-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 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
-RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
-SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
-MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
-RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
-SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 d737f3b71caf365c75eeae5b31d99bdb ood680-m4-binfilter.tar.bz2 16800760
-RMD160 a864e9929d0156330371bffcc37b77facfc906db ood680-m4-binfilter.tar.bz2 16800760
-SHA256 430d5d164e8f48ae600b130868586e5b50b7c4c98f3138b2333be9c4590388e4 ood680-m4-binfilter.tar.bz2 16800760
-MD5 78af5bdc68cb594d77365cf405a79864 ood680-m4-core.tar.bz2 121412930
-RMD160 5bcaaa997e1eb0a1e7e2335f8aaa4076a1f5ae13 ood680-m4-core.tar.bz2 121412930
-SHA256 e79b733e61990557d6bd05b3955c6f3a4e817d18aa767e8c54384875efd974d3 ood680-m4-core.tar.bz2 121412930
-MD5 3db28ac4efab118c57d3015361de62d0 ood680-m4-lang.tar.bz2 71589219
-RMD160 25e5208245ea87f00582113c6b05961e120843ae ood680-m4-lang.tar.bz2 71589219
-SHA256 5ba171ec5b49b04505ce71b2a734d94166262fcfd0594f9dd070681ce7d84522 ood680-m4-lang.tar.bz2 71589219
-MD5 ba224f69a027211742517f784bcb7ad4 ood680-m4-system.tar.bz2 28791586
-RMD160 b78b0f0c236d6135aef06e9ae75e6bf7139feca4 ood680-m4-system.tar.bz2 28791586
-SHA256 fb19326a3843d7a493440d53dc7b6153d4286354a5c30ccc4d4881f4547923df ood680-m4-system.tar.bz2 28791586
-MD5 400590f308afd5189bfceaca9eb75878 ooo-build-ood680-m4.tar.gz 4349611
-RMD160 7c21d2df4cd08542e12f0b98bbce3403f37b5cbf ooo-build-ood680-m4.tar.gz 4349611
-SHA256 668c654b7d73a44d19c6529b6cdc5b6a8f3dcdad0fdee4a56dbef56c43a2214d ooo-build-ood680-m4.tar.gz 4349611
-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.0.4_rc2.ebuild b/app-office/openoffice/openoffice-2.0.4_rc2.ebuild
deleted file mode 100644
index b0643d4b443b..000000000000
--- a/app-office/openoffice/openoffice-2.0.4_rc2.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc2.ebuild,v 1.2 2006/10/12 15:23:33 suka Exp $
-
-inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
-
-IUSE="binfilter branding cairo cups dbus eds firefox gnome gstreamer gtk kde ldap sound odk pam webdav"
-
-MY_PV="${PV}"
-PATCHLEVEL="OOD680"
-SRC="ood680-m4"
-S="${WORKDIR}/ooo"
-S_OLD="${WORKDIR}/ooo-build-${SRC}"
-CONFFILE="${S}/distro-configs/Gentoo.conf.in"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-
-SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
-	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2
-	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
-	binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 )
-	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${SRC}.tar.gz
-	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/SRC680/hunspell_UNO_1.1.tar.gz
-	http://go-oo.org/packages/xt/xt-20051206-src-only.zip
-	http://go-oo.org/packages/SRC680/lp_solve_5.5.tar.gz"
-
-LANGS="af ar be_BY bg bn bs ca cs cy da de el en en_GB en_US en_ZA es et fa fi fr gu_IN he hi_IN hr hu it ja km ko lt mk nb nl nn nr ns pa_IN pl pt pt_BR ru rw sh_YU sk sl sr_CS st sv sw_TZ th tn tr ts vi xh zh_CN zh_TW zu"
-
-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"
-
-RDEPEND="!app-office/openoffice-bin
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	virtual/libc
-	>=dev-lang/perl-5.0
-	dbus? ( >=sys-apps/dbus-0.60 )
-	gnome? ( >=x11-libs/gtk+-2.4
-		>=gnome-base/gnome-vfs-2.6
-		>=gnome-base/gconf-2.0 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	cairo? ( >=x11-libs/cairo-1.0.2
-		>=x11-libs/gtk+-2.8 )
-	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 )
-	firefox? ( >=www-client/mozilla-firefox-1.5-r9
-		>=dev-libs/nspr-4.6.2
-		>=dev-libs/nss-3.11-r1 )
-	sound? ( =media-libs/portaudio-18*
-			>=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.2.0
-	cups? ( net-print/cups )
-	media-libs/libpng
-	sys-devel/flex
-	sys-devel/bison
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.1.4-r1
-	dev-libs/expat
-	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )  )
-	>=dev-libs/boost-1.33.1
-	>=dev-libs/icu-3.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 )"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXrender
-	x11-proto/printproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	>=sys-apps/findutils-4.1.20-r1
-	>=sys-devel/gcc-3.2.1
-	dev-perl/Archive-Zip
-	dev-perl/Compress-Zlib
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=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
-	>=app-admin/eselect-oodict-20060706
-	java? ( || ( =virtual/jre-1.4* =virtual/jre-1.5* )
-		dev-java/ant-core )
-	dev-libs/libxslt
-	ldap? ( net-nds/openldap )
-	>=dev-libs/libxml2-2.0"
-
-PROVIDE="virtual/ooo"
-
-# FIXME executable stacks should be addressed upstream!
-QA_EXECSTACK_x86="usr/lib/openoffice/program/libgcc3_uno.so"
-
-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
-
-}
-
-src_unpack() {
-
-	unpack ooo-build-${SRC}.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
-
-	#Use flag checks
-	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
-	use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
-	use amd64 && echo "--with-system-boost" >> ${CONFFILE}
-
-	echo "`use_enable binfilter`" >> ${CONFFILE}
-
-	echo "`use_enable firefox mozilla`" >> ${CONFFILE}
-	echo "`use_with firefox system-mozilla`" >> ${CONFFILE}
-	echo "`use_with firefox`" >> ${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 odk`" >> ${CONFFILE}
-	echo "`use_enable debug crashdump`" >> ${CONFFILE}
-
-	echo "--with-system-icu" >> ${CONFFILE}
-
-}
-
-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}
-	autoconf || die
-	./configure ${MYCONF} \
-		--with-distro="Gentoo" \
-		--with-arch="${ARCH}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--with-binsuffix="2" \
-		--with-installed-ooo-dirname="openoffice" \
-		--with-tag=${SRC} \
-		"${GTKFLAG}" \
-		`use_enable kde` \
-		`use_enable cairo` \
-		`use_with cairo system-cairo` \
-		`use_enable gnome quickstart` \
-		`use_enable pam` \
-		`use_enable !debug strip` \
-		--disable-access \
-		--disable-mono \
-		--disable-post-install-scripts \
-		--enable-hunspell \
-		--with-system-hunspell \
-		--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() {
-
-	einfo "Preparing Installation"
-	make DESTDIR=${D} install || die "Installation failed!"
-
-	# Install corrected Symbol Font
-	insinto /usr/share/fonts/TTF/
-	doins fonts/*.ttf
-
-	# Fix the permissions for security reasons
-	chown -R root:root ${D} || die
-
-}
-
-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
-
-	einfo " To start OpenOffice.org, run:"
-	einfo
-	einfo " $ ooffice2"
-	einfo
-	einfo " Also, for individual components, you can use any of:"
-	einfo
-	einfo " oobase2, oocalc2, oodraw2, oofromtemplate2, ooimpress2, oomath2,"
-	einfo " ooweb2 or oowriter2"
-	einfo
-	einfo " Spell checking is now provided through our own myspell-ebuilds, "
-	einfo " if you want to use it, please install the correct myspell package "
-	einfo " according to your language needs. "
-
-}