Add 3.4.2_rc2 to the main tree (from my dev overlay). This still contains A LOT rough edges.

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

5 files changed, 633 insertions, 12 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 36c7fae6a61a..a67953ea6651 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,14 @@
 # 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.40 2011/07/19 09:28:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.41 2011/07/24 12:25:53 scarabeus Exp $
+
+*libreoffice-3.4.2.2 (24 Jul 2011)
+
+  24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +libreoffice-3.4.2.2.ebuild, +files/libreoffice-unfigured-options.txt,
+  metadata.xml:
+  Add 3.4.2_rc2 to the main tree (from my dev overlay). This still contains A
+  LOT rough edges.
 
   19 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.1.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b89924cacc9e..b49248334d49 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,10 +13,13 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
+AUX libreoffice-unfigured-options.txt 1886 RMD160 b3ad4169dc6634b5e9e34e41af5a90a5de980577 SHA1 2f2ea97227408c8d55c8697d4180cb7284157cce SHA256 9e9188be96eeaacb4d6f5755370e90a0ee791ee95e20098315c758d659f15320
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
 AUX wrapper.in 102 RMD160 e11e046dc57bed812ba28e549145fdc3605ede8d SHA1 2e8cf54755431070b2352621eb4a91179a7cc543 SHA256 0cd747062eb7d6d4ecabbf8943575c688c273c7f258b5793a5cff42254ecb432
+DIST 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz 3484993 RMD160 78f48eeb84adb64e78d3fdd6724ba6095e4454d0 SHA1 820f58f1fd26b955e9853370d2d61484b24939f3 SHA256 986c8cec94f7e409497d826d0ec6809c261a3c0f3f2a891213cb9128a93ae195
 DIST 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz 4893724 RMD160 aefa80476ef8340be84440b61f738f432da51c92 SHA1 025d5d0d566a23ddb353495c116116c1088ba2e9 SHA256 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee
+DIST 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz 456304 RMD160 fe72e3958fb2ed39aa5cb04ff55b643f06646300 SHA1 595487766c3814afeaaf18e1021b312dd546dfec SHA256 2b16516ef147bb604e1cf50c883143a052a7ff92d2930b70e571da0603b7d9ce
 DIST 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8
 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
@@ -99,14 +102,17 @@ DIST libreoffice-artwork-3.3.1.2.tar.bz2 21989190 RMD160 59d7e07d9dbc8b3b20e168a
 DIST libreoffice-artwork-3.3.2.2.tar.bz2 21989346 RMD160 1ccf6ed246bca092e3b0fc4e56dbd257e7a54073 SHA1 58111f00cb80b0003a5acb33174318c8d9975685 SHA256 81b087bf616b521ece2be1922c532917be0cb564ffec1a8043219d2cf9b5aa6d
 DIST libreoffice-artwork-3.3.3.1.tar.bz2 21988711 RMD160 87889fe32738688f62eb8dba338592439541f9f4 SHA1 820c8bbd2e77fca28ba2e817f0b438319570ea58 SHA256 a09c65f1db0a953b6f68c7a63190da75fc07edc4cb6122c13317ae17471be62e
 DIST libreoffice-artwork-3.4.1.3.tar.bz2 13542278 RMD160 3de2ba621f2e86394d6e48df41a169afa96c4195 SHA1 48f87722ad3def38b96ebbacf843ca630a196851 SHA256 2c603503dc5473c95e3732016055a5cd7657fe832929e5391492176bcebc8460
+DIST libreoffice-artwork-3.4.2.2.tar.bz2 13540475 RMD160 8844467ad68632f7b31a6e757003c6296afedd81 SHA1 3608393750e0ffd19c157cdfc440f9f4b92e28cb SHA256 a79cbc74cd8c2cf70bfd45c6db0a7560bf2de02d6604c787cdd09d4e078abbf5
 DIST libreoffice-base-3.3.1.2.tar.bz2 2081385 RMD160 7d734d15b9e261a63c21c9a728b26dcd65a3599c SHA1 7fd85ff1b1e9321cf08ad5ef05bd4d61f8f8190c SHA256 bf585502b317831797b4ebb48f0b54633e8fda451985bf4111189cd29a4716b0
 DIST libreoffice-base-3.3.2.2.tar.bz2 2082264 RMD160 0f20c212d3336ce70298b0825539d45acef101ab SHA1 b04e5dfa550db2726338d9be61b908e47a9e3e50 SHA256 32a03ea3897f978bc98d67a03cae60f2c9b6e395e1aa8c8cca06f62979efcf15
 DIST libreoffice-base-3.3.3.1.tar.bz2 2082833 RMD160 ab4820d9d8bf856946f20ef36781119da7de24a6 SHA1 91d0be9606605a8176aa08b120bf7f2e0269e9bc SHA256 0f26d3ffd42a184480bb59a089ea0068fcb9c2ef02a745dacf428e0b428ad54a
 DIST libreoffice-base-3.4.1.3.tar.bz2 2068353 RMD160 c33d06b9c9d6fb2fcfe5f435f95d05166187287d SHA1 5bd999c5f77a0e6401827cd99dde04951285b4ae SHA256 08c41edb5baa673771bad430e137d4c2f58603418eaa1e5cfb6a1bf60d270736
+DIST libreoffice-base-3.4.2.2.tar.bz2 2068542 RMD160 337fe71100b954a09fb583c9a6792e90a8a1faa6 SHA1 735446bbd9ad378e4640f4e0c96964d0fd4d4065 SHA256 3a1fbd48e33ad7f0850e7339ef1f81c37f184e59eb49af996a78d4396af06367
 DIST libreoffice-bootstrap-3.3.1.2.tar.bz2 2752061 RMD160 6ef3bcaf464d862498c289bcbcd3567c2d7e4d50 SHA1 9fa3d0b659be4b1db51defb064af850a4c001770 SHA256 f8511b5459b9d6cd7f9d0bcdafc13b3e48649ddda91ce8fcd729525832a44a17
 DIST libreoffice-bootstrap-3.3.2.2.tar.bz2 2751299 RMD160 b8279525a1c7ef789a5c03853e69d775d9218521 SHA1 68829ca1d83407ad295c7c2495d7e0b9969ef45b SHA256 8799545dd696be0288e690ae066b4a91bdd4979b4947a9faf36f21c1500ae044
 DIST libreoffice-bootstrap-3.3.3.1.tar.bz2 2751295 RMD160 a4cc2f74ff3faa93a4006eadde355aacb1ca0973 SHA1 b12bbb7558086cd49b2f52ee20932f2d0a7e8811 SHA256 f51f0cef73b5657b5a0bb49c67da402e1a96e061da20a1ede35dcf41b3d7461f
 DIST libreoffice-bootstrap-3.4.1.3.tar.bz2 2707154 RMD160 6b8ec5816abd6c970edd6dd113d406ad229004e5 SHA1 18b62e4692d2f0cd7791e0e7d4cc8e8ab81f1f8a SHA256 476c15b88200121892c26a724bf8717e151a54e9c36d34a474b7cd2f947f169d
+DIST libreoffice-bootstrap-3.4.2.2.tar.bz2 2712979 RMD160 4012b440095321bb6fe12addb4b624bb9226ca26 SHA1 543f1ec7cbf49cbfa4df46cf2fe62e6e626117d4 SHA256 1cab94a57f3688e778323a536f446ab31d33e7fa411bc7106bc067f8a853b612
 DIST libreoffice-build-3.3.1.2.tar.gz 14364811 RMD160 b7e0889a2207cbec388557b02a7e49593a8a8821 SHA1 85c0feaf94f6fb5fe453d289aca4c21d19e04840 SHA256 d0e41398b90edf40125597c0b743c9824b976fabcbd5d578c886ae8e69393cea
 DIST libreoffice-build-3.3.2.2.tar.gz 14466234 RMD160 c41a7af4da7d1cb680a7eb0197846ae2ccfe15d1 SHA1 aaa0d1cc4bb79cc70a6c7fb083706411bf510e78 SHA256 be754033eacb59dd79234ac60b3c3a0a9c08eac510daa0fb16ed16abe2cf5e3e
 DIST libreoffice-build-3.3.3.1.tar.gz 14608755 RMD160 bdda006de40a39ca257ddc1149d47714d5df58b6 SHA1 846dc655a294e3d382dabd47786d2f414feb4d24 SHA256 2b7b35e461697aa3379bf53181dc05ecc00bfc9b83d366e2f81837ca8d464f13
@@ -114,30 +120,37 @@ DIST libreoffice-calc-3.3.1.2.tar.bz2 9412067 RMD160 8b0b8b6492c4647539a9549b61a
 DIST libreoffice-calc-3.3.2.2.tar.bz2 9407394 RMD160 6495cdf36687d88a8d2650c9ee8054f70b2523ba SHA1 d6b165fd27065854b61f312c689c049ad12c251d SHA256 cba5e46ad4899e68dceefd655f3607e752186f699cff50af9fddc7220082f996
 DIST libreoffice-calc-3.3.3.1.tar.bz2 9404500 RMD160 51d15421d3fa907c422c43eb39cef0df1a46e761 SHA1 7b6d06e3dd5183c40e8a9ded0eedeb28ddc4aebb SHA256 f13ecea9a05f02aab8320f5d3edbec2b53838d5d7620b0295ee39f5a0011ebac
 DIST libreoffice-calc-3.4.1.3.tar.bz2 9521156 RMD160 d45f378c728be3ad0cfff638c9e85e2a3285d599 SHA1 dc619847349bcb7e289f2f4d85c780baac709173 SHA256 1d94ef2f2ac9dd6e068e88a056981c77e4bb2209937693a2a57b8424f3fe4431
+DIST libreoffice-calc-3.4.2.2.tar.bz2 9514579 RMD160 2b1bfa1d33a663ebbaa48f0748ecb9c1f7828f9e SHA1 4bb6a717726771785d28e044b540f001efc32503 SHA256 2273b6655199a6514084754a5c5b2f6c08d2b730ec919b17bed8421b613a7ad6
 DIST libreoffice-components-3.3.1.2.tar.bz2 5125538 RMD160 925797fe5f7423507e167f01089bb4f6c02a947f SHA1 7b74950ba96ed409520195eb8ca3ef67bd27bfc8 SHA256 04d27ef5ddbd25c0ff4eab821fa223bcab4b034ccec14704a1cfd0394ac17b6f
 DIST libreoffice-components-3.3.2.2.tar.bz2 5123213 RMD160 825f1463c7cabef10fb32961e927d5a85460cf05 SHA1 4f2d2aaef0efbc0aea695efb536367cf01fbc60e SHA256 8c554f9266eb92b1bdd09379bde83ece2180bdf132f6f45f59c2d509884c5e71
 DIST libreoffice-components-3.3.3.1.tar.bz2 5126030 RMD160 6d7291d1b84c0b0ef58d91eb900b9b0c584bdf95 SHA1 df65514edbcf32cdfc4559bec604309103679a30 SHA256 77238933fce5cb442e60117732be3a5fc5c95b04a83a23d0d32b678d5a69cc34
 DIST libreoffice-components-3.4.1.3.tar.bz2 5094752 RMD160 485621736033a099250af8532d993e8302d1675d SHA1 2f36689b4250440e47c30e1241c2a35d24775a75 SHA256 15dc8891fd7b54c5e70573f3a2030ba3164049fd58bcd30f9f9c5e2aaf11821d
+DIST libreoffice-components-3.4.2.2.tar.bz2 5095907 RMD160 b5ba4debc7592988bd0d03ac79379e2d0bcdb208 SHA1 419353008725b5d4305cd8967bfc527236c967f2 SHA256 dcb721151db426cb22ae7d3b3a81e5539c509755f774f946a9980c6a44b9ee95
 DIST libreoffice-extensions-3.3.1.2.tar.bz2 4199525 RMD160 ed1f80ffd7f0784b1ce749010c38e98b73055f00 SHA1 9afe07200aa8ad708b220b04819c77962a2eaa1c SHA256 dc85149bcd44eaf6aac49eaaf67e63ddf3fc7ed8f6ae5a6889620b895004b7f6
 DIST libreoffice-extensions-3.3.2.2.tar.bz2 4198856 RMD160 17e2fc608bcfc729da938b8f18598decb3b591e9 SHA1 c0733e402696e6e99b6a4658471a990de1a349b9 SHA256 f5ad77b09cf174bd73b107805e09c6bd6ddadd5348908861f4e730dee62347ff
 DIST libreoffice-extensions-3.3.3.1.tar.bz2 4202583 RMD160 46db699075d9fae97593a29761245587cac5715b SHA1 2e91f00d859b72810ff30987fbad3bbf3f644ebb SHA256 7721fa9fb53608ffcf9358de6f69b0f763b676334794f11b068d475f9824ada5
 DIST libreoffice-extensions-3.4.1.3.tar.bz2 4215501 RMD160 04b37299353e13ad6f5e80ce2ce4ada1123700e7 SHA1 9909d86f7ed059e5308167942c343681c3646f9d SHA256 962bde1d33a0b43e6670c3bd0b88f0ec1cdc2f7311ff0aa1ca71ebb18cc7e299
+DIST libreoffice-extensions-3.4.2.2.tar.bz2 4216511 RMD160 e80cd939c2644894ed15fb91a0954060b2dd75d5 SHA1 50a8a70d442c8ec8ca10eafca14a69a58889a26b SHA256 58579f8f0dc47b4401441940c82f484edf6ebbd3268a9f763dabc26c54d12dc8
 DIST libreoffice-extras-3.3.1.2.tar.bz2 38706932 RMD160 154f68660cc8e23fc7631e27c56712208ac56927 SHA1 ff2a33eaef6e66c60c7bc4e023ec5efe89d6466c SHA256 692a0b26d5f4b6a1d0a6925c90895c6df730251e766b625d152376e9cd177852
 DIST libreoffice-extras-3.3.2.2.tar.bz2 38706912 RMD160 063ff609bd3a88414e4dedd4c103cfbdcaae7cb7 SHA1 f07ec52a6367e110d4e969eb21b4678ee07f61a4 SHA256 74bb20a2ce2c3139ca7b35c4d82390b26c745e09e7b7596521e7a80d73459b4d
 DIST libreoffice-extras-3.3.3.1.tar.bz2 38706769 RMD160 2621d4729320099a31d3cec82c2c03f1cae3d371 SHA1 ed21c0faac63000b6473b3fb9cba820223c9c107 SHA256 c2e9c6a3f6e5756b714b8fd300dedf51012ee41b31a99a096998b95557fd8707
 DIST libreoffice-extras-3.4.1.3.tar.bz2 38642506 RMD160 57db1a7a2df079a58a0af1d2f0d13fd6b06e35e9 SHA1 26469b3706af688b6e8ed00c2df5824bc0f0ed13 SHA256 91a40b2216574583a84b25679b7b0fad86295e1c48c876d797411ba422455f95
+DIST libreoffice-extras-3.4.2.2.tar.bz2 38643479 RMD160 7436b38d049e4fba21bbffb840dc6c91dc6d95e8 SHA1 00b2bc8b3b6766339d83d63664abae1a6e97f06e SHA256 7196f75c8f2c61c6f7fd26ec947b323c0f7dad9310b87bc565d91ecf55d85cd1
 DIST libreoffice-filters-3.3.1.2.tar.bz2 11949571 RMD160 b77ba7c572bf722ae1cbdf4af6f8d6dc2d9d9d33 SHA1 fedc34e789e98d4bced59a9dd5b1a5fa086d9599 SHA256 c65a8bcb7a44fa2db9b9b833b7dd455a9b856a7c67e38f9204f1409a8adff51d
 DIST libreoffice-filters-3.3.2.2.tar.bz2 11950736 RMD160 6c1d5bb2d8958bf3ee4a5ced4b678fa1dddec401 SHA1 6b15187c796a31ede38ad1108addce94d94d40f5 SHA256 7ab895b5873b2a9f1d6d631d6af1fbbbf8c8d520564d46c30440658e2833e58a
 DIST libreoffice-filters-3.3.3.1.tar.bz2 11949559 RMD160 7aa30d68991d6468e357ee18061599139bfb6581 SHA1 8e0eada653684136206fd576582762e054268d7d SHA256 57b48f5f2acf3bd7a1c0e6403201939b9416367e5967a292a5f4908fdb85c932
 DIST libreoffice-filters-3.4.1.3.tar.bz2 11774356 RMD160 828a16ab5c567c17f88472aab3ca9a04ca11e985 SHA1 36c211ac0973027d1c9bb25f7fd80be994cb4e14 SHA256 27622cc141b55629bbfb51da7fa18e6a25c91bda0643226292e81bc6859ad0fd
+DIST libreoffice-filters-3.4.2.2.tar.bz2 11776660 RMD160 eb90b2922ca47bd567eb4e8bf9a2e3d24f132c08 SHA1 94456f839d25defdab2fb69b05c054f3cdaf66ed SHA256 722cf4dbe944a32d1c243d065992e46230d8ce1c35c5cb3a9f5e19d29fde6faf
 DIST libreoffice-help-3.3.1.2.tar.bz2 1913332 RMD160 1c1595e6f72a6008de770cb70e2a10ef594dba95 SHA1 36965abf48b67642704d2d98ced4314a4451514d SHA256 606b6d2d739c8f6b4b413d05bd00671b753be953f2d96cb15a9b70a61eec31a7
 DIST libreoffice-help-3.3.2.2.tar.bz2 1914229 RMD160 b00668915f716b57c79491896b97431db0dd7513 SHA1 08213ff55841426c1c20ff2f5269a7a941deb38f SHA256 f3d105f2e4eae770ba87b8ecb7b425a2479aa3bcfca4b95bb0de4cd50f5b2da8
 DIST libreoffice-help-3.3.3.1.tar.bz2 1928379 RMD160 7aaf8b4a7b9fdc2c49bee7903714d45b28da8e4a SHA1 751e4435a37895bbe242d4be759457f9181b42b3 SHA256 4dba3ee1f58f6c34004ffa3e7e3f88dd2e20e46018119105fe4e7fb295b0ce28
 DIST libreoffice-help-3.4.1.3.tar.bz2 1846148 RMD160 5e7b1f9691c78a15f33a9551030e5612ba11b4b8 SHA1 775b2c34bf180641c11b771b4e2877d1b0233031 SHA256 179eaa0b5ed5d83ddaf0163f35906050089e4ca911d0b3ded71e5c041eabde47
+DIST libreoffice-help-3.4.2.2.tar.bz2 1846264 RMD160 8702930cda18488343688cf96858155e3465f33d SHA1 51c7da939bdda3381a48cd37195dab23b1175ff6 SHA256 10cae992204dca2065dd941c0a378b90642f8fe7584dcd918a7cd2c4a530127f
 DIST libreoffice-impress-3.3.1.2.tar.bz2 2605925 RMD160 95932f450abdc0bbbda9a57257fd9b0a3c4b216a SHA1 3a74b9b8948d30479cde0853c496764e25935f9f SHA256 eab9c215c6e087debb3f26cf4e327967cd85f8aeb5beccf5f332864c810467bb
 DIST libreoffice-impress-3.3.2.2.tar.bz2 2607403 RMD160 372200c44b544273b13eb2187b492148472f5ce4 SHA1 19bfe0c22e7b7623766ef2fc237aea11b7a0049b SHA256 93a879bb15bb1995d3f0c33a623639c4f0917fa3909fe998865001546d6575cf
 DIST libreoffice-impress-3.3.3.1.tar.bz2 2606174 RMD160 b80f097f69aba533fc235d1d18794b96a832f357 SHA1 61b479d92bf4e3532dc7660862e9fbd788164c39 SHA256 30340e8878118ed1f26f6b0be39022c378385e2c8a84a80127c501adfdddbd72
 DIST libreoffice-impress-3.4.1.3.tar.bz2 2651815 RMD160 ef7a15ae6d46569946ffdf246e1631048bee430d SHA1 c7ac9e9c15896fac8177045f4d0793dc635f17b4 SHA256 15f23ea6731302cae52e5b1a16ef5b2a7fa9fb1f5f690277d40b7c22193c2e2c
+DIST libreoffice-impress-3.4.2.2.tar.bz2 2651675 RMD160 10916782b5befb80e2dafcba0103d724f3ecb4f6 SHA1 1089fa229eacbd18aa7e8d298aa76e6c94b6681d SHA256 609fee64e79dffbd8d6f32e03d2f4d529006d656ba131e9fef8d7599bc92bc6f
 DIST libreoffice-l10n-3.3.1.2.tar.bz2 80244657 RMD160 85c57a0a951bfb0f266b01c227694d506c351ab8 SHA1 9cfc3021de302ebca343f0e7dcc6278af8bf318d SHA256 fd8279d71d20d9cae08ca661ea92aba0ae5234f7db023e77b7a07c98ff16f562
 DIST libreoffice-l10n-3.3.2.2.tar.bz2 80784635 RMD160 d0674b3ae355eb19d9e85f7898ce811595a00632 SHA1 18d661cf597c8ecf350a808462b332ca3c5d5611 SHA256 a0f705de7cdabcde047545b9240a295eb2002e7fcfec81f2a12262b6937c578d
 DIST libreoffice-l10n-3.3.3.1.tar.bz2 80826598 RMD160 231f4fe2535fa17832c3b8b6d439cece1fb1c7fc SHA1 e3cc368c9e2c94722d99be70e203ff1487579e3a SHA256 db8fc1cfa0701e5b4f518ecfed7d0f3dd2a9000eda5f1ad9f8ded35c79984780
@@ -145,50 +158,61 @@ DIST libreoffice-libs-core-3.3.1.2.tar.bz2 16695271 RMD160 f07f3d6b8605a263ef1f3
 DIST libreoffice-libs-core-3.3.2.2.tar.bz2 16698853 RMD160 12ac46ee9e8f51e997d6193042629c46c9abf2ee SHA1 236d605f6b5faa01de6000c0440ef24286e6f167 SHA256 66b1924fac13fc0a293b59abf55cc1d28dd0e8af085b758d166e7f1d3997323a
 DIST libreoffice-libs-core-3.3.3.1.tar.bz2 16651698 RMD160 30482b696e8a004690e366f0314f6ac6090ab70a SHA1 ec4efe4a3bff8b3e155ba6337235f7602fc0a833 SHA256 a7002e77ecf778b109ba1e82220dc5574db6a7ce6cc77bb063fe9d2cf977c5fd
 DIST libreoffice-libs-core-3.4.1.3.tar.bz2 15601815 RMD160 fa89757a5c5d0afe9f14cd8dc1b3f9c27b5ea01e SHA1 c130a4a1648d64fb0d27ad87617efe9989706f47 SHA256 121700e15ff2bf27159c23c07795490a006923dbbfd48b308c3d9a89a51e15ab
+DIST libreoffice-libs-core-3.4.2.2.tar.bz2 15590627 RMD160 c1c56eb03756cb7f502490d2f712cf6b5776a612 SHA1 1ca7cbe9fbd487a917249a3f9ce73088a86ab256 SHA256 db68b04ebae59438db3e1526d943b9bc5fd94699492e394716289bc63096347a
 DIST libreoffice-libs-extern-3.3.1.2.tar.bz2 629139 RMD160 b069645dc9a9721cf9612e9bd8eccf8ddfc095a2 SHA1 87d9d09f970ca697f3067679d577a6f564a786d8 SHA256 87009a8522071ff72e8080f43e5e98917268f9cafad1f8808626c4f2cff3a676
 DIST libreoffice-libs-extern-3.3.2.2.tar.bz2 628888 RMD160 d94568c00e515de6aa6e6764c06db297d5e84f83 SHA1 4ccb124b2c96238e6509f4ffb316380663d1425f SHA256 6f55e4c1cfe6ce179448342f117030f8e0016b154d0a68ead52d5a48f5af8222
 DIST libreoffice-libs-extern-3.3.3.1.tar.bz2 629622 RMD160 b638045bf38f16022fe448ae437f6ec4593f81ca SHA1 2ccd83d9f7a1686b52ec8f6b2d460ff715a331f7 SHA256 0372a48153bb3931d0300e89de42b5e54d408d8a5552e60fb2eb3ebe44cd27a6
 DIST libreoffice-libs-extern-3.4.1.3.tar.bz2 637815 RMD160 ff425724d386699f326a4b2afdd84001326fd8ff SHA1 3148e55b4512d16bd3ade3f097d019589d7c69b2 SHA256 62e2e550b027cafd156ec2d0c6abce50ba90a3ea27a3d90fbba70dbc5060b09b
+DIST libreoffice-libs-extern-3.4.2.2.tar.bz2 637668 RMD160 4a62ad88beb4a8b608d0ccb27b5d711aac55df46 SHA1 e8a09caeed653ae88ae11a414450bcedb404f0ba SHA256 410b17518da537b517004b83017cade0e8bfcc926332228809eee483b2cdf589
 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.2.2.tar.bz2 38822520 RMD160 93464429e38e6d6827efea3146e4334b81aeef7c SHA1 93ec79c399dae49485e93dafe2f8d5df3efcd344 SHA256 b63de5e7bb8274fa3e82a0a028dff56c985b6c3d44517b7840973be980d8a8b5
 DIST libreoffice-libs-extern-sys-3.3.3.1.tar.bz2 38823514 RMD160 92c26edd4784e041fba7eadc556a37f7c5b3b26b SHA1 33bfe5dbdea89c651778080a484eb3e7f5f1442c SHA256 00e1e504a350cbb8a94dc66d3ae6f69961121c146033c1af696857ce76b4d3f0
 DIST libreoffice-libs-extern-sys-3.4.1.3.tar.bz2 40003280 RMD160 c7ae99540c9f54086daeb2676906226073cde150 SHA1 44ebedc88beafa9e3e497a103c25e616bb934f8c SHA256 30e300a36b70dac952c9a4c68112b79433060f40a0eae1e1d76a727845b880ee
+DIST libreoffice-libs-extern-sys-3.4.2.2.tar.bz2 40011708 RMD160 7f953de119948e2eb801f14468d1f6e1c2628faf SHA1 665de8628a0bb52cdac43be9c652aec5491ca221 SHA256 2b0504d737ce7ed7f447a8a1e9a9bc47d7711215c5ef7acaf3c96ff979296de9
 DIST libreoffice-libs-gui-3.3.1.2.tar.bz2 10833093 RMD160 3fe18f63b095cf1feb5a43783fdaa4fbd97be01a SHA1 ba056c492bbfc6caa425423a2e47ae301470e89e SHA256 5566da268018efa3a9b0ff0ca624faabd04350c8e44b753722c2d55d625cb734
 DIST libreoffice-libs-gui-3.3.2.2.tar.bz2 10833350 RMD160 f5ce3aef3d44fdad6194ea71a8b3dafb8ef18c5a SHA1 dfe92cf62f553103804c2ff971428fd95d36edb1 SHA256 c9264c0f7b292bf131f74c8b54f380350f29f9e4d3e4da203483c6d2c20cf15f
 DIST libreoffice-libs-gui-3.3.3.1.tar.bz2 10833787 RMD160 ce2286293b4d4106ca699636930ec37446275051 SHA1 8d6f52e9cf75d6ce342e072f1bc8371e3378ef8e SHA256 a3e9c1482f653c8db796519294a5aed3e0f3f945da3d1925a83dcb7a78b43e30
 DIST libreoffice-libs-gui-3.4.1.3.tar.bz2 10852777 RMD160 06f48fdc251cae4e2c9a5dfc6be0893b46d08953 SHA1 10174fe9d8a2bdc1d6e5363bebacb009495aa96f SHA256 634014e3fc149ab98e2e81d961e506f75b669c3b9336e3d7437a12b418754d61
+DIST libreoffice-libs-gui-3.4.2.2.tar.bz2 10858440 RMD160 c78af2be2d5ad580f100903206599826fb4331c4 SHA1 a986ce290c0ea082a002a684007883d60a6812b8 SHA256 0cbfbcfa6506924b66107f6b8a4dd06180ed2a75a05bb87f00e513ce3a9eebd5
 DIST libreoffice-postprocess-3.3.1.2.tar.bz2 43094 RMD160 3f55ccd8f81d1e00249d8876f2c010283fc9342a SHA1 4b08a7416cb9c05ece9fb816a10e21b242c3149d SHA256 e30a59adbbbb6acb732bcd76bfee471f4e59a27593219dbbb01ae6365e7d5dd9
 DIST libreoffice-postprocess-3.3.2.2.tar.bz2 43106 RMD160 609ed05dec50008a26e8fbb07e78d0e4898d5b52 SHA1 8b60346b59375a52dec80c4f81d13175e21f5829 SHA256 2e7ab60dac2c520c9d709b34f631bb2ce30cbc9ae04f58dbb32314a683c65762
 DIST libreoffice-postprocess-3.3.3.1.tar.bz2 42994 RMD160 66dfc58de19a6d9ddd62c70c44d76d1a00707b3f SHA1 9a79dfdb290348a109fffab3c1334732cfee2ba3 SHA256 6c9cebfb3e7f3d2e8f3a354bcada28552a84c0806ea20255b28e4376406ebd07
 DIST libreoffice-postprocess-3.4.1.3.tar.bz2 50867 RMD160 78579ac6f9f3592400373eac55c638ea6a19494c SHA1 3a2b7b34e5795d1fb5e65adb0d8979443964e3fe SHA256 2ef4dfefb2c6842d97c45c16c0fd59bf8e38f140c2960bfd84a0ef09dc6f119c
+DIST libreoffice-postprocess-3.4.2.2.tar.bz2 50856 RMD160 7b3dd61798e09462cebfb295bf8b278b9b45cbe1 SHA1 605c924da97398f4c3766630a09d684582cc57e0 SHA256 d48e29668e0b8efdb49120b503054805f058c4d57d6d3120c6bb8bec0d8bda5c
 DIST libreoffice-sdk-3.3.1.2.tar.bz2 1711153 RMD160 d1fdfc93b9056ed7c91d1eb98ad827308cef44ac SHA1 a8b488a273daf6ecefa8141a821cb12613c48652 SHA256 ad0a73593dda2512acb91aeaeccc41cf7e7b1587f577124bc74bb79aa2f5535c
 DIST libreoffice-sdk-3.3.2.2.tar.bz2 1710897 RMD160 a179fdc2248e5b968fca56577ae0dfe3fd6d4dc0 SHA1 e92375a45afdf2612946ab45ac423878ba188d6f SHA256 95699df280e7ec022ec4659448359040fb00d47f680ee808b4a9554153490b29
 DIST libreoffice-sdk-3.3.3.1.tar.bz2 1710604 RMD160 1529fd40bbd28911ed1cfdb8e5613d57225b2022 SHA1 d8544f5f24654a0b1c197b8881fbb15c4ef48dd0 SHA256 e5795ba600e84a8565b75131975d63b29fddad1ec4b8ee5416f2ce88282e1935
 DIST libreoffice-sdk-3.4.1.3.tar.bz2 1721006 RMD160 c16bf7de8eea393f24ef0c15e3538132e1fbdf05 SHA1 a40a95d7b51733db56fe5f4d2103bb8f916a6155 SHA256 112c4b193a6649bd805c3d537d7a0f08560943dbba372a0a6d3c5491c0193074
+DIST libreoffice-sdk-3.4.2.2.tar.bz2 1721557 RMD160 3c1065c17a23cec3414888632639480def14af89 SHA1 89c21eeea24eb61d639c920faa181ebe4f935d13 SHA256 88c14e864bd0c7c95da39e36c72d98f0d0b1159a3de6a202978b0a9f9bc54c1c
 DIST libreoffice-testing-3.3.1.2.tar.bz2 50946803 RMD160 dcd8394eab32ed119c4d01ede8e4d4a84071ddcb SHA1 cbc4d9a556fee66b90966bb5b1369f6b8babc637 SHA256 94b07675759dba9c6a6e8f7b5c384dd30b8e13babb5c0f79afbdca1484cf82ba
 DIST libreoffice-testing-3.3.2.2.tar.bz2 50946350 RMD160 eeee1b4f985ee6897def774b5e9f0cd38014883c SHA1 e67f369188858b5b7451762049953daf1167e925 SHA256 0b67a06192fe157e9fe0c0f70acc96897db53add936baf4d3b5f1a7552e81ed3
 DIST libreoffice-testing-3.3.3.1.tar.bz2 50945720 RMD160 247ee46d2f21b7ad186dab8d87bbe3507f70a2c1 SHA1 32d7feceb7aaa0256f51a32761edb60d6aa46eac SHA256 47b2632cc564080008649e4ed5a071fb3a1feb6f8b209236aee1e1c304701a1b
 DIST libreoffice-testing-3.4.1.3.tar.bz2 50845728 RMD160 0bbcc5c24a382f715be104c056ffa6c8b0904ea3 SHA1 2baebc4dc5255a5ebe9a215e02a94f8d82da8a79 SHA256 e9851cc83bf716908eeb4677c0cfb52b62b1617226b32aa43c0312c5390fb074
+DIST libreoffice-testing-3.4.2.2.tar.bz2 50846263 RMD160 cb785e1aec0ecfeeaebea45637b98539fb5d79ee SHA1 e5ffa90f226149b75e8e4912e9f724d0d00127f9 SHA256 e94076c063f7dd55203f25a9412485bb84577a72c96340dda40cd5aa969f5fa1
 DIST libreoffice-translations-3.4.1.3.tar.bz2 136758452 RMD160 d86abba4959a3ee75f61c4a25548e4472cfeb1b3 SHA1 078f8cc852715292da1d0c8d90b3fc5617425a6b SHA256 c8a80577711f1e48b8fe457978d25ea7f2a995e96f629f319266a5f55725684b
+DIST libreoffice-translations-3.4.2.2.tar.bz2 137567227 RMD160 5e0bf18dbd6d91aa3da83c997af58eb91705cb52 SHA1 b3ac0dd25fc24f46fa8dbb88abd2113a1789317d SHA256 b14755e5677df0bff096a4b6f1813026df7b8910bd7f277c9fd2df0ca4d94212
 DIST libreoffice-ure-3.3.1.2.tar.bz2 6166982 RMD160 eb65ed62e6f0d3ed0c341edc4956674990140b0d SHA1 417cd74abaf10aaf0050553ecfa11714e21f25e1 SHA256 99978e7977449a578925620ecd2cfff744668ebae05fd0ff5370cad031c9bbdd
 DIST libreoffice-ure-3.3.2.2.tar.bz2 6165456 RMD160 016a6e690e02e41519e2d64d174f542b5a4e50f2 SHA1 40261e8a9605e504661111c41229ce0ee2986844 SHA256 37b340c3b476e1c7a95c4406228848d8afe0b5f8188af7a4f01f7fa5772232ea
 DIST libreoffice-ure-3.3.3.1.tar.bz2 6163742 RMD160 e046d55882b57080dac73f59736019f5dd8539bf SHA1 51ca4cd60e53ef5ad1e1297a80f1d24faae50cc5 SHA256 ddf053aa2c5db4b41e461f1009eb9d0ff218aadb0b4fa492e627dba06873ea2b
 DIST libreoffice-ure-3.4.1.3.tar.bz2 6213303 RMD160 1c29f24861e905fc0b6659a67c29835aca32ce80 SHA1 f7cf4319cdd40c14bb47a7730a39b5e897412be4 SHA256 a11b6463de7516541ba9fe0fafcfa3521ef022fef8f2c0fc5b8b11f4e1ac6b98
+DIST libreoffice-ure-3.4.2.2.tar.bz2 6214251 RMD160 13697a990e4f4b0ce8d389f660ec320832464317 SHA1 928ea08192feabc258f95df7c38c78ab61a6ec82 SHA256 32ffefd327828caee0e7eab3f6b1584acd4588992c36dbfe5e607bd87bd8b10f
 DIST libreoffice-writer-3.3.1.2.tar.bz2 6776894 RMD160 7667f4fbbe8d6eea2dd8b8fef84bc7152d2a4738 SHA1 17fc2d585da2eb948c5ce7951d112d238a9b124c SHA256 2a1d8836eaa738a4378bbab27accb2d6af1218a6d601354558adb12f2342509b
 DIST libreoffice-writer-3.3.2.2.tar.bz2 6778875 RMD160 db0b4ae2c1c93c6e35e93e48ee4ce5bdc1e963dc SHA1 d0d329bd1659c3d943c746c4f8cc76379094d7cc SHA256 3b7fe1fa2a889b5358a958c8e669505fa81251164c773d3dad650ce53009a973
 DIST libreoffice-writer-3.3.3.1.tar.bz2 6777324 RMD160 53d9c4494720d574099b628c3728776afa806369 SHA1 e2904da46bebd29916be810af3616cb1667d11c5 SHA256 7d91da3cfc31595a6c0fa0835a27735e2934bd27c1c214b5abbd92c845ce4b68
 DIST libreoffice-writer-3.4.1.3.tar.bz2 7309213 RMD160 4f75b2798a6e2c90f4bacee9fa776cbca4f0f9c9 SHA1 28f2e9ceb83705dac6bfbd821ce4b4fd770febe8 SHA256 73299c2fd1d939f1bd1472d861e9ae60197fa368d6b2e68c815f5355afc23630
+DIST libreoffice-writer-3.4.2.2.tar.bz2 7294336 RMD160 87f787eac22358846cb7b8dd386f4840aefe6e86 SHA1 a51a67e32052104cc1964d9dc93d163d8ed1e1d8 SHA256 ebc4513e0fb9bd26945802c089991f886534403aa4c58bede6b9ff0d5d5563f4
 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.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-MISC ChangeLog 8469 RMD160 fddc7e45d1ba54bf3e90eacac5a36aeff4b38994 SHA1 4ea967f079d1c4aa3c4a1cf6e5d50f060474663d SHA256 f3a5aeb06801427af403d2d47f31ea80f36f7e3e99054b84baa6d6328fcd7887
-MISC metadata.xml 796 RMD160 7306d61c906193b7f73fceeae0d333935c2998bb SHA1 40b3009cb0e11369e9e1a969018860ce21d9244e SHA256 0e6786c5227554b4c8848c2b7711f0ed40faa26c90afcfc72581a2adcddaba12
+EBUILD libreoffice-3.4.2.2.ebuild 19100 RMD160 9636e40a2716420cb0960f969a73b793307b4c1d SHA1 ed9a79dc24f80af260edcd8781231ce0ce813e00 SHA256 9af729c55d55f81d87b0f2fb9fb553dac826c2cd7d823db32af2065100c4f0f7
+MISC ChangeLog 8747 RMD160 fb054ec9b0ad1a02affecd33bc25acf82f75d2ed SHA1 e899bd1a5fcf91a61bf9415fbcb9bac08118f0d1 SHA256 e207e91afc88ae346713d0a8f9778e7c9260db72106a24efde9b7c7f76f81c33
+MISC metadata.xml 882 RMD160 fec57be29e81f82a00fe1a3792d06bf55094312f SHA1 2256f830fe8568d99a9104a8446dde40259546d0 SHA256 4b55d790375e3eb2cd00a94f2327efccc0a505cb8e3358eb9a15e44f917f5333
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4lTkoACgkQHB6c3gNBRYeW8gCfdQTIGWXvhRT/MXa9j2lx4LS/
-2BEAnRxcLrRKu+cjdeF3TxQej2eI7sCi
-=hnk9
+iEYEARECAAYFAk4sDzwACgkQHB6c3gNBRYfHzACdE+RwMPA+LEFpeOWi1yE1gKZk
+vC0AoMmBj1ueBkMxFN6iYt4AQ0hp4hEl
+=94Px
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-unfigured-options.txt b/app-office/libreoffice/files/libreoffice-unfigured-options.txt
new file mode 100644
index 000000000000..5a97316601f7
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-unfigured-options.txt
@@ -0,0 +1,32 @@
+  --enable-ext-barcode    Enables the Barcode extension.
+  --enable-ext-diagram    Enables the Diagram extension.
+  --enable-ext-google-docs
+                          Download and enables the Google Documents extension.
+  --enable-ext-hunart     Enables the Hungarian Cross-reference Toolbar
+                          extension.
+  --enable-ext-lightproof Enables the Lightproof extension.
+  --enable-ext-nlpsolver  Download and enables the NLPSolver extension.
+  --enable-ext-ct2n       Enables the ConvertTextToNumber extension.
+  --enable-ext-numbertext Enables the Numbertext extension.
+  --enable-ext-oooblogger Download and enables the OOo Blogger extension.
+  --enable-ext-report-builder
+                          Enables the build of the Report Builder extension.
+  --enable-ext-scripting-javascript
+                          Enables support for scripts in JavaScript.
+  --enable-ext-typo       Enables the Typography Toolbar extension.
+  --enable-ext-validator  Enables the Validator extension.
+  --enable-ext-watch-window
+                          Enables the Watch Window extension to Calc.
+  --enable-ext-wiki-publisher
+                          Enables the Wiki Publisher extension.
+  --disable-vba           Disables the vba compatibility feature.
+  --disable-activex-component
+                          Remove support for ActiveX embedding of LibO.
+  --disable-mathmldtd     Disable mathmldtd (useful for distributions that
+                          want to avoid packaging it).
+  --enable-layout         Enable the compilation and use of layout dialogs.
+  --disable-build-mozilla Use this option if you do not want to build the
+                          mozilla components from the mozilla source code but
+                          take precompiled zips.
+  --disable-nss-module    Whether to use provided NSS module.
+  --enable-lomenubar      Enable global menu support.
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
new file mode 100644
index 000000000000..7a8aee8a7274
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -0,0 +1,555 @@
+# 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.4.2.2.ebuild,v 1.1 2011/07/24 12:25:53 scarabeus Exp $
+
+EAPI=3
+
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads,xml"
+
+inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python toolchain-funcs
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+DEV_URI="http://download.documentfoundation.org/libreoffice/src"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+SRC_URI="odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )"
+
+# Shiny split sources with so many packages...
+MODULES="artwork base calc components extensions extras filters help
+impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
+ure writer translations"
+# split out as bootstrap is required to be done first
+SRC_URI+=" ${DEV_URI}/${PN}-bootstrap-${PV}.tar.bz2"
+for mod in ${MODULES}; do
+	SRC_URI+=" ${DEV_URI}/${PN}-${mod}-${PV}.tar.bz2"
+done
+unset mod
+
+# addons
+# FIXME: actually review which one of these are used
+ADDONS_SRC+=" ${ADDONS_URI}/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
+ADDONS_SRC+=" ${ADDONS_URI}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
+ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
+ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
+ADDONS_SRC+=" ${ADDONS_URI}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
+ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
+ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
+ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz"
+ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
+ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
+SRC_URI+=" ${ADDONS_SRC}"
+
+# translations
+LANGUAGES="af ar as ast be 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 gl gu he hi hr hu id is it ja ka kk km
+kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or
+pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg
+th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
+for X in ${LANGUAGES} ; do
+	IUSE+=" linguas_${X}"
+done
+unset X
+
+# 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"
+for X in ${SPELL_DIRS} ; do
+	SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+unset X
+
+TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
+TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )"
+TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
+TDEPEND+=" linguas_en_ZA? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
+TDEPEND+=" linguas_es? ( ${EXT_URI}/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )"
+TDEPEND+=" linguas_fr? ( ${EXT_URI}/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )"
+TDEPEND+=" linguas_hu? ( ${EXT_URI}/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )"
+TDEPEND+=" linguas_it? ( ${EXT_URI}/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )"
+SRC_URI+=" templates? ( ${TDEPEND} )"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE+=" binfilter cups custom-cflags dbus debug eds gnome gstreamer
+gtk kde ldap mysql nsplugin odk offlinehelp opengl pch python templates webdav"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	app-text/mythes
+	app-text/libwpd:0.9[tools]
+	>=app-text/libwps-0.2.2
+	>=app-text/poppler-0.12.3-r3[xpdf-headers]
+	dev-db/unixODBC
+	dev-libs/expat
+	>=dev-libs/glib-2.18
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.0
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-0.9.8g
+	dev-libs/redland[ssl]
+	media-libs/freetype:2
+	>=media-libs/fontconfig-2.3.0
+	>=media-libs/vigra-1.4
+	media-libs/libpng
+	media-libs/libwpg:0.2
+	sci-mathematics/lpsolve
+	>=sys-libs/db-4.8
+	virtual/jpeg
+	>=x11-libs/cairo-1.0.2
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	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.9
+		dev-java/lucene-analyzers:2.3
+		dev-java/saxon:0
+	)
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c++ )
+	nsplugin? (
+		net-libs/xulrunner:1.9
+		>=dev-libs/nspr-4.6.6
+		>=dev-libs/nss-3.11-r1
+	)
+	opengl? ( virtual/opengl )
+	webdav? ( net-libs/neon )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/openoffice-bin
+	!app-office/openoffice
+	java? ( >=virtual/jre-1.5 )
+	${SPELL_DIRS_DEPEND}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	>=dev-libs/libxml2-2.0
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	dev-util/mdds
+	dev-util/pkgconfig
+	media-gfx/sane-backends
+	>=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/libXtst
+	x11-proto/printproto
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		=virtual/jdk-1.6*
+		>=dev-java/ant-core-1.7
+		dev-java/junit:4
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
+	"${FILESDIR}/${PN}-libdb5-fix-check.diff"
+	"${FILESDIR}/${PN}-3.4.1-salfix.diff"
+	"${FILESDIR}/sdext-presenter.diff"
+)
+
+# Uncoment me when updating to eapi4
+# REQUIRED_USE="
+#	|| ( gtk gnome kde )
+#	gnome? ( gtk )
+#"
+
+S="${WORKDIR}/${PN}-bootstrap-${PV}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+
+	python_set_active_version 2
+	python_pkg_setup
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		eerror "Compilation with gcc older than 4.0 is not supported"
+		die "Too old gcc found."
+	fi
+
+	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
+
+	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
+		ewarn "Some java libraries will be provided internally by libreoffice"
+		ewarn "during the build. You should really reconsider enabling java"
+		ewarn "use flag."
+		ewarn
+	fi
+
+	if ! use gtk; then
+		ewarn "If you want the LibreOffice systray quickstarter to work"
+		ewarn "activate the 'gtk' use flag."
+		ewarn
+	fi
+
+	ewarn "Libreoffice compilation often fails on parallel issues"
+	ewarn "but the slowdown by enforcing MAKEOPTS=-j1 is too huge."
+	ewarn "If you encounter errors try yourself to disable parallel build."
+
+	# 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
+}
+
+src_unpack() {
+	local mod dest tmplfile tmplname
+
+	#first the bootstrap files
+	unpack "${PN}-bootstrap-${PV}.tar.bz2"
+
+	# and then all the separate modules
+	for mod in ${MODULES}; do
+		unpack "${PN}-${mod}-${PV}.tar.bz2"
+		mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+		# punt the empty dirs; it is annoying during debuging :)
+		rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+	done
+
+	# don't forget the wrapper...
+	cp "${FILESDIR}"/wrapper.in "${T}"
+
+	# copy extension templates; o what fun ...
+	if use templates; then
+		dest="${S}/extras/source/extensions"
+		mkdir -p "${dest}"
+
+		for template in ${TDEPEND}; do
+			if [[ ${template} == *.oxt ]]; then
+				tmplfile="${DISTDIR}/$(basename ${template})"
+				tmplname="$(echo "${template}" | \
+					cut -f 2- -s -d - | cut -f 1 -d _)"
+				echo ">>> Unpacking ${tmplfile/\*/} to ${dest}"
+				if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
+					cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
+				fi
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	eprefixify "${T}"/wrapper.in
+
+	strip-linguas ${LANGUAGES}
+	LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# 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*"
+
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local extensions
+	local themes="default"
+	local jobs=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+
+	# expand themes we are going to build based on DE useflags
+	use gnome && themes+=" tango"
+	use kde && themes+=" oxygen"
+
+	# list the extensions we are going to build by default
+	extensions="
+		--enable-ext-pdfimport
+		--enable-ext-presenter-console
+		--enable-ext-presenter-minimizer
+	"
+
+	# Things that do not have gentoo packages
+	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
+	# we should use in-system dmake: so far fails
+	internal_libs+="
+		--without-system-hsqldb
+	"
+
+	# When building without java some things needs to be done
+	# as internal libraries.
+	if ! use java; then
+		internal_libs+="
+			--without-system-beanshell
+			--without-system-lucene
+			--without-system-saxon
+		"
+	else
+		java_opts="
+			--with-ant-home=${ANT_HOME}
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-java-target-version=$(java-pkg_get-target)
+			--with-jvm-path=${EPREFIX}/usr/$(get_libdir)/
+			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
+			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
+			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
+			--with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
+			--with-junit=$(java-pkg_getjar junit-4 junit.jar)
+		"
+	fi
+
+	# TODO: create gentoo branding on the about/intro screens
+	# --with-about-bitmap="${FILESDIR}/gentoo-about.png"
+	# --with-intro-bitmap="${FILESDIR}/gentoo-intro.png"
+
+	# system headers/libs/...: enforce using system packages
+	#   only expections are mozilla and odbc/sane/xrender-header(s).
+	#   for jars the exception is db.jar controlled by --with-system-db
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+	# --disable-broffice: do not use brazillian brand just be uniform
+	# --enable-cairo: ensure that cairo is always required
+	# --disable-graphite: no package in gentoo
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-rpath: relative runtime path is not desired
+	# --disable-static-gtk: ensure that gtk is linked dynamically
+	# --disable-zenity: disable build icon
+	# --with-extension-integration: enable any extension integration support
+	# --with-{max-jobs,num-cpus}: ensuring parallel building
+	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --without-stlport: disable deprecated extensions framework
+	econf \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-db \
+		--with-system-dicts \
+		--enable-cairo \
+		--enable-fontconfig \
+		--enable-largefile \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-unix-qstart-libpng \
+		--enable-Xaw \
+		--enable-xrender-link \
+		--disable-broffice \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-graphite \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-rpath \
+		--disable-static-gtk \
+		--disable-zenity \
+		--with-alloc=system \
+		--with-build-version="Gentoo official package" \
+		--with-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-max-jobs=${jobs} \
+		--with-num-cpus=${jobs} \
+		--with-theme="${themes}" \
+		--with-unix-wrapper=libreoffice \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-afms \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-ppds \
+		--without-stlport \
+		$(use_enable binfilter) \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable debug crashdump) \
+		$(use_enable !debug strip-solver) \
+		$(use_enable eds evolution2) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk systray) \
+		$(use_enable java ext-scripting-beanshell) \
+		$(use_enable kde kde4) \
+		$(use_enable ldap) \
+		$(use_enable mysql ext-mysql-connector) \
+		$(use_enable nsplugin mozilla) \
+		$(use_enable odk) \
+		$(use_enable opengl) \
+		$(use_enable pch) \
+		$(use_enable python) \
+		$(use_enable python ext-scripting-python) \
+		$(use_enable webdav neon) \
+		$(use_with java) \
+		$(use_with java junit) \
+		$(use_with ldap openldap) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with nsplugin system-mozilla libxul) \
+		$(use_with offlinehelp helppack-integration) \
+		$(use_with templates sun-templates) \
+		${internal_libs} \
+		${java_opts}
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	local SIZE desk app
+
+	export PYTHONPATH=""
+
+	emake DESTDIR="${D}" install || die
+
+	# Fix the permissions for security reasons
+	use prefix || chown -RP root:0 "${ED}"
+
+	# Desktop files
+	pushd "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/ > /dev/null
+	for i in *; do
+		mv ${i}.desktop ${PN}-${i}.desktop
+	done
+	popd > /dev/null
+	sed -i \
+		-e s/libreoffice3.4/${PN}/g \
+		-e s/libreoffice34/${PN}/g \
+		"${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop || die111
+	use java || rm "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/javafilter.desktop
+	domenu "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop
+
+	# install icons
+	insinto /usr/share/icons/
+	doins -r "${S}"/sysui/desktop/icons/hicolor
+
+	# app icon names are too generic, have to make them unique
+	for SIZE in 16 32 48 128 ; do
+		cd "${ED}"/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
+		for app in base calc draw impress main math startcenter writer ; do
+			mv ${app}.png ${PN}-${app}.png || die
+		done
+	done
+
+	# install mime package
+	dodir /usr/share/mime/packages
+	cp sysui/*.pro/misc/${PN}/openoffice.org.xml \
+		"${ED}"/usr/share/mime/packages/${PN}.xml
+
+	# Install wrapper script
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${T}/wrapper.in" || die
+	newbin "${T}/wrapper.in" ${PN} || die
+
+	# Cleanup after playing
+	rm "${ED}"/gid_Module_*
+
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 95ce97729d4f..4e27c3279ca4 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -8,11 +8,13 @@ compilation can take up to a day depending on the speed of your
 computer. It will however make a snappier openoffice than the binary 
 version</longdescription>
 <use>
-  <flag name='binfilter'>Enable support for legacy StarOffice 5.x and earlier
-    file formats</flag>
-  <flag name='odk'>Build the Office Development Kit</flag>
-  <flag name='offlinehelp'>Install help files locally instead of
-    using the LibreOffice Wiki</flag>
-  <flag name='templates'>Enable installation of Sun templates</flag>
+	<flag name='binfilter'>Enable support for legacy StarOffice 5.x and earlier
+		file formats</flag>
+	<flag name='odk'>Build the Office Development Kit</flag>
+	<flag name='offlinehelp'>Install help files locally instead of
+		using the LibreOffice Wiki</flag>
+	<flag name='templates'>Enable installation of Sun templates</flag>
+	<flag name='webdav'>Adds support for HTTP repositories via
+		<pkg>net-libs/neon</pkg></flag>
 </use>
 </pkgmetadata>