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 dfeb26843fb99..45acaaa8c0ba7 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 cc94097eec3b0..3147c714f7238 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 9b098731d7641..05b16a7e5d7a1 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 3bc607d4ab8a7..14fa0b2a60528 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