commit: 72dce62644ba328f3b6040997e7df055080d83b5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 10:53:03 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 11:50:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72dce626
app-office/libreoffice: Update dependencies, allow {clang,llvm}:16
Drop {clang,llvm}:13
Drop unused sys-devel/ucpp BDEPEND
Raise minimum media-libs/harfbuzz to 2.6.8
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 3 ---
app-office/libreoffice/libreoffice-9999.ebuild | 10 ++++------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 6400a6ada991..0e91df871e67 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -271,9 +271,6 @@ BDEPEND="
( sys-devel/clang:14
sys-devel/llvm:14
=sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-9999.ebuild
index bcd7d50224e9..59ae26b54637 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -149,7 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
>=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ >=media-libs/harfbuzz-2.6.8:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
>=media-libs/libepoxy-1.3.1[X]
@@ -231,7 +231,6 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gperf-3.1
dev-util/mdds:1/2.0
media-libs/glm
- sys-devel/ucpp
x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
@@ -265,15 +264,15 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
( sys-devel/clang:15
sys-devel/llvm:15
=sys-devel/lld-15* )
( sys-devel/clang:14
sys-devel/llvm:14
=sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
@@ -495,7 +494,6 @@ src_configure() {
--with-parallelism=$(makeopts_jobs)
--with-system-abseil
--with-system-openjpeg
- --with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
--with-webdav="neon"
