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: Fri, 22 May 2020 14:09:49
Message-Id: 1590156568.cd6e654846fa3a26a95497419343a485c3879c33.asturm@gentoo
1 commit: cd6e654846fa3a26a95497419343a485c3879c33
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 22 12:36:51 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri May 22 14:09:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6e6548
7
8 app-office/libreoffice: Set IUSE="+dbus", gtk requires sys-apps/dbus[X]
9
10 Try to fix 'minimalist WM' corner case.
11
12 Closes: https://bugs.gentoo.org/716712
13 Package-Manager: Portage-2.3.99, Repoman-2.3.22
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 app-office/libreoffice/libreoffice-6.4.9999.ebuild | 5 +++--
17 app-office/libreoffice/libreoffice-9999.ebuild | 5 +++--
18 2 files changed, 6 insertions(+), 4 deletions(-)
19
20 diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
21 index 96cb0161263..e42e510981a 100644
22 --- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
23 +++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
24 @@ -64,12 +64,13 @@ unset ADDONS_SRC
25 # Extensions that need extra work:
26 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
27
28 -IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
29 +IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
30 googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
31 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
32
33 REQUIRED_USE="${PYTHON_REQUIRED_USE}
34 bluetooth? ( dbus )
35 + gtk? ( dbus )
36 libreoffice_extensions_nlpsolver? ( java )
37 libreoffice_extensions_scripting-beanshell? ( java )
38 libreoffice_extensions_scripting-javascript? ( java )
39 @@ -164,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
40 )
41 coinmp? ( sci-libs/coinor-mp )
42 cups? ( net-print/cups )
43 - dbus? ( sys-apps/dbus )
44 + dbus? ( sys-apps/dbus[X] )
45 eds? (
46 dev-libs/glib:2
47 gnome-base/dconf
48
49 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
50 index 536c445e030..3e5059a2035 100644
51 --- a/app-office/libreoffice/libreoffice-9999.ebuild
52 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
53 @@ -68,12 +68,13 @@ unset ADDONS_SRC
54 # Extensions that need extra work:
55 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
56
57 -IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
58 +IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
59 googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
60 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
61
62 REQUIRED_USE="${PYTHON_REQUIRED_USE}
63 bluetooth? ( dbus )
64 + gtk? ( dbus )
65 libreoffice_extensions_nlpsolver? ( java )
66 libreoffice_extensions_scripting-beanshell? ( java )
67 libreoffice_extensions_scripting-javascript? ( java )
68 @@ -168,7 +169,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
69 )
70 coinmp? ( sci-libs/coinor-mp )
71 cups? ( net-print/cups )
72 - dbus? ( sys-apps/dbus )
73 + dbus? ( sys-apps/dbus[X] )
74 eds? (
75 dev-libs/glib:2
76 gnome-base/dconf