| 1 |
commit: 3dbeda142170212cfca19d1f5d6a1d116767452e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 14 07:00:34 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 14 08:20:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dbeda14 |
| 7 |
|
| 8 |
app-office/libreoffice: Make sure NSS is used for TLS, disable OpenSSL |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.42, Repoman-2.3.9 |
| 11 |
|
| 12 |
app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 6 +++--- |
| 13 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 6 +++--- |
| 14 |
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 6 +++--- |
| 15 |
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++--- |
| 16 |
4 files changed, 12 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 19 |
index 1ed29b9c997..4f4550757b5 100644 |
| 20 |
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 21 |
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 22 |
@@ -64,7 +64,7 @@ unset ADDONS_SRC |
| 23 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 24 |
|
| 25 |
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
| 26 |
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc |
| 27 |
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc |
| 28 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 29 |
|
| 30 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 31 |
@@ -115,8 +115,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 32 |
dev-libs/librevenge |
| 33 |
dev-libs/nspr |
| 34 |
dev-libs/nss |
| 35 |
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
| 36 |
- libressl? ( dev-libs/libressl ) |
| 37 |
>=dev-libs/redland-1.0.16 |
| 38 |
>=dev-libs/xmlsec-1.2.24[nss] |
| 39 |
media-gfx/graphite2 |
| 40 |
@@ -411,6 +409,7 @@ src_configure() { |
| 41 |
--disable-fetch-external |
| 42 |
--disable-gstreamer-0-10 |
| 43 |
--disable-online-update |
| 44 |
+ --disable-openssl |
| 45 |
--disable-pdfium |
| 46 |
--disable-report-builder |
| 47 |
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") |
| 48 |
@@ -423,6 +422,7 @@ src_configure() { |
| 49 |
--with-lang="" |
| 50 |
--with-parallelism=$(makeopts_jobs) |
| 51 |
--with-system-ucpp |
| 52 |
+ --with-tls=nss |
| 53 |
--with-vendor="Gentoo Foundation" |
| 54 |
--with-x |
| 55 |
--without-fonts |
| 56 |
|
| 57 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 58 |
index 3df147edf4c..e79889f91ee 100644 |
| 59 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 60 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 61 |
@@ -64,7 +64,7 @@ unset ADDONS_SRC |
| 62 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 63 |
|
| 64 |
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
| 65 |
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc |
| 66 |
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc |
| 67 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 68 |
|
| 69 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 70 |
@@ -115,8 +115,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 71 |
dev-libs/librevenge |
| 72 |
dev-libs/nspr |
| 73 |
dev-libs/nss |
| 74 |
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
| 75 |
- libressl? ( dev-libs/libressl ) |
| 76 |
>=dev-libs/redland-1.0.16 |
| 77 |
>=dev-libs/xmlsec-1.2.24[nss] |
| 78 |
media-gfx/graphite2 |
| 79 |
@@ -408,6 +406,7 @@ src_configure() { |
| 80 |
--disable-fetch-external |
| 81 |
--disable-gstreamer-0-10 |
| 82 |
--disable-online-update |
| 83 |
+ --disable-openssl |
| 84 |
--disable-pdfium |
| 85 |
--disable-report-builder |
| 86 |
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") |
| 87 |
@@ -420,6 +419,7 @@ src_configure() { |
| 88 |
--with-lang="" |
| 89 |
--with-parallelism=$(makeopts_jobs) |
| 90 |
--with-system-ucpp |
| 91 |
+ --with-tls=nss |
| 92 |
--with-vendor="Gentoo Foundation" |
| 93 |
--with-x |
| 94 |
--without-fonts |
| 95 |
|
| 96 |
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 97 |
index ae37700e0e3..e8d1f1a6c1a 100644 |
| 98 |
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 99 |
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 100 |
@@ -64,7 +64,7 @@ unset ADDONS_SRC |
| 101 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 102 |
|
| 103 |
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
| 104 |
-gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc |
| 105 |
+gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc |
| 106 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 107 |
|
| 108 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 109 |
@@ -116,8 +116,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 110 |
dev-libs/librevenge |
| 111 |
dev-libs/nspr |
| 112 |
dev-libs/nss |
| 113 |
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
| 114 |
- libressl? ( dev-libs/libressl ) |
| 115 |
>=dev-libs/redland-1.0.16 |
| 116 |
>=dev-libs/xmlsec-1.2.24[nss] |
| 117 |
media-gfx/graphite2 |
| 118 |
@@ -405,6 +403,7 @@ src_configure() { |
| 119 |
--disable-fetch-external |
| 120 |
--disable-gstreamer-0-10 |
| 121 |
--disable-online-update |
| 122 |
+ --disable-openssl |
| 123 |
--disable-pdfium |
| 124 |
--disable-report-builder |
| 125 |
--with-alloc=system |
| 126 |
@@ -417,6 +416,7 @@ src_configure() { |
| 127 |
--with-lang="" |
| 128 |
--with-parallelism=$(makeopts_jobs) |
| 129 |
--with-system-ucpp |
| 130 |
+ --with-tls=nss |
| 131 |
--with-vendor="Gentoo Foundation" |
| 132 |
--with-x |
| 133 |
--without-fonts |
| 134 |
|
| 135 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 136 |
index cc4c2bc8ce1..e470a725458 100644 |
| 137 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 138 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 139 |
@@ -64,7 +64,7 @@ unset ADDONS_SRC |
| 140 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 141 |
|
| 142 |
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
| 143 |
-gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc |
| 144 |
+gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc |
| 145 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 146 |
|
| 147 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 148 |
@@ -116,8 +116,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 149 |
dev-libs/librevenge |
| 150 |
dev-libs/nspr |
| 151 |
dev-libs/nss |
| 152 |
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
| 153 |
- libressl? ( dev-libs/libressl ) |
| 154 |
>=dev-libs/redland-1.0.16 |
| 155 |
>=dev-libs/xmlsec-1.2.24[nss] |
| 156 |
media-gfx/graphite2 |
| 157 |
@@ -405,6 +403,7 @@ src_configure() { |
| 158 |
--disable-fetch-external |
| 159 |
--disable-gstreamer-0-10 |
| 160 |
--disable-online-update |
| 161 |
+ --disable-openssl |
| 162 |
--disable-pdfium |
| 163 |
--disable-report-builder |
| 164 |
--with-alloc=system |
| 165 |
@@ -417,6 +416,7 @@ src_configure() { |
| 166 |
--with-lang="" |
| 167 |
--with-parallelism=$(makeopts_jobs) |
| 168 |
--with-system-ucpp |
| 169 |
+ --with-tls=nss |
| 170 |
--with-vendor="Gentoo Foundation" |
| 171 |
--with-x |
| 172 |
--without-fonts |
Archives