commit: f6561717e54d3e3b7b5a853d64e37b8221dcf479 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Wed Mar 12 10:18:47 2025 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Apr 1 12:24:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6561717
app-office/libreoffice: use slotted dep declaration for jdk The build fails with Java 25. Therefore, introduce an upper bound for jdk by only allowing Java 17 and Java 21. Closes: https://bugs.gentoo.org/951189 Closes: https://github.com/gentoo/gentoo/pull/41032 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild | 5 ++++- app-office/libreoffice/libreoffice-25.2.2.2.ebuild | 5 ++++- app-office/libreoffice/libreoffice-25.2.9999.ebuild | 5 ++++- app-office/libreoffice/libreoffice-9999.ebuild | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild index dfeb26843fb9..45acaaa8c0ba 100644 --- a/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild @@ -239,7 +239,10 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXtst java? ( dev-java/ant:0 - >=virtual/jdk-17 + || ( + virtual/jdk:17 + virtual/jdk:21 + ) ) test? ( app-crypt/gnupg diff --git a/app-office/libreoffice/libreoffice-25.2.2.2.ebuild b/app-office/libreoffice/libreoffice-25.2.2.2.ebuild index cc94097eec3b..3147c714f723 100644 --- a/app-office/libreoffice/libreoffice-25.2.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.2.2.ebuild @@ -245,7 +245,10 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXtst java? ( dev-java/ant:0 - >=virtual/jdk-17 + || ( + virtual/jdk:17 + virtual/jdk:21 + ) ) test? ( app-crypt/gnupg diff --git a/app-office/libreoffice/libreoffice-25.2.9999.ebuild b/app-office/libreoffice/libreoffice-25.2.9999.ebuild index 9b098731d764..05b16a7e5d7a 100644 --- a/app-office/libreoffice/libreoffice-25.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.9999.ebuild @@ -245,7 +245,10 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXtst java? ( dev-java/ant:0 - >=virtual/jdk-17 + || ( + virtual/jdk:17 + virtual/jdk:21 + ) ) test? ( app-crypt/gnupg diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 3bc607d4ab8a..14fa0b2a6052 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -237,7 +237,10 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXtst java? ( dev-java/ant:0 - >=virtual/jdk-17 + || ( + virtual/jdk:17 + virtual/jdk:21 + ) ) test? ( app-crypt/gnupg
