From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1687713-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25789158042 for <garchives@archives.gentoo.org>; Fri, 8 Nov 2024 16:19:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B331E085B; Fri, 8 Nov 2024 16:19:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FC1AE085B for <gentoo-commits@lists.gentoo.org>; Fri, 8 Nov 2024 16:19:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46E02340C77 for <gentoo-commits@lists.gentoo.org>; Fri, 8 Nov 2024 16:19:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A57DA1CA7 for <gentoo-commits@lists.gentoo.org>; Fri, 8 Nov 2024 16:19:13 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1731082741.79d5d58f40f56b1ec7ffa717eebb08c100b940d2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 79d5d58f40f56b1ec7ffa717eebb08c100b940d2 X-VCS-Branch: master Date: Fri, 8 Nov 2024 16:19:13 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d7d798d-d67b-4338-866e-7b61ece22941 X-Archives-Hash: 0b1324ca8f665287085c3117445a74f8 commit: 79d5d58f40f56b1ec7ffa717eebb08c100b940d2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Oct 6 10:01:51 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 8 16:19:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d5d58f app-office/libreoffice: WIP Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/libreoffice-9999.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index c3344edaa200..40ff8be2ab7f 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -146,6 +146,7 @@ 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 @@ -167,7 +168,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/openjpeg:= media-libs/tiff:= media-libs/zxing-cpp:= - net-misc/curl + net-misc/curl[kerberos] sci-mathematics/lpsolve:= sys-libs/zlib virtual/opengl @@ -214,11 +215,14 @@ 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:= ) + mariadb? ( dev-db/mariadb-connector-c:=[kerberos] ) !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] ) + qt6? ( + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtmultimedia:6 + ) " # FIXME: cppunit should be moved to test conditional # after everything upstream is under gbuild @@ -496,7 +500,6 @@ src_configure() { --disable-fetch-external --disable-gtk3-kde5 --disable-online-update - --disable-openssl --disable-pdfium --disable-qt5 --with-extra-buildid="${gentoo_buildid}"