1 |
commit: 5b4e5d83e39462483c93ccf22f1438d1375db548 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 3 12:47:24 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 3 12:51:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4e5d83 |
7 |
|
8 |
app-office/libreoffice: versionator -> eapi7-ver.eclass, some cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.33, Repoman-2.3.9 |
11 |
|
12 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 86 ++++++++++---------- |
13 |
app-office/libreoffice/libreoffice-9999.ebuild | 92 +++++++++++----------- |
14 |
2 files changed, 87 insertions(+), 91 deletions(-) |
15 |
|
16 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
17 |
index edf22ead40d..c29d9ffa33d 100644 |
18 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
19 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
20 |
@@ -6,21 +6,22 @@ EAPI=6 |
21 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
22 |
PYTHON_REQ_USE="threads,xml" |
23 |
|
24 |
+MY_PV="${PV/_alpha/.alpha}" |
25 |
+MY_PV="${MY_PV/_beta/.beta}" |
26 |
# experimental ; release ; old |
27 |
-# Usually the tarballs are moved a lot so this should make |
28 |
-# everyone happy. |
29 |
+# Usually the tarballs are moved a lot so this should make everyone happy. |
30 |
DEV_URI=" |
31 |
https://dev-builds.libreoffice.org/pre-releases/src |
32 |
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ |
33 |
- https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src |
34 |
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ |
35 |
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src |
36 |
" |
37 |
ADDONS_URI="https://dev-www.libreoffice.org/src/" |
38 |
|
39 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
40 |
PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz" |
41 |
|
42 |
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" |
43 |
-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} |
44 |
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3" |
45 |
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS} |
46 |
unset SCM_ECLASS |
47 |
|
48 |
DESCRIPTION="A full office productivity suite" |
49 |
@@ -28,14 +29,13 @@ HOMEPAGE="https://www.libreoffice.org" |
50 |
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
51 |
[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" |
52 |
|
53 |
-# Split modules following git/tarballs |
54 |
-# Core MUST be first! |
55 |
+# Split modules following git/tarballs; Core MUST be first! |
56 |
# Help is used for the image generator |
57 |
# Only release has the tarballs |
58 |
-if [[ ${PV} != *9999* ]]; then |
59 |
+if [[ ${MY_PV} != *9999* ]]; then |
60 |
for i in ${DEV_URI}; do |
61 |
- SRC_URI+=" ${i}/${P}.tar.xz" |
62 |
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" |
63 |
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" |
64 |
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" |
65 |
done |
66 |
unset i |
67 |
fi |
68 |
@@ -67,9 +67,18 @@ IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
69 |
gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc |
70 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
71 |
|
72 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
73 |
+ bluetooth? ( dbus ) |
74 |
+ kde? ( gtk ) |
75 |
+ libreoffice_extensions_nlpsolver? ( java ) |
76 |
+ libreoffice_extensions_scripting-beanshell? ( java ) |
77 |
+ libreoffice_extensions_scripting-javascript? ( java ) |
78 |
+ libreoffice_extensions_wiki-publisher? ( java ) |
79 |
+" |
80 |
+ |
81 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
82 |
SLOT="0" |
83 |
-[[ ${PV} == *9999* ]] || \ |
84 |
+[[ ${MY_PV} == *9999* ]] || \ |
85 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
86 |
|
87 |
COMMON_DEPEND="${PYTHON_DEPS} |
88 |
@@ -151,12 +160,14 @@ COMMON_DEPEND="${PYTHON_DEPS} |
89 |
dev-libs/glib:2 |
90 |
dev-libs/gobject-introspection |
91 |
gnome-base/dconf |
92 |
+ media-libs/mesa[egl] |
93 |
x11-libs/gtk+:3 |
94 |
) |
95 |
gtk2? ( |
96 |
x11-libs/gdk-pixbuf |
97 |
>=x11-libs/gtk+-2.24:2 |
98 |
) |
99 |
+ jemalloc? ( dev-libs/jemalloc ) |
100 |
kde? ( |
101 |
dev-qt/qtcore:5 |
102 |
dev-qt/qtgui:5 |
103 |
@@ -168,7 +179,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
104 |
kde-frameworks/kio:5 |
105 |
kde-frameworks/kwindowsystem:5 |
106 |
) |
107 |
- jemalloc? ( dev-libs/jemalloc ) |
108 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
109 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
110 |
mysql? ( dev-db/mysql-connector-c++ ) |
111 |
@@ -189,8 +199,8 @@ RDEPEND="${COMMON_DEPEND} |
112 |
vlc? ( media-video/vlc ) |
113 |
" |
114 |
|
115 |
-if [[ ${PV} != *9999* ]]; then |
116 |
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" |
117 |
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
118 |
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" |
119 |
else |
120 |
# Translations are not reliable on live ebuilds |
121 |
# rather force people to use english only. |
122 |
@@ -231,15 +241,6 @@ DEPEND="${COMMON_DEPEND} |
123 |
) |
124 |
" |
125 |
|
126 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
127 |
- bluetooth? ( dbus ) |
128 |
- kde? ( gtk ) |
129 |
- libreoffice_extensions_nlpsolver? ( java ) |
130 |
- libreoffice_extensions_scripting-beanshell? ( java ) |
131 |
- libreoffice_extensions_scripting-javascript? ( java ) |
132 |
- libreoffice_extensions_wiki-publisher? ( java ) |
133 |
-" |
134 |
- |
135 |
PATCHES=( |
136 |
# not upstreamable stuff |
137 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
138 |
@@ -252,6 +253,17 @@ PATCHES=( |
139 |
"${WORKDIR}"/${PATCHSET/.tar.xz/} |
140 |
) |
141 |
|
142 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
143 |
+ |
144 |
+_check_reqs() { |
145 |
+ CHECKREQS_MEMORY="512M" |
146 |
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
147 |
+ CHECKREQS_DISK_BUILD="22G" |
148 |
+ else |
149 |
+ CHECKREQS_DISK_BUILD="6G" |
150 |
+ fi |
151 |
+} |
152 |
+ |
153 |
pkg_pretend() { |
154 |
use java || \ |
155 |
ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
156 |
@@ -263,12 +275,7 @@ pkg_pretend() { |
157 |
fi |
158 |
|
159 |
if [[ ${MERGE_TYPE} != binary ]]; then |
160 |
- CHECKREQS_MEMORY="512M" |
161 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
162 |
- CHECKREQS_DISK_BUILD="22G" |
163 |
- else |
164 |
- CHECKREQS_DISK_BUILD="6G" |
165 |
- fi |
166 |
+ _check_reqs |
167 |
check-reqs_pkg_pretend |
168 |
fi |
169 |
} |
170 |
@@ -279,12 +286,7 @@ pkg_setup() { |
171 |
xdg_environment_reset |
172 |
|
173 |
if [[ ${MERGE_TYPE} != binary ]]; then |
174 |
- CHECKREQS_MEMORY="512M" |
175 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
176 |
- CHECKREQS_DISK_BUILD="22G" |
177 |
- else |
178 |
- CHECKREQS_DISK_BUILD="6G" |
179 |
- fi |
180 |
+ _check_reqs |
181 |
check-reqs_pkg_setup |
182 |
fi |
183 |
} |
184 |
@@ -292,12 +294,12 @@ pkg_setup() { |
185 |
src_unpack() { |
186 |
default |
187 |
|
188 |
- if [[ ${PV} = *9999* ]]; then |
189 |
+ if [[ ${MY_PV} = *9999* ]]; then |
190 |
local base_uri branch mypv |
191 |
base_uri="https://anongit.freedesktop.org/git" |
192 |
branch="master" |
193 |
- mypv=${PV/.9999} |
194 |
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" |
195 |
+ mypv=${MY_PV/.9999} |
196 |
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" |
197 |
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
198 |
git-r3_checkout "${base_uri}/${PN}/core" |
199 |
|
200 |
@@ -340,7 +342,7 @@ src_prepare() { |
201 |
|
202 |
if use branding; then |
203 |
# hack... |
204 |
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die |
205 |
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die |
206 |
fi |
207 |
|
208 |
# Don't list pdfimport support in desktop when built with none, bug # 605464 |
209 |
@@ -554,10 +556,6 @@ src_install() { |
210 |
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin |
211 |
} |
212 |
|
213 |
-pkg_preinst() { |
214 |
- gnome2_icon_savelist |
215 |
-} |
216 |
- |
217 |
pkg_postinst() { |
218 |
gnome2_icon_cache_update |
219 |
xdg_desktop_database_update |
220 |
|
221 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
222 |
index 3799a7815c0..45222450d1f 100644 |
223 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
224 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
225 |
@@ -6,36 +6,36 @@ EAPI=6 |
226 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
227 |
PYTHON_REQ_USE="threads,xml" |
228 |
|
229 |
+MY_PV="${PV/_alpha/.alpha}" |
230 |
+MY_PV="${MY_PV/_beta/.beta}" |
231 |
# experimental ; release ; old |
232 |
-# Usually the tarballs are moved a lot so this should make |
233 |
-# everyone happy. |
234 |
+# Usually the tarballs are moved a lot so this should make everyone happy. |
235 |
DEV_URI=" |
236 |
https://dev-builds.libreoffice.org/pre-releases/src |
237 |
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ |
238 |
- https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src |
239 |
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ |
240 |
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src |
241 |
" |
242 |
ADDONS_URI="https://dev-www.libreoffice.org/src/" |
243 |
|
244 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
245 |
# PATCHSET="${P}-patchset-01.tar.xz" |
246 |
|
247 |
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" |
248 |
-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} |
249 |
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3" |
250 |
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS} |
251 |
unset SCM_ECLASS |
252 |
|
253 |
DESCRIPTION="A full office productivity suite" |
254 |
HOMEPAGE="https://www.libreoffice.org" |
255 |
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
256 |
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" |
257 |
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" |
258 |
|
259 |
-# Split modules following git/tarballs |
260 |
-# Core MUST be first! |
261 |
+# Split modules following git/tarballs; Core MUST be first! |
262 |
# Help is used for the image generator |
263 |
# Only release has the tarballs |
264 |
-if [[ ${PV} != *9999* ]]; then |
265 |
+if [[ ${MY_PV} != *9999* ]]; then |
266 |
for i in ${DEV_URI}; do |
267 |
- SRC_URI+=" ${i}/${P}.tar.xz" |
268 |
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" |
269 |
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" |
270 |
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" |
271 |
done |
272 |
unset i |
273 |
fi |
274 |
@@ -67,10 +67,19 @@ IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
275 |
gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc |
276 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
277 |
|
278 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
279 |
+ bluetooth? ( dbus ) |
280 |
+ kde? ( gtk ) |
281 |
+ libreoffice_extensions_nlpsolver? ( java ) |
282 |
+ libreoffice_extensions_scripting-beanshell? ( java ) |
283 |
+ libreoffice_extensions_scripting-javascript? ( java ) |
284 |
+ libreoffice_extensions_wiki-publisher? ( java ) |
285 |
+" |
286 |
+ |
287 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
288 |
SLOT="0" |
289 |
-[[ ${PV} == *9999* ]] || \ |
290 |
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" |
291 |
+[[ ${MY_PV} == *9999* ]] || \ |
292 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
293 |
|
294 |
COMMON_DEPEND="${PYTHON_DEPS} |
295 |
app-arch/unzip |
296 |
@@ -151,6 +160,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
297 |
dev-libs/glib:2 |
298 |
dev-libs/gobject-introspection |
299 |
gnome-base/dconf |
300 |
+ media-libs/mesa[egl] |
301 |
x11-libs/gtk+:3 |
302 |
) |
303 |
gtk2? ( |
304 |
@@ -188,8 +198,8 @@ RDEPEND="${COMMON_DEPEND} |
305 |
vlc? ( media-video/vlc ) |
306 |
" |
307 |
|
308 |
-if [[ ${PV} != *9999* ]]; then |
309 |
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" |
310 |
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
311 |
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" |
312 |
else |
313 |
# Translations are not reliable on live ebuilds |
314 |
# rather force people to use english only. |
315 |
@@ -230,15 +240,6 @@ DEPEND="${COMMON_DEPEND} |
316 |
) |
317 |
" |
318 |
|
319 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
320 |
- bluetooth? ( dbus ) |
321 |
- kde? ( gtk ) |
322 |
- libreoffice_extensions_nlpsolver? ( java ) |
323 |
- libreoffice_extensions_scripting-beanshell? ( java ) |
324 |
- libreoffice_extensions_scripting-javascript? ( java ) |
325 |
- libreoffice_extensions_wiki-publisher? ( java ) |
326 |
-" |
327 |
- |
328 |
PATCHES=( |
329 |
# "${WORKDIR}"/${PATCHSET/.tar.xz/} |
330 |
|
331 |
@@ -250,6 +251,17 @@ PATCHES=( |
332 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
333 |
) |
334 |
|
335 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
336 |
+ |
337 |
+_check_reqs() { |
338 |
+ CHECKREQS_MEMORY="512M" |
339 |
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
340 |
+ CHECKREQS_DISK_BUILD="22G" |
341 |
+ else |
342 |
+ CHECKREQS_DISK_BUILD="6G" |
343 |
+ fi |
344 |
+} |
345 |
+ |
346 |
pkg_pretend() { |
347 |
use java || \ |
348 |
ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
349 |
@@ -261,12 +273,7 @@ pkg_pretend() { |
350 |
fi |
351 |
|
352 |
if [[ ${MERGE_TYPE} != binary ]]; then |
353 |
- CHECKREQS_MEMORY="512M" |
354 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
355 |
- CHECKREQS_DISK_BUILD="22G" |
356 |
- else |
357 |
- CHECKREQS_DISK_BUILD="6G" |
358 |
- fi |
359 |
+ _check_reqs |
360 |
check-reqs_pkg_pretend |
361 |
fi |
362 |
} |
363 |
@@ -277,12 +284,7 @@ pkg_setup() { |
364 |
xdg_environment_reset |
365 |
|
366 |
if [[ ${MERGE_TYPE} != binary ]]; then |
367 |
- CHECKREQS_MEMORY="512M" |
368 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
369 |
- CHECKREQS_DISK_BUILD="22G" |
370 |
- else |
371 |
- CHECKREQS_DISK_BUILD="6G" |
372 |
- fi |
373 |
+ _check_reqs |
374 |
check-reqs_pkg_setup |
375 |
fi |
376 |
} |
377 |
@@ -290,12 +292,12 @@ pkg_setup() { |
378 |
src_unpack() { |
379 |
default |
380 |
|
381 |
- if [[ ${PV} = *9999* ]]; then |
382 |
+ if [[ ${MY_PV} = *9999* ]]; then |
383 |
local base_uri branch mypv |
384 |
base_uri="https://anongit.freedesktop.org/git" |
385 |
branch="master" |
386 |
- mypv=${PV/.9999} |
387 |
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" |
388 |
+ mypv=${MY_PV/.9999} |
389 |
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" |
390 |
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
391 |
git-r3_checkout "${base_uri}/${PN}/core" |
392 |
|
393 |
@@ -338,7 +340,7 @@ src_prepare() { |
394 |
|
395 |
if use branding; then |
396 |
# hack... |
397 |
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die |
398 |
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die |
399 |
fi |
400 |
|
401 |
# Don't list pdfimport support in desktop when built with none, bug # 605464 |
402 |
@@ -431,9 +433,9 @@ src_configure() { |
403 |
$(use_enable gstreamer gstreamer-1-0) |
404 |
$(use_enable gtk gtk3) |
405 |
$(use_enable gtk2 gtk) |
406 |
- $(use_enable kde qt5) |
407 |
- $(use_enable kde kde5) |
408 |
$(use_enable kde gtk3-kde5) |
409 |
+ $(use_enable kde kde5) |
410 |
+ $(use_enable kde qt5) |
411 |
$(use_enable mysql ext-mariadb-connector) |
412 |
$(use_enable odk) |
413 |
$(use_enable pdfimport) |
414 |
@@ -553,10 +555,6 @@ src_install() { |
415 |
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin |
416 |
} |
417 |
|
418 |
-pkg_preinst() { |
419 |
- gnome2_icon_savelist |
420 |
-} |
421 |
- |
422 |
pkg_postinst() { |
423 |
gnome2_icon_cache_update |
424 |
xdg_desktop_database_update |