From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Apr 2022 13:07:24 +0100 Subject: gentoo resync : 16.04.2022 --- app-office/libreoffice/libreoffice-7.3.9999.ebuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'app-office/libreoffice/libreoffice-7.3.9999.ebuild') diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild index 41fa7859c3a7..d21640a76c4a 100644 --- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild @@ -104,13 +104,13 @@ RESTRICT="!test? ( test )" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -#[[ ${MY_PV} == *9999* ]] || \ -#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip - app-crypt/gpgme[cxx] + app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 @@ -269,6 +269,10 @@ BDEPEND=" virtual/pkgconfig clang? ( || ( + ( + sys-devel/clang:14 + sys-devel/llvm:14 + =sys-devel/lld-14* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) @@ -504,7 +508,7 @@ src_configure() { --with-system-ucpp --with-tls=nss --with-vendor="Gentoo Foundation" - --with-webdav + --with-webdav="neon" --with-x --without-fonts --without-myspell-dicts @@ -563,9 +567,9 @@ src_configure() { --with-ant-home="${ANT_HOME}" ) if has_version "dev-java/openjdk:11"; then - myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" ) + myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" ) elif has_version "dev-java/openjdk-bin:11"; then - myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" ) + myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" ) fi use libreoffice_extensions_scripting-beanshell && \ -- cgit v1.2.3