From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1384263-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 (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9F30515808B
for <garchives@archives.gentoo.org>; Sun, 10 Apr 2022 10:47:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DDA44E0936;
Sun, 10 Apr 2022 10:47:02 +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 8854AE0933
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Apr 2022 10:47:00 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 98A1A3410F0
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Apr 2022 10:46:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E1F463A9
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Apr 2022 10:46:53 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1649587602.5d61563ae4f3fa5e7190df7b95861de22ccba1f6.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/libreoffice/libreoffice-7.3.2.2.ebuild app-office/libreoffice/libreoffice-7.3.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild
X-VCS-Directories: app-office/libreoffice/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 5d61563ae4f3fa5e7190df7b95861de22ccba1f6
X-VCS-Branch: master
Date: Sun, 10 Apr 2022 10:46:53 +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: fc5c9e0f-dc94-452e-91ce-20330863a975
X-Archives-Hash: 696d31198459edc7e381a89cc7373c47
commit: 5d61563ae4f3fa5e7190df7b95861de22ccba1f6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 10:39:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 10:46:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d61563a
app-office/libreoffice: add LLVM 14 to 7.3+; sync live
Closes: https://bugs.gentoo.org/837353
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.2.2.ebuild | 14 +++++++++-----
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 10 +++++++---
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* )