Version bump by Andreas Sturmlechner (genstorm)

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x0B08240A96F66571
author: Andreas Hüttel <dilfridge@gentoo.org> 2015-07-12 20:54:10 +0000
committer: Andreas Hüttel <dilfridge@gentoo.org> 2015-07-12 20:54:10 +0000
commit: f2f9ec9c9066904056a430ace840afcd1e989a7f (patch)
tree: 9eee4e482dc8842f48726bfa4ca9ff35aa2042bb /app-office
parent: stable amd64; stable x86; fixed bad use of nonfatal, wrt bug 551184 (diff)
download: historical-f2f9ec9c9066904056a430ace840afcd1e989a7f.tar.gz
historical-f2f9ec9c9066904056a430ace840afcd1e989a7f.tar.bz2
historical-f2f9ec9c9066904056a430ace840afcd1e989a7f.zip
9 files changed, 1750 insertions, 23 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index c2b17fadf0ae..4401a1878508 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.638 2015/06/21 19:10:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.639 2015/07/12 20:54:02 dilfridge Exp $
+
+*libreoffice-5.0.0.3 (12 Jul 2015)
+*libreoffice-4.4.4.3 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch,
+  +files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch,
+  +files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch,
+  +libreoffice-4.4.4.3.ebuild, +libreoffice-5.0.0.3.ebuild,
+  libreoffice-4.4.9999.ebuild, libreoffice-9999.ebuild:
+  Version bump by Andreas Sturmlechner (genstorm)
 
   21 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   libreoffice-4.4.3.2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d960193ec089..bf2a62dbd6a0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,9 @@ AUX libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch 4304 SHA256 33c662ee9a0645
 AUX libreoffice-4.4.0.3-telepathy-build-fix.patch 1503 SHA256 d23431960aa3898331b0e80f827c2eb224c3586bdaf9d2bb9dc10e2aa58ae6f3 SHA512 cf76698e851e31646ad7e6f9547d8c0917a047fa93b5132d00f0ea246945344f3e1df2376a9e3ffcd7ee7a4a200e24e213330482fddf50fc47558b5a9b949426 WHIRLPOOL 92e870da0ea77954d2b04e39887909a0cf20fe4277388be0074c01fac5c7adfa1cfed84333b3e7ae26f7866082bb1711ba453f877b8bc2b390d74a17d41830c0
 AUX libreoffice-4.4.1.2-add-kde4-open-url-script.patch 2144 SHA256 d35630cffc304652ad4e7df6d88dbd2ea499ae7a904a6b4c6a7eec9570ebee23 SHA512 2999f66d65e50cd06f8df1a48727407a6f4d0259d5d7dffedb3b750ed4876f93374b1a1a0aaa7d8e223e3a25ccbf05ca05d1a919fe36fc0eee0f7cd956a5949d WHIRLPOOL dbdd05bd29dcc37c94ee67ba4b1856b970a735af2ee3a468440f1edcb760a008fef2f62fb43ce2fef3626953786456652c8b606dea2b24650c72c1be66a976ef
 AUX libreoffice-4.4.1.2-improve-KDE4FilePicker.patch 5561 SHA256 b9ff37b20bd73011cda137d1dce5ef87c79972718019ae16e525bf5c1fd9cc56 SHA512 3deb4211367320fcbe59acc62083245267b7637758a06996d0e14f4db1e37c53fa282363de83177fd0b756e736d725cbbbfeac2059254bfa02748c23ecf8e4df WHIRLPOOL 6acf13a6d271fdc5f549028eb8c032f41e55c9e128c7c11f97931b6cbdd3c621ae76e58b1ea0bae343afd4b51b6deadd932db893f4134ed01b4b56cd8d63a4e4
+AUX libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch 7615 SHA256 a1c0a663966e306270d17fc63f0f2b5c62585eaa46b6c5c0e9becf7c30acd60b SHA512 ff607595107edc33d903b0bb010c36b4d17ca7d3a907fc151c32757255993f5cade5581376d89855727173ccc2c1e619f0af15e7773e0dcd98937325a82c6211 WHIRLPOOL 4e6dfa1704e6d48a681a3346801ab099085d141248be999e186ee55d15fca3f7554bb76ef5a118766a929ee74d4a802dc2ab9f3d1b46b7106a394e8dfbd73d10
+AUX libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch 2725 SHA256 c6f71a016d92405de995d731e1dbb7b40f6af9989096744a69a52de176645fb0 SHA512 5800219accbd9bbfcd66841ff1b1a338faddec33bfc73d1c958126ff53b7d3dbf410622d74597d98ad925af07a66eee23e076b436f73d5076c0f9b439f99cefd WHIRLPOOL 6cdbf5266d96fb37dc542f6c07c034badbe38f1a9cb2b39aa402d0b70d407f074f278209aecb3e4dfb6246b1cf97389d7ed7a59ccbbc9a2de0dc74d18519fae6
+AUX libreoffice-4.4.4.3-improve-KDE4FilePicker.patch 5764 SHA256 3cb715491fbd91abdeb99477d19417bfc299376ec4532d5ef8826d4b9e001eee SHA512 11a860f9fb227e04e8f1d66ad54072d0117d6506a1e4d66a11876999a17bbac67b550f90cc8cf128d8cc81600eafa8bbcc49907657ccced2cbbf133c5acbe31c WHIRLPOOL 3f8bf68815132b0c436e8656d83208c4d5c30f45c069a33f6de28c54ccc3d7f2fe90413e3be34594cd0383ec9a448dd4ce2b0cca719f834d8671ddec22c47b5b
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
 DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
@@ -16,31 +19,37 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
 DIST libreoffice-4.4.3.2.tar.xz 164320100 SHA256 ad6154c157e07adee2271cfc722a116065a2e7261ee7d93fc796f76703e88966 SHA512 4842acfb07c887063fe82484cb1ced2ac59a4f670fc0a26fc2665ca53fc2d87e221a680284c3c7c62cfb02b7044baa8aba855c33488d7a89d5faa0ccd23a4104 WHIRLPOOL d38ef073016dcd3c624a6969298b25fda49d13c8dc7729df1cdcb962f7d65c5469e69149ec695c5cb7a2378a0d47112d2ffc0f337e0ab4582260f0a65c9186c9
+DIST libreoffice-4.4.4.3.tar.xz 164365608 SHA256 31ac86daa4f842fe825c88262b99a032ba3c0620f6e01cb22a54af14bc3dda72 SHA512 fbe97d4f8db92348927dc7c8412631ad5187968357ebdc57f22936cea84c76ced3655aac4c6ebc936b0f96d3d36bafe163eea05ed2dca02e53724bd5a0396513 WHIRLPOOL a7938d94b8644cd736a7213c0c4931a9d857da7005972bc751f6157445839ce395fdb1b6b057dc6fd681cf86143cfe96c9b2126fef2d5de5ea000eb15c5bdb35
+DIST libreoffice-5.0.0.3.tar.xz 165377132 SHA256 2c290a4f1911e96a5851f9e4e354264c69c86fde222f79a363419ea782b4a44a SHA512 571054165fc1935bd1324bd3cd40976620a85bdcf8245fe1ad21f00374eba23842eeb50b62baf249d07e9efce5f57026eb51e338e2b1d3989306112c7f0210d0 WHIRLPOOL 864f15a9e6314c4c80b67730c87a43e44fedbeea795f0e94dfca39316c11d4b258a4f13d321582ee1417f2ab4289f7ab78009c9b46cf41fba63ae21a9280541e
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.4.3.2.tar.xz 1875884 SHA256 e10d43de0478d2aa939131e46cb8f7144e0302ee61e06a60732da9b9a03e3526 SHA512 f0c47876686beafbdbb324ea816bbf301f49a9b18fcb7468c77b85afd9eee8951e4973f762c4eac07141b436fe7ff91b8edd9309c3b032f0eabfefdd12ec5b7c WHIRLPOOL 6c284938ed0269020f3f28cc554dbec3bcc30a0c16141ffa0f2529888e0f7008cfe2cbc40153aa5badbbbbde86764a470fd7ee439e0c180a165f48d30250f107
+DIST libreoffice-help-4.4.4.3.tar.xz 1876068 SHA256 80d2cb4c5ee1d97218741d4e65351763dd74a617df7a51fce275983bcc5e6bc9 SHA512 b3d05ab85b1c25c3cc045c7d5217fb61b8dfc54b58c54a04b442c678d2c51975e5aadf3e28ac3f17544dd7afd6770fd8115cd05e3878b80c378b8fed6bcc2b22 WHIRLPOOL 3204cfac0ef6d2cd741e2f319242da6943b46c82ba5635df45dc1f99c3049a542df00a31c4b48092bcfad1a6d6f5d4e3c1ba0a3248331c324c08d728f909cb27
+DIST libreoffice-help-5.0.0.3.tar.xz 1882452 SHA256 f656f97c9903fe89652de5cac4269cfb07fd19d23d92baf1663261650846d500 SHA512 c5794e340a9708ec4eda9ac5986f867defe32cfd2fce2f662ad1aa7672d2a12cb092fff867b1039c43247901608635c0f948b157014c1db488f430d6436ea7ea WHIRLPOOL cd5f3edc87904edd513c42bf4e37f19aedb31e366f9a2ef9d3a917c3beecc28e1fce49cc5a467770dba18414b6e33662fc83c3ef9c4b7de60545c7d849047a09
 EBUILD libreoffice-4.4.3.2.ebuild 19017 SHA256 c251bd9f865b197c052e2be35d8b906894ca58470ab54edbf564c1977311ef41 SHA512 557ceaf6e421a68bfac1d952ed19db733dba735405cb8762a65916d26e666e1cd7e8c178da2c5085a0a27bf13fdb58efc7b96d3e31ef5417b6fcda09514dc838 WHIRLPOOL 5b2bd7251b5accd88d475a0f346fc8f613990229b146ebd8b8bdb849acf9eaa110a657aae27c360079793f3f8af11af486c5fc815c68b32a7b544e59d16faea7
-EBUILD libreoffice-4.4.9999.ebuild 19021 SHA256 bb1da53ad70a0669e507b4a3c69e5e66640636e68c89360ac2e8731bc5ca2f9a SHA512 96461e8814a29f37d6e69c5d7010d142ceb606388f5ce080eb77c881b1ed521e7c2d02142e018f5b0ef80a28c7c1d3b9f86ba84458c681e2370148b3eee1e3eb WHIRLPOOL 7575e29b0e1bd56a0238aac3d50422d714cf9d3565ffd96bb71d0c40524d5ca413d77dc82173a12aea4b956e00c181d2196f50247aabc34a580942b11292b8c9
+EBUILD libreoffice-4.4.4.3.ebuild 19142 SHA256 9560dd888c2ea774bdd8a45ffa8d6535d09d8fedfe45d6d4b853997b0b9781c5 SHA512 26399fbab1cc9b714dffc58486013a4e0d692c0dc87f5c73012bc52569de359cdeadff3c5b8fb1e823251c4f402d621bd2fa9a2e34a2274f4fea6e5f7ba6689a WHIRLPOOL f71bb7166339d076399a630974266c95ac7dd0a6b2d2ac6b7d6e7e2ef8c516324fe36863914c719b3e52b6a0d788ced2ebecda737e88b67db7178ec91626d6aa
+EBUILD libreoffice-4.4.9999.ebuild 19144 SHA256 48881c269c38a281eab156b1ee8657a01c38dc7e8cd33bdccf28060c745bb246 SHA512 5a83af59f4beef6f314fcfc38fb8e9a33d896c323988457b9dc2d82b7e31af7c1796710cfdefb613bee2f691cbe63dd43f889fbf2941f00575e9e06c7ea3bcf9 WHIRLPOOL f924ac5246568aca7e03fe96696be599caf267113844292d266cb4e20a77920b31fc7702b16525af795f99df4ce6dd05b3d335885c0eec3625dfa40fbb3945b7
+EBUILD libreoffice-5.0.0.3.ebuild 18818 SHA256 71ed0d4722508ef2c5a365962afcb57695a87b1188c27bef81f162168ca7c866 SHA512 dbe26cd21a7cc6170ec510888d32655fb8cfa14ae2f0a3ac08d031ff8d6b98fbe38832d465dcb38ee97ea90b911b3390c9944c9862cf8cea2dd20406d0fa8a04 WHIRLPOOL ecfb92ded8f3261c7348d087390be55d69bcc1f98a4ee8172ab6ca53643df103f9031b98c16a7440b4bb031b9a65ddd2101ad5fd18f281501a3d7f11ab278494
 EBUILD libreoffice-5.0.9999.ebuild 18760 SHA256 8ce974bd93795f1210582afcffabdcb8ee2654d38317f207e8636a864a95678d SHA512 fe24359942856a61f6540ea553e637e012b143a7dbb52ba93e0d4f2c973273fd7f47ddc91ca0121c9d8b40dc2e9f968a1ea10d0500d52e235528f9e48c6bdaa9 WHIRLPOOL 0ec6a0bc6cb0a8f0ee3e086f02dfbc51f98837bdffa672870208eeac43aad9bb3e1a577fd1b749adf5a45e038b432cb6bd5b1f3a67ea5613f2a0335fc59a8d2e
-EBUILD libreoffice-9999.ebuild 18759 SHA256 7105ce13b237e5a3b31235cefa127f0d558fa61068db9b655e8d9889517c228e SHA512 095693d315b84824a11bfde67d43f6dff0fe4920b066e25718bad2df616a9431f85d6a7151efcde87c10e9354d08b1f0f24bf96ebc8ee8ae0e5bc84506e517ef WHIRLPOOL b07cef0c87ec7b2f77af0408fd844cd4a7c4daac046a6964b497ae3f433401598d363624ad2429d3af5865a1b85931a7d02cb4a883b1796dedfa975cf8dd2067
-MISC ChangeLog 8051 SHA256 21f19896ec6dee36a9faaf0f7f299bcee9e022b7104c2e877c16e0858806a58e SHA512 f799635cb871f5040d6e69177abce35930f41b4d52416b8287ef6d4ff2b30688d4a5acc8925c5cec7e72bd9cf2b5d61236244b0d378631c9bce7889c6416ccaa WHIRLPOOL a4229457ce0b93cfeb1503be42b6ad2cf56ee924889b95681659f8238f7c1b5ac7d83cf6ef0b24f7933ffe6d6378b512fb8931dbeb88b99294af50da002f34ac
+EBUILD libreoffice-9999.ebuild 18761 SHA256 cf7661486d6fdbf54dec58690576ded2b4ab6a3627ae745bbeaa8137ca89d992 SHA512 7937c6c32b13e5f4932ebaf0892762fca9fc19714f49225cd7fe4dbbf9cbe6061629f44f59d21622ec87d0fab9426271ffbd2e8d50d4cbbd6e36604ae74c2cc8 WHIRLPOOL 7a7404a8a6cd924ec1ae1d58d1f4dbfd9343d540a2b8bd213f6bd319f2e0fcbf32f5bc2108e8222c5fa6b4bed47bf529cc15328a4b16007edd846029a444e3c3
+MISC ChangeLog 8530 SHA256 d815f3531c5c1d59c568f41b738ea27bfdfca4e72fd91f1a4fa95d02bc0d8e84 SHA512 7da45c489ce3824a1db6dbc9b1ccbe64bb6f33c585e17eb0c33ff6709fb84ffb79db07a958656cbb36ecc6d9e5d3a17834617b6c3ad71e3113fe81d4fb8c28cf WHIRLPOOL 5e78d1e7296af0273a454545b02d1ed2ec2e010b2815b6c9d8e2db24677f0fa687074d34fd4abefa0912affce89b637ebb6bf8a1a0000a6e5e5d261654308cd1
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVhwwXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVotPyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5ExcQAJxXR6yytQfriscNoBoQuH2j
-Ju7TmxY64rFMzypS1kcgU9xYoHzJnMmE1JEvDB5x4BGTSwqAxywRNH/sID5hu02K
-qWdo3tYlR5f3mdrgPMoO/niMcybEzZ7VCUHiCyaCSAdnyjK3bs3DLu8jw3QG7mLr
-EiJEf8o6RP1OJ79A3DpftGhH/A8tEorONtqlnZVLNwbLfCHTtnv7z7sdzbeRjNCN
-BWVn0yxKKjB3Uz41z7HQ1WTqZOO7hZzRl4YmTLpoppXfA35nXYvX5CWXKUSmqCSN
-gWWZEunykTQZbhYPt05dyWEW2qHf/6I+HsUng3p4cEhQ+LiVpoUo8USbmeIFWstl
-vMCKLxBa2GvH3XD5xVkMEGKQzUmZHf9OxZJMvRMxbjEeeazpseAt8VwIsquW61L/
-0FIrugecQIF2nZCh8lTslcU7+2Mte5jhRDoAWFuAJS7mpuwqUjs2X9StGo3PNA9G
-bAjj8ZMq6ell6gyC0tM03Xih7vj6/qTBKjUQPuhL5shzwOMUEGE5G/SFHndCy6g2
-aXshsICJCVtEhm6Ef1xrgQdWEYHFeXMtuBuiH8/jb7SNMqn2L+KQYAJ4i56QiwBg
-iZJYaka3ZQTvORK7RiTnHuPYWHjrC8DQr4UOYAEQotfqe75Moajhn98mbd/k4N0K
-DRoj4g5hlB9xQSfEu0Je
-=xqzK
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d52DQP/3mL0QQYKn6JlNVF7NrxglSl
+5HnYA31ODxqZpLkNMH5LnAESKTJfLEqVjNRF0cm9QZ/hlkgfp5dgsmh19vMbMymp
+DiXRZ7hV4QkX84Ng42gTbkDeXEu1mMms0iS8ortycxoJiXpmLXkj1ufQRcDF+hs7
+Usa+yW2MxRRDcZoE5Yf2vUQ9AhgO3tBkybRXcxG16GP80WFK4DgSYHptXGfgBgkn
+M18YTx//LV+hesDoNAlFhz/Y2dZu7QxR413iIcCYjK4CUSyg175y6bK/Yb71SsQs
+JpVvNuO7BTgKwIg8fDpUULq5z1Qpu5U/NG1bShiLVAtPqWtF50U+yW67QlvrjLs1
+8Gybb7kBBwC/dzYT1yHZs2BbYOlGCSUjDDz40XyCQDuGvnU0zVAKWBUO7MxIVo31
+nUsEehNB/+c0d/B0o/s8a/pfPXrKpVCFaB7+Py8DLGpSWZGNXNwjZVr/r8fWeCs7
+hzqAqgwzZr99/RzlUcPcej8tD6zdVIarkv47A5MtHgTw/CH9O9suR9r1Cz7S+zl7
+V59f4fFH1QVHMmfkZ3F6M8OBNfoDEIsbSPXIvdTi/3w25DNtdDblBJIIqHVhv+aT
+xL0QSJnq4iFiHFWPBUjJfbWtd8+VlhFjqRUt4crcBPxfSUQJR95+jsGs4C6n9+fN
+O5n1+ZPd2S6qB/aUTAwi
+=Xz6m
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
new file mode 100644
index 000000000000..7cb33b98fd32
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
@@ -0,0 +1,212 @@
+Merged upstream commits:
+
+88e16529fc7b0e312b68e38295348c93b437aad8	"tdf#92110 KDE4: cleanup IsNativeControlSupported"
+57792314c7b05f71c66834ee47bfaa09003df765	"tdf#92115 KDE4: better listbox theming"
+
+
+diff -u b/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
+--- b/vcl/unx/kde4/KDESalGraphics.cxx
++++ b/vcl/unx/kde4/KDESalGraphics.cxx
+@@ -85,47 +85,43 @@
+ 
+ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part )
+ {
+-    if (type == CTRL_PUSHBUTTON) return true;
+-
+-    if (type == CTRL_MENUBAR) return true;
+-
+-    if (type == CTRL_MENU_POPUP) return true;
+-
+-    if (type == CTRL_EDITBOX) return true;
+-
+-    if (type == CTRL_COMBOBOX) return true;
+-
+-    if (type == CTRL_TOOLBAR) return true;
+-
+-    if (type == CTRL_CHECKBOX) return true;
+-
+-    if (type == CTRL_LISTBOX) return true;
+-
+-    if (type == CTRL_LISTNODE) return true;
+-
+-    if (type == CTRL_FRAME) return true;
+-
+-    if (type == CTRL_SCROLLBAR) return true;
+-
+-    if (type == CTRL_WINDOW_BACKGROUND) return true;
+-
+-    if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true;
+-
+-    // no spinbuttons for KDE, paint spinbox complete
+-    //if (type == CTRL_SPINBUTTONS) return true;
+-
+-    if (type == CTRL_GROUPBOX) return true;
+-
+-    if (type == CTRL_FIXEDLINE) return true;
+-
+-    if (type == CTRL_TOOLTIP) return true;
++    switch (type)
++    {
++        case CTRL_PUSHBUTTON:
++        case CTRL_RADIOBUTTON:
++        case CTRL_CHECKBOX:
++        case CTRL_TOOLTIP:
++        case CTRL_PROGRESS:
++        case CTRL_LISTNODE:
++            return (part == PART_ENTIRE_CONTROL);
++
++        case CTRL_MENUBAR:
++        case CTRL_MENU_POPUP:
++        case CTRL_EDITBOX:
++        case CTRL_COMBOBOX:
++        case CTRL_TOOLBAR:
++        case CTRL_FRAME:
++        case CTRL_SCROLLBAR:
++        case CTRL_WINDOW_BACKGROUND:
++        case CTRL_GROUPBOX:
++        case CTRL_FIXEDLINE:
++            return true;
++
++        case CTRL_LISTBOX:
++            return (part == PART_ENTIRE_CONTROL
++                 || part == PART_SUB_EDIT
++                 || part == PART_WINDOW
++                 || part == PART_BUTTON_DOWN);
+ 
+-    if (type == CTRL_RADIOBUTTON) return true;
++        case CTRL_SPINBOX:
++            return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
+ 
+-    if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA) )
+-        return true;
++        case CTRL_SLIDER:
++            return (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA);
+ 
+-    if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true;
++        default:
++            break;
++    }
+ 
+     return false;
+ }
+@@ -221,15 +217,15 @@
+                                         const ImplControlValue& value,
+                                         const OUString& )
+ {
+-    if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))
+-        lastPopupRect = QRect();
+-
+-    // put not implemented types here
+-    if (type == CTRL_SPINBUTTONS)
+-    {
++    bool nativeSupport = IsNativeControlSupported( type, part );
++    if( ! nativeSupport ) {
++        assert( ! nativeSupport && "drawNativeControl called without native support!" );
+         return false;
+     }
+ 
++    if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))
++        lastPopupRect = QRect();
++
+     bool returnVal = true;
+ 
+     QRect widgetRect = region2QRect(rControlRegion);
+@@ -414,24 +410,26 @@
+     }
+     else if (type == CTRL_LISTBOX)
+     {
+-        if( part == PART_WINDOW )
+-        {
+-            lcl_drawFrame( QStyle::PE_Frame, m_image,
+-                           vclStateValue2StateFlag(nControlState, value) );
+-        }
+-        else
+-        {
+-            QStyleOptionComboBox option;
+-            if (part == PART_SUB_EDIT)
+-            {
++        QStyleOptionComboBox option;
++        switch (part) {
++            case PART_WINDOW:
++                lcl_drawFrame( QStyle::PE_Frame, m_image,
++                               vclStateValue2StateFlag(nControlState, value) );
++                break;
++            case PART_SUB_EDIT:
+                 draw( QStyle::CE_ComboBoxLabel, &option, m_image,
+                       vclStateValue2StateFlag(nControlState, value) );
+-            }
+-            else
+-            {
++                break;
++            case PART_ENTIRE_CONTROL:
++                draw( QStyle::CC_ComboBox, &option, m_image,
++                      vclStateValue2StateFlag(nControlState, value) );
++                break;
++            case PART_BUTTON_DOWN:
++                m_image->fill( Qt::transparent );
++                option.subControls = QStyle::SC_ComboBoxArrow;
+                 draw( QStyle::CC_ComboBox, &option, m_image,
+                       vclStateValue2StateFlag(nControlState, value) );
+-            }
++                break;
+         }
+     }
+     else if (type == CTRL_LISTNODE)
+@@ -652,6 +650,12 @@
+                                              const OUString&,
+                                              Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
+ {
++    bool nativeSupport = IsNativeControlSupported( type, part );
++    if( ! nativeSupport ) {
++        assert( ! nativeSupport && "drawNativeControl called without native support!" );
++        return false;
++    }
++
+     bool retVal = false;
+ 
+     QRect boundingRect = region2QRect( controlRegion );
+@@ -733,8 +737,6 @@
+             {
+                 case PART_ENTIRE_CONTROL:
+                 {
+-                    int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
+-
+                     // find out the minimum size that should be used
+                     // assume contents is a text ling
+                     int nHeight = QApplication::fontMetrics().height();
+@@ -747,8 +749,10 @@
+                     // FIXME: why this difference between comboboxes and listboxes ?
+                     // because a combobox has a sub edit and that is positioned
+                     // inside the outer bordered control ?
+-                    if( type == CTRL_COMBOBOX )
++                    if( type == CTRL_COMBOBOX ) {
++                        int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
+                         contentRect.adjust(-size,-size,size,size);
++                    }
+                     retVal = true;
+                     break;
+                 }
+@@ -761,13 +765,22 @@
+                     retVal = true;
+                     break;
+                 case PART_SUB_EDIT:
++                {
+                     contentRect = QApplication::style()->subControlRect(
+                         QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxEditField );
+ 
+-                    contentRect.translate( boundingRect.left(), boundingRect.top() );
++                    int hmargin = QApplication::style()->pixelMetric(
++                            QStyle::PM_FocusFrameHMargin, &styleOption);
++                    int vmargin = QApplication::style()->pixelMetric(
++                            QStyle::PM_FocusFrameVMargin, &styleOption);
++
++                    contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );
++                    contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
++                    boundingRect = contentRect;
+ 
+                     retVal = true;
+                     break;
++                }
+                 case PART_WINDOW:
+                     retVal = true;
+                     break;
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
new file mode 100644
index 000000000000..2247781443bd
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
@@ -0,0 +1,76 @@
+From e7352d5ada69f212dc813c4cbd257d036e7a27c8 Mon Sep 17 00:00:00 2001
+From: Juergen Funk <juergen.funk_ml@cib.de>
+Date: Fri, 3 Jul 2015 08:33:03 +0200
+Subject: tdf#92517 KDE4-FileDialog: "Save as" has wrong Filter
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixing follow
+ - The order of calling: first should be set the filter, after
+   that can be set the current filter
+ - change the function from "setCurrentFilter" to "setCurrentItem"
+   When you set the filter over "setCurrentFilter" you need the full
+   search string "extention|description" e.g. "*.docx|Microsoft Word.."
+ - Not need the escape of slash (with that can not find
+   "Microsoft Word 2007/2010 XML (.docx))"
+
+Change-Id: Ie4f7d6fd619b391487ee944c3e745c855600ee54
+Reviewed-on: https://gerrit.libreoffice.org/16721
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
+(cherry picked from commit a93cfd5afb9072de00fc4b2a070f23ebdad6e4fe)
+Reviewed-on: https://gerrit.libreoffice.org/16890
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+
+diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
+index 4615bd4..a638955 100644
+--- a/vcl/unx/kde4/KDE4FilePicker.cxx
++++ b/vcl/unx/kde4/KDE4FilePicker.cxx
+@@ -250,6 +250,10 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
+ 
+     _dialog->clearFilter();
+     _dialog->setFilter(_filter);
++
++    if(!_currentFilter.isNull())
++        _dialog->filterWidget()->setCurrentItem(_currentFilter);
++
+     _dialog->filterWidget()->setEditable(false);
+ 
+     VCLKDEApplication::preDialogSetup();
+@@ -384,9 +388,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
+         return Q_EMIT setCurrentFilterSignal( title );
+     }
+ 
+-    QString t = toQString(title);
+-    t.replace("/", "\\/");
+-    _dialog->filterWidget()->setCurrentFilter(t);
++    _currentFilter = toQString(title);
+ }
+ 
+ OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
+@@ -633,6 +635,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
+     }
+ 
+     _filter.clear();
++    _currentFilter.clear();
+ 
+     // parameter checking
+     uno::Any arg;
+diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
+index 98e9af6..ff3a8602 100644
+--- a/vcl/unx/kde4/KDE4FilePicker.hxx
++++ b/vcl/unx/kde4/KDE4FilePicker.hxx
+@@ -66,6 +66,8 @@ protected:
+ 
+     //running filter string to add to dialog
+     QString _filter;
++    // string to set the current filter
++    QString _currentFilter;
+ 
+     //mapping of SAL control ID's to created custom controls
+     QHash<sal_Int16, QWidget*> _customWidgets;
+-- 
+cgit v0.10.2
+
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
new file mode 100644
index 000000000000..d0350e489697
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
@@ -0,0 +1,193 @@
+Merged upstream commits:
+
+6fc55b9abd783b624241d56e34751ea495adbd7d	"KDE4: actually apply file dialog operation mode"
+b613270a730ace29dd1b16b29be2222b34f34a5d	"KDE4: improve default load and save dialog titles"
+2b999dd6da5a90db66afe852a007fab8c62ffaec	"vcl: kde4: loplugin:staticmethods"
+3e8c14df67a43d3088ed7df0a2b0d96a4bc42d57	"tdf#92353 FileSave: Not confirmed for overwrite a file (unix)"
+
+
+diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
+--- b/vcl/unx/kde4/KDE4FilePicker.cxx
++++ b/vcl/unx/kde4/KDE4FilePicker.cxx
+@@ -58,6 +58,8 @@
+ 
+ #include "generic/geninst.h"
+ 
++#include "svids.hrc"
++
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::ui::dialogs;
+ using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
+@@ -109,7 +111,6 @@
+ 
+ KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
+     : KDE4FilePicker_Base(_helperMutex)
+-    , _resMgr( ResMgr::CreateResMgr("fps_office") )
+     , allowRemoteUrls( false )
+ {
+     _extraControls = new QWidget();
+@@ -128,8 +129,6 @@
+ #endif
+ 
+     setMultiSelectionMode( false );
+-    //default mode
+-    _dialog->setOperationMode(KFileDialog::Opening);
+ 
+     // XExecutableDialog functions
+     connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
+@@ -202,7 +201,6 @@
+         SalYieldMutexReleaser aReleaser;
+         return Q_EMIT cleanupProxySignal();
+     }
+-    delete _resMgr;
+     delete _dialog;
+ }
+ 
+@@ -524,6 +522,24 @@
+     return toOUString(label);
+ }
+ 
++QString KDE4FilePicker::getResString( sal_Int16 aRedId )
++{
++    QString aResString;
++
++    if( aRedId < 0 )
++        return aResString;
++
++    try
++    {
++        aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString());
++    }
++    catch(...)
++    {
++    }
++
++    return aResString.replace('~', '&');
++}
++
+ void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
+ {
+     QWidget* widget = 0;
+@@ -532,37 +548,37 @@
+     switch (controlId)
+     {
+         case CHECKBOX_AUTOEXTENSION:
+-            resId = STR_SVT_FILEPICKER_AUTO_EXTENSION;
++            resId = STR_FPICKER_AUTO_EXTENSION;
+             break;
+         case CHECKBOX_PASSWORD:
+-            resId = STR_SVT_FILEPICKER_PASSWORD;
++            resId = STR_FPICKER_PASSWORD;
+             break;
+         case CHECKBOX_FILTEROPTIONS:
+-            resId = STR_SVT_FILEPICKER_FILTER_OPTIONS;
++            resId = STR_FPICKER_FILTER_OPTIONS;
+             break;
+         case CHECKBOX_READONLY:
+-            resId = STR_SVT_FILEPICKER_READONLY;
++            resId = STR_FPICKER_READONLY;
+             break;
+         case CHECKBOX_LINK:
+-            resId = STR_SVT_FILEPICKER_INSERT_AS_LINK;
++            resId = STR_FPICKER_INSERT_AS_LINK;
+             break;
+         case CHECKBOX_PREVIEW:
+-            resId = STR_SVT_FILEPICKER_SHOW_PREVIEW;
++            resId = STR_FPICKER_SHOW_PREVIEW;
+             break;
+         case CHECKBOX_SELECTION:
+-            resId = STR_SVT_FILEPICKER_SELECTION;
++            resId = STR_FPICKER_SELECTION;
+             break;
+         case PUSHBUTTON_PLAY:
+-            resId = STR_SVT_FILEPICKER_PLAY;
++            resId = STR_FPICKER_PLAY;
+             break;
+         case LISTBOX_VERSION:
+-            resId = STR_SVT_FILEPICKER_VERSION;
++            resId = STR_FPICKER_VERSION;
+             break;
+         case LISTBOX_TEMPLATE:
+-            resId = STR_SVT_FILEPICKER_TEMPLATES;
++            resId = STR_FPICKER_TEMPLATES;
+             break;
+         case LISTBOX_IMAGE_TEMPLATE:
+-            resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE;
++            resId = STR_FPICKER_IMAGE_TEMPLATE;
+             break;
+         case LISTBOX_VERSION_LABEL:
+         case LISTBOX_TEMPLATE_LABEL:
+@@ -581,16 +597,7 @@
+         case CHECKBOX_PREVIEW:
+         case CHECKBOX_SELECTION:
+         {
+-            QString label;
+-
+-            if (_resMgr && resId != -1)
+-            {
+-                OUString s(ResId(resId, *_resMgr).toString());
+-                label = toQString(s);
+-                label.replace("~", "&");
+-            }
+-
+-            widget = new QCheckBox(label, _extraControls);
++            widget = new QCheckBox(getResString(resId), _extraControls);
+ 
+             // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify
+             // code, but the checkbox is hidden and ignored
+@@ -719,8 +726,23 @@
+                     1 );
+     }
+ 
+-    _dialog->setOperationMode(operationMode);
+-    _dialog->setConfirmOverwrite(true);
++    _dialog->setOperationMode( operationMode );
++
++    sal_Int16 resId = -1;
++    switch (_dialog->operationMode())
++    {
++    case KFileDialog::Opening:
++        resId = STR_FPICKER_OPEN;
++        break;
++    case KFileDialog::Saving:
++        resId = STR_FPICKER_SAVE;
++        _dialog->setConfirmOverwrite( true );
++        break;
++    default:
++        break;
++    }
++
++    _dialog->setCaption(getResString(resId));
+ }
+ 
+ void SAL_CALL KDE4FilePicker::cancel()
+diff -u b/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
+--- b/vcl/unx/kde4/KDE4FilePicker.hxx
++++ b/vcl/unx/kde4/KDE4FilePicker.hxx
+@@ -41,8 +41,6 @@
+ class QWidget;
+ class QLayout;
+ 
+-class ResMgr;
+-
+ typedef ::cppu::WeakComponentImplHelper5
+ <   ::com::sun::star::ui::dialogs::XFilePicker2
+ ,   ::com::sun::star::ui::dialogs::XFilePicker3
+@@ -61,8 +59,6 @@
+ 
+     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener;
+ 
+-    ResMgr *_resMgr;
+-
+     //the dialog to display
+     KFileDialog* _dialog;
+ 
+@@ -225,6 +221,8 @@
+     //add a custom control widget to the file dialog
+     void addCustomControl(sal_Int16 controlId);
+ 
++    static QString getResString( sal_Int16 aRedId );
++
+ private Q_SLOTS:
+     void cleanupProxy();
+     void checkProtocol();
diff --git a/app-office/libreoffice/libreoffice-4.4.4.3.ebuild b/app-office/libreoffice/libreoffice-4.4.4.3.ebuild
new file mode 100644
index 000000000000..8910174eb484
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.4.4.3.ebuild
@@ -0,0 +1,615 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.4.3.ebuild,v 1.1 2015/07/12 20:54:02 dilfridge Exp $
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.2
+	>=app-text/libebook-0.1.1
+	>=app-text/libetonyek-0.1.1
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.4
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	=app-text/libwps-0.3*
+	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.7*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d:0
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+		dev-java/tomcat-servlet-api:3.0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.11.2:=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+
+	# from master branch
+	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
+	"${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
+	"${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
+	"${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
+	"${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
+	"${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
+)
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+CHECKREQS_MEMORY="512M"
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	local pgslot
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+				; then
+			eerror "Compilation with gcc older than 4.6 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} < 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod mod2 dest tmplfile tmplname mypv
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		for mod in ${MODULES}; do
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+			git-r3_src_unpack
+			if [[ ${mod} != core ]]; then
+				mod2=${mod}
+				# mapping does not match on help
+				[[ ${mod} == help ]] && mod2="helpcontent2"
+				mkdir -p "${S}/${mod2}/" || die
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
+	fi
+}
+
+src_prepare() {
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	base_src_prepare
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		-i pyuno/source/module/uno.py \
+		-i pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e 's#all : build unitcheck#all : build#g' \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+			"
+		fi
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --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-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-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="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"/etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -rf "${ED}"/usr/share/mimelnk/
+
+	# FIXME: Hack add missing file
+	insinto /usr/$(get_libdir)/${PN}/program
+	doins "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index c3c64fc1311a..4a4eb1383a7c 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.15 2015/06/21 15:44:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.16 2015/07/12 20:54:02 dilfridge Exp $
 
 EAPI=5
 
@@ -246,10 +246,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 
 	# from master branch
+	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
 	"${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
 	"${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
-	"${FILESDIR}/${PN}-4.4.1.2-improve-KDE4FilePicker.patch"
-	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
+	"${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
+	"${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
+	"${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
 )
 
 REQUIRED_USE="
diff --git a/app-office/libreoffice/libreoffice-5.0.0.3.ebuild b/app-office/libreoffice/libreoffice-5.0.0.3.ebuild
new file mode 100644
index 000000000000..8ebde7bafd0e
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.0.3.ebuild
@@ -0,0 +1,609 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-5.0.0.3.ebuild,v 1.1 2015/07/12 20:54:02 dilfridge Exp $
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libabw-0.1.0
+	>=app-text/libexttextcat-3.2
+	>=app-text/libebook-0.1.1
+	>=app-text/libetonyek-0.1.2
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.5
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	=app-text/libwps-0.4*
+	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.7*
+	>=dev-libs/librevenge-0.0.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d:0
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/glew-1.10
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libvisio-0.1.0
+	>=net-misc/curl-7.21.4
+	net-libs/neon
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.10.0[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+		dev-java/tomcat-servlet-api:3.0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!<app-office/openoffice-bin-3.4.0-r1
+	!app-office/openoffice
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	#PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+	PDEPEND=">=app-office/libreoffice-l10n-4.4"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-0.12.0:=
+	media-libs/glm
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	gnome? ( gtk )
+	eds? ( gnome )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+CHECKREQS_MEMORY="512M"
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	local pgslot
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+				; then
+			eerror "Compilation with gcc older than 4.6 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} < 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local mod mod2 dest tmplfile tmplname mypv
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		for mod in ${MODULES}; do
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+			git-r3_src_unpack
+			if [[ ${mod} != core ]]; then
+				mod2=${mod}
+				# mapping does not match on help
+				[[ ${mod} == help ]] && mod2="helpcontent2"
+				mkdir -p "${S}/${mod2}/" || die
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
+	fi
+}
+
+src_prepare() {
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	base_src_prepare
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		-i pyuno/source/module/uno.py \
+		-i pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e 's#all : build unitcheck#all : build#g' \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+			"
+		fi
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --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-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--disable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-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="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+	rm -rf "${ED}"/etc/ || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files for support to old installs that can't parse mime
+	rm -rf "${ED}"/usr/share/mimelnk/
+
+	# FIXME: Hack add missing file
+	insinto /usr/$(get_libdir)/${PN}/program
+	doins "${S}"/instdir/program/libsaxlo.so
+
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a2b8c95fc353..08d3f54446a7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.36 2015/06/21 15:44:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.37 2015/07/12 20:54:02 dilfridge Exp $
 
 EAPI=5
 
@@ -99,7 +99,7 @@ COMMON_DEPEND="
 	>=app-text/hunspell-1.3.2-r3
 	app-text/mythes
 	>=app-text/libabw-0.1.0
-	>=app-text/libexttextcat-3.2
+	>=app-text/libexttextcat-3.4.4
 	>=app-text/libebook-0.1.1
 	>=app-text/libetonyek-0.1.2
 	app-text/liblangtag
author	Andreas Hüttel <dilfridge@gentoo.org>	2015-07-12 20:54:10 +0000
committer	Andreas Hüttel <dilfridge@gentoo.org>	2015-07-12 20:54:10 +0000
commit	f2f9ec9c9066904056a430ace840afcd1e989a7f (patch)
tree	9eee4e482dc8842f48726bfa4ca9ff35aa2042bb /app-office
parent	stable amd64; stable x86; fixed bad use of nonfatal, wrt bug 551184 (diff)
download	historical-f2f9ec9c9066904056a430ace840afcd1e989a7f.tar.gz historical-f2f9ec9c9066904056a430ace840afcd1e989a7f.tar.bz2 historical-f2f9ec9c9066904056a430ace840afcd1e989a7f.zip