Add release candidate for OpenOffice.org 2.4.0

(Portage version: 2.1.4.4)
 (Unsigned Manifest commit)

3 files changed, 60 insertions, 1 deletions

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 44ad6cd21d89..7dd6ae179c34 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -5,19 +5,31 @@ AUX 2.3.1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e S
 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_rc5/gentoo-2.4.0_rc5.diff 494 RMD160 a076a95cfd3a5c97272738581e4d84c9c2172e27 SHA1 48011ef618a0a3488d208a393f0fcfac90032aeb SHA256 68f5ffcd2803b7b02f22dafc67f454082fe6b42b6a064cad6d85c86b418113de
+AUX 2.4.0_rc5/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.0rc5_src_binfilter.tar.bz2 6674320 RMD160 f43c9037dc848a36b0bf93175786b9b3fb8e1195 SHA1 0e7b06ca2fae0ad8d17f52f9012dc9d9b40571ff SHA256 7b4d3a49b821ed10e866ca734a9236b7b27927fc940d20ca6633693970e226bd
+DIST OOo_2.4.0rc5_src_core.tar.bz2 153592570 RMD160 2da9933af2ec9b34b97a39c59cbc27b06cd34fe6 SHA1 44b38c7c2746681076b133f970e2f863825e6743 SHA256 53d8697f297489c200475619ff2c5d41d51285fa85c773be5f7df1d4e316fd68
+DIST OOo_2.4.0rc5_src_l10n.tar.bz2 26653 RMD160 4ae1a536eabd66a66105ef9702a793af9d04cb5d SHA1 5585d1e935cf2ee3ee3583bd0f3e0001e356f8fc SHA256 16b4cefb73a76957b3f2c64ce8696dd65a19da0e2f13686d7b938bf6c94f9f5e
+DIST OOo_2.4.0rc5_src_sdk.tar.bz2 38301 RMD160 839690e90a6eec91a37d8660caf138e2253dcc09 SHA1 e02fc64349e0a182a26f9574be3bfffc95bda838 SHA256 9ed2961a34300056600782161b049a9b7f16e3e02edd7653ad69af61750f4d1a
 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.3.1.tar.gz 8178554 RMD160 61c78e41e1e1eb495750d332e9e43f617e3047ac SHA1 e4e573c17d09698c65b440df865e8329e5ab5a58 SHA256 c402c4e84a352a5bb69128288d4dddcd06f861e770c72a8f4f9724b826d49ca9
 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
+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 12387 RMD160 9255a63278a59439edc8a930f97f613c2dac37b4 SHA1 c0f87d2d642899b0601764016b448d531e2aa2ca SHA256 e4a01a5d9160cf1aba9298ebc82a390dd2d43546fd50ed74342d1dba79be8868
-MISC ChangeLog 77808 RMD160 bcc997eed8cf9eecc2998d56a51ab2688af9852a SHA1 dc2a981a842b91f9ff63f9f7434a835d2cd2ced3 SHA256 0648a6eaa47c0d4a33a3c8cec56bf87a3fa6d0815b498d5496b882f7c856e137
+EBUILD openoffice-2.4.0_rc5.ebuild 12104 RMD160 ac61bac0d819c22ff11fce1a4066bf9ab579c74b SHA1 005a0b0e2f718da1fa3b932ee5aa5fd1ef3b329c SHA256 4441dfdbedb7a1ace491ef98ed8eada06da2ad1cfcb4029b2203528b9a4b845b
+MISC ChangeLog 78057 RMD160 1fb7179a006ec29e2e75632d58c30f6969af39af SHA1 37b72bd12df5cd66640e69221b4bfb5422eac7ac SHA256 90e7a658d09b80d4d99b8d440dce9c275740ea165233186708d1ae7cc9c06c8e
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
diff --git a/app-office/openoffice/files/2.4.0_rc5/gentoo-2.4.0_rc5.diff b/app-office/openoffice/files/2.4.0_rc5/gentoo-2.4.0_rc5.diff
new file mode 100644
index 000000000000..7b9da0a7ff0b
--- /dev/null
+++ b/app-office/openoffice/files/2.4.0_rc5/gentoo-2.4.0_rc5.diff
@@ -0,0 +1,22 @@
+--- 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
+--- configure.in 
++++ configure.in 
+@@ -1090,7 +1090,7 @@
+ elif test "$with_tag" = "OOG680_m9" ; then
+    UPSTREAM_VERSION=2.3.1
+ elif test "$with_tag" = "OOH680_m11" ; then
+-   UPSTREAM_VERSION=2.4.0
++   UPSTREAM_VERSION=2.4.0rc5
+ fi
+ if test -n "$UPSTREAM_VERSION"; then
+    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
+
diff --git a/app-office/openoffice/files/2.4.0_rc5/ooo-env_log.diff b/app-office/openoffice/files/2.4.0_rc5/ooo-env_log.diff
new file mode 100644
index 000000000000..908169ab6c5a
--- /dev/null
+++ b/app-office/openoffice/files/2.4.0_rc5/ooo-env_log.diff
@@ -0,0 +1,25 @@
+--- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
++++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
+@@ -21,9 +21,8 @@
+ echo "configuring ...";
+ autoconf || exit 1;
+ 
+-echo "Env for configure:"
+-set
+-echo "Env for configure ends"
++echo "Log Env for configure to `pwd`/env.log"
++set > env.log
+ 
+ eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
+ 
+@@ -88,8 +88,8 @@
+ # similar that gives child nmake's pain.
+ unset MAKEFLAGS
+ 
+-echo "Env:"
+-set
++echo "Log Env to `pwd`/env.log"
++set > env.log
+ 
+ # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
+ # already merged?