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, 05 Jan 2018 00:35:12
Message-Id: 1515112468.27a83a252dcdf19df21da8a2ed842a9212120f48.asturm@gentoo
1 commit: 27a83a252dcdf19df21da8a2ed842a9212120f48
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 5 00:33:02 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 5 00:34:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27a83a25
7
8 app-office/libreoffice: Drop USE=jemalloc
9
10 'Support for tcmalloc and jemalloc is long dead',
11 upstream commit 494bdd3dc32287cc01ea4e0d81438a9266425726
12
13 Package-Manager: Portage-2.3.19, Repoman-2.3.6
14
15 app-office/libreoffice/libreoffice-9999.ebuild | 7 +++----
16 1 file changed, 3 insertions(+), 4 deletions(-)
17
18 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
19 index 9b35442a6de..664bacbda8e 100644
20 --- a/app-office/libreoffice/libreoffice-9999.ebuild
21 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2017 Gentoo Foundation
24 +# Copyright 1999-2018 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 @@ -64,7 +64,7 @@ unset ADDONS_SRC
29 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
30
31 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
32 -gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
33 +gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
34 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
35
36 LICENSE="|| ( LGPL-3 MPL-1.1 )"
37 @@ -157,7 +157,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
38 gnome-base/dconf
39 x11-libs/gtk+:3
40 )
41 - jemalloc? ( dev-libs/jemalloc )
42 libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
43 libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
44 mysql? ( dev-db/mysql-connector-c++ )
45 @@ -413,7 +412,7 @@ src_configure() {
46 --disable-online-update
47 --disable-pdfium
48 --disable-report-builder
49 - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
50 + --with-alloc=system
51 --with-build-version="Gentoo official package"
52 --enable-extension-integration
53 --with-external-dict-dir="${EPREFIX}/usr/share/myspell"