Bump to 2.0.4_rc2, also add sound use-flag

(Portage version: 2.1.2_pre1)
 (Unsigned Manifest commit)

5 files changed, 20 insertions, 481 deletions

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 690c41e0b8ce..ceb9da8f6617 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,14 +2,10 @@ 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 2824 RMD160 005f3cd7b7c1233e0d2f3ff730b92641b4ccb628 SHA1 f3f9bbffd4d71667c97770c0425f4646a7d52934 SHA256 946275bb8b76998296e4c83780ef4db6dbeead39dc81cd3aa8d77c71cf708950
-MD5 5679305f1ff009a9f7635b9527835c91 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2824
-RMD160 005f3cd7b7c1233e0d2f3ff730b92641b4ccb628 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2824
-SHA256 946275bb8b76998296e4c83780ef4db6dbeead39dc81cd3aa8d77c71cf708950 files/2.0.4_rc1/gentoo-2.0.4_rc1.diff 2824
-AUX 2.0.4_rc1/sfx2-docfile-newfilesave.diff 703 RMD160 7a0075c051bcb72200976169691cef3717255b65 SHA1 9ead520d7c168096a65816eac97d78814a1d3282 SHA256 ef54f6ef67a1dfe4a2e6ad5066210d87698471a10b53fc9d007d01bf3d9ef53f
-MD5 7c49cc405fa89a62fc2b5e222397ffd6 files/2.0.4_rc1/sfx2-docfile-newfilesave.diff 703
-RMD160 7a0075c051bcb72200976169691cef3717255b65 files/2.0.4_rc1/sfx2-docfile-newfilesave.diff 703
-SHA256 ef54f6ef67a1dfe4a2e6ad5066210d87698471a10b53fc9d007d01bf3d9ef53f files/2.0.4_rc1/sfx2-docfile-newfilesave.diff 703
+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
 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
@@ -21,26 +17,26 @@ DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1
 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-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 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-m2.tar.gz 4314684 RMD160 3bcf113cf87202bd5ff413fe476eeb4dcbaa8143 SHA1 8e14458373718a48a771d3678667c68b1c2b4629 SHA256 73598930e7e8b94446a5cc9e49ae8d60fff3605396e6f4c0be2d86b27223e3cd
+DIST ooo-build-ood680-m4.tar.gz 4349611 RMD160 7c21d2df4cd08542e12f0b98bbce3403f37b5cbf SHA1 6aeee510f15379f4f42a810a633fc6feea0e9fb9 SHA256 668c654b7d73a44d19c6529b6cdc5b6a8f3dcdad0fdee4a56dbef56c43a2214d
 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 9285 RMD160 cb582bc53ac6b7a207f2132917b6ee7a0efe01f9 SHA1 ed0a8b0c3aaa592c734dbec9ff0f2452be65fbe1 SHA256 0ae99dd6369774fce3d87c0dbe9df537340d6c263d57c0b3b68569a9b332bb07
 MD5 486b74a163db2e1692fcedb1aa833778 openoffice-2.0.3.ebuild 9285
 RMD160 cb582bc53ac6b7a207f2132917b6ee7a0efe01f9 openoffice-2.0.3.ebuild 9285
 SHA256 0ae99dd6369774fce3d87c0dbe9df537340d6c263d57c0b3b68569a9b332bb07 openoffice-2.0.3.ebuild 9285
-EBUILD openoffice-2.0.4_rc1-r1.ebuild 9716 RMD160 b108f755ef4b2634416d2d75310b7192a881e794 SHA1 516cfd45a62dd2bcfbf1fc08a5a137a1a3e34a03 SHA256 6c78584d58fb5bad9f58ee6f515c41016969f902acd2c3c15220e745db1f3fc7
-MD5 76aaee9ba9ba7dd645526ce8177271b1 openoffice-2.0.4_rc1-r1.ebuild 9716
-RMD160 b108f755ef4b2634416d2d75310b7192a881e794 openoffice-2.0.4_rc1-r1.ebuild 9716
-SHA256 6c78584d58fb5bad9f58ee6f515c41016969f902acd2c3c15220e745db1f3fc7 openoffice-2.0.4_rc1-r1.ebuild 9716
-MISC ChangeLog 53828 RMD160 77c1bede9dbd33f9d884660f82eef0026b0c03f2 SHA1 093bae9421bb3d596fb62fcb56c223bcb0716757 SHA256 1ba63ed1e94fb0a605c4582011a193c2b44527e8e8d6d6b96651d2f66112fce1
-MD5 8dfc9cb6d93d64701a73c1347af848f2 ChangeLog 53828
-RMD160 77c1bede9dbd33f9d884660f82eef0026b0c03f2 ChangeLog 53828
-SHA256 1ba63ed1e94fb0a605c4582011a193c2b44527e8e8d6d6b96651d2f66112fce1 ChangeLog 53828
+EBUILD openoffice-2.0.4_rc2.ebuild 9694 RMD160 1b31266034c638875bcc4671caadc6a5c6c61b48 SHA1 2f414d86391a90cf5b256a4ce48396abb81de97c SHA256 cdcc2cd22de9d8fcc5cdbf02ab21d2216f475449f8c69c22cf4edfdff6df27f3
+MD5 9f53a48dd23e39e8b73ec9ebca9f43e0 openoffice-2.0.4_rc2.ebuild 9694
+RMD160 1b31266034c638875bcc4671caadc6a5c6c61b48 openoffice-2.0.4_rc2.ebuild 9694
+SHA256 cdcc2cd22de9d8fcc5cdbf02ab21d2216f475449f8c69c22cf4edfdff6df27f3 openoffice-2.0.4_rc2.ebuild 9694
+MISC ChangeLog 54191 RMD160 c49f00be4b81e58b83f758b4ec435348e6651cd2 SHA1 a8926f2caba4140b09247e0608c7085a962838d0 SHA256 f09b3e551da1bd40f6a8cb69d34b4dc83e999141c60e1da0b207a8f9b0fc98b0
+MD5 c4e87ec3485668af772ee21c845a945c ChangeLog 54191
+RMD160 c49f00be4b81e58b83f758b4ec435348e6651cd2 ChangeLog 54191
+SHA256 f09b3e551da1bd40f6a8cb69d34b4dc83e999141c60e1da0b207a8f9b0fc98b0 ChangeLog 54191
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -48,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 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
+MD5 5031c6b3985820259da893103e8e6a5f files/digest-openoffice-2.0.4_rc2 3163
+RMD160 23eb6081fe20b157bdd3cbbf9924fc6eb4904354 files/digest-openoffice-2.0.4_rc2 3163
+SHA256 8c31615ce007d8c98b8db155fd17abbc21fc9b367ed62266be97f8ed8852f760 files/digest-openoffice-2.0.4_rc2 3163
diff --git a/app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff b/app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff
deleted file mode 100644
index 94cd96817dfd..000000000000
--- a/app-office/openoffice/files/2.0.4_rc1/gentoo-2.0.4_rc1.diff
+++ /dev/null
@@ -1,96 +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
- 
---- bin/unpack 
-+++ bin/unpack 
-@@ -89,7 +89,7 @@
- # it is necessary in ODK
- # it can be built even on linux by mingw32, though
- if test "$USE_PREBUILD_UNOWINREG_DLL" = "YES" ; then
--    cp -f $TOOLSDIR/src/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
-+    cp -f $SRCDIR/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
- fi
- 
- # copy in misc Mono related dlls if we need to
-@@ -319,7 +319,7 @@
- cp -af $TOOLSDIR/src/evolocal.odb $OOBUILDDIR/extras/source/database || exit 1;
- 
- echo "Installing bibliography overwrides";
--tar xjf $TOOLSDIR/src/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database
-+tar xjf $SRCDIR/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database
- 
- echo "Copying custom user-dicts into tree"
- cp -af $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -150,6 +150,9 @@
- 
- # add SPARC platform to automation
- automation-sparc-platform.diff, i#66140, rengelha
-+
-+#Fix new file save error in ood-m1 and ood-m2
-+sfx2-docfile-newfilesave.diff, i#69232 jianhua
- 
- # [ LinuxOnly ]
- 
-@@ -1008,16 +1011,10 @@
- 
- # system STLport
- dont-copy-and-install-stlport.diff, i#63732, rengelha
--# support server-only versions of 64bit JDKs
--64bit-jdk-server-paths.diff, i#65974
- # throw also Java exception on JNI error
- jni-throw-exception.diff, i#65977
- # system db check
- system-db-check.diff, i#65979
--# Gentoo's portaudio ...
--system-portaudio-use-lpthread.diff
--# use IBM j9vm over IBM classic JVM
--ibm-j9vm.diff
- 
- [ GentooOnly ]
- SectionOwner => aprosky
-@@ -1031,7 +1028,14 @@
- gentoo-gcc-naming-and-versioning.diff, hmth
- # build with -fomit-frame-pointer
- #omit-fp-workaround.diff, i#50625, hmth
--
-+# use libxslt from system for xmlhelp / disable sablot
-+xmlhelp-use-libxslt-from-system.diff, i#30380, rengelha
-+# Gentoo's portaudio ...
-+system-portaudio-use-lpthread.diff, hmth
-+# support server-only versions of 64bit JDKs
-+64bit-jdk-server-paths.diff, i#65974, hmth
-+# use IBM j9vm over IBM classic JVM
-+ibm-j9vm.diff, hmth
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
-@@ -1494,8 +1498,6 @@
- [ GentooExperimental ]
- SectionOwner => hmth
- 
--# use libxslt from system for xmlhelp / disable sablot
--xmlhelp-use-libxslt-from-system.diff, i#30380
- # Gnu JRE paths.
- gentooexperimental-gnujre.diff
- 
diff --git a/app-office/openoffice/files/2.0.4_rc1/sfx2-docfile-newfilesave.diff b/app-office/openoffice/files/2.0.4_rc1/sfx2-docfile-newfilesave.diff
deleted file mode 100644
index f270c8a78b7b..000000000000
--- a/app-office/openoffice/files/2.0.4_rc1/sfx2-docfile-newfilesave.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- sfx2/source/doc/docfile.cxx	2006-09-02 00:25:16.000000000 +0800
-+++ sfx2/source/doc/docfile.cxx	2006-09-04 17:16:59.000000000 +0800
-@@ -2274,7 +2274,9 @@ void SfxMedium::GetMedium_Impl()
-         }
- 
-         //TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor
--        if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() )
-+        //When you create a new file, it will cause the file set Error. but it is correct. 
-+        //And the pURLObj will mark the file is new one or opened -- base on gdb.
-+        if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() && pURLObj)
-             SetError( ERRCODE_IO_ACCESSDENIED );
- 
- 		if ( !GetError() )
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4_rc1-r1 b/app-office/openoffice/files/digest-openoffice-2.0.4_rc1-r1
deleted file mode 100644
index 42d4fcba02de..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.0.4_rc1-r1
+++ /dev/null
@@ -1,39 +0,0 @@
-MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
-RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
-SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
-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 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 686f009ac0b587f7abba5b4c3f419559 ood680-m2-binfilter.tar.bz2 16799814
-RMD160 ed2e583d811bfad162b917f2269ace9f98a8cc6a ood680-m2-binfilter.tar.bz2 16799814
-SHA256 a4235f16b247afa4cca03fc6f8c6b8edd1500f20753ad0db256fadfc0035809f ood680-m2-binfilter.tar.bz2 16799814
-MD5 d112d0dcc105c9e6c5c049eb1dde28a4 ood680-m2-core.tar.bz2 121415950
-RMD160 5017151853c48464e6b0258fd220c0636367c188 ood680-m2-core.tar.bz2 121415950
-SHA256 9baafec147f8ff78b7ffc2f71fe0ee2ed7e016170233549e86f5bf2083b2755f ood680-m2-core.tar.bz2 121415950
-MD5 c1a53a7e22476f7b10db82ea39150beb ood680-m2-lang.tar.bz2 67723249
-RMD160 81426d415733025b31899db7c45319e2249378de ood680-m2-lang.tar.bz2 67723249
-SHA256 d4db201f04260ee3e48f6c8c0269b9bc5443cfc692178bbb6f3adeef981c84f6 ood680-m2-lang.tar.bz2 67723249
-MD5 df3e3d8d35a4269555b88a8b055355ee ood680-m2-system.tar.bz2 28794310
-RMD160 5d885ccec07b2cba543a026f4966f36aba736570 ood680-m2-system.tar.bz2 28794310
-SHA256 f6f120be87fe6284bf4af0b8757b5bba8656e6a8e2bf6738317cd29cc296aa98 ood680-m2-system.tar.bz2 28794310
-MD5 b107dceb6f5a11a819531f21fdc8b90f ooo-build-ood680-m2.tar.gz 4314684
-RMD160 3bcf113cf87202bd5ff413fe476eeb4dcbaa8143 ooo-build-ood680-m2.tar.gz 4314684
-SHA256 73598930e7e8b94446a5cc9e49ae8d60fff3605396e6f4c0be2d86b27223e3cd ooo-build-ood680-m2.tar.gz 4314684
-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-r1.ebuild b/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild
deleted file mode 100644
index d389a1fbaefd..000000000000
--- a/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild
+++ /dev/null
@@ -1,309 +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-r1.ebuild,v 1.11 2006/09/20 14:51: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 cups dbus eds firefox gnome gstreamer gtk kde ldap mono odk pam webdav"
-
-MY_PV="${PV}"
-PATCHLEVEL="OOD680"
-SRC="ood680-m2"
-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
-	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/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 )
-	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 )
-	mono? ( >=dev-lang/mono-1.1.6 )
-	>=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
-	cp -a ${FILESDIR}/${PV}/sfx2-docfile-newfilesave.diff ${S}/patches/src680 || die
-
-	#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 odk`" >> ${CONFFILE}
-	echo "`use_enable debug crashdump`" >> ${CONFFILE}
-
-	echo "--with-system-boost" >> ${CONFFILE}
-	echo "--with-system-icu" >> ${CONFFILE}
-	echo "--with-system-libxml" >> ${CONFFILE}
-	echo "--with-system-libxslt" >> ${CONFFILE}
-	echo "--enable-xsltproc" >> ${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 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. "
-
-}