Stable on amd64 x86 and ppc, drop older.

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

4 files changed, 29 insertions, 599 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 388d0c8a4bd1..680ec748dc0f 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.418 2012/12/13 15:29:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.419 2012/12/17 09:49:26 scarabeus Exp $
+
+  17 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> -libreoffice-3.6.3.2.ebuild,
+  libreoffice-3.6.4.3.ebuild:
+  Stable on amd64 x86 and ppc, drop older.
 
   13 Dec 2012; Agostino Sarubbo <ago@gentoo.org>
   files/generate_libreoffice_package.sh:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 28bb430ff5ab..8d12606ba2c4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX generate_libreoffice_package.sh 5213 SHA256 293f8cc120f9342a46017caf792e5aeddfaca412e5fc77acb4553d01c4500048 SHA512 dc3d93326c30abaa975bb93eb760041e1cd01569d0ed28a041b11fce46e5e8494757133950af422e402a456e9116078e866be49880f1b0e356a670c3d0742498 WHIRLPOOL 5d8d5445bb69ab8e7443b83479786aced4386806fc065761141d0b2bf7e960cfeffd61bf47aa9ee9f661cd8a0122d14b0d56b7bfec2fe7d00c551d1ea149b097
 AUX libreoffice-3.5-doublebuild.patch 887 SHA256 15dba3ca6be47bffe26e9eae73ed356a3e75fde97c5000b9a19b61906af8f5f8 SHA512 42d460f2b5ba578bfe9bdf0b6ec0a096778fdcf445a449524e6b65b8accbe4a0340b8c818a6aafdb1d92ac58a1e9513488c26ff67f370ea356d7c1cc0baa524b WHIRLPOOL 9be5eb7b2490f2d4820d961ace029c98ee13fe9482d4967efdb20f63659e4dceb9aba4df7aec8d688a3dac41ca22326970c34add5232a62676d4ec7b5e07f820
 AUX libreoffice-3.5-hebrew-icu49.patch 5661 SHA256 169ec723b1453b932deefafada3e4dcbc038a336c427657021e1de8afadd8ab9 SHA512 6b6c93092bc34acc4030ebed056ad189d1eefc2081521b1c995ff81b5ac52760e7f631e90a94c7165bd745c7685b43c0e7b105deb37b40b6fd7e767e64e7ee1a WHIRLPOOL 5c2c09462eb770a2240469f972be4b99329674f2a056d56d3fb1cd539da9551a4d4f85040d936e77fe3bdbdfe7e991c47e9a2a83c5906ca7848685498a1f2dc4
@@ -18,22 +21,35 @@ 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-binfilter-3.5.7.2.tar.xz 6061416 SHA256 ba07bc9b488d0c5f0c207ac7ab04e1d86b47018bf3fa77ef7562e28937485374 SHA512 3824d3ec845a2f0fdd4dcff3db8c7981f46f3b5ef541fc43d7ad0843f6093dcfda92ddbb406b4c314ea980335d74c2ee76c4f491ae38506689486481fc1d6196 WHIRLPOOL 9a637f35233c5a297f3209ca6d4c9bb2654fca5f8f171f689048de79fd3537bd8071c252c6943b284a71876d0deace76e35e28fb27d89d39e333dd3993a357ef
-DIST libreoffice-binfilter-3.6.3.2.tar.xz 5979916 SHA256 65c27499468866ae06851f2686f904e991b0ae93abca3972e6a0202f624893b0 SHA512 4ae53b9aa61db7b741de47640c6d545e21b16021ffab2396c2593806c41909a0b8669cd37d13de03dd6e6858afee3f4835ec5846f7241561666f6e3608c6f5a5 WHIRLPOOL f3f905932b816f5ce849e97311f8fe50577e9487f06424fda281ec7b808740e8b01c8df5c6e127c6f2ac66c8c01b1adb370e21e92d52e679d8d118feb22c50dc
 DIST libreoffice-binfilter-3.6.4.3.tar.xz 5979564 SHA256 309c6e59693a60622a4fc02e5408a81dd3f422b0721340767f7ff8271c32c788 SHA512 83ca29b8ce813b9a87e20afdac160f51b67b7849ecc4dfc6868c7a4eb2146757d4f65f2e568d12f7ab9ee2eefcf7bd076860dd8466564683511e73d694d8f3b7 WHIRLPOOL 4d1f916448a4707142a821a1821054c489ab52d0e1f85fa8fe2d2ac4c99fd21ead35be21c1bc09206d834e11e9cecd6a5c3e98f46e2aa9e48b896d989053df27
 DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63 SHA512 a915973e1566414fd8fdae67ccaf426a9543cfa4f2549b39e7da0146c975d568d2e222835a259f4bbe6d36979b956cf65a7d28c7a5b3a7b8858e8f731acf33d9 WHIRLPOOL c2beb6b4220a99820eade85784638b883ea3b9293f6714bcce65dcb91fd617a1712a19327377d5fa1c33ac7b402749e8a29daa72f9ea9672d24607ce27cb82fc
 DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
 DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b
 DIST libreoffice-core-3.5.7.2.tar.xz 105115768 SHA256 de03ffe76e3b7c636755f8e08730f606cab62e95df6a17e6b2804e5233cc8fb1 SHA512 cfb5990117c210a4a85d4f127dba09037e7cc184ef80d4545be962ea67a245c6c07550a6c3f59866919c98145227669bc5ba3fcc2034a45cd2dc87bfecee5ba6 WHIRLPOOL ccece4e1ed5854fcf226b31504141120b4c38eb2bd8e8fccee02f82ef6d65e5c197033dcd94a6815b331c8c5b1ce9200713faef0ae98386007cae27c2e64df89
-DIST libreoffice-core-3.6.3.2.tar.xz 107194308 SHA256 260d4cac0ea18a88af201ec8b2e39dfb950b9c06d378876118cff0f7f0ed6d78 SHA512 f91322a2dc548b6e898619457650c6df13e622f1cac823020eac722d50c434b3729e3727441264d5d7382dc9586f779c0aadb0f4a2e4fc79b2f9321535df9657 WHIRLPOOL d42aff70aba5194c0ef3be07a9d34af8f6b0a01b49269bc2f6a499e6793390e1d01c20deb55f54498c9072c6db925f4f76de21b349a78a66c5e0313b0e15f569
 DIST libreoffice-core-3.6.4.3.tar.xz 107228036 SHA256 8f72530cf153707ce29a8db578c64609678375f86930b640c472c7bb9ef699cc SHA512 ff80fd960ea07911969e99993fb530d37a194e3381bd398aad0bd64c7849132d5a5ff7b81a93eaab0e772f5ef4f776dc88d4ef7375dee546e5a537a7e4a9865b WHIRLPOOL 1a15e5012a20b3d701d20e89dffac560cf28667c2678cd21fc1a617c02b5e0b16ef55464b6fd6590974043b5b8c9be184050d15f920de394004868925ced67ec
 DIST libreoffice-help-3.5.7.2.tar.xz 1905872 SHA256 b8a645053eaf05195beaa9118f4ae59512d6dc7e76fbfaacd2c70dbce7965857 SHA512 000718aebad278bd1209130b873b16089c791db3ffabe95333dc4ba9d519f05d25950006417337d23d9ff7f983a4859d921b7e618598a4f0f4f9e13dbe8bc84b WHIRLPOOL 1eefaf8f4947659d39a3fbc4aa9e6d1e14b0b839ddf5a3e8589f125f127425bffc5cada82674a28f23598765ccf40d19008f311470c97871c1b42bef2315072a
-DIST libreoffice-help-3.6.3.2.tar.xz 1864084 SHA256 954edba6f6109037a001af97ecd3d755a17fb3d68e5cba688313bbbdf8a500d2 SHA512 d9747a34d36fc5eb806c9cd294fef927b802185301f7f1a98b50ebae8411d3f9b2abe4b8d16514e14d3e8fe748e53a111c783120944161d24ca662da0b05de51 WHIRLPOOL 14ed04624657a095b8cbaa2cd07fa9f96faac1a3d2af45081b12beeb66948efa3868f9729095b57c3a55cc19cdc4bb4dc492df4e57dacacd70fc41d9230bda91
 DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a953f67f754a9b7f913aad576ceef236db6686f SHA512 123009eef4d1ed342a4c23acf5ec52002cbe5f8083d1fc5d485e86f67f461765ebb34ff1edfcc0ff6d321de7f8a2bc40d87f757c66b3c2ac22785549f4098f27 WHIRLPOOL b275bded52e998e5a12111260123c7b3456d2dc7fba4e6b13ffda787b1712df4af4838ab426760f7abdb9824aced163a470255d83afb7daf46a83845bff900b8
 EBUILD libreoffice-3.5.7.2.ebuild 15682 SHA256 d86d6b532a7d1c8b66a7671e4db14d0f5bf25d61f2d0fa3fc01d9eb701d99c9d SHA512 b8388601186c29d43b26222a8f0a8f77c3f0ac468c068f284f7498a26d42685eabc61b22047bc94c5509fd796f1b95d3ee9d6a5e88370932ec1d9c37327a23b5 WHIRLPOOL 4a1bd0e270e83d3282ab768ee19c8a07ff79566bf9d3d0010dd6aca55ed5479aca48f4c577e6d90ba47af7bea4b40e2ae0c33f8e8ef4f9388c56ca5c1bb7887a
-EBUILD libreoffice-3.6.3.2.ebuild 17752 SHA256 18c3091c018aab01bb0958aaa055f578c2ef7ba68c8dd1688befea54d052e6ec SHA512 8e4828a684171793edd818a2a87a288aabc23212a1a62b533b6254c9aa5c05204d30804616607aaad5ba8159d98d4bdacd3efc7e066d2937d8c137990017bc70 WHIRLPOOL c9f8f0d280492e30f82a1ba87ffddb48a877785216e0ad2e6a5ab851c5c5bf298585a867a27e83235a3bc0be48327ae1b0032ddfc6539a27433bc94b82fe09f7
-EBUILD libreoffice-3.6.4.3.ebuild 17477 SHA256 1192001cf892b2151e02276362adef491e7f20cdb5a0b879363260c2fbedb275 SHA512 ce50933ae4e12d191b1575d2d334b8758482ca7781adfe466f4a73e4294823c0dc6f41a0665f83e82b5f2cfff4d1752b113312d0bfad572ddc6b76d30a305943 WHIRLPOOL adb686e112f31b7cd9f31003b9c6ff93d3fc9921a30c46f098f61fe9bfce551df37a7ecb2326d5bf974ccb7f953b79c96888f45a42e08b2c9b0cabee91c3755e
+EBUILD libreoffice-3.6.4.3.ebuild 17474 SHA256 45864f14c1be69e169dcd53d7381480e08325764e87a0885a9d2d14d0e3bd0a2 SHA512 4dac58e96fe89c64811632cb34432ea2fc89ac55811259ecd9f9cebc7f312936c58c22431eee14a0d0f53a13d491e4be1618c5fa6215c25b627b99e2e91010b5 WHIRLPOOL 4e9925c2c749ddc85c8d0eef2b5b1348d2f71a5e3a35d17c6ebbb7b1d635f500f967a62a9a77f0975d12a9b8487434f54f671312d82f175bb26a3fb0a1b7cf38
 EBUILD libreoffice-3.6.9999.ebuild 17479 SHA256 15a5118aa526180063a8ce70bb833d08dcbdbdcff869de13b09d1a50013dd347 SHA512 5d25ff67d51d31ac5aeb4ba7ec25e65f213a80d676b92dff81b073e119d0c825c44da5916b124a7df470eba3f03f2856039b0b0e126ff911a0137dbb7d3d8ee9 WHIRLPOOL 3945486c2be650a19850410286cc257fa0bb861e29a3d201a0e9dbade4dcd84ce81dd038ba15157d9adb49de9f01dd1b14bd022b3712b7e971bf510fb9884a10
 EBUILD libreoffice-4.0.9999.ebuild 17399 SHA256 6414b9a30bb5e902db5cb398c3e0b8db517319c8559a8aa4fa0dcc2c455b7059 SHA512 47b6bce15fdaf4b5f44d2e41ffd45a6ad09d92d1abc370444438fb339bc2f693ce197b42d55c0e6998a3b18772066dd1f901e4fd9e82033877df254711c4e89d WHIRLPOOL 8f6700c30bada5c58e0113506596ba3f0ca8f94b2dfe6fb4a64455d27e1adcfd87dd2ad3624f8e41ce9b0983c9eee751488a4e6dfab46031b728749535a17af2
 EBUILD libreoffice-9999-r2.ebuild 17179 SHA256 097d6b1cd3a00802c2135c10584e6bcaa869fcc5b6b5999571cbd405c9d8eed4 SHA512 43067bfd3978a6a11a63ccc4037e78c5fa0998013395bc94bf1ecbe0a92c70d57dc174ec92204e9f827dc2fbc9e982436a9b762f20ce3630cc9cd8cbe3eaacbc WHIRLPOOL c01948bc837e1f3a678b3b1b0c262dcfca11e71810e8fa0b5c9a586d93c4fd431280b10070d3b1fcb6646d7fb4545f65796ca9fa356df085f1fdea4e6229cf24
-MISC ChangeLog 75477 SHA256 b673dace63faf37da174068c2d73793cfa562270135fc705a0841b3d787a57c2 SHA512 754720c9b681b9c827e39583f30443f7ececab635f6f794bbb99920028ad28156000e27adc162cb94ab65f0ba82354f391c0a5b3ab7221f6ee492610f111a528 WHIRLPOOL ab392ae3571146b16ae33791f3f197ad838bb98bb9f81ca71fe3d116fe9ed8d415d14bcd203cdab14a6f5e301861dea999cca18b3a740e3eb1e0b37ec19eebf9
+MISC ChangeLog 75641 SHA256 01085fbd903771eb89ae248bacdfe43af35b20c2883ded82115ebcbbe32a26df SHA512 6ad01208bcd3ee7a81850132f1ec5774d26f49909e53851e86d4c3d2074d6cd913e463a54a0483c4f38ee5c8bf056c4b851ae590362fe162a65db14904bb13fb WHIRLPOOL a82dc4d430ff831b356b3eac9cb30baa9d8a14c1e60495a7e296bd5786f13f1d5cc6c02d441c4ce7c913ae48e6c280c6e9ae440386d79c5494910c21ece1f7e1
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQzuqSAAoJEOSiRoyO7jvoKYEP/i7jQM1BcXdubBBfW9imIs9t
+wcpahy/fpypc4DuakUdBXl6pMsZ41W+ShmET08mfLXfwdqoXqvnMydJMpALzJ0W2
+bN4eQF2CFWAi1Qel3i3O4Ldo7wETN2r0/4iUY8pUWmk1frO+xbC11+4ec/BtlwyU
+7yrkiHohh/VLdHUg4q0EHL46625+fpiojMAGwkpq932SqySIK0r/KAyzzl3t3LeT
+4hNN87TjTvx2NoXsT7SwrU/jFNojYMzOYNZjCyxmv6Zx0Fh4Eb8XuYJkEbj1CXja
+t3WSifDGN0yICGUFcpq2mSuh/17kf6Sz9xHTgiLei1cf5eHq6nwKs/n5krBM4LmP
+GMSWpLFIb7OkkrWlDnCc6V29dtvzKNE3zCI17111kqUIa/h/rk1Xd5pPObh5YsZz
+5U7cyIpCGnftC1d2HqgkMHxbaiI90bVdgiH7oErPq8jFq9eQOa0u1TbaEj3pHllv
+1MmqJeBycFUgjj7j1e80VR1BPdaLRJQZgwtUelvBrICdhsTom3/glalAKiDSRlu0
+bDyboaSSr0jvSwkKZhTHiJUTCzpvTS+KPGERp/WAOo8o3zvsfPGWoWQWeqKqvYFO
+U5zUDnEaLRRaUYDrf3u0dRKhS55QyOmJXKu2n/ObSBfTHYOimJyZSMrRTv5uL9af
+AFMYJADXf03BWbP6OC2u
+=9jOf
+-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.6.3.2.ebuild b/app-office/libreoffice/libreoffice-3.6.3.2.ebuild
deleted file mode 100644
index f16f1aed82ef..000000000000
--- a/app-office/libreoffice/libreoffice-3.6.3.2.ebuild
+++ /dev/null
@@ -1,590 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.3.2.ebuild,v 1.9 2012/12/08 12:57:04 maekke Exp $
-
-EAPI=4
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src/${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.6.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${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 binfilter help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]]; then
-				SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
-			else
-				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
-			fi
-		done
-		unset mod
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-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="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
-jemalloc kde mysql odk opengl postgres svg test +vba +webdav"
-
-LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# 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"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
-	app-text/mythes
-	>=app-text/libexttextcat-3.2
-	app-text/libwpd:0.9[tools]
-	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.2:0.2
-	dev-db/unixODBC
-	dev-libs/expat
-	>=dev-libs/glib-2.28
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-1.0.0d
-	>=dev-libs/redland-1.0.14[ssl]
-	media-gfx/graphite2
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=media-libs/libpng-1.4
-	>=media-libs/libcdr-0.0.5
-	media-libs/libvisio
-	>=net-misc/curl-7.21.4
-	sci-mathematics/lpsolve
-	>=sys-libs/db-4.8
-	virtual/jpeg
-	>=x11-libs/cairo-1.10.0[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	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
-	)
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
-	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] )
-	svg? ( gnome-base/librsvg )
-	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-libs/zlib
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		>=virtual/jdk-1.6
-		>=dev-java/ant-core-1.7
-		test? ( dev-java/junit:4 )
-	)
-	odk? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
-	"${FILESDIR}/${PN}-3.6-separate-checks.patch"
-	"${FILESDIR}/${P}-fix-poppler.patch"
-)
-
-REQUIRED_USE="
-	gnome? ( gtk )
-	eds? ( gnome )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-S="${WORKDIR}/${PN}-core-${PV}"
-
-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 5 ]] ) \
-				; then
-			eerror "Compilation with gcc older than 4.5 is not supported"
-			die "Too old gcc found."
-		fi
-	fi
-
-	# ensure pg version
-	if use postgres; then
-		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 90 ]] ; then
-			eerror "PostgreSQL slot must be set to 9.0 or higher."
-			eerror "    postgresql-config set 9.0"
-			die "PostgreSQL slot is not set to 9.0 or higher."
-		 fi
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	kde4-base_pkg_setup
-
-	python_set_active_version 2
-	python_pkg_setup
-
-	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	local mod dest tmplfile tmplname mypv
-
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	if use branding; then
-		unpack "${BRANDING}"
-	fi
-
-	if [[ ${PV} != *9999* ]]; then
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]] && ! use binfilter; then
-				continue
-			fi
-			unpack "${PN}-${mod}-${PV}.tar.xz"
-			if [[ ${mod} != core ]]; then
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-	else
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]] && ! use binfilter; then
-				continue
-			fi
-			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_PROJECT="${PN}/${mod}"
-			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
-			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-			EGIT_NOUNPACK="true"
-			git-2_src_unpack
-			if [[ ${mod} != core ]]; then
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
-	fi
-}
-
-src_prepare() {
-	# optimization flags
-	export ARCH_FLAGS="${CXXFLAGS}"
-	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-	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
-
-	# please no debug in binfilter, it blows up things insanely
-	if use binfilter && ! use binfilterdebug ; then
-		for name in $(find "${S}/binfilter" -name makefile.mk) ; do
-			sed -i -e '1i\CFLAGS+= -g0' $name || die
-		done
-	fi
-
-	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}")
-
-	# Workaround the boost header include issue for older gccs
-	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; then
-		append-cppflags -DBOOST_NO_0X_HDR_TYPEINDEX
-		append-cppflags -DBOOST_NO_CXX11_HDR_TYPEINDEX
-	fi
-
-	# 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
-		ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		# saxon: system one does not work properly
-		java_opts="
-			--without-system-hsqldb
-			--without-system-saxon
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-java-target-version=$(java-pkg_get-target)
-			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
-		"
-
-		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
-
-		if use test; then
-			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
-		else
-			java_opts+=" --without-junit"
-		fi
-	fi
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --disable-gnome-vfs: old gnome virtual fs support
-	# --disable-kdeab: kde3 adressbook
-	# --disable-kde: kde3 support
-	# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
-	# --disable-mozilla: disable mozilla build that is used for adresbook, not
-	#   affecting the nsplugin that is always ON
-	# --disable-pch: precompiled headers cause build crashes
-	# --disable-rpath: relative runtime path is not desired
-	# --disable-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
-	# --with-{max-jobs,num-cpus}: ensuring parallel building
-	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
-	# --disable-ext-report-builder: too much java packages pulled in
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
-		--with-system-headers \
-		--with-system-libs \
-		--with-system-jars \
-		--with-system-dicts \
-		--enable-graphite \
-		--enable-cairo-canvas \
-		--enable-largefile \
-		--enable-mergelibs \
-		--enable-python=system \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-release-build \
-		--enable-unix-qstart-libpng \
-		--enable-xmlsec \
-		--disable-ccache \
-		--disable-crashdump \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gnome-vfs \
-		--disable-ext-report-builder \
-		--disable-kdeab \
-		--disable-kde \
-		--disable-ldap \
-		--disable-mozilla \
-		--disable-nsplugin \
-		--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-max-jobs=${jbs} \
-		--with-num-cpus=${jbs} \
-		--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 \
-		--disable-gtk3 \
-		$(use_enable binfilter) \
-		$(use_enable cups) \
-		$(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 kde kde4) \
-		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable odk) \
-		$(use_enable opengl) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable svg librsvg system) \
-		$(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
-	(
-		source "${S}/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
-
-	# 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-3.6.4.3.ebuild b/app-office/libreoffice/libreoffice-3.6.4.3.ebuild
index 50f67a17d311..6c032ea1af54 100644
--- a/app-office/libreoffice/libreoffice-3.6.4.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.2 2012/12/08 19:47:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.3 2012/12/17 09:49:26 scarabeus Exp $
 
 EAPI=4
 
@@ -90,7 +90,7 @@ unset lo_xt
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	app-arch/zip