summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-07-14 09:00:34 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-07-14 10:20:24 +0200
commit3dbeda142170212cfca19d1f5d6a1d116767452e (patch)
tree3366fe3083e5819bc5a8f705dc0977d087c5a3ad /app-office/libreoffice/libreoffice-9999.ebuild
parentapp-office/libreoffice: Drop old (diff)
downloadgentoo-3dbeda142170212cfca19d1f5d6a1d116767452e.tar.gz
gentoo-3dbeda142170212cfca19d1f5d6a1d116767452e.tar.bz2
gentoo-3dbeda142170212cfca19d1f5d6a1d116767452e.zip
app-office/libreoffice: Make sure NSS is used for TLS, disable OpenSSL
Package-Manager: Portage-2.3.42, Repoman-2.3.9
Diffstat (limited to 'app-office/libreoffice/libreoffice-9999.ebuild')
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cc4c2bc8ce1..e470a725458 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -116,8 +116,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.24[nss]
media-gfx/graphite2
@@ -405,6 +403,7 @@ src_configure() {
--disable-fetch-external
--disable-gstreamer-0-10
--disable-online-update
+ --disable-openssl
--disable-pdfium
--disable-report-builder
--with-alloc=system
@@ -417,6 +416,7 @@ src_configure() {
--with-lang=""
--with-parallelism=$(makeopts_jobs)
--with-system-ucpp
+ --with-tls=nss
--with-vendor="Gentoo Foundation"
--with-x
--without-fonts