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

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
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