Bump to 4.1 rc1 for testing.

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 596 insertions, 15 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 221c7d07efe5..9a70fd344d0d 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.478 2013/06/23 09:39:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.479 2013/06/23 15:42:24 scarabeus Exp $
+
+*libreoffice-4.1.0.1 (23 Jun 2013)
+
+  23 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> +libreoffice-4.1.0.1.ebuild:
+  Bump to 4.1 rc1 for testing.
 
   23 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.4.2.ebuild,
   libreoffice-4.0.9999.ebuild, libreoffice-4.1.9999.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ae798cfaabc4..92c71ed90b6c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,34 +17,37 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
 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-4.0.4.2.tar.xz 104213468 SHA256 5336734757f721139d6615eefed0249be1461e428e2e64f592ce3c36a661b154 SHA512 4d9c14df08e713b7928660983243354afa524f0f24b9c6b7b40f4711396418d960103519851f3dbc4288576ec7276d4c8acfd1d5bb60a2663a663f008f274596 WHIRLPOOL e432c4a6b6a27a621578154aff607a077e8f1ae32743d3ea45565b0e5d08a1b57b975c631c807c3fb496b4e88a0859a3c2bd0dac60b80dc2ccdc6452a8808a5a
+DIST libreoffice-4.1.0.1.tar.xz 121557896 SHA256 24c4d13faead4459e08af6150c902c68b47fdf0041cc557ad97cadb6e69645dd SHA512 2f668f47134c9af0cfb20279030b23ad861f6f33b313028b53c570f3e6967cfd000d7739a4ede90a93f6bb0cc8a4edcf7039b01e06b849f66d23815f3f5b0c22 WHIRLPOOL 745d53b799084770055884a3e31fbbdadb1f1a44be65563feb7f09e9add3841582224c9388667bc3073c6485c11739a3703b673bec406229cea3a8c2bc032eae
 DIST libreoffice-binfilter-3.6.6.2.tar.xz 5969848 SHA256 b88c297f5cf5459049c0f00074ddf3fdb4946ba4c6880ac786d6236bb1636e67 SHA512 577c7e403046d185fceb092287f3ad99856010b9f18b43490f4d05c48815eef314d7554f24e0c064695fc05bff922a5d0924a10e7ffbe483338a54ddd73539a4 WHIRLPOOL 933574d32df1104a91e8489572b5a41204fde97c55896c4177c99e3b261169d830eab096258f23954854eb9b8900575aac9ef5df76bffcfee90387bf38f7ed97
 DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
 DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b
 DIST libreoffice-core-3.6.6.2.tar.xz 107650196 SHA256 f6a20418a36678550241f66b2a005b25d5ad6ed95787edc61cf3b17194368377 SHA512 5fad2db063e8a2297f9935bf71d66abaa57d3f20dc31b09c486c9c9e7a39453c553232f7beaa497fda373bc78adc1033b0a266e483d090b118dee464562ceba1 WHIRLPOOL b0e8d545ba63e08ac6f47e54d6770378e14135db0991a9e6ab6269a7876d646b4983ab096b075b6ed87dffa3d65560dc0289b2869908e228c116e6dd065f24ff
 DIST libreoffice-help-3.6.6.2.tar.xz 1860668 SHA256 b3ebb29bb6077ccdeb65e5ae883ac349c7e81c263277f5030f242e6d782d2b8b SHA512 425e7ca64e60316a8ee5b05672bc5079400c0c0ccfe0f12079bb4b9867e88191233cc7d5770dad6a92daf50dcbf43aeecdf32dd76994b1393a486d4a5f876272 WHIRLPOOL 6e4583ee7e6d7a68a189853e74c87b60f35e4edb5addd804891082998da23eefa8b28c71975cc10c11f2373a69e95340d2d01e1f4f40ee38dfb97eab3b4282e2
 DIST libreoffice-help-4.0.4.2.tar.xz 1855588 SHA256 9d7f732760b24b6916266903913d7684d9b933640174b1e041d729914beb5a4e SHA512 848329df801dfba2b06006325371e7a51354bebe0e99ba98aca14d3e3882de0ccde902b440cb1e47984585350f7e4f48b779b36281d9844251e802245633bd30 WHIRLPOOL a7048fbddaa81eb0c97f86902054195c66f84babe42ac1e088338ba019b07283a9049b70554800224ad50ee9097b2e57b4493527177a9599d9251c42894da20f
+DIST libreoffice-help-4.1.0.1.tar.xz 1846872 SHA256 71f724083e159d5eef3fda6357fbb5a4eb2d99fe038c9753b49d29b386510c6b SHA512 4fd4ff75e3f04c374e75600765a06dc6299fc338bfcacd802912abbae1e9db42a032afa20c6691852effb2d94584ca18f0992274e06f82009339203c854dce6d WHIRLPOOL b0355b98c561d1affa34db83ab104560415b04c95c7747f4b3a7ed8ddc707b5405c614b80f1fc2a3cafd795d99266183b4f4b91378b6890629a77aef6c40c9d1
 EBUILD libreoffice-3.6.6.2.ebuild 17510 SHA256 5753c1cfeff1637b21296ffe7969537aca4c358674ccd0d3fdecf63c6a006128 SHA512 9886c1a3f68e1d3d4be89a08d57077d3e865d7b4f63fd839a51455d0d0c59644ed5226da1a68fe24a807b21ec17feafef3884e967e1e33d0b5302218237b4821 WHIRLPOOL 36fa5f23f5de20dbeb9dcc6f2c67a0fff7398b38979bcf1d9d1f483eb12ab16b21baba5b6ae48e45f245f94393692e73c188725f92c92fe9cfa5f75f31ebb9f7
 EBUILD libreoffice-3.6.9999.ebuild 17515 SHA256 873e3a2bf8e09ae65ad30cc050c61aacd27b295187e9576215fa9158a70c3a57 SHA512 be8b6f5ccbb8d87f0033873d30ec457497a9b7dbc8c272b992275c520df4aa70210e9a27804504ecb61ae58f97b4c95ad7f92049e066db4f24ba66c21ad4eda3 WHIRLPOOL f28f5e104422a1dc9b5e5aa371f0af662142c363f953e8e8870ec40dcdeda5d9af8785d60a05bc52fc155de9a788e9fcd8e20c071e16b87eecf79fd4fbbf8ef9
 EBUILD libreoffice-4.0.4.2.ebuild 17507 SHA256 12cdcda41b1ea922cb6d36b9747b7dab26df0d78997152d185982408b9852b1c SHA512 1f6fb31d66c3055622fb33290cfb8ec1241f237088d3a9036923d11b4edd80604255425ef196902ef9d5706e5abaac49869fb3ed45e1111750a778cf4e15a5e3 WHIRLPOOL ca561ca3c52c3bb245cb96886970c52f1d98595337c8e9ab01faf6f4271e531d272e2bfc857c22b31df7463c633ba0f3b514065db12ade1f49f7b5af08235cc6
 EBUILD libreoffice-4.0.9999.ebuild 17509 SHA256 56c60b5c5835066b12944ec262a1c59fe2f061128369b07a5753d4a529efa8cb SHA512 2ec7eeed14ee7833bb36944ecd48ca3f75c9cb490126920e1283d194f93013872130f09a4218d20a502d2c0ec42aa02e5c7efd370b7ebea6f5c4406dc721c637 WHIRLPOOL 59364598f37f8ff34ec9c8423f47525ab691a1936f2ed2fdc0b3b585569d482f036c9c496562d0007e658d3739ad5fdc1e1586f40adb5c2879643c41b2e15356
+EBUILD libreoffice-4.1.0.1.ebuild 17249 SHA256 45e7d238c2ee82f16133ebbd030f6f21b61d8610cae83cd36fa4a9e338574f1d SHA512 dc3130d07e080db8270eaa075e1aca5bde44f72ebb92b3a3f86571cc008901ae02a8acd44a880c592f743545545e8d692b587bf6bc70531cee33456e435f0df7 WHIRLPOOL c4a113f887b59d794a9bfa2224250a1b0af383f6a0c30bc6292a40ca6872ac8b0399d5fd5f2dc39710cc8ab7ad47bba7727c2eac3614839d26ebcb35d5fced12
 EBUILD libreoffice-4.1.9999.ebuild 17250 SHA256 c090876b94abc09f7abc49f5a57e84a196fa87782ff994764895be9ebcc0a999 SHA512 0ae860c5e0c15d3af87e98e6a7333eb240a8123ba6640c2cd718d6680bb8f0e38f4ec9606b87b49fdb9528ce0ee4a1301df6d7df0ccf23cf3b8f97f7415a22ff WHIRLPOOL d8ffcc3d6bf9349d4e6eca77a5f985ef66eaf68dd931ffd4f3768fe3a4963208f8e02165f4816c302444517fce21ad511e5b94e07fd2a2a8276a84bf17ed3eaf
 EBUILD libreoffice-9999-r2.ebuild 17337 SHA256 45528a79e10192d1ca7bacb5a52ab6b3d929d04e261fef8925009b22eccfaf66 SHA512 4543f683d5bc8a757c776922094d16559489645fa52042dde9eede8d0477101a035900ff081966bf34b89cd2661515f1fc6cc91b39dfaaddba80a34653dd67a3 WHIRLPOOL 712d62381b1bc19d7515f7eee210fb8bddd95d8943146b383434cd97a8b6a4fbb6db9b10b303b0ae19db346e2cf73257719e1594180c938ccee894d66c4a064c
-MISC ChangeLog 86735 SHA256 b5cc19887acc2fbe4415249fc6434d67c79fe039c0457846cbddef2b6666aceb SHA512 b17794f8d3031d3c21a29aa091873a833c8ed5f226482a317230ba0ec4ba96ff2ae21fe1106f8b4c2385da2ee245e51577010ae2638a5bc4787c5040a8973851 WHIRLPOOL 3bc3a9f40ab770eeecf4426344ab000b8f4aa22e09e31176ba9992a4dc2185620ad55d05e284b99a84f37e6a0e6160159fe2162c7fb0e7bd33477cfdf73c8e06
+MISC ChangeLog 86887 SHA256 bef75aed44e380b065921e5d13d7ad3560d1b1342372f3b4324ae473264a9779 SHA512 ca8f12fc901f468ce3c4d46d1831ee5be24d64c15f6fe48873c646fd44fdfaf0c3d772d515e7166bfbce14176be0d2e4977be9056f0e8587844d1f45f4db8007 WHIRLPOOL a2e5fddcb9dd2562304f58e677b1ef2e66fed0145941c12951722b2ca9ca1824085944cd4275a1e05b62e719325f402918f708d634542a8875efaebe0e56ba05
 MISC metadata.xml 1176 SHA256 c1690efe4b2a0fa49801e5cbe66637e25ba71fb902115a75d363f6fe7dc444fb SHA512 2889263d6cf5388d402b2c3999d471e2a2e8c852dcd50755d9f6fd7a549e8b70af7afb66d2f58bc8b9f7bedb4d01a05dda6159c5433a5fdce20ba69f49b9d1b1 WHIRLPOOL e4b548267c79bee3de7bdec839c0fd4d2f1166ded0464d65e6103e63ffb8fb9c08c6a9ff0d01ab09c02826ff1b0b0233a55c5d49b701e963d8c732685b3267dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRxsJOAAoJEOSiRoyO7jvo24sP+wSiosle/LuIxjkN3/QVMTbV
-Wu64xBn6Yl/ZfgPNP1fF+uVHWJL2B/+8dz+mQBhByUWKwnfQUG2sJkt6x/7ZP7FV
-nyboR6m8ZpDg6eZ2dWEF0kfSHkQItbxMsS9dWlMB8ZYuwW0FNWaYNX4Rep3cZcgA
-ffWh92gr9U8J4lsQdkA6iX8l6CWEGpWMt7gN0oZElL8bB0HVj06gMFE5fNIJKz2y
-NsKTcYwYvVhXPozFegj5gMJcxApsNBpUz8D3xrwf0JR76kRgLvz/6YEiZZ0QubIR
-rrikQi4tQ7eBUXllxu2ruao206NWUh3YsA8KaZHrY7zrpSls+eB+MGwHOCWivfws
-tle8DZ/64QwWQJ+Eq0hb5wqQkma0CvXVK1joaxQUVvxuA8SdfwbFWXCTr5nrsRBt
-32uzV4IC7LKztPYnXOa6t7i8EPnip8yfnT/TRIacrDod+/TrUPxF0JWinj7gm+ac
-2trn2iM1H1xtQDZ54wHBNUmvfuVAhoZqcO7X02m5j3nmWULyKOMNuaDTUTkiC4PX
-/yu6fGlUs6UIcAZdymoqHy9168X5jRv45tW+KfuCmEgq4M0ngFv51h3+Z+tWd3DX
-W2NN9Z20cNoLS6nRofbN5HYV0Ms7sfAh6D1aZqvHHBOlVKftDuUZU19nPvD9ao1g
-sKn4lSckal52HV6XsMcn
-=hAU7
+iQIcBAEBCAAGBQJRxxdmAAoJEOSiRoyO7jvodToQAJt3vcR59Tc5MBNF/fe50/7q
+bkexgEhYJJ/GDqYCjao0LlgWllYCASz/ZtwDtgRZsV7bDlpSuiCR5a3350ue3CDn
+pgpFydsg++TYmSwG+91BBDSPDqXsa4BfoSXWdmRF+XetfAvNvSN7U0lb6BjmsMCh
+tSLVlC5DqZ6VpCPosiE0AUgJfL9L/X9SS++CzD06w2vFWyVsJCDGKlqFDyJXu7BC
+soz8dRfeMOF7pqh5WE7vGfyA7CBWrwgVGBOYtGzVZO+cSSE0NAFtJiEM2zD+hgx/
+f5lGdAsRx1dKdZwNYuKHetl4sasyZienoptywCB6AVmjAe91AtNSlvqhU6nhmdnF
+ujU6qvUMskByyy6aUXNg9OynTTxeegMAIJJ1RbLhKdP90FMtCRmIv32h5eYAATvz
+0zhaoQABuw3xcQzV15YdmaeFU4mEYf95wlIfIPtIeNY0mrFZ0FkAG2oAiyjkdWg4
+pqv64pfrSsEXDjmC6M9I1+26MyEu2CMbEPFK9wR6f8J5fv0Vv6ic8h/A2IzIuGM4
+8xiuyozVhH2oGPfQIUZEtHUikhe8uct94kwUvP0E125RI8qdkOpOJh9+RVPELmGH
+sAQgUvrsOus0EVjMAKttHolYFbzUqQLJQE1rXGuDJ3NK4nO/XZ2aF1bEJkdvr9g1
+yJjSuZ3VuoOIan1zVSoE
+=p9K+
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.1.0.1.ebuild b/app-office/libreoffice/libreoffice-4.1.0.1.ebuild
new file mode 100644
index 000000000000..69dfe156f4f7
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.1.0.1.ebuild
@@ -0,0 +1,573 @@
+# 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.1.ebuild,v 1.1 2013/06/23 15:42:24 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}"
+
+# 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="~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/libmwaw-0.1.7
+	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/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.14[ssl]
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.10:=
+	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
+	>=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/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-0.8.1:=
+	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"
+)
+
+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 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."
+	)
+
+	# 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
+}