gentoo auto-resync : 25:06:2023 - 01:28:26

3 files changed, 3 insertions, 58 deletions

diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 9191040e7f7c..f152dce0b5d4 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -3,8 +3,6 @@ AUX minecraft-server-bin 427 BLAKE2B b02c5d3ee1256cc41b5e369cc0ed2f082e8045c1189
 AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r5 2014 BLAKE2B f38e398a0772918349797c9ffa46ee6ac0a14bbd48cdfe61ba88c54785f290f6f4643498bec5aac8943f45b5e4cc9c1af4af99577284c87442d73b827e141ab7 SHA512 b49f615d823e35545797d21430f33674f1345a059279dcaccd2a4a91d63a4b90b278739827c6af2c57de083c440f84edce684d28d6eb04d5a8d1f7e5699ea658
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
-DIST minecraft-server-1.19.4.jar 47515675 BLAKE2B ab4f65ce8e08ea790d3ef4e291dd1eadad0931bd5cf39771ed6571089c556cb85786987c0f9e22c2aaf4b000400a674c85bf157382c6840cd65fcaa33ada70b8 SHA512 a4233e35aca4ade4b2d7b8047c990d40ef81e832ef693b583a08b963ad9358c0abe3ccca656848ba649aaeded2a37ac585099bee24036a8abb1e7541eb91e96e
-DIST minecraft-server-1.20.jar 47787288 BLAKE2B 396deea2ec2d1a144406cac63ef46aca50537f8c76244c44928623a5c4e0287a944406b312f18034742761f20c73820c9bf6fa3a702ab45afac35299059f6169 SHA512 5995ee6652c4b6667bdf9d6e4d80669002f7d59e274eab681e00929c38cfe447cd6e49fa3993feefabb18c3230ac92a6fa93aad4d907f6a576295333fbe84042
-EBUILD minecraft-server-1.19.4.ebuild 1166 BLAKE2B 90f1f328e0d325540023f5a3168749b85c1d44f1e1ffe27e09d3b0fe302eb59945f68966d1376db95a4ff77200e963eebfcf4d20dcc6c8612ec7e951b255e839 SHA512 3817a721c6d3f7393c4cf713d94aa6282644ca0b508c85458b2530dfe6fba03f06c8dc0f39802b4110e17d9279e09b1847d7b98d9361e330c67f0765e9ef9972
-EBUILD minecraft-server-1.20.ebuild 1167 BLAKE2B 149b574cef65470307da8dd88f6b4ffd19e611ee742ea14484fb6c9409a7ab3e2607e873ad02eb6fd1c4a60107914997b713e3bf56482f8b5069cd8aced6a596 SHA512 c3f266bd656dfe9fa345eed223323733e52d056da2f0bbaf89d226137e4577efaa8ac6f91b2c7b2f3269af27b7d1c784194a691664bc1371782583638d35d16b
+DIST minecraft-server-1.20.1.jar 47791053 BLAKE2B b795d4f213fb8f8d09628791da57dc31fd4eaeae892e1162fbc93ec0e45b016eaf2b32962fb3b553ce4e311617ff8d9f075784846a0407c8a4e44c4c6ee051ec SHA512 363772bbf92f36f8eee41b3e6caf6cb2259bc3dbf9ba0bfe26bb68658cc7a3725d934b321904dce4a98a5a0b5ccef7c7735717ce77e9c5526278c6e4faf8df43
+EBUILD minecraft-server-1.20.1.ebuild 1166 BLAKE2B 1d834d23343371d48b5bfe184df15007c78dea15de40a6299a2a6a91523987c7f31038116c51d2fad92a9131e1dbf0b6ca51da9130f87a14ec38cc430327950a SHA512 bad5df9ae7b49ac0bdabb6232fce6ae56ea70a3d4c11ede178fc64cf73fd40b9db2cf970de32014c65c15f2408835978169a591d3e442bc9ecbfb2ffe2db98ad
 MISC metadata.xml 935 BLAKE2B 7147903a9b3a7405889a8ef3282569aa953574339af51aa27d1deea266795546defd6ff89e93aee06c82f2b5bee34a8aa3a9756f4fdf2bac0ff5565a7165e17b SHA512 46d768d34f586b1e148657f108b4a852dd6708d340a53c5b6fedbfe4dc4770f44313510a04d58ccdb59b13257a7d30801c38c6fa94dcbb16e3d438179fd6b3d4
diff --git a/games-server/minecraft-server/minecraft-server-1.19.4.ebuild b/games-server/minecraft-server/minecraft-server-1.20.1.ebuild
index 3eb4af6ceaeb..930b5d75750c 100644
--- a/games-server/minecraft-server/minecraft-server-1.19.4.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-EGIT_COMMIT="8f3112a1049751cc472ec13e397eade5336ca7ae"
+EGIT_COMMIT="84194a2f286ef7c14ed7ce0090dba59902951553"
 README_GENTOO_SUFFIX="-r1"
 
 inherit readme.gentoo-r1 java-pkg-2 systemd
diff --git a/games-server/minecraft-server/minecraft-server-1.20.ebuild b/games-server/minecraft-server/minecraft-server-1.20.ebuild
deleted file mode 100644
index 6cb763192912..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.20.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="15c777e2cfe0556eef19aab534b186c0c6f277e1"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		dev-java/openjdk:17
-		dev-java/openjdk-bin:17
-	)
-"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
-
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}