Bump to 4.0rc1 for testing, unmasked as already a lot of regression testing was done.

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

5 files changed, 642 insertions, 51 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 79dbec3f4899..c2a240733b92 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,13 @@
 # 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.427 2013/01/10 10:14:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.428 2013/01/11 21:24:53 scarabeus Exp $
+
+*libreoffice-4.0.0.1 (11 Jan 2013)
+
+  11 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +libreoffice-4.0.0.1.ebuild,
+  libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Bump to 4.0rc1 for testing, unmasked as already a lot of regression testing
+  was done.
 
   10 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Drop unused desc.
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4dbc7f0a4594..db43e4a4be93 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -14,31 +14,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-4.0.0.1.tar.xz 104146976 SHA256 dead0e32ab5f89c76ab8fe4323e7262804dc88560a897d0e250d43aaef0a90db SHA512 0c137bb2fec5cfad325153bac77dd5c191316e6940f03e2c61cd15bc32bf83ddd64612e2e62e55cab159952b214340ed53b2741ea9375b7eca8f498d277e48c9 WHIRLPOOL e78fb19bb1392b7ea49cc35afa56cc90c5d58bfe14f56bf8af8f4fce3e6d7976881019f36762343623f5d2d18c4c190cee1753bbce6fc4ca988e9d798044fbb6
 DIST libreoffice-binfilter-3.6.4.3.tar.xz 5979564 SHA256 309c6e59693a60622a4fc02e5408a81dd3f422b0721340767f7ff8271c32c788 SHA512 83ca29b8ce813b9a87e20afdac160f51b67b7849ecc4dfc6868c7a4eb2146757d4f65f2e568d12f7ab9ee2eefcf7bd076860dd8466564683511e73d694d8f3b7 WHIRLPOOL 4d1f916448a4707142a821a1821054c489ab52d0e1f85fa8fe2d2ac4c99fd21ead35be21c1bc09206d834e11e9cecd6a5c3e98f46e2aa9e48b896d989053df27
 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.4.3.tar.xz 107228036 SHA256 8f72530cf153707ce29a8db578c64609678375f86930b640c472c7bb9ef699cc SHA512 ff80fd960ea07911969e99993fb530d37a194e3381bd398aad0bd64c7849132d5a5ff7b81a93eaab0e772f5ef4f776dc88d4ef7375dee546e5a537a7e4a9865b WHIRLPOOL 1a15e5012a20b3d701d20e89dffac560cf28667c2678cd21fc1a617c02b5e0b16ef55464b6fd6590974043b5b8c9be184050d15f920de394004868925ced67ec
 DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a953f67f754a9b7f913aad576ceef236db6686f SHA512 123009eef4d1ed342a4c23acf5ec52002cbe5f8083d1fc5d485e86f67f461765ebb34ff1edfcc0ff6d321de7f8a2bc40d87f757c66b3c2ac22785549f4098f27 WHIRLPOOL b275bded52e998e5a12111260123c7b3456d2dc7fba4e6b13ffda787b1712df4af4838ab426760f7abdb9824aced163a470255d83afb7daf46a83845bff900b8
+DIST libreoffice-help-4.0.0.1.tar.xz 1863312 SHA256 68432934b70645ed8e390a1fce73dfd9c3a52434e2384c30c11321aeef1a335f SHA512 cae1ebf2b282d0e93e169aa2849b5beea6d1a4b910b92067885ee605797aac7f08f4da7c7900f80daeb3105ec95c466a446b8468372cde497d80b8440f5f9988 WHIRLPOOL b31be242bd245a9af787aebc3d9f0baee7d6064c8262ac5a4c36d28d3304b73a06461a173aebf94bcf91f0fbb72ec96a310311821736657ee46c183183aaaab0
 EBUILD libreoffice-3.6.4.3.ebuild 17474 SHA256 ebfebf22f2c06bc68f4a63e2ae74a9f0f378b79eb7fa297ead8f4741a39ce162 SHA512 2e540b456c2eaa2624cded3fe929678c5641797f0c8fbf044b760ce44c53b8008b9b70b0aa41350510fa671cf7f595acf355d8a804fdba2c7b0b3015db886858 WHIRLPOOL 5ffd405228caa4f36c7897db21ff10964b545b2180bd65854d2a9ce7e09f9b70228a294a2645c6bcb94f8635e08b9215a6a9943a54d745a927d5ce546b09fd1c
 EBUILD libreoffice-3.6.9999.ebuild 17504 SHA256 63590679442804681a97aeb2a575da274b6da92761f61df81eda0a38352a5411 SHA512 90b2c48c1e9f9bf2b543eb09d8a5d9fda7f26291adfc7f3a3a6da8502259542a0bb87503f093e8383ec2c3f4cc15be67a0d87a5045518833eab2842f93193195 WHIRLPOOL d7f48a6495f6901e5e7989d63dd23b242488b040cc128374c96816ff647fb3f263ebdffe8a8d32eb5e9913c8d97f83ce9a39ed83926d106bf6f83a3c416880e6
-EBUILD libreoffice-4.0.9999.ebuild 17392 SHA256 62cb616261aa0ed155efa47af6fdacc8851339a0b1ffaf5ef1ea9cd5e2046fd2 SHA512 1d285b657d3bb20275fbd675df3f57fd6583a618640cb66ded30510bb17f2f1cef0b96b125a735d56a1f5134018d5ef2e2e193bf3893c0e65ddc5e8175e8c03f WHIRLPOOL 2ee2da2d80b87feb92cdbce0c9e3bfdddd2fcedb62f46787d3ac4cf09c41ab53142c87c40b3ccf3212d2c3f87670d53c9e922186ca7d38bd6cafc1bd35b562b4
-EBUILD libreoffice-9999-r2.ebuild 17202 SHA256 73478e9e5bb0b3900c56c1fc48016f09f9ea1a8ceb1012ff010c0aef818e4781 SHA512 581c4aba88a0863658a7ccf2fe15ded055393c639ce182885c5d6e3fff56100bc4efeb057908736485d6188ad85778b925eb3d68dcbb52672395f40a6e77e35d WHIRLPOOL dff80269517774135f51f347d44b540d8a7201b447cee9c7e033809b37078f6b76251e7998c01de89290adc50a39bef4adf7a69d1f361979ed058b730c261250
-MISC ChangeLog 77345 SHA256 d3ebc200f23c61ec43333880401afad69815edaca6d9a5265ce07d662744a4cf SHA512 06cdb41a66b22b2f31a272ec0f591eedeccd32d560506f9163551882c4cdfe8ed57ac86c3f9012e086db17a93b308e09e9023fdb667a787e28de85d044bd97fa WHIRLPOOL 0d7ce487feda957e54776af2057feb5b9442b4ef32a563c43527a51cd19d977d5a3d4164f2ee06927e6b0e0fe9ffeef108ce30dede82753474987d824d53fb32
+EBUILD libreoffice-4.0.0.1.ebuild 17485 SHA256 7f82a88690076ee5926db3c3b3a018b44b65314c9c1bb5187407cca0ff01a5a5 SHA512 a6649d19293b8834af76ca1ff7c9869dd7f3636f7feccc53ea8689848ee401d20aed8b2c26d0788d9ea0def21a4ec2f20e2b44b91d0dd2101d6c8a02b1544459 WHIRLPOOL d97c0e2971af088c078b6cb8da7a5b46ad13f0bc6b113e5f1f6b7ee7089fe75f8b202347e7ac58ac9b0cdd327c2f39cc75f917c1cb6ef454d31b96fefdf5addb
+EBUILD libreoffice-4.0.9999.ebuild 17492 SHA256 6ee710464cbaade9aebb91305ea036536968e756e0e88a5df3ce6416e4d8bc0a SHA512 1b365e40886f124582627fc8cac1e4c2f3e1a5617f351ed0374ed8c9d7a16d5bf65ecf4dba585fa5a91091d62c92fba06860f697fa988a77aa3ae9953e302da8 WHIRLPOOL 3f3e7b5adc9b16355c8c49d9ae6a164b9c16b48888f71b69d43367044f27097c9b2b1755b5473100a4c33b1443ae44f7bf0f4742828423a6e95016a1eff765c6
+EBUILD libreoffice-9999-r2.ebuild 17189 SHA256 061674b0f2c7c0a5d9d4b84ea93c95b7f51e555926ecc4c52b14cf8b9ceb8307 SHA512 2ef10956cc2c68f25f1465b09af9460f821731a275df8d599b77ed92e5f7a3545b3783bccd70fe70f1f0b530303e54aaaa45e523d6cb23567a052a27d3809b30 WHIRLPOOL 7697bda0ed88a55f0aaa86e4706d1b32f49a1c7118d71cac1a642c2dc03c48cd82c8f6a96d8822971bf40deba03765a4665ad7a00a2525aec363d81343ce9a82
+MISC ChangeLog 77615 SHA256 358f6298f5ebea0df754647b997a7e2d4e6608d731bafd160fd58e23d180c465 SHA512 980136fa1b09fd9d5418e40d8e322069bc6e28488ddaa31d0d75c559945dbd77eb385db6ed46e57f7c7d8cef2d009ec7daf6675b65a09e60771325d3067ed264 WHIRLPOOL 295453360a83cd5b8a26a659828159c95f9fa0424cdbdf362ec02380339d14f4d1fa9e16eee77596dae4419af0679ba99a0ebf06f2d2e59e18106b995dc628ab
 MISC metadata.xml 1316 SHA256 8f09b5b07d6954e7a7fe0b847c9c8e68b0cb9cb649d4cf2a800dbab6a1a42fca SHA512 a44703f5db81a9c3c5ac6600bf44a8cf5e115b9650bd12dcd09a351255a7fd5f8215fe30a300e5aad1a7c8578c7c6cab6609f56c19988febbc599ea84556b60d WHIRLPOOL 3f2d634b6aed5c1b41784517f1b6cb2a929f89c63a25ef140a13a12124ab26de660bf6da767a4be6b1bff77cc75dae6ccff8d6bba5ec23e7e269e96fc21bc6a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ7pR6AAoJEOSiRoyO7jvo+ZYQAKUN0yaLU5+bnjHdZy73xKOO
-cQUDQoWWJ9J+sK5wpDdEVce4P0dvPiYF6hY7VK0pg77KHL08sBejgYRmEPd8CW+X
-jTJR6UrJkdGJGxjoWgeQRAv4uga4C746sz9ycs5SPDJvO6rcf10EOjFgoTzAqaUt
-4Zd1qqX83yeCD7qqWy7V5ZjHpNwEUy3se4TbXr97YWF5M3SZzf7tpna038HC9sMT
-TJjQdsWDKUbdxCq/wG6erkNpqdvDFZqgiUE15gsB8/I1Z/WfXyOnCRlg2DwuKQQU
-A6hqyKtVc65FkUItsYjpbVcmTLaajrR8qdiGk+iMeoSkph+4xZ2ygpcA+At23NpE
-FYILZalMdj3t9tQ59G/WLlGOirA6KVk0y9aI5rfxEOzUOJm6Bh0iiqoV0SAgQlh3
-rRG00lnuT6vtjeadw0zGfIGYTzf5cScGeDCiOVwl6HhFt0Gcx0WgpR+Cml/i5NJX
-2OE9trFhlsCcuoN1J41UtA8HrmLG22TZMwWm3aMaNR+/hUId0nzTFFId12Bm/KoK
-pj9pcFTmOVddYmppr8UtuacDjwj9z3hvB7dysDG7i3GdFDDUozocOIzhgWG8/Njl
-yC5W6+y/wUBvjvui35gmXtbrKCIwBziK5nbZ4cAPlkgOnsn0R6cbIl2GPJUzWbXl
-/1l3wvKTEg5s2re6bYhq
-=5zaC
+iQIcBAEBCAAGBQJQ8IMqAAoJEOSiRoyO7jvoj1sP/22M+8NESuS+T2cNUoeg/oQv
+VICJSw6hH5IsaxnlHK98SuwMtjTC4pHAt7cZL83RcUHv1aF18+MJrbpPglO6Mwry
+zyhpzwe8JGB8Sd29+RGKqcpUoE/baCf6iOvqDdGH0d9GVY0s4+mO26Fpcsk1AIeI
+scbGRwf1afr6ZepMdWHTxcPxOYl0kfkQitwpwFdTuNys17rO/lMLlJHlnAToPrWX
+AfJPpAQi/ECwWZSG3GYSmw74eDJ8NRBhV/pK+6lSyJN+mpZDKjoSeXxx87rL2UxY
+b6IPNhV3Bcp9Sgo8nkE/9Tf5QJctpD2PKyo30ANVMxx3nijr+vUK6hq7UK8KRf+7
+DLlqxFk5XEom1D0x9qy6AQ2ZsL4UcT7vWduwDhe5Dv+oBdx5OL7YnqIZVXnQ2zri
+iF8JtaVY8iWrd860c+QOm9znhHY4qdWXf3UE/B6j44fQi0tA174qWOR0S/WEx7op
+X0xvoZvWLnn8QFXxjqjKhX8hU8BjMdfNHpDNEOqbs78Ujp2ni2VTqGGQ80VNmcqY
+gQcCcPPALctWupURQ0sm0zCp2qjsqy0q1L5JNif9e+x6H8ojEUzn95Toh87sMacS
+v8R094+WDBB4hlc/zMbq5KfapHk+ad8D0TSWfFIw38ezWrBNx384SYpJZQmZjhux
+tlI3pU1YiV68vwWdbJQT
+=dOg/
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.0.0.1.ebuild b/app-office/libreoffice/libreoffice-4.0.0.1.ebuild
new file mode 100644
index 000000000000..1c081091b77b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.0.0.1.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.1.ebuild,v 1.1 2013/01/11 21:24:53 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 ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Help is used for the image generator
+# We can also build translations and others if needed.
+# Core must be first
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				# core is now packed without it in the name, git reponame stay
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
+gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
+telepathy test +vba +webdav"
+
+LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+# report-builder: missing java packages
+for lo_xt in ${LO_EXTS}; do
+	IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libexttextcat-3.2
+	app-text/liblangtag
+	app-text/libmspub
+	app-text/libwpd:0.9[tools]
+	app-text/libwpg:0.2
+	>=app-text/libwps-0.2.2
+	>=dev-cpp/clucene-2.3.3.4-r2
+	dev-cpp/libcmis: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.3
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d
+	>=dev-libs/redland-1.0.14[ssl]
+	media-gfx/graphite2
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=media-libs/libpng-1.4
+	>=media-libs/libcdr-0.0.5
+	media-libs/libvisio
+	>=net-misc/curl-7.21.4
+	net-misc/npapi-sdk
+	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
+	)
+	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
+	postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
+	telepathy? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.18.0
+	)
+	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 )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-3.6*
+"
+
+# 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
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-devel/ucpp
+	sys-libs/zlib
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		>=virtual/jdk-1.6
+		>=dev-java/ant-core-1.7
+	)
+	odk? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.7-separate-checks.patch"
+)
+
+REQUIRED_USE="
+	bluetooth? ( dbus )
+	gnome? ( gtk )
+	eds? ( gnome )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+	nsplugin? ( gtk )
+"
+
+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; 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}/${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 ARCH_FLAGS="${CXXFLAGS}"
+	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+
+	# 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
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local lo_ext
+	local ext_opts
+	local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+	# recheck that there is some value in jobs
+	[[ -z ${jbs} ]] && jbs="1"
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-java-target-version=$(java-pkg_get-target)
+			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+		if use libreoffice_extensions_wiki-publisher; then
+			java_opts+="
+				--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+			"
+		fi
+	fi
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+
+	# System python 2.7 enablement:
+	export PYTHON="${PYTHON}"
+	export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
+	export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-mozilla: mozilla internal is for contact integration, never
+	#   worked on linux
+	# --disable-pch: precompiled headers cause build crashes
+	# --disable-rpath: relative runtime path is not desired
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
+	# --disable-zenity: disable build icon
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --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-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--enable-unix-qstart-libpng \
+		--enable-hardlink-deliver \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-gstreamer-0-10 \
+		--disable-ext-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-mozilla \
+		--disable-online-update \
+		--disable-pch \
+		--disable-rpath \
+		--disable-systray \
+		--disable-zenity \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=${jbs} \
+		--with-system-ucpp \
+		--with-unix-wrapper=libreoffice \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-afms \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-stlport \
+		--without-system-mozilla \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mysql-connector) \
+		$(use_enable nsplugin) \
+		$(use_enable odk) \
+		$(use_enable opengl) \
+		$(use_enable pdfimport) \
+		$(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 nsplugin && 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.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
index ca2a56e721f8..9a5b85ef7659 100644
--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.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.0.9999.ebuild,v 1.9 2013/01/01 10:56:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.10 2013/01/11 21:24:53 scarabeus Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_COMPAT=( python3_3 )
+PYTHON_COMPAT=( python2_7 python3_3 )
 PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
@@ -35,15 +35,20 @@ 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
+# We can also build translations and others if needed.
+# Core must be first
 MODULES="core help"
 # Only release has the tarballs
 if [[ ${PV} != *9999* ]]; then
 	for i in ${DEV_URI}; do
 		for mod in ${MODULES}; do
-			SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			if [[ ${mod} == core ]]; then
+				# core is now packed without it in the name, git reponame stay
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
 		done
 		unset mod
 	done
@@ -234,8 +239,6 @@ REQUIRED_USE="
 	nsplugin? ( gtk )
 "
 
-S="${WORKDIR}/${PN}-core-${PV}"
-
 CHECKREQS_MEMORY="512M"
 CHECKREQS_DISK_BUILD="6G"
 
@@ -276,21 +279,13 @@ src_unpack() {
 	local mod mod2 dest tmplfile tmplname mypv
 
 	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	if use branding; then
-		unpack "${BRANDING}"
-	fi
+	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"
-			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
 	else
 		for mod in ${MODULES}; do
@@ -405,6 +400,11 @@ src_configure() {
 		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
 	fi
 
+	# System python 2.7 enablement:
+	export PYTHON="${PYTHON}"
+	export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
+	export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
+
 	# 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
@@ -441,6 +441,7 @@ src_configure() {
 		--enable-randr-link \
 		--enable-release-build \
 		--enable-unix-qstart-libpng \
+		--enable-hardlink-deliver \
 		--disable-ccache \
 		--disable-crashdump \
 		--disable-dependency-tracking \
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 3d0ea939ec68..44e4e244fc14 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.147 2013/01/10 10:13:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.148 2013/01/11 21:24:53 scarabeus Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_COMPAT=( python3_3 )
+PYTHON_COMPAT=( python2_7 python3_3 )
 PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
@@ -43,7 +43,11 @@ MODULES="core help"
 if [[ ${PV} != *9999* ]]; then
 	for i in ${DEV_URI}; do
 		for mod in ${MODULES}; do
-			SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
 		done
 		unset mod
 	done
@@ -234,8 +238,6 @@ REQUIRED_USE="
 	nsplugin? ( gtk )
 "
 
-S="${WORKDIR}/${PN}-core-${PV}"
-
 CHECKREQS_MEMORY="512M"
 CHECKREQS_DISK_BUILD="6G"
 
@@ -276,21 +278,13 @@ src_unpack() {
 	local mod mod2 dest tmplfile tmplname mypv
 
 	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	if use branding; then
-		unpack "${BRANDING}"
-	fi
+	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"
-			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
 	else
 		for mod in ${MODULES}; do
@@ -405,6 +399,11 @@ src_configure() {
 		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
 	fi
 
+	# System python 2.7 enablement:
+	export PYTHON="${PYTHON}"
+	export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
+	export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
+
 	# 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