diff options
| author |   Sam James <sam@gentoo.org> | 2022-04-10 11:39:52 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-04-10 11:46:42 +0100 |
| commit | 5d61563ae4f3fa5e7190df7b95861de22ccba1f6 (patch) | |
| tree | 832907363995f31af766da9b128455765559db50 /app-office | |
| parent | dev-libs/liborcus: keyword 0.17.2 (diff) | |
| download | gentoo-5d61563ae4f3fa5e7190df7b95861de22ccba1f6.tar.gz gentoo-5d61563ae4f3fa5e7190df7b95861de22ccba1f6.tar.bz2 gentoo-5d61563ae4f3fa5e7190df7b95861de22ccba1f6.zip | |
app-office/libreoffice: add LLVM 14 to 7.3+; sync live
Closes: https://bugs.gentoo.org/837353
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.3.2.2.ebuild | 14 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.3.9999.ebuild | 10 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 4 |
3 files changed, 20 insertions, 8 deletions
diff --git a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild index 31759b24aa48..9f5a7ab0de81 100644 --- a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild @@ -212,11 +212,11 @@ COMMON_DEPEND="${PYTHON_DEPS} kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - mariadb? ( dev-db/mariadb-connector-c ) - !mariadb? ( dev-db/mysql-connector-c ) + libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) + mariadb? ( dev-db/mariadb-connector-c:= ) + !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " @@ -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* ) @@ -575,7 +579,7 @@ src_configure() { myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi is-flagq "-flto*" && myeconfargs+=( --enable-lto ) diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild index 41fa7859c3a7..0f7170a5e44e 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* ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index db53409b551c..a30d4d21bfbd 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -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* ) |