Version bump to 4.2.1.1 and 4.1.5.3.

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

4 files changed, 615 insertions, 9 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 7e81710b625e..35ef4dc1a731 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.540 2014/02/08 14:06:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.541 2014/02/25 20:30:30 scarabeus Exp $
+
+*libreoffice-4.1.5.3 (25 Feb 2014)
+*libreoffice-4.2.1.1 (25 Feb 2014)
+
+  25 Feb 2014; Tomáš Chvátal <scarabeus@gentoo.org> +libreoffice-4.1.5.3.ebuild,
+  +libreoffice-4.2.1.1.ebuild, -libreoffice-4.2.0.4.ebuild:
+  Version bump to 4.2.1.1 and 4.1.5.3.
 
   08 Feb 2014; Pacho Ramos <pacho@gentoo.org> libreoffice-4.1.4.2.ebuild:
   amd64 stable, bug #500622
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7999341acf80..7bd1e8b7ae4e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,26 +19,39 @@ DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2
 DIST libreoffice-4.0.4.2.tar.xz 104213468 SHA256 5336734757f721139d6615eefed0249be1461e428e2e64f592ce3c36a661b154 SHA512 4d9c14df08e713b7928660983243354afa524f0f24b9c6b7b40f4711396418d960103519851f3dbc4288576ec7276d4c8acfd1d5bb60a2663a663f008f274596 WHIRLPOOL e432c4a6b6a27a621578154aff607a077e8f1ae32743d3ea45565b0e5d08a1b57b975c631c807c3fb496b4e88a0859a3c2bd0dac60b80dc2ccdc6452a8808a5a
 DIST libreoffice-4.1.3.2.tar.xz 121871896 SHA256 795a3be31dc7627c1a9c3278f93507c476097bc8a03c1f5e94814590c8504823 SHA512 c0008c0729c5f80e69db3344e7e3191f79ac6e7e033e54ddb7ed8c856e04ab642fa414b3ee9f677a388ba6f5763a4e57d31a6f8b714125192cc068b58952397e WHIRLPOOL 697d9ad8888f63eb6b7556f1d6a9a17b142245c6008b8392cffe8342c0002bf37256ad9b9b937e542020156a07a702b56b86375746e29d6d9854613c655ad9a7
 DIST libreoffice-4.1.4.2.tar.xz 121954220 SHA256 18bff8f45919c5e4be3b3355086b2f2336cc42263312f5b420be8d61daceb0bb SHA512 64ffbe563d7f8b542614903f35148edd2ba8ab074c0fef80061acde653b0799d37b8f2e6b883613315b88334b39a779e428e87999a36714f8ebd13e5b3f3c918 WHIRLPOOL 74e78f532d0c3016713be31a7b250e5005846f4ddf0cfb4467e7e637d28bf43bc5f0297d1c025fa8352581691d7d9e7572dfcca48d4b60dd888b6102282a8a47
-DIST libreoffice-4.2.0.4.tar.xz 123114364 SHA256 f8768071886506048a126abd2c3c091b054beb6a489ae0a33d86c64914e797df SHA512 df915fb938c565e61832a78cd2a0ef60aa456d1ac73a9431151e3ce27efa8657cf60748101b5309bc6d88cb1001ab65f2d39c55058c9a53b8236bfc93b032e53 WHIRLPOOL d8a70eeddf6ad12c010ac5d38167279549bff1879ccb2d56018b970607d00712f6c3308d14acd45740c055405afd40b97da0ec14c697860f13de3100c277959d
+DIST libreoffice-4.1.5.3.tar.xz 121988752 SHA256 6dee23a8e2fed792dc68d22b6ca4838a31213a07e7b0a04dc16511d714f06eb2 SHA512 262a35ea627fc70993726606352565733774307f6bc75f02966fb7c85d2fabd41142cd9dfb3a28ceacd49199f26474b0fe3ea4d2c08417b1850075de0d7aff84 WHIRLPOOL 660e63083a05342a710e81cbb785d86202dea4f4ef0c5f44ccd059147377cd443bf9c1d0aa3068f2bc45e89c936e4ae2fc22a765e0534e3cddfe2b6ac7a59eee
+DIST libreoffice-4.2.1.1.tar.xz 123167692 SHA256 792f08639ef2a0a81dc1fa40ca52d35443844279f4f87af260e3c7414a312c57 SHA512 9f8361e887bd834058b64940b7c2efeca1c98fbef4fed9cec8d1c610399091936503e48028d07b63a8f66989a30ac395857d408a0fead36d3ca0fc2b7c409677 WHIRLPOOL 46d11133d358a297541c631b1c4d35b314e569eff0307aa532cd216838dd282d7a454d6233300e6dc4204da69df276ca07654736c0654b0ca09617dad63967a7
 DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.0.4.2.tar.xz 1855588 SHA256 9d7f732760b24b6916266903913d7684d9b933640174b1e041d729914beb5a4e SHA512 848329df801dfba2b06006325371e7a51354bebe0e99ba98aca14d3e3882de0ccde902b440cb1e47984585350f7e4f48b779b36281d9844251e802245633bd30 WHIRLPOOL a7048fbddaa81eb0c97f86902054195c66f84babe42ac1e088338ba019b07283a9049b70554800224ad50ee9097b2e57b4493527177a9599d9251c42894da20f
 DIST libreoffice-help-4.1.3.2.tar.xz 1848664 SHA256 380cc9d0f35d3dbba25629a17123befd2329bce800a1e63bc2a43725cf0f3eae SHA512 ee9a3a6b95fa78b3287eb647f0fd0409d6d7c02ff51d808b26cda6957fab1419e4d6b2d523b619c2e4b37167be4a7727281ccdf0504cb1f5c7b942e5f8e35f61 WHIRLPOOL c2952c3a4423aefd0a0bebb7cf6d858886ec0ac5cff5ac7cf462c38033cda3a3fe61e2fb931a1847b698874ff070a086d7d4aa02064c82f8813130cd7699cdce
 DIST libreoffice-help-4.1.4.2.tar.xz 1849668 SHA256 1e33b1b9626045c26fda9ad50cb03405fb00967375af05d28fa24e98e790c15c SHA512 4fd83ebd2340219822e5742a082213fb18d7fd283f656f791152d8976e0c674cacd08b30c1fabe47b490f8d44c89b0e56290fcf577c82a220dd2dc0bf1dae826 WHIRLPOOL 9bbb123cd94fe97aae691cf1a422a763917af64c06f08f8fd621e71f99af4e715ed13104a75e13ce8d7fe44b2d04443d9df39ce7ecefe652975c7fb941e5f6a1
-DIST libreoffice-help-4.2.0.4.tar.xz 1854864 SHA256 3357bc3f1fe3d13172122b3a7cf98c9d408989cf454e14fa78f92ad5b67f0dd9 SHA512 39d14120da1543d13818a0f1c1c02f5248951de82a030e340a841e72fd97755cc86422f63fec69b8d9e23329a9f1cfcb666c1d44173e8f054e0cf27951e01001 WHIRLPOOL c3a518a8e19fc4dc2fb7c79023035d52dfec39714ed7a079b14aa73b12e24fce6f008af42fe782069f78922793c68b01c76d5ecb8a303aae12fd7e474e1fce75
+DIST libreoffice-help-4.1.5.3.tar.xz 1849276 SHA256 97481deae1616ca07b748dc0842b608a5522a46e1061823978496eb2a2e7582a SHA512 51bd732292ee77186e689c8bae2c092c416666087d97a93a5387a05f1f4b934087750ec5cb974c76388701e391cc0b7b3b0f252c2a2105e87acec37ba36e0d1d WHIRLPOOL 8dedda850bffa324e7a5f0fc83ac5a6461e820d6e2cf2a6a9b6c1a243eed00304be508482a49e43509316f43b94a3304d497df0f79090f38fc9e5f266a6892d2
+DIST libreoffice-help-4.2.1.1.tar.xz 1854972 SHA256 8e6bb1386009d2487b0c1bb6b1d17e3b03d94547232d7cb3075aac690aaf3779 SHA512 41d157471dfad1019696c708cc2df812c8a73f5b3c0ccb0245380bf5df2bd0ce4a9e24386166441a1f1e1bfe65e6c27332e8e8f82f13d0ea6995694939d4d00a WHIRLPOOL 8daecaa5d81dfe570e8e6419d5c1c3f80435811562c03ccb920dd04cc02a026e959a5d2bd0f237cd7a664a64819399c8e83ad9437963ac53b1a4d0b2facb4015
 EBUILD libreoffice-4.0.4.2.ebuild 17560 SHA256 7987c4166eba595234087cf2774ceb1129d7513d26f6079ac480e25445a95d53 SHA512 f9696b2b89aaae3971de5d43a4c036b69e2383dd7a96b1197b602d0b8491bf581e09feae3ed90b560aa53156aa88a4213cc79986c2ff7d44c1164aa06b8fb271 WHIRLPOOL 77f55d8ce57869013c4d1b34cd9d2481779afe0e3cce3e6d851c45901dc52c779affb5ba9b56fd3308d17c06ded53ed5b31ed657b37061ab7ae24f8d72032464
 EBUILD libreoffice-4.1.3.2-r2.ebuild 17613 SHA256 0c494bb1f7f7eaf6854b9e1832215649beda560eed63acbdb14151fa6c2ab21a SHA512 1541e0a4eaef5376d80801ce3d570f1cf67b1938cdf36809446984a81f443742b6d2ae29d8e0852ecd21bde4223a4c60da58425b3d01372887d1474a096bc775 WHIRLPOOL 8d9bdf9ae2114b0ef4220c659134b611fc083acac84066791de3fa773ccd523efe81e204e7e542313d7009019ef3588b95f2633c48b958a0acb15bffe0ae1773
 EBUILD libreoffice-4.1.4.2.ebuild 17670 SHA256 2251ddef86ca4e6f37b00d549bdf22b7d2b647ecdd9fe5865f8c8320a3628f62 SHA512 5f95639a9e57a52432a07323a774018de2af4d4f0a1f5ed11a1d868b1c5f73a4ec7c18a733bb8445e2c27614c4fe99176301882fc5e74f52d48d35d8d93662d9 WHIRLPOOL 51d901cb29382304a80107aa6542a735a3cd6d9f28b144484f06a651f7422eb90bbf93b84b854f1e43a792185cfd663b5abec3585ec1adf28a887ede12c17cc3
+EBUILD libreoffice-4.1.5.3.ebuild 17675 SHA256 b0ddc0fb9af342d3b2a566c7678157db84b6bc27e6713b73e7ad60fe32406a3a SHA512 b8ecff445b9b9499016a966ad92ce3322ec7542ff20ca8a489e773e35d2b47aeb39a7c83b4d1ad67ebbd40eab83990bd1857f7c69ec622400f56c5189ff7b623 WHIRLPOOL 19c222492b94319d4df4e8e149fb8392699ec04999554881f51fbba4282979667f20566edc0db00d75d3b689e80083a5283d19d7f79bfe4b4e7b24717fac278f
 EBUILD libreoffice-4.1.9999.ebuild 17677 SHA256 1993cb863c0fa23ab0c72f623b3f9e176bcbd44588d6237ac01e91493fc14e60 SHA512 4b826f3ace323ecbbd23bbabbbf305ee800a2ed70196ae7b14c37cef1775d419b1debbeb1afd1d02d978e2845eb45d554e0c01244339aa2e36753ad8dd46f832 WHIRLPOOL f03545423d8dacb1a16f1c005aaae001b26aec777774e8c0ac57888d8bcf2a6e159123ddf457a2f138ad8da6d645526f2e5ea72cfb8ee4f47db65abc5eb864d2
-EBUILD libreoffice-4.2.0.4.ebuild 17768 SHA256 3551334b0a4b71fce644c44baa991aaa48354c4bfb078db4f8fccb4ee933c1c0 SHA512 05453ab8e4bc45644372993b1c6548139a00c1599e44692e299ad07791f48fe793f6eabd99affb716532ce8fbdc8ea197649bc49c5e88589b9f16e88d14ca74a WHIRLPOOL c3e4cceade4b3c29ce6933f9dd17abb450055a86cb40a2e017b10c64e04b08ef0bc0a668818f56219c7c910d57ac3ffa8af039646f0b1aeb08e950c5978cd5e8
+EBUILD libreoffice-4.2.1.1.ebuild 17768 SHA256 47f5fd34ab221bd7dea9bdfd1513aefcb58c52809734023cca2f07140e906b9c SHA512 05ac84da9471aefd154abeb1e6c836fdc75631e7bac4610be8bb9f4475226702421a6291ada49c804ed8678650b0f9b35e97075296a5900308c58d696f19b9d8 WHIRLPOOL 11ca7a7f90eb6f38ad2d47f8da452add07dfd5eaf73d1244d12064948015cfb933dbd594eb90eeda44bce639cb88b78d7c518041573cb343ccb731d984f2e354
 EBUILD libreoffice-4.2.9999.ebuild 17769 SHA256 c73f8b6c12ba0b836d5a59880bc311c6b0c661211dcf3e8da22c92256eb9b1e7 SHA512 8374864c0b22f62fbef6037ae36bcab30774b682504931694c3bee66d8d9f05aa8971c4decfe878cd8a944f59eb57e8e70993ed7e7efb9df01be19ac19c2ac37 WHIRLPOOL 8db44d93b68dc933b97a7e1d613e9785e53d7da105f120504ac907c86862f9a3e49cbbe553c6e1841fc5ce56483796c4f3f43bd452974dfb692e4dcdd4a5b2ba
 EBUILD libreoffice-9999-r2.ebuild 17697 SHA256 ff50dbefb2b3d0643edb662ac9a12dc80fb7a236b0b104b7ad47de7e91db4e88 SHA512 f1376f38a2b84f4bfd4074c591e6841f37900e85553eb7a991554d4dbc071a54202349fcde2b8f2de673da8bf98ac502c43e8d06a131c70e3280f3d8c0dd7865 WHIRLPOOL dd3c870da7fc445bc5d523e2376fb9198fb2f70ee23f85077dbfec6a3b4bf6594a745175f36994916a00c6315933958d046b6846173d5f17ba917c310e6406fc
-MISC ChangeLog 98041 SHA256 6998701d3ad673801f278513e2cb22ee7ca2789b69f4bef63f3fdc5992aaa367 SHA512 02382df5cac8db74f336b6bed3b2af9a9279c32f4055716574e5a4eab87b8a50c5ec841fcf2621d80742025c673e7c7c3721affc3cb8e5cda112baa86d85928a WHIRLPOOL 9e09ebd5b8f70cb7afa16633fa25dbde3aaaccc3fff274082d16bbdd091c18c14825b890367c6c18c5479894f1960c2bc265f5f61730ffecab51ee739af4d149
+MISC ChangeLog 98300 SHA256 17c263dc51479a1a0e1b9d9478821f07f8492d158828f6ac7b473f69bc1dad94 SHA512 3c761049ff3fa8e8fe333462fc6f17fca844b35d5b92e98fa5b351f095ab80fd310295aa3302b444451ac14752f522f3ebce7f74d913be2f82d1a4b3e0c225db WHIRLPOOL bb4abf5d48d54708252b48ed94caac63a35bf14e044516b690a34548e5bec6aa511c8cbdf8044373d8f2c733ba0f3a9fd6ae7e19a1c0717be4c0fa6f4d745d47
 MISC metadata.xml 1057 SHA256 fae4981111eeb4ca46bc24106d32559f0ae4372e60b38433b4eebf748fead545 SHA512 d249cec1b2ce6e600d34034fa961ffbcef9bd5b0d614dfe043b414ba105e477681bbe0c9b98f982ccfc075f98d409c3897f76b6eec0aaaafb7f3d841442bd355 WHIRLPOOL 73de668873d556236dfc7b86cc197f8426c4e1617e860df1f60dac51cb68e620b01d335fa6d9553927adfb0aba3a349fe6f4baff0e994ce078833b2bbd17b682
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlL2OcsACgkQCaWpQKGI+9S0nACfb7VImaB/b8Yum21brieoLWj2
-AGgAn0lnm8jZ/FiO77ZnD/gn5YO2fAkX
-=v87o
+iQIcBAEBCAAGBQJTDP2WAAoJEOSiRoyO7jvop0gQAKHkhnauCC5cQ7G7LvQDmiBz
+KT4ZRdsDUof8Mq1psg/2Yp2HWpUksHw1Zu/TQ94hkpdlygClTo9Ypx7z+W2pQG2N
+RyXGm251uluXq665qFJiddpIhbAZf4cowY3dH5dtJf8kgHU89CRIKiWboVax+VTD
+A8yp5dXEJbHIwwWIyCsVnlCSJ4JAlVya03xKdJoAiZor7IJ5wwKXySc1rPbsGYgS
+85iKFC7ELlr19dsr6oTvP8hphPMfXrwAIzFC0WA00kSsC7+rpctnfZfHZ2mj0SPU
+TLXoiQJcCMKgvow/Hsm2m6mdtEcm/0254jM4N0ZJBrUhOO7WWNfOiNwz/5I0n6Ln
+/SqUl4P7I3Nwlr+Y9SiVhOmgA/LCOGTO2hMxPGz5I+t26TcuhuzA5u8gv6MfEAXI
+A9nm38+hVgxW3Jpr4FXPN30MmCGVN1a6p9rvQcENsYnqxHj6s5U1C6r0eeT+WkAn
+RtdeCT9/ZOo8REO0zOdeBiHE2SiWqntuIFsRuOo/aLIwioHRo2lTqV2Ht2941QpJ
+QUhTuET5TFtjI5XytaXeTuFAgqraAVdfP6yzGylKe36OVauRqXRwJlP1GqDtTvI3
+pgDIw0yyJmjj+l9UvjAUdWDcBMIWM085WbD9jEhhrWg7bj1XYCMOB9IkCDiW6lCY
+HKY6PLRXoSMv+yQVyFGH
+=l5hQ
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-4.1.5.3.ebuild b/app-office/libreoffice/libreoffice-4.1.5.3.ebuild
new file mode 100644
index 000000000000..db5ecc1b75b3
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.1.5.3.ebuild
@@ -0,0 +1,586 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.5.3.ebuild,v 1.1 2014/02/25 20:30:30 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.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="~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.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"
+
+	# staged for git master
+	"${FILESDIR}/${PN}-4.1.4.2-curl-config.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 \
+		--disable-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
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+	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/
+
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	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.2.0.4.ebuild b/app-office/libreoffice/libreoffice-4.2.1.1.ebuild
index 9b22504810f4..b3e32003b00e 100644
--- a/app-office/libreoffice/libreoffice-4.2.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-4.2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.0.4.ebuild,v 1.1 2014/02/08 12:14:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.1.1.ebuild,v 1.1 2014/02/25 20:30:30 scarabeus Exp $
 
 EAPI=5