commit: 2e24d5d1094a33d7b10852032710b96ab971c31e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 16:20:44 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 16:20:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e24d5d1
app-office/libreoffice: Revert "WIP"
This reverts commit 79d5d58f40f56b1ec7ffa717eebb08c100b940d2.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-9999.ebuild
index 40ff8be2ab7f..c3344edaa200 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -146,7 +146,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
- dev-libs/openssl:=
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.35:=[nss]
>=games-engines/box2d-2.4.1:0
@@ -168,7 +167,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/openjpeg:=
media-libs/tiff:=
media-libs/zxing-cpp:=
- net-misc/curl[kerberos]
+ net-misc/curl
sci-mathematics/lpsolve:=
sys-libs/zlib
virtual/opengl
@@ -215,14 +214,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
ldap? ( net-nds/openldap:= )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? (
>=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:=[kerberos] )
+ mariadb? ( dev-db/mariadb-connector-c:= )
!mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- qt6? (
- dev-qt/qtbase:6[gui,widgets]
- dev-qt/qtmultimedia:6
- )
+ qt6? ( dev-qt/qtbase:6[gui,widgets] )
"
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
@@ -500,6 +496,7 @@ src_configure() {
--disable-fetch-external
--disable-gtk3-kde5
--disable-online-update
+ --disable-openssl
--disable-pdfium
--disable-qt5
--with-extra-buildid="${gentoo_buildid}"
