Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@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, 22 Feb 2016 17:07:21
Message-Id: 1456160724.db23475fd1efe1c0d7144c7c6a195f00dd5a60a0.dilfridge@gentoo
1 commit: db23475fd1efe1c0d7144c7c6a195f00dd5a60a0
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Wed Oct 21 23:37:12 2015 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 22 17:05:24 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db23475f
7
8 app-office/libreoffice: Update DEPENDs, pyuno patch, add 5.1 stable branch
9
10 - Pin mdds DEPEND to slot 0
11 - Relax library dependencies, see commit
12 517e2522adcd7d091009bfd9e9f9704374ec02a7 and following
13 - Upstream dropped gconf integration, see commit
14 3cf557c12d27f1b2250e69a543136da098112d80
15 - pyuno patch: Only a small change in desktop/scripts/soffice.sh context
16
17 Package-Manager: portage-2.2.27
18
19 .../files/libreoffice-5.2-system-pyuno.patch | 44 ++++++++++++++++++++++
20 app-office/libreoffice/libreoffice-4.4.6.3.ebuild | 2 +-
21 app-office/libreoffice/libreoffice-4.4.9999.ebuild | 2 +-
22 app-office/libreoffice/libreoffice-5.0.3.2.ebuild | 2 +-
23 app-office/libreoffice/libreoffice-5.0.4.2.ebuild | 2 +-
24 app-office/libreoffice/libreoffice-5.0.5.2.ebuild | 4 +-
25 app-office/libreoffice/libreoffice-5.0.9999.ebuild | 4 +-
26 ...ice-9999.ebuild => libreoffice-5.1.9999.ebuild} | 22 ++++++-----
27 app-office/libreoffice/libreoffice-9999.ebuild | 40 ++++++++------------
28 9 files changed, 79 insertions(+), 43 deletions(-)
29
30 diff --git a/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
31 new file mode 100644
32 index 0000000..e06f81f
33 --- /dev/null
34 +++ b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
35 @@ -0,0 +1,44 @@
36 +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
37 +index a259bf6..672fa23 100755
38 +--- a/desktop/scripts/soffice.sh
39 ++++ b/desktop/scripts/soffice.sh
40 +@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
41 + exit 1;
42 + fi
43 +
44 ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
45 ++export PYTHONPATH
46 ++
47 + case "`uname -s`" in
48 + NetBSD|OpenBSD|DragonFly)
49 + # this is a temporary hack until we can live with the default search paths
50 +diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
51 +index 4ff2606..6a05eed 100644
52 +--- a/pyuno/source/module/uno.py
53 ++++ b/pyuno/source/module/uno.py
54 +@@ -16,8 +16,12 @@
55 + # except in compliance with the License. You may obtain a copy of
56 + # the License at http://www.apache.org/licenses/LICENSE-2.0 .
57 + #
58 ++import os
59 + import sys
60 +
61 ++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
62 ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
63 ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
64 + import pyuno
65 +
66 + try:
67 +diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
68 +index 99d3b03..704edab 100755
69 +--- a/pyuno/source/officehelper.py
70 ++++ b/pyuno/source/officehelper.py
71 +@@ -44,7 +44,7 @@ def bootstrap():
72 + if "UNO_PATH" in os.environ:
73 + sOffice = os.environ["UNO_PATH"]
74 + else:
75 +- sOffice = "" # lets hope for the best
76 ++ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
77 + sOffice = os.path.join(sOffice, "soffice")
78 + if platform.startswith("win"):
79 + sOffice += ".exe"
80
81 diff --git a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
82 index 863f7c9..1dad190 100644
83 --- a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
84 +++ b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
85 @@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
86 dev-util/cppunit
87 >=dev-util/gperf-3
88 dev-util/intltool
89 - >=dev-util/mdds-0.11.2:=
90 + >=dev-util/mdds-0.11.2:0=
91 media-libs/glm
92 net-misc/npapi-sdk
93 >=sys-apps/findutils-4.4.2
94
95 diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
96 index 863f7c9..1dad190 100644
97 --- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
98 +++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
99 @@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
100 dev-util/cppunit
101 >=dev-util/gperf-3
102 dev-util/intltool
103 - >=dev-util/mdds-0.11.2:=
104 + >=dev-util/mdds-0.11.2:0=
105 media-libs/glm
106 net-misc/npapi-sdk
107 >=sys-apps/findutils-4.4.2
108
109 diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
110 index 15d59be..6b99676 100644
111 --- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
112 +++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
113 @@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
114 dev-util/cppunit
115 >=dev-util/gperf-3
116 dev-util/intltool
117 - >=dev-util/mdds-0.12.0:=
118 + >=dev-util/mdds-0.12.0:0=
119 media-libs/glm
120 net-misc/npapi-sdk
121 >=sys-apps/findutils-4.4.2
122
123 diff --git a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
124 index 4cc1a49..1cf15be 100644
125 --- a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
126 +++ b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
127 @@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
128 dev-util/cppunit
129 >=dev-util/gperf-3
130 dev-util/intltool
131 - >=dev-util/mdds-0.12.0:=
132 + >=dev-util/mdds-0.12.0:0=
133 media-libs/glm
134 net-misc/npapi-sdk
135 >=sys-apps/findutils-4.4.2
136
137 diff --git a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
138 index 4cc1a49..abeb761 100644
139 --- a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
140 +++ b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
141 @@ -1,4 +1,4 @@
142 -# Copyright 1999-2015 Gentoo Foundation
143 +# Copyright 1999-2016 Gentoo Foundation
144 # Distributed under the terms of the GNU General Public License v2
145 # $Id$
146
147 @@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
148 dev-util/cppunit
149 >=dev-util/gperf-3
150 dev-util/intltool
151 - >=dev-util/mdds-0.12.0:=
152 + >=dev-util/mdds-0.12.0:0=
153 media-libs/glm
154 net-misc/npapi-sdk
155 >=sys-apps/findutils-4.4.2
156
157 diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
158 index 4cc1a49..abeb761 100644
159 --- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
160 +++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
161 @@ -1,4 +1,4 @@
162 -# Copyright 1999-2015 Gentoo Foundation
163 +# Copyright 1999-2016 Gentoo Foundation
164 # Distributed under the terms of the GNU General Public License v2
165 # $Id$
166
167 @@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
168 dev-util/cppunit
169 >=dev-util/gperf-3
170 dev-util/intltool
171 - >=dev-util/mdds-0.12.0:=
172 + >=dev-util/mdds-0.12.0:0=
173 media-libs/glm
174 net-misc/npapi-sdk
175 >=sys-apps/findutils-4.4.2
176
177 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
178 similarity index 98%
179 copy from app-office/libreoffice/libreoffice-9999.ebuild
180 copy to app-office/libreoffice/libreoffice-5.1.9999.ebuild
181 index 3907338..18d7177 100644
182 --- a/app-office/libreoffice/libreoffice-9999.ebuild
183 +++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
184 @@ -1,4 +1,4 @@
185 -# Copyright 1999-2015 Gentoo Foundation
186 +# Copyright 1999-2016 Gentoo Foundation
187 # Distributed under the terms of the GNU General Public License v2
188 # $Id$
189
190 @@ -106,15 +106,15 @@ COMMON_DEPEND="
191 app-text/mythes
192 >=app-text/libabw-0.1.0
193 >=app-text/libexttextcat-3.4.4
194 - >=app-text/libebook-0.1.1
195 - >=app-text/libetonyek-0.1.2
196 + >=app-text/libebook-0.1
197 + >=app-text/libetonyek-0.1
198 app-text/liblangtag
199 >=app-text/libmspub-0.1.0
200 - >=app-text/libmwaw-0.3.6
201 + >=app-text/libmwaw-0.3.1
202 >=app-text/libodfgen-0.1.0
203 app-text/libwpd:0.10[tools]
204 app-text/libwpg:0.3
205 - >=app-text/libwps-0.4.2
206 + >=app-text/libwps-0.4
207 >=app-text/poppler-0.16:=[cxx]
208 >=dev-cpp/clucene-2.3.3.4-r2
209 =dev-cpp/libcmis-0.5*
210 @@ -123,7 +123,7 @@ COMMON_DEPEND="
211 dev-libs/expat
212 >=dev-libs/hyphen-2.7.1
213 >=dev-libs/icu-4.8.1.1:=
214 - >=dev-libs/liborcus-0.9.0
215 + =dev-libs/liborcus-0.9*
216 >=dev-libs/librevenge-0.0.1
217 >=dev-libs/nspr-4.8.8
218 >=dev-libs/nss-3.12.9
219 @@ -158,10 +158,12 @@ COMMON_DEPEND="
220 collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
221 cups? ( net-print/cups )
222 dbus? ( >=dev-libs/dbus-glib-0.92 )
223 - eds? ( gnome-extra/evolution-data-server )
224 + eds? (
225 + dev-libs/glib:2
226 + gnome-extra/evolution-data-server
227 + )
228 firebird? ( >=dev-db/firebird-2.5 )
229 gltf? ( media-libs/libgltf )
230 - gnome? ( dev-libs/glib:2 )
231 gtk? (
232 x11-libs/gdk-pixbuf[X]
233 >=x11-libs/gtk+-2.24:2
234 @@ -215,7 +217,7 @@ DEPEND="${COMMON_DEPEND}
235 dev-util/cppunit
236 >=dev-util/gperf-3
237 dev-util/intltool
238 - >=dev-util/mdds-0.12.0:=
239 + >=dev-util/mdds-0.12.0:0=
240 media-libs/glm
241 net-misc/npapi-sdk
242 >=sys-apps/findutils-4.4.2
243 @@ -247,7 +249,7 @@ REQUIRED_USE="
244 collada? ( gltf )
245 eds? ( gnome )
246 gnome? ( gtk )
247 - telepathy? ( gnome )
248 + telepathy? ( gtk )
249 libreoffice_extensions_nlpsolver? ( java )
250 libreoffice_extensions_scripting-beanshell? ( java )
251 libreoffice_extensions_scripting-javascript? ( java )
252
253 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
254 index 3907338..9e2bd12 100644
255 --- a/app-office/libreoffice/libreoffice-9999.ebuild
256 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
257 @@ -1,4 +1,4 @@
258 -# Copyright 1999-2015 Gentoo Foundation
259 +# Copyright 1999-2016 Gentoo Foundation
260 # Distributed under the terms of the GNU General Public License v2
261 # $Id$
262
263 @@ -59,7 +59,6 @@ unset DEV_URI
264 # These are bundles that can't be removed for now due to huge patchsets.
265 # If you want them gone, patches are welcome.
266 ADDONS_SRC=(
267 - "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
268 "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
269 "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
270 "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
271 @@ -106,15 +105,15 @@ COMMON_DEPEND="
272 app-text/mythes
273 >=app-text/libabw-0.1.0
274 >=app-text/libexttextcat-3.4.4
275 - >=app-text/libebook-0.1.1
276 - >=app-text/libetonyek-0.1.2
277 + >=app-text/libebook-0.1
278 + >=app-text/libetonyek-0.1
279 app-text/liblangtag
280 >=app-text/libmspub-0.1.0
281 - >=app-text/libmwaw-0.3.6
282 + >=app-text/libmwaw-0.3.1
283 >=app-text/libodfgen-0.1.0
284 app-text/libwpd:0.10[tools]
285 app-text/libwpg:0.3
286 - >=app-text/libwps-0.4.2
287 + >=app-text/libwps-0.4
288 >=app-text/poppler-0.16:=[cxx]
289 >=dev-cpp/clucene-2.3.3.4-r2
290 =dev-cpp/libcmis-0.5*
291 @@ -158,10 +157,12 @@ COMMON_DEPEND="
292 collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
293 cups? ( net-print/cups )
294 dbus? ( >=dev-libs/dbus-glib-0.92 )
295 - eds? ( gnome-extra/evolution-data-server )
296 + eds? (
297 + dev-libs/glib:2
298 + gnome-extra/evolution-data-server
299 + )
300 firebird? ( >=dev-db/firebird-2.5 )
301 gltf? ( media-libs/libgltf )
302 - gnome? ( dev-libs/glib:2 )
303 gtk? (
304 x11-libs/gdk-pixbuf[X]
305 >=x11-libs/gtk+-2.24:2
306 @@ -215,9 +216,8 @@ DEPEND="${COMMON_DEPEND}
307 dev-util/cppunit
308 >=dev-util/gperf-3
309 dev-util/intltool
310 - >=dev-util/mdds-0.12.0:=
311 + dev-util/mdds:1=
312 media-libs/glm
313 - net-misc/npapi-sdk
314 >=sys-apps/findutils-4.4.2
315 sys-devel/bison
316 sys-apps/coreutils
317 @@ -247,7 +247,7 @@ REQUIRED_USE="
318 collada? ( gltf )
319 eds? ( gnome )
320 gnome? ( gtk )
321 - telepathy? ( gnome )
322 + telepathy? ( gtk )
323 libreoffice_extensions_nlpsolver? ( java )
324 libreoffice_extensions_scripting-beanshell? ( java )
325 libreoffice_extensions_scripting-javascript? ( java )
326 @@ -256,7 +256,7 @@ REQUIRED_USE="
327
328 PATCHES=(
329 # not upstreamable stuff
330 - "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
331 + "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
332 )
333
334 CHECKREQS_MEMORY="512M"
335 @@ -365,7 +365,6 @@ src_prepare() {
336
337 src_configure() {
338 local java_opts
339 - local internal_libs
340 local lo_ext
341 local ext_opts
342
343 @@ -380,16 +379,6 @@ src_configure() {
344 export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
345 fi
346
347 - # sane: just sane.h header that is used for scan in writer, not
348 - # linked or anything else, worthless to depend on
349 - # vigra: just uses templates from there
350 - # it is serious pain in the ass for packaging
351 - # should be replaced by boost::gil if someone interested
352 - internal_libs+="
353 - --without-system-sane
354 - --without-system-vigra
355 - "
356 -
357 # libreoffice extensions handling
358 for lo_xt in ${LO_EXTS}; do
359 if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
360 @@ -427,6 +416,8 @@ src_configure() {
361 # --enable-extension-integration: enable any extension integration support
362 # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
363 # --disable-report-builder: too much java packages pulled in without pkgs
364 + # --without-system-sane: just sane.h header that is used for scan in writer,
365 + # not linked or anything else, worthless to depend on
366 econf \
367 --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
368 --with-system-headers \
369 @@ -440,7 +431,6 @@ src_configure() {
370 --enable-neon \
371 --enable-python=system \
372 --enable-randr \
373 - --enable-randr-link \
374 --enable-release-build \
375 --disable-hardlink-deliver \
376 --disable-ccache \
377 @@ -469,6 +459,7 @@ src_configure() {
378 --without-help \
379 --with-helppack-integration \
380 --without-sun-templates \
381 + --without-system-sane \
382 $(use_enable bluetooth sdremote-bluetooth) \
383 $(use_enable coinmp) \
384 $(use_enable collada) \
385 @@ -494,7 +485,6 @@ src_configure() {
386 $(use_with java) \
387 $(use_with mysql system-mysql-cppconn) \
388 $(use_with odk doxygen) \
389 - ${internal_libs} \
390 ${java_opts} \
391 ${ext_opts}
392 }