public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/anarchy:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2011-06-20 18:34 Jory Pratt
  0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2011-06-20 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     5567295fa7d2f939fed86dbb845e736a0e8ba865
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 18:28:18 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:28:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=5567295f

version bump with gcc-4.6 support along with system libwpd libwpg

---
 app-office/libreoffice/Manifest                    |   48 ++++++++++---------
 .../libreoffice/files/libreoffice-3.3.2-gcc46.diff |    1 +
 ...ffice-3.3.2.ebuild => libreoffice-3.3.3.ebuild} |   10 +++--
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4bca768..3a02175 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,7 +7,7 @@ AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75
 AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c
 AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
-AUX libreoffice-3.3.2-gcc46.diff 13710 RMD160 30039ccaa4cc068532546625dfb4ed36b338503d SHA1 cfb3008a61168e94a928a213c7a8da459676cbae SHA256 fb35713bf8e85239dc6b1f5c7529eff720417254a004f53c2fea86945941c453
+AUX libreoffice-3.3.2-gcc46.diff 13711 RMD160 caabb1be7a3bb92294fcca42d93a5fa65ce84a57 SHA1 164f26319f3c4be1c598b36e8e78943c61363e8f SHA256 d33a7e073e742f507013986911f3bc8e7606af0e139b201f475db64d6c642919
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
@@ -34,6 +34,8 @@ DIST 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 441 RMD160 db
 DIST 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz 22508 RMD160 08682935b555027eb032a212accb2284ce93d645 SHA1 b8ecfaee8aef693817f0ebc12a2e932ac9467776 SHA256 799682f52182fa8295227731b4efad639413f82c1950a6459047477000f2a619
 DIST 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 674912 RMD160 e900cb8670b8c430beaa45895fb474411cb1958d SHA1 f9940698840c8a8045677e8be68ab8580903e20a SHA256 b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d51ac11f00
 DIST 5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip 44748 RMD160 de0edf9be3e466c0291c75cff49f44851bdd69f4 SHA1 82663948e32fe269c3ac9c6704855e1dbf63d6de SHA256 b1c123f73fe5c48092576b1f15eee6e374697b2b361ee8b0f7762e4036ab1911
+DIST 5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2 326684 RMD160 0169a85c75040dd96b03702c5d2cd67dfded6d1f SHA1 34a692566bda66488f83c635774d1bd92cee0fdf SHA256 d823f4b2ddfe349cca09e40bd57af8220e8bf935bcfb66be520e02ba4d327dc6
+DIST 5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 540345 RMD160 8cb666fd4244831be0008a24905fb22692414d8e SHA1 bc1fd58fdb260409b02bd01911bd3187b05c5220 SHA256 f8295f3803f9089f31c26b77371f3bcaf8e57909b6803b7b8fb9194e7e55e40b
 DIST 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 2424604 RMD160 a46ebbc4915dd871891c8461a331dd0804b61101 SHA1 bb845c3de2bb7ad93dddb2c752247ec91475a947 SHA256 d1708a3a9a0d08b1cde1e9d95de950c2f18fffc3ca41413c06b3ed3cae34a5f5
 DIST 79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip 1449297 RMD160 70849a36291392e7f0f17f32884514eb4264371b SHA1 f4685ca1a539f9eb8cda92acd485b1430290712f SHA256 a7907d558d77b6c980542b31546b199adf2fc8fc7ee2bb0ba3cfaf94fba57902
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 RMD160 68e248ec03675458f0536282ef250efa42c4c154 SHA1 8a90669029e107b61953b90ba11545fef586c2ca SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
@@ -67,26 +69,26 @@ DIST f3e2febd267c8e4b13df00dac211dd6d-flute.zip 83503 RMD160 c73b7919ee73d248d11
 DIST f7925ba8491fe570e5164d2c72791358-libfonts.zip 1336993 RMD160 a4ba6e7e2e19a085dc054d3793f7c31d5c32894c SHA1 171fc524f7f42e99b23754c8aca0600378057d40 SHA256 40549fb2995749f1c57455d1226b1e1fa1cfca635ce9d79d8de9ec625e4a82b9
 DIST fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 559 RMD160 46ffb5caf57188aef737668221cf0013621a2a80 SHA1 21ed62fb15fc59a942ec0ced95e885653290f0f9 SHA256 aab31340dfc8a6ba5c9689349ff892336044cb6637a426404cf197ac21ed2244
 DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
-DIST libreoffice-artwork-3.3.2.2.tar.bz2 21989346 RMD160 1ccf6ed246bca092e3b0fc4e56dbd257e7a54073 SHA1 58111f00cb80b0003a5acb33174318c8d9975685 SHA256 81b087bf616b521ece2be1922c532917be0cb564ffec1a8043219d2cf9b5aa6d
-DIST libreoffice-base-3.3.2.2.tar.bz2 2082264 RMD160 0f20c212d3336ce70298b0825539d45acef101ab SHA1 b04e5dfa550db2726338d9be61b908e47a9e3e50 SHA256 32a03ea3897f978bc98d67a03cae60f2c9b6e395e1aa8c8cca06f62979efcf15
-DIST libreoffice-bootstrap-3.3.2.2.tar.bz2 2751299 RMD160 b8279525a1c7ef789a5c03853e69d775d9218521 SHA1 68829ca1d83407ad295c7c2495d7e0b9969ef45b SHA256 8799545dd696be0288e690ae066b4a91bdd4979b4947a9faf36f21c1500ae044
-DIST libreoffice-build-3.3.2.2.tar.gz 14466234 RMD160 c41a7af4da7d1cb680a7eb0197846ae2ccfe15d1 SHA1 aaa0d1cc4bb79cc70a6c7fb083706411bf510e78 SHA256 be754033eacb59dd79234ac60b3c3a0a9c08eac510daa0fb16ed16abe2cf5e3e
-DIST libreoffice-calc-3.3.2.2.tar.bz2 9407394 RMD160 6495cdf36687d88a8d2650c9ee8054f70b2523ba SHA1 d6b165fd27065854b61f312c689c049ad12c251d SHA256 cba5e46ad4899e68dceefd655f3607e752186f699cff50af9fddc7220082f996
-DIST libreoffice-components-3.3.2.2.tar.bz2 5123213 RMD160 825f1463c7cabef10fb32961e927d5a85460cf05 SHA1 4f2d2aaef0efbc0aea695efb536367cf01fbc60e SHA256 8c554f9266eb92b1bdd09379bde83ece2180bdf132f6f45f59c2d509884c5e71
-DIST libreoffice-extensions-3.3.2.2.tar.bz2 4198856 RMD160 17e2fc608bcfc729da938b8f18598decb3b591e9 SHA1 c0733e402696e6e99b6a4658471a990de1a349b9 SHA256 f5ad77b09cf174bd73b107805e09c6bd6ddadd5348908861f4e730dee62347ff
-DIST libreoffice-extras-3.3.2.2.tar.bz2 38706912 RMD160 063ff609bd3a88414e4dedd4c103cfbdcaae7cb7 SHA1 f07ec52a6367e110d4e969eb21b4678ee07f61a4 SHA256 74bb20a2ce2c3139ca7b35c4d82390b26c745e09e7b7596521e7a80d73459b4d
-DIST libreoffice-filters-3.3.2.2.tar.bz2 11950736 RMD160 6c1d5bb2d8958bf3ee4a5ced4b678fa1dddec401 SHA1 6b15187c796a31ede38ad1108addce94d94d40f5 SHA256 7ab895b5873b2a9f1d6d631d6af1fbbbf8c8d520564d46c30440658e2833e58a
-DIST libreoffice-help-3.3.2.2.tar.bz2 1914229 RMD160 b00668915f716b57c79491896b97431db0dd7513 SHA1 08213ff55841426c1c20ff2f5269a7a941deb38f SHA256 f3d105f2e4eae770ba87b8ecb7b425a2479aa3bcfca4b95bb0de4cd50f5b2da8
-DIST libreoffice-impress-3.3.2.2.tar.bz2 2607403 RMD160 372200c44b544273b13eb2187b492148472f5ce4 SHA1 19bfe0c22e7b7623766ef2fc237aea11b7a0049b SHA256 93a879bb15bb1995d3f0c33a623639c4f0917fa3909fe998865001546d6575cf
-DIST libreoffice-l10n-3.3.2.2.tar.bz2 80784635 RMD160 d0674b3ae355eb19d9e85f7898ce811595a00632 SHA1 18d661cf597c8ecf350a808462b332ca3c5d5611 SHA256 a0f705de7cdabcde047545b9240a295eb2002e7fcfec81f2a12262b6937c578d
-DIST libreoffice-libs-core-3.3.2.2.tar.bz2 16698853 RMD160 12ac46ee9e8f51e997d6193042629c46c9abf2ee SHA1 236d605f6b5faa01de6000c0440ef24286e6f167 SHA256 66b1924fac13fc0a293b59abf55cc1d28dd0e8af085b758d166e7f1d3997323a
-DIST libreoffice-libs-extern-3.3.2.2.tar.bz2 628888 RMD160 d94568c00e515de6aa6e6764c06db297d5e84f83 SHA1 4ccb124b2c96238e6509f4ffb316380663d1425f SHA256 6f55e4c1cfe6ce179448342f117030f8e0016b154d0a68ead52d5a48f5af8222
-DIST libreoffice-libs-extern-sys-3.3.2.2.tar.bz2 38822520 RMD160 93464429e38e6d6827efea3146e4334b81aeef7c SHA1 93ec79c399dae49485e93dafe2f8d5df3efcd344 SHA256 b63de5e7bb8274fa3e82a0a028dff56c985b6c3d44517b7840973be980d8a8b5
-DIST libreoffice-libs-gui-3.3.2.2.tar.bz2 10833350 RMD160 f5ce3aef3d44fdad6194ea71a8b3dafb8ef18c5a SHA1 dfe92cf62f553103804c2ff971428fd95d36edb1 SHA256 c9264c0f7b292bf131f74c8b54f380350f29f9e4d3e4da203483c6d2c20cf15f
-DIST libreoffice-postprocess-3.3.2.2.tar.bz2 43106 RMD160 609ed05dec50008a26e8fbb07e78d0e4898d5b52 SHA1 8b60346b59375a52dec80c4f81d13175e21f5829 SHA256 2e7ab60dac2c520c9d709b34f631bb2ce30cbc9ae04f58dbb32314a683c65762
-DIST libreoffice-sdk-3.3.2.2.tar.bz2 1710897 RMD160 a179fdc2248e5b968fca56577ae0dfe3fd6d4dc0 SHA1 e92375a45afdf2612946ab45ac423878ba188d6f SHA256 95699df280e7ec022ec4659448359040fb00d47f680ee808b4a9554153490b29
-DIST libreoffice-testing-3.3.2.2.tar.bz2 50946350 RMD160 eeee1b4f985ee6897def774b5e9f0cd38014883c SHA1 e67f369188858b5b7451762049953daf1167e925 SHA256 0b67a06192fe157e9fe0c0f70acc96897db53add936baf4d3b5f1a7552e81ed3
-DIST libreoffice-ure-3.3.2.2.tar.bz2 6165456 RMD160 016a6e690e02e41519e2d64d174f542b5a4e50f2 SHA1 40261e8a9605e504661111c41229ce0ee2986844 SHA256 37b340c3b476e1c7a95c4406228848d8afe0b5f8188af7a4f01f7fa5772232ea
-DIST libreoffice-writer-3.3.2.2.tar.bz2 6778875 RMD160 db0b4ae2c1c93c6e35e93e48ee4ce5bdc1e963dc SHA1 d0d329bd1659c3d943c746c4f8cc76379094d7cc SHA256 3b7fe1fa2a889b5358a958c8e669505fa81251164c773d3dad650ce53009a973
+DIST libreoffice-artwork-3.3.3.1.tar.bz2 21988711 RMD160 87889fe32738688f62eb8dba338592439541f9f4 SHA1 820c8bbd2e77fca28ba2e817f0b438319570ea58 SHA256 a09c65f1db0a953b6f68c7a63190da75fc07edc4cb6122c13317ae17471be62e
+DIST libreoffice-base-3.3.3.1.tar.bz2 2082833 RMD160 ab4820d9d8bf856946f20ef36781119da7de24a6 SHA1 91d0be9606605a8176aa08b120bf7f2e0269e9bc SHA256 0f26d3ffd42a184480bb59a089ea0068fcb9c2ef02a745dacf428e0b428ad54a
+DIST libreoffice-bootstrap-3.3.3.1.tar.bz2 2751295 RMD160 a4cc2f74ff3faa93a4006eadde355aacb1ca0973 SHA1 b12bbb7558086cd49b2f52ee20932f2d0a7e8811 SHA256 f51f0cef73b5657b5a0bb49c67da402e1a96e061da20a1ede35dcf41b3d7461f
+DIST libreoffice-build-3.3.3.1.tar.gz 14608755 RMD160 bdda006de40a39ca257ddc1149d47714d5df58b6 SHA1 846dc655a294e3d382dabd47786d2f414feb4d24 SHA256 2b7b35e461697aa3379bf53181dc05ecc00bfc9b83d366e2f81837ca8d464f13
+DIST libreoffice-calc-3.3.3.1.tar.bz2 9404500 RMD160 51d15421d3fa907c422c43eb39cef0df1a46e761 SHA1 7b6d06e3dd5183c40e8a9ded0eedeb28ddc4aebb SHA256 f13ecea9a05f02aab8320f5d3edbec2b53838d5d7620b0295ee39f5a0011ebac
+DIST libreoffice-components-3.3.3.1.tar.bz2 5126030 RMD160 6d7291d1b84c0b0ef58d91eb900b9b0c584bdf95 SHA1 df65514edbcf32cdfc4559bec604309103679a30 SHA256 77238933fce5cb442e60117732be3a5fc5c95b04a83a23d0d32b678d5a69cc34
+DIST libreoffice-extensions-3.3.3.1.tar.bz2 4202583 RMD160 46db699075d9fae97593a29761245587cac5715b SHA1 2e91f00d859b72810ff30987fbad3bbf3f644ebb SHA256 7721fa9fb53608ffcf9358de6f69b0f763b676334794f11b068d475f9824ada5
+DIST libreoffice-extras-3.3.3.1.tar.bz2 38706769 RMD160 2621d4729320099a31d3cec82c2c03f1cae3d371 SHA1 ed21c0faac63000b6473b3fb9cba820223c9c107 SHA256 c2e9c6a3f6e5756b714b8fd300dedf51012ee41b31a99a096998b95557fd8707
+DIST libreoffice-filters-3.3.3.1.tar.bz2 11949559 RMD160 7aa30d68991d6468e357ee18061599139bfb6581 SHA1 8e0eada653684136206fd576582762e054268d7d SHA256 57b48f5f2acf3bd7a1c0e6403201939b9416367e5967a292a5f4908fdb85c932
+DIST libreoffice-help-3.3.3.1.tar.bz2 1928379 RMD160 7aaf8b4a7b9fdc2c49bee7903714d45b28da8e4a SHA1 751e4435a37895bbe242d4be759457f9181b42b3 SHA256 4dba3ee1f58f6c34004ffa3e7e3f88dd2e20e46018119105fe4e7fb295b0ce28
+DIST libreoffice-impress-3.3.3.1.tar.bz2 2606174 RMD160 b80f097f69aba533fc235d1d18794b96a832f357 SHA1 61b479d92bf4e3532dc7660862e9fbd788164c39 SHA256 30340e8878118ed1f26f6b0be39022c378385e2c8a84a80127c501adfdddbd72
+DIST libreoffice-l10n-3.3.3.1.tar.bz2 80826598 RMD160 231f4fe2535fa17832c3b8b6d439cece1fb1c7fc SHA1 e3cc368c9e2c94722d99be70e203ff1487579e3a SHA256 db8fc1cfa0701e5b4f518ecfed7d0f3dd2a9000eda5f1ad9f8ded35c79984780
+DIST libreoffice-libs-core-3.3.3.1.tar.bz2 16651698 RMD160 30482b696e8a004690e366f0314f6ac6090ab70a SHA1 ec4efe4a3bff8b3e155ba6337235f7602fc0a833 SHA256 a7002e77ecf778b109ba1e82220dc5574db6a7ce6cc77bb063fe9d2cf977c5fd
+DIST libreoffice-libs-extern-3.3.3.1.tar.bz2 629622 RMD160 b638045bf38f16022fe448ae437f6ec4593f81ca SHA1 2ccd83d9f7a1686b52ec8f6b2d460ff715a331f7 SHA256 0372a48153bb3931d0300e89de42b5e54d408d8a5552e60fb2eb3ebe44cd27a6
+DIST libreoffice-libs-extern-sys-3.3.3.1.tar.bz2 38823514 RMD160 92c26edd4784e041fba7eadc556a37f7c5b3b26b SHA1 33bfe5dbdea89c651778080a484eb3e7f5f1442c SHA256 00e1e504a350cbb8a94dc66d3ae6f69961121c146033c1af696857ce76b4d3f0
+DIST libreoffice-libs-gui-3.3.3.1.tar.bz2 10833787 RMD160 ce2286293b4d4106ca699636930ec37446275051 SHA1 8d6f52e9cf75d6ce342e072f1bc8371e3378ef8e SHA256 a3e9c1482f653c8db796519294a5aed3e0f3f945da3d1925a83dcb7a78b43e30
+DIST libreoffice-postprocess-3.3.3.1.tar.bz2 42994 RMD160 66dfc58de19a6d9ddd62c70c44d76d1a00707b3f SHA1 9a79dfdb290348a109fffab3c1334732cfee2ba3 SHA256 6c9cebfb3e7f3d2e8f3a354bcada28552a84c0806ea20255b28e4376406ebd07
+DIST libreoffice-sdk-3.3.3.1.tar.bz2 1710604 RMD160 1529fd40bbd28911ed1cfdb8e5613d57225b2022 SHA1 d8544f5f24654a0b1c197b8881fbb15c4ef48dd0 SHA256 e5795ba600e84a8565b75131975d63b29fddad1ec4b8ee5416f2ce88282e1935
+DIST libreoffice-testing-3.3.3.1.tar.bz2 50945720 RMD160 247ee46d2f21b7ad186dab8d87bbe3507f70a2c1 SHA1 32d7feceb7aaa0256f51a32761edb60d6aa46eac SHA256 47b2632cc564080008649e4ed5a071fb3a1feb6f8b209236aee1e1c304701a1b
+DIST libreoffice-ure-3.3.3.1.tar.bz2 6163742 RMD160 e046d55882b57080dac73f59736019f5dd8539bf SHA1 51ca4cd60e53ef5ad1e1297a80f1d24faae50cc5 SHA256 ddf053aa2c5db4b41e461f1009eb9d0ff218aadb0b4fa492e627dba06873ea2b
+DIST libreoffice-writer-3.3.3.1.tar.bz2 6777324 RMD160 53d9c4494720d574099b628c3728776afa806369 SHA1 e2904da46bebd29916be810af3616cb1667d11c5 SHA256 7d91da3cfc31595a6c0fa0835a27735e2934bd27c1c214b5abbd92c845ce4b68
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.3.2.ebuild 18040 RMD160 d5429343e7fa7059c3d11dcf22ff156383e7b5fa SHA1 45e5badc2ff98273ed2ecdcca71f04fd16124ef0 SHA256 f1ec56e7da38fd04c7792f156feca38a19ca05fe46adcbcb3b621f11492ad9ec
+EBUILD libreoffice-3.3.3.ebuild 18248 RMD160 2a1090d61a13ee04cec1847a5d376d849ecbbfdf SHA1 bd38f4d2cc144e2f6bf49301383d8f8c13894047 SHA256 d0525f7520784f87f67b292dd352698d68a3d13359271037a91cbf428e8e1615

diff --git a/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff b/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff
index 164a177..0f86a2b 100644
--- a/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff
+++ b/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff
@@ -293,3 +293,4 @@ index 043a214..02f6e00 100644
  
  template<class T>
 
+

diff --git a/app-office/libreoffice/libreoffice-3.3.2.ebuild b/app-office/libreoffice/libreoffice-3.3.3.ebuild
similarity index 97%
rename from app-office/libreoffice/libreoffice-3.3.2.ebuild
rename to app-office/libreoffice/libreoffice-3.3.3.ebuild
index 32cc514..39de605 100644
--- a/app-office/libreoffice/libreoffice-3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.2.ebuild,v 1.2 2011/04/07 21:03:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.3.ebuild,v 1.2 2011/06/17 12:41:24 scarabeus Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic
 
 IUSE="binfilter cups -custom-cflags dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
 
-MY_PV=3.3.2.2
+MY_PV=3.3.3.1
 MY_P="${PN}-build-${MY_PV}"
 PATCHLEVEL=OOO320
 SRC=OOo_${PV}_src
@@ -96,6 +96,8 @@ ADDONS_SRC+=" http://download.go-oo.org/src/47e1edaa44269bc537ae8cabebb0f638-JLa
 ADDONS_SRC+=" http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
 ADDONS_SRC+=" http://download.go-oo.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
 ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+ADDONS_SRC+=" http://download.go-oo.org/src/5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2"
+ADDONS_SRC+=" http://download.go-oo.org/src/5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2"
 ADDONS_SRC+=" http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2"
 ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
 SRC_URI+=" ${ADDONS_SRC}"
@@ -257,7 +259,7 @@ src_prepare() {
 	fi
 
 	# Some fixes for our patchset
-	epatch "${FILESDIR}/gentoo-${PV}.diff"
+	epatch "${FILESDIR}/gentoo-3.3.2.diff"
 	epatch "${FILESDIR}/gentoo-pythonpath.diff"
 	epatch "${FILESDIR}/env_log.diff"
 	epatch "${FILESDIR}/fix-ooo-collision.diff"
@@ -268,7 +270,7 @@ src_prepare() {
 	cp -f "${FILESDIR}/${PN}-3.3-libpng-1.5.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/${PN}-libdb5-fix-check.diff" "${S}/patches/hotfixes"
-	cp -f "${FILESDIR}/${P}-bison25.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-3.3.2-bison25.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/${PN}-3.3.2-gcc46.diff" "${S}/patches/hotfixes"
 
 	#Use flag checks



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] dev/anarchy:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2011-05-29 20:36 Jory Pratt
  0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2011-05-29 20:36 UTC (permalink / raw
  To: gentoo-commits

commit:     150538f71967118acd64c7b0ad9703b8ece52ef2
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 15:57:16 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun May 29 15:57:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=150538f7

add bison-2.5 fix for libreoffice

---
 app-office/libreoffice/Manifest                    |    3 +-
 .../files/libreoffice-3.3.2-bison25.diff           |   23 ++++++++++++++++++++
 app-office/libreoffice/libreoffice-3.3.2.ebuild    |    1 +
 3 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 133f93b..4bca768 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 S
 AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75d42e184 SHA1 caf49686b19f11b56ea929494d16a56cc4e05326 SHA256 13c5d10642c2f044293186eb46de0611dd36ee3f0f3134ea2b3ea2c6ed6984f8
 AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c
 AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
+AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.3.2-gcc46.diff 13710 RMD160 30039ccaa4cc068532546625dfb4ed36b338503d SHA1 cfb3008a61168e94a928a213c7a8da459676cbae SHA256 fb35713bf8e85239dc6b1f5c7529eff720417254a004f53c2fea86945941c453
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
@@ -88,4 +89,4 @@ DIST libreoffice-testing-3.3.2.2.tar.bz2 50946350 RMD160 eeee1b4f985ee6897def774
 DIST libreoffice-ure-3.3.2.2.tar.bz2 6165456 RMD160 016a6e690e02e41519e2d64d174f542b5a4e50f2 SHA1 40261e8a9605e504661111c41229ce0ee2986844 SHA256 37b340c3b476e1c7a95c4406228848d8afe0b5f8188af7a4f01f7fa5772232ea
 DIST libreoffice-writer-3.3.2.2.tar.bz2 6778875 RMD160 db0b4ae2c1c93c6e35e93e48ee4ce5bdc1e963dc SHA1 d0d329bd1659c3d943c746c4f8cc76379094d7cc SHA256 3b7fe1fa2a889b5358a958c8e669505fa81251164c773d3dad650ce53009a973
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.3.2.ebuild 17977 RMD160 a5698175eff89ca8dc7c1a4d1569802424ecd353 SHA1 5e9e6edaba54c79d35c0c5fa3ea5e758173bd9bc SHA256 1749ffeae18f2df741ef0ee7a8eb9bb1105f9c5a2dadd0248dedb1fadbbd01d1
+EBUILD libreoffice-3.3.2.ebuild 18040 RMD160 d5429343e7fa7059c3d11dcf22ff156383e7b5fa SHA1 45e5badc2ff98273ed2ecdcca71f04fd16124ef0 SHA256 f1ec56e7da38fd04c7792f156feca38a19ca05fe46adcbcb3b621f11492ad9ec

diff --git a/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff b/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff
new file mode 100644
index 0000000..869b6c8
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff
@@ -0,0 +1,23 @@
+--- connectivity/source/parse/sqlbison.y	2011-05-20 13:21:02.000000000 -0600
++++ connectivity/source/parse/sqlbison.y	2011-05-20 13:22:11.000000000 -0600
+@@ -4338,7 +4338,7 @@
+ }
+ 
+ // -------------------------------------------------------------------------
+-void OSQLParser::error(sal_Char *fmt)
++void OSQLParser::error(const sal_Char *fmt)
+ {
+ 	if(!m_sErrorMessage.getLength())
+ 	{
+--- connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:58.000000000 -0600
++++ connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:46.000000000 -0600
+@@ -233,7 +233,7 @@
+         // returns the type for a parameter in a given function name
+         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
+ 
+-        void error(sal_Char *fmt);
++        void error(const sal_Char *fmt);
+         int SQLlex();
+ #ifdef YYBISON
+         void setParseTree(OSQLParseNode * pNewParseTree);
+

diff --git a/app-office/libreoffice/libreoffice-3.3.2.ebuild b/app-office/libreoffice/libreoffice-3.3.2.ebuild
index 357efbc..32cc514 100644
--- a/app-office/libreoffice/libreoffice-3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.2.ebuild
@@ -268,6 +268,7 @@ src_prepare() {
 	cp -f "${FILESDIR}/${PN}-3.3-libpng-1.5.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/${PN}-libdb5-fix-check.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${P}-bison25.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/${PN}-3.3.2-gcc46.diff" "${S}/patches/hotfixes"
 
 	#Use flag checks



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] dev/anarchy:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2011-05-13 11:50 Jory Pratt
  0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2011-05-13 11:50 UTC (permalink / raw
  To: gentoo-commits

commit:     926828c5ab13612ac08ffe8f57aa523804b1a54f
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 11:48:16 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri May 13 11:48:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=926828c5

add support for gcc-4.6 to libreoffice with system libs

---
 app-office/libreoffice/Manifest                    |   91 ++++
 .../files/enable-startup-notification.diff         |  108 +++++
 app-office/libreoffice/files/env_log.diff          |   25 ++
 .../libreoffice/files/fix-ooo-collision.diff       |   29 ++
 app-office/libreoffice/files/gentoo-3.3.2.diff     |   49 +++
 .../libreoffice/files/gentoo-pythonpath.diff       |   11 +
 .../files/libreoffice-3.3-libpng-1.5.diff          |   13 +
 .../libreoffice-3.3.0_libxmlsec_fix_extern_c.diff  |   38 ++
 ...libreoffice-3.3.1-neon_remove_SSPI_support.diff |   27 ++
 .../libreoffice/files/libreoffice-3.3.2-gcc46.diff |  295 +++++++++++++
 .../files/libreoffice-libdb5-fix-check.diff        |   25 ++
 .../libreoffice/files/scrap-pixmap-links.diff      |   37 ++
 app-office/libreoffice/files/sdext-presenter.diff  |   11 +
 app-office/libreoffice/libreoffice-3.3.2.ebuild    |  451 ++++++++++++++++++++
 14 files changed, 1210 insertions(+), 0 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
new file mode 100644
index 0000000..133f93b
--- /dev/null
+++ b/app-office/libreoffice/Manifest
@@ -0,0 +1,91 @@
+AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
+AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
+AUX gentoo-3.3.2.diff 1710 RMD160 406448b0b05ff95cf23d5e13a3a9e102955f296b SHA1 0149b456d80da07fea047c2443becf316f2711a2 SHA256 e31ebd94a154338e527976d24354917e01e9ca4ff54917e2a697d2cc2bca672e
+AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
+AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75d42e184 SHA1 caf49686b19f11b56ea929494d16a56cc4e05326 SHA256 13c5d10642c2f044293186eb46de0611dd36ee3f0f3134ea2b3ea2c6ed6984f8
+AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c
+AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
+AUX libreoffice-3.3.2-gcc46.diff 13710 RMD160 30039ccaa4cc068532546625dfb4ed36b338503d SHA1 cfb3008a61168e94a928a213c7a8da459676cbae SHA256 fb35713bf8e85239dc6b1f5c7529eff720417254a004f53c2fea86945941c453
+AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
+AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
+AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
+DIST 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz 4893724 RMD160 aefa80476ef8340be84440b61f738f432da51c92 SHA1 025d5d0d566a23ddb353495c116116c1088ba2e9 SHA256 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee
+DIST 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 376068 RMD160 b6c1b121ea1b3b1386a188e9f425a7288b1de865 SHA1 c67f67b4b8ae46ef94bc8c09dc29ff66d5796d37 SHA256 585c15b3b9ae0f3562d0aa35e15406adfd75357087d93009d4fa4ae034c6e983
+DIST 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz 540999 RMD160 2058bab6642460fdaee13993dd05da29aa516efa SHA1 e98d7149d6a20fdbb58cc0b79cb5e3f95ae304e4 SHA256 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
+DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 RMD160 8b25da02fbc2702a43cc88b0af8eaeb41c0f75a0 SHA1 7168b0f40aa5c72267899601c116d2348d2f56ec SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
+DIST 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz 315122 RMD160 e99bb5017c29657c3303d8810e21bf02d737c345 SHA1 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3 SHA256 6e6c53064ef6f40891ad72c06fab9f3c8fdcda80e03c9d0b21244cb1d4bf030b
+DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 RMD160 40a15ad43e92335558c868d66bca521e57d8c583 SHA1 0619ed3a89644bef318df67db12045b2b590585b SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
+DIST 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 728789 RMD160 c5590829fedb1934a4854fb5d9a85d443cd0f406 SHA1 1dcd28d3fc7af42ceb63006cdc56aa55ac66d355 SHA256 5ff7825fd09d0774b4f863ac77ed0d0349e4910de6c596e92c0af2ed9ecc0306
+DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 RMD160 6056046e4043e3e6a613029fe94f5f1728bebcd5 SHA1 8f949ae74a6d66278a595bd063f13e0ad196d14a SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
+DIST 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html 20335 RMD160 b74ae68c08ef3bc579407337e2f4f527c4754d9c SHA1 f07e5f2744ebf5a5d1018f77b312a50bfd06a006 SHA256 71730ed23e9f00e7b93bc78538bbf7750be501f149bf04d1289c83cb222a2708
+DIST 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
+DIST 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz 1657246 RMD160 00d43701b92a6b7befacf082bbf01a4ecfe71275 SHA1 d55390a4242ad61f034291f1c854ab037e508272 SHA256 edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf7357f244d82a40
+DIST 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz 3568559 RMD160 5b7c679ca59540a19cfabb22b923f11d77da84c0 SHA1 32d2298c78132a629ed2ac6c9830b4d52770ce02 SHA256 556921bf0de5c508985c95eef77b73a4388a7da1b7e703060c79c58385483bf4
+DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 RMD160 687165fa06edad490e6173f3b868e1e1afdfc2c9 SHA1 1acea86fd399ed7817879d36370d3d1f8b109050 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
+DIST 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip 867405 RMD160 83ada665ea92bd70cd8e9c73f0921e5790d6d9f1 SHA1 b67507ea7a48f7b68075cdfb2384784e516cb8ca SHA256 f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b
+DIST 37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip 4706244 RMD160 be12115ab2d4fbb13851a54b2538d615a4055aab SHA1 b4a2aba7b27e5a10f40b980a50aedadeb63228b4 SHA256 d78e33142ae37a1e085c6d1b0f0171abcd8fa626acc6d6da24212d8193df5685
+DIST 377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt 638 RMD160 0bc261dd64cb9abbaf2c89dbb0fea66da310ab46 SHA1 4bc1606963326e4f1236a1a0ddafb7808e5a8b79 SHA256 4e62b6cb81cbab67e666e69ab8d069e66629d38e37f2207c0bce1f53e2868fd3
+DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 RMD160 0e6a6f183b1aafa43635ed9dfb74fc76761e65b4 SHA1 b92930010622906778f713fb8f0153fa0683d018 SHA256 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
+DIST 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz 463264 RMD160 d43dd826d64cc5a100618a9c7153b525510830f1 SHA1 180143410351cc87078c56e67649131219484f16 SHA256 b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
+DIST 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 14952999 RMD160 e807b51c007a80de843566c47f16149afeb03a5e SHA1 19bdd1cabba599e5b0ed6fb0efc446e860e021b0 SHA256 8da587c6870bb35719c64c5973cafe1ce3f834fb33f343d2293a56a58bf1ef1b
+DIST 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 441 RMD160 db97e6581e875ede8cf895a63d2c689f1eae667f SHA1 60bca1db80e8cb5bd1621f79350b26a3a10360b2 SHA256 4745d5b571c79e1323044893f408d675527b4f641def3f2c2b204b5997604484
+DIST 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz 22508 RMD160 08682935b555027eb032a212accb2284ce93d645 SHA1 b8ecfaee8aef693817f0ebc12a2e932ac9467776 SHA256 799682f52182fa8295227731b4efad639413f82c1950a6459047477000f2a619
+DIST 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 674912 RMD160 e900cb8670b8c430beaa45895fb474411cb1958d SHA1 f9940698840c8a8045677e8be68ab8580903e20a SHA256 b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d51ac11f00
+DIST 5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip 44748 RMD160 de0edf9be3e466c0291c75cff49f44851bdd69f4 SHA1 82663948e32fe269c3ac9c6704855e1dbf63d6de SHA256 b1c123f73fe5c48092576b1f15eee6e374697b2b361ee8b0f7762e4036ab1911
+DIST 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 2424604 RMD160 a46ebbc4915dd871891c8461a331dd0804b61101 SHA1 bb845c3de2bb7ad93dddb2c752247ec91475a947 SHA256 d1708a3a9a0d08b1cde1e9d95de950c2f18fffc3ca41413c06b3ed3cae34a5f5
+DIST 79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip 1449297 RMD160 70849a36291392e7f0f17f32884514eb4264371b SHA1 f4685ca1a539f9eb8cda92acd485b1430290712f SHA256 a7907d558d77b6c980542b31546b199adf2fc8fc7ee2bb0ba3cfaf94fba57902
+DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 RMD160 68e248ec03675458f0536282ef250efa42c4c154 SHA1 8a90669029e107b61953b90ba11545fef586c2ca SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
+DIST 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar 56041 RMD160 fbf2fc7ec950ac7282b50ee5fbe0d9c9426c1894 SHA1 72a838242dfe8089fbe08e143bbe28a19a0fa396 SHA256 deb9897f2c48a8c921bec4d72a98b506d86f3a69e35d9439e0896ca8ee1a8563
+DIST 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip 4001063 RMD160 530969ea625e7c7c2b8f8336a6d69a960ba3b31f SHA1 704c90532c96c460c9fb0ca0a4b41561dd958dcb SHA256 4a9c251e8ee02295fdba9d988863f19ee13ee56b9bc2aa4c16411f414ad09ab5
+DIST 8ea307d71d11140574bfb9fcc2487e33-libbase.zip 161294 RMD160 9baf290feb0ce0da668842c0c300ab20cc5009d9 SHA1 29ef207664bb89283ad176c5afab26a95b50e9b9 SHA256 9d6a8da4a4f6e201d3d7eb6293a5c01b5686d67c6df8f3cf9458df449c75846c
+DIST 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 64057 RMD160 f2ca02c3bbd8e6787284420f8cb9364c6d5746cf SHA1 02e9cca05a9a3b6da59236c6801c186c07c311f3 SHA256 f0ff752a2c82548b02d8edeeaffbe9f276f4b8c509fdb909d3b7e2a71beb8cc3
+DIST 9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 306902 RMD160 08a73131db2f3c2949959296ff270015833b3e71 SHA1 afc64ef4c4e8404f045efaa52c16c975c5cb1c84 SHA256 d69f6ccf8c4902b643302373bb6b3f95248f223fc0f75d47ade53e8949064c79
+DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
+DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
+DIST Sun_ODF_Template_Pack_es.oxt 4972619 RMD160 3b8bf592b34256969421472b6ca492479d10d145 SHA1 2b33b91d536c39dba2ec5504f68d72c001712782 SHA256 0a00c795f4af10919d981e7409895198c9f09d2ab05f9e578a1e8428071f5bc3
+DIST Sun_ODF_Template_Pack_fr.oxt 4970438 RMD160 44de71cb028dde89836bfd1167b084dea54922e5 SHA1 3908eee06c17154c2cff6c9f175a7a8dad258e47 SHA256 4c8b739255122c989f00b3b706d99b93fa1c4cf428d61fd550994093aaca8fb5
+DIST Sun_ODF_Template_Pack_hu.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8
+DIST Sun_ODF_Template_Pack_it.oxt 4960369 RMD160 9d8881f645f409599b7a5e14cb4b6842e5883383 SHA1 85c7670e182d5ed5aeb2d9bfe20d161c4ac824c8 SHA256 6e87462d76954698ffcbcf4145fd13ab9c41520026160363fd6e97f7cad3ae05
+DIST a06a496d7a43cbdc35e69dbe678efadb-libloader.zip 166507 RMD160 21cf9ec399c036494c7020d2ad02d9231e210fe1 SHA1 ce173113d325aa82c54c91322c2de25a1c5a2157 SHA256 54092554adf14b90d32ea0fdf2ea3de50e22644cfc1f930a3abd8b7df9633c8e
+DIST a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html 44798 RMD160 4242fd0c126dc5d2d7edc1f66a0565bf42812a7e SHA1 e5fb08ef4f0f19018ba4b397569edb5fa1c916c7 SHA256 05e6fddefb41a3a675a719c597bf0c44d2a4116d5978d02db8a32cca5f405672
+DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 RMD160 923870cf88023713a492e0a5c5d5707ec21d8739 SHA1 2d49e11b0b711970f494294dc3698f05eb294853 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
+DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf89bab559d82d82c75f6a339b5351ee06f48 SHA1 528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825
+DIST bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 13176 RMD160 df5850e54a1049328050d6a0c46a2d109a9827d0 SHA1 cef151475872853a9f0b8e3ce6c65d829403008f SHA256 9bb0f3d57c170a6833c3aec020ec52b6c7280d26bf42c9134773c54cd238ac75
+DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
+DIST c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz 686207 RMD160 1d5d88a8521eab43a57f270550bb654c8c980b32 SHA1 7c36232506c5cfc911b2e2edc44a1841a74630f5 SHA256 3be3b80c0151fbc69bc93767e952cf4bfbe61874328b1c979126bbbcf1e75da5
+DIST ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz 1324547 RMD160 4ff48c470d788e0fccdd9b8c3acdb66b73fcf546 SHA1 e36555ed4e13a8109bfdb5a8c621de6d581f5ab7 SHA256 9cdea85d1ee40160cf48fc482fbd9038b07b47d909f2091039338d39b0bb7d2f
+DIST cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2 43041 RMD160 76d894e8f083d03ef1795e9c4c764c4b20c90a3a SHA1 3a1d839b9a36287074c3724fa16ac1e04d343fbe SHA256 4d28548468bb63edf630ebfc8c14f80531f12265f8fa5694c01b401594d01dff
+DIST d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz 638806 RMD160 d26e2f1f10c434599e5fee50b25f8e158ce4b083 SHA1 4aaf6fdca76acec0b2dd6f50e23c180c5fa1bef5 SHA256 03b9d0af693190d95bbf159df69cd34ec93ac4373cc922d902fc6b579c8617d1
+DIST d1a3205871c3c52e8a50c9f18510ae12-libformula.zip 516667 RMD160 9f573e6e1863e33e56c0f55e1263cc73796be85c SHA1 557462b46e68d2b067aa7b0a0521943c703209ff SHA256 41099b1a7f53c9af816a1eba8a3ad9a05a3345935ae4c5697013d846477f3910
+DIST d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip 764464 RMD160 5f7f24ab86a2b1d051dfd775b66c7681c212be6a SHA1 626731cb89e69d864d0f52a571f71f44d90db394 SHA256 c8e14bb686e113b126dc802d922fbafcf8fca592ea230ffc07c4672a3ab0a979
+DIST dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip 89510 RMD160 a7dfb272393ba1698146cc7b170c256be11b6f25 SHA1 36ef214f64bab59ce7300f9af8ecff88a218874c SHA256 0f4cc8f5a1fb233f8101c86d5b118ef1c910c623e759da108cb729743deb1ff8
+DIST e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt 175 RMD160 a2dee9cfec3a784c38cfb343abd739cee8d5008f SHA1 23e23f0d6f6b7e4c9b7e2f0ef25f5057e61f0e4c SHA256 62f48b6922e661141ddbc8b78518409d063f2f7d41d8c46e02fadd5a01e6272f
+DIST extras-3.1.tar.bz2 130647 RMD160 dc9022051a589dbd810afa9b871472d27c9e80aa SHA1 c4e9c3ed2502c584f1b6e4b7d650afc8c33fccb6 SHA256 6691d40911bf1b1ef7832a5b320e2ab383a79e463ef0dad9b13eb7a5e74c8b1d
+DIST f3e2febd267c8e4b13df00dac211dd6d-flute.zip 83503 RMD160 c73b7919ee73d248d11d433f036b3232e1d151f8 SHA1 76830de4f64998e68c0d03a4c02177c6dfebbfb1 SHA256 13968a9ade310ee464be04380fecbeb2f591a3a462e4048ad1ebc4dae65538f5
+DIST f7925ba8491fe570e5164d2c72791358-libfonts.zip 1336993 RMD160 a4ba6e7e2e19a085dc054d3793f7c31d5c32894c SHA1 171fc524f7f42e99b23754c8aca0600378057d40 SHA256 40549fb2995749f1c57455d1226b1e1fa1cfca635ce9d79d8de9ec625e4a82b9
+DIST fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 559 RMD160 46ffb5caf57188aef737668221cf0013621a2a80 SHA1 21ed62fb15fc59a942ec0ced95e885653290f0f9 SHA256 aab31340dfc8a6ba5c9689349ff892336044cb6637a426404cf197ac21ed2244
+DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
+DIST libreoffice-artwork-3.3.2.2.tar.bz2 21989346 RMD160 1ccf6ed246bca092e3b0fc4e56dbd257e7a54073 SHA1 58111f00cb80b0003a5acb33174318c8d9975685 SHA256 81b087bf616b521ece2be1922c532917be0cb564ffec1a8043219d2cf9b5aa6d
+DIST libreoffice-base-3.3.2.2.tar.bz2 2082264 RMD160 0f20c212d3336ce70298b0825539d45acef101ab SHA1 b04e5dfa550db2726338d9be61b908e47a9e3e50 SHA256 32a03ea3897f978bc98d67a03cae60f2c9b6e395e1aa8c8cca06f62979efcf15
+DIST libreoffice-bootstrap-3.3.2.2.tar.bz2 2751299 RMD160 b8279525a1c7ef789a5c03853e69d775d9218521 SHA1 68829ca1d83407ad295c7c2495d7e0b9969ef45b SHA256 8799545dd696be0288e690ae066b4a91bdd4979b4947a9faf36f21c1500ae044
+DIST libreoffice-build-3.3.2.2.tar.gz 14466234 RMD160 c41a7af4da7d1cb680a7eb0197846ae2ccfe15d1 SHA1 aaa0d1cc4bb79cc70a6c7fb083706411bf510e78 SHA256 be754033eacb59dd79234ac60b3c3a0a9c08eac510daa0fb16ed16abe2cf5e3e
+DIST libreoffice-calc-3.3.2.2.tar.bz2 9407394 RMD160 6495cdf36687d88a8d2650c9ee8054f70b2523ba SHA1 d6b165fd27065854b61f312c689c049ad12c251d SHA256 cba5e46ad4899e68dceefd655f3607e752186f699cff50af9fddc7220082f996
+DIST libreoffice-components-3.3.2.2.tar.bz2 5123213 RMD160 825f1463c7cabef10fb32961e927d5a85460cf05 SHA1 4f2d2aaef0efbc0aea695efb536367cf01fbc60e SHA256 8c554f9266eb92b1bdd09379bde83ece2180bdf132f6f45f59c2d509884c5e71
+DIST libreoffice-extensions-3.3.2.2.tar.bz2 4198856 RMD160 17e2fc608bcfc729da938b8f18598decb3b591e9 SHA1 c0733e402696e6e99b6a4658471a990de1a349b9 SHA256 f5ad77b09cf174bd73b107805e09c6bd6ddadd5348908861f4e730dee62347ff
+DIST libreoffice-extras-3.3.2.2.tar.bz2 38706912 RMD160 063ff609bd3a88414e4dedd4c103cfbdcaae7cb7 SHA1 f07ec52a6367e110d4e969eb21b4678ee07f61a4 SHA256 74bb20a2ce2c3139ca7b35c4d82390b26c745e09e7b7596521e7a80d73459b4d
+DIST libreoffice-filters-3.3.2.2.tar.bz2 11950736 RMD160 6c1d5bb2d8958bf3ee4a5ced4b678fa1dddec401 SHA1 6b15187c796a31ede38ad1108addce94d94d40f5 SHA256 7ab895b5873b2a9f1d6d631d6af1fbbbf8c8d520564d46c30440658e2833e58a
+DIST libreoffice-help-3.3.2.2.tar.bz2 1914229 RMD160 b00668915f716b57c79491896b97431db0dd7513 SHA1 08213ff55841426c1c20ff2f5269a7a941deb38f SHA256 f3d105f2e4eae770ba87b8ecb7b425a2479aa3bcfca4b95bb0de4cd50f5b2da8
+DIST libreoffice-impress-3.3.2.2.tar.bz2 2607403 RMD160 372200c44b544273b13eb2187b492148472f5ce4 SHA1 19bfe0c22e7b7623766ef2fc237aea11b7a0049b SHA256 93a879bb15bb1995d3f0c33a623639c4f0917fa3909fe998865001546d6575cf
+DIST libreoffice-l10n-3.3.2.2.tar.bz2 80784635 RMD160 d0674b3ae355eb19d9e85f7898ce811595a00632 SHA1 18d661cf597c8ecf350a808462b332ca3c5d5611 SHA256 a0f705de7cdabcde047545b9240a295eb2002e7fcfec81f2a12262b6937c578d
+DIST libreoffice-libs-core-3.3.2.2.tar.bz2 16698853 RMD160 12ac46ee9e8f51e997d6193042629c46c9abf2ee SHA1 236d605f6b5faa01de6000c0440ef24286e6f167 SHA256 66b1924fac13fc0a293b59abf55cc1d28dd0e8af085b758d166e7f1d3997323a
+DIST libreoffice-libs-extern-3.3.2.2.tar.bz2 628888 RMD160 d94568c00e515de6aa6e6764c06db297d5e84f83 SHA1 4ccb124b2c96238e6509f4ffb316380663d1425f SHA256 6f55e4c1cfe6ce179448342f117030f8e0016b154d0a68ead52d5a48f5af8222
+DIST libreoffice-libs-extern-sys-3.3.2.2.tar.bz2 38822520 RMD160 93464429e38e6d6827efea3146e4334b81aeef7c SHA1 93ec79c399dae49485e93dafe2f8d5df3efcd344 SHA256 b63de5e7bb8274fa3e82a0a028dff56c985b6c3d44517b7840973be980d8a8b5
+DIST libreoffice-libs-gui-3.3.2.2.tar.bz2 10833350 RMD160 f5ce3aef3d44fdad6194ea71a8b3dafb8ef18c5a SHA1 dfe92cf62f553103804c2ff971428fd95d36edb1 SHA256 c9264c0f7b292bf131f74c8b54f380350f29f9e4d3e4da203483c6d2c20cf15f
+DIST libreoffice-postprocess-3.3.2.2.tar.bz2 43106 RMD160 609ed05dec50008a26e8fbb07e78d0e4898d5b52 SHA1 8b60346b59375a52dec80c4f81d13175e21f5829 SHA256 2e7ab60dac2c520c9d709b34f631bb2ce30cbc9ae04f58dbb32314a683c65762
+DIST libreoffice-sdk-3.3.2.2.tar.bz2 1710897 RMD160 a179fdc2248e5b968fca56577ae0dfe3fd6d4dc0 SHA1 e92375a45afdf2612946ab45ac423878ba188d6f SHA256 95699df280e7ec022ec4659448359040fb00d47f680ee808b4a9554153490b29
+DIST libreoffice-testing-3.3.2.2.tar.bz2 50946350 RMD160 eeee1b4f985ee6897def774b5e9f0cd38014883c SHA1 e67f369188858b5b7451762049953daf1167e925 SHA256 0b67a06192fe157e9fe0c0f70acc96897db53add936baf4d3b5f1a7552e81ed3
+DIST libreoffice-ure-3.3.2.2.tar.bz2 6165456 RMD160 016a6e690e02e41519e2d64d174f542b5a4e50f2 SHA1 40261e8a9605e504661111c41229ce0ee2986844 SHA256 37b340c3b476e1c7a95c4406228848d8afe0b5f8188af7a4f01f7fa5772232ea
+DIST libreoffice-writer-3.3.2.2.tar.bz2 6778875 RMD160 db0b4ae2c1c93c6e35e93e48ee4ce5bdc1e963dc SHA1 d0d329bd1659c3d943c746c4f8cc76379094d7cc SHA256 3b7fe1fa2a889b5358a958c8e669505fa81251164c773d3dad650ce53009a973
+DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+EBUILD libreoffice-3.3.2.ebuild 17977 RMD160 a5698175eff89ca8dc7c1a4d1569802424ecd353 SHA1 5e9e6edaba54c79d35c0c5fa3ea5e758173bd9bc SHA256 1749ffeae18f2df741ef0ee7a8eb9bb1105f9c5a2dadd0248dedb1fadbbd01d1

diff --git a/app-office/libreoffice/files/enable-startup-notification.diff b/app-office/libreoffice/files/enable-startup-notification.diff
new file mode 100644
index 0000000..39e1172
--- /dev/null
+++ b/app-office/libreoffice/files/enable-startup-notification.diff
@@ -0,0 +1,108 @@
+--- desktop/base.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/base.desktop.in.in	2010-03-25 14:23:29.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-base@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Database;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
+ _Name=OpenOffice.org Base
+ _GenericName=Database
+--- desktop/calc.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/calc.desktop.in.in	2010-03-25 14:23:36.000000000 +0200
+@@ -7,7 +7,7 @@
+ Type=Application
+ InitialPreference=6
+ Categories=Office;Spreadsheet;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/msexcel;application/vnd.lotus-1-2-3;application/vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;application/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x-csv;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/csv;application/excel;application/tab-separated-values;application/x-123;application/x-dos_ms_excel;application/x-excel;application/x-ms-excel;application/x-msexcel;text/comma-se
 parated-values;text/tab-separated-values;text/x-comma-separated-values;
+ _Name=OpenOffice.org Calc
+ _GenericName=Spreadsheet
+--- desktop/draw.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/draw.desktop.in.in	2010-03-25 14:23:44.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-draw@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Graphics;VectorGraphics;
+-StartupNotify=false
++StartupNotify=true
+ InitialPreference=6
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.stardivision.draw;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
+ _Name=OpenOffice.org Draw
+--- desktop/impress.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/impress.desktop.in.in	2010-03-25 14:23:52.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-impress@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Presentation;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.stardivision.impress;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;
+ InitialPreference=5
+ _Name=OpenOffice.org Impress
+--- desktop/math.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/math.desktop.in.in	2010-03-25 14:24:02.000000000 +0200
+@@ -7,7 +7,7 @@
+ Icon=ooo-math@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Math;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/vnd.stardivision.math;application/vnd.sun.xml.math;text/mathml;
+ _Name=OpenOffice.org Math
+ _GenericName=Formula
+--- desktop/ooo-extension-manager.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/ooo-extension-manager.desktop.in.in	2010-03-25 14:24:10.000000000 +0200
+@@ -5,7 +5,7 @@
+ Exec=unopkg@OOO_BINSUFFIX@ gui %U
+ NoDisplay=true
+ Type=Application
+-StartupNotify=false
++StartupNotify=true
+ Categories=X-SuSE-Core-Office;Office;
+ MimeType=application/vnd.openofficeorg.extension;
+ Name=OpenOffice.org Extension Manager
+--- desktop/startcenter.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/startcenter.desktop.in.in	2010-03-25 14:24:20.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-gulls@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;X-SuSE-Core-Office;
+-StartupNotify=false
++StartupNotify=true
+ InitialPreference=5
+ _Name=OpenOffice.org
+ _GenericName=Office
+--- desktop/template.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/template.desktop.in.in	2010-03-25 14:24:27.000000000 +0200
+ Icon=ooo-gulls@OOO_BINSUFFIX@
+ Type=Application
+ Categories=X-SuSE-Core-Office;Office;
+-StartupNotify=false
++StartupNotify=true
+ _Name=LibreOffice
+ _GenericName=Office Suite
+--- desktop/web.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/web.desktop.in.in	2010-03-25 14:24:33.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-web@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Network;WebDevelopment;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.text-web;
+ _Name=OpenOffice.org Writer/Web
+ _GenericName=Web Page Creation
+--- desktop/writer.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/writer.desktop.in.in	2010-03-25 14:24:39.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-writer@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;WordProcessor;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/msword;application/rtf;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect;application/x-extension-txt;application/x-t602;text/plain;text/rtf;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
+ InitialPreference=5
+ _Name=OpenOffice.org Writer

diff --git a/app-office/libreoffice/files/env_log.diff b/app-office/libreoffice/files/env_log.diff
new file mode 100644
index 0000000..908169a
--- /dev/null
+++ b/app-office/libreoffice/files/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?

diff --git a/app-office/libreoffice/files/fix-ooo-collision.diff b/app-office/libreoffice/files/fix-ooo-collision.diff
new file mode 100644
index 0000000..5bdc5c2
--- /dev/null
+++ b/app-office/libreoffice/files/fix-ooo-collision.diff
@@ -0,0 +1,29 @@
+--- bin/package-ooo.orig	2010-11-29 20:16:08.700004578 +0100
++++ bin/package-ooo	2010-11-29 20:20:47.972004579 +0100
+@@ -104,12 +104,12 @@
+ ln -sf $OOINSTBASE/program/soffice$BINSUFFIX $PREFIX/bin/soffice$BINSUFFIX
+ 
+ # no man-page so ...
+-if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; then
++if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva" -a "z$VENDORNAME" != "zGentoo"; then
+     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
+     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
+ fi
+ 
+-if test "z$VENDORNAME" = "zMandriva"; then
++if test "z$VENDORNAME" = "zMandriva" -o "z$VENDORNAME" = "zGentoo"; then
+     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFIX
+     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
+ fi
+@@ -210,9 +210,9 @@
+ 	done
+ 	
+ 	# shared MIME info
+-	mkdir -p $PREFIX/share/mime/packages
++	mkdir -p $DATADIR/mime/packages
+ 	cd $TOOLSDIR/desktop
+-	cp openoffice.xml $PREFIX/share/mime/packages
++	cp openoffice.xml $DATADIR/mime/packages/libreoffice.xml
+ 	if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
+ 	   which update-mime-database >/dev/null 2>&1 ; then
+ 	    update-mime-database /usr/share/mime || :

diff --git a/app-office/libreoffice/files/gentoo-3.3.2.diff b/app-office/libreoffice/files/gentoo-3.3.2.diff
new file mode 100644
index 0000000..2a4b293
--- /dev/null
+++ b/app-office/libreoffice/files/gentoo-3.3.2.diff
@@ -0,0 +1,49 @@
+--- distro-configs/Gentoo.conf.in
++++ distro-configs/Gentoo.conf.in
+@@ -1,5 +1,3 @@
+---disable-fontooo
+---disable-qadevooo
+ --enable-neon
+ --enable-xrender-link
+ --with-external-dict-dir=/usr/share/myspell
+--- configure.in 
++++ configure.in 
+@@ -1326,12 +1326,18 @@
+ 	done
+     fi
+     SUNTEMPLATES_LANG=
+-    # check whether the langs are requested at all
+-    for lang in $wanted_sun_templates ; do
+-        if test -n "`echo $with_lang | grep "$lang"`" ; then
+-                SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+-        fi
+-    done
++
++    # --with-lang="" now used for en-US
++    if test "z$with_lang" = "z" ; then
++        SUNTEMPLATES_LANG="en-US"
++    else
++        # check whether the langs are requested at all
++        for lang in $wanted_sun_templates ; do
++	    if test -n "`echo $with_lang | grep "$lang"`" ; then
++		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
++	    fi
++        done
++    fi
+     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
+ fi
+ AC_SUBST(SUNTEMPLATES_LANG)
+--- bin/package-ooo
++++ bin/package-ooo
+@@ -126,8 +126,8 @@
+ fi
+ 
+ # create bash completion
+-mkdir -p $OODESTDIR/etc/bash_completion.d
+-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
++mkdir -p $SYSCONFDIR/bash_completion.d
++$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
+ if test "$COMPAT_OOWRAPPERS" = "YES" ; then
+     $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX"  $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
+ fi
+

diff --git a/app-office/libreoffice/files/gentoo-pythonpath.diff b/app-office/libreoffice/files/gentoo-pythonpath.diff
new file mode 100644
index 0000000..4714b0a
--- /dev/null
+++ b/app-office/libreoffice/files/gentoo-pythonpath.diff
@@ -0,0 +1,11 @@
+--- 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
+

diff --git a/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff b/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff
new file mode 100644
index 0000000..d0ca2ed
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff
@@ -0,0 +1,13 @@
+--- desktop/unx/source/splashx.c.ark	2011-01-16 20:25:10.846685172 +0100
++++ desktop/unx/source/splashx.c	2011-01-16 20:27:12.673351839 +0100
+@@ -137,8 +137,8 @@ int splash_load_bmp( const char *filenam
+                   PNG_TRANSFORM_GRAY_TO_RGB | PNG_TRANSFORM_BGR, NULL);
+ 
+     bitmap_rows = png_get_rows( png_ptr, info_ptr );
+-    width = info_ptr->width;
+-    height = info_ptr->height;
++    width = png_get_image_width( png_ptr, info_ptr );
++    height = png_get_image_height( png_ptr, info_ptr );
+ 
+ #if 0
+     {

diff --git a/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff b/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
new file mode 100644
index 0000000..168d272
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
@@ -0,0 +1,38 @@
+--- libxmlsec/makefile.mk.ORIGINAL	2010-11-11 09:35:21.000000000 -0600
++++ libxmlsec/makefile.mk	2011-02-13 03:13:41.496866392 -0600
+@@ -67,7 +67,8 @@
+    xmlsec1-noverify.patch \
+    xmlsec1-mingw32.patch \
+    xmlsec1-mingw-keymgr-mscrypto.patch \
+-   xmlsec1-vc10.patch
++   xmlsec1-vc10.patch \
++   xmlsec1-1.2.14_fix_extern_c.patch
+ 
+ ADDITIONAL_FILES= \
+     include$/xmlsec$/mscrypto$/akmngr.h \
+--- libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.ORIGINAL	1969-12-31 18:00:00.000000000 -0600
++++ libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch	2011-02-13 03:11:34.740594681 -0600
+@@ -0,0 +1,23 @@
++--- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL	2009-12-05 15:19:18.000000000 -0600
+++++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h	2011-02-13 03:09:42.917240245 -0600
++@@ -11,16 +11,16 @@
++ #ifndef __XMLSEC_H__
++ #define __XMLSEC_H__    
++ 
++-#ifdef __cplusplus
++-extern "C" {
++-#endif /* __cplusplus */ 
++-
++ #include <libxml/tree.h>
++ 
++ #include <xmlsec/version.h>
++ #include <xmlsec/exports.h>
++ #include <xmlsec/strings.h>
++ 
+++#ifdef __cplusplus
+++extern "C" {
+++#endif /* __cplusplus */ 
+++
++ /***********************************************************************
++  *
++  * Basic types to make ports to exotic platforms easier

diff --git a/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff
new file mode 100644
index 0000000..4230374
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff
@@ -0,0 +1,27 @@
+--- ucb/source/ucp/webdav/NeonSession.cxx
++++ ucb/source/ucp/webdav/NeonSession.cxx
+@@ -253,9 +253,6 @@
+ 
+ // -------------------------------------------------------------------
+ extern "C" int NeonSession_NeonAuth( void *       inUserData,
+-#ifdef NE_FEATURE_SSPI
+-                                     const char * inAuthProtocol,
+-#endif
+                                      const char * inRealm,
+                                      int          attempt,
+                                      char *       inoutUserName,
+@@ -322,14 +319,6 @@
+ 
+     bool bCanUseSystemCreds = false;
+ 
+-#ifdef NE_FEATURE_SSPI
+-    bCanUseSystemCreds
+-        = (attempt == 0) && // avoid endless loops
+-          ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
+-          ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
+-            ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) );
+-#endif
+-
+     int theRetVal = pListener->authenticate(
+                             rtl::OUString::createFromAscii( inRealm ),
+                             theSession->getHostName(),

diff --git a/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff b/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff
new file mode 100644
index 0000000..164a177
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff
@@ -0,0 +1,295 @@
+diff --git basegfx/source/polygon/b2dpolygon.cxx basegfx/source/polygon/b2dpolygon.cxx
+index f88069b..4e578a9 100644
+--- basegfx/source/polygon/b2dpolygon.cxx
++++ basegfx/source/polygon/b2dpolygon.cxx
+@@ -257,6 +257,8 @@ class ControlVectorPair2D
+     basegfx::B2DVector							maNextVector;
+ 
+ public:
++    ControlVectorPair2D() {}
++
+     const basegfx::B2DVector& getPrevVector() const 
+     { 
+         return maPrevVector; 
+diff --git basegfx/source/polygon/b2dsvgpolypolygon.cxx basegfx/source/polygon/b2dsvgpolypolygon.cxx
+index 7f5ed07..51b8740 100644
+--- basegfx/source/polygon/b2dsvgpolypolygon.cxx
++++ basegfx/source/polygon/b2dsvgpolypolygon.cxx
+@@ -787,9 +787,9 @@ namespace basegfx
+                                 // (since
+                                 // createPolygonFromEllipseSegment()
+                                 // normalizes to e.g. cw arc)
+-                                const bool bFlipSegment( (bLargeArcFlag!=0) == 
+-                                    (fmod(fTheta2+2*M_PI-fTheta1,
+-                                          2*M_PI)<M_PI) );
++                                const bool bLessThanPi(fmod(fTheta2+2*M_PI-fTheta1,
++                                          2*M_PI)<M_PI);
++                                const bool bFlipSegment( (bLargeArcFlag!=0) == bLessThanPi );
+                                 if( bFlipSegment )
+                                     std::swap(fTheta1,fTheta2);
+ 
+diff --git cosv/inc/cosv/tpl/vvector.hxx cosv/inc/cosv/tpl/vvector.hxx
+index 4848d97..1903dce 100644
+--- cosv/inc/cosv/tpl/vvector.hxx
++++ cosv/inc/cosv/tpl/vvector.hxx
+@@ -132,7 +132,7 @@ class VirtualVector
+     typedef VirtualVector<XX,PTRDEL>            self;
+     typedef std::vector< DYN XX* >              impl_type;
+     typedef typename impl_type::size_type       size_type;
+-    typedef ptrdiff_t                           difference_type;
++    typedef std::ptrdiff_t                      difference_type;
+ 
+     class const_iterator;
+     class iterator;
+diff --git autodoc/source/display/idl/hi_linkhelper.hxx autodoc/source/display/idl/hi_linkhelper.hxx
+index c08be55..1cdfaa7 100644
+--- autodoc/source/display/idl/hi_linkhelper.hxx
++++ autodoc/source/display/idl/hi_linkhelper.hxx
+@@ -85,9 +85,7 @@ class LinkHelper
+     const String &      XrefsSuffix() const;                               
+                           
+   private:                                                     
+-    // DATA
+-    mutable HtmlEnvironment_Idl &
+-                        rEnv;
++    HtmlEnvironment_Idl & rEnv;
+ };     
+ 
+ inline const ary::idl::CodeEntity *          
+diff --git autodoc/inc/ary/idl/i_ce2s.hxx autodoc/inc/ary/idl/i_ce2s.hxx
+index c490980..efb2711 100644
+--- autodoc/inc/ary/idl/i_ce2s.hxx
++++ autodoc/inc/ary/idl/i_ce2s.hxx
+@@ -51,6 +51,7 @@ class Ce_2s
+ {
+   public:
+     // LIFECYCLE
++    Ce_2s() {}
+     virtual             ~Ce_2s();
+ 
+     static DYN Ce_2s *  Create_(
+diff --git unotools/inc/unotools/streamwrap.hxx unotools/inc/unotools/streamwrap.hxx
+index 80cde76..4b53500 100644
+--- unotools/inc/unotools/streamwrap.hxx
++++ unotools/inc/unotools/streamwrap.hxx
+@@ -51,7 +51,7 @@ namespace utl
+ //==================================================================
+ typedef ::cppu::WeakImplHelper1	<	stario::XInputStream
+                                 > InputStreamWrapper_Base;
+-    // needed for some compilers
++// needed for some compilers
+ /// helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XInputStream</type>
+ class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base
+ {
+@@ -69,9 +69,6 @@ public:
+     OInputStreamWrapper(SvStream* pStream, sal_Bool bOwner=sal_False);
+     virtual ~OInputStreamWrapper();
+ 
+-// UNO Anbindung
+-    DECLARE_UNO3_AGG_DEFAULTS(OInputStreamWrapper, InputStreamWrapper_Base);
+-
+ // stario::XInputStream
+     virtual sal_Int32	SAL_CALL	readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+     virtual sal_Int32	SAL_CALL	readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+@@ -122,9 +119,6 @@ protected:
+ public:
+     OOutputStreamWrapper(SvStream& _rStream) :rStream(_rStream) { }
+ 
+-// UNO Anbindung
+-    DECLARE_UNO3_AGG_DEFAULTS(OOutputStreamWrapper, OutputStreamWrapper_Base);
+-
+ // stario::XOutputStream
+     virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+     virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+diff --git lotuswordpro/source/filter/xfilter/xfparastyle.hxx lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+index fde03ae..ead40ff 100644
+--- lotuswordpro/source/filter/xfilter/xfparastyle.hxx
++++ lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+@@ -235,10 +235,7 @@ public:
+ 
+     sal_uInt32 GetFlag(){ return m_nFlag; }
+ 
+-    /**
+-     * @descr	return margins.
+-     */
+-    XFMargins GetMargins(){return m_aMargin;}
++    XFMargins& GetMargins(){return m_aMargin;}
+ 
+     virtual enumXFStyle	GetStyleFamily();
+ 
+diff --git chart2/source/controller/main/ChartController.hxx chart2/source/controller/main/ChartController.hxx
+index 3927da9..93b1706 100644
+--- chart2/source/controller/main/ChartController.hxx
++++ chart2/source/controller/main/ChartController.hxx
+@@ -545,7 +545,7 @@ private:
+                 TheModel* operator->() const { return m_pTheModel; }
+         private:
+             TheModel*				m_pTheModel;
+-            mutable ::osl::Mutex&	m_rModelMutex;
++            ::osl::Mutex&	m_rModelMutex;
+     };
+ 
+ private:
+diff --git writerperfect/source/filter/Style.hxx writerperfect/source/filter/Style.hxx
+index 2820415..d54f0c8 100644
+--- writerperfect/source/filter/Style.hxx
++++ writerperfect/source/filter/Style.hxx
+@@ -34,7 +34,7 @@
+ class TopLevelElementStyle
+ {
+ public:
+-    TopLevelElementStyle() : mpsMasterPageName(NULL) { }
++    TopLevelElementStyle() : mpsMasterPageName(0) { }
+     virtual ~TopLevelElementStyle() { if (mpsMasterPageName) delete mpsMasterPageName; }
+     void setMasterPageName(WPXString &sMasterPageName) { mpsMasterPageName = new WPXString(sMasterPageName); }
+     const WPXString * getMasterPageName() const { return mpsMasterPageName; }
+diff --git filter/source/xmlfilteradaptor/streamwrap.hxx filter/source/xmlfilteradaptor/streamwrap.hxx
+index 369a7bb..2a1a2ce 100644
+--- filter/source/xmlfilteradaptor/streamwrap.hxx
++++ filter/source/xmlfilteradaptor/streamwrap.hxx
+@@ -34,13 +34,6 @@
+ #include <com/sun/star/io/XSeekable.hpp>
+ #include <cppuhelper/implbase1.hxx>
+ 
+-#define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \
+-virtual void            SAL_CALL acquire() throw() { baseclass::acquire(); } \
+-virtual void            SAL_CALL release() throw() { baseclass::release(); }    \
+-virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \
+-{ return baseclass::queryInterface(_rType); } \
+-void            SAL_CALL PUT_SEMICOLON_AT_THE_END()
+-
+ namespace osl
+ {
+     class File;
+@@ -63,9 +56,6 @@ class OOutputStreamWrapper : public OutputStreamWrapper_Base
+ public:
+     OOutputStreamWrapper(::osl::File& _rStream) :rStream(_rStream) { }
+ 
+-// UNO Anbindung
+-    DECLARE_UNO3_AGG_DEFAULTS(OOutputStreamWrapper, OutputStreamWrapper_Base);
+-
+ // stario::XOutputStream
+     virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+     virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+diff --git comphelper/inc/comphelper/oslfile2streamwrap.hxx comphelper/inc/comphelper/oslfile2streamwrap.hxx
+index d636666..4d6c454 100644
+--- comphelper/inc/comphelper/oslfile2streamwrap.hxx
++++ comphelper/inc/comphelper/oslfile2streamwrap.hxx
+@@ -44,10 +44,7 @@ namespace comphelper
+ // FmUnoIOStream,
+ // stream zum schreiben un lesen von Daten, basieren  auf File
+ //==================================================================
+-struct InputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XInputStream> 
+-{};
+-
+-class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public InputStreamWrapper_Base
++class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XInputStream>
+ {
+     ::osl::Mutex	m_aMutex;
+     ::osl::File*	m_pFile;
+@@ -58,14 +55,6 @@ public:
+     OSLInputStreamWrapper(::osl::File* pStream, sal_Bool bOwner=sal_False);
+     virtual ~OSLInputStreamWrapper();
+ 
+-// UNO Anbindung
+-    virtual void			SAL_CALL acquire() throw()
+-        { InputStreamWrapper_Base::acquire(); }
+-    virtual void			SAL_CALL release() throw()
+-        { InputStreamWrapper_Base::release(); }
+-    virtual ::com::sun::star::uno::Any	SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException)
+-        { return InputStreamWrapper_Base::queryInterface(_rType); }
+-
+ // stario::XInputStream
+     virtual sal_Int32	SAL_CALL	readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+     virtual sal_Int32	SAL_CALL	readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+@@ -78,24 +67,13 @@ public:
+ // FmUnoOutStream,
+ // Datensenke fuer Files
+ //==================================================================
+-struct OutputStreamWrapper_Base : public ::cppu::WeakImplHelper1<stario::XOutputStream> 
+-{};
+-
+-class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public OutputStreamWrapper_Base
++class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream>
+ {
+     ::osl::File&		rFile;
+ 
+ public:
+     OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { }
+ 
+-// UNO Anbindung
+-    virtual void			SAL_CALL acquire() throw()
+-        { OutputStreamWrapper_Base::acquire(); }
+-    virtual void			SAL_CALL release() throw()
+-        { OutputStreamWrapper_Base::release(); }
+-    virtual ::com::sun::star::uno::Any	SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException)
+-        { return OutputStreamWrapper_Base::queryInterface(_rType); }
+-
+ // stario::XOutputStream
+     virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+     virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+diff --git sc/source/filter/inc/xeroot.hxx sc/source/filter/inc/xeroot.hxx
+index cac22f4..dc8652e 100644
+--- sc/source/filter/inc/xeroot.hxx
++++ sc/source/filter/inc/xeroot.hxx
+@@ -168,7 +168,7 @@ private:
+     XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const;
+ 
+ private:
+-    mutable XclExpRootData& mrExpData;      /// Reference to the global export data struct.
++    XclExpRootData& mrExpData;      /// Reference to the global export data struct.
+ };
+ 
+ // ============================================================================
+diff --git sc/source/filter/inc/xiroot.hxx sc/source/filter/inc/xiroot.hxx
+index 1b4153e..83953e3 100644
+--- sc/source/filter/inc/xiroot.hxx
++++ sc/source/filter/inc/xiroot.hxx
+@@ -218,7 +218,7 @@ public:
+     void                ReadCodeName( XclImpStream& rStrm, bool bGlobals );
+ 
+ private:
+-    mutable XclImpRootData& mrImpData;      /// Reference to the global import data struct.
++    XclImpRootData& mrImpData;      /// Reference to the global import data struct.
+ };
+ 
+ // ============================================================================
+diff --git sc/source/filter/inc/xlroot.hxx sc/source/filter/inc/xlroot.hxx
+index 5e132fa..3f9f6fa 100644
+--- sc/source/filter/inc/xlroot.hxx
++++ sc/source/filter/inc/xlroot.hxx
+@@ -285,7 +285,7 @@ public:
+     inline void         IncCurrScTab() { ++mrData.mnScTab; }
+ 
+ private:
+-    mutable XclRootData& mrData;        /// Reference to the global data struct.
++    XclRootData& mrData;        /// Reference to the global data struct.
+ };
+ 
+ // ============================================================================
+diff --git dbaccess/source/core/dataaccess/documentdefinition.hxx dbaccess/source/core/dataaccess/documentdefinition.hxx
+index f74b6ac..e51b959 100644
+--- dbaccess/source/core/dataaccess/documentdefinition.hxx
++++ dbaccess/source/core/dataaccess/documentdefinition.hxx
+@@ -374,7 +374,7 @@ private:
+             ODocumentDefinition&            m_rDocumentDefinition;
+     const   ::com::sun::star::uno::Any      m_aOldValue;
+     const   ::com::sun::star::uno::Any      m_aNewValue;
+-    mutable ::osl::ResettableMutexGuard&    m_rClearForNotify;
++    ::osl::ResettableMutexGuard&    m_rClearForNotify;
+ 
+     void    impl_fireEvent_throw( const sal_Bool i_bVetoable );
+ };
+diff --git hwpfilter/source/list.hxx hwpfilter/source/list.hxx
+index 043a214..02f6e00 100644
+--- hwpfilter/source/list.hxx
++++ hwpfilter/source/list.hxx
+@@ -41,6 +41,7 @@
+  * re-implements the same functionality, based on the STL.
+  */
+ 
++#include <cstddef>
+ #include <vector>
+ 
+ template<class T>
+

diff --git a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff
new file mode 100644
index 0000000..0c59f02
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff
@@ -0,0 +1,25 @@
+--- configure.in.orig	2011-01-13 21:12:40.420005851 +0100
++++ configure.in	2011-01-13 21:15:23.680008513 +0100
+@@ -4456,16 +4456,17 @@
+        else return 1;
+ }
+     ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
+-    DB_LIB=
+-    for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do
+-        AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
+-            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
++    save_LIBS="$LIBS"
++    for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
++        AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ] ,
++            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ]
+             )
+         )
+     done
+     if test -z "$DB_LIB" ; then 
+-        AC_MSG_ERROR([db not installed or functional])
++        AC_CHECK_FUNC(dbopen, [], [ AC_MSG_ERROR([db not installed or functional]) ])
+     fi
++    LIBS="$save_LIBS"
+     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ else
+     AC_MSG_RESULT([internal])

diff --git a/app-office/libreoffice/files/scrap-pixmap-links.diff b/app-office/libreoffice/files/scrap-pixmap-links.diff
new file mode 100644
index 0000000..69cfbbe
--- /dev/null
+++ b/app-office/libreoffice/files/scrap-pixmap-links.diff
@@ -0,0 +1,37 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -212,14 +212,6 @@
+ 	    done
+ 	done
+ 
+-	# create symlinks below share/pixmaps to keep the backward compatibility
+-	pixmapsdir=$PREFIX/share/pixmaps
+-	mkdir -p $pixmapsdir
+-	cd $OODESTDIR$icondir/48x48/apps
+-	for icon in ooo-*.png ; do
+-	    ln -sf $icondir/48x48/apps/$icon $pixmapsdir
+-	done
+-	
+ 	# shared MIME info
+ 	mkdir -p $DATADIR/mime/packages
+ 	cd $TOOLSDIR/desktop
+--- bin/piece/desktop-support-app 
++++ bin/piese/desktop-support-app 
+@@ -75,17 +75,6 @@
+ 	test -n "$list_icon_dirs" && echo "%dir $icon_dir/$size/$category" >>files-$piece.txt
+     done
+ 
+-    # create symlink below share/pixmaps to keep the backward compatibility
+-    if test "$category" = "apps" ; then
+-	file=$DESTDIR/$icon_dir/48x48/apps/$icon_name.png
+-	if test -f $file ; then
+-	    filename=`basename $file`
+-	    pixmaps_dir=/usr/share/pixmaps
+-	    mkdir -p $DESTDIR$pixmaps_dir
+-	    ln -sf $icon_dir/48x48/apps/$filename $DESTDIR$pixmaps_dir
+-	    test -n "$DESTDIR" && echo "$pixmaps_dir/$filename" >>files-$piece.txt
+-	fi
+-    fi
+ }
+ 
+ case "$app" in

diff --git a/app-office/libreoffice/files/sdext-presenter.diff b/app-office/libreoffice/files/sdext-presenter.diff
new file mode 100644
index 0000000..b1eac7d
--- /dev/null
+++ b/app-office/libreoffice/files/sdext-presenter.diff
@@ -0,0 +1,11 @@
+--- sdext/source/presenter/makefile.mk	2011-01-24 20:03:50.376007211 +0100
++++ sdext/source/presenter/makefile.mk	2011-01-24 20:04:45.184007227 +0100
+@@ -295,7 +295,7 @@
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
+-$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
++$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
+     @echo creating $@
+     @-$(MKDIRHIER) $(@:d)
+     $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@

diff --git a/app-office/libreoffice/libreoffice-3.3.2.ebuild b/app-office/libreoffice/libreoffice-3.3.2.ebuild
new file mode 100644
index 0000000..357efbc
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-3.3.2.ebuild
@@ -0,0 +1,451 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.2.ebuild,v 1.2 2011/04/07 21:03:27 josejx Exp $
+
+EAPI="3"
+
+WANT_AUTOMAKE="1.9"
+
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 kde4-base multilib pax-utils python toolchain-funcs
+
+IUSE="binfilter cups -custom-cflags dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
+
+MY_PV=3.3.2.2
+MY_P="${PN}-build-${MY_PV}"
+PATCHLEVEL=OOO320
+SRC=OOo_${PV}_src
+S="${WORKDIR}/${MY_P}"
+DEVPATH="http://download.documentfoundation.org/libreoffice/src"
+CONFFILE=${S}/distro-configs/Gentoo.conf.in
+BASIS=basis3.3
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="${DEVPATH}/${PN}-build-${MY_PV}.tar.gz
+	templates? (
+		http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
+		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
+		http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
+		http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
+		http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt
+		ftp://ftp.devall.hu/kami/go-oo//Sun_ODF_Template_Pack_hu.oxt
+		)
+	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
+	http://download.go-oo.org/SRC680/extras-3.1.tar.bz2
+	http://download.go-oo.org/SRC680/biblio.tar.bz2"
+
+# Shiny split sources with so many packages...
+MODULES="artwork base bootstrap calc components extensions extras filters help
+impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
+ure writer l10n"
+
+for mod in ${MODULES}; do
+	SRC_URI+=" ${DEVPATH}/${PN}-${mod}-${MY_PV}.tar.bz2"
+done
+
+# addons
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/8ea307d71d11140574bfb9fcc2487e33-libbase.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/a06a496d7a43cbdc35e69dbe678efadb-libloader.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/d1a3205871c3c52e8a50c9f18510ae12-libformula.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/f3e2febd267c8e4b13df00dac211dd6d-flute.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/f7925ba8491fe570e5164d2c72791358-libfonts.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
+ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2"
+ADDONS_SRC+=" http://download.go-oo.org/src/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
+ADDONS_SRC+=" http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
+ADDONS_SRC+=" http://download.go-oo.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
+ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+ADDONS_SRC+=" http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2"
+ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
+SRC_URI+=" ${ADDONS_SRC}"
+
+LANGS1="af ar as ast be_BY bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk km kn ko kok ks ku ky lo lt lv mai mk ml mn mni mr ms my nb ne nl nn nr ns oc om or pa_IN pap pl ps pt pt_BR ro ru rw sa_IN sat sd sh si sk sl sq sr ss st sv sw_TZ ta te tg th ti tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
+LANGS="${LANGS1} en en_US"
+
+for X in ${LANGS} ; do
+	IUSE+=" linguas_${X}"
+done
+
+# intersection of available linguas and app-dicts/myspell-* dictionaries
+SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb nl nn pl pt ru sk sl sv tn zu"
+SPELL_DIRS_DEPEND=""
+for X in ${SPELL_DIRS} ; do
+	SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="!app-office/libreoffice-bin
+	!app-office/openoffice-bin
+	!app-office/openoffice
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gnome? ( >=x11-libs/gtk+-2.10:2
+		gnome-base/gconf:2 )
+	gtk? ( >=x11-libs/gtk+-2.10:2 )
+	gstreamer? ( >=media-libs/gstreamer-0.10
+			>=media-libs/gst-plugins-base-0.10 )
+	java? ( >=dev-java/bsh-2.0_beta4
+		dev-java/lucene:2.3
+		dev-java/lucene-analyzers:2.3 )
+	ldap? ( net-nds/openldap )
+	nsplugin? ( net-libs/xulrunner:1.9
+		>=dev-libs/nspr-4.6.6
+		>=dev-libs/nss-3.11-r1 )
+	opengl? ( virtual/opengl )
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	>=app-text/poppler-0.12.3-r3[xpdf-headers]
+	dev-libs/expat
+	>=dev-libs/glib-2.18
+	>=dev-libs/icu-4.0
+	>=dev-lang/perl-5.0
+	>=net-libs/neon-0.24.7
+	>=dev-libs/openssl-0.9.8g
+	dev-libs/redland[ssl]
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.3.0
+	>=media-libs/vigra-1.4
+	media-libs/libpng
+	>=sys-libs/db-4.3
+	>=media-libs/libwpg-0.2.0
+	>=app-text/libwpd-0.9.1
+	virtual/jpeg
+	>=x11-libs/cairo-1.0.2
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+
+RDEPEND="java? ( >=virtual/jre-1.5 )
+	${SPELL_DIRS_DEPEND}
+	${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+		>=dev-java/ant-core-1.7 )
+	>=dev-libs/boost-1.36
+	>=dev-libs/libxml2-2.0
+	dev-perl/Archive-Zip
+	dev-libs/libxslt
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	dev-util/pkgconfig
+	>=net-misc/curl-7.12
+	>=sys-apps/findutils-4.1.20-r1
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-libs/zlib
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+pkg_setup() {
+
+	java-pkg-opt-2_pkg_setup
+
+	# sys-libs/db version used
+	local db_ver=$(db_findver '>=sys-libs/db-4.3')
+
+	kde4-base_pkg_setup
+
+	python_set_active_version 2
+	python_pkg_setup
+
+}
+
+src_unpack() {
+
+	unpack ${MY_P}.tar.gz
+
+}
+
+src_prepare() {
+
+	if use custom-cflags; then
+		ewarn " You are using custom CFLAGS, which is NOT supported and can cause "
+		ewarn " all sorts of build and runtime errors. "
+		ewarn
+		ewarn " Before reporting a bug, please make sure you rebuild and try with "
+		ewarn " basic CFLAGS, otherwise the bug will not be accepted. "
+		ewarn
+	fi
+
+	ewarn
+	ewarn " If you experience a build break, please make sure to retry "
+	ewarn " with MAKEOPTS="-j1" before filing a bug. "
+	ewarn
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="512"
+	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
+	check_reqs
+
+	strip-linguas ${LANGS}
+
+	# en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out
+	export LINGUAS_TEMP=$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//g;s/_GB/en_GB/g;s/_ZA/en_ZA/g')
+
+	if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} == " " ]]; then
+		export LINGUAS_OOO=""
+	else
+		# always build en-US as a fallback (needed for broken code / translations)
+		export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
+	fi
+
+	if use !java; then
+		ewarn " You are building with java-support disabled, this results in some "
+		ewarn " of the LibreOffice functionality being disabled. "
+		ewarn " If something you need does not work for you, rebuild with "
+		ewarn " java in your USE-flags. "
+		ewarn
+	fi
+
+	if use !gtk && use !gnome; then
+		ewarn " If you want the LibreOffice systray quickstarter to work "
+		ewarn " activate either the 'gtk' or 'gnome' use flags. "
+		ewarn
+	fi
+
+	# Some fixes for our patchset
+	epatch "${FILESDIR}/gentoo-${PV}.diff"
+	epatch "${FILESDIR}/gentoo-pythonpath.diff"
+	epatch "${FILESDIR}/env_log.diff"
+	epatch "${FILESDIR}/fix-ooo-collision.diff"
+	epatch "${FILESDIR}/scrap-pixmap-links.diff"
+	epatch "${FILESDIR}/enable-startup-notification.diff"
+	use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-3.3-libpng-1.5.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-libdb5-fix-check.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-3.3.2-gcc46.diff" "${S}/patches/hotfixes"
+
+	#Use flag checks
+	if use java ; then
+		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
+		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
+		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
+		echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
+		echo "--with-system-beanshell" >> ${CONFFILE}
+		echo "--with-system-lucene" >> ${CONFFILE}
+		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
+		echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
+		echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
+	fi
+
+	echo $(use_enable nsplugin mozilla) >> ${CONFFILE}
+	echo $(use_with nsplugin system-mozilla libxul) >> ${CONFFILE}
+
+	echo $(use_enable binfilter) >> ${CONFFILE}
+	echo $(use_enable cups) >> ${CONFFILE}
+	echo $(use_enable dbus) >> ${CONFFILE}
+	echo $(use_enable eds evolution2) >> ${CONFFILE}
+	echo $(use_enable gnome gconf) >> ${CONFFILE}
+	echo $(use_enable gnome gio) >> ${CONFFILE}
+	echo "--disable-gnome-vfs" >> ${CONFFILE}
+	echo $(use_enable gnome lockdown) >> ${CONFFILE}
+	echo $(use_enable gstreamer) >> ${CONFFILE}
+	echo $(use_enable gtk systray) >> ${CONFFILE}
+	echo $(use_enable ldap) >> ${CONFFILE}
+	echo $(use_enable opengl) >> ${CONFFILE}
+	echo $(use_with ldap openldap) >> ${CONFFILE}
+	echo $(use_enable debug crashdump) >> ${CONFFILE}
+	echo $(use_enable debug strip-solver) >> ${CONFFILE}
+
+	# Extension stuff, disabled when building without java for bug #352812
+	if use java; then
+		echo "--with-extension-integration" >> ${CONFFILE}
+		echo "--enable-pdfimport" >> ${CONFFILE}
+		echo "--enable-minimizer" >> ${CONFFILE}
+		echo "--enable-presenter-console" >> ${CONFFILE}
+		echo "--enable-presenter-extra-ui" >> ${CONFFILE}
+		#still necessary
+		echo "--enable-presenter-screen" >> ${CONFFILE}
+	fi
+
+	# Misc stuff
+	echo "--disable-graphite" >> ${CONFFILE}
+	echo "--with-system-cppunit" >> ${CONFFILE}
+	echo "--with-system-openssl" >> ${CONFFILE}
+	echo "--with-system-redland" >> ${CONFFILE}
+	echo "--without-junit" >> ${CONFFILE}
+
+	#fix desktop files bug #352955
+	sed -i 's/Exec=oo/Exec=lo/g' "${S}"/desktop/*.desktop.in.in || die "Could not fix desktop files"
+
+	# needed for sun-templates patch
+	eautoreconf
+
+}
+
+src_configure() {
+
+	use kde && export KDE4DIR="${KDEDIR}"
+	use kde && export QT4LIB="/usr/$(get_libdir)/qt4"
+
+	# Use multiprocessing by default now, it gets tested by upstream
+	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+
+	# compiler flags
+	use custom-cflags || strip-flags
+	use debug || filter-flags "-g*"
+	# silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
+	filter-flags "-O*"
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector"
+		filter-flags "-fstack-protector-all"
+		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+	fi
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# Make sure gnome-users get gtk-support
+	local GTKFLAG="--disable-gtk"
+	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk"
+
+	cd "${S}"
+	./configure --with-distro="Gentoo" \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--with-arch="${ARCH}" \
+		--with-srcdir="${DISTDIR}" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-num-cpus="${JOBS}" \
+		--without-binsuffix \
+		--with-installed-ooo-dirname="libreoffice" \
+		--with-drink="True Blood" \
+		--without-git \
+		--with-split \
+		${GTKFLAG} \
+		--enable-cairo \
+		--with-system-cairo \
+		--disable-mono \
+		--disable-kde \
+		$(use_enable kde kde4) \
+		$(use_enable !debug strip) \
+		$(use_enable odk) \
+		$(use_with java) \
+		$(use_with templates sun-templates) \
+		--disable-access \
+		--disable-post-install-scripts \
+		$(use_enable java extensions) \
+		--with-system-libwpd \
+		--with-system-libwpg \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		|| die "Configuration failed!"
+
+}
+
+src_compile() {
+
+	make || die "Build failed"
+
+}
+
+src_install() {
+
+	export PYTHONPATH=""
+
+	einfo "Preparing Installation"
+	make DESTDIR="${D}" install || die "Installation failed!"
+
+	# Fix the permissions for security reasons
+	chown -RP root:0 "${ED}"
+
+	# record java libraries
+	if use java; then
+			java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/${BASIS}/program/classes/*.jar
+			java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/ure/share/java/*.jar
+	fi
+
+	# Upstream places the bash-completion module in /etc. Gentoo places them in
+	# /usr/share/bash-completion. bug 226061
+	dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh libreoffice
+	rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed"
+
+}
+
+pkg_preinst() {
+
+	{ use gtk || use gnome; } && gnome2_icon_savelist
+
+}
+
+pkg_postinst() {
+
+	# Cache updates
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	{ use gtk || use gnome; } && gnome2_icon_cache_update
+
+	BASHCOMPLETION_NAME=libreoffice && bash-completion_pkg_postinst
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+	# Add available & useful jars to LibreOffice classpath
+	use java && "${EPREFIX}"/usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+
+	kde4-base_pkg_postinst
+
+}
+
+pkg_postrm() {
+
+	fdo-mime_desktop_database_update
+	{ use gtk || use gnome; } && gnome2_icon_cache_update
+
+}



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-06-20 18:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-20 18:34 [gentoo-commits] dev/anarchy:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ Jory Pratt
  -- strict thread matches above, loose matches on Subject: below --
2011-05-29 20:36 Jory Pratt
2011-05-13 11:50 Jory Pratt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox