diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest index 0f92d009e6109..53c2ff24a1fab 100644 --- a/games-server/minecraft-server/Manifest +++ b/games-server/minecraft-server/Manifest @@ -1 +1 @@ -DIST minecraft-server-26.1.1.jar 60417481 BLAKE2B 4b7a8163c460c843a4110373742043c261c67bdbeb4ad8bb43adc592d8200ec6da1968eadc072f3bb48c3741d3a502ec9b0562cf691103c5551f3b300074b639 SHA512 b05dddb3ef0c338d857642265ff7ea2fedb13900f80fadcfbd6026eaf03837557bbb3c2265e86186cc9e6eb5bfefb30936bee22d385dfbf757f8b0b712116cfc +DIST minecraft-server-26.1.2.jar 60417480 BLAKE2B 74c368db6c1c147ed30c0eda0fab57f83c372f9ebdc17b4a2d81904f14d17a12dec5a799bd8ab51e83a0bf69a9cf6fd81d8351cc6ccf26947dc981f70cc1ba36 SHA512 2b80bb3336a0f52320725c691d0b72a91343af27c1d03d5544c5cc4889b42c03d8758402da94fcacaaf0dfac0346db48ed22689fc3f489acd64c99e2054ebf8a diff --git a/games-server/minecraft-server/files/minecraft-server-bin b/games-server/minecraft-server/files/minecraft-server-bin-r1 similarity index 78% rename from games-server/minecraft-server/files/minecraft-server-bin rename to games-server/minecraft-server/files/minecraft-server-bin-r1 index 1dda3bc48797c..ff1b8ebb0da46 100644 --- a/games-server/minecraft-server/files/minecraft-server-bin +++ b/games-server/minecraft-server/files/minecraft-server-bin-r1 @@ -6,10 +6,10 @@ JAVA_OPTS="$@" MINECRAFT_OPTS="nogui" # Choose JAVA -set -- /opt/openjdk-bin-21.* /usr/lib*/openjdk-21 +set -- /opt/openjdk-bin-25.* /usr/lib*/openjdk-25 while ! [ -d "${1}" ]; do if [ ${#} -eq 1 ]; then - echo "Error: No JAVA 21 runtime found!" + echo "Error: No JAVA 25 runtime found!" exit 1 fi diff --git a/games-server/minecraft-server/minecraft-server-26.1.1.ebuild b/games-server/minecraft-server/minecraft-server-26.1.2.ebuild similarity index 89% rename from games-server/minecraft-server/minecraft-server-26.1.1.ebuild rename to games-server/minecraft-server/minecraft-server-26.1.2.ebuild index 2be7bfa22718f..bc3600a6d8fb5 100644 --- a/games-server/minecraft-server/minecraft-server-26.1.1.ebuild +++ b/games-server/minecraft-server/minecraft-server-26.1.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -EGIT_COMMIT="49c8195703ad0ba4f0a4efbccfd85a4a8ca57431" +EGIT_COMMIT="97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51" README_GENTOO_SUFFIX="-r1" inherit readme.gentoo-r1 java-pkg-2 systemd @@ -37,7 +37,7 @@ src_compile() { } src_install() { - newbin "${FILESDIR}"/minecraft-server-bin minecraft-server + newbin "${FILESDIR}"/minecraft-server-bin-r1 minecraft-server java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar