Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-4.2.9999.ebuild ChangeLog libreoffice-4.3.9999.ebuild
Date: Sun, 08 Feb 2015 18:54:04
Message-Id: 20150208185359.466F01156D@oystercatcher.gentoo.org
1 dilfridge 15/02/08 18:53:59
2
3 Modified: libreoffice-9999-r2.ebuild
4 libreoffice-4.2.9999.ebuild ChangeLog
5 libreoffice-4.3.9999.ebuild
6 Log:
7 Update live ebuilds for LibreOffice 4.4, thanks Andreas Sturmlechner
8
9 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
10
11 Revision Changes Path
12 1.237 app-office/libreoffice/libreoffice-9999-r2.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.237&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.237&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.236&r2=1.237
17
18 Index: libreoffice-9999-r2.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
21 retrieving revision 1.236
22 retrieving revision 1.237
23 diff -u -r1.236 -r1.237
24 --- libreoffice-9999-r2.ebuild 29 Dec 2014 20:05:21 -0000 1.236
25 +++ libreoffice-9999-r2.ebuild 8 Feb 2015 18:53:59 -0000 1.237
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2014 Gentoo Foundation
28 +# Copyright 1999-2015 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.236 2014/12/29 20:05:21 dilfridge Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.237 2015/02/08 18:53:59 dilfridge Exp $
32
33 EAPI=5
34
35 @@ -27,7 +27,7 @@
36 # PATCHSET="${P}-patchset-01.tar.xz"
37
38 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
39 -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}
40 +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}
41 unset SCM_ECLASS
42
43 DESCRIPTION="LibreOffice, a full office productivity suite"
44 @@ -61,7 +61,6 @@
45 ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
46 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
47 ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
48 -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )"
49 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
50 ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
51 ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
52 @@ -74,7 +73,7 @@
53 unset ADDONS_SRC
54
55 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
56 -+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc"
57 ++gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
58
59 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
60 # Unpackaged separate extensions:
61 @@ -93,8 +92,6 @@
62 [[ ${PV} == *9999* ]] || \
63 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
64
65 -# FIXME: collada? ( media-libs/opencollada )
66 -# how to configure system-collada?
67 COMMON_DEPEND="
68 ${PYTHON_DEPS}
69 app-arch/zip
70 @@ -107,16 +104,16 @@
71 >=app-text/libetonyek-0.1.1
72 app-text/liblangtag
73 >=app-text/libmspub-0.1.0
74 - >=app-text/libmwaw-0.3.1
75 + >=app-text/libmwaw-0.3.4
76 >=app-text/libodfgen-0.1.0
77 app-text/libwpd:0.10[tools]
78 app-text/libwpg:0.3
79 >=app-text/libwps-0.3.0
80 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
81 >=dev-cpp/clucene-2.3.3.4-r2
82 - dev-cpp/libcmis:0.4
83 + =dev-cpp/libcmis-0.5*
84 dev-db/unixODBC
85 - >=dev-libs/boost-1.46:=
86 + >=dev-libs/boost-1.55:=
87 dev-libs/expat
88 >=dev-libs/hyphen-2.7.1
89 >=dev-libs/icu-4.8.1.1:=
90 @@ -136,6 +133,7 @@
91 >=media-libs/libpng-1.4
92 >=media-libs/libcdr-0.1.0
93 >=media-libs/libfreehand-0.1.0
94 + media-libs/libpagemaker
95 >=media-libs/libvisio-0.1.0
96 >=net-misc/curl-7.21.4
97 net-libs/neon
98 @@ -146,8 +144,11 @@
99 x11-libs/libXinerama
100 x11-libs/libXrandr
101 x11-libs/libXrender
102 + virtual/glu
103 + virtual/opengl
104 bluetooth? ( net-wireless/bluez )
105 coinmp? ( sci-libs/coinor-mp )
106 + collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
107 cups? ( net-print/cups )
108 dbus? ( >=dev-libs/dbus-glib-0.92 )
109 eds? ( gnome-extra/evolution-data-server )
110 @@ -174,10 +175,6 @@
111 dev-java/tomcat-servlet-api:3.0
112 )
113 mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
114 - opengl? (
115 - virtual/glu
116 - virtual/opengl
117 - )
118 postgres? ( >=dev-db/postgresql-9.0[kerberos] )
119 telepathy? (
120 dev-libs/glib:2
121 @@ -245,7 +242,7 @@
122
123 PATCHES=(
124 # not upstreamable stuff
125 - "${FILESDIR}/${PN}-3.7-system-pyuno.patch"
126 + "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
127 )
128
129 REQUIRED_USE="
130 @@ -340,6 +337,11 @@
131 export PYTHON_CFLAGS=$(python_get_CFLAGS)
132 export PYTHON_LIBS=$(python_get_LIBS)
133
134 + if use collada; then
135 + export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
136 + export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
137 + fi
138 +
139 # patchset
140 if [[ -n ${PATCHSET} ]]; then
141 EPATCH_FORCE="yes" \
142 @@ -359,7 +361,7 @@
143 -e "s:%eprefix%:${EPREFIX}:g" \
144 -e "s:%libdir%:$(get_libdir):g" \
145 -i pyuno/source/module/uno.py \
146 - -i scripting/source/pyprov/officehelper.py || die
147 + -i pyuno/source/officehelper.py || die
148 # sed in the tests
149 sed -i \
150 -e 's#all : build unitcheck#all : build#g' \
151 @@ -441,7 +443,6 @@
152 # --enable-extension-integration: enable any extension integration support
153 # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
154 # --disable-report-builder: too much java packages pulled in without pkgs
155 - # FIXME: $(use_with collada system-opencollada)
156 econf \
157 --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
158 --with-system-headers \
159 @@ -499,17 +500,17 @@
160 $(use_enable gnome gconf) \
161 $(use_enable gnome gio) \
162 $(use_enable gnome lockdown) \
163 - $(use_enable gstreamer) \
164 + $(use_enable gstreamer gstreamer-1-0) \
165 $(use_enable gtk) \
166 $(use_enable gtk3) \
167 $(use_enable kde kde4) \
168 $(use_enable mysql ext-mariadb-connector) \
169 $(use_enable odk) \
170 - $(use_enable opengl) \
171 $(use_enable postgres postgresql-sdbc) \
172 $(use_enable telepathy) \
173 $(use_enable vlc) \
174 $(use_with coinmp system-coinmp) \
175 + $(use_with collada system-opencollada) \
176 $(use_with gltf system-libgltf) \
177 $(use_with java) \
178 $(use_with mysql system-mysql-cppconn) \
179 @@ -567,9 +568,6 @@
180 echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
181 fi
182
183 - # symlink the nsplugin to proper location
184 - # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
185 -
186 # Hack for offlinehelp, this needs fixing upstream at some point.
187 # It is broken because we send --without-help
188 # https://bugs.freedesktop.org/show_bug.cgi?id=46506
189 @@ -579,6 +577,10 @@
190 # Remove desktop files for support to old installs that can't parse mime
191 rm -rf "${ED}"/usr/share/mimelnk/
192
193 + # FIXME: Hack add missing file
194 + insinto /usr/$(get_libdir)/${PN}/program
195 + doins "${S}"/instdir/program/libsaxlo.so
196 +
197 pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
198 pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
199 }
200
201
202
203 1.33 app-office/libreoffice/libreoffice-4.2.9999.ebuild
204
205 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?rev=1.33&view=markup
206 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?rev=1.33&content-type=text/plain
207 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild?r1=1.32&r2=1.33
208
209 Index: libreoffice-4.2.9999.ebuild
210 ===================================================================
211 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v
212 retrieving revision 1.32
213 retrieving revision 1.33
214 diff -u -r1.32 -r1.33
215 --- libreoffice-4.2.9999.ebuild 29 Dec 2014 20:05:21 -0000 1.32
216 +++ libreoffice-4.2.9999.ebuild 8 Feb 2015 18:53:59 -0000 1.33
217 @@ -1,6 +1,6 @@
218 -# Copyright 1999-2014 Gentoo Foundation
219 +# Copyright 1999-2015 Gentoo Foundation
220 # Distributed under the terms of the GNU General Public License v2
221 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.32 2014/12/29 20:05:21 dilfridge Exp $
222 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.33 2015/02/08 18:53:59 dilfridge Exp $
223
224 EAPI=5
225
226 @@ -110,7 +110,7 @@
227 =app-text/libwps-0.2*
228 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
229 >=dev-cpp/clucene-2.3.3.4-r2
230 - dev-cpp/libcmis:0.4
231 + =dev-cpp/libcmis-0.4*
232 dev-db/unixODBC
233 >=dev-libs/boost-1.46:=
234 dev-libs/expat
235
236
237
238 1.608 app-office/libreoffice/ChangeLog
239
240 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.608&view=markup
241 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.608&content-type=text/plain
242 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.607&r2=1.608
243
244 Index: ChangeLog
245 ===================================================================
246 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
247 retrieving revision 1.607
248 retrieving revision 1.608
249 diff -u -r1.607 -r1.608
250 --- ChangeLog 4 Jan 2015 14:41:22 -0000 1.607
251 +++ ChangeLog 8 Feb 2015 18:53:59 -0000 1.608
252 @@ -1,6 +1,11 @@
253 # ChangeLog for app-office/libreoffice
254 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
255 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.607 2015/01/04 14:41:22 dilfridge Exp $
256 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.608 2015/02/08 18:53:59 dilfridge Exp $
257 +
258 + 08 Feb 2015; Andreas K. Huettel <dilfridge@g.o>
259 + libreoffice-4.2.9999.ebuild, libreoffice-4.3.9999.ebuild,
260 + libreoffice-9999-r2.ebuild, +files/libreoffice-4.4-system-pyuno.patch:
261 + Update live ebuilds for LibreOffice 4.4, thanks Andreas Sturmlechner
262
263 04 Jan 2015; Andreas K. Huettel <dilfridge@g.o>
264 libreoffice-4.3.5.2.ebuild, libreoffice-4.3.9999.ebuild,
265
266
267
268 1.12 app-office/libreoffice/libreoffice-4.3.9999.ebuild
269
270 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild?rev=1.12&view=markup
271 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild?rev=1.12&content-type=text/plain
272 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild?r1=1.11&r2=1.12
273
274 Index: libreoffice-4.3.9999.ebuild
275 ===================================================================
276 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v
277 retrieving revision 1.11
278 retrieving revision 1.12
279 diff -u -r1.11 -r1.12
280 --- libreoffice-4.3.9999.ebuild 4 Jan 2015 14:41:22 -0000 1.11
281 +++ libreoffice-4.3.9999.ebuild 8 Feb 2015 18:53:59 -0000 1.12
282 @@ -1,6 +1,6 @@
283 # Copyright 1999-2015 Gentoo Foundation
284 # Distributed under the terms of the GNU General Public License v2
285 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.11 2015/01/04 14:41:22 dilfridge Exp $
286 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.12 2015/02/08 18:53:59 dilfridge Exp $
287
288 EAPI=5
289
290 @@ -114,7 +114,7 @@
291 >=app-text/libwps-0.3.0
292 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
293 >=dev-cpp/clucene-2.3.3.4-r2
294 - dev-cpp/libcmis:0.4
295 + =dev-cpp/libcmis-0.4*
296 dev-db/unixODBC
297 >=dev-libs/boost-1.46:=
298 dev-libs/expat
Report Message
Find on MARC Find on Google Groups