Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
Date: Mon, 01 Oct 2018 18:13:40
Message-Id: 1538417536.6902ac4c0f3bf4480323f980dbc249899f93c13b.asturm@gentoo
1 commit: 6902ac4c0f3bf4480323f980dbc249899f93c13b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 1 17:35:41 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 1 18:12:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6902ac4c
7
8 app-office/libreoffice: Drop 6.0.3.2
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.50, Repoman-2.3.11
12
13 app-office/libreoffice/Manifest | 3 -
14 ...libreoffice-6.0.3.2-disable-flaky-tests-2.patch | 37 --
15 .../files/libreoffice-6.0.3.2-poppler-0.64.patch | 71 ---
16 .../files/libreoffice-6.0.4.2-glm-0.9.9.patch | 34 --
17 app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 578 ---------------------
18 5 files changed, 723 deletions(-)
19
20 diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
21 index 54ee7ef00ab..6258b4e18a4 100644
22 --- a/app-office/libreoffice/Manifest
23 +++ b/app-office/libreoffice/Manifest
24 @@ -3,12 +3,9 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325
25 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
26 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
27 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
28 -DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
29 -DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
30 DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
31 DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
32 DIST libreoffice-6.1.1.2.tar.xz 207211808 BLAKE2B 9c60f6153a82903252102056d27ae412350200fcdb8dfc8cbefeb92bd50eebfbd11bda06e20f35d19320591f9cfdfa53c9f1fda8c66d2bee66c59c37f27753be SHA512 c3429fbd247c4b17f4e140751fcb1e593705aa60911556c4dfc960ebaa6fe50a39d933d14bfc3c89cdd92619f41611eb1aa0090fe9d391d84989d206005af3ea
33 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
34 -DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
35 DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
36 DIST libreoffice-help-6.1.1.2.tar.xz 15757536 BLAKE2B 5e93bb65c6e42f924bd1c782e472f247b97cb9264c671d932a71cf67813d529c363a8664eeca48b407a0882ad2d0d7392cffcfddea0f35f0c62881b3c11d70ce SHA512 6e22a3efa9c6db97dec27a5f6ef21efb0c0665712715338d8fb73340a9572841fcaac63b0f6b03d67bc9c459a85d1910c18a5830ff8541265509cf8a1bdc3aa1
37
38 diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
39 deleted file mode 100644
40 index 55f2d8a55fc..00000000000
41 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
42 +++ /dev/null
43 @@ -1,37 +0,0 @@
44 ---- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100
45 -+++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100
46 -@@ -114,7 +114,7 @@
47 - /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
48 - void testODFBrokenDsigGPG();
49 - /// Test loading an encrypted ODF document
50 -- void testODFEncryptedGPG();
51 -+// void testODFEncryptedGPG();
52 - #endif
53 - CPPUNIT_TEST_SUITE(SigningTest);
54 - CPPUNIT_TEST(testDescription);
55 -@@ -143,7 +143,7 @@
56 - CPPUNIT_TEST(testODFUntrustedGoodGPG);
57 - CPPUNIT_TEST(testODFBrokenStreamGPG);
58 - CPPUNIT_TEST(testODFBrokenDsigGPG);
59 -- CPPUNIT_TEST(testODFEncryptedGPG);
60 -+// CPPUNIT_TEST(testODFEncryptedGPG);
61 - #endif
62 - CPPUNIT_TEST_SUITE_END();
63 -
64 -@@ -743,14 +743,14 @@
65 - CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
66 - }
67 -
68 --void SigningTest::testODFEncryptedGPG()
69 -+/*void SigningTest::testODFEncryptedGPG()
70 - {
71 - createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
72 - SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
73 - CPPUNIT_ASSERT(pBaseModel);
74 - SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
75 - CPPUNIT_ASSERT(pObjectShell);
76 --}
77 -+}*/
78 -
79 - #endif
80 -
81
82 diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch
83 deleted file mode 100644
84 index 37a554d807d..00000000000
85 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch
86 +++ /dev/null
87 @@ -1,71 +0,0 @@
88 -From 106b2c96e9807af14d6eb6e8f83dcf25095a093e Mon Sep 17 00:00:00 2001
89 -From: Rene Engelhard <rene@××××××.org>
90 -Date: Tue, 24 Apr 2018 15:56:23 +0200
91 -Subject: fix build with poppler 0.64
92 -
93 -GooString became const...
94 -
95 -Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
96 -Reviewed-on: https://gerrit.libreoffice.org/53422
97 -Tested-by: Jenkins <ci@×××××××××××.org>
98 -Reviewed-by: Michael Stahl <Michael.Stahl@×××.de>
99 ----
100 - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++
101 - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
102 - 2 files changed, 14 insertions(+)
103 -
104 -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
105 -index 00fd56a..9618e5b 100644
106 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
107 -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
108 -@@ -446,6 +446,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
109 - FontAttributes aNewFont;
110 - int nSize = 0;
111 -
112 -+#if POPPLER_CHECK_VERSION(0, 64, 0)
113 -+ const
114 -+#endif
115 - GooString* pFamily = gfxFont->getName();
116 - if( pFamily )
117 - {
118 -@@ -742,6 +745,9 @@ void PDFOutDev::updateFont(GfxState *state)
119 - FontAttributes aFont;
120 - int nEmbedSize=0;
121 -
122 -+#if POPPLER_CHECK_VERSION(0, 64, 0)
123 -+ const
124 -+#endif
125 - Ref* pID = gfxFont->getID();
126 - // TODO(Q3): Portability problem
127 - long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
128 -@@ -932,7 +938,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
129 - printf( "\n" );
130 - }
131 -
132 -+#if POPPLER_CHECK_VERSION(0, 64, 0)
133 -+void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
134 -+#else
135 - void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
136 -+#endif
137 - {
138 - // TODO(F3): NYI
139 - }
140 -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
141 -index 922c513..2a6268c 100644
142 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
143 -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
144 -@@ -223,7 +223,11 @@ namespace pdfi
145 - double dx, double dy,
146 - double originX, double originY,
147 - CharCode code, int nBytes, Unicode *u, int uLen) override;
148 -+#if POPPLER_CHECK_VERSION(0, 64, 0)
149 -+ virtual void drawString(GfxState *state, const GooString *s) override;
150 -+#else
151 - virtual void drawString(GfxState *state, GooString *s) override;
152 -+#endif
153 - virtual void endTextObject(GfxState *state) override;
154 -
155 - //----- image drawing
156 ---
157 -cgit v1.1
158 -
159
160 diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
161 deleted file mode 100644
162 index 1430fdf1a34..00000000000
163 --- a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
164 +++ /dev/null
165 @@ -1,34 +0,0 @@
166 -From 5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa Mon Sep 17 00:00:00 2001
167 -From: Louis Sautier <sautier.louis@×××××.com>
168 -Date: Sun, 10 Jun 2018 12:25:18 +0200
169 -Subject: Fix build with GLM 0.9.9.0, tdf#118070
170 -
171 -One of the test files was forgotten in 953c4add8fd76d88f49a81ae4c21a1fdcc007e57
172 -
173 -Change-Id: I0315433c688ff7edb2ba599bbef203cac9de3022
174 -Reviewed-on: https://gerrit.libreoffice.org/55554
175 -Reviewed-by: Rene Engelhard <rene@××××××.org>
176 -Tested-by: Rene Engelhard <rene@××××××.org>
177 ----
178 - vcl/Executable_icontest.mk | 6 ++++++
179 - 1 file changed, 6 insertions(+)
180 -
181 -diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
182 -index ce16330..8c917b7 100644
183 ---- a/vcl/Executable_icontest.mk
184 -+++ b/vcl/Executable_icontest.mk
185 -@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
186 - ))
187 - endif
188 -
189 -+ifeq ($(SYSTEM_GLM),TRUE)
190 -+$(eval $(call gb_Executable_add_defs,icontest,\
191 -+ -DGLM_ENABLE_EXPERIMENTAL \
192 -+))
193 -+endif
194 -+
195 - $(eval $(call gb_Executable_use_api,icontest,\
196 - offapi \
197 - udkapi \
198 ---
199 -cgit v1.1
200
201 diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
202 deleted file mode 100644
203 index 04b8d2c4851..00000000000
204 --- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
205 +++ /dev/null
206 @@ -1,578 +0,0 @@
207 -# Copyright 1999-2018 Gentoo Foundation
208 -# Distributed under the terms of the GNU General Public License v2
209 -
210 -EAPI=6
211 -
212 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
213 -PYTHON_REQ_USE="threads,xml"
214 -
215 -# experimental ; release ; old
216 -# Usually the tarballs are moved a lot so this should make
217 -# everyone happy.
218 -DEV_URI="
219 - https://dev-builds.libreoffice.org/pre-releases/src
220 - https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
221 - https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
222 -"
223 -ADDONS_URI="https://dev-www.libreoffice.org/src/"
224 -
225 -BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
226 -PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
227 -
228 -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
229 -inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
230 -unset SCM_ECLASS
231 -
232 -DESCRIPTION="A full office productivity suite"
233 -HOMEPAGE="https://www.libreoffice.org"
234 -SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
235 -[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
236 -
237 -# Split modules following git/tarballs
238 -# Core MUST be first!
239 -# Help is used for the image generator
240 -# Only release has the tarballs
241 -if [[ ${PV} != *9999* ]]; then
242 - for i in ${DEV_URI}; do
243 - SRC_URI+=" ${i}/${P}.tar.xz"
244 - SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
245 - done
246 - unset i
247 -fi
248 -unset DEV_URI
249 -
250 -# Really required addons
251 -# These are bundles that can't be removed for now due to huge patchsets.
252 -# If you want them gone, patches are welcome.
253 -ADDONS_SRC=(
254 - "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
255 - # no release for 8 years, should we package it?
256 - "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
257 - # Does not build with 1.6 rhino at all
258 - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
259 - # requirement of rhino
260 - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
261 - # not packageable
262 - "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
263 -)
264 -SRC_URI+=" ${ADDONS_SRC[*]}"
265 -
266 -unset ADDONS_URI
267 -unset ADDONS_SRC
268 -
269 -# Extensions that need extra work:
270 -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
271 -
272 -IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
273 -gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
274 -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
275 -
276 -LICENSE="|| ( LGPL-3 MPL-1.1 )"
277 -SLOT="0"
278 -[[ ${PV} == *9999* ]] || \
279 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
280 -
281 -COMMON_DEPEND="${PYTHON_DEPS}
282 - app-arch/unzip
283 - app-arch/zip
284 - app-crypt/gpgme[cxx]
285 - app-text/hunspell:=
286 - >=app-text/libabw-0.1.0
287 - >=app-text/libebook-0.1
288 - app-text/libepubgen
289 - >=app-text/libetonyek-0.1
290 - app-text/libexttextcat
291 - app-text/liblangtag
292 - >=app-text/libmspub-0.1.0
293 - >=app-text/libmwaw-0.3.1
294 - >=app-text/libodfgen-0.1.0
295 - app-text/libqxp
296 - app-text/libstaroffice
297 - app-text/libwpd:0.10[tools]
298 - app-text/libwpg:0.3
299 - >=app-text/libwps-0.4
300 - app-text/mythes
301 - >=dev-cpp/clucene-2.3.3.4-r2
302 - =dev-cpp/libcmis-0.5*
303 - dev-db/unixODBC
304 - dev-lang/perl
305 - dev-libs/boost:=[nls]
306 - dev-libs/expat
307 - dev-libs/hyphen
308 - dev-libs/icu:=
309 - dev-libs/libassuan
310 - dev-libs/libgpg-error
311 - >=dev-libs/liborcus-0.13.3
312 - dev-libs/librevenge
313 - dev-libs/nspr
314 - dev-libs/nss
315 - !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
316 - libressl? ( dev-libs/libressl )
317 - >=dev-libs/redland-1.0.16
318 - >=dev-libs/xmlsec-1.2.24[nss]
319 - media-gfx/graphite2
320 - media-libs/fontconfig
321 - media-libs/freetype:2
322 - >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
323 - media-libs/lcms:2
324 - >=media-libs/libcdr-0.1.0
325 - >=media-libs/libepoxy-1.3.1[X]
326 - >=media-libs/libfreehand-0.1.0
327 - media-libs/libpagemaker
328 - >=media-libs/libpng-1.4:0=
329 - >=media-libs/libvisio-0.1.0
330 - media-libs/libzmf
331 - net-libs/neon
332 - net-misc/curl
333 - net-nds/openldap
334 - sci-mathematics/lpsolve
335 - virtual/glu
336 - virtual/jpeg:0
337 - virtual/opengl
338 - x11-libs/cairo[X]
339 - x11-libs/libXinerama
340 - x11-libs/libXrandr
341 - x11-libs/libXrender
342 - bluetooth? ( net-wireless/bluez )
343 - coinmp? ( sci-libs/coinor-mp )
344 - cups? ( net-print/cups )
345 - dbus? ( dev-libs/dbus-glib )
346 - eds? (
347 - dev-libs/glib:2
348 - gnome-base/dconf
349 - gnome-extra/evolution-data-server
350 - )
351 - firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
352 - gstreamer? (
353 - media-libs/gstreamer:1.0
354 - media-libs/gst-plugins-base:1.0
355 - )
356 - gtk? (
357 - dev-libs/glib:2
358 - dev-libs/gobject-introspection
359 - gnome-base/dconf
360 - x11-libs/gtk+:3
361 - )
362 - gtk2? (
363 - x11-libs/gdk-pixbuf
364 - >=x11-libs/gtk+-2.24:2
365 - )
366 - kde? (
367 - dev-qt/qtcore:5
368 - dev-qt/qtgui:5
369 - dev-qt/qtx11extras:5
370 - dev-qt/qtwidgets:5
371 - kde-frameworks/kconfig:5
372 - kde-frameworks/kcoreaddons:5
373 - kde-frameworks/ki18n:5
374 - kde-frameworks/kio:5
375 - kde-frameworks/kwindowsystem:5
376 - )
377 - jemalloc? ( dev-libs/jemalloc )
378 - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
379 - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
380 - mysql? ( dev-db/mysql-connector-c++ )
381 - pdfimport? ( app-text/poppler:=[cxx] )
382 - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
383 -"
384 -
385 -RDEPEND="${COMMON_DEPEND}
386 - !app-office/libreoffice-bin
387 - !app-office/libreoffice-bin-debug
388 - !app-office/openoffice
389 - media-fonts/dejavu
390 - media-fonts/liberation-fonts
391 - media-fonts/libertine
392 - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
393 - java? ( >=virtual/jre-1.6 )
394 - kde? ( kde-frameworks/breeze-icons:* )
395 - vlc? ( media-video/vlc )
396 -"
397 -
398 -if [[ ${PV} != *9999* ]]; then
399 - PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
400 -else
401 - # Translations are not reliable on live ebuilds
402 - # rather force people to use english only.
403 - PDEPEND="!app-office/libreoffice-l10n"
404 -fi
405 -
406 -# FIXME: cppunit should be moved to test conditional
407 -# after everything upstream is under gbuild
408 -# as dmake execute tests right away
409 -DEPEND="${COMMON_DEPEND}
410 - !<sys-devel/make-3.82
411 - >=dev-libs/libatomic_ops-7.2d
412 - >=dev-libs/libxml2-2.7.8
413 - dev-libs/libxslt
414 - dev-perl/Archive-Zip
415 - >=dev-util/cppunit-1.14.0
416 - >=dev-util/gperf-3
417 - dev-util/intltool
418 - >=dev-util/mdds-1.2.3:1=
419 - media-libs/glm
420 - sys-devel/bison
421 - sys-devel/flex
422 - sys-devel/gettext
423 - sys-devel/ucpp
424 - sys-libs/zlib
425 - virtual/pkgconfig
426 - x11-base/xorg-proto
427 - x11-libs/libXt
428 - x11-libs/libXtst
429 - java? (
430 - dev-java/ant-core
431 - >=virtual/jdk-1.6
432 - )
433 - odk? ( >=app-doc/doxygen-1.8.4 )
434 - test? (
435 - app-crypt/gnupg
436 - dev-util/cppunit
437 - media-fonts/dejavu
438 - )
439 -"
440 -
441 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
442 - bluetooth? ( dbus )
443 - kde? ( gtk )
444 - libreoffice_extensions_nlpsolver? ( java )
445 - libreoffice_extensions_scripting-beanshell? ( java )
446 - libreoffice_extensions_scripting-javascript? ( java )
447 - libreoffice_extensions_wiki-publisher? ( java )
448 -"
449 -
450 -PATCHES=(
451 - # not upstreamable stuff
452 - "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
453 - "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
454 - "${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676
455 - # 6.0 branch
456 - "${FILESDIR}/${P}-poppler-0.64.patch"
457 - # 6.1 branch
458 - "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
459 -
460 - # TODO: upstream
461 - "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
462 - "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
463 -
464 - # gtk3-kde5 vcl plugin backported from master
465 - "${WORKDIR}"/${PATCHSET/.tar.xz/}
466 -)
467 -
468 -pkg_pretend() {
469 - use java || \
470 - ewarn "If you plan to use Base application you should enable java or you will get various crashes."
471 -
472 - if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
473 - ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
474 - ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
475 - ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
476 - fi
477 -
478 - if [[ ${MERGE_TYPE} != binary ]]; then
479 - CHECKREQS_MEMORY="512M"
480 - if is-flagq "-g*" && ! is-flagq "-g*0" ; then
481 - CHECKREQS_DISK_BUILD="22G"
482 - else
483 - CHECKREQS_DISK_BUILD="6G"
484 - fi
485 - check-reqs_pkg_pretend
486 - fi
487 -}
488 -
489 -pkg_setup() {
490 - java-pkg-opt-2_pkg_setup
491 - python-single-r1_pkg_setup
492 - xdg_environment_reset
493 -
494 - if [[ ${MERGE_TYPE} != binary ]]; then
495 - CHECKREQS_MEMORY="512M"
496 - if is-flagq "-g*" && ! is-flagq "-g*0" ; then
497 - CHECKREQS_DISK_BUILD="22G"
498 - else
499 - CHECKREQS_DISK_BUILD="6G"
500 - fi
501 - check-reqs_pkg_setup
502 - fi
503 -}
504 -
505 -src_unpack() {
506 - default
507 -
508 - if [[ ${PV} = *9999* ]]; then
509 - local base_uri branch mypv
510 - base_uri="https://anongit.freedesktop.org/git"
511 - branch="master"
512 - mypv=${PV/.9999}
513 - [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
514 - git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
515 - git-r3_checkout "${base_uri}/${PN}/core"
516 -
517 - git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
518 - git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
519 - fi
520 -}
521 -
522 -src_prepare() {
523 - default
524 -
525 - # sandbox violations on many systems, we don't need it. Bug #646406
526 - sed -i \
527 - -e "/KF5_CONFIG/s/kf5-config/no/" \
528 - configure.ac || die "Failed to disable kf5-config"
529 -
530 - AT_M4DIR="m4" eautoreconf
531 - # hack in the autogen.sh
532 - touch autogen.lastrun
533 -
534 - # system pyuno mess
535 - sed -i \
536 - -e "s:%eprefix%:${EPREFIX}:g" \
537 - -e "s:%libdir%:$(get_libdir):g" \
538 - pyuno/source/module/uno.py \
539 - pyuno/source/officehelper.py || die
540 - # sed in the tests
541 - sed -i \
542 - -e "s#all : build unitcheck#all : build#g" \
543 - solenv/gbuild/Module.mk || die
544 - sed -i \
545 - -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
546 - -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
547 - Makefile.in || die
548 -
549 - sed -i \
550 - -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
551 - -e "s,\$INSTALLDIRNAME.sh,${PN}," \
552 - bin/distro-install-desktop-integration || die
553 -
554 - if use branding; then
555 - # hack...
556 - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
557 - fi
558 -
559 - # Don't list pdfimport support in desktop when built with none, bug # 605464
560 - if ! use pdfimport; then
561 - sed -i \
562 - -e ":MimeType: s:application/pdf;::" \
563 - -e ":Keywords: s:pdf;::" \
564 - sysui/desktop/menus/draw.desktop || die
565 - fi
566 -}
567 -
568 -src_configure() {
569 - # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
570 - # Note: these are for Gentoo use ONLY. For your own distribution, please get
571 - # your own set of keys. Feel free to contact chromium@g.o for more info.
572 - local google_default_client_id="329227923882.apps.googleusercontent.com"
573 - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
574 -
575 - # optimization flags
576 - export GMAKE_OPTIONS="${MAKEOPTS}"
577 - # System python enablement:
578 - export PYTHON_CFLAGS=$(python_get_CFLAGS)
579 - export PYTHON_LIBS=$(python_get_LIBS)
580 -
581 - if use kde; then
582 - export QT_SELECT=5 # bug 639620 needs proper fix though
583 - export QT5DIR="$(qt5_get_bindir)/../"
584 - export MOC5="$(qt5_get_bindir)/moc"
585 - fi
586 -
587 - # system headers/libs/...: enforce using system packages
588 - # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
589 - # --enable-cairo: ensure that cairo is always required
590 - # --enable-*-link: link to the library rather than just dlopen on runtime
591 - # --enable-release-build: build the libreoffice as release
592 - # --disable-fetch-external: prevent dowloading during compile phase
593 - # --enable-extension-integration: enable any extension integration support
594 - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
595 - # --disable-report-builder: too much java packages pulled in without pkgs
596 - # --without-system-sane: just sane.h header that is used for scan in writer,
597 - # not linked or anything else, worthless to depend on
598 - # --disable-pdfium: not yet packaged
599 - local myeconfargs=(
600 - --with-system-dicts
601 - --with-system-epoxy
602 - --with-system-headers
603 - --with-system-jars
604 - --with-system-libs
605 - --enable-cairo-canvas
606 - --enable-largefile
607 - --enable-mergelibs
608 - --enable-neon
609 - --enable-python=system
610 - --enable-randr
611 - --enable-release-build
612 - --disable-breakpad
613 - --disable-ccache
614 - --disable-dependency-tracking
615 - --disable-epm
616 - --disable-fetch-external
617 - --disable-gstreamer-0-10
618 - --disable-online-update
619 - --disable-pdfium
620 - --disable-report-builder
621 - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
622 - --with-build-version="Gentoo official package"
623 - --enable-extension-integration
624 - --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
625 - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
626 - --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
627 - --with-external-tar="${DISTDIR}"
628 - --with-lang=""
629 - --with-parallelism=$(makeopts_jobs)
630 - --with-system-ucpp
631 - --with-vendor="Gentoo Foundation"
632 - --with-x
633 - --without-fonts
634 - --without-myspell-dicts
635 - --without-help
636 - --with-helppack-integration
637 - --with-system-gpgmepp
638 - --without-system-sane
639 - $(use_enable bluetooth sdremote-bluetooth)
640 - $(use_enable coinmp)
641 - $(use_enable cups)
642 - $(use_enable dbus)
643 - $(use_enable debug)
644 - $(use_enable eds evolution2)
645 - $(use_enable firebird firebird-sdbc)
646 - $(use_enable gstreamer gstreamer-1-0)
647 - $(use_enable gtk gtk3)
648 - $(use_enable gtk2 gtk)
649 - $(use_enable kde gtk3-kde5)
650 - $(use_enable kde qt5)
651 - $(use_enable mysql ext-mariadb-connector)
652 - $(use_enable odk)
653 - $(use_enable pdfimport)
654 - $(use_enable postgres postgresql-sdbc)
655 - $(use_enable vlc)
656 - $(use_with coinmp system-coinmp)
657 - $(use_with googledrive gdrive-client-id ${google_default_client_id})
658 - $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
659 - $(use_with java)
660 - $(use_with mysql system-mysql-cppconn)
661 - $(use_with odk doxygen)
662 - )
663 -
664 - if use eds || use gtk; then
665 - myeconfargs+=( --enable-dconf --enable-gio )
666 - else
667 - myeconfargs+=( --disable-dconf --disable-gio )
668 - fi
669 -
670 - # libreoffice extensions handling
671 - for lo_xt in ${LO_EXTS}; do
672 - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
673 - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
674 - else
675 - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
676 - fi
677 - done
678 -
679 - if use java; then
680 - # hsqldb: system one is too new
681 - myeconfargs+=(
682 - --without-junit
683 - --without-system-hsqldb
684 - --with-ant-home="${ANT_HOME}"
685 - --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
686 - --with-jvm-path="${EPREFIX}/usr/lib/"
687 - )
688 -
689 - use libreoffice_extensions_scripting-beanshell && \
690 - myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
691 -
692 - use libreoffice_extensions_scripting-javascript && \
693 - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
694 - fi
695 -
696 - is-flagq "-flto*" && myeconfargs+=( --enable-lto )
697 -
698 - econf "${myeconfargs[@]}"
699 -}
700 -
701 -src_compile() {
702 - # more and more LO stuff tries to use OpenGL, including tests during build
703 - # bug 501508, bug 540624, bug 545974 and probably more
704 - addpredict /dev/dri
705 - addpredict /dev/ati
706 - addpredict /dev/nvidiactl
707 -
708 - # hack for offlinehelp, this needs fixing upstream at some point
709 - # it is broken because we send --without-help
710 - # https://bugs.freedesktop.org/show_bug.cgi?id=46506
711 - (
712 - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
713 - source "${T}/config_host.mk" 2&> /dev/null
714 -
715 - local path="${WORKDIR}/helpcontent2/source/auxiliary/"
716 - mkdir -p "${path}" || die
717 -
718 - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
719 - perl "${S}/helpcontent2/helpers/create_ilst.pl" \
720 - -dir=helpcontent2/source/media/helpimg \
721 - > "${path}/helpimg.ilst"
722 - [[ -s "${path}/helpimg.ilst" ]] || \
723 - ewarn "The help images list is empty, something is fishy, report a bug."
724 - )
725 -
726 - local target
727 - use test && target="build" || target="build-nocheck"
728 -
729 - # this is not a proper make script
730 - make ${target} || die
731 -}
732 -
733 -src_test() {
734 - make unitcheck || die
735 - make slowcheck || die
736 -}
737 -
738 -src_install() {
739 - # This is not Makefile so no buildserver
740 - make DESTDIR="${D}" distro-pack-install -o build -o check || die
741 -
742 - # bug 593514
743 - if use gtk; then
744 - dosym libreoffice/program/liblibreofficekitgtk.so \
745 - /usr/$(get_libdir)/liblibreofficekitgtk.so
746 - fi
747 -
748 - # bash completion aliases
749 - bashcomp_alias \
750 - libreoffice \
751 - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
752 -
753 - if use branding; then
754 - insinto /usr/$(get_libdir)/${PN}/program
755 - newins "${WORKDIR}/branding-sofficerc" sofficerc
756 - dodir /etc/env.d
757 - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
758 - fi
759 -
760 - # Hack for offlinehelp, this needs fixing upstream at some point.
761 - # It is broken because we send --without-help
762 - # https://bugs.freedesktop.org/show_bug.cgi?id=46506
763 - insinto /usr/$(get_libdir)/libreoffice/help
764 - doins xmlhelp/util/*.xsl
765 -
766 - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
767 - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
768 -}
769 -
770 -pkg_preinst() {
771 - gnome2_icon_savelist
772 -}
773 -
774 -pkg_postinst() {
775 - gnome2_icon_cache_update
776 - xdg_desktop_database_update
777 - xdg_mimeinfo_database_update
778 -}
779 -
780 -pkg_postrm() {
781 - gnome2_icon_cache_update
782 - xdg_desktop_database_update
783 - xdg_mimeinfo_database_update
784 -}