Version bump to 3.6.1. Drop older. Stabilise 3.5.6 on amd64 x86 and ppc. Remove live 3.5 branch ebuild.

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

8 files changed, 45 insertions, 1205 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index dea8cc8bbdbe..fd471d46e43d 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.365 2012/08/25 08:43:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.366 2012/08/31 14:08:51 scarabeus Exp $
+
+*libreoffice-3.6.1.2 (31 Aug 2012)
+
+  31 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libreoffice-3.6.1.2.ebuild,
+  -files/libreoffice-3.6.0-kde-fpicker.patch,
+  -files/libreoffice-3.6.0-mysql-as-needed.patch, -libreoffice-3.5.5.3.ebuild,
+  -libreoffice-3.5.9999.ebuild, -libreoffice-3.6.0.4.ebuild,
+  libreoffice-3.5.6.2.ebuild:
+  Version bump to 3.6.1. Drop older. Stabilise 3.5.6 on amd64 x86 and ppc.
+  Remove live 3.5 branch ebuild.
 
   25 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.9999.ebuild,
   libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 21e7ef75c687..ccaff1fcf1d1 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,8 +7,6 @@ AUX libreoffice-3.5-hebrew-icu49.patch 5661 SHA256 169ec723b1453b932deefafada3e4
 AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724 SHA512 3fdeaaffc82e2b43ba162b45866c0bb795b23b6be671f4bdc71459d9ab169fd62487d9339c7d6e8dc4721d567027c049b861ddf56cb097594641b0bf357c7c42 WHIRLPOOL c55ff6ff62b63ccfc4fec7f21ac01bafa21d2228897cda2d3033738a31fd99159a717d463228ba3843f9a45edba87a5a07be9d3d83a0b00f3a763598affe56bd
 AUX libreoffice-3.5.4-libexttextcat.patch 910 SHA256 5e2acf868f511d8937d6551b6fe52e73e808082cc5bf327815a95c8fe4c9a6d2 SHA512 eb3ac4eff756812d3b2a149f30a98501abc625b2177bfed73bb35ab37bfbf09fd3c214aa58fa29b0a4bdc38788dfdb625aa48ba9dc5d05b971bfe4f06a1bc129 WHIRLPOOL 7f1a771765296cce6c38eaec6c2abf50913355cf1d2909fbd51636045c8ac38bdd05dd2cf54edfffeab5c904c2de1de5be57b1347961c55fee937c90afd0758f
 AUX libreoffice-3.6-system-pyuno.patch 1628 SHA256 25f319caed7205e06d4b9e17a45ab268a2ac67846c4e02442a15acc540266a5b SHA512 e7eb2c26932dd3fdff22c0c72a28542a42c26fc04a0fcc2a813e7b4d7fe642f211a395d41042cfc735670127a81104fcc2a4b845a59235a4d7924db2659916b0 WHIRLPOOL 09863ef7c67e8ed5d3edfd758fcdebd3ad785d3f82de47b9f1cc60d41cc18a56973515088abe9a4584311b551073b0db8bdd7e74fb72a81576a5a0d71c900998
-AUX libreoffice-3.6.0-kde-fpicker.patch 1586 SHA256 03d091f549e5a7d7ba72f523c7d0e8d3e753e3e1b02494ec4dd6b276cc2566c8 SHA512 8a319daf33cb3ffe76012891bade9038cea2acce49a8927a487d54178b5b52989046db52bf3da9341f73ce88dceb7e0d724c4e99b61a560a9cd110434e26ef02 WHIRLPOOL 3e4585b0a6c253c6e82a9a4a946ac205cb15354a9a2c1ef337b20c46ee090bbbd5ac1144e93e41d61fe03d0cc263e1da212f05afb41b0f0d7f940360088e1dbd
-AUX libreoffice-3.6.0-mysql-as-needed.patch 1395 SHA256 c5d26597d9de043f7b8b64abb5ea4a8c2c4dac4c3622f9387e3f43365ad90464 SHA512 09f5ee6e20adc3700ab9fc929b75e021d4394aa95302c6f3cfa8dbcd9946ad41f1e5668877628304a0f430dab8c7867347925d7373700827246fc24acc6119e9 WHIRLPOOL 0f7a6dbdec2b539bdfe940e45d0366190238bf2ff49ff2f335ae1a1c15692e3dcb536d411a7e4f5b0a5e2b608ad98746569971b97651349dd19ec9ca64ac189e
 AUX libreoffice-system-pyuno.patch 1634 SHA256 8a45fe2d6eb9b9a529c9f237b7219b221296d270caa7d42d4ea1a47c5e30841f SHA512 30d6ea3e648ce21e2e9cabf8b1ffc05e7a97ac691fadc56d02f9fa32df914628735fce2101abc1e30b5a31967f3ce124a85ecb481041b9f61713acd9d9489220 WHIRLPOOL c2f10535ed97b9eb5fa9f271ff4c9ad8b552595f58234899d2b5091daacc4444532bdee1d2ec2bd24f0ce601f0e5b5ce408fcbe169e21184f263c7bac86bfa69
 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
@@ -18,39 +16,34 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825 SHA512 bba2fe76d09e3ab99b170685525ceb4ce8ce8d95ffa0df97c05ce18cd7edbe73028861e19c501bf00db369d36f43fe274d4220ad046518d89737249f61c7cf3a WHIRLPOOL 2dd0924defb85dc6a266126fdaabc29f051ccf525d1e1e7a5f74db19f162ee2d17f98ae96fd832dbd1600c006e277b75a4d88d9b3128c7ec9e2365a6704d32e9
 DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
-DIST libreoffice-binfilter-3.5.5.3.tar.xz 5983952 SHA256 e6a68f304debdfd2fdb5bfcc6779557be7b88188d71ccbd1e105c6cdb550816e SHA512 b89b549ce837189500228feab360ae6298f2ef1388a153aec3fad59afa19766d08494a9d005aaef0bf7e1f6faac9c25b79ca92c2d341b7abca63aff7ee23dc3e WHIRLPOOL 2dde0e91b5a22abefbf7fcbd91cdcde09ff9082443e9d6b798025a739a45f43f5ac1f20286ff39b7def244b366211c9f52ecbea891f2a99b9662f18c727e66ba
 DIST libreoffice-binfilter-3.5.6.2.tar.xz 5982612 SHA256 58c4607ec32a7a0618cd03c439ff6188f1467ccd8a4ff2227b2f681092d5b936 SHA512 c6337fdefbb906c974e64e948899f91553493986eac236548cb40f1ce882706b379add23eaceff4ad3637d738f8741d7e8cbfc6fb54d541fbd6e92d01b95ea04 WHIRLPOOL 158eb39e2db2d328a32263800a6cd8eda0fe7e1bbe00675698b367137209e28c5c572ca9050c84aa2e57640dee04ab01622b91edc6392b3360144218612657ba
-DIST libreoffice-binfilter-3.6.0.4.tar.xz 5979928 SHA256 8f58af5c3fec6c797907f4e1d8621ac152bf4cf8018b8cff0668000d2010630e SHA512 45b43145dadd81bb9fbcd9ec5a64239ff0d393139cfd167c352bf570d1477520e4e240d915cefbd33267a1393af45dedfe69d02b0efbf705be0718be7ffbbb76 WHIRLPOOL 98f5d1c884e97bddb57480d561b1f8e6e3e109ff6c5a97c413af78e90fe8f0b25e815df78f4fe09ec8d177d1db1aee69abcaef95c0317644085693ca87fc1825
+DIST libreoffice-binfilter-3.6.1.2.tar.xz 5979484 SHA256 fa64c070dca5eea80c909ea4598b5dba2b30c24d184b58201081e5b9db1bd405 SHA512 1670fb59f7c368592ad281023ed2937db8d41448c3395c27934b0a438f57cd15d85258d474a148119f546106408458727318a732528910d4d84728cbe43cf47e WHIRLPOOL 936cca7af8e4099039f2186da1ee81383a388eaa4ac261bef2c93d9969718feb1a79fced0fa6d442196d6b5b5e39cc0a1ad5a9fc1e651bd5299602cafb68eb6c
 DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63 SHA512 a915973e1566414fd8fdae67ccaf426a9543cfa4f2549b39e7da0146c975d568d2e222835a259f4bbe6d36979b956cf65a7d28c7a5b3a7b8858e8f731acf33d9 WHIRLPOOL c2beb6b4220a99820eade85784638b883ea3b9293f6714bcce65dcb91fd617a1712a19327377d5fa1c33ac7b402749e8a29daa72f9ea9672d24607ce27cb82fc
 DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
-DIST libreoffice-core-3.5.5.3.tar.xz 102661852 SHA256 65e4d05ff6b4ea54243f3e50f571df7c8dc636f5b005d844417bf69ebc17516c SHA512 4a54cecc29aaf82b3183daed413bcfb1a91c2c91ac03b5f564116ee7ed152dfb18b9580807ff01ea0b6144d1922fd9f811bbb84df656898c3901e45fdffccd31 WHIRLPOOL 6df5f74950ec652cb2f561bac2edb884fcbd7a3bcb81cefbbdb35df101fc38d6469c12d3d8a0c303bc5bd66e351ac7f0d4047b1ba152eb421fb7a741101c6e09
 DIST libreoffice-core-3.5.6.2.tar.xz 102714756 SHA256 0c0624aca649ab9d86aa3e35584ebeb648fe6e06d82a16c727fad2c56cb6c509 SHA512 fc0f399346b8ae7b235123f12c6c2addf78b25f1c3f03b7fb168089183b7153575f92823425154d5f4e15d79e704213ac834c1165d2393372a7921de8fea603a WHIRLPOOL bc2f214cc79efbe80fe664ebc3f767341aa7b546f31d9965bac80a23440bc8acfd7ea0c4693462421f222483a670d19d2805e7b0556f30b61f1adad79d72938e
-DIST libreoffice-core-3.6.0.4.tar.xz 107125460 SHA256 b301eac605830ed6423cbab49d99ff5ca3999ed8ad53f51766c715d49d09cd4d SHA512 2ebb55ea31115637d241c3df4a255575dcbdb19503c573e6dbbe271f1daa16bc3349675403cfa94bb4d35c46598c3f32df6b410cba20d8d68fb5f647c5eca1fc WHIRLPOOL 80e90d83dc64649beead91788da00145286db31bb69ff7862e36eb264525727256d4c0c1926ffeaf5a04f53e429fde0291943c87e4d7207df91e0257c10c2370
-DIST libreoffice-help-3.5.5.3.tar.xz 1856804 SHA256 62631206eb03de10d24295e2126011aa410b1d09881c31deb7fb72459e3209e7 SHA512 f7a35bbbae652e68739eb19179ea142133cac3261d3edc1d91e6d1b3c19c576122f6ba6676ae64cca3f2bb46127431696262a56623642c5fa0045403ee53eb62 WHIRLPOOL cdd7c421a5fd3e153c72e3cc218e74abeb006d05e0399605d8aef2769f7aca572412646ff50195a3970aaf0e898527e67e5fc1006bf44356e3b0e49226933413
+DIST libreoffice-core-3.6.1.2.tar.xz 107175952 SHA256 037a89a6867f2483898e73507b293296e99f899ea4dab2c37ce3061ff707ec8b SHA512 fb1a30fb7989057c3ca124ae6795d21292f007206d925331dc97d8c8ef1752ba359c3aabeca61d2a2a37283d53f2b1dae22b3a2f51ccdc90827590b54d8a97bc WHIRLPOOL 7f23fd65cbeb729597f23054d94d2bcaa453782cca1dd202a7c7558ad723c00340135612e9afb378c2a46a59cbcf0d254d066a3bee610c8e43b3244a344f6ed3
 DIST libreoffice-help-3.5.6.2.tar.xz 1856988 SHA256 05840501d0ad959de0ea907c067f8e6c4c91397cba49b54c8ea8a0f0d01fba22 SHA512 1fa1a202f6e975dc6baedec7cbbe6f98ee365bc87ac052eec1559db91984eee552a44b5ed09cf6d574fa002d95189ac7ea30556e829f994fd195d62447a1e35e WHIRLPOOL 516c7848fd077b4962cc703ebf314676424255aa921babefd43c4e710ed2fe33d2a8e6330e491623015d6ae26bfb0d84c9a8cec62eead4f8a42839223969dd86
-DIST libreoffice-help-3.6.0.4.tar.xz 1863972 SHA256 30b79e3b4cb5b2167d1f3c17b8781e8940665f861197ee9021a6ac8c64d508f8 SHA512 f6fe9296c605999634b484de4a62e7665dae8353d8c5dc20595036b1cc87d51750f6b2eedcae70c4739993337a8ec22de6cf3046d0a15f8669464247e6da1745 WHIRLPOOL 8237777a6bcaf15d875f8cdc909f401906902a5670f2e2097376a90ceb74bd116d42a258faafba563317b7b1e9469b6fdaf1ffa71d95c9d3447d25cfdaf3f6b5
-EBUILD libreoffice-3.5.5.3.ebuild 15651 SHA256 2d917faf6e64025100fc3913d5709d995ecd608b65c977d029e789dfe0ac9d12 SHA512 c45a9848e807334c62b0e3ee537bbf96b4c5fae01756364c02e67b5c4cfc8ab53b5613408f7aa82e1e534ae54d56d375538210bd1cfea20e3375196f424f3364 WHIRLPOOL 63957862d965632f8f60a5fe2a4b1f5d86202f652e4bf5156f0ae62e333656c5c7f5b59dc74de1de4fbaa8805549afbf3e667f00e8c7fd31b3bd1db78472aaa7
-EBUILD libreoffice-3.5.6.2.ebuild 15675 SHA256 0ff64a9e829eb123ebfba0d0af8ee618d70b5338cb95c56550203f33f64c7828 SHA512 e42c53704f74e4f40917ed9580edf5212c7d1953fbb66e408c8413c988b028f15932bff886c5883a7a507b899ed0d8e1e1bff3cd72b3f30264aa45425f657a1f WHIRLPOOL 8d142a2e607913b996048aa9da67e75057750f06d641640ee32f933530ea750cbbfda52d81e597a3ab8a58ff76b0d955a94f8b92a83ab04d7a017d5e60936edb
-EBUILD libreoffice-3.5.9999.ebuild 15670 SHA256 f2d0a3bab81902be7835260cfbb407b6cfd42dc7ea48d9bd5bd28bdba2cb3e9f SHA512 60a35d57ff539082d5478b1acb1813c3c38402ab4019c36ef07f11c9b7cd81c7f9ef43cf256fff1f9df7c984d5383c97e5e7b386b54fb67673975c3145498981 WHIRLPOOL 4073a2bb78ec8ece3effe3cdeb020aa400d03aca7657f8ace5352123472665e82a0c68940f48965dbf8e270d01891d375cd44216520417ba09cdd264cb430092
-EBUILD libreoffice-3.6.0.4.ebuild 17565 SHA256 d2e6048513c38c3c4599cb5e62a32d593ab41bda7097b7e242d4cef5ff2bb001 SHA512 fae1a0a5e6c46d2d3858ee36232793b8546726517c4495975cc4da91c450659f5c92e74fb16a455dfc69d500e954bb3352b0f2ba3a2fda2f0dbb9bb23eb97192 WHIRLPOOL 2fc351b1844011d82265173bddf0be1ae1a411e604c7d10a750df6cd2e740b0ebc0c5d2329638bdcef5d3abc613a479cb6d4d30635815cc7c556d43814b1daf6
+DIST libreoffice-help-3.6.1.2.tar.xz 1863760 SHA256 41672c3548f95ff8ad3b491b0ff7d814a6a77f82b94e3adfcebb5538f3a0a349 SHA512 157352376c5811b8b9fa1141e1134c289f79a7f412b10500b0150cffe6d492198e6502d2a952e0e63c22bda88ade83a53357d40edc3543bc145450c9b5e9f26d WHIRLPOOL db2193440d3bb5a0fa7e13dd9af39f196aefbd5c7ff9d4d55fd0f4e4beb61b5727c8451c5b001087d2fa7f92ce3fc61848e97d2d3020c2a2cb2be0cb3be414ea
+EBUILD libreoffice-3.5.6.2.ebuild 15672 SHA256 50964a32b3ccda096c43a01cf804b69f83807eef4ad3a791469250c25a40da6b SHA512 8ba424c19b59149b3f0b5635e99256a66d80dc6269eb14da1065ec126ef98a77c425c0d5424955cbb6ca1779d05f4be5a662838e65367e5a8c9dbbf4b90fe949 WHIRLPOOL 46172d9c9efa07f7254c9f5055da2e7f1c43c13574c5f706ea1610f89ff667091e0be40066ec0504f01135c1ab55d2635cf2618386e617de92a0bb9263f3c53d
+EBUILD libreoffice-3.6.1.2.ebuild 17486 SHA256 0c97264db183b066817cb97616ea243916a76e4686f2eeef24f8fec3a2fe53fb SHA512 5662728a4c0584c6b9ec3ab0107ef3d732dc5f614fb51000b4be3be7043e539a273665ae07831256693b77f2d886dd857c2edefbe811c5c7e70c69fee92ac88e WHIRLPOOL a1258c8bf51f78af398df5a97c54ed438e4bea37d0b44ae7516112659df317ecc56cfe361fb4c62a7d0b6d2802e398633550c05b2259d9edb1fad7d466a359be
 EBUILD libreoffice-3.6.9999.ebuild 17487 SHA256 7332d58083d07e63b1204529dba421c6e5aa0236f4584edb89bf719be777051d SHA512 d851a8f5fbd463cc58efbccca4e96bb7fed09e0b69723ef56a05a13545d54480b7010f6c95ed3dcf2c0641a00f383c76459e140328dc71eec77b2ddc9ed63719 WHIRLPOOL 9d740828849a0a51c3b068643c1eba91658d279637a83efe2585e3fc119765cc1b42df7a5d10d247b5937ba200cabbbe0a6d8f74071b2b44d8daa228dc5c5d51
 EBUILD libreoffice-9999-r2.ebuild 17693 SHA256 d82e06ec445d17a5ee7cbb9edf442120b83f74711d3cfee193bd7b9446add3e8 SHA512 61af0062e9bd28ba20701668957f4c8ffaef284cee3ef194d2c09d62457902f771032454bf0e3de03d0122a701ed7207c86829e6b5d4a773aa4a49d1841c002b WHIRLPOOL 6330435e2ca01cd2f2c3572f0742f4312625e84c4d4984cfc10ff89ea03bf1fa6fbc349ca6a0c5eaefada200295aab337c41a0c12850812d9fe1068ea0134e4a
-MISC ChangeLog 66955 SHA256 7aeeaf5b75fc503d0d7002a6dc5bd9dd59eddd1a81598944b63b4899a434a087 SHA512 353d0862db3fccf0a2ca31f7ead55850e797da72b13e37fb990f6cd98f9696931c03b023eea49d3a69c7fb805470c6f5cb6e72ffceb2c58bed11e0cc25d817f6 WHIRLPOOL 0e3a5f97576da71dd91502c7a2e48f1b1045cdbcf9a43fafd97c55b62a84cb16b673e29423c8ed4ffb4ad72b49e570ffbec6c5e39f92eeccbefd4e35c3ac749e
+MISC ChangeLog 67400 SHA256 c80c47ad39c5dcf29160823c4986a3303b9c72294f7bf279f961dc553415d70b SHA512 c77a058b2e37778f2b539b60b4c4ef034cdd5862c438bc1030716066282e4dff2c5532338539f7f699f8ae26e19dbde333d1046ae41c2ae91e6350aa492373a3 WHIRLPOOL 60975d3a120d203dc761c6cd23373cf1b32e4801b62ef38aa8975d37c608eb081b47f92d234aaf6088b480ba50974440dbf51f7a615f2dd127e997730d208c35
 MISC metadata.xml 1534 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401 SHA512 6e07d86c7aef51c72303ae0f41c49ebc9f0bb89d9bc176822c50a2f73684253c16acf718caef6bfe8bd072ae9e987235e0181806fb0989319ea40e894fa2ea39 WHIRLPOOL 4708c3823f88598934b7ffdcc5f02c8a1427e6d06d3424634042e22527f9e16786a45114ea6010fa085ae25170b8ca241a8f2741d522f159b563d511977d521f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQOJAyAAoJEOSiRoyO7jvoeVcP/3MBzo3G9EzT6ThYdM2ZaJnG
-KuMFcLpDauznv0OFBwXhYbizcmsgbUHabkFfKDYWCu+IUK3BJ/H7UizdZCahckk9
-ZK3reDtU4ogs41GABhhP9CEO8D5zZ62gBJ2kRhhFoNlLu7uENlGZvgYKUeZ1ug6x
-mbHP0mivNHRaIbNbLBNMSPIkLUlkkTaAtVJmjQgpy6YBExBw6yCNI/I+G1/lCWQz
-u3ElVaXqPZOyGFyZQP72kHcrfAkEVLwxJ/ZWsSdXIBluIzZsR0aBCSXQB/loTla3
-M8WlJBSf59nsPf3yuC72a+zILjPLSFYCp/+pKHaEgBsPMzMnvjJplmT8ccDVoN5N
-c4ilz+YgoiisVLCp3S1nQrrgi7BZHtc/LRcntYKbgeoVzCUXPO6XRPx4ZtR1eFlf
-PnhsH7qPi1sHMHpIcnuYQooOCSOox03ER8hHz97iuU7x52jmFX2yuXy8NhRl/3Ys
-oGOeKWrg9vrNW+0HnPrGkT8CNYiIuHvW3BXJBzzVvwentZUs1fDaCmJPDS25RSul
-q7kSsQAGuLkgulzpX4a8f3dcDY24N1csRPhKcgoFJrw6i1nkaVF/KqNnDi0c5YuZ
-QK1XPIoLXrsk7mk8djd3v7sugQ4CobokOOjEFnB+nNIXiOG0g5waL5ip8SVuEqOU
-ApIO0S7cbS71AHy35pgF
-=H3m9
+iQIcBAEBCAAGBQJQQMWGAAoJEOSiRoyO7jvoYVgQAIFqR6aCOLSEwYlXLEtv87a6
+wRAn5uW5/eJdU033maa8HvvVS+CMPGhBxKxmQ/xXOqB10GDsWYkc16MP5FBuQpRz
+LxcdSqo6gGZtoqX5y3zYni8FP2a3oMTaUyRSMKRxFoh3SNukxjdr0AiL2r+gAYcE
+X0CrSRyoLIue6moUd4/0wGFkoajPTiDzGLZyzQBEQWPxm/zjavBydBPRsb8KSAVA
+hejgkjxfR+GN5r0TpPXT7Hjr+AxGNz/+iCF/dTgL7BZ9Fjymzpe4gVD4/cuUqGAW
+TTIgYHkFV9WWrSHyvDvwccFD03T5Fl4XfMLsQ6zqzMre5uV5O1iL0YWiyhztgm7r
+e1JK4lPOH5F/q2stZc616k2JoqpFJfNQjC5TAmJIC0Qu93zEtEO3Zq88YfVorCCy
+SMHtm+lCe5Lvl4fjLQ7igG+pwAd3FS7MRvKChWtvHBeIKuulsI/7vNwURQjWkvU8
+qd1hRzHxJzz99YjRSq9OfmOnzXTCIvyrA67VmY/4ftnKcnZ1XAQFAG4XylqNNbz9
+Aalzp+wQTiwDzWRDcmNQyTfZIRXZ3R5k3g/vZWEeYHLb7SW4qpLRrK4vK3/h2uQi
+Yzj3fHlqGrIrzYRMUynKEJfc+8DQCrOUmZUY+LkaJQlZq8V4WVk/o3RStPlGYav2
+bNdvMCr5dahZcLTrvp6F
+=GSsU
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-3.6.0-kde-fpicker.patch b/app-office/libreoffice/files/libreoffice-3.6.0-kde-fpicker.patch
deleted file mode 100644
index 9ce7a75e86a3..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.6.0-kde-fpicker.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c921fc0ae2b20de1953e7558fce6b9ddb94c56d3 Mon Sep 17 00:00:00 2001
-From: Luboš Luňák <l.lunak@suse.cz>
-Date: Wed, 01 Aug 2012 09:11:44 +0000
-Subject: do not let LO's autoextension handling interfere with KFileDialog's(fdo#52546)
-
-Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5
-Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
----
-diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
-index df08ed7..4917bf7 100644
---- a/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 )
-         switch (controlId)
-         {
-             case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
--            // we ignore this one and rely on KFileDialog to provide the function,
--            // always return true, here meaning "it's been taken care of"
--                res = uno::Any( true );
-+            // We ignore this one and rely on KFileDialog to provide the function.
-+            // Always return false, to pretend we do not support this, otherwise
-+            // LO core would try to be smart and cut the extension in some places,
-+            // interfering with KFileDialog's handling of it. KFileDialog also
-+            // saves the value of the setting, so LO core is not needed for that either.
-+                res = uno::Any( false );
-                 break;
-             case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
-             case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS:
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/files/libreoffice-3.6.0-mysql-as-needed.patch b/app-office/libreoffice/files/libreoffice-3.6.0-mysql-as-needed.patch
deleted file mode 100644
index f53ec26c45c0..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.6.0-mysql-as-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 130a064c29f218699c0b64b50367b3ddd3a3d2db Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <tchvatal@suse.cz>
-Date: Wed, 08 Aug 2012 19:10:17 +0000
-Subject: Use LIBS not LDFLAGS to not fail with enforced as-needed.
-
-Change-Id: Ia27e97c12e9a8f36e106c9ae3c399cd776433387
-(cherry picked from commit 0c7617a388d8e2e3a0d6c451b6412a5d32dd3d6e)
-
-Signed-off-by: Michael Stahl <mstahl@redhat.com>
----
-diff --git a/configure.in b/configure.in
-index 2dd9390..444cf82 100644
---- a/configure.in
-+++ b/configure.in
-@@ -6833,8 +6833,8 @@ if test "$ENABLE_MYSQLC" = "YES"; then
-                     [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
-         AC_CHECK_LIB([mysqlcppconn], [main], [:],
-                     [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
--        save_LDFLAGS=$LDFLAGS
--        LDFLAGS="$LDFLAGS -lmysqlcppconn"
-+        save_LIBS=$LIBS
-+        LIBS="$LIBS -lmysqlcppconn"
-         AC_MSG_CHECKING([version])
-         AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <mysql_driver.h>
-@@ -6852,7 +6852,7 @@ int main(int argc, char **argv) {
-       ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >= 1.0.6])],[])
- 
-         AC_LANG_POP([C++])
--        LDFLAGS=$save_LDFLAGS
-+        LIBS=$save_LIBS
-     else
-         AC_MSG_RESULT([internal])
-         AC_MSG_CHECKING([for mysqlcppconn module])
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/libreoffice-3.5.5.3.ebuild b/app-office/libreoffice/libreoffice-3.5.5.3.ebuild
deleted file mode 100644
index c7a7a3269c1b..000000000000
--- a/app-office/libreoffice/libreoffice-3.5.5.3.ebuild
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.5.3.ebuild,v 1.4 2012/08/08 16:37:34 dilfridge Exp $
-
-EAPI=4
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="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
-	http://download.documentfoundation.org/libreoffice/old/src
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.5.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 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}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-MODULES="core binfilter help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]]; then
-				SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.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+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite gstreamer +gtk
-jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
-+vba +webdav +xmlsec"
-LICENSE="LGPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-NSS_DEPEND="
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-"
-
-COMMON_DEPEND="
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
-	app-text/mythes
-	>=app-text/libexttextcat-3.2
-	app-text/libwpd:0.9[tools]
-	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
-	<dev-cpp/libcmis-0.2
-	dev-db/unixODBC
-	dev-libs/expat
-	>=dev-libs/glib-2.28
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-49
-	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-1.0.0d
-	>=dev-libs/redland-1.0.14[ssl]
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	>=media-libs/libpng-1.4
-	media-libs/libvisio
-	>=net-misc/curl-7.21.4
-	sci-mathematics/lpsolve
-	>=sys-libs/db-4.8
-	virtual/jpeg
-	>=x11-libs/cairo-1.10.0[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? ( gnome-extra/evolution-data-server )
-	gnome? ( gnome-base/gconf:2 )
-	gtk? ( >=x11-libs/gtk+-2.24:2 )
-	graphite? ( media-gfx/graphite2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10
-	)
-	java? (
-		>=dev-java/bsh-2.0_beta4
-		dev-java/lucene:2.9
-		dev-java/lucene-analyzers:2.3
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	opengl? ( virtual/opengl )
-	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
-	postgres? ( >=dev-db/postgresql-base-8.4.0 )
-	svg? ( gnome-base/librsvg )
-	webdav? ( net-libs/neon )
-	xmlsec? ( ${NSS_DEPEND} )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice-bin
-	!app-office/openoffice
-	media-fonts/libertine-ttf
-	media-fonts/liberation-fonts
-	media-fonts/urw-fonts
-	cups? ( net-print/cups )
-	java? ( >=virtual/jre-1.6 )
-"
-
-PDEPEND="
-	>=app-office/libreoffice-l10n-3.5.0
-"
-
-# 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/boost-1.46
-	>=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
-	virtual/pkgconfig
-	media-libs/sampleicc
-	net-misc/npapi-sdk
-	net-print/cups
-	>=sys-apps/findutils-4.4.2
-	sys-devel/bison
-	sys-apps/coreutils
-	sys-devel/flex
-	sys-devel/gettext
-	>=sys-devel/make-3.82
-	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
-		test? ( dev-java/junit:4 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-system-pyuno.patch"
-	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
-	"${FILESDIR}/${PN}-3.5-doublebuild.patch"
-	"${FILESDIR}/${PN}-3.5-hebrew-icu49.patch"
-)
-
-REQUIRED_USE="
-	nsplugin? ( gtk )
-	gnome? ( gtk )
-	eds? ( gnome )
-	nlpsolver? ( java )
-"
-
-S="${WORKDIR}/${PN}-core-${PV}"
-
-RESTRICT="test"
-
-pkg_pretend() {
-	local pgslot
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		CHECKREQS_DISK_BUILD="6G"
-		check-reqs_pkg_pretend
-
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]] ) \
-				; then
-			eerror "Compilation with gcc older than 4.5 is not supported"
-			die "Too old gcc found."
-		fi
-	fi
-
-	# ensure pg version
-	if use postgres; 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_set_active_version 2
-	python_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		CHECKREQS_DISK_BUILD="6G"
-		check-reqs_pkg_pretend
-	fi
-}
-
-src_unpack() {
-	local mod dest tmplfile tmplname mypv
-
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	if use branding; then
-		unpack "${BRANDING}"
-	fi
-
-	if [[ ${PV} != *9999* ]]; then
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]] && ! use binfilter; then
-				continue
-			fi
-			unpack "${PN}-${mod}-${PV}.tar.xz"
-			if [[ ${mod} != core ]]; then
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-	else
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]] && ! use binfilter; then
-				continue
-			fi
-			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_PROJECT="${PN}/${mod}"
-			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
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
-	fi
-}
-
-src_prepare() {
-	# optimization flags
-	export ARCH_FLAGS="${CXXFLAGS}"
-	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# patchset
-	if [[ -n ${PATCHSET} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	base_src_prepare
-
-	# please no debug in binfilter, it blows up things insanely
-	if use binfilter && ! use binfilterdebug ; then
-		for name in $(find "${S}/binfilter" -name makefile.mk) ; do
-			sed -i -e '1i\CFLAGS+= -g0' $name || die
-		done
-	fi
-
-	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
-
-}
-
-src_configure() {
-	local java_opts
-	local internal_libs
-	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
-	"
-
-	if use java; then
-		# hsqldb: system one is too new
-		# saxon: system one does not work properly
-		java_opts="
-			--without-system-hsqldb
-			--without-system-saxon
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-java-target-version=$(java-pkg_get-target)
-			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
-			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
-			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
-			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
-		"
-		if use test; then
-			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
-		else
-			java_opts+=" --without-junit"
-		fi
-	fi
-
-	if use branding; then
-		internal_libs+="
-			--with-about-bitmap="${WORKDIR}/branding-about.png"
-			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
-		"
-	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-*-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-ldap: ldap requires internal mozilla stuff, same like mozab
-	# --disable-mozilla: disable mozilla build that is used for adresbook, not
-	#   affecting the nsplugin that is always ON
-	# --disable-pch: precompiled headers cause build crashes
-	# --disable-rpath: relative runtime path is not desired
-	# --disable-static-gtk: ensure that gtk is linked dynamically
-	# --disable-ugly: disable ugly pieces of code
-	# --disable-zenity: disable build icon
-	# --enable-extension-integration: enable any extension integration support
-	# --with-{max-jobs,num-cpus}: ensuring parallel building
-	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
-	# --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-largefile \
-		--enable-python=system \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-release-build \
-		--enable-unix-qstart-libpng \
-		--enable-mergelibs \
-		--disable-ccache \
-		--disable-crashdump \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gnome-vfs \
-		--disable-ext-report-builder \
-		--disable-kdeab \
-		--disable-kde \
-		--disable-ldap \
-		--disable-mozilla \
-		--disable-online-update \
-		--disable-pch \
-		--disable-rpath \
-		--disable-systray \
-		--disable-static-gtk \
-		--disable-strip-solver \
-		--disable-ugly \
-		--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-max-jobs=${jbs} \
-		--with-num-cpus=2 \
-		--with-unix-wrapper=libreoffice \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-afms \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-stlport \
-		--without-system-mozilla \
-		--without-help \
-		--with-helppack-integration \
-		--without-sun-templates \
-		$(use_enable binfilter) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome lockdown) \
-		$(use_enable graphite) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		--disable-gtk3 \
-		$(use_enable java ext-scripting-beanshell) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nlpsolver ext-nlpsolver) \
-		$(use_enable nsplugin) \
-		$(use_enable odk) \
-		$(use_enable opengl) \
-		$(use_enable pdfimport ext-pdfimport) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable svg librsvg system) \
-		$(use_enable test linkoo) \
-		$(use_enable vba) \
-		$(use_enable vba activex-component) \
-		$(use_enable webdav neon) \
-		$(use_enable xmlsec) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		${internal_libs} \
-		${java_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
-	(
-		 source "${S}/Env.Host.sh" 2&> /dev/null
-
-		 local path="${SOLARVER}/${INPATH}/res/img"
-		 mkdir -p "${path}" || die
-
-		 echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\""
-		 perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			  -dir=default_images/res/helpimg \
-			  > "${path}/helpimg.ilst"
-		 [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	# not a proper make script
-	make build || die
-}
-
-src_test() {
-	make check || 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/
-
-	# symlink the nsplugin to system location
-	if use nsplugin; then
-		inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-	fi
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-	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
-}
-
-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 cups || \
-		ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
-
-	use java || \
-		ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-3.5.6.2.ebuild b/app-office/libreoffice/libreoffice-3.5.6.2.ebuild
index e0e25f81cf33..148fc7473e8a 100644
--- a/app-office/libreoffice/libreoffice-3.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.6.2.ebuild,v 1.2 2012/08/21 10:17:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.6.2.ebuild,v 1.3 2012/08/31 14:08:51 scarabeus Exp $
 
 EAPI=4
 
@@ -75,7 +75,7 @@ jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
 +vba +webdav +xmlsec"
 LICENSE="LGPL-3"
 SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 NSS_DEPEND="
 	>=dev-libs/nspr-4.8.8
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
deleted file mode 100644
index ad6f1726416b..000000000000
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.55 2012/08/13 18:33:39 scarabeus Exp $
-
-EAPI=4
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="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
-	http://download.documentfoundation.org/libreoffice/old/src
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.5.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 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}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-MODULES="core binfilter help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]]; then
-				SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.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+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite gstreamer +gtk
-jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
-+vba +webdav +xmlsec"
-LICENSE="LGPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-NSS_DEPEND="
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-"
-
-COMMON_DEPEND="
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
-	app-text/mythes
-	>=app-text/libexttextcat-3.2
-	app-text/libwpd:0.9[tools]
-	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
-	<dev-cpp/libcmis-0.2
-	dev-db/unixODBC
-	dev-libs/expat
-	>=dev-libs/glib-2.28
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-49
-	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-1.0.0d
-	>=dev-libs/redland-1.0.14[ssl]
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	>=media-libs/libpng-1.4
-	media-libs/libvisio
-	>=net-misc/curl-7.21.4
-	sci-mathematics/lpsolve
-	>=sys-libs/db-4.8
-	virtual/jpeg
-	>=x11-libs/cairo-1.10.0[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? ( gnome-extra/evolution-data-server )
-	gnome? ( gnome-base/gconf:2 )
-	gtk? ( >=x11-libs/gtk+-2.24:2 )
-	graphite? ( media-gfx/graphite2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10
-	)
-	java? (
-		>=dev-java/bsh-2.0_beta4
-		dev-java/lucene:2.9
-		dev-java/lucene-analyzers:2.3
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	opengl? ( virtual/opengl )
-	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
-	postgres? ( >=dev-db/postgresql-base-8.4.0 )
-	svg? ( gnome-base/librsvg )
-	webdav? ( net-libs/neon )
-	xmlsec? ( ${NSS_DEPEND} )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!<app-openoffice/openoffice-bin-3.4.0-r1
-	!app-office/openoffice
-	media-fonts/libertine-ttf
-	media-fonts/liberation-fonts
-	media-fonts/urw-fonts
-	cups? ( net-print/cups )
-	java? ( >=virtual/jre-1.6 )
-"
-
-PDEPEND="
-	>=app-office/libreoffice-l10n-3.5.0
-"
-
-# 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/boost-1.46
-	>=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
-	virtual/pkgconfig
-	media-libs/sampleicc
-	net-misc/npapi-sdk
-	net-print/cups
-	>=sys-apps/findutils-4.4.2
-	sys-devel/bison
-	sys-apps/coreutils
-	sys-devel/flex
-	sys-devel/gettext
-	>=sys-devel/make-3.82
-	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
-		test? ( dev-java/junit:4 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-system-pyuno.patch"
-	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
-	"${FILESDIR}/${PN}-3.5-doublebuild.patch"
-	"${FILESDIR}/${PN}-3.5-hebrew-icu49.patch"
-)
-
-REQUIRED_USE="
-	nsplugin? ( gtk )
-	gnome? ( gtk )
-	eds? ( gnome )
-	nlpsolver? ( java )
-"
-
-S="${WORKDIR}/${PN}-core-${PV}"
-
-RESTRICT="test"
-
-pkg_pretend() {
-	local pgslot
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		CHECKREQS_DISK_BUILD="6G"
-		check-reqs_pkg_pretend
-
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]] ) \
-				; then
-			eerror "Compilation with gcc older than 4.5 is not supported"
-			die "Too old gcc found."
-		fi
-	fi
-
-	# ensure pg version
-	if use postgres; 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_set_active_version 2
-	python_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		CHECKREQS_DISK_BUILD="6G"
-		check-reqs_pkg_pretend
-	fi
-}
-
-src_unpack() {
-	local mod dest tmplfile tmplname mypv
-
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	if use branding; then
-		unpack "${BRANDING}"
-	fi
-
-	if [[ ${PV} != *9999* ]]; then
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]] && ! use binfilter; then
-				continue
-			fi
-			unpack "${PN}-${mod}-${PV}.tar.xz"
-			if [[ ${mod} != core ]]; then
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-	else
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]] && ! use binfilter; then
-				continue
-			fi
-			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_PROJECT="${PN}/${mod}"
-			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
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
-	fi
-}
-
-src_prepare() {
-	# optimization flags
-	export ARCH_FLAGS="${CXXFLAGS}"
-	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# patchset
-	if [[ -n ${PATCHSET} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	base_src_prepare
-
-	# please no debug in binfilter, it blows up things insanely
-	if use binfilter && ! use binfilterdebug ; then
-		for name in $(find "${S}/binfilter" -name makefile.mk) ; do
-			sed -i -e '1i\CFLAGS+= -g0' $name || die
-		done
-	fi
-
-	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
-
-}
-
-src_configure() {
-	local java_opts
-	local internal_libs
-	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
-	"
-
-	if use java; then
-		# hsqldb: system one is too new
-		# saxon: system one does not work properly
-		java_opts="
-			--without-system-hsqldb
-			--without-system-saxon
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-java-target-version=$(java-pkg_get-target)
-			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
-			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
-			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
-			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
-		"
-		if use test; then
-			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
-		else
-			java_opts+=" --without-junit"
-		fi
-	fi
-
-	if use branding; then
-		internal_libs+="
-			--with-about-bitmap="${WORKDIR}/branding-about.png"
-			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
-		"
-	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-*-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-ldap: ldap requires internal mozilla stuff, same like mozab
-	# --disable-mozilla: disable mozilla build that is used for adresbook, not
-	#   affecting the nsplugin that is always ON
-	# --disable-pch: precompiled headers cause build crashes
-	# --disable-rpath: relative runtime path is not desired
-	# --disable-static-gtk: ensure that gtk is linked dynamically
-	# --disable-ugly: disable ugly pieces of code
-	# --disable-zenity: disable build icon
-	# --enable-extension-integration: enable any extension integration support
-	# --with-{max-jobs,num-cpus}: ensuring parallel building
-	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
-	# --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-largefile \
-		--enable-python=system \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-release-build \
-		--enable-unix-qstart-libpng \
-		--enable-mergelibs \
-		--disable-ccache \
-		--disable-crashdump \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gnome-vfs \
-		--disable-ext-report-builder \
-		--disable-kdeab \
-		--disable-kde \
-		--disable-ldap \
-		--disable-mozilla \
-		--disable-online-update \
-		--disable-pch \
-		--disable-rpath \
-		--disable-systray \
-		--disable-static-gtk \
-		--disable-strip-solver \
-		--disable-ugly \
-		--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-max-jobs=${jbs} \
-		--with-num-cpus=2 \
-		--with-unix-wrapper=libreoffice \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-afms \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-stlport \
-		--without-system-mozilla \
-		--without-help \
-		--with-helppack-integration \
-		--without-sun-templates \
-		$(use_enable binfilter) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome lockdown) \
-		$(use_enable graphite) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		--disable-gtk3 \
-		$(use_enable java ext-scripting-beanshell) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nlpsolver ext-nlpsolver) \
-		$(use_enable nsplugin) \
-		$(use_enable odk) \
-		$(use_enable opengl) \
-		$(use_enable pdfimport ext-pdfimport) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable svg librsvg system) \
-		$(use_enable test linkoo) \
-		$(use_enable vba) \
-		$(use_enable vba activex-component) \
-		$(use_enable webdav neon) \
-		$(use_enable xmlsec) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		${internal_libs} \
-		${java_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
-	(
-		 source "${S}/Env.Host.sh" 2&> /dev/null
-
-		 local path="${SOLARVER}/${INPATH}/res/img"
-		 mkdir -p "${path}" || die
-
-		 echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\""
-		 perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			  -dir=default_images/res/helpimg \
-			  > "${path}/helpimg.ilst"
-		 [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	# not a proper make script
-	make build || die
-}
-
-src_test() {
-	make check || 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/
-
-	# symlink the nsplugin to system location
-	if use nsplugin; then
-		inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-	fi
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-	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
-}
-
-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 cups || \
-		ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
-
-	use java || \
-		ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild b/app-office/libreoffice/libreoffice-3.6.1.2.ebuild
index ce42f466f926..059fcb34ee2d 100644
--- a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.10 2012/08/23 21:47:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.1.2.ebuild,v 1.1 2012/08/31 14:08:51 scarabeus Exp $
 
 EAPI=4
 
@@ -59,7 +59,7 @@ unset DEV_URI
 # 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+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )" # modifies source code
+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+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
 ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
@@ -72,9 +72,8 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite
-gstreamer +gtk jemalloc kde mysql odk opengl postgres svg test +vba
-+webdav +xmlsec"
+IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
+jemalloc kde mysql odk opengl postgres svg test +vba +webdav"
 
 LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -93,10 +92,6 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-NSS_DEPEND="
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-"
 COMMON_DEPEND="
 	app-arch/zip
 	app-arch/unzip
@@ -113,9 +108,12 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.28
 	>=dev-libs/hyphen-2.7.1
 	>=dev-libs/icu-4.8.1.1
+	>=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
@@ -138,7 +136,6 @@ COMMON_DEPEND="
 		x11-libs/gdk-pixbuf[X]
 		>=x11-libs/gtk+-2.24:2
 	)
-	graphite? ( media-gfx/graphite2 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10
 		>=media-libs/gst-plugins-base-0.10
@@ -159,13 +156,12 @@ COMMON_DEPEND="
 	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
 	svg? ( gnome-base/librsvg )
 	webdav? ( net-libs/neon )
-	xmlsec? ( ${NSS_DEPEND} )
 "
 
 RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
-	!app-office/openoffice-bin
+	!<app-openoffice/openoffice-bin-3.4.0-r1
 	!app-office/openoffice
 	media-fonts/libertine-ttf
 	media-fonts/liberation-fonts
@@ -214,8 +210,6 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/libreoffice-3.6.0-kde-fpicker.patch"
-	"${FILESDIR}/libreoffice-3.6.0-mysql-as-needed.patch"
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
 )
@@ -443,6 +437,7 @@ src_configure() {
 		--with-system-libs \
 		--with-system-jars \
 		--with-system-dicts \
+		--enable-graphite \
 		--enable-cairo-canvas \
 		--enable-largefile \
 		--disable-mergelibs \
@@ -451,6 +446,7 @@ src_configure() {
 		--enable-randr-link \
 		--enable-release-build \
 		--enable-unix-qstart-libpng \
+		--enable-xmlsec \
 		--disable-ccache \
 		--disable-crashdump \
 		--disable-dependency-tracking \
@@ -497,7 +493,6 @@ src_configure() {
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
 		$(use_enable gnome lockdown) \
-		$(use_enable graphite) \
 		$(use_enable gstreamer) \
 		$(use_enable gtk) \
 		$(use_enable kde kde4) \
@@ -509,7 +504,6 @@ src_configure() {
 		$(use_enable test linkoo) \
 		$(use_enable vba) \
 		$(use_enable webdav neon) \
-		$(use_enable xmlsec) \
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with odk doxygen) \
@@ -562,6 +556,9 @@ src_install() {
 	# 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() {