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/
Date: Tue, 04 May 2021 22:57:19
Message-Id: 1620169006.46228c2ee31b278182016969395b3797fc19ee28.asturm@gentoo
1 commit: 46228c2ee31b278182016969395b3797fc19ee28
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 4 22:17:29 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 22:56:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46228c2e
7
8 app-office/libreoffice: Bad news for x86 and IUSE="base,java"
9
10 Bug: https://bugs.gentoo.org/785640
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 app-office/libreoffice/libreoffice-7.1.9999.ebuild | 14 ++++++++++----
15 app-office/libreoffice/libreoffice-9999.ebuild | 14 ++++++++++----
16 2 files changed, 20 insertions(+), 8 deletions(-)
17
18 diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
19 index cf695c2bff7..41b1282d902 100644
20 --- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
21 +++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
22 @@ -307,10 +307,16 @@ _check_reqs() {
23 }
24
25 pkg_pretend() {
26 - use base ||
27 - ewarn "If you plan to use Base application you must enable USE base."
28 - use java ||
29 - ewarn "Without USE java, several wizards are not going to be available."
30 + if use x86; then
31 + elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
32 + elog "most notably Report Builder in LibreOffice Base, will not be available."
33 + elog "See also: https://bugs.gentoo.org/785640"
34 + else
35 + use base ||
36 + ewarn "If you plan to use Base application you must enable USE base."
37 + use java ||
38 + ewarn "Without USE java, several wizards are not going to be available."
39 + fi
40
41 [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
42 }
43
44 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
45 index a38aba75536..c9f16a41c2a 100644
46 --- a/app-office/libreoffice/libreoffice-9999.ebuild
47 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
48 @@ -307,10 +307,16 @@ _check_reqs() {
49 }
50
51 pkg_pretend() {
52 - use base ||
53 - ewarn "If you plan to use Base application you must enable USE base."
54 - use java ||
55 - ewarn "Without USE java, several wizards are not going to be available."
56 + if use x86; then
57 + elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
58 + elog "most notably Report Builder in LibreOffice Base, will not be available."
59 + elog "See also: https://bugs.gentoo.org/785640"
60 + else
61 + use base ||
62 + ewarn "If you plan to use Base application you must enable USE base."
63 + use java ||
64 + ewarn "Without USE java, several wizards are not going to be available."
65 + fi
66
67 [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
68 }