New milestone release

(Portage version: 2.1.1_rc1-r2)
 (Unsigned Manifest commit)

3 files changed, 21 insertions, 361 deletions

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6fa0ad957b37..e09376693f68 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,40 +2,41 @@ 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_rc1/gentoo-2.0.4_rc1.diff 775 RMD160 c9625d2c3a589fa87f306da15371a69967090d78 SHA1 4a9d83497f7d6274e827d45cdf81d8d732ea9f15 SHA256 0bb0442e774124fd7ea3c7ccfed17743274aef3d2413e85fe6981d71f0e5838b
-MD5 c6636afc3588216a5a60fd5c99eefc50 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 775
-RMD160 c9625d2c3a589fa87f306da15371a69967090d78 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 775
-SHA256 0bb0442e774124fd7ea3c7ccfed17743274aef3d2413e85fe6981d71f0e5838b files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 775
+AUX 2.0.4_rc1/gentoo-2.0.4_rc1.diff 1330 RMD160 e1c7108c526846257211f11bedce3f797b43cf2d SHA1 1d72c862e9f40c48ae9e11ae5ee46a44e19f0a86 SHA256 95801701f33f617a62a08858a91fafe1431a0b09e38da72986383aa59fa794e7
+MD5 1dfdadbcea795f1d3197c37bfeea61b9 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 1330
+RMD160 e1c7108c526846257211f11bedce3f797b43cf2d files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 1330
+SHA256 95801701f33f617a62a08858a91fafe1431a0b09e38da72986383aa59fa794e7 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 1330
 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 biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
 DIST cli_types.dll 634880 RMD160 2cba491d27cc349a3468127a93981396756c6fc8 SHA1 b91baf5d09c7dcb9702c824af04f91f048f46bf1 SHA256 7316a75be649b5a1c09c953b6ac20aa1953afbddd82a454a864d4a1c70a5a3ca
 DIST cli_types_bridgetest.dll 20480 RMD160 ac4a4110cf21d5bc7d9797f651a84fa20627c03b SHA1 f36c332cbe3a60e562ae42265fe0736d8102fea7 SHA256 3e62533c0f9e337021d2396332438ad23ea0fd480aab849c50aab48ab40579bb
 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-m1-binfilter.tar.bz2 16801691 RMD160 e4626103a2d897867ce142267a618e014d4f876b SHA1 4d7ec28c3f59991022822e948fdadbe086a63356 SHA256 8d2e815620dbd83d49c4c107ca1cb63dda2095e06b28579de40046e9b49499c1
-DIST ood680-m1-core.tar.bz2 108530107 RMD160 d0451f05d5345a72ae0ca1613d8d954cf5a32826 SHA1 d0d8ce23c90bc92568caa7ac4e2493da1b0936c8 SHA256 93b109f79d9c2f746893546785b4c14587849463cdb7928bc033c94a7415ac9c
-DIST ood680-m1-lang.tar.bz2 64737274 RMD160 d30de72ca7bf577d76fd991249050fe80ae839ce SHA1 c92fbc083fb9362411af86baa8ca0783495c36db SHA256 8198743aef1129cf357bc09a880bf0746cf088466963dec6ec0adbb57a9b5e92
-DIST ood680-m1-system.tar.bz2 28794391 RMD160 5492cc2dd5e0d67d63fa594dc33b42d77a5a8564 SHA1 b4e3795a1314489c26fb7db73b4669c0478b6612 SHA256 dc7890a4ea710e9bc2dcb1d9d32f58c68a02844bdcc40e41248682f0082fff20
+DIST ood680-m2-binfilter.tar.bz2 16799814 RMD160 ed2e583d811bfad162b917f2269ace9f98a8cc6a SHA1 7637fee329805638c86023e8cf16223287874578 SHA256 a4235f16b247afa4cca03fc6f8c6b8edd1500f20753ad0db256fadfc0035809f
+DIST ood680-m2-core.tar.bz2 121415950 RMD160 5017151853c48464e6b0258fd220c0636367c188 SHA1 9a08f6c5aa38ec9c0937045495976d27072adc32 SHA256 9baafec147f8ff78b7ffc2f71fe0ee2ed7e016170233549e86f5bf2083b2755f
+DIST ood680-m2-lang.tar.bz2 67723249 RMD160 81426d415733025b31899db7c45319e2249378de SHA1 f03205813f31a2994508bf994553469879ed6ddb SHA256 d4db201f04260ee3e48f6c8c0269b9bc5443cfc692178bbb6f3adeef981c84f6
+DIST ood680-m2-system.tar.bz2 28794310 RMD160 5d885ccec07b2cba543a026f4966f36aba736570 SHA1 735f122014fd0c63cd224c4d85b0d0e09f932c52 SHA256 f6f120be87fe6284bf4af0b8757b5bba8656e6a8e2bf6738317cd29cc296aa98
 DIST ooo-build-2.0.3.0.tar.gz 5158406 RMD160 45eb102b17f4b55b1b44f0eb08a933b75b9eb3dc SHA1 a8d5c3d264819620bcb0122342558debc50c8729 SHA256 b425013aa40d1fd4e3d596a38b2add86ae9c4d7e84cc23e1b2b5e924553efd7c
-DIST ooo-build-ood680-m1.tar.gz 4267507 RMD160 bd38e9d1fdefc39322d9a628b89bace8a0c387f0 SHA1 59d387f58a0d994b822b8926c8f0c8c54c663dd6 SHA256 9ddf518c5f41b6268f81ae43480acdd246cdf7fb074d9f6edf127ceeeca5ccaa
+DIST ooo-build-ood680-m2.tar.gz 4314684 RMD160 3bcf113cf87202bd5ff413fe476eeb4dcbaa8143 SHA1 8e14458373718a48a771d3678667c68b1c2b4629 SHA256 73598930e7e8b94446a5cc9e49ae8d60fff3605396e6f4c0be2d86b27223e3cd
 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 8771 RMD160 d8e4177da714bf2baf0918254d55d74b007c0450 SHA1 e027c967c426442b48e0489ef85cfbcc75a51bf5 SHA256 64fb4fc0fce9c69df56246ceec62779be3256d6e9eff1d876ab566e245a29e20
 MD5 1bb775b012dc3e889ce2deb201d52cf7 openoffice-2.0.3.ebuild 8771
 RMD160 d8e4177da714bf2baf0918254d55d74b007c0450 openoffice-2.0.3.ebuild 8771
 SHA256 64fb4fc0fce9c69df56246ceec62779be3256d6e9eff1d876ab566e245a29e20 openoffice-2.0.3.ebuild 8771
-EBUILD openoffice-2.0.4_rc1.ebuild 9142 RMD160 408d19f5110ffd8f6b14d902c39f7324c542da15 SHA1 030edd7208322d0c6ad635bfc612bae29e73bc7f SHA256 fda597f3a165dd0b00707585ab55fa78dfe8b486616ad05f5420b2cb0acc6aca
-MD5 28ab22a1438222cdf8ad395e8ac6e208 openoffice-2.0.4_rc1.ebuild 9142
-RMD160 408d19f5110ffd8f6b14d902c39f7324c542da15 openoffice-2.0.4_rc1.ebuild 9142
-SHA256 fda597f3a165dd0b00707585ab55fa78dfe8b486616ad05f5420b2cb0acc6aca openoffice-2.0.4_rc1.ebuild 9142
-MISC ChangeLog 50927 RMD160 7b6d6eb1d2288a8c9cde01ce266c644bdca86fa6 SHA1 dd5b6a9c23fb4680819f6accfcadc71702df6798 SHA256 c391a8890f6c1b0de6aa819861b181a747052d1cc55ba2b83ccd56c2235118ae
-MD5 d4519c2255c67835506b03d23fb3196c ChangeLog 50927
-RMD160 7b6d6eb1d2288a8c9cde01ce266c644bdca86fa6 ChangeLog 50927
-SHA256 c391a8890f6c1b0de6aa819861b181a747052d1cc55ba2b83ccd56c2235118ae ChangeLog 50927
+EBUILD openoffice-2.0.4_rc1-r1.ebuild 9077 RMD160 a95e9dc9040ba11a3a181258cdb036d4b696daf9 SHA1 5c7053a9c2f5249398c803484131ecc0edb023e6 SHA256 2b9daefdebb52ebb467d5a2a18689afcd4cda795192aca557ab9daae2b6a09dd
+MD5 34128b105dffaa4f7631959310ea982c openoffice-2.0.4_rc1-r1.ebuild 9077
+RMD160 a95e9dc9040ba11a3a181258cdb036d4b696daf9 openoffice-2.0.4_rc1-r1.ebuild 9077
+SHA256 2b9daefdebb52ebb467d5a2a18689afcd4cda795192aca557ab9daae2b6a09dd openoffice-2.0.4_rc1-r1.ebuild 9077
+MISC ChangeLog 51225 RMD160 c75bb1ccbb2f18ce3e8b738187698944a54fcb5a SHA1 d85027f2e870d3601a31a622be290284d75fc690 SHA256 2fdda8bae5c6e8054a596dc9b08c9ad0982304733c2ff80f59ad868697a7073c
+MD5 56aa5d5ba249e035d40da1eb8b05c5b1 ChangeLog 51225
+RMD160 c75bb1ccbb2f18ce3e8b738187698944a54fcb5a ChangeLog 51225
+SHA256 2fdda8bae5c6e8054a596dc9b08c9ad0982304733c2ff80f59ad868697a7073c ChangeLog 51225
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -43,6 +44,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 a6b28e47f7e33da4cd6c0f075331cce8 files/digest-openoffice-2.0.3 2964
 RMD160 70b80a5d3b91f81fa2bb814b3fa15c9295667201 files/digest-openoffice-2.0.3 2964
 SHA256 79256124a48dd35bbf1af13f79d11424b11686766035dc9441c898cb8e7838a0 files/digest-openoffice-2.0.3 2964
-MD5 5b59631fd5610696d04698355c2a9c8a files/digest-openoffice-2.0.4_rc1 3184
-RMD160 b6ebbc1ba35dc6bc4a45d27975b8880b37ec99e6 files/digest-openoffice-2.0.4_rc1 3184
-SHA256 f14da0f443f95ea849dc44ed3e2b4802ed63df164c57b5cd7713bee0e776f75d files/digest-openoffice-2.0.4_rc1 3184
+MD5 ab7e924a9187f50de71f91189c293dd8 files/digest-openoffice-2.0.4_rc1-r1 3163
+RMD160 adab13227946ecec9849d912b9910e9ca0acf64f files/digest-openoffice-2.0.4_rc1-r1 3163
+SHA256 16966e220f44072a6750fc2c617cabc8bd30abe95a981401b1b7c6da7a14bcca files/digest-openoffice-2.0.4_rc1-r1 3163
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4_rc1 b/app-office/openoffice/files/digest-openoffice-2.0.4_rc1
deleted file mode 100644
index 0ee1c6a509db..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.0.4_rc1
+++ /dev/null
@@ -1,39 +0,0 @@
-MD5 2aa6bb72a257abcd896014b08fa4e6f0 cli_types.dll 634880
-RMD160 2cba491d27cc349a3468127a93981396756c6fc8 cli_types.dll 634880
-SHA256 7316a75be649b5a1c09c953b6ac20aa1953afbddd82a454a864d4a1c70a5a3ca cli_types.dll 634880
-MD5 f06322e5157495c22ba77f310fa4a89b cli_types_bridgetest.dll 20480
-RMD160 ac4a4110cf21d5bc7d9797f651a84fa20627c03b cli_types_bridgetest.dll 20480
-SHA256 3e62533c0f9e337021d2396332438ad23ea0fd480aab849c50aab48ab40579bb cli_types_bridgetest.dll 20480
-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 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
-RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757
-SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757
-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 4227cb490181e7906d68e230e503e7fd ood680-m1-binfilter.tar.bz2 16801691
-RMD160 e4626103a2d897867ce142267a618e014d4f876b ood680-m1-binfilter.tar.bz2 16801691
-SHA256 8d2e815620dbd83d49c4c107ca1cb63dda2095e06b28579de40046e9b49499c1 ood680-m1-binfilter.tar.bz2 16801691
-MD5 a7f39438c364c1a4d690c142828eb784 ood680-m1-core.tar.bz2 108530107
-RMD160 d0451f05d5345a72ae0ca1613d8d954cf5a32826 ood680-m1-core.tar.bz2 108530107
-SHA256 93b109f79d9c2f746893546785b4c14587849463cdb7928bc033c94a7415ac9c ood680-m1-core.tar.bz2 108530107
-MD5 0505bc40e555c79641baf214d24c7661 ood680-m1-lang.tar.bz2 64737274
-RMD160 d30de72ca7bf577d76fd991249050fe80ae839ce ood680-m1-lang.tar.bz2 64737274
-SHA256 8198743aef1129cf357bc09a880bf0746cf088466963dec6ec0adbb57a9b5e92 ood680-m1-lang.tar.bz2 64737274
-MD5 67346db58d80775c901ef0b808c7b9db ood680-m1-system.tar.bz2 28794391
-RMD160 5492cc2dd5e0d67d63fa594dc33b42d77a5a8564 ood680-m1-system.tar.bz2 28794391
-SHA256 dc7890a4ea710e9bc2dcb1d9d32f58c68a02844bdcc40e41248682f0082fff20 ood680-m1-system.tar.bz2 28794391
-MD5 a9bc3fcc2b08095779b839b43dbd8a4a ooo-build-ood680-m1.tar.gz 4267507
-RMD160 bd38e9d1fdefc39322d9a628b89bace8a0c387f0 ooo-build-ood680-m1.tar.gz 4267507
-SHA256 9ddf518c5f41b6268f81ae43480acdd246cdf7fb074d9f6edf127ceeeca5ccaa ooo-build-ood680-m1.tar.gz 4267507
-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_rc1.ebuild b/app-office/openoffice/openoffice-2.0.4_rc1.ebuild
deleted file mode 100644
index a2aba8ac8110..000000000000
--- a/app-office/openoffice/openoffice-2.0.4_rc1.ebuild
+++ /dev/null
@@ -1,302 +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_rc1.ebuild,v 1.4 2006/08/25 08:30:30 suka Exp $
-
-inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
-
-IUSE="binfilter branding cairo eds firefox gnome gstreamer gtk java kde ldap mono odk pam xml"
-
-MY_PV="${PV}"
-PATCHLEVEL="OOD680"
-SRC="ood680-m1"
-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://go-oo.org/packages/libwpd/libwpd-0.8.3.tar.gz
-	mono? ( http://go-oo.org/packages/SRC680/cli_types.dll
-		http://go-oo.org/packages/SRC680/cli_types_bridgetest.dll )
-	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/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/x11 )
-	virtual/libc
-	>=dev-lang/perl-5.0
-	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 )
-	>=x11-libs/startup-notification-0.5
-	>=media-libs/freetype-2.1.10-r2
-	>=media-libs/fontconfig-2.2.0
-	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/jre-1.4 )
-	>=sys-devel/gcc-3.2.1
-	amd64? ( >=dev-libs/boost-1.31.0 )
-	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
-		)
-		virtual/x11 )
-	net-print/cups
-	>=sys-apps/findutils-4.1.20-r1
-	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
-	java? ( >=virtual/jdk-1.4
-		dev-java/ant-core
-		${JAVA_PKG_E_DEPEND} )
-	!java? ( dev-libs/libxslt
-		>=dev-libs/libxml2-2.0 )
-	ldap? ( net-nds/openldap )
-	mono? ( >=dev-lang/mono-1.1.6 )
-	xml? ( >=dev-libs/libxml2-2.0 )"
-
-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
-
-	# 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. Also the xml use-flag is disabled with "
-		ewarn " -java to prevent build breakage. "
-		ewarn
-	elif use sparc; then
-		ewarn " Java support on sparc is very flaky, we don't recommend "
-		ewarn " building openoffice this way."
-		ebeep 5
-		epause 10
-	fi
-
-}
-
-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
-
-	# Copy over some missing stuff
-	cp -f ${DISTDIR}/unowinreg.dll ${S}/src
-
-	#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_with xml system-libxml`" >> ${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 odk`" >> ${CONFFILE}
-	echo "`use_enable debug crashdump`" >> ${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_DISTCC}" == "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 "-ftracer"
-	filter-flags "-ffast-math"
-	filter-flags "-fforce-addr"
-	replace-flags "-O3" "-O2"
-	replace-flags "-Os" "-O2"
-	replace-flags "-O1" "-O2"
-	replace-flags "-O0" "-O2"
-
-	use ppc && append-flags "-D_STLP_STRICT_ANSI"
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-
-	# 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 mono` \
-		`use_enable pam` \
-		`use_enable !debug strip` \
-		--disable-access \
-		--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. "
-
-}