Stable 3.3.3 on x86. Add testing 3.3.4. Remove 3.3.1.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 108 insertions, 112 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 93f375d256cb..438b67cd339a 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.111 2011/08/17 10:22:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.112 2011/08/17 18:15:06 scarabeus Exp $
+
+*libreoffice-3.3.4 (17 Aug 2011)
+
+  17 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-3.3.1.ebuild, libreoffice-3.3.3.ebuild,
+  +libreoffice-3.3.4.ebuild:
+  Stable 3.3.3 on x86. Add testing 3.3.4. Remove 3.3.1.
 
 *libreoffice-3.4.3.1 (17 Aug 2011)
 
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 537fe9de98d5..d4bd99dd530f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
@@ -105,102 +105,102 @@ DIST f7925ba8491fe570e5164d2c72791358-libfonts.zip 1336993 RMD160 a4ba6e7e2e19a0
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 RMD160 575a7daf02efbab9ea972e03a6870f7f13112806 SHA1 5ecb895ffc1eff2c381fa78d2197d0c57422b3df SHA256 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
 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.1.2.tar.bz2 21989190 RMD160 59d7e07d9dbc8b3b20e168a00bf015894a607f87 SHA1 b04432a94b06a9c63dee60904cc5972a352f95a4 SHA256 79bff5dc790e13a3782043fb0b0a2c22edbda924b2f1690a562650a3761712be
 DIST libreoffice-artwork-3.3.3.1.tar.bz2 21988711 RMD160 87889fe32738688f62eb8dba338592439541f9f4 SHA1 820c8bbd2e77fca28ba2e817f0b438319570ea58 SHA256 a09c65f1db0a953b6f68c7a63190da75fc07edc4cb6122c13317ae17471be62e
+DIST libreoffice-artwork-3.3.4.1.tar.bz2 21989297 RMD160 7700b89bebbf299697fb4420ec3091f107fcca25 SHA1 9dd17d8934c1efa8f14727b8513b51b25f82aebc SHA256 d20f6da3a4c5d81816c401ca673eb151069f38277a9805dd6a36a9074d7f1fda
 DIST libreoffice-artwork-3.4.2.3.tar.bz2 13539965 RMD160 fcc216853edcb7640b3b605da7305f31e9bafe84 SHA1 19d857e42ab1f2955af5d25dee1a33ebfb6aa9f3 SHA256 b380f286fe95bfc4168aa73f410c5fffb94baad3ea0533bb0a692e3811f6829f
 DIST libreoffice-artwork-3.4.3.1.tar.bz2 13539515 RMD160 900c0863ac2adde1749f204e5e7e98dbf2f09f23 SHA1 27911610907a3663d2e81634356d72750b2634d0 SHA256 7eba7ecba89f869f8fab59db9e9695324cbe9645b9ddca8ea5a2ba8cc7b90bc6
-DIST libreoffice-base-3.3.1.2.tar.bz2 2081385 RMD160 7d734d15b9e261a63c21c9a728b26dcd65a3599c SHA1 7fd85ff1b1e9321cf08ad5ef05bd4d61f8f8190c SHA256 bf585502b317831797b4ebb48f0b54633e8fda451985bf4111189cd29a4716b0
 DIST libreoffice-base-3.3.3.1.tar.bz2 2082833 RMD160 ab4820d9d8bf856946f20ef36781119da7de24a6 SHA1 91d0be9606605a8176aa08b120bf7f2e0269e9bc SHA256 0f26d3ffd42a184480bb59a089ea0068fcb9c2ef02a745dacf428e0b428ad54a
+DIST libreoffice-base-3.3.4.1.tar.bz2 2083238 RMD160 a0ea708e67d47d010c7e390b373c78d93eda6e9f SHA1 d5b0d91a6a9fe17930b587c5e42309f52d09095f SHA256 029c2cde055ff2b8e3432f292c565dba6fd1e023cdd39fc9478635cedf006d1e
 DIST libreoffice-base-3.4.2.3.tar.bz2 2069337 RMD160 8268e3930992bb0d67cb9c52fea95e0c10934bfd SHA1 f483d8e21430a9be6551084a0e1807fafbcb5d86 SHA256 2e08042babcf4cea9e75fe70eb5f41b09010282d3d8a46a4762eb84b0eec8365
 DIST libreoffice-base-3.4.3.1.tar.bz2 2068416 RMD160 87ca2fa902ad3fe64cde3ea6e1fcff360fcb6637 SHA1 6dd91906d7694000c6148a31a16c0cec1ab06fb7 SHA256 c032d8a441ea476351b0d990e8b0bc789165585a7b8b7c1179657fd229fda674
-DIST libreoffice-bootstrap-3.3.1.2.tar.bz2 2752061 RMD160 6ef3bcaf464d862498c289bcbcd3567c2d7e4d50 SHA1 9fa3d0b659be4b1db51defb064af850a4c001770 SHA256 f8511b5459b9d6cd7f9d0bcdafc13b3e48649ddda91ce8fcd729525832a44a17
 DIST libreoffice-bootstrap-3.3.3.1.tar.bz2 2751295 RMD160 a4cc2f74ff3faa93a4006eadde355aacb1ca0973 SHA1 b12bbb7558086cd49b2f52ee20932f2d0a7e8811 SHA256 f51f0cef73b5657b5a0bb49c67da402e1a96e061da20a1ede35dcf41b3d7461f
+DIST libreoffice-bootstrap-3.3.4.1.tar.bz2 2753537 RMD160 6348b4b121159aa74a1b4e9c03f34cc5533a3d72 SHA1 4c7b5b105c29eb5e9dafc8ee59b4f306187f664d SHA256 a83cc7be2211c1dd03f49e1e9c54895852e732e291022c8022470cd057b9b2c6
 DIST libreoffice-bootstrap-3.4.2.3.tar.bz2 2712799 RMD160 f0eef44d44eb63b319d86f333bb4be3c624c5042 SHA1 838098a47a0c2a13529995a913c41bfe28de9ae3 SHA256 577d85b6aca3b5b3cf72db6545ef79a9a53014c90ec62fd1932a1eeeb40e95be
 DIST libreoffice-bootstrap-3.4.3.1.tar.bz2 2713327 RMD160 b5518a515d29572915a27ab432092cd3d1e632c9 SHA1 6f88b3248a844dde52d094f7405020b73dd37559 SHA256 892e7988f9f6283ef1da38c5c512f957a91fd61c84bd221366ced723eaccecc0
 DIST libreoffice-branding-gentoo-0.3.tar.xz 130776 RMD160 acb76ddfd77d9c3093f5da229b9d6703831a97b5 SHA1 12afad81a77bccbaadf5a6a11d6a58d70003432e SHA256 34882717b5cc7e1fbc672e6924b92bb6d5def850209b957003f1e517f08d5598
-DIST libreoffice-build-3.3.1.2.tar.gz 14364811 RMD160 b7e0889a2207cbec388557b02a7e49593a8a8821 SHA1 85c0feaf94f6fb5fe453d289aca4c21d19e04840 SHA256 d0e41398b90edf40125597c0b743c9824b976fabcbd5d578c886ae8e69393cea
 DIST libreoffice-build-3.3.3.1.tar.gz 14608755 RMD160 bdda006de40a39ca257ddc1149d47714d5df58b6 SHA1 846dc655a294e3d382dabd47786d2f414feb4d24 SHA256 2b7b35e461697aa3379bf53181dc05ecc00bfc9b83d366e2f81837ca8d464f13
-DIST libreoffice-calc-3.3.1.2.tar.bz2 9412067 RMD160 8b0b8b6492c4647539a9549b61af25c44ac51538 SHA1 c6d2bfbae5bb21c8c57d753fd81665d39a9fd124 SHA256 48ff8cfacbcc4d407302f04543a4ccd800de45d6d99b2ceecdfad046a1ce92cf
+DIST libreoffice-build-3.3.4.1.tar.gz 14608524 RMD160 014b86686a28830b445131b5466cc7094721eabf SHA1 20df109e25b91f89ddf40af3d198838cd372b2c2 SHA256 dd6e15ac00ba34b4c45bdb39a3d09bca34a442c5c22c103d76f595eab0aaea1d
 DIST libreoffice-calc-3.3.3.1.tar.bz2 9404500 RMD160 51d15421d3fa907c422c43eb39cef0df1a46e761 SHA1 7b6d06e3dd5183c40e8a9ded0eedeb28ddc4aebb SHA256 f13ecea9a05f02aab8320f5d3edbec2b53838d5d7620b0295ee39f5a0011ebac
+DIST libreoffice-calc-3.3.4.1.tar.bz2 9407748 RMD160 7092b6f2e4736a5d02e9d5bc47275655cc34b093 SHA1 94b021273a1d1947b21286ddc6e7e5d77c78b8d2 SHA256 7cb99233e7c268d1f8854c1403bdd3c07cc043ff55fdaa6705342803a47f7c33
 DIST libreoffice-calc-3.4.2.3.tar.bz2 9522743 RMD160 8da76108d3e286b54bb28036a8497c97b715ef92 SHA1 6c01fb62c910eddd51e253099c41a97f3a08b9c6 SHA256 401d81e1cf8588187ff5988f911c354d5aa340c237412a54097c8000317bedcf
 DIST libreoffice-calc-3.4.3.1.tar.bz2 9519909 RMD160 7906fbfe50d041dc8c8ea33f6b0ccfc1ef7384d6 SHA1 2594e90d897760bf58c3d40966a9086f47c902df SHA256 efd24603b883edda55cb41dd3934f8fb3ec63687a87dcf35dc37eedbe9710903
-DIST libreoffice-components-3.3.1.2.tar.bz2 5125538 RMD160 925797fe5f7423507e167f01089bb4f6c02a947f SHA1 7b74950ba96ed409520195eb8ca3ef67bd27bfc8 SHA256 04d27ef5ddbd25c0ff4eab821fa223bcab4b034ccec14704a1cfd0394ac17b6f
 DIST libreoffice-components-3.3.3.1.tar.bz2 5126030 RMD160 6d7291d1b84c0b0ef58d91eb900b9b0c584bdf95 SHA1 df65514edbcf32cdfc4559bec604309103679a30 SHA256 77238933fce5cb442e60117732be3a5fc5c95b04a83a23d0d32b678d5a69cc34
+DIST libreoffice-components-3.3.4.1.tar.bz2 5124325 RMD160 bbd98b77d4b9db5d948526d65f54e3479a9b33a3 SHA1 9ca1d2ad9211cf7df0834f764af28c8e88060f0f SHA256 bb9651370ee239a6fe0f4b52d5b6d3b84aafad64dcf1ccfcb655efb782599fb6
 DIST libreoffice-components-3.4.2.3.tar.bz2 5095585 RMD160 20d273d0966262cc3f7f614463a3d73063bc92d0 SHA1 33e34bdfe24260ff1ab6216b9d90508b27190b8f SHA256 2fe9b564fe5754a2b67195d0114ded2584e6370f17e40a71e7c27eb10d920df9
 DIST libreoffice-components-3.4.3.1.tar.bz2 5095935 RMD160 b74c004a81ab87c815c9af58f312b84ef744dfcc SHA1 6ca0d90e3b5d0a420b79bd19abe537ca68f77b96 SHA256 9216840e94427f02c515ba215bba39187b5e4150c6dcbfe8f8eb7ed1a937fcb9
-DIST libreoffice-extensions-3.3.1.2.tar.bz2 4199525 RMD160 ed1f80ffd7f0784b1ce749010c38e98b73055f00 SHA1 9afe07200aa8ad708b220b04819c77962a2eaa1c SHA256 dc85149bcd44eaf6aac49eaaf67e63ddf3fc7ed8f6ae5a6889620b895004b7f6
 DIST libreoffice-extensions-3.3.3.1.tar.bz2 4202583 RMD160 46db699075d9fae97593a29761245587cac5715b SHA1 2e91f00d859b72810ff30987fbad3bbf3f644ebb SHA256 7721fa9fb53608ffcf9358de6f69b0f763b676334794f11b068d475f9824ada5
+DIST libreoffice-extensions-3.3.4.1.tar.bz2 4202033 RMD160 1db3d06fcfd6354345e394ddf78f2cae6e0e5573 SHA1 8fbac20fa87e348ad07dc245f48f09ee539d7d80 SHA256 65c4540bd958a5f4dbf5875659d83e40a3d5542aa0cfde7f0f03e5000d16f241
 DIST libreoffice-extensions-3.4.2.3.tar.bz2 4216328 RMD160 0efe2f56b34f21c83778d105580caeb3e3a99a76 SHA1 324ae3a6cfd79996e20bd8b01962622bf8bff306 SHA256 191ca347026f4f258f6fd6b8b5c40947ef7e42fc6389f8f5d85f6b53513b2496
 DIST libreoffice-extensions-3.4.3.1.tar.bz2 4215584 RMD160 ffde7a7c8eb8e58aa274a49b743c1bc731b6b684 SHA1 04e32fded39802d925a123fc8135f5f5e88a3207 SHA256 0b43ca16af29406ec31f4a00b35f72b34574858359132531bfdaeb115c384e4c
-DIST libreoffice-extras-3.3.1.2.tar.bz2 38706932 RMD160 154f68660cc8e23fc7631e27c56712208ac56927 SHA1 ff2a33eaef6e66c60c7bc4e023ec5efe89d6466c SHA256 692a0b26d5f4b6a1d0a6925c90895c6df730251e766b625d152376e9cd177852
 DIST libreoffice-extras-3.3.3.1.tar.bz2 38706769 RMD160 2621d4729320099a31d3cec82c2c03f1cae3d371 SHA1 ed21c0faac63000b6473b3fb9cba820223c9c107 SHA256 c2e9c6a3f6e5756b714b8fd300dedf51012ee41b31a99a096998b95557fd8707
+DIST libreoffice-extras-3.3.4.1.tar.bz2 38706682 RMD160 a9d280e5d6a56b7816b4abb1202a8cc08ec27ac0 SHA1 795058c4bd92f8267e34f6df72eeae6514cabe65 SHA256 f8d5a6fcfa5a19973ca3ec62553d259e4522d2e4b82ea48766495150ec39cb3b
 DIST libreoffice-extras-3.4.2.3.tar.bz2 38644416 RMD160 f6d3e9a9c700a270d6b15168a360961407290603 SHA1 f7eb8532a1ffdf6556a0b654dada6d791cc59100 SHA256 7488464823ecf557ac485ee3f5655e9356730ddfc168945e7a0009319b7e9dd7
 DIST libreoffice-extras-3.4.3.1.tar.bz2 38641277 RMD160 453ac9bdbaa7c853c6b3641c75740b304a6e339b SHA1 4a849aad687acd9c1736f679917f932705023514 SHA256 8576ec90a9446436a98dd34b00abb05065066127e9eba6242733f7f90639eed2
-DIST libreoffice-filters-3.3.1.2.tar.bz2 11949571 RMD160 b77ba7c572bf722ae1cbdf4af6f8d6dc2d9d9d33 SHA1 fedc34e789e98d4bced59a9dd5b1a5fa086d9599 SHA256 c65a8bcb7a44fa2db9b9b833b7dd455a9b856a7c67e38f9204f1409a8adff51d
 DIST libreoffice-filters-3.3.3.1.tar.bz2 11949559 RMD160 7aa30d68991d6468e357ee18061599139bfb6581 SHA1 8e0eada653684136206fd576582762e054268d7d SHA256 57b48f5f2acf3bd7a1c0e6403201939b9416367e5967a292a5f4908fdb85c932
+DIST libreoffice-filters-3.3.4.1.tar.bz2 11952128 RMD160 2859a3aac56820fc17531bf1baadea7eacffe67c SHA1 dacae4855dc5329517a3f0988fb51037df39f3c0 SHA256 f9aef5149d34e3812b62b8d6e45afb1fbc77d14be686489377d4b8608e975329
 DIST libreoffice-filters-3.4.2.3.tar.bz2 11777347 RMD160 9cd11b83d4c1addcc275706b113a4c6e6adeb01d SHA1 8f9042a9634bc11a28e723508816aaaadb0573c4 SHA256 bc03c2fa71f9d06dfba1c1e3aa29a41f5e3e5096e4eb13ce7e5364f01e3dfcd5
 DIST libreoffice-filters-3.4.3.1.tar.bz2 11780294 RMD160 41cd02e675ba88be42671aff494f618dd709c327 SHA1 06b30e813445fb3a5561226bc6ab84e5bd472647 SHA256 428f330aa3ab6dab6dfed94139ca5f1aada91984d552d3f67dbef1c03b9de9c0
-DIST libreoffice-help-3.3.1.2.tar.bz2 1913332 RMD160 1c1595e6f72a6008de770cb70e2a10ef594dba95 SHA1 36965abf48b67642704d2d98ced4314a4451514d SHA256 606b6d2d739c8f6b4b413d05bd00671b753be953f2d96cb15a9b70a61eec31a7
 DIST libreoffice-help-3.3.3.1.tar.bz2 1928379 RMD160 7aaf8b4a7b9fdc2c49bee7903714d45b28da8e4a SHA1 751e4435a37895bbe242d4be759457f9181b42b3 SHA256 4dba3ee1f58f6c34004ffa3e7e3f88dd2e20e46018119105fe4e7fb295b0ce28
+DIST libreoffice-help-3.3.4.1.tar.bz2 1929042 RMD160 f07e9dc9a2d9e96e2f2ec4ba00292930417ce071 SHA1 b14c2106f3e714cc9953a2245bcb2c00ef253952 SHA256 e0e56cae62af05819b9a16c4a65d336ce6b73b37454716b4c6efeea44c467617
 DIST libreoffice-help-3.4.2.3.tar.bz2 1846361 RMD160 617612ed70ddaab34e727bcbaa6d289c4c2b1916 SHA1 3bf7cadebf3e93af8c87565f4919a09c7cf211f2 SHA256 0adcdd0080de859263e9260b2357e66c3f478cd5f510811e9d2f49dbe7185867
 DIST libreoffice-help-3.4.3.1.tar.bz2 1845861 RMD160 a78e595d5674d64c9fb406f1ad564fcb0a014f09 SHA1 545a2cd5ff1ed773590bc442c181c438353eb541 SHA256 59e80055039bb890f0e21f6b11a00bc20ed9ec6042c59fcf372f5fee1d57da6f
-DIST libreoffice-impress-3.3.1.2.tar.bz2 2605925 RMD160 95932f450abdc0bbbda9a57257fd9b0a3c4b216a SHA1 3a74b9b8948d30479cde0853c496764e25935f9f SHA256 eab9c215c6e087debb3f26cf4e327967cd85f8aeb5beccf5f332864c810467bb
 DIST libreoffice-impress-3.3.3.1.tar.bz2 2606174 RMD160 b80f097f69aba533fc235d1d18794b96a832f357 SHA1 61b479d92bf4e3532dc7660862e9fbd788164c39 SHA256 30340e8878118ed1f26f6b0be39022c378385e2c8a84a80127c501adfdddbd72
+DIST libreoffice-impress-3.3.4.1.tar.bz2 2606301 RMD160 9f08fd75b2e924aedca95b92aebd3ed02249d962 SHA1 504837993123375cde0beef79b22e1cc4bf06de2 SHA256 5f0e69050a33bccb97e7adcd87d3929c5e99bf23d736d42e970e5ad5aa2e550b
 DIST libreoffice-impress-3.4.2.3.tar.bz2 2651052 RMD160 dd3b3819f67004be8f1fe632942a2ccf388cee4b SHA1 b9e092e36e9b1faaa8ca3ad09f778c3376e709f5 SHA256 a9c5447924e47312b6db80f36dfa1f4c5046a897416a7f7497f51b5116904ec6
 DIST libreoffice-impress-3.4.3.1.tar.bz2 2651837 RMD160 9310de08e9a98ad3849a6a560bcdefda2be6bfbb SHA1 ae69528dc5f0cd355755efa6b7ec388c985b2f5f SHA256 9fe9e7428468ad65dc1262591ebcb5601a47d173e28c7809549819024b00537a
-DIST libreoffice-l10n-3.3.1.2.tar.bz2 80244657 RMD160 85c57a0a951bfb0f266b01c227694d506c351ab8 SHA1 9cfc3021de302ebca343f0e7dcc6278af8bf318d SHA256 fd8279d71d20d9cae08ca661ea92aba0ae5234f7db023e77b7a07c98ff16f562
 DIST libreoffice-l10n-3.3.3.1.tar.bz2 80826598 RMD160 231f4fe2535fa17832c3b8b6d439cece1fb1c7fc SHA1 e3cc368c9e2c94722d99be70e203ff1487579e3a SHA256 db8fc1cfa0701e5b4f518ecfed7d0f3dd2a9000eda5f1ad9f8ded35c79984780
-DIST libreoffice-libs-core-3.3.1.2.tar.bz2 16695271 RMD160 f07f3d6b8605a263ef1f32420a21eaf79b32bed2 SHA1 bdb308e1132cac9396547cd7542db991e8f66cf0 SHA256 7a2e8b763230cb7b95938cc4655759b3ebd7237c7fbf5ea2cc25a4af5dabec9e
+DIST libreoffice-l10n-3.3.4.1.tar.bz2 80831453 RMD160 785334782dc365a347f6239cb057d44d284f6f3a SHA1 eeb6ed70aa916dc18e8ffa17151c2e284bd31850 SHA256 1ada47d71b2097da53e5ec899c3df507de9a2dab99b9000c5f1187439ad7a962
 DIST libreoffice-libs-core-3.3.3.1.tar.bz2 16651698 RMD160 30482b696e8a004690e366f0314f6ac6090ab70a SHA1 ec4efe4a3bff8b3e155ba6337235f7602fc0a833 SHA256 a7002e77ecf778b109ba1e82220dc5574db6a7ce6cc77bb063fe9d2cf977c5fd
+DIST libreoffice-libs-core-3.3.4.1.tar.bz2 16655434 RMD160 72d20414af08e4e0733ef93dea353af05ea6534b SHA1 398ff53d290e43966a200c846d2b885108ccd52b SHA256 3fce50df4a0ea73929074941951202c6ad6159164cafbe33ea2640a7a943a2f0
 DIST libreoffice-libs-core-3.4.2.3.tar.bz2 15589730 RMD160 8a9fa40218c0560d33311f6e0a6709cb3ecc9ed0 SHA1 c1dfa35b7d492243a044bcd4eb60378291adb805 SHA256 22f938b2f47a4c254b98fb88ba33a21943a6b7e2ca3cc9d835850448e80a0b63
 DIST libreoffice-libs-core-3.4.3.1.tar.bz2 15594392 RMD160 d16173c48c72c43ef9feb25d3db759d4f47f7d45 SHA1 6b816a6250c59f74e18d82ced53722dbfe7a9f04 SHA256 2426090dc34e44e2bcc6f283c96cc44c8f995fa08f2dc11b836077a6cd314fd9
-DIST libreoffice-libs-extern-3.3.1.2.tar.bz2 629139 RMD160 b069645dc9a9721cf9612e9bd8eccf8ddfc095a2 SHA1 87d9d09f970ca697f3067679d577a6f564a786d8 SHA256 87009a8522071ff72e8080f43e5e98917268f9cafad1f8808626c4f2cff3a676
 DIST libreoffice-libs-extern-3.3.3.1.tar.bz2 629622 RMD160 b638045bf38f16022fe448ae437f6ec4593f81ca SHA1 2ccd83d9f7a1686b52ec8f6b2d460ff715a331f7 SHA256 0372a48153bb3931d0300e89de42b5e54d408d8a5552e60fb2eb3ebe44cd27a6
+DIST libreoffice-libs-extern-3.3.4.1.tar.bz2 629156 RMD160 962ad0981318e884bfc98ff930125644c2f0284b SHA1 379c5e2079d8614c56180aa4426ef8431871ac65 SHA256 5d6d831006c50ab4d88c5714fa5013acc7e4a24783ed0d2026373c75b161a3eb
 DIST libreoffice-libs-extern-3.4.2.3.tar.bz2 637916 RMD160 6deb97ad45d5274b255a69cea4179c391620362d SHA1 bc07dd37c6b524a54839b1e5438e4291516cad7b SHA256 7cc3c817cd0aca856e01c447ddfeb22803f5da187295d16e39c948ece9f6527c
 DIST libreoffice-libs-extern-3.4.3.1.tar.bz2 637870 RMD160 d857a3e1e8ac40e76782005e0d61ae8907724608 SHA1 3201882f6b731002c765c16de2dcd65f2d549d6c SHA256 510cf95b5aebfd10121c4eff40d4088e2c40370951bd07de243b6d7a43090efc
-DIST libreoffice-libs-extern-sys-3.3.1.2.tar.bz2 37033208 RMD160 54b68f944df2f943640d77fd18a3f1c605d2b5b8 SHA1 4ab54b1cc3062b64722386df38cd77de2f7bab61 SHA256 98d91dcb09eb2111eb95a970d20c286266d077e050b22d13647254d77f52a5c7
 DIST libreoffice-libs-extern-sys-3.3.3.1.tar.bz2 38823514 RMD160 92c26edd4784e041fba7eadc556a37f7c5b3b26b SHA1 33bfe5dbdea89c651778080a484eb3e7f5f1442c SHA256 00e1e504a350cbb8a94dc66d3ae6f69961121c146033c1af696857ce76b4d3f0
+DIST libreoffice-libs-extern-sys-3.3.4.1.tar.bz2 38822907 RMD160 ee4d4cfa7f52932451558b9e99c7393d7c41c083 SHA1 b7eb3070a986941c8b9da5daef7da0f601cfdc70 SHA256 a7fccb82d88b61a999a632fad1d6bce2207167dd506100d5a48b1b40b5aaf204
 DIST libreoffice-libs-extern-sys-3.4.2.3.tar.bz2 40016513 RMD160 8a27c6ff7bf620f432e9c93ea04ced0212e6e4c6 SHA1 8d27041d4e26a10f93af6565cba658370977016e SHA256 f90d2915645eb3d3968a6a162c9ddec9d7a4a9b892c7d80b9685eae230d273df
 DIST libreoffice-libs-extern-sys-3.4.3.1.tar.bz2 40032040 RMD160 ceb3a333ffbbc4528c01ba163fcbb2bfb7c807e3 SHA1 38c2387581778f1d132b790cd6236755b995b8d6 SHA256 4424bd8b63b0f62cfe05a685fecbf8f29494ad3fccb078f50522756dc1ee79fc
-DIST libreoffice-libs-gui-3.3.1.2.tar.bz2 10833093 RMD160 3fe18f63b095cf1feb5a43783fdaa4fbd97be01a SHA1 ba056c492bbfc6caa425423a2e47ae301470e89e SHA256 5566da268018efa3a9b0ff0ca624faabd04350c8e44b753722c2d55d625cb734
 DIST libreoffice-libs-gui-3.3.3.1.tar.bz2 10833787 RMD160 ce2286293b4d4106ca699636930ec37446275051 SHA1 8d6f52e9cf75d6ce342e072f1bc8371e3378ef8e SHA256 a3e9c1482f653c8db796519294a5aed3e0f3f945da3d1925a83dcb7a78b43e30
+DIST libreoffice-libs-gui-3.3.4.1.tar.bz2 10834251 RMD160 5bc3d2d828c03250930e19a9e26cc16b93dda8a3 SHA1 526bb57d2ef6c079c13d0e2bed051d585a653737 SHA256 edbf4c29e89500cd0add21379fd9e150842e1539401633ec29b66939128c71f2
 DIST libreoffice-libs-gui-3.4.2.3.tar.bz2 10857198 RMD160 583c044920d65c1cebf8dbcfe1cc0a95d915ac84 SHA1 d68b6196e1c344c11c3e3214363d76a7517e4fd9 SHA256 93be03e42c2add347db8ccfbfe3fee065e44959e771f7b3083f64644e5d505cc
 DIST libreoffice-libs-gui-3.4.3.1.tar.bz2 10863044 RMD160 f5147bd0565757d04a2577cf9001c61e760d9301 SHA1 8810ad0473f30cd89448d14f89facc28a4455e6a SHA256 f9781b75faa9c1492860518e924651fe204768ce31fe4261cc47651382d558b2
-DIST libreoffice-postprocess-3.3.1.2.tar.bz2 43094 RMD160 3f55ccd8f81d1e00249d8876f2c010283fc9342a SHA1 4b08a7416cb9c05ece9fb816a10e21b242c3149d SHA256 e30a59adbbbb6acb732bcd76bfee471f4e59a27593219dbbb01ae6365e7d5dd9
 DIST libreoffice-postprocess-3.3.3.1.tar.bz2 42994 RMD160 66dfc58de19a6d9ddd62c70c44d76d1a00707b3f SHA1 9a79dfdb290348a109fffab3c1334732cfee2ba3 SHA256 6c9cebfb3e7f3d2e8f3a354bcada28552a84c0806ea20255b28e4376406ebd07
+DIST libreoffice-postprocess-3.3.4.1.tar.bz2 43045 RMD160 de6e35c4f89cea80bdccb85548e1521619efeff6 SHA1 ea51f2022f03fa5cc6b7e7c57866902430cd0d1f SHA256 1331b08e97002d41d89a2438fddea038e84c2a1fe40949c6bce0f9162fed112e
 DIST libreoffice-postprocess-3.4.2.3.tar.bz2 50845 RMD160 4a7c7c1fa774293c0d42599898a665649129bfc0 SHA1 f447738479aa01617b17dea672959fc618c13209 SHA256 b782a00f6d3fdeb9a44e59ec9b0fdb2c59c28b1501c203fb26bb256ffd423ecc
 DIST libreoffice-postprocess-3.4.3.1.tar.bz2 50759 RMD160 0cb644d13674dd8f8d8b97d993dfa3c373a9be8d SHA1 991701a02277303a689029cf687da2a86d95528e SHA256 695215da6fa98a302e5adbe67a5a32528494bd3884f1a7bd262fcb97aaa26820
-DIST libreoffice-sdk-3.3.1.2.tar.bz2 1711153 RMD160 d1fdfc93b9056ed7c91d1eb98ad827308cef44ac SHA1 a8b488a273daf6ecefa8141a821cb12613c48652 SHA256 ad0a73593dda2512acb91aeaeccc41cf7e7b1587f577124bc74bb79aa2f5535c
 DIST libreoffice-sdk-3.3.3.1.tar.bz2 1710604 RMD160 1529fd40bbd28911ed1cfdb8e5613d57225b2022 SHA1 d8544f5f24654a0b1c197b8881fbb15c4ef48dd0 SHA256 e5795ba600e84a8565b75131975d63b29fddad1ec4b8ee5416f2ce88282e1935
+DIST libreoffice-sdk-3.3.4.1.tar.bz2 1710835 RMD160 78e95d956a890ac3abf016886f1405564afde668 SHA1 7c7e914eee4f1296e3fa51f63de831133f0fb8fc SHA256 b6b56a3ce6ce1bf55d7f97b9039c28afd994a28106fa882d849b05dc247516e1
 DIST libreoffice-sdk-3.4.2.3.tar.bz2 1721383 RMD160 27fffbf1dfacf55e0523ce31bc562501efaa73a0 SHA1 a24119a7b833548b16d4e47ebd4f76d2bc8d8bf4 SHA256 173abff22599da24c32e3e03b8744dd16fa77795bc7c9c6d9b5f682a84017b1d
 DIST libreoffice-sdk-3.4.3.1.tar.bz2 1721666 RMD160 6ce76c8622e10b31ea0a5d7c18e6ffa56b993371 SHA1 ebcd882be56660547bd50fb969b80e2ff4cd40d1 SHA256 cea8fb20580eac7a2859344f59b5bd090289feeed027464774b4332a0ec8c211
-DIST libreoffice-testing-3.3.1.2.tar.bz2 50946803 RMD160 dcd8394eab32ed119c4d01ede8e4d4a84071ddcb SHA1 cbc4d9a556fee66b90966bb5b1369f6b8babc637 SHA256 94b07675759dba9c6a6e8f7b5c384dd30b8e13babb5c0f79afbdca1484cf82ba
 DIST libreoffice-testing-3.3.3.1.tar.bz2 50945720 RMD160 247ee46d2f21b7ad186dab8d87bbe3507f70a2c1 SHA1 32d7feceb7aaa0256f51a32761edb60d6aa46eac SHA256 47b2632cc564080008649e4ed5a071fb3a1feb6f8b209236aee1e1c304701a1b
+DIST libreoffice-testing-3.3.4.1.tar.bz2 50947859 RMD160 3a95e68a6430a5cd2432e7644e79776e00a9275a SHA1 4ae0faff80df62950e57dbb626a4ac3a8f06cdbc SHA256 3282a0ef87fe14763cd482796103209fd2fc8d377ced80db8c827c3c62cf885d
 DIST libreoffice-testing-3.4.2.3.tar.bz2 50846459 RMD160 2dbde40764380077e9ef38307a2e7ecde07c79f8 SHA1 c41c2e2e0b7d9bbd56d6c7e8e9198f0e89a3d0d4 SHA256 4eb94d47d4d48bff41f1998c0dad96d49231301a99d8a987bebdb91f04777a42
 DIST libreoffice-testing-3.4.3.1.tar.bz2 50846731 RMD160 d993467d5304927ddede8d42b9aec4a0be403341 SHA1 820da99536484b7980eb99baca16c13d94cbc0f6 SHA256 cf623d76d6d56b41f58b07992bdc97269c7dc0929bd34c0affe7f706fc555e64
 DIST libreoffice-translations-3.4.2.3.tar.bz2 137568946 RMD160 c4ebe2ccac621bc5bf5d4e743d6f5d39f9bf5d14 SHA1 4efe1180d298a76f499f52ac6c3f89f4ab4a378b SHA256 1f21d4a1eb517653c22dabc93ae45a9d4c3ae46663d202db156ad9323e81e22f
 DIST libreoffice-translations-3.4.3.1.tar.bz2 137574741 RMD160 8daf0171df2de5a719270839087445e512a5ef15 SHA1 89c02a25b2653882652451575fca610862cdf72c SHA256 cafcf5f73ee9002085b8303f30ea4b8ab7688b4efb03c17e509b956e069a18fe
-DIST libreoffice-ure-3.3.1.2.tar.bz2 6166982 RMD160 eb65ed62e6f0d3ed0c341edc4956674990140b0d SHA1 417cd74abaf10aaf0050553ecfa11714e21f25e1 SHA256 99978e7977449a578925620ecd2cfff744668ebae05fd0ff5370cad031c9bbdd
 DIST libreoffice-ure-3.3.3.1.tar.bz2 6163742 RMD160 e046d55882b57080dac73f59736019f5dd8539bf SHA1 51ca4cd60e53ef5ad1e1297a80f1d24faae50cc5 SHA256 ddf053aa2c5db4b41e461f1009eb9d0ff218aadb0b4fa492e627dba06873ea2b
+DIST libreoffice-ure-3.3.4.1.tar.bz2 6164629 RMD160 1a3b874de71b719e4ea10134cc82dc43ddc7fbc2 SHA1 2c3562704e8cf275ec7db790dbf1cc8627587120 SHA256 535953cd6b97e109690d8b1329ef129218e38774109612d4390e21e0da4d8a70
 DIST libreoffice-ure-3.4.2.3.tar.bz2 6213202 RMD160 00d7ef07d3d7374ca39079c900c02a69840b31a3 SHA1 b15d8255a08f97a3d0590310f39c9a0014d4014a SHA256 5ed8cf111331e1da4c205320dda16b4a63102458b12b251b71f1681860097b5f
 DIST libreoffice-ure-3.4.3.1.tar.bz2 6213727 RMD160 742b8402206f0e6afb89725ff376de6c8cdedb88 SHA1 2567d6fb2d61f228e23ae78c72d37c3f68f59bb1 SHA256 e97476e2c6ddcfdee61444db3571db394758845b15e5c04d4f68d426248c0d1c
-DIST libreoffice-writer-3.3.1.2.tar.bz2 6776894 RMD160 7667f4fbbe8d6eea2dd8b8fef84bc7152d2a4738 SHA1 17fc2d585da2eb948c5ce7951d112d238a9b124c SHA256 2a1d8836eaa738a4378bbab27accb2d6af1218a6d601354558adb12f2342509b
 DIST libreoffice-writer-3.3.3.1.tar.bz2 6777324 RMD160 53d9c4494720d574099b628c3728776afa806369 SHA1 e2904da46bebd29916be810af3616cb1667d11c5 SHA256 7d91da3cfc31595a6c0fa0835a27735e2934bd27c1c214b5abbd92c845ce4b68
+DIST libreoffice-writer-3.3.4.1.tar.bz2 6778265 RMD160 a2a3bbe1f8e6ff0f03b419ece249bc0752bd081c SHA1 d572efceaf4249ebd97df0446d7b2aa74d506858 SHA256 312aaf0610753a789d7e7ed5ebf407e0fc12a4e35f50d3df51dbcb40af799c15
 DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a501ef782a9596ca6c SHA1 4cfb0467ae5d6e1c7944328a830a3765f4616307 SHA256 5f80890e0493849080ea521848a521aae0964c1d8f6df1e0da6c9525721663b7
 DIST libreoffice-writer-3.4.3.1.tar.bz2 7294202 RMD160 5f4029a78e7072ae317509c3fd33f7b928a2f16b SHA1 69d694f3257a40539010dc1f33e5293ac4b1390c SHA256 c9abca3b960cb579f3855d380c069ecec76104fc5ac12566790ac24e8a5f62fc
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
-EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 f8b13e0c4a6169860dd6e0a65c772839dc5310c2 SHA1 2766a7119a63a41bb912eef7437193059ee8a0fd SHA256 9cc4172de1437c0e1b239c4f6630424f556ce8346c891694a53fc984eb6d12d6
+EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
+EBUILD libreoffice-3.3.4.ebuild 18141 RMD160 50ac48e5cc3206f2cfc35c69a098fba8e38da4b7 SHA1 a2bb549a0c6c66c477db08bae202d581ecfea5b4 SHA256 1233871084a7fb29500478bc3891f23c398d30811c06224c3da4344f3c4fd280
 EBUILD libreoffice-3.4.2.3.ebuild 19612 RMD160 55f0032ee178656d381556cfa5f2862c665dda73 SHA1 2187a57ddfdd83b66152f624498ff35d6bc1b274 SHA256 0e4ec8c6bbb0a9553c68fc457d8f03bf3ae3fcabf96e733c6cc29cfe9df819b3
 EBUILD libreoffice-3.4.3.1.ebuild 19532 RMD160 61684d1a374c1ed6f60d28c108690fbcf514664d SHA1 e67f219b475b518417085407d7c81ae771fd9391 SHA256 21ed1bfa0af0c466722f523ced66dcaf95ba8249560522296f332d200fab10f8
 EBUILD libreoffice-3.4.9999.ebuild 19539 RMD160 1057b772313a1680460e227dad070c1e71fce82e SHA1 860e7779e96f1ab8aefd9f6489dfea0926435f24 SHA256 709d53d16c7925f10367395be7659944c56bd078d9cf83721967b474ddf0bc0a
 EBUILD libreoffice-9999.ebuild 18909 RMD160 d9018d6e485990d789194187e850bfdc1638ca4e SHA1 890809b99597332c8223da972548f4f408a94221 SHA256 2df60fcb9bf9330ea54a6aab21d1c8ab73dc5de4d2b8a92370ce8612b2beb0f6
-MISC ChangeLog 21581 RMD160 92d83a92b9d22843f19f1a9e92a2ad758aa342c3 SHA1 73b585aa3f3808e2a840beaebe4be899c676685b SHA256 f4aa630b6a1579aee85593519409ca77d599f99e93aca88ef909af7f2f9a60e4
+MISC ChangeLog 21816 RMD160 1769b395327f021621ac28eaa3e11141e4c71d7a SHA1 5f0cbca39ada3df3456df21ecb4c1d03e27df3a6 SHA256 117ca142163baf5751cb41bffaa7381b2fb85f7a05ac9a8f63597fcc45911770
 MISC metadata.xml 1081 RMD160 df0ee3e614054cbd5f850530a17c0958b81a5d19 SHA1 8fc6d58e473f009d55a8876dc77135c0234d943b SHA256 2c90f32341f47586996dce605e83037a6759854a2871b8396f9832cb64f4db19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5LlocACgkQgAnW8HDreRYddACfY1XQpv2TXjC22seafgHAe52z
-IbcAn1WrGxN5K7oSzue7aO90XHb9QgKt
-=rWXm
+iEYEARECAAYFAk5MBUAACgkQHB6c3gNBRYfGRgCgjhOehUIxRtrm/s/KUhtm/dKF
+Q5wAoJO8VZTMy5CJzuFK0hs26DsbR0Ic
+=CeXz
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.3.3.ebuild b/app-office/libreoffice/libreoffice-3.3.3.ebuild
index 171cc0c416e0..260639ed7946 100644
--- a/app-office/libreoffice/libreoffice-3.3.3.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.3.ebuild,v 1.4 2011/08/14 15:24:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.3.ebuild,v 1.5 2011/08/17 18:15:06 scarabeus Exp $
 
 EAPI="3"
 
@@ -118,7 +118,7 @@ done
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="!app-office/libreoffice-bin
 	!app-office/openoffice-bin
diff --git a/app-office/libreoffice/libreoffice-3.3.1.ebuild b/app-office/libreoffice/libreoffice-3.3.4.ebuild
index ea8f6b4c8915..453fad6cb557 100644
--- a/app-office/libreoffice/libreoffice-3.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.4.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.1.ebuild,v 1.9 2011/03/27 09:48:47 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.4.ebuild,v 1.1 2011/08/17 18:15:06 scarabeus Exp $
 
 EAPI="3"
 
@@ -14,18 +14,19 @@ 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 dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
+IUSE="binfilter cups -custom-cflags dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
 
-MY_PV=3.3.1.2
+MY_PV=3.3.4.1
 MY_P="${PN}-build-${MY_PV}"
 PATCHLEVEL=OOO320
 SRC=OOo_${PV}_src
-DEVPATH="http://download.documentfoundation.org/libreoffice/src"
 S="${WORKDIR}/${MY_P}"
+DEVPATH="http://download.documentfoundation.org/libreoffice/src/${PV}/"
 CONFFILE=${S}/distro-configs/Gentoo.conf.in
 BASIS=basis3.3
-DESCRIPTION="LibreOffice, a full office productivity suite."
 
+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
@@ -115,81 +116,78 @@ for X in ${SPELL_DIRS} ; do
 	SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
 done
 
-HOMEPAGE="http://www.libreoffice.org"
-
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="!app-office/libreoffice-bin
 	!app-office/openoffice-bin
 	!app-office/openoffice
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	>=dev-lang/perl-5.0
-	>=dev-libs/glib-2.18
+	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	gnome? ( >=x11-libs/gtk+-2.10:2
-		gnome-base/gconf:2
-		>=x11-libs/cairo-1.0.2 )
-	gtk? ( >=x11-libs/gtk+-2.10:2
-		>=x11-libs/cairo-1.0.2 )
 	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 )
-	>=net-libs/neon-0.24.7
-	>=dev-libs/openssl-0.9.8g
-	>=media-libs/freetype-2.1.10-r2
-	>=media-libs/fontconfig-2.3.0
-	cups? ( net-print/cups )
-	  dev-libs/redland[ssl]
-	virtual/jpeg
-	media-libs/libpng
 	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
-	>=sys-libs/db-4.3
+	>=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
-	>=app-text/poppler-0.12.3-r3[xpdf-headers]"
+	media-libs/libpng
+	>=sys-libs/db-4.3
+	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}
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-proto/printproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	>=sys-apps/findutils-4.1.20-r1
-	dev-perl/Archive-Zip
-	dev-util/pkgconfig
-	dev-util/intltool
+	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+		>=dev-java/ant-core-1.7 )
 	>=dev-libs/boost-1.36
-	sys-devel/flex
-	sys-devel/bison
-	dev-libs/libxslt
 	>=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-libs/zlib
+	>=sys-apps/findutils-4.1.20-r1
+	sys-devel/bison
 	sys-apps/coreutils
-	dev-util/cppunit
-	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
-		>=dev-java/ant-core-1.7 )
-	ldap? ( net-nds/openldap )"
+	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() {
 
@@ -213,14 +211,17 @@ src_unpack() {
 
 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 " It is important to note that LibreOffice is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use aggressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again. "
-	ewarn
-	ewarn " Also if you experience a build break, please make sure to retry "
+	ewarn " If you experience a build break, please make sure to retry "
 	ewarn " with MAKEOPTS="-j1" before filing a bug. "
 	ewarn
 
@@ -255,27 +256,19 @@ src_prepare() {
 		ewarn
 	fi
 
-	if is-flagq -ffast-math ; then
-		eerror " You are using -ffast-math, which is known to cause problems. "
-		eerror " Please remove it from your CFLAGS, using this globally causes "
-		eerror " all sorts of problems. "
-		eerror " After that you will also have to - at least - rebuild python otherwise "
-		eerror " the LibreOffice build will break. "
-		die
-	fi
-
-	#Some fixes for our patchset
-	cd "${S}"
-	epatch "${FILESDIR}/gentoo-${PV}.diff"
+	# Some fixes for our patchset
+	epatch "${FILESDIR}/gentoo-3.3.2.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}/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes"
-	cp -f "${FILESDIR}/libreoffice-3.3-libpng-1.5.diff" "${S}/patches/hotfixes"
-	cp -f "${FILESDIR}/libreoffice-3.3.1-neon_remove_SSPI_support.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-bison25.diff" "${S}/patches/hotfixes"
 
 	#Use flag checks
 	if use java ; then
@@ -343,14 +336,11 @@ src_configure() {
 	# Use multiprocessing by default now, it gets tested by upstream
 	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
 
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-ftracer"
-	filter-flags "-fforce-addr"
-
-	filter-flags "-O[s2-9]"
+	# 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"
@@ -358,16 +348,13 @@ src_configure() {
 		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
 	fi
 
-	# Build with NVidia cards breaks otherwise
-	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
-
 	# 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 --disable-cairo --without-system-cairo"
-	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
+	local GTKFLAG="--disable-gtk"
+	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk"
 
 	cd "${S}"
 	./configure --with-distro="Gentoo" \
@@ -383,6 +370,8 @@ src_configure() {
 		--without-git \
 		--with-split \
 		${GTKFLAG} \
+		--enable-cairo \
+		--with-system-cairo \
 		--disable-mono \
 		--disable-kde \
 		$(use_enable kde kde4) \