Use python-r1 eclass. Drop 3.5 series as 3.6 seem fine wrt regressions for now.

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

12 files changed, 55 insertions, 972 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 0dc9e72fbe49..6bf9abf813fe 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,18 @@
 # 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.424 2012/12/19 20:22:04 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.425 2013/01/01 10:56:53 scarabeus Exp $
+
+  01 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/libreoffice-3.5-doublebuild.patch,
+  -files/libreoffice-3.5-hebrew-icu49.patch,
+  -files/libreoffice-3.5-propagate-gb_FULLDEPS.patch,
+  -files/libreoffice-3.5.4-libexttextcat.patch,
+  -files/libreoffice-3.6.3.2-fix-poppler.patch,
+  -files/libreoffice-system-pyuno.patch, -libreoffice-3.5.7.2.ebuild,
+  libreoffice-3.6.9999.ebuild, libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Use python-r1 eclass. Drop 3.5 series as 3.6 seem fine wrt regressions for
+  now.
 
   19 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.4.3.ebuild,
   libreoffice-3.6.9999.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a6cd212e3f50..2569761f64ae 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,16 +2,10 @@
 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
-AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724 SHA512 3fdeaaffc82e2b43ba162b45866c0bb795b23b6be671f4bdc71459d9ab169fd62487d9339c7d6e8dc4721d567027c049b861ddf56cb097594641b0bf357c7c42 WHIRLPOOL c55ff6ff62b63ccfc4fec7f21ac01bafa21d2228897cda2d3033738a31fd99159a717d463228ba3843f9a45edba87a5a07be9d3d83a0b00f3a763598affe56bd
-AUX libreoffice-3.5.4-libexttextcat.patch 910 SHA256 5e2acf868f511d8937d6551b6fe52e73e808082cc5bf327815a95c8fe4c9a6d2 SHA512 eb3ac4eff756812d3b2a149f30a98501abc625b2177bfed73bb35ab37bfbf09fd3c214aa58fa29b0a4bdc38788dfdb625aa48ba9dc5d05b971bfe4f06a1bc129 WHIRLPOOL 7f1a771765296cce6c38eaec6c2abf50913355cf1d2909fbd51636045c8ac38bdd05dd2cf54edfffeab5c904c2de1de5be57b1347961c55fee937c90afd0758f
 AUX libreoffice-3.6-separate-checks.patch 2366 SHA256 0fa6bdba2a176f3cdbfc8f87f5fc69b8790b6464cb607153e807df758066a3fb SHA512 8c79eb6bb60f04c6877bf7f1aff8f93ff56e069ca00f2982123b6187aba77e23eb8287bf668ef419e0277e3f51a872a2cf11431465a1a35560ae86d4ff4794cf WHIRLPOOL 9c4e8eba379d4c8e51ff6a24438fb3a8f7d3d64132854c8e5cdfd082c2e1c4ae38c501ec199990e3d505466898199b32595045d7e9a456858c63b663d4ad5d2c
 AUX libreoffice-3.6-system-pyuno.patch 1628 SHA256 25f319caed7205e06d4b9e17a45ab268a2ac67846c4e02442a15acc540266a5b SHA512 e7eb2c26932dd3fdff22c0c72a28542a42c26fc04a0fcc2a813e7b4d7fe642f211a395d41042cfc735670127a81104fcc2a4b845a59235a4d7924db2659916b0 WHIRLPOOL 09863ef7c67e8ed5d3edfd758fcdebd3ad785d3f82de47b9f1cc60d41cc18a56973515088abe9a4584311b551073b0db8bdd7e74fb72a81576a5a0d71c900998
-AUX libreoffice-3.6.3.2-fix-poppler.patch 1912 SHA256 9c80fc6fce26e1b71785e04e5cc3479c02b179b32ff7cbbb2b4a63c0d54212cc SHA512 41beb35bae1772114b8bd4d0cc85f04a1ebabb86970ed8e60c26e0d8bf648849c96475e5c65297860ce3cbc3c2accb452630a64ef2e43d20e0be5972eab0c395 WHIRLPOOL ea80bbedce2b00f87c9a64d2f71164a39089293d37e314bd793d6adafb49ea8e468536a91b16107323db682421c2810cb933fd31b3ed076678e17e1d5ee0ec66
 AUX libreoffice-3.7-separate-checks.patch 1554 SHA256 d1128006f0e49cd0262a3c8e5f5251160929282cf65a5b560cde637346f7b724 SHA512 23f2d9587f5fdcfb1b59e9629d373b870a838003265cd48d88d1c6450e6d7e7bbb40df2b2ffc01efbe3cf14b9c5702174782797cfda152b7fcaa89eac7606314 WHIRLPOOL 0a3fe76cc8034a705a55886ac65242f3aa03a27d6905b7b1599295b97720321760884c2d2dedd6749d87dea9c769e34ade5f686e3c7e7d89900bec358f46ca04
 AUX libreoffice-3.7-system-pyuno.patch 1642 SHA256 191d2462c13947d63a3f2758ec26b4b5b7765d06f0454add1c471e9dccfa9016 SHA512 76d0b836f2b26c9cd3a0ad2b471d033c863ffc1eb593f28f1ebecaae30f205adb97b4b0a63483f93d2f32d5934480f580776e1ce83baf77e5bedee759112fb8d WHIRLPOOL efada275cfa123b2f3fd96a20057fab5a8f83c50e0d401df1af76d1eb017e5c7ceb74d0a5d8fd77352379be4a69b67f22d99a072213b5644012094a31f353da0
-AUX libreoffice-system-pyuno.patch 1634 SHA256 8a45fe2d6eb9b9a529c9f237b7219b221296d270caa7d42d4ea1a47c5e30841f SHA512 30d6ea3e648ce21e2e9cabf8b1ffc05e7a97ac691fadc56d02f9fa32df914628735fce2101abc1e30b5a31967f3ce124a85ecb481041b9f61713acd9d9489220 WHIRLPOOL c2f10535ed97b9eb5fa9f271ff4c9ad8b552595f58234899d2b5091daacc4444532bdee1d2ec2bd24f0ce601f0e5b5ce408fcbe169e21184f263c7bac86bfa69
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
 DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
@@ -20,36 +14,31 @@ 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-binfilter-3.5.7.2.tar.xz 6061416 SHA256 ba07bc9b488d0c5f0c207ac7ab04e1d86b47018bf3fa77ef7562e28937485374 SHA512 3824d3ec845a2f0fdd4dcff3db8c7981f46f3b5ef541fc43d7ad0843f6093dcfda92ddbb406b4c314ea980335d74c2ee76c4f491ae38506689486481fc1d6196 WHIRLPOOL 9a637f35233c5a297f3209ca6d4c9bb2654fca5f8f171f689048de79fd3537bd8071c252c6943b284a71876d0deace76e35e28fb27d89d39e333dd3993a357ef
 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.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.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.4.3.ebuild 17474 SHA256 ebfebf22f2c06bc68f4a63e2ae74a9f0f378b79eb7fa297ead8f4741a39ce162 SHA512 2e540b456c2eaa2624cded3fe929678c5641797f0c8fbf044b760ce44c53b8008b9b70b0aa41350510fa671cf7f595acf355d8a804fdba2c7b0b3015db886858 WHIRLPOOL 5ffd405228caa4f36c7897db21ff10964b545b2180bd65854d2a9ce7e09f9b70228a294a2645c6bcb94f8635e08b9215a6a9943a54d745a927d5ce546b09fd1c
-EBUILD libreoffice-3.6.9999.ebuild 17479 SHA256 b86f48e0cf60fe226b03fd1c1c3f668fed4941a027bbff8512f93009704383c1 SHA512 43ab38cd31d9c1539a936d9a84e01baaf8a909e164bced849e061ae956ba6b11cae512c1147c9201aa4297a9af0b80d55c8556e128096e8f344a581a7bc16ded WHIRLPOOL 5a9c5b1585d804ff4adb778ae93ad97cdd3ec83fd100be5d0d59a7a752220a6b88060f2eb882bc2041567ddb1dbf25af287b95e13071faaafaff44825b4a13c2
-EBUILD libreoffice-4.0.9999.ebuild 17381 SHA256 96afbfc7f1e0724f8a30e9eea06817e9c8958ce9ac62121d5086b29f859eeadc SHA512 dcce9aea31d69c863cdfd50926f75e7b4ec8c7bccdbc62f1f1a07721d1b548cc3406d906c6806b9f16465273cce58555f6ec933d812a8fe3ce83e2a6a8f37815 WHIRLPOOL 02025c541f0ed472d4c4730de14f3e661b8fd77cf17efd2bf1da311f5859d9e770c6f7093081890bb127c409341ed3051fea88f9589a6222ef62490a6de7293c
-EBUILD libreoffice-9999-r2.ebuild 17161 SHA256 deefc58c30ea6442fb40267920666ed9e0647e5be89777113fa5ee13659e70ed SHA512 e79216fb6adab2174a948db14e07b5768420279b1d4872b65dad46c5d202bf62da0c142f12eba0fd33afeee280ca9b7ca48708ea40db9fb5b7c401d06df72db9 WHIRLPOOL f2753fc9635dcaff8140d0a076650ca60b0bdfca16b124c1d05607689a55919862519537dfd21c3f06d53633a5408af146e625ccfcda5b1d47f9ce016a7df4d6
-MISC ChangeLog 76581 SHA256 f220a42e187c4a177c56cc8f7df952b0369ff32914f65d0ea0d727822a94874e SHA512 5ea269b442b68660a62e656032392fcbceaa7cc68679f1a2d026c401ed0ce51394f7226c37dc57b1b4f44864bed3876fdcd883f6c70b55f97177fcdd77f529fc WHIRLPOOL 604719bbfafe943fa7f167f4ac482e3b364256a2e6ed85e9fa4175f7bf657699a5dbe110517449e65a72bbee9d2d7b03928badaba20003e9007ac869426d529c
+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 17172 SHA256 c196acd34279073c124e104dd2f4f30bb2e79eb5650919090f873e3a7b1cd2f9 SHA512 6d3b21b900fab77d4dd46f185daf90355d14aa4807f10f78ec9c0d453cd1bb0a154e94c1d3896a83a2f617b26b1ef1b7b62fc8300cd50fecea1237b656cedd7f WHIRLPOOL ede9a7038059606a80d2cb50e69a5d5015c5fb33bc6c6826992a1159b2d97f480ba98b617777dad9d9b5c32342b7c57b83e3b923cd54b24f06bbd2bd845a7987
+MISC ChangeLog 77120 SHA256 2a428892a9e4312bf8eeb19f820f08e91a299142d587f9cb8fb4fa37bcbdb2a3 SHA512 fde96817eb0882b1b2bc2f610e6e7feb958ec923f9f044cc9ca80eb9271ee80f94062496d7b46123a386e42dde0a3a0226078b0319589a0a79800c3eeb3ac69a WHIRLPOOL 8ccdfe3e0e60daf40564a75e9914e3c9419b0725161fd56fabfa492a83c02801babf08e04589de10e2a2dbbcd9f74e38dacba0137b03e6d0bd86b88c08fa9dde
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ0iJgAAoJEOSiRoyO7jvoDs0P/3wAHIdsMvjxcKx1HM2WgjYZ
-KUYk+0celJMoPwtZUrVusZff5wcZo5L3Z/ZLit6mbwmcgUN5QSTaLccs9Pq6LAJm
-IpYaGMP9bKLQ8+XCfvschQ8Elu4ZNsYueQYSG99Kya93gbZxMmxXJT5Lx66FfkDN
-zTyCPFW2ZUbcJs6C2BZxvMjy8kG+5R0sMPhq9AFCpzSPG8Hwed8RIAymuqRfrqy3
-qTzs9cP4FwtzUX4dfY9GCwW4zguDqqkCIQECjp1jaKvqg8k1YAkVTr5fSoxUyMVu
-YACarfNlJZNGbN5hAcyY1xQ/tbs4b40QsGR2XME6ZsirZWsqmHRf1eFAnD24JGG9
-lcBxJhEVg1JtPVCqzPQJWy1JThfk6YvGxVQGojH3rfUz8TpmIqkI8tGb1s3Evper
-BFhDsu0qkk/7vdJlEEXyfhTT/t7EliZw09uFEgkumUbrHfPzTTpa8Q2P4JGiI6Wv
-XSTP3QLAPExZIkRUa34QT9B+t8d11OGutIe4fecxwmlqSYBVEYYoAlXcUUoue8wV
-P+cA14N8pr6nJxygo5QuMaszCQisUVh9NFLqwGWfeDe4gc1JA2QtFN7GTTKuK1Gi
-zqEmvpH5Isz1T/yikjtJNHwZE2siHdFD304r7L27cuRXneBGzcTkz4bMQDmFHHKM
-akW+O+EwzSoZ99BtSSUK
-=XPYF
+iQIcBAEBCAAGBQJQ4sD4AAoJEOSiRoyO7jvoVCoP/2jXphUfED3tMuZ2dm12dXWv
+0j6x2oFhTsbXKFuVt7fxO1HJXhoAD/PR0PJT2ZqcKBhmMuSoUOwvxc0Z+Ze8UlbY
+F2yRF1Yz9Ger5B/ss/MeIxwqt45CrndESfU2/BO5xGMrMazIzaNpKxLCH9jaKZ4Q
+BbeVCcV4qJCMelIP6cogEXgNzWpXNYWJq8gYIsq8OpdTlpef9vCZLQFjFFs9D5Ta
+0vjTstrw5Xj9U6YgKH+h2G36fJSTEqPWRkTbdV46kgD+9xj/R+965IZc3p4h5PLf
+EJc53Y8zosmEsZG+izeWcWu0Gdk7li6UsFQW0C4u0v0EFxZzzxjDzOaKeSk+11jr
+I8Z4DqHQ/Z4ttt8fk36DRpH79UyY/1uznzfsGUUeRvHsMO9vWUw8NAVB+Lwzk8YK
+DP75ZHRN83awz2L8N/Y+Q7qfQzzE2cb+Sx9B/VhuLTWNA+THNlUhVEEF+rOXohpl
+DzbKLtgAYEu68+U+psXtchI0QiAZeAfiT1fB335PNpPNSNsw7QybSzvCvBZT0kPO
+xSF2enqMiPHaHMgUlM8VH9hRh7ekSKNC3zfS4VZvwSqD25UakMFL8TiBtWWOJp7X
+031S0amognHcSgVeIGW0oiV8wR0zvVV+siACiuq/Fzcw9PMzOpWR/EK3teUJf7+o
+QB79vjm50JdzhdHy3mhx
+=5puI
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch b/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch
deleted file mode 100644
index 903fe2359adf..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c40c21fe0670c6fb58bc82e4df2825e23c7406bb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz>
-Date: Tue, 3 Apr 2012 14:40:12 +0200
-Subject: [PATCH] Do not run build again during the install phase.
-
----
- solenv/gbuild/extensions/post_AuxTargets.mk |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
-index 72414b7..825b130 100644
---- a/solenv/gbuild/extensions/post_AuxTargets.mk
-+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
-@@ -83,7 +83,7 @@ distclean: clean
- 	desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
- 	set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
- 
--install: build
-+install:
- 	echo "Installing in $(INSTALLDIR)..." && \
- 	ooinstall "$(INSTALLDIR)" && \
- 	echo "" && \
--- 
-1.7.7
-
diff --git a/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch b/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch
deleted file mode 100644
index 6156f06f1ceb..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Sun, 13 May 2012 21:41:30 +0000
-Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
-
-i.e.  sync with svn diff -c 31071
-http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
-
-Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
----
-diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
-index cbabee6..91c8f3d 100644
---- a/i18npool/source/breakiterator/data/line.txt
-+++ b/i18npool/source/breakiterator/data/line.txt
-@@ -61,11 +61,13 @@ $BB = [:LineBreak =  Break_Before:];
- $BK = [:LineBreak =  Mandatory_Break:];
- $B2 = [:LineBreak =  Break_Both:];
- $CB = [:LineBreak =  Contingent_Break:];
-+$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
- $CL = [:LineBreak =  Close_Punctuation:] ;
- $CM = [:LineBreak =  Combining_Mark:];
- $CR = [:LineBreak =  Carriage_Return:];
- $EX = [:LineBreak =  Exclamation:];
- $GL = [:LineBreak =  Glue:];
-+$HL = [:LineBreak =  Hebrew_Letter:];
- $HY = [:LineBreak =  Hyphen:];
- $H2 = [:LineBreak =  H2:];
- $H3 = [:LineBreak =  H3:];
-@@ -77,7 +79,7 @@ $JV = [:LineBreak =  JV:];
- $JT = [:LineBreak =  JT:];
- $LF = [:LineBreak =  Line_Feed:];
- $NL = [:LineBreak =  Next_Line:];
--$NS = [:LineBreak =  Nonstarter:];
-+$NS = [[:LineBreak =  Nonstarter:] $CJ];
- $NU = [:LineBreak =  Numeric:];
- $OP = [[:LineBreak =  Open_Punctuation:] - $DG];
- $PO = [:LineBreak =  Postfix_Numeric:];
-@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
- $CLcm = $CL $CM*;
- $EXcm = $EX $CM*;
- $GLcm = $GL $CM*;
-+$HLcm = $HL $CM*;
- $HYcm = $HY $CM*;
- $H2cm = $H2 $CM*;
- $H3cm = $H3 $CM*;
-@@ -150,6 +153,7 @@ $B2 $CM+;
- $CL $CM+;
- $EX $CM+;
- $GL $CM+;
-+$HL $CM+;
- $HY $CM+;
- $H2 $CM+;
- $H3 $CM+;
-@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
- #            so for this one case we need to manually list out longer sequences.
- #
- $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
--$AL_FOLLOW_CM   = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
-+$AL_FOLLOW_CM   = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
- $AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
- 
- 
-@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
- $BBcm [^$CB];                                  #  $BB  x
- $BBcm $LB20NonBreaks $CM*;
- 
-+# LB 21a Don't break after Hebrew + Hyphen
-+#   HL (HY | BA) x
-+#  
-+$HLcm ($HYcm | $BAcm) [^$CB]?;
-+
- # LB 22
--$ALcm    $INcm;
-+($ALcm | $HLcm) $INcm;
- $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
- $IDcm    $INcm;
- $INcm    $INcm;
-@@ -331,16 +340,18 @@ $NUcm    $INcm;
- # $LB 23
- $IDcm  $POcm;
- $ALcm  $NUcm;       # includes $LB19
-+$HLcm  $NUcm;
- $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
- $NUcm  $ALcm;
-+$NUcm  $HLcm;
- 
- #
- # LB 24
- #
- $PRcm $IDcm;
- $ALcm $PRcm;
--$PRcm $ALcm;
--$POcm $ALcm;
-+$PRcm ($ALcm | $HLcm);
-+$POcm ($ALcm | $HLcm);
- 
- #
- # LB 25   Numbers.
-@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
- 
- # LB 28   Do not break between alphabetics
- #
--$ALcm $ALcm;
--$CM+ $ALcm;      # The $CM+ is from rule 10, and unattached CM is treated as AL
-+($ALcm | $HLcm) ($ALcm | $HLcm);
-+$CM+ ($ALcm | $HLcm);      # The $CM+ is from rule 10, an unattached CM is treated as AL
- 
- # LB 29
- $IScm ($ALcm | $NUcm);
-@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
- # Rule 30   Do not break between letters, numbers or ordinary symbols
- #           and opening or closing punctuation
- #
--($ALcm | $NUcm) $OPcm;
-+($ALcm | $HLcm | $NUcm) $OPcm;
- $CM+ $OPcm;
--$CLcm ($ALcm | $NUcm);
--
--
-+$CLcm ($ALcm | $HLcm | $NUcm);
- 
- #
- #  Reverse Rules.
-@@ -391,6 +400,7 @@ $CM+ $B2;
- $CM+ $CL;
- $CM+ $EX;
- $CM+ $GL;
-+$CM+ $HL;
- $CM+ $HY;
- $CM+ $H2;
- $CM+ $H3;
-@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
- $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
- [^$CB] $CM* $BB;                                      # 
- 
--
-+# LB21a
-+[^$CB] $CM* ($HY | $BA) $CM* $HL;
- 
- # LB 22
--$CM* $IN $CM* $ALPlus;
-+$CM* $IN $CM* ($ALPlus | $HL);
- $CM* $IN $CM* $ID;
- $CM* $IN $CM* $IN;
- $CM* $IN $CM* $NU;
- 
- # LB 23
- $CM* $PO $CM* $ID;
--$CM* $NU $CM* $ALPlus;
--$CM* $ALPlus $CM* $NU;
-+$CM* $NU $CM* ($ALPlus | $HL);
-+$CM* ($ALPlus | $HL) $CM* $NU;
- 
- # LB 24
- $CM* $ID $CM* $PR;
- $CM* $PR $CM* $ALPlus;
--$CM* $ALPlus $CM* $PR;
--$CM* $ALPlus $CM* $PO;
-+$CM* ($ALPlus | $HL) $CM* $PR;
-+$CM* ($ALPlus | $HL) $CM* $PO;
- 
- $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
- $CM* $NU+ $CM* $HY+ / $SP;
-@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
- $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
- 
- # LB 28
--$CM* $ALPlus $CM* $ALPlus;
--
-+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
- 
- # LB 29
- $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
- 
- # LB 30
--$CM* $OP $CM* ($NU | $ALPlus);
--$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
-+$CM* $OP $CM* ($ALPlus | $HL | $NU);
-+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
- 
- 
- ## -------------------------------------------------
-@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
- $SP+ $CM* $CL;
- $SP+ $CM* $B2;
- 
-+# LB 21
-+$CM* ($HY | $BA) $CM* $HL;
-+
- # LB 18
- ($CM* ($IS | $SY))+ $CM* $NU;
- $CL $CM* ($NU | $IS | $SY);
-@@ -629,6 +642,6 @@ $dictionary $dictionary;
- #  turn off rule chaining.  We don't want to move more
- #  than necessary.
- #
--[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
-+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
- $dictionary $dictionary;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch b/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch
deleted file mode 100644
index 8175e8a34d4a..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 07fc748fb1b242859913df178a0c41dc95a9f3e7 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Wed, 21 Dec 2011 22:29:02 +0100
-Subject: [PATCH] propagate gb_FULLDEPS
-
----
- solenv/gbuild/source_and_rerun.mk |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk
-index a2aaea0..27de233 100644
---- a/solenv/gbuild/source_and_rerun.mk
-+++ b/solenv/gbuild/source_and_rerun.mk
-@@ -2,7 +2,7 @@
- gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
- 
- define gb_SourceEnvAndRecurse_recurse
--$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2)
-+$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2) gb_FULLDEPS=$(gb_FULLDEPS)
- endef
- 
- ifneq ($(strip $(gb_PARTIALBUILD)),)
--- 
-1.7.5.4
-
diff --git a/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch b/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch
deleted file mode 100644
index 905c6818afe1..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 25a605f36544582bd454d4bc0e71e684749a0b80 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Fri, 25 May 2012 14:51:04 +0000
-Subject: this is supposed to just be the number of bytes
-
-Change-Id: Iecd376aba13f94c5c62fab2f3278c5f3efda20b4
----
-diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx
-index 383ab3e..3346ef2 100644
---- a/lingucomponent/source/languageguessing/simpleguesser.cxx
-+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
-@@ -117,8 +117,7 @@ vector<Guess> SimpleGuesser::GuessLanguage(const char* text)
-     if (!h)
-         return guesses;
- 
--    //calculate le number of unicode charcters (symbols)
--    int len = utfstrlen(text);
-+    int len = strlen(text);
- 
-     if (len > MAX_STRING_LENGTH_TO_ANALYSE)
-         len = MAX_STRING_LENGTH_TO_ANALYSE;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch b/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch
deleted file mode 100644
index 6ae1dd175485..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 1296db324d5962ff904c0ed488a62132dd36a66f Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Wed, 31 Oct 2012 17:00:18 +0000
-Subject: fix sdext build with poppler >= 0.19.x
-
-Conflicts:
-
-	configure.ac
-
-Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a
-Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
----
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 87c0ab2..9d38e9b 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -497,7 +497,9 @@ void PDFOutDev::endPage()
-     printf("endPage\n");
- }
- 
--#if POPPLER_CHECK_VERSION(0, 17, 0)
-+#if POPPLER_CHECK_VERSION(0, 19, 0)
-+void PDFOutDev::processLink(AnnotLink *link)
-+#elif POPPLER_CHECK_VERSION(0, 17, 0)
- void PDFOutDev::processLink(AnnotLink *link, Catalog *)
- #else
- void PDFOutDev::processLink(Link* link, Catalog*)
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index bba8f58..1911d57 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -201,10 +201,12 @@ namespace pdfi
-         // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
-         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
- 
--        #if POPPLER_CHECK_VERSION(0, 17, 0)
--        virtual void processLink(AnnotLink *link, Catalog *catalog);
--        #else
-         //----- link borders
-+	#if POPPLER_CHECK_VERSION(0, 19, 0)
-+        virtual void processLink(AnnotLink *link);
-+        #elif POPPLER_CHECK_VERSION(0, 17, 0)
-+	virtual void processLink(AnnotLink *link, Catalog *catalog);
-+        #else
-         virtual void processLink(Link *link, Catalog *catalog);
-         #endif
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/files/libreoffice-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-system-pyuno.patch
deleted file mode 100644
index c603d6acbb1a..000000000000
--- a/app-office/libreoffice/files/libreoffice-system-pyuno.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
-index defd7b2..ea2a809 100755
---- a/desktop/scripts/soffice.sh.in
-+++ b/desktop/scripts/soffice.sh.in
-@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index f93ac5e..92a2891 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
- #
- #*************************************************************************
-+import os
- import sys
- 
-+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
- import pyuno
- 
- try:
-diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
-index 610ac5f..df243d0 100755
---- a/scripting/source/pyprov/officehelper.py
-+++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
-         if "UNO_PATH" in os.environ:
-             sOffice = os.environ["UNO_PATH"]
-         else:
--            sOffice = "" # lets hope for the best
-+            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
-         sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"): 
-             sOffice += ".exe"
diff --git a/app-office/libreoffice/libreoffice-3.5.7.2.ebuild b/app-office/libreoffice/libreoffice-3.5.7.2.ebuild
deleted file mode 100644
index 238bbd90c95e..000000000000
--- a/app-office/libreoffice/libreoffice-3.5.7.2.ebuild
+++ /dev/null
@@ -1,547 +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.5.7.2.ebuild,v 1.2 2012/11/07 21:10:10 tetromino 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/3.5.7/
-	http://download.documentfoundation.org/libreoffice/old/src
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.5.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 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!
-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+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite gstreamer +gtk
-jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
-+vba +webdav +xmlsec"
-LICENSE="LGPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-NSS_DEPEND="
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-"
-
-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/libcmis-0.2
-	dev-db/unixODBC
-	dev-libs/expat
-	>=dev-libs/glib-2.28
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-49
-	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-1.0.0d
-	>=dev-libs/redland-1.0.14[ssl]
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	>=media-libs/libpng-1.4
-	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
-	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? ( gnome-extra/evolution-data-server )
-	gnome? ( gnome-base/gconf:2 )
-	gtk? ( >=x11-libs/gtk+-2.24:2 )
-	graphite? ( media-gfx/graphite2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
-	)
-	java? (
-		>=dev-java/bsh-2.0_beta4
-		dev-java/lucene:2.9
-		dev-java/lucene-analyzers:2.3
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	opengl? ( virtual/opengl )
-	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
-	postgres? ( >=dev-db/postgresql-base-8.4.0 )
-	svg? ( gnome-base/librsvg )
-	webdav? ( net-libs/neon )
-	xmlsec? ( ${NSS_DEPEND} )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!<app-openoffice/openoffice-bin-3.4.0-r1
-	!app-office/openoffice
-	media-fonts/libertine-ttf
-	media-fonts/liberation-fonts
-	media-fonts/urw-fonts
-	cups? ( net-print/cups )
-	java? ( >=virtual/jre-1.6 )
-"
-
-PDEPEND="
-	>=app-office/libreoffice-l10n-3.5.0
-"
-
-# 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
-	media-libs/sampleicc
-	net-misc/npapi-sdk
-	net-print/cups
-	>=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 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-system-pyuno.patch"
-	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
-	"${FILESDIR}/${PN}-3.5-doublebuild.patch"
-	"${FILESDIR}/${PN}-3.5-hebrew-icu49.patch"
-)
-
-REQUIRED_USE="
-	nsplugin? ( gtk )
-	gnome? ( gtk )
-	eds? ( gnome )
-	nlpsolver? ( java )
-"
-
-S="${WORKDIR}/${PN}-core-${PV}"
-
-RESTRICT="test"
-
-pkg_pretend() {
-	local pgslot
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		CHECKREQS_DISK_BUILD="6G"
-		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
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		CHECKREQS_DISK_BUILD="6G"
-		check-reqs_pkg_pretend
-	fi
-}
-
-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}"
-
-	# 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
-
-	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 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
-	"
-
-	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)/"
-			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
-			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
-			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
-		"
-		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
-		internal_libs+="
-			--with-about-bitmap="${WORKDIR}/branding-about.png"
-			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
-		"
-	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-static-gtk: ensure that gtk is linked dynamically
-	# --disable-ugly: disable ugly pieces of code
-	# --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-cairo-canvas \
-		--enable-largefile \
-		--enable-python=system \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-release-build \
-		--enable-unix-qstart-libpng \
-		--enable-mergelibs \
-		--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-online-update \
-		--disable-pch \
-		--disable-rpath \
-		--disable-systray \
-		--disable-static-gtk \
-		--disable-strip-solver \
-		--disable-ugly \
-		--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=2 \
-		--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 binfilter) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome lockdown) \
-		$(use_enable graphite) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		--disable-gtk3 \
-		$(use_enable java ext-scripting-beanshell) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nlpsolver ext-nlpsolver) \
-		$(use_enable nsplugin) \
-		$(use_enable odk) \
-		$(use_enable opengl) \
-		$(use_enable pdfimport ext-pdfimport) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable svg librsvg system) \
-		$(use_enable test linkoo) \
-		$(use_enable vba) \
-		$(use_enable vba activex-component) \
-		$(use_enable webdav neon) \
-		$(use_enable xmlsec) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		${internal_libs} \
-		${java_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}/Env.Host.sh" 2&> /dev/null
-
-		 local path="${SOLARVER}/${INPATH}/res/img"
-		 mkdir -p "${path}" || die
-
-		 echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\""
-		 perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			  -dir=default_images/res/helpimg \
-			  > "${path}/helpimg.ilst"
-		 [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	# not a proper make script
-	make build || die
-}
-
-src_test() {
-	make check || 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/
-
-	# symlink the nsplugin to system location
-	if use nsplugin; then
-		inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-	fi
-
-	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
-}
-
-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 cups || \
-		ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
-
-	use java || \
-		ewarn 'If you plan to use lbase aplication 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.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 2d54174cb16d..99a5d26c682b 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-3.6.9999.ebuild,v 1.38 2012/12/19 20:22:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.39 2013/01/01 10:56:53 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
 KDE_REQUIRED="optional"
 QT_MINIMAL="4.7.4"
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads,xml"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
 # Usually the tarballs are moved a lot so this should make
@@ -27,7 +27,7 @@ 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}
+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."
@@ -93,6 +93,7 @@ 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
@@ -259,9 +260,7 @@ pkg_pretend() {
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 	kde4-base_pkg_setup
-
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 
 	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
 }
diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
index c12f7f7350d8..ca2a56e721f8 100644
--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.8 2012/12/18 21:52:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.9 2013/01/01 10:56:53 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
 KDE_REQUIRED="optional"
 QT_MINIMAL="4.7.4"
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_DEPEND="3:3.3"
-PYTHON_USE_WITH="threads,xml"
+PYTHON_COMPAT=( python3_3 )
+PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
 # Usually the tarballs are moved a lot so this should make
@@ -27,7 +27,7 @@ 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 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
+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."
@@ -89,6 +89,7 @@ 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
@@ -266,9 +267,7 @@ pkg_pretend() {
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 	kde4-base_pkg_setup
-
-	python_set_active_version 3
-	python_pkg_setup
+	python-single-r1_pkg_setup
 
 	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
 }
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 0378ef76799b..39f1d76bc42b 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.145 2012/12/18 21:52:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.146 2013/01/01 10:56:53 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
 KDE_REQUIRED="optional"
 QT_MINIMAL="4.7.4"
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_DEPEND="3:3.3"
-PYTHON_USE_WITH="threads,xml"
+PYTHON_COMPAT=( python3_3 )
+PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
 # Usually the tarballs are moved a lot so this should make
@@ -27,7 +27,7 @@ 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 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
+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."
@@ -89,6 +89,7 @@ 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
@@ -266,9 +267,7 @@ pkg_pretend() {
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 	kde4-base_pkg_setup
-
-	python_set_active_version 3
-	python_pkg_setup
+	python-single-r1_pkg_setup
 
 	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
 }