First release candidate for OpenOffice.org 2.4.1, masked for testing

(Portage version: 2.1.5.2)
 (Unsigned Manifest commit)

3 files changed, 67 insertions, 1 deletions

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 545d2b59b87e..6cd4c9f3e636 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,18 +1,26 @@
 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
+AUX 2.4.1_rc1/gentoo-2.4.1_rc1.diff 894 RMD160 7dfa03b31f572e04ae0a5d28dbb50d23f87ca2f4 SHA1 3d6ecd6564f9980a904328d3a5f34e5cbf7f2b4b SHA256 4b05dcf64461a77a0b6ca49b9da39739309f96bf2ac8e75d799c046297363f9b
+AUX 2.4.1_rc1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 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 OOo_2.4.1rc1_src_binfilter.tar.bz2 6674638 RMD160 57ab714eef5ce4d73ce4587dc7f4fcc30a72f90e SHA1 facaa01e016f8bed5aed24343c55983d9e5d3dc2 SHA256 27d4811b07f8670cf0595083165956ed589a26af4e94bf4f5a048e913f11c0d1
+DIST OOo_2.4.1rc1_src_core.tar.bz2 153564440 RMD160 bf4842f05b390beaf8bf50ccbd827abf44acc44a SHA1 5a0096330672d891480f5edb9640a88622f76975 SHA256 f2b6ee3e15b7e3daecd913c0c26a046c77afb366ad361c06b139330d59f4f87e
+DIST OOo_2.4.1rc1_src_l10n.tar.bz2 1766 RMD160 a4e8585083a422d197ebccd7a1b0515644611310 SHA1 913418898572f6090d7854d038dbf1206d0ff9a0 SHA256 45566c87d408a0eef27851e2972ec84bc1070cc4cc9d2db529226a8fd1f4e28c
+DIST OOo_2.4.1rc1_src_sdk.tar.bz2 38456 RMD160 c830ba383d0a36349400573ea7758aaa1405d803 SHA1 4cadb22a7532d25eafda48ce7564e1c62bf3c172 SHA256 88cf945f02746154b317055f74a4e3883c5965f392b46e4213227c05156f65ae
 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.2.tar.gz 401460 RMD160 9bb39a4b3081277209326c0f553d398c51b4f3bf SHA1 06f4da8fcddaa1987c761f617c41724734e839fa SHA256 1fd363db1debd3f0883b942704809d758f54a3a7d09fc1ddfbd99a1062d4e851
 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.4.0.13.tar.gz 8628867 RMD160 804b5bdcef030b585f323d0e07dd6c0ccb019460 SHA1 0400a6743357f0e3f3528501defe65e3a4b0be64 SHA256 07ff66d38c4926bd3a03939667c4766b7436b8fe5ce3e2c1ccb596b412655d2c
+DIST ooo-build-2.4.1.1.tar.gz 8813021 RMD160 ae3c806123a6713694ff5282552260ff036b10e1 SHA1 e11ee940bd123b65c3587b93acf050fa412b81b4 SHA256 81e833f167dd67805560f7d84d5f9f68aec8a31287f90e631528ee269871e2cc
 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
 EBUILD openoffice-2.4.0.ebuild 12706 RMD160 7413dafed817b48a0fcd3d5505cb0ca4bce866c8 SHA1 cbbcf120777424771ebe0d734c838a1178429b87 SHA256 0f1fef5abc41a64d3f08ef029ff75f4e021b36625c2fa9c312eaf68e8ac2fddf
-MISC ChangeLog 82344 RMD160 db7b18375ffeaa55befe1fd59cbf090623668620 SHA1 9af16822c75e9d15a1462143eca2860c2aaeecf2 SHA256 039dd3bfe6b5684cfd52ecdec4126004be6489a0719769b9cc636dd43ce7e00c
+EBUILD openoffice-2.4.1_rc1.ebuild 12761 RMD160 c94d6773c53c7975dc3679c8b50835bb244c4b61 SHA1 0272c780f43e3f7c3d247a5227ddc5f230da262c SHA256 141bfa0527b2e9cb7d5b224e86d42f34823e1541df793202ec4b104ff460a9b2
+MISC ChangeLog 82615 RMD160 adbdb9bebffb4c4463e22531dc3e4d80bff67c7b SHA1 a2270d6b19dbc83af90cb90d970653ffecfadfbd SHA256 88931a315d170de83e2e4d7f54f6b63141f91524f85a4657de4500cd55c87f1e
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
diff --git a/app-office/openoffice/files/2.4.1_rc1/gentoo-2.4.1_rc1.diff b/app-office/openoffice/files/2.4.1_rc1/gentoo-2.4.1_rc1.diff
new file mode 100644
index 000000000000..ede7f34cdbcc
--- /dev/null
+++ b/app-office/openoffice/files/2.4.1_rc1/gentoo-2.4.1_rc1.diff
@@ -0,0 +1,33 @@
+--- 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
+--- patches/src680/svg-import-filter.diff   2008-04-12 23:55:36.000000000 +0400
++++ patches/src680/svg-import-filter.diff   2008-03-06 21:09:06.000000000 +0300
+@@ -692,7 +692,7 @@
+ +                      $(SLO)$/units.obj
+ +
+ +.IF "$(COMID)"=="gcc3"
+-+.IF "$(CCNUMVER)">="000400000000" 
+++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES"
+ +CFLAGS+=-DUSE_MODERN_SPIRIT
+ +.ENDIF
+  .ENDIF
+--- configure.in 
++++ configure.in 
+@@ -1136,7 +1136,7 @@
+ elif test "$with_tag" = "OOH680_m12" ; then
+    UPSTREAM_VERSION=2.4.0
+ elif test "$with_tag" = "OOH680_m16" ; then
+-   UPSTREAM_VERSION=2.4.1
++   UPSTREAM_VERSION=2.4.1rc1
+ fi
+ if test -n "$UPSTREAM_VERSION"; then
+    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
+
diff --git a/app-office/openoffice/files/2.4.1_rc1/ooo-env_log.diff b/app-office/openoffice/files/2.4.1_rc1/ooo-env_log.diff
new file mode 100644
index 000000000000..908169ab6c5a
--- /dev/null
+++ b/app-office/openoffice/files/2.4.1_rc1/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?