commit:     7ac36649f0fd687fbe945949b7356c4f3b8f5301
Author:     Tomasz Regdos <tomek <AT> regdos <DOT> com>
AuthorDate: Wed Apr 24 12:34:37 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 12:50:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac36649

games-server/minecraft-server: fix java version - 1.20.5 requires Java 21

Signed-off-by: Tomasz Regdos <tomek <AT> regdos.com>
Closes: https://github.com/gentoo/gentoo/pull/36402
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-server/minecraft-server/files/minecraft-server-bin     | 2 +-
 games-server/minecraft-server/minecraft-server-1.20.5.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-server/minecraft-server/files/minecraft-server-bin 
b/games-server/minecraft-server/files/minecraft-server-bin
index b2664211f2cf..eb81aaf02103 100644
--- a/games-server/minecraft-server/files/minecraft-server-bin
+++ b/games-server/minecraft-server/files/minecraft-server-bin
@@ -6,7 +6,7 @@ JAVA_OPTS="$@"
 MINECRAFT_OPTS="nogui"
 
 # Choose JAVA
-set -- /opt/openjdk-bin-17.* /usr/lib*/openjdk-17
+set -- /opt/openjdk-bin-21.* /usr/lib*/openjdk-21
 while ! [ -d "${1}" ]; do
        if [ ${#} -eq 1 ]; then
                echo "Error: No JAVA 17 runtime found!"

diff --git a/games-server/minecraft-server/minecraft-server-1.20.5.ebuild 
b/games-server/minecraft-server/minecraft-server-1.20.5.ebuild
index 7158fdbaf129..1c1c43fc0149 100644
--- a/games-server/minecraft-server/minecraft-server-1.20.5.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.20.5.ebuild
@@ -23,8 +23,8 @@ RDEPEND="
        acct-user/minecraft
        app-misc/dtach
        || (
-               dev-java/openjdk:17
-               dev-java/openjdk-bin:17
+               dev-java/openjdk:21
+               dev-java/openjdk-bin:21
        )
 "
 

Reply via email to