gentoo resync : 06.04.2022

3 files changed, 2 insertions, 57 deletions

diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index f86949e4b106..3c49bd3c3235 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.18.1.jar 46324407 BLAKE2B bc974116c00692910955fab6fff2f21f4363c575b28e03af5e7750d98d8f0b9ed52123ac7fffbb0739c775f22190ace2ea7ebe916e1b4deafca82278c4f6a5af SHA512 cb306772c06e88b70475961ec1f057a9edfcef8db334479ec5c28e8b07287b3209bc54d83f7da7e8c63a8581e7ddbb93109acbf491ff74806b27486368640e71
 DIST minecraft-server-1.18.2.jar 46592587 BLAKE2B 1a6a1092fad0133a23a91e1db8d8057d418f52c23d04bcbe8e3578582bffe7d8c0e653c8893b78978fed05b2fc7b5f99643c35cae2c427d9ca76ff19aa6f8b58 SHA512 efc804cdce8b616126f1e0bb0bc43538571da85cd8cf25e8b0c9d787be6b2149319801389a90841b5450b029c248dda89de5d8295e93d0b58004d519c09b91a8
-EBUILD minecraft-server-1.18.1.ebuild 1166 BLAKE2B d90365eb2d6ffa30d0a435f639d5dad54b6fdb977500883d49ea2676e1651b06e4f160b607f491c6813a07a4b89bcbffcd5bba0e6097938fa0d87458e54d2e46 SHA512 af3ea5b92a5d1149df1947bf90285c732219ef4877cc2a38c79844ad3597851270e629cd39b2cd7a0b07161a93837acf7faf50167b09ab6cafc504cf84e65296
-EBUILD minecraft-server-1.18.2.ebuild 1167 BLAKE2B 3b321c206661819f1197251e8ac8071607aa6643bc7df5440bc835576b4b0baceea782955e8cfb70ee9cffabee7b88ecfedf761b92d18ed15727e1bc1d8bec3b SHA512 ae100ffb84d2a767f9a219333b0a8decc547070892725a8f70f6c6b40003ebe37aebf79ac531ba64fa1347d73ee656368c68c1d829b396a9b04f37aa0a1f2b8e
+EBUILD minecraft-server-1.18.2.ebuild 1166 BLAKE2B 9a69f43036617189db0ab7881ed5f82f0ce2e768eb98c8046c77ec7a2072660448d2619c97c73593ec0c83336496a24dc6c5999f8fe795c450f5410040bf6034 SHA512 9df16a90467c80e062a297db2151d749a1629f93923582a0fe24bf24fb4eaeb4ed1b4e43c2bda29d85c6de0a0f63c30b15e221b32592bf47c5c40c8e91975444
 MISC metadata.xml 935 BLAKE2B 7147903a9b3a7405889a8ef3282569aa953574339af51aa27d1deea266795546defd6ff89e93aee06c82f2b5bee34a8aa3a9756f4fdf2bac0ff5565a7165e17b SHA512 46d768d34f586b1e148657f108b4a852dd6708d340a53c5b6fedbfe4dc4770f44313510a04d58ccdb59b13257a7d30801c38c6fa94dcbb16e3d438179fd6b3d4
diff --git a/games-server/minecraft-server/minecraft-server-1.18.1.ebuild b/games-server/minecraft-server/minecraft-server-1.18.1.ebuild
deleted file mode 100644
index 9bf1afc8e306..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.18.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="125e5adf40c659fd3bce3e66e67a16bb49ecc1b9"
-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
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.18.2.ebuild b/games-server/minecraft-server/minecraft-server-1.18.2.ebuild
index 9eef37665ed4..3bd55f345cc8 100644
--- a/games-server/minecraft-server/minecraft-server-1.18.2.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.18.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 RESTRICT="bindist mirror"
 
 RDEPEND="