gentoo resync : 17.02.2021

4 files changed, 2 insertions, 58 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 6335f745ac3a..2a16c4f74f83 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index c700c64fd312..d339e4231c2c 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -2,8 +2,6 @@ AUX README.gentoo-r1 776 BLAKE2B 3c514a09e07524568c8cbe6045069b569005c7754bdff0f
 AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r4 1996 BLAKE2B 34c4d6e41135224cf1b4bf96d93059897448a8646cb659ef63eb57cc45fbf9b766db5dce80aaad22062d4232eab1a55e2d6b2938aac0dae0fe6d8c897acc0b0f SHA512 fdc4cbc89852e2538f332911acec281e83f185534a996a83c5eb2094be7245a892b7a8139fb77a50b49abaf8e311bf629a21fee0f85906ecd87abce865740ae0
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
-DIST minecraft-server-1.16.4.jar 37961464 BLAKE2B 1578a1ad52c81c038a1a5ee63b68dba03ff54005991095bde9d88a9275b427dc86144e26466dc2ad0313740f387fafd7c23cbdf61c452fff8df4ca82ec6367b5 SHA512 2807168800da30e6e58a22fc9f1981b58be6ba986d12dc138c19013269fcf51976db21a0488c3a95468e4f8016646db3a9966ac2065f6950ba9b733056df47bd
 DIST minecraft-server-1.16.5.jar 37962360 BLAKE2B 355715b809c09581e457f54618bd6ddab91b1c488d709d402fa6690d32244298d44191d439b8d9f27f4853f7e7658bfa2db88b61697a1caeb66da76ab211d9f8 SHA512 8321c50d788c6a3a3e8b2146bf1b20f6a3da87dd21ec4bd1fda0031d26f728d64e56a6a230ba5d857f4d500d7ba281eb4e3c28b6715f29d8dcba79d8c0ddf03f
-EBUILD minecraft-server-1.16.4.ebuild 1196 BLAKE2B a724ead671566be5928c6c8b17b0244a2314010b36bf8f2af2658bb2530f2fe32decd24428cd8d76a0db3f1851befa671a646fa96477eb053e625ade4f799794 SHA512 23df446ca608ca336fd75adb387513ba4e13c617c969257af65e641c6b17275a7d4a218da7d3bf5ac1cb65fd3722bfeee92aeb8698caa7b4aed877779cafd43b
-EBUILD minecraft-server-1.16.5.ebuild 1198 BLAKE2B 08e217f13a83a6a94451692e52d3f951c9e9ebf7b50618fd8676a6e12720a5b5a991453dc0059521e7216aa1351327ae55fd2a4a4f436ccb1383e478241890b5 SHA512 6107799a39ee6a40166c34e339c264733165d553ba783d451d7c8950046d655a1e5e12ac9b4aa65568207480e92e8851196e2d5d0788b3d1cfaa33cfeda376de
+EBUILD minecraft-server-1.16.5.ebuild 1196 BLAKE2B 44fd7ba3a5759606edfe7b472c32022530ad9e239cac79ad59adee6f6a59d909c8427cebef92d298e1ef503cca91f3042dbae4780d7cb1b7ff48a7f11887ce8b SHA512 71b5e27befa92108920bb7bed5148367a90126a1992bcfd73a01d47270572230668cc9948b550c7176e3fdf6963ecaffeaf58fdb399e2149c265416a708eea80
 MISC metadata.xml 934 BLAKE2B 96dae32908e92724e43b4fe1c75e8e861be515567de1866e7fb67c66aad9869ac8094c2537c0b852fe937b64e1a8f5276532c9377fe96401328aa2b70adbe462 SHA512 1930ef90ba19556269a83c934252712bedd92eb218f0773d9656a81bc447c88837dfa2a931da0f660c343fa85cb259e6997485e7e28810b0ece034481c99a784
diff --git a/games-server/minecraft-server/minecraft-server-1.16.4.ebuild b/games-server/minecraft-server/minecraft-server-1.16.4.ebuild
deleted file mode 100644
index 95540a10c568..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.16.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="35139deedbd5182953cf1caa23835da59ca3d7cd"
-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"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		>=virtual/jre-1.8
-		>=virtual/jdk-1.8
-	)
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r4 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.16.5.ebuild b/games-server/minecraft-server/minecraft-server-1.16.5.ebuild
index 5a052dd2df7d..f5a67d91eb14 100644
--- a/games-server/minecraft-server/minecraft-server-1.16.5.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.16.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	acct-group/minecraft