commit:     d4949fc045c7805aeb1c1f87fa81a6ac26022013
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 23:23:57 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 00:47:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4949fc0

app-office/libreoffice: update 9999 dependencies

Closes: https://bugs.gentoo.org/921094
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/libreoffice/Manifest                | 1 +
 app-office/libreoffice/libreoffice-9999.ebuild | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 287e13fe8e5a..070b0c78c6b9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -27,3 +27,4 @@ DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B 
fadcd32c50af1d4607ecd20ef
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 
BLAKE2B 
d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a
 SHA512 
1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 
BLAKE2B 
67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f
 SHA512 
58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 
BLAKE2B 
ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a
 SHA512 
6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
+DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B 
f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857
 SHA512 
d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild 
b/app-office/libreoffice/libreoffice-9999.ebuild
index 3211338cb330..5e42fa31a46e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -52,6 +52,8 @@ ADDONS_SRC=(
        "${ADDONS_URI}/frozen-1.1.1.tar.gz"
        # not packaged in Gentoo, https://skia.org/
        
"${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+       # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+       "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
        "base? (
                ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
                
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -108,6 +110,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 
~amd64-linux"
 COMMON_DEPEND="${PYTHON_DEPS}
        app-arch/unzip
        app-arch/zip
+       app-crypt/argon2:=
        app-crypt/gpgme:=[cxx]
        app-text/hunspell:=
        >=app-text/libabw-0.1.0
@@ -235,7 +238,7 @@ DEPEND="${COMMON_DEPEND}
        x11-libs/libXtst
        java? (
                dev-java/ant-core
-               >=virtual/jdk-11
+               >=virtual/jdk-17
        )
        test? (
                app-crypt/gnupg
@@ -515,6 +518,7 @@ src_configure() {
                --without-system-jfreereport
                --without-system-libfixmath
                --without-system-sane
+               --without-system-zxcvbn
                $(use_enable base report-builder)
                $(use_enable bluetooth sdremote-bluetooth)
                $(use_enable coinmp)

Reply via email to