Finaly add 2.1.0 to the tree

Package-Manager: portage-2.1.2_rc4-r8

3 files changed, 47 insertions, 4 deletions

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 35ce6cc73120..5b324a53a3f5 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -14,25 +14,42 @@ AUX 2.0.4/regcompapply.diff 319 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752
 MD5 cb8c7bad3c931b6b7990cffd484a4cae files/2.0.4/regcompapply.diff 319
 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752 files/2.0.4/regcompapply.diff 319
 SHA256 6886083c9de0493f0b3a68b8d1f329ed3927360d989ff1d15916f12c7842cadd files/2.0.4/regcompapply.diff 319
+AUX 2.1.0/disable_cxxhelplinker.diff 542 RMD160 f6acf0ab183d2cd3119c5aac2aab2bb10de1e867 SHA1 4c25cab1d11a8f53ff263072aff3a4fa9bc53ab0 SHA256 a754eecd83ba38bcb77ce7c9ce888078397cbfa6963c39475e3401142d2f5157
+MD5 a6f5ecfb56f82de3684a1e802f554b8a files/2.1.0/disable_cxxhelplinker.diff 542
+RMD160 f6acf0ab183d2cd3119c5aac2aab2bb10de1e867 files/2.1.0/disable_cxxhelplinker.diff 542
+SHA256 a754eecd83ba38bcb77ce7c9ce888078397cbfa6963c39475e3401142d2f5157 files/2.1.0/disable_cxxhelplinker.diff 542
+AUX 2.1.0/gentoo-2.1.0.diff 182 RMD160 2cf5750a040b0711f4cef05882a1d403d41927af SHA1 92b1de167a32a5b9f71f124eec75917c46c0ebb9 SHA256 c441bb2a3e291ca19bd839b6f544151195779f38df4a3cf3a8f92f337057f7ee
+MD5 0f5ab709306b362f1787d578510b0838 files/2.1.0/gentoo-2.1.0.diff 182
+RMD160 2cf5750a040b0711f4cef05882a1d403d41927af files/2.1.0/gentoo-2.1.0.diff 182
+SHA256 c441bb2a3e291ca19bd839b6f544151195779f38df4a3cf3a8f92f337057f7ee files/2.1.0/gentoo-2.1.0.diff 182
 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-sdk_oo.tar.bz2 29295983 RMD160 60ef50b4206d3424103289a53d1cd897729c85e7 SHA1 b97adf5342b513dd5d42bda65ef9dfc1f4b2a1c2 SHA256 fad5de27f827c31064fea1e222092079af98866680e4be57b610dd5015a7da0d
+DIST OOo_2.1.0_src_binfilter.tar.bz2 16349604 RMD160 69625f4ac6e1c72bf901b69173195009a78d33ba SHA1 7c3c9ea5217f7cd5ee46dee90ce71f4e8fab3137 SHA256 0145872512badc637b17be36444211b17d83676ce3570068950dac763ea65be0
+DIST OOo_2.1.0_src_core.tar.bz2 122566860 RMD160 11256b125fdc412480d90983b0f80f35d4833e9a SHA1 9513216ae71267addf3625f5a41c3a43564da3bc SHA256 44d1f4696a3eddef02fd3b4dde07c2049884953dcd96c1121513ad6eddd5db77
+DIST OOo_2.1.0_src_l10n.tar.bz2 73603380 RMD160 4b8e95a35f2222330790a442aa1a9a4988d9d37e SHA1 dd50756610e277f2886f6d423d57c084f0bee18a SHA256 269a08ca3e14cf69f4ad82c4743029aaf87510c9a9b7c6dfd9b35f6b4c75bbd1
+DIST OOo_2.1.0_src_sdk.tar.bz2 29297196 RMD160 64d8a113ad1307c8fa66880bb0edf83c769f5978 SHA1 d0e0e445e00aad67fc2cf9f4d550018c808a1a79 SHA256 1d860adc52390b2910961e33b8ac5d27a55cc4212b9db8f73ccc1e05fbef2863
 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 lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1
 DIST ooo-build-2.0.4.11.tar.gz 4675395 RMD160 73f7f981f3d4a15f879bbd8cc41d1690be4d6dd7 SHA1 102c4df8e14a95bbf410c0364089d39c4f70e563 SHA256 f3164e2242fa8bbe4e196bcac8c9ab332f33542940c3677d58bd13fc3a3c55ca
+DIST ooo-build-2.1.tar.gz 4034756 RMD160 8acf5e0276a878c33762365434c8753a45765233 SHA1 02a3857fb18b5b60d5f946a2bf6c9c90defd3f23 SHA256 02bdf2c8b3fa02cabfdb8aa74a2d0f194d5488c504afb1019d720ed5ce38b4ac
 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.4.ebuild 9998 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5c9c SHA1 b4a7518f0e464022685b17347ec199a30408eb13 SHA256 64895490bbc4c12cf6f552ffb37d847c79f37e8563fa8a115b50c1865a2bdc10
 MD5 7387216086e33c7907d1450fe64bb965 openoffice-2.0.4.ebuild 9998
 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5c9c openoffice-2.0.4.ebuild 9998
 SHA256 64895490bbc4c12cf6f552ffb37d847c79f37e8563fa8a115b50c1865a2bdc10 openoffice-2.0.4.ebuild 9998
-MISC ChangeLog 59496 RMD160 49de7b78685d90427066cb19ddbcadaa8230a2f2 SHA1 57240276074972b8b0d3622de6d4de45da15e848 SHA256 02c5257881ff436a10b6a472f326b18268aac18fb28da07afb9b0f41c9a170b7
-MD5 c5264f579598fccf52f16185f478aaf7 ChangeLog 59496
-RMD160 49de7b78685d90427066cb19ddbcadaa8230a2f2 ChangeLog 59496
-SHA256 02c5257881ff436a10b6a472f326b18268aac18fb28da07afb9b0f41c9a170b7 ChangeLog 59496
+EBUILD openoffice-2.1.0.ebuild 11209 RMD160 cbceaddb4984c2c85e79aa39395496e771dee317 SHA1 3e2deb8ca937729e19b864f625623fba06cf99c9 SHA256 cf71f6cebbe18d4b5195058b37d8aaa24fa0d25fde300c4bd6475cb20f875df3
+MD5 fba5a96fe4b13bf743aefec2c2c65f12 openoffice-2.1.0.ebuild 11209
+RMD160 cbceaddb4984c2c85e79aa39395496e771dee317 openoffice-2.1.0.ebuild 11209
+SHA256 cf71f6cebbe18d4b5195058b37d8aaa24fa0d25fde300c4bd6475cb20f875df3 openoffice-2.1.0.ebuild 11209
+MISC ChangeLog 60083 RMD160 8c3a71d23df5c958c011e7af88727336e6a8f538 SHA1 bb6a56bfc825f3bc436bfe4e590452e707585a99 SHA256 9cecada124f55f41f804ba32ae61c7b6e26eda1c9ed3b5c9fb62f6f47f90d5e0
+MD5 99d0d2296f99810c7c6a4cb13165805f ChangeLog 60083
+RMD160 8c3a71d23df5c958c011e7af88727336e6a8f538 ChangeLog 60083
+SHA256 9cecada124f55f41f804ba32ae61c7b6e26eda1c9ed3b5c9fb62f6f47f90d5e0 ChangeLog 60083
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -40,3 +57,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 e837d4be9f6b62e483edd69a87b84a45 files/digest-openoffice-2.0.4 2690
 RMD160 fe56e14aa7634660083562d9114978cfded8e489 files/digest-openoffice-2.0.4 2690
 SHA256 b069f01aacb01cc7136aad7b37f65aee07a3cfc574902972e4b1d48cabcd0890 files/digest-openoffice-2.0.4 2690
+MD5 318a5cc7bae4bfca4526a0f8cd48a653 files/digest-openoffice-2.1.0 2714
+RMD160 dd30d937a7ede64ed422c7579d91929d06afe7da files/digest-openoffice-2.1.0 2714
+SHA256 32f76ab4627dfbe88bb9112395b09a799945b4544026d42c76a6c3f94c0f3f7d files/digest-openoffice-2.1.0 2714
diff --git a/app-office/openoffice/files/2.1.0/disable_cxxhelplinker.diff b/app-office/openoffice/files/2.1.0/disable_cxxhelplinker.diff
new file mode 100644
index 000000000000..d855b0b4c193
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/disable_cxxhelplinker.diff
@@ -0,0 +1,12 @@
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -73,7 +73,7 @@
+ Frugalware64: FrugalwareBase, 64bit
+ QiLinux: LinuxCommon, GlobalDesktopFiles, FilePickers
+ #Gentoo
+-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, SystemJavaBits, CairoFonts, CXXHelpLinker, ICU36, BerkeleyDB43, STLport5
++GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, SystemJavaBits, CairoFonts, ICU36, BerkeleyDB43
+ GentooUnstable: GentooBase, GentooExperimental, 64bit
+ Gentoo : GentooBase
+ Gentoo64: GentooBase, 64bit
+
diff --git a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
new file mode 100644
index 000000000000..85f600e31780
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
@@ -0,0 +1,11 @@
+--- 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
+ }
+