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: Wed, 14 Aug 2019 11:54:46
Message-Id: 1565783625.bffeaaf173391d014f56fd2ef1db46354bc44e7a.asturm@gentoo
1 commit: bffeaaf173391d014f56fd2ef1db46354bc44e7a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 14 11:53:45 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 14 11:53:45 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bffeaaf1
7
8 app-office/libreoffice: Drop USE gtk2
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-office/libreoffice/libreoffice-9999.ebuild | 9 ++-------
14 1 file changed, 2 insertions(+), 7 deletions(-)
15
16 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
17 index c593c78f419..b603ee3b8f4 100644
18 --- a/app-office/libreoffice/libreoffice-9999.ebuild
19 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
20 @@ -63,7 +63,7 @@ unset ADDONS_SRC
21 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
22
23 IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
24 -googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
25 +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
26 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
27
28 REQUIRED_USE="${PYTHON_REQUIRED_USE}
29 @@ -176,11 +176,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
30 x11-libs/gtk+:3
31 x11-libs/pango
32 )
33 - gtk2? (
34 - x11-libs/gdk-pixbuf
35 - >=x11-libs/gtk+-2.24:2
36 - x11-libs/pango
37 - )
38 kde? (
39 dev-qt/qtcore:5
40 dev-qt/qtgui:5
41 @@ -409,6 +404,7 @@ src_configure() {
42 --disable-epm
43 --disable-fetch-external
44 --disable-gstreamer-0-10
45 + --disable-gtk2
46 --disable-gtk3-kde5
47 --disable-online-update
48 --disable-openssl
49 @@ -442,7 +438,6 @@ src_configure() {
50 $(use_enable firebird firebird-sdbc)
51 $(use_enable gstreamer gstreamer-1-0)
52 $(use_enable gtk gtk3)
53 - $(use_enable gtk2 gtk)
54 $(use_enable kde kf5)
55 $(use_enable kde qt5)
56 $(use_enable ldap)