app-office/libreoffice: Make sure NSS is used for TLS, disable OpenSSL

Package-Manager: Portage-2.3.42, Repoman-2.3.9

diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index 1ed29b9c997669dd0b28ab42ffe3139f131c7856..4f4550757b596c21de760ebe19d0c1eae7ad05ae 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.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 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -115,8 +115,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
@@ -411,6 +409,7 @@ src_configure() {
                --disable-fetch-external
                --disable-gstreamer-0-10
                --disable-online-update
+               --disable-openssl
                --disable-pdfium
                --disable-report-builder
                --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
@@ -423,6 +422,7 @@ src_configure() {
                --with-lang=""
                --with-parallelism=$(makeopts_jobs)
                --with-system-ucpp
+               --with-tls=nss
                --with-vendor="Gentoo Foundation"
                --with-x
                --without-fonts

diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 3df147edf4c0b80cedd5e538fa29bc2ae53dd8ad..e79889f91eef4ae6cf1a2e6fce7ac2c9323f8ec1 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.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 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -115,8 +115,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
@@ -408,6 +406,7 @@ src_configure() {
                --disable-fetch-external
                --disable-gstreamer-0-10
                --disable-online-update
+               --disable-openssl
                --disable-pdfium
                --disable-report-builder
                --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
@@ -420,6 +419,7 @@ src_configure() {
                --with-lang=""
                --with-parallelism=$(makeopts_jobs)
                --with-system-ucpp
+               --with-tls=nss
                --with-vendor="Gentoo Foundation"
                --with-x
                --without-fonts

diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index ae37700e0e3984649c3c6f703f2411608969c8e6..e8d1f1a6c1ab3c546d95e26ac1d0674d79549368 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.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

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cc4c2bc8ce118a2737a9a0b978acbd37ee422394..e470a725458c2c817922266f60541fd902bc0a2c 100644 (file)
--- 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