Backport patch against KDE drag-n-drop hang from Git master, bug 489988. No testing yet, no keywords.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

5 files changed, 685 insertions, 18 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index dea634a749bd..6e7605147a29 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,14 @@
 # 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.524 2013/12/07 20:29:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.525 2013/12/07 21:03:18 dilfridge Exp $
+
+*libreoffice-4.1.3.2-r2 (07 Dec 2013)
+
+  07 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libreoffice-4.1.3.2-r2.ebuild,
+  +files/libreoffice-4.1.3.2-kde-calchang.patch, libreoffice-4.1.9999.ebuild:
+  Backport patch against KDE drag-n-drop hang from Git master, bug 489988. No
+  testing yet, no keywords.
 
 *libreoffice-4.1.3.2-r1 (07 Dec 2013)
 
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 374782b12aaf..54d355a24439 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 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.3.2-kde-calchang.patch 2630 SHA256 a70bd71a561ebbc37d8b545a9828734bbfe5fa9268283a6df92a459c0749f9b9 SHA512 d9c2e13ab6bcb795af56af52545fb508287b327bd22ffaef1821f4e68b4d47755b9abe9469210ccfee10a3bf368dfed24ae07b15d5e9e79b58facf90791ffaca WHIRLPOOL 6c23183327c65c48f01f18666203d1942a433a44033bac1a13d0a858c14db2df5901498c22235e42a1965a8c9f0bb0dfd78fce5b51da3108b25e149f31124eb8
 AUX libreoffice-4.1.3.2-kde-recursiverepaint.patch 6063 SHA256 be777aa6c3bc4ccc728f5d0642d641e59fbbb6740b3609498722525cf1729baf SHA512 7eaca59375b3b26de4dcfff1f420f9a9737025351589286a40fc1964a4e5d48c6ec8dc0ab24a76cc6904a06b2366da2a2912ebafa98f86064663bd3c5753522e WHIRLPOOL b08e2923624c338c485ad1d1942a78364470704748e686d7839d0d7530dc141d9df2fe29ef1652e3af49a4af24d5a9bd17f7b48499438765bcce86ba25e273c5
 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
@@ -23,27 +24,28 @@ DIST libreoffice-help-4.1.3.2.tar.xz 1848664 SHA256 380cc9d0f35d3dbba25629a17123
 EBUILD libreoffice-4.0.4.2.ebuild 17560 SHA256 7987c4166eba595234087cf2774ceb1129d7513d26f6079ac480e25445a95d53 SHA512 f9696b2b89aaae3971de5d43a4c036b69e2383dd7a96b1197b602d0b8491bf581e09feae3ed90b560aa53156aa88a4213cc79986c2ff7d44c1164aa06b8fb271 WHIRLPOOL 77f55d8ce57869013c4d1b34cd9d2481779afe0e3cce3e6d851c45901dc52c779affb5ba9b56fd3308d17c06ded53ed5b31ed657b37061ab7ae24f8d72032464
 EBUILD libreoffice-4.1.2.3.ebuild 17383 SHA256 28ae2fbd2885b89eac35065b23b99c60252258199032fcdfa299932c9c9e97b4 SHA512 bca7256addb0eafa7a1cd13246d7e7e46a62becc46a1120980865136daf95d624e55116d94a881a344e101f847123e54894a1e3a1567d0a2e68bae4133687545 WHIRLPOOL 6c5ba1ec74ef807d8b2f56f4255d50d62a9ab9a7afd17b03cde671cb5fab4c39b5b71c8ca6a1ae0da7223e2353249c71b54a85411d295dcd5eba59a686f4a3b0
 EBUILD libreoffice-4.1.3.2-r1.ebuild 17426 SHA256 f1b70dcbae70b9b888728f4e679737f07f33cc954032bf07afa04763c4a8f09d SHA512 d8c0baf020f507ee000b096c338ba9a88ff672ae9d2be7bc750613c4cbd5d9428c9a3d568e407fbd338d1eae5fd308c83b4ec5d2a9668cf940ca69bf7567f922 WHIRLPOOL 59ec75912618134f4388fd6c08ed0c0a6c6486d9c99534a9c017ee98e1900c7143d9bf5f6f7275402c62b3f90cd8b7b7e48808dbef2ccb76bb15a68d064638a2
+EBUILD libreoffice-4.1.3.2-r2.ebuild 17474 SHA256 8d8666761847f91797d0a34e0f99982b0eb366e575988a90d21c6a6d02196939 SHA512 8b9ad912ef93a76056ee0e2a4eacabd842cb166d4fb82f5ceeeb3bdbeb6bba033cb359d81a5e91aeb04fbfc09baa63c6aab8b77488d3791331332107af448bce WHIRLPOOL ae8c8e56151c343e420dcc939985d444a023ab53f19320fd819f7441e84dbb5ba75334b9f7137374f81c2fded0b5b63db29059a6534886870685e530f73a95ed
 EBUILD libreoffice-4.1.3.2.ebuild 17385 SHA256 2f0c99cd1481694757a52004d06cfea337420488e61d89f33601b9e2cdc60dea SHA512 1f5260589b2ce2c83e6d2923d09320d78e61006bbf112dc1183f521d5a213816f43e87ea7e3aeba20ab3d6f9ae39b3f4a86d6c1f890b8b03a62676d5a75eb9ae WHIRLPOOL 9a6976214d53d638032832f17e4ad91c8f65b4e793b57680a2fa338b9ad8acacdfdc427a07bf84702a383da614390d374f032dee78b5ca1608e9d2504026da03
-EBUILD libreoffice-4.1.9999.ebuild 17470 SHA256 d3ef24bfd4a5e5fa73f69595e9a6c15f5969b80085145b4c3ea99431d5e44bab SHA512 20c8b6665ceca66f3b47804828606979fc5b350a0ba35ad11ebc6b78fc16e03367acfe4b9e34d609370a45b00da4c06c9d7ea67cdb20593f27f603936557d4ab WHIRLPOOL f64dae04eb885d51176c738525bb124f4bac3a0b02919c9613bfafba5008b648a855d11dba04c04026db57258429c5a3eeee808e956c07de5a57e1dbbd5092ec
+EBUILD libreoffice-4.1.9999.ebuild 17518 SHA256 de02113b7a56010ee156256c925d3aaedf13827118f6ffee66e4a80cccba1db9 SHA512 f86eca1d01121d5c0a1d15523d4f8776e0d7a9c58e7ab8608a8a9f7fb663644de6a1f7f39d1beb60a47f449996d4a475a219513193e9887a708a9a91b003dc48 WHIRLPOOL deef27015f140bee027914bb5e48a105504ea74f69b282d16ed1c53eddc9a473139263f907af207b85308ee9b7e80107adedca48b3997db3d363259084ecf7c7
 EBUILD libreoffice-9999-r2.ebuild 17593 SHA256 ac9204e76352f317f9d59ed87ab2f1b6d3faa9050c9222bb1db5a5c6960e496a SHA512 be8b593212f653eba7ef7a1649ae9a7c423404b17720e425a9f0876cdae5243b771cf8c20b3a6addb4debfafcf50c44f5aefa0bb9e77276ca308f9f4caf74734 WHIRLPOOL 473cdbaab41795ad3533cb1157a670830979e3136a51d99b574c843900066364a94f980765182ce2fa56812b14ac3795a11cbe7c2b1f35dbca2413ee7fe04103
-MISC ChangeLog 95011 SHA256 4e18d7b486b704294303501d1faebd8c7b918bca4c491de5ac77fed408de16af SHA512 72f38a4f806f0e81ee5540b500f8f0a751fa469612eaaa786b3a961871e6bb59950f37249ad9c3b7375b510560b5f6ef99257322c6db5cc3e9be96223c3a3040 WHIRLPOOL 911a915c9739411e2402aedfe974b20022a03eb6157974e42f10a6fd705085d1babb6190f290bf7a4dc47210c3f2c6e5ae6fad7150fe286663edf37a33902b2d
+MISC ChangeLog 95326 SHA256 b0b5c82de93d4ef902d5a432d23c5c99ffd4a6c3a6dcd867ef4a4d266ab8d981 SHA512 0630426d5af7d76a930a9a260b6ddd72875ec76739a2776b016c2f7794ae61cd5bccad3cf06678167ac0c079207272b0a6a1a04158adfcb49ed8a8b9f73504d6 WHIRLPOOL ba5d8b3956a72d3cd86f0fc4535fe7c1df57e5e31df5b86065bf7bc9533312d3241b8b5fd6f3ae6113fb8bca83ece4eeba9ef40217b9f6c82008e8889bcc7f8b
 MISC metadata.xml 1057 SHA256 fae4981111eeb4ca46bc24106d32559f0ae4372e60b38433b4eebf748fead545 SHA512 d249cec1b2ce6e600d34034fa961ffbcef9bd5b0d614dfe043b414ba105e477681bbe0c9b98f982ccfc075f98d409c3897f76b6eec0aaaafb7f3d841442bd355 WHIRLPOOL 73de668873d556236dfc7b86cc197f8426c4e1617e860df1f60dac51cb68e620b01d335fa6d9553927adfb0aba3a349fe6f4baff0e994ce078833b2bbd17b682
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSo4V0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSo41LXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcqfkQANutZTrdbZhwf7sE4Q5FOOGF
-srXPMoXzBJYubtFrxgo6IKY0ouju9VjTm7P9CbuLBZSwUfUxL+lFQD0cbl2zopwF
-P7FdKjjJOcxSxDX7gNKmMDMDIya9v6YcG7zmJpBswdaHPZkGHZj9aGlg96uhBGds
-PI4dZ+VUl209O48DFfa7PW8zixNTbn+QISUn0MGoTUHFCn40oiFdZi54xkZTsqp0
-EY4KGKxp6i8QcNmh1qDteCAlioqDw08BLPr9jc3bvswZiDrrWnQtwEAEI+1XJRoA
-zYvA5a+NJ5C9GXVEKROHwsf/eQ7xvCoZ7EtyrO7T8I9duIDNzlIHFZSnp85Fsxkm
-UMTlZDMquNa4sk9Bo5GlV9rJ1l4Yy0w7xDZNerF6j6ew72z31lCnbUrK5zk50Ym1
-M5cDX2AlRUXOUzdpug5/oxkdSCWQr8192jvV88DLsOua2s53Y/q00j+USWZMNhuo
-nsqMVPk3o/iJiBgPk9CA42xq/a9Nyfh7pGU6eo/JPz/LHyDmCQV8OL0eSaSMgMhV
-2DZ29UqFoIo50hJRbMDttA3V2BEXftTTFqLKSHu9KNPDiHPiEyyadgGpigV0S4Ye
-MfVeN/IRX1jNV/Z92RzEwfxggowqHgmrlhxTQ0IQCwZEZrEl80icYUoHRLltChu2
-G0OZWp50zGT2rFlUGPUs
-=JzNB
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcRtAQAKB5p+yXMsli33iKeHBkfaIJ
+VtZl/8awm5oA2Gh48blsOy+kqzwgJCmpO8YOlcqsFepRkZ/jdZ2gYrbbAoY60wgC
+uMZkXq+de74qBZh4DVNgwEBPnlGfOQa9HX7rwRwtbhlsbSR2BnFgKZtxbyk76uGL
++t6bSIkAkf40t1vlyMle7UZwBq7qxo6YLxWrM2xOnySpvIFA/E3qL/+gCbItjvh9
+fw1ZVXOCnDL1ST8d4pvaPzPAvQye2PbZuCc7MTRqDyyPu34wClW+IPYv6va48IS6
+o372B7M5/z6JNW+5TvfukM1jEUocSwqFYBENGWDUZ4fQcLbV8zIFwWMBDVT1c3+0
+MPmTl+OH1IVHOHtHnBGpQRB0yR8o3nUBPXikpMlx77HkY1sEggIFSJtDzq9TTAoJ
+2bGwF0QFAo+tIiWMNjrDzdiaTn+FcTVXpuVfTOvd5z5G4f9bcN0byGFxvbLVj6W0
+cu/aie/tZ/Uki2xR85Rgp+SJRWIbK/h6KMVW/HSHCji8NQ1IBidtZ8ka8vLzeMoW
+vvuEDW8EP0RtjoYe7MNBq7hLq73jwd1EsASEle+DzXPCL+ejfLK4gwoO68PadpYP
+XFDhwBnOETURmnB80yjuZe8PnacaeGhrnz11FsxN/mGldqIfqJUfCsZUekDIuyMw
+b4DYNHJd9BygZSrWoeX8
+=wamq
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch b/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch
new file mode 100644
index 000000000000..8cf3a2b34928
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch
@@ -0,0 +1,74 @@
+From 95f60222e75486336b6569afa8f34d60b51c94ad Mon Sep 17 00:00:00 2001
+From: Jan-Marek Glogowski <glogow@fbihome.de>
+Date: Thu, 21 Nov 2013 12:40:57 +0100
+Subject: [PATCH] fdo#67011: Run Display::Yield through KDEXLib::Yield.
+
+Drag'n'Drop is handled in a second thread, which tries to "yield
+the display" while the main Qt thread probably is already
+yielding. Both need the YieldMutex, which freezes the application
+until the D'n'D thread times out.
+
+Trying to yield the display throught the application yield
+results in a recursive loop.
+
+So this catches and breaks the recursion, but just inside the Qt
+thread, so other processes can "yield on the display", instead
+of simply disabling the Display::Yield.
+
+Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f
+Reviewed-on: https://gerrit.libreoffice.org/6750
+Tested-by: Jan-Marek Glogowski <glogow@fbihome.de>
+Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
+---
+ vcl/unx/kde4/KDESalDisplay.cxx | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
+index 21440fc..ee330e7 100644
+--- a/vcl/unx/kde4/KDESalDisplay.cxx
++++ b/vcl/unx/kde4/KDESalDisplay.cxx
+@@ -25,6 +25,8 @@
+ #include <assert.h>
+ #include <unx/saldata.hxx>
+ 
++#include <qthread.h>
++
+ SalKDEDisplay* SalKDEDisplay::selfptr = NULL;
+ 
+ SalKDEDisplay::SalKDEDisplay( Display* pDisp )
+@@ -48,18 +50,26 @@ SalKDEDisplay::~SalKDEDisplay()
+ 
+ void SalKDEDisplay::Yield()
+ {
+-    if( DispatchInternalEvent() )
++    // We yield the display throught the main Qt thread.
++    // Actually this Yield may call the Display::Yield, which results in an
++    // unlimited cycle.
++    static bool break_cyclic_yield_recursion = false;
++    bool is_qt_gui_thread = ( qApp->thread() == QThread::currentThread() );
++
++    if( DispatchInternalEvent() || break_cyclic_yield_recursion )
+         return;
+ 
++    if( is_qt_gui_thread )
++        break_cyclic_yield_recursion = true;
++
+     DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() ==
+                 osl::Thread::getCurrentIdentifier(),
+                 "will crash soon since solar mutex not locked in SalKDEDisplay::Yield" );
+ 
+-    XEvent event;
+-    XNextEvent( pDisp_, &event );
+-    if( checkDirectInputEvent( &event ))
+-        return;
+-    qApp->x11ProcessEvent( &event );
++    static_cast<KDEXLib*>(GetXLib())->Yield( true, false );
++
++    if( is_qt_gui_thread )
++        break_cyclic_yield_recursion = false;
+ }
+ 
+ // HACK: When using Qt event loop, input methods (japanese, etc.) will get broken because
+-- 
+1.8.5.1
+
diff --git a/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild b/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild
new file mode 100644
index 000000000000..bfc2919078f9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.1.3.2-r2.ebuild
@@ -0,0 +1,582 @@
+# 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.3.2-r2.ebuild,v 1.1 2013/12/07 21:03:18 dilfridge 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.8.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}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/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
+gtk3 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:
+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=""
+
+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/libmwaw-0.2.0
+	app-text/libodfgen
+	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.5.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.16[ssl]
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.10:=[icu(+)]
+	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
+	)
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	libreoffice_extensions_wiki-publisher? (
+		dev-java/commons-codec:0
+		dev-java/commons-httpclient:3
+		dev-java/commons-lang:2.1
+		dev-java/commons-logging:0
+		dev-java/tomcat-servlet-api:3.0
+	)
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	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*:=
+	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"
+
+	# picked from git master
+	"${FILESDIR}/${PN}-4.1.3.2-kde-recursiverepaint.patch"
+	"${FILESDIR}/${PN}-4.1.3.2-kde-calchang.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() {
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	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
+	# sed in the tests
+	sed -i \
+		-e 's#all : build unitcheck#all : build#g' \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		Makefile.in || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+	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-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-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-rpath: relative runtime path is not desired
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--enable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-rpath \
+		--disable-systray \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=${jbs} \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-afms \
+		--without-fonts \
+		--without-myspell-dicts \
+		--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 gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-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."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	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.9999.ebuild b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
index a7615b3b4d68..14f62353a704 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.16 2013/12/07 20:29:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.17 2013/12/07 21:03:18 dilfridge Exp $
 
 EAPI=5
 
@@ -233,6 +233,7 @@ PATCHES=(
 
 	# picked from git master
 	"${FILESDIR}/${PN}-4.1.3.2-kde-recursiverepaint.patch"
+	"${FILESDIR}/${PN}-4.1.3.2-kde-calchang.patch"
 )
 
 REQUIRED_USE="