Update live ebuilds for LibreOffice 4.4, thanks Andreas Sturmlechner

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 45fc44150f3e96fb6a59b86ee6a5d95461077f9a..14a296939efafa7b0d95321ef1948de2cf43229e 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.607 2015/01/04 14:41:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.608 2015/02/08 18:53:59 dilfridge Exp $
+
+  08 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  libreoffice-4.2.9999.ebuild, libreoffice-4.3.9999.ebuild,
+  libreoffice-9999-r2.ebuild, +files/libreoffice-4.4-system-pyuno.patch:
+  Update live ebuilds for LibreOffice 4.4, thanks Andreas Sturmlechner
 
   04 Jan 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   libreoffice-4.3.5.2.ebuild, libreoffice-4.3.9999.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 29fc7662dfc2806b2881ece2e324d601c6e68967..a8f8307c58dd2f1fb47be350396c0dda2bc24fab 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,6 +19,7 @@ AUX libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch 2123 SHA256 f424034
 AUX libreoffice-4.3.5.2-remove-bashisms.patch 1180 SHA256 60c9874b724cd0de61578e67a76e53cef5e5ac5fdbdc4360c6b3f4b8f9faa89e SHA512 cf7336dd8a7596f48edb7d73ffb19071f0455456b99e6492f41c78417de01ec2e7e3aad5b1c7e7c7bc431b5d4afe0e2095591f3f62d1a4a1dc221a55711b485c WHIRLPOOL cb90fe2e6b2f94458e5ac70a1716819dbc5942d1648b9db80abd199507ad235e69044d2645cc62fcbca93194169443b71783bfb361f9202c879c39d7a9462b9a
 AUX libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch 1379 SHA256 f64326c3089189520683b8def52dadd73225abf259212ff22cd8e0f5ef183767 SHA512 1366e3914d78ddc22c2dd324b53478c5d76fc8d563f46d02f83b09cceded2e71ea19311e29e6fa23ce230d3bec8f3a56c5ff18572050c6e5a4e03a975d54c38e WHIRLPOOL 2d16b6f90e6bb16de3a53a38e146930eb15685e306558c362e08ffe8c3b410a5124860e22475410f8db6e71fedbed4098b292c8efddfeb8570158046c5736f8a
 AUX libreoffice-4.3.5.2-system-opencollada.patch 5810 SHA256 5ae98f04551520db1118a873a8cb02c0b3306db0d55e3d5b863729e5393c280e SHA512 6749be7d372d2e92ba16697c3bf90be4bdda01d759100a13fcfe89c935e5291715e8556bc42ab8ce5fa47b6dced95f750c7c497051bdf140e8e504e281e2fe58 WHIRLPOOL 47f02ce1e5ca88cef50c75b339206ee0768a0e74862ab37040be7260c35b6c1d5c56a16fe9f2ca077ab457f1bec3b166c8ee031722eb9711cd63e9222e20a33f
+AUX libreoffice-4.4-system-pyuno.patch 1598 SHA256 444ba9a06a548952cd82f7ea2ff17e5bd7b04788dc894ef5376bf3440749de9e SHA512 043c78f923b941a1e8985ee16d8e6b23859207eac0f4fdc52fedbce0103d62309aa7aae14e19f8bb26bef9d4213dee9871fcc3770f99be84f3405573e32ced78 WHIRLPOOL 51f85f39847a587551b6887362557771a81b6abc59b926eace36f8e2eb61cd4895486c28d44fe38e77fc1b77b0ed4e142d65f4793bf2161c9d0c5c0abeca07f7
 AUX libreoffice-9999-curl-config.patch 2483 SHA256 ae1de898a921089932da214f667d979f7057d7e99c8f8f08fa21b7a827cb8f2e SHA512 ab10307f099368e71684d22a92b70703ebce5755ec618016393df014d1054fa723b5ebed031575ffd8bbbaa2449582c44646ed389bda16adda9c1df90f13f2f9 WHIRLPOOL 4ab824d86abe300c4c863e4162f3646ec499a4b0f519bc3d6a77bc702bd307b5b4b642d24d3921f52c8da6d96613afa85cb5fd6310d0ede61612a6b437eca6b6
 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
@@ -35,27 +36,29 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e06
 DIST libreoffice-help-4.2.8.2.tar.xz 1855204 SHA256 9cafdc22f0af401dc31bb713e0c477eb111cf4092fbc3582f5bde55a2d6d33d0 SHA512 9ab75261323ed5170c33c74d8cfb630c7d5552701301e6d1fc5890a4b73a831b000172ea9bfa816ced033b8179df38d7d91600e833ec6def67cc8af43e9e1a25 WHIRLPOOL c89f2c9adf9ffd7d1e6124b40d3a5818cea9f6ab57770910cbb0ff440ba8490be80acf2b7e0a702e733412884004600ea2a5c31f7750f1f48e9b2f3f6f0ba40a
 DIST libreoffice-help-4.3.5.2.tar.xz 1852412 SHA256 78b586931d8e085aa18d137711e7c878f858ea386a80ee673b0a787953836d92 SHA512 8525cc1bef1ac95a89c3100e137793bdea9ac05a85468e0ec96c6a360ce65baf3dfef7e634d9e8dbc644dec138df2b979cdb8a636ff27cdb7ee652ddee114236 WHIRLPOOL f5bd7d1da705e20def1cc6bff3dd3902ce6d77e2b5fb977860a4fbf9748a6ffec3524fe9ab0e2c539ece015082aadcf9f7392a145862ebb20f4abc117667b25e
 EBUILD libreoffice-4.2.8.2.ebuild 17952 SHA256 47b3d7661bac7965053ccd96368a1ba417f1d172f2faa71ca64f59a8c96b738f SHA512 14d5254340ee2c05426cdd3eb1d0c76c3adc3d226eb424ba6dc1891a676b4e6f2dc8ce742dd99fb592bbc7187427007d0bfd207c279a57b18bec66286c5f5d0f WHIRLPOOL 1de2d1a662a296bc26719fe6d23feaefaa5550c8cdc9b6c175783c1462f0588a71ad0f8d61fe7d725e90366817983890bc41a94157ca666527fd50b11589800d
-EBUILD libreoffice-4.2.9999.ebuild 17981 SHA256 774d36e21f851620fcc31a2fd272a4bafa81994d4c63b537f072a61cfd933151 SHA512 c0ae19f30b8e83436cae409eef364a47ee939b7662802272ad48e04e6f585b9e2ce531ca7fa18d1674571a701dfa0ac49017cf14b8e31528594cf88ce0820199 WHIRLPOOL 2e17fcf69aff5e7872ef127968706b50c3d98bbfb10b0e68a22997ff78ee7d165385a0d72d8d897079e51811bd1b93fdbd3179a9f67f26868b80dc06af85ed7b
+EBUILD libreoffice-4.2.9999.ebuild 17983 SHA256 e636bf8845c2d6e94375d3d616f71e568587e6ca3c47ab7dea4e47cf6eb7241f SHA512 7aa5aa780bf4143a2a2b88c1c1f7763d7cd6aac87e587bc02b55d3fcc0c3de9fa5e8e01bc506df6a765917dcdd4028961077bfd8d2960e05b7c32904aa5b5bef WHIRLPOOL b429e779bd347a4e9147f89d97935a55b51a2ad8e4f51e3fe8c8274e0d11cf894c682cc5a1387d58b197758c80c2e125b464e0eb98dedbda05e0bc4f5b791a61
 EBUILD libreoffice-4.3.5.2.ebuild 19021 SHA256 6321a2d312bde561441c60b50b4824c720104a9c7dac6a60454cc489a52cbce9 SHA512 ee3aa3ecd1050d190fc93c1f83bd337e32781f43f5bc4ae808bc44bff867d495eff099bb2c2dbd14fc3d897e1f0c4d6dca437c9c43c3bcb2632a50a16c4a747e WHIRLPOOL be1f1ed63e27079192a422d7906ee15700dab6f4d44405e73f482ea95b73c99ee17bd213c8800de1353be2063ddd0cc16e56d30c7174ee3feab06821df3ba580
-EBUILD libreoffice-4.3.9999.ebuild 18926 SHA256 7ce99cde0759f24074db6778a1bcaae560f3b6f9770850ad15c3906124ec4c98 SHA512 f1b7d4f835d9ab1c52c8d1f598d917eae327c96d717ae4d7f9a06a87f2189e1d1db7ccc9ca85f3a45f9aa73932662f3acae4ee0c0dd4e23400d64d9f95e614c8 WHIRLPOOL fb43454b848a7f8777b9b177684f142b485e4c559ad2ccde3493349b389aa2b310102563a95f6e73d24ac7f9355c69c0038c1aa41ec69ed670bc6a4f11ca7970
-EBUILD libreoffice-9999-r2.ebuild 18293 SHA256 60b962a8d3987fd4894fed5f00d3ac21b67e2fc25745c8bfada9aebff3793b2f SHA512 abc4de48c80d7be63c3a0bd66b7d39a468d9155d7a88c76e28398102b65a95cb2fd082823faf9e835d83184de1ced4b4e374c43e95ad33546f4752bbd3fd2109 WHIRLPOOL 096493b4583250939558b3b4dcb3e8a30f1aab9df5532ef429aa8bbb6ba35f973bd0581ae3d7af79f56595b21b62d38de7e7f22d4394bdd73fb7dfedd30f40e8
-MISC ChangeLog 940 SHA256 77805ce4fb3c9c8c19d836c3606b7908972542d92a84155c8715005394686a98 SHA512 456a75e2c7599fffa267e1d498ea0920ba766651afd7cf1089984e118a96cfc756ed78d55e7fd4a964bde78a27ffca4edbfd92313fd4d80ca6d9f213572d0e75 WHIRLPOOL 02cb0c1d5adc2b9471500a8a68a27e87789c6d0efcf1358e58b84918c5873bfc0697d5a0745659f2a0d0d0956b005eefee57d78fea7f25da8bb58c35d0fd0223
+EBUILD libreoffice-4.3.9999.ebuild 18928 SHA256 7ce919b74dd6e43238a59a5d2aadeeff5b9113566aef62cc0139f25392a48e39 SHA512 3d0d662367f2f8e90223fa3bf99762cac2c34c527328df90a55e01cc0eca39f08e7114005e4b624657124d38d38029ca667e143c148ecbf3ec50fe5afcc942f7 WHIRLPOOL 0800baeabc5e30eeb8e908d2b9819b616ea8dc63a9bdd5b73e29def46a781b1d4b8d427750bc13a0bf3d23e44988247d58800cbdaec7e0fa9425616aa055e133
+EBUILD libreoffice-9999-r2.ebuild 18543 SHA256 66ade1b6efe83f7359604e0470e3dc6623ced2861d40f17f171768ba57167cc1 SHA512 749c341b06510e7737918535ebc7c3f3f0869f9e8ef3ad7c7a6c9c7f27d817e4947ee9d73769ae49f345c429c23c7edb2bafec80d053be429a124017b1f3b79f WHIRLPOOL e5480a0ca79e385ef239b6a823cc0771c2d9d3fff6fbb9987a671775c783db608da97d66200b896b1206c7d4f5b4b578ff75d7ad2e0ce6c9c4fbed76308158fb
+MISC ChangeLog 1202 SHA256 37d71d77a6f8d3c927b757c28a5d6614139882736e61a282a0188a0f7844bec0 SHA512 bc8e2d1458cb655d525c97620b6e84bc86833542592717547186ed6faf5aaa067c3fcdc00479e7b519e5e7b64a60870319ba08095ef239301f7cc683c7e7a622 WHIRLPOOL f06d541e40d7c9ce48d25924f56ace5ecc747d4b56f68eb865514457b3bbaf30c4b750df7dd8143b27053a7c2d135a06fdcdd3d431a30d306b4ffd25acd227c2
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUqVFyAAoJEJS/30SErRQv7qIQAIhj19/8THO85V7nLMdPdIxr
-DcJYsOFr6gbbR3geigBP6NJkw0TLl4CCh6eOFeGh8cc0wT3EiWPHFno3QlthKASM
-QrJ5b7idXBndUyPm42NwurY3CYa7lSDLRwIE9ov8ZRLrr2GpDmitldU/jvD7Z2+c
-cywGQgrAlM0itKXRQvftn+6fnLq0G4TJdxyHnpJqqWYjE7r2vtCLzaiWzrxmzb0q
-DwMXf9IAvxGVE8DbU6d7A3N03olVdSQ0qZummGBjP51lSwUxugOSQqSqVkbCHMJ2
-CTZYzIy5y3ng1to79JI32NJuBljWT2fvw+BoQGtXjASvoyySqgVyfBOgksu/mPOF
-UDmRpjMgnGA3O8Tx+LHO5IQFU3j16lQ12CWQzsnM15R363p/ZOsOynzkDhBZKOvO
-hqq5ffeWVjzwqQduJ5E4qnWmoGssTw3qexQxR91crGWVSMsWWoYCx0QcjaYijxjg
-on3rpbQ9F/3KwHCIavdrA7yroCn3kk3Qpr4Xb4/YF0XsSUi0H4z42E5sk96u2IAh
-CjX4juC0aBA2siwRVcBJ15EgLTZgscQc7TNClBWKy7ojCjVk9V6pDYfLLayxiy8X
-A47SN+kQfcjDj1J8wyZDx/ISmJNGitC2JPZlC41vqw338Mudne3BqyAhmxxPkhgy
-MP+d8SfjptawKiMU/E80
-=cwf4
+iQJ8BAEBCABmBQJU17DJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOctukP/jjdazg4EmY3sxX/Gww1deTY
+k2+uXQr3itbdLWXkH006J12DOwcEScgOzbB4fhTLCTIXxhWjXawF7kVlmLkkiZF2
+Dk3qAk45DRSBd8pQXeGh8Szb4cZPTpXS+btV3MU6p1eWXpxDznsHaWSGF1ZMgqym
+vSiOL3ztPefakIdRkGyMQL5/tquoJUv/Q21eCAUjPIXcv6C4TrLLwGHDGm4nQD5J
+B5Koj48l1mQFdTwtcqcfiOJrbvDI7mleG83CFcrd722EpSWeDzZpMoFLUB4si//5
+QQfnE3thJKCImyn8IMSt2kc1ucIaja8j4P73njMKRckuoGPzaquJw22h7z1YRfaA
+Ja8XIS3Nya2mF5dXazEE3ASmxJawb7+gl2gnMCr0PrXdcCgBmC7vXtynvnUGjMMx
+JOVcW4TUIzL6mDMr2e3y8t/XV06vP5TQA4/brMvPaxw7j2z78mi41k8HaCt+G0/e
+cgAay+ncXkUaTS3qVPxubvkkSwul8/rV0r7GkHszxO1rtkv9SwEKAuvds/SGGEtD
+xWMeyCupdb2nvnS8G29sIxhSdyeFzskQJsyz+Se7zlLCpuHjpm2B5TCSD/GSerNO
+R8royaInzjluiG8MMltCYQL3adWek/H327gC5a6F4ZT0aS3GPxguK6xS7IBPgdcr
+9ECgVec/ggERspw5nDn+
+=4+km
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch
new file mode 100644 (file)
index 0000000..1cf8e19
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -129,6 +129,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 4ff2606..6a05eed 100644
+--- a/pyuno/source/module/uno.py
++++ b/pyuno/source/module/uno.py
+@@ -16,8 +16,12 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++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/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
+index 99d3b03..704edab 100755
+--- a/pyuno/source/officehelper.py
++++ b/pyuno/source/officehelper.py
+@@ -44,7 +44,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-4.2.9999.ebuild b/app-office/libreoffice/libreoffice-4.2.9999.ebuild
index 8d6739af1678c53f3bf367947d70935ec2fc276c..684f99676f59a61d29d32484e387e8a4655af0bf 100644 (file)
--- a/app-office/libreoffice/libreoffice-4.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.2.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.32 2014/12/29 20:05:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.33 2015/02/08 18:53:59 dilfridge Exp $
 
 EAPI=5
 
@@ -110,7 +110,7 @@ COMMON_DEPEND="
        =app-text/libwps-0.2*
        >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
        >=dev-cpp/clucene-2.3.3.4-r2
-       dev-cpp/libcmis:0.4
+       =dev-cpp/libcmis-0.4*
        dev-db/unixODBC
        >=dev-libs/boost-1.46:=
        dev-libs/expat

diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
index 3ce906ae0ffff3fa7f00a63ce7eebbc7db2d1d63..761f70ab641e3af0e12ad915337309fb29395a72 100644 (file)
--- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.11 2015/01/04 14:41:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.12 2015/02/08 18:53:59 dilfridge Exp $
 
 EAPI=5
 
@@ -114,7 +114,7 @@ COMMON_DEPEND="
        >=app-text/libwps-0.3.0
        >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
        >=dev-cpp/clucene-2.3.3.4-r2
-       dev-cpp/libcmis:0.4
+       =dev-cpp/libcmis-0.4*
        dev-db/unixODBC
        >=dev-libs/boost-1.46:=
        dev-libs/expat

diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 791cb3be69abb1cdd447dc75a6e4c9edd1b7af9c..a8636709f4d397556f0f8273742dff9895537ef6 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.236 2014/12/29 20:05:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.237 2015/02/08 18:53:59 dilfridge Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base multiprocessing 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}
+inherit base multiprocessing 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"
@@ -61,7 +61,6 @@ unset DEV_URI
 ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
 ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )"
 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
@@ -74,7 +73,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc"
++gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
 
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -93,8 +92,6 @@ SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-# FIXME: collada? ( media-libs/opencollada )
-#        how to configure system-collada?
 COMMON_DEPEND="
        ${PYTHON_DEPS}
        app-arch/zip
@@ -107,16 +104,16 @@ COMMON_DEPEND="
        >=app-text/libetonyek-0.1.1
        app-text/liblangtag
        >=app-text/libmspub-0.1.0
-       >=app-text/libmwaw-0.3.1
+       >=app-text/libmwaw-0.3.4
        >=app-text/libodfgen-0.1.0
        app-text/libwpd:0.10[tools]
        app-text/libwpg:0.3
        >=app-text/libwps-0.3.0
        >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
        >=dev-cpp/clucene-2.3.3.4-r2
-       dev-cpp/libcmis:0.4
+       =dev-cpp/libcmis-0.5*
        dev-db/unixODBC
-       >=dev-libs/boost-1.46:=
+       >=dev-libs/boost-1.55:=
        dev-libs/expat
        >=dev-libs/hyphen-2.7.1
        >=dev-libs/icu-4.8.1.1:=
@@ -136,6 +133,7 @@ COMMON_DEPEND="
        >=media-libs/libpng-1.4
        >=media-libs/libcdr-0.1.0
        >=media-libs/libfreehand-0.1.0
+       media-libs/libpagemaker
        >=media-libs/libvisio-0.1.0
        >=net-misc/curl-7.21.4
        net-libs/neon
@@ -146,8 +144,11 @@ COMMON_DEPEND="
        x11-libs/libXinerama
        x11-libs/libXrandr
        x11-libs/libXrender
+       virtual/glu
+       virtual/opengl
        bluetooth? ( net-wireless/bluez )
        coinmp? ( sci-libs/coinor-mp )
+       collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
        cups? ( net-print/cups )
        dbus? ( >=dev-libs/dbus-glib-0.92 )
        eds? ( gnome-extra/evolution-data-server )
@@ -174,10 +175,6 @@ COMMON_DEPEND="
                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-9.0[kerberos] )
        telepathy? (
                dev-libs/glib:2
@@ -245,7 +242,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
        # not upstreamable stuff
-       "${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+       "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )
 
 REQUIRED_USE="
@@ -340,6 +337,11 @@ src_prepare() {
        export PYTHON_CFLAGS=$(python_get_CFLAGS)
        export PYTHON_LIBS=$(python_get_LIBS)
 
+       if use collada; then
+               export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+               export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+       fi
+
        # patchset
        if [[ -n ${PATCHSET} ]]; then
                EPATCH_FORCE="yes" \
@@ -359,7 +361,7 @@ src_prepare() {
                -e "s:%eprefix%:${EPREFIX}:g" \
                -e "s:%libdir%:$(get_libdir):g" \
                -i pyuno/source/module/uno.py \
-               -i scripting/source/pyprov/officehelper.py || die
+               -i pyuno/source/officehelper.py || die
        # sed in the tests
        sed -i \
                -e 's#all : build unitcheck#all : build#g' \
@@ -441,7 +443,6 @@ src_configure() {
        # --enable-extension-integration: enable any extension integration support
        # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
        # --disable-report-builder: too much java packages pulled in without pkgs
-       # FIXME: $(use_with collada system-opencollada)
        econf \
                --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
                --with-system-headers \
@@ -499,17 +500,17 @@ src_configure() {
                $(use_enable gnome gconf) \
                $(use_enable gnome gio) \
                $(use_enable gnome lockdown) \
-               $(use_enable gstreamer) \
+               $(use_enable gstreamer gstreamer-1-0) \
                $(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 vlc) \
                $(use_with coinmp system-coinmp) \
+               $(use_with collada system-opencollada) \
                $(use_with gltf system-libgltf) \
                $(use_with java) \
                $(use_with mysql system-mysql-cppconn) \
@@ -567,9 +568,6 @@ src_install() {
                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
@@ -579,6 +577,10 @@ src_install() {
        # Remove desktop files for support to old installs that can't parse mime
        rm -rf "${ED}"/usr/share/mimelnk/
 
+       # FIXME: Hack add missing file
+       insinto /usr/$(get_libdir)/${PN}/program
+       doins "${S}"/instdir/program/libsaxlo.so
+
        pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
        pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }