Version bump to 4.0.5.2 and 4.1.1.2.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

7 files changed, 673 insertions, 41 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 6d2e1017de7b..789e9b89412c 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.500 2013/08/27 16:06:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.501 2013/08/30 08:34:47 scarabeus Exp $
+
+*libreoffice-4.0.5.2 (30 Aug 2013)
+*libreoffice-4.1.1.2 (30 Aug 2013)
+
+  30 Aug 2013; Tomáš Chvátal <scarabeus@gentoo.org> +libreoffice-4.0.5.2.ebuild,
+  +libreoffice-4.1.1.2.ebuild, -libreoffice-4.1.0.4.ebuild,
+  files/libreoffice-4.1.0.4-neon-build.patch, libreoffice-4.1.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Version bump to 4.0.5.2 and 4.1.1.2.
 
   27 Aug 2013; Michael Palimaka <kensington@gentoo.org>
   libreoffice-4.0.4.2.ebuild, libreoffice-4.0.9999.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e2af62b6620c..3051ec33711b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX generate_libreoffice_package.sh 5277 SHA256 06a94253abebb271cac57ffc4b76fb0b37abbaa757b0b3806f4ccf163268df3f SHA512 62849e519f90a27dfc79340ba676116688336a398cf1113480fbdfc084b02c554037231690d256b2f0e28168f89de436292d827cfd843b9871c10fa9e9e92778 WHIRLPOOL c04e0cbf07991ca446829696a3cd0232c152edea12ac7f71634f68932ea09594003dec1955f428a8acda9f517a994c7bd8f55b21bbb8a076816c8e031b6f0690
 AUX libreoffice-3.7-separate-checks.patch 1554 SHA256 d1128006f0e49cd0262a3c8e5f5251160929282cf65a5b560cde637346f7b724 SHA512 23f2d9587f5fdcfb1b59e9629d373b870a838003265cd48d88d1c6450e6d7e7bbb40df2b2ffc01efbe3cf14b9c5702174782797cfda152b7fcaa89eac7606314 WHIRLPOOL 0a3fe76cc8034a705a55886ac65242f3aa03a27d6905b7b1599295b97720321760884c2d2dedd6749d87dea9c769e34ade5f686e3c7e7d89900bec358f46ca04
 AUX libreoffice-3.7-system-pyuno.patch 1642 SHA256 191d2462c13947d63a3f2758ec26b4b5b7765d06f0454add1c471e9dccfa9016 SHA512 76d0b836f2b26c9cd3a0ad2b471d033c863ffc1eb593f28f1ebecaae30f205adb97b4b0a63483f93d2f32d5934480f580776e1ce83baf77e5bedee759112fb8d WHIRLPOOL efada275cfa123b2f3fd96a20057fab5a8f83c50e0d401df1af76d1eb017e5c7ceb74d0a5d8fd77352379be4a69b67f22d99a072213b5644012094a31f353da0
-AUX libreoffice-4.1.0.4-neon-build.patch 1017 SHA256 76a8d293b5221ef483e6cc5e641184bb9deca362c9105ad6b680b3bab1f5a1df SHA512 b76a80371cb72e0eca95b06cc1eecee6053c638e49fb3dbba1fcb67fcacbeac131c4ac8801d63b27337500df27b3eb40f5007dd0728a734f6ba602a095eb6e48 WHIRLPOOL 5c350626efb25e9ab0e6a6cc138e5c970c0678c495f8589f43d0f9b607cf2af39a5bcb655b69572a622ae2ccf1581c33c9d3b2f642892b271edf39267488ec52
+AUX libreoffice-4.1.0.4-neon-build.patch 1953 SHA256 c54c39eab184d7507d22f83769185f0c174a90589baa36fbd6a6474d14349a21 SHA512 0074a85db007e36e80319882a45cb3cc756038e66be5be69af73f4f86f8e49b5ced46d28574b3daa126ed66cb1908fd80d803274e083cbd5b79590c5ab3271c6 WHIRLPOOL b9ca8b66d19a27d0c8359ffb3ba77b1dc035ccae7acd4aef2a11ab32830a48197f4fc217cb3f15be35f0fc2a0e61feebd13dc1cbc5ca7359f94d39cdf06fa37b
 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
@@ -14,25 +14,34 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
 DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
 DIST libreoffice-4.0.4.2.tar.xz 104213468 SHA256 5336734757f721139d6615eefed0249be1461e428e2e64f592ce3c36a661b154 SHA512 4d9c14df08e713b7928660983243354afa524f0f24b9c6b7b40f4711396418d960103519851f3dbc4288576ec7276d4c8acfd1d5bb60a2663a663f008f274596 WHIRLPOOL e432c4a6b6a27a621578154aff607a077e8f1ae32743d3ea45565b0e5d08a1b57b975c631c807c3fb496b4e88a0859a3c2bd0dac60b80dc2ccdc6452a8808a5a
-DIST libreoffice-4.1.0.4.tar.xz 121670716 SHA256 8e42a149f37043f8a2e4456779324745621683c759bb451fcd69539f219d8075 SHA512 aff9ce62fc55f4cdbbb135b59575b7623d625db92e75e11cadf66be6c71d2aa7ec1b3fc4c413ac285ea9e8932bfc38751e4944ddf829e60d3714b598de01f09e WHIRLPOOL a822365245e75ae929ea33a7dd5b67fef5e68d5e2cc99b9abff95d028498fede5c1ed2eabbc1c9da2d4bbf191acb62cf029c10836cee46cca7fa6f50bcc28bd4
+DIST libreoffice-4.0.5.2.tar.xz 104673552 SHA256 8a222b7e8c67e58661da97e77e8ab62210e5f7c1ab1b31a83e5dc8b3540cafa4 SHA512 6e233e5687eb7886a6703d9ad4978ae1017dd552c08e695fd902827c9bf3077f87f8d319d99ce93a3bf648cb1eaca9888c09eb5b504ac7210b3fc7b6066f01e8 WHIRLPOOL ae644ee93c9d37935753f8519618f81ae9a7653a40a66a48cf21ab374e2e006382f3c002b861281a5759ba87d94b8ac855560d0373e3ab800aecf3dd32fcc4ac
+DIST libreoffice-4.1.1.2.tar.xz 121747824 SHA256 f62611bdd13f8197ebdaf8f2fa24a8d40d75de11c996f5280e8765377bb1ea03 SHA512 5c0c811e62d10eaa507df1510112c14330b0ced088edbbba65a0cbac01f808a0cd4a28347d4248cf7b319f27ca699dffdae89307b879eb9669fddb015d6c803b WHIRLPOOL 8ff25dd55c56fde003d9ed22bc961f9d621a6dbd7548073c6b902d63d5bddabb3affdbf7de2d3cf4b2a69472a735ede8a168182d6a10942326084394b0e8f986
 DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b
 DIST libreoffice-help-4.0.4.2.tar.xz 1855588 SHA256 9d7f732760b24b6916266903913d7684d9b933640174b1e041d729914beb5a4e SHA512 848329df801dfba2b06006325371e7a51354bebe0e99ba98aca14d3e3882de0ccde902b440cb1e47984585350f7e4f48b779b36281d9844251e802245633bd30 WHIRLPOOL a7048fbddaa81eb0c97f86902054195c66f84babe42ac1e088338ba019b07283a9049b70554800224ad50ee9097b2e57b4493527177a9599d9251c42894da20f
-DIST libreoffice-help-4.1.0.4.tar.xz 1847260 SHA256 273003ceb9758ab0f4ee1952b61f787353d55e059a93ff9ca4141a5d59d5e0a0 SHA512 e89a3038e868de63dbd1e6c333600717ad0a22276b371eea9ad8ff6748d5211e72356a01abcc87dfd463ba1029d7d74f383a9faa0250048042dccbca61ac7a3a WHIRLPOOL e26f92123914fcdba2dc7f9cdda8e810722b513f7409927f456f8c8f7638cd989199f7a7adcc054cac19bbad45f0b54ddc18519c7e62f475e7060d6818dc28f8
+DIST libreoffice-help-4.0.5.2.tar.xz 1858248 SHA256 eba8c993fb558eaf970a1411ad968b9bdcad12b528d4ecc306f6e5fc982c4b59 SHA512 48ec1aeded8df51eed64cd8ddc19c8d97820b483f7abcaec841f53fd69a97adb7454644b2b25052d8934d98b22701b1133ea8d418139265bebfe765fcf59bc28 WHIRLPOOL c243ab1834d8057bc52dacbb2b96936bc980dc5b2c52285a711a51a70f3bc7c3a0fb4b61cdf52cd0aa8a3b1de51e20f7cc7109c02edee10ad39bfc1b12531a49
+DIST libreoffice-help-4.1.1.2.tar.xz 1847556 SHA256 5391d0ff9f7e6bbb4517ec8fb192effeb8e93903b58f99f1411ebe4bd3048965 SHA512 4c2b69b171a079b1169a2474f4fa9ca3f8f2c04fd564f724ea55588596d140486eebd06150edfe3b9f01a6324d142aa0222cdfa4fe28e2fb1571091aca42e426 WHIRLPOOL 9380d858c77afaf3b97d755327f8760705c4e78fa6e2045b0721d39b97deb9aa7f14bdc846b4399e16ee7f4a1b8043e267e6a5aed9a3c46bbaf687ccd97e3e62
 EBUILD libreoffice-4.0.4.2.ebuild 17531 SHA256 79fb76dc340531f072546a2de2fe556c26b6716def3952bc714a72dce10bd2e8 SHA512 e8375e81006fd636e4130340600f6f4f1252394473681f5bf09c56878065128d1ec521cdddbe9ced8bd11a5d0239e3cbdc2db9d79421c4ecb81b1894caef1476 WHIRLPOOL b201e9eeeebf00ae04b01de50a8e568b8609486d2f1f2fa1842ddde88518504d4f3aa74b89fb7a62f2e9a1e1493981abc8b902ecd8f41e195d2c718de093ec40
+EBUILD libreoffice-4.0.5.2.ebuild 17581 SHA256 10056e914130862312a4ff68f4a5dcc18724e9d19977c6129dde392ba116316f SHA512 4a06b6887d8fb772f468c507c2fb04e3d09842df9588568e93a98f768fb724d87849e9197ccff3fe705a690c22daef5a84e1c531313a4af8487b1cae340c1c94 WHIRLPOOL 6855827e3bef38f1625e44039aa8a81ce1db3d70e71c3aafd55110b510b6b5842d073662067a7a1da36b8dff941f7dfdae5ee69c7ff7345f47e392bb1d46ed31
 EBUILD libreoffice-4.0.9999.ebuild 17538 SHA256 3256cf2c681fbbf08afe72246d0432fb112e7c82a2cb1689f4fdfe20635f9758 SHA512 ee9f1d9abf141aca8b9b0472c71feff6ccdda326aef74e23ad76963b9fe743a37c81cbe4cefd8994a9de4e1eba592d4c5829e689da2bcf05aa85998980d624db WHIRLPOOL 42184f9200b3db3de4e7c795bd5e5889f588811406267fae3fb7d19568e4f199d312d5c29987d36327c6ac42099a3b51b2e2f108f6218362d0b8ebf00d5bdee3
-EBUILD libreoffice-4.1.0.4.ebuild 17377 SHA256 2414585aaf388fed2a383cca51ee0e728872bbdec01b9e4abd513812464b8929 SHA512 4ab7e175e4484b1814d3abcceb5bb3fbab45c4d6fff5d1835ad90e6658b40a9d2922c84f578538db9de00741b3944912dad5811ad420c165d5e5d59686ae4e25 WHIRLPOOL 7971b065d018e803953bd23240316bfbe0e844f3c780d08306c497c9df693e78fbf3cfd9be15a3519de74573a515daf0d8817da8ea746454610a9d3d56369fa2
-EBUILD libreoffice-4.1.9999.ebuild 17286 SHA256 b7febf6bf87a1d2bbf347934609b23bdc7b58610c75cf4dfb6fcb1d42fa218f4 SHA512 f6a74507480ff054f505bbf99379859aaa1927d57dda430d59ec1e6a016b3c2733173385066ecae2ddbdd480f7dfd9198ff6d97429140a2ae1190634da9af476 WHIRLPOOL 10264aa1d8978d42a98a86982743f728959a402430d0d342f2751980e0dacc52db6b50b2ad000657774999b6d4f968e1c918fae636a931c0bc7988a799100583
-EBUILD libreoffice-9999-r2.ebuild 17407 SHA256 a3a95ddb34bb43d58b775cc72b58c7bc009992789964b528ce9e5aba70137646 SHA512 1d2ee8b8a864bdcf360ff6e93cefa18c2bd73ae15f72286909d7f62ef9d6acd6a0709ff637998f18bfda2dcf1e8043826dc47d9db8be10d5e1e0f4fc38374706 WHIRLPOOL 6214b9dac98d0d303bebe3b7456c6fd57a43c29470fb993e5f9c58ec66c77cf3ce3ffe5f0d7652266172e4a7dc62c1722ef129637bfa620c39dc21ea5530fb05
-MISC ChangeLog 90493 SHA256 ff6717671144e340ca0b6f68f21aa1c9a6c317830808f3982ee6e81cadf30423 SHA512 8874b48098e7223142848a673d9ee0f2c9baee30f3b539bf63165d0973a2b13e3d2bdb7e8083167f5c0255840459f778523f1997586a2fe6ed7c6910b98ae79a WHIRLPOOL 97d74bcd1a6d223eac7618e3a4fde9f392f31106b5bd16015408a7ee272419a32f316c025149cf4a1e1a9288bc0d3dc811ad19a1ab61145220360fa15b2fbbc8
+EBUILD libreoffice-4.1.1.2.ebuild 17402 SHA256 ca388f28498c0d6ca715c795b2619bea680df40c8f851cec272757fd34eeff9f SHA512 fca22fc8b2b14ce5c42d784e1157c010304bdbedc42e561081c3391289021dcc6d199f69400fbd66f342f176e85ee0dc20b1f778f2a5c1b795c7bda1edc32470 WHIRLPOOL 9de171bc6b9ffc9e1f2d34a55235eed443d686a8887a2ac8e00e4b9ecac9287715f9730100a3980b908217787aedb964bddbaa7e7f219ab8aa9533a986040dff
+EBUILD libreoffice-4.1.9999.ebuild 17358 SHA256 b8a172130e1a359ba3a68c38bffb52f55c7bf6cce9b1a3799d7b5f52c776f51c SHA512 aced1f20f58f04a6c4eba6e1f6e57c84974181cd8b633feb50842ecc90c112a0f16f50a6070c228b025a2b10aa959931976e373fa1ef068591fb5cb011a121d9 WHIRLPOOL 91b30079acdeca15b0cd19fe82bfacdd13bb8c612715d84b16e33bd3212099de32a890a28194e852e19a8be871d468db452daa3989f7f0a7310f19495cce7a4a
+EBUILD libreoffice-9999-r2.ebuild 17479 SHA256 fd3a0eb5d0ed460d23e5d3b9150c7fe4c669472da57048dd9b7ec890ac6183df SHA512 4882b421eb9378e36b32212e5497d188dcf1f462de7612288f45664ac5774905fe6515fed87a689250e205cb01d686e9be8d103851a5a4d018b6df75c0ed0fa8 WHIRLPOOL 8cc5d6c594ae7c092ffefaa283c197f9679c88c5de38243bfde5374d8c8edd971efc89db8d1b92cf5feb14fc0d68689f1b0ca86bedda9c5d01b8b84289c8ba07
+MISC ChangeLog 90852 SHA256 21c3b0445b9fd2a4fef9a43b32fcbfd106382e8fb84bd579aaa13af9790fd00c SHA512 a5ef3298ab9bbdbfea657f31da9bb870abf00ec92d5e475b308c0a8c34ac823b1379aa136dc2ff977c14afa84777e1284bb184f43cb2bf10a82e4d108309ea1d WHIRLPOOL 9b83387504081be990fac77739f068dedac726a5d18b7cac959bc40787b0d089d84dcd88b097c81f14abe0313998cb3e18a3e43c7c2bdd7f805aea7ce5a95cba
 MISC metadata.xml 981 SHA256 c691b5c7b0fc97292292144420e08b701a99e0c371c569f5e199f90e9a9459d8 SHA512 e25d86b1f2c00db10b08b4b55feca6f2821588bab530c4a15d1e3ada9c8cff33bdd0f343614d6bb26762d17d76a1e1edbd753067867a0c160942162e0559599b WHIRLPOOL 9cc92e58b31406290a09733f9801b035a21cd7989f398e25fdba30771bd190deb8c87a6b5af593212f1733ae2d2569afcd16cd605cb6dc13654fd7d4cafa1808
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSHM3dAAoJEMbwO6tnXQ0s4MAIALqJ4YCwrai8XPqaYAItGPQT
-12dqaZDwYtwhtw5tLwoCp7gr2wpqF0blKbk88cCzQky/GHPBrzLNLixvQ+JeqmT5
-Yoo1G8wLwmp+Me2JLWg2xSvmD+EFun1fLgBGBhHYDmjYp0wcc2DLFGy8+IaUrZeD
-kQntQMJZaasQiP7+lk4a5Kj4baebI2q5+XhDmVgUeLiQ0s5TmuZOaX7xll5RTwR3
-O8IfuLirgLpehrPXmtdODc0oUpXDgSPfLJRD2FXqjEUjzJXFRpP/vohnZrC8lK2s
-vYEyRKZh4HrggKUlJ2TGObStYNP8up4C7ljGc6leORG2XHOeTVIgIKVhXpV9q7U=
-=CC69
+iQIcBAEBCAAGBQJSIFlFAAoJEOSiRoyO7jvo49sP/2flpVrW+aoxHWUrAJHtGh4X
+FvtGFdhmCRFxiNheDxKTKi8wEGtAmeu84eTosXfaz6cLr8UbGZftxJC+9A1GvHR3
+hixGzi8CZwpz7QRw8uD5bV2J+dgWu2LpsPUrAECwKuc6tvuR0/OIj5ovA4shIbKz
+v0AZQ2VAJoWIx3CymRxSYzmjGHiaGRAFX8DIjnfjzu4AcDorQch0QUCbHRjzMlf3
++bw8jYnX4gUEOJwIbpHxxWOOQNpIgp8cV/DpFSfzhs60oYnUUbITCfoXO1CRA6EX
+FTL+DPGfQ8SacSrL04StHbXNjwq1kBQj1WpBI666a0xXDUu8p++lkPqLJkk0YftD
+igARlJ2hLbpdhIySe89zjLQOElWE5ekcFXGYMtXBdpQKiOsfwRxI84qPTgXvkYT6
+950koJhOI00ipjoC5mBefMDawGBagWPilKbxmIasR1yj/EqTtLqbJLXyO45xAiTA
+5F8A6MHLA6qWGuu659auxqEySwniZ1fmGkB8V13ZPayNJyQHtZfmFumXP/4AQaTv
+GJ3J0LEolMOqC+TmxLmFbPqfIF7q0ehX8mY1nq4M3bz1mIyumtP6Sb/q3zsqqs1J
+fJXqmQuqmJq0WQmsJifQlFZa3A7w3MC2dChhdR81jTM+dOG9FsQQprWL6FID5QFW
+KaBXTk8wDW0+ZbfNFMkA
+=gC0Z
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch b/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch
index 298e2228d8fa..94e858bde78b 100644
--- a/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch
+++ b/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch
@@ -1,27 +1,51 @@
---- ucb/source/ucp/webdav-neon/NeonSession.cxx
-+++ ucb/source/ucp/webdav-neon/NeonSession.cxx
-@@ -228,9 +228,6 @@
+From b74bf4146e866fbcd41ad075296c9a4eee16c829 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 12 Aug 2013 09:39:59 +0200
+Subject: [PATCH] only use the SSPI support with internal neon
+
+neon 0.30.0 has added support for SSPI (author of the commit is kso,
+which sounds familiar :-), so NE_FEATURE_SSPI is defined, but the
+signature of ne_auth_creds remains the same as before. That means that
+build with system neon 0.30.0 fails...
+---
+ RepositoryExternal.mk                      | 1 +
+ ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index f866957..8c19c27 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -867,6 +867,7 @@ ifeq ($(SYSTEM_NEON),YES)
+ define gb_LinkTarget__use_neon
+ $(call gb_LinkTarget_add_defs,$(1),\
+ 	-DNEON_VERSION=0x$(NEON_VERSION) \
++	-DSYSTEM_NEON \
+ )
+ $(call gb_LinkTarget_set_include,$(1),\
+ 	$$(INCLUDE) \
+diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
+index 34a1937..cee643a 100644
+--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
++++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
+@@ -228,7 +228,7 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
  }
  
  extern "C" int NeonSession_NeonAuth( void *       inUserData,
 -#ifdef NE_FEATURE_SSPI
--                                     const char * inAuthProtocol,
--#endif
++#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON
+                                      const char * inAuthProtocol,
+ #endif
                                       const char * inRealm,
-                                      int          attempt,
-                                      char *       inoutUserName,
-@@ -297,14 +294,6 @@
+@@ -297,7 +297,7 @@ extern "C" int NeonSession_NeonAuth( void *       inUserData,
  
      bool bCanUseSystemCreds = false;
  
 -#ifdef NE_FEATURE_SSPI
--    bCanUseSystemCreds
--        = (attempt == 0) && // avoid endless loops
--          ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
--          ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
--            ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) );
--#endif
--
-     int theRetVal = pListener->authenticate(
-                             OUString::createFromAscii( inRealm ),
-                             theSession->getHostName(),
++#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON
+     bCanUseSystemCreds
+         = (attempt == 0) && // avoid endless loops
+           ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
+-- 
+1.7.12.4
+
diff --git a/app-office/libreoffice/libreoffice-4.0.5.2.ebuild b/app-office/libreoffice/libreoffice-4.0.5.2.ebuild
new file mode 100644
index 000000000000..b6b0e708ac8d
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.0.5.2.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.5.2.ebuild,v 1.1 2013/08/30 08:34:47 scarabeus Exp $
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_3 )
+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.7.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${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}"
+
+# Help is used for the image generator
+# We can also build translations and others if needed.
+# Core must be first
+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
+				# core is now packed without it in the name, git reponame stay
+				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}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+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 +cups dbus debug eds gnome gstreamer +gtk
+jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"
+
+LO_EXTS="nlpsolver presenter-minimizer 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:
+# report-builder: missing java packages
+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 ~ppc ~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/libexttextcat-3.2
+	app-text/liblangtag
+	app-text/libmspub
+	app-text/libwpd:0.9[tools]
+	app-text/libwpg:0.2
+	>=app-text/libwps-0.2.2
+	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.3.1:0.3
+	dev-db/unixODBC
+	>=dev-libs/boost-1.46:=
+	dev-libs/expat
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1.1:=
+	=dev-libs/liborcus-0.3*
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d
+	>=dev-libs/redland-1.0.14[ssl]
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4
+	>=media-libs/libcdr-0.0.5
+	media-libs/libvisio
+	>=net-misc/curl-7.21.4
+	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
+	bluetooth? ( net-wireless/bluez )
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	gnome? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.24:2
+	)
+	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 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+		>=x11-libs/gtk+-2.24:2
+	)
+	webdav? ( net-libs/neon )
+"
+
+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-ttf
+	media-fonts/liberation-fonts
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="~app-office/libreoffice-l10n-${PV}"
+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/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.8.0
+	virtual/pkgconfig
+	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
+	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 )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.7-separate-checks.patch"
+	"${FILESDIR}/${PN}-4.1.0.4-neon-build.patch"
+)
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	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
+	if use postgres && has_version dev-db/postgresql-base; 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_PROJECT="${PN}/${mod}"
+			EGIT_SOURCEDIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+			EGIT_NOUNPACK="true"
+			git-2_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_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+	fi
+}
+
+src_prepare() {
+	# fixed in master, flags order in bridges compilation
+	filter-flags -fomit-frame-pointer
+
+	# optimization flags
+	export ARCH_FLAGS="${CXXFLAGS}"
+	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON="${PYTHON}"
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	# 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 scripting/source/pyprov/officehelper.py || 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
+	local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+	# recheck that there is some value in jobs
+	[[ -z ${jbs} ]] && jbs="1"
+
+	# 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-java-target-version=$(java-pkg_get-target)
+			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+		"
+
+		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-unix-qstart-libpng: use libpng splashscreen that is faster
+	# --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-pch: precompiled headers cause build crashes
+	# --disable-rpath: relative runtime path is not desired
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --disable-zenity: disable build icon
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-ext-report-builder: too much java packages pulled in
+	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-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--enable-unix-qstart-libpng \
+		--enable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-ext-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-pch \
+		--disable-rpath \
+		--disable-systray \
+		--disable-zenity \
+		--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=${jbs} \
+		--with-system-ucpp \
+		--with-unix-wrapper=libreoffice \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-afms \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-system-mozilla \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gtk) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mysql-connector) \
+		$(use_enable odk) \
+		$(use_enable opengl) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable telepathy) \
+		$(use_enable test linkoo) \
+		$(use_enable vba) \
+		$(use_enable webdav neon) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${internal_libs} \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# 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="${SOLARVER}/${INPATH}/res/img"
+		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."
+	)
+
+	# this is not a proper make script
+	make build || 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}
+	rm -rf "${ED}"/etc/
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+	fi
+
+	# symlink the nsplugin to proper location
+	use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+
+	# 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/
+}
+
+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
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+
+	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.1.0.4.ebuild b/app-office/libreoffice/libreoffice-4.1.1.2.ebuild
index 3f7489d59abd..4fa5413590f5 100644
--- a/app-office/libreoffice/libreoffice-4.1.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-4.1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.0.4.ebuild,v 1.4 2013/08/27 16:06:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.1.2.ebuild,v 1.1 2013/08/30 08:34:47 scarabeus Exp $
 
 EAPI=5
 
@@ -230,6 +230,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+	"${FILESDIR}/${PN}-4.1.0.4-neon-build.patch"
 )
 
 REQUIRED_USE="
@@ -355,7 +356,6 @@ src_prepare() {
 		# hack...
 		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
 	fi
-	epatch "${FILESDIR}/libreoffice-4.1.0.4-neon-build.patch" || die "Failed patching for neon"
 }
 
 src_configure() {
@@ -520,8 +520,11 @@ src_compile() {
 		[[ -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 build || die
+	make ${target} || die
 }
 
 src_test() {
diff --git a/app-office/libreoffice/libreoffice-4.1.9999.ebuild b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
index 0cbc0f0fe058..0573a1ed0dfb 100644
--- a/app-office/libreoffice/libreoffice-4.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.10 2013/08/27 16:06:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.11 2013/08/30 08:34:47 scarabeus Exp $
 
 EAPI=5
 
@@ -519,8 +519,11 @@ src_compile() {
 		[[ -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 build || die
+	make ${target} || die
 }
 
 src_test() {
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 256fa2e69aca..b5e5f7d79e2e 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.190 2013/08/27 16:06:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.191 2013/08/30 08:34:47 scarabeus Exp $
 
 EAPI=5
 
@@ -521,8 +521,11 @@ src_compile() {
 		[[ -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 build || die
+	make ${target} || die
 }
 
 src_test() {