gentoo resync : 14.12.2020

6 files changed, 4 insertions, 59 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index f33c57c7e8d1..a5a91a365b8b 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 11544a7e52e3..bfebeea272e1 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,7 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
-DIST bedrock-server-1.16.100.04.zip 89007325 BLAKE2B baaa1244297385938ea45ed0559e9965d6b0c03f13ccaa6a85e9ee4b272ad46eeb9ce0b1a23fd3eb1b4cfdda730d3251a7df86470bdfebe617dea2f87e5c35b0 SHA512 7442237169dbc64d11629321a5ec75b004f4e29e28b3c031cfca98498d079b759bcecb56fe0c7f8df8c3fca4bdc7127b282614a50adeb7afa41aa89f190f1fc7
+DIST bedrock-server-1.16.101.01.zip 89007227 BLAKE2B 9f9dea5a52c8ae21ab2a3afc727dd750dc3b743de2d690427a8a1c9b17ded040f06c56edf82a9d501d64702cc19f64d0ed272fa869dd5936dd7bca818e2ea07f SHA512 b8742363a59b8959da1cf6a1bc13aa20c683e1ac26a16aa570d6111b68f437546ee00e52d51794be7c5f42be83dab77ec11bddf0a16cd18385f777eed97ba9df
 DIST bedrock-server-1.16.40.02.zip 69910097 BLAKE2B 6c074a3f99bcd9dfe0214a43550d08714af9a58ee619765bf6713b59b997c1c322bba906966c18181fdb3c5e3e5791140fa49d25146820b649f30ace1c147adb SHA512 e0d012719a413656ed0f4b8ffc0ca96d537e3dbfc306ce8e05d757442e209ce2b1f9a43c1152c3a36ed251a35f68f6072401742e1ab2cf75d75ef9420232702b
-EBUILD bedrock-server-1.16.100.04.ebuild 1119 BLAKE2B b76800f2862d9a9237cb22b877a03b607b84f7cf12572d75b0b52bb0360c641033e53a3f14ab82c62ce44af71ac2690e7d28a0ba9530fd3cb1261446272a00e1 SHA512 1672257c9b81808bd913712167d152a981f5cf9deca0224a057e4c25f5bbacef0b7dcf6fe72080efd47b807d3b7b00639db344c143468c2d95f82663bcb9e1d4
+EBUILD bedrock-server-1.16.101.01.ebuild 1119 BLAKE2B b76800f2862d9a9237cb22b877a03b607b84f7cf12572d75b0b52bb0360c641033e53a3f14ab82c62ce44af71ac2690e7d28a0ba9530fd3cb1261446272a00e1 SHA512 1672257c9b81808bd913712167d152a981f5cf9deca0224a057e4c25f5bbacef0b7dcf6fe72080efd47b807d3b7b00639db344c143468c2d95f82663bcb9e1d4
 EBUILD bedrock-server-1.16.40.02.ebuild 1118 BLAKE2B 15615680a29dd763080f6fe275a1289b1590943c6f4584328fa8cd4ab9d5d911cb9b274f5f8ecb854d1534c5d264a1bf929aa363b870ebfbd37ae1191acb1a13 SHA512 97462a2c38905e4063886cc4fe214d7c98cb93d15fe77bc84451b62f18904cd6ba3510132e9e52ed7f748af6cf5249178b9eec4729013143484269c36e14e2e4
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.16.100.04.ebuild b/games-server/bedrock-server/bedrock-server-1.16.101.01.ebuild
index a60cb02addb6..a60cb02addb6 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.100.04.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.101.01.ebuild
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 9d50dd9237c8..61d3beb9e0d8 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.3.jar 37942656 BLAKE2B 1ed70ac476dd202797f46a4844519d816f17c272d0703791d74b651fa8ac4c343a6939b50c5a0230d5bf149a564af6c7603297f0b114ce9fd2487f4bebef1c7e SHA512 ef9956ec55638b54e21e3b504ba2d2ce1b9d09769b5e118a36fbf2d97bd84a5bb49adf9a07328ae3e1c9fd76fe3da0b7d56baaa77bdc55b99d0f45039ada2ac3
 DIST minecraft-server-1.16.4.jar 37961464 BLAKE2B 1578a1ad52c81c038a1a5ee63b68dba03ff54005991095bde9d88a9275b427dc86144e26466dc2ad0313740f387fafd7c23cbdf61c452fff8df4ca82ec6367b5 SHA512 2807168800da30e6e58a22fc9f1981b58be6ba986d12dc138c19013269fcf51976db21a0488c3a95468e4f8016646db3a9966ac2065f6950ba9b733056df47bd
-EBUILD minecraft-server-1.16.3.ebuild 1099 BLAKE2B 073345a4ec7938ba773900c035b06124a61be5f09dd3e6787708c342027dccb18025ff1b6931b049054bcc2cb036ce304760f5c0fa8c14c8d7db215280a158c8 SHA512 7bdbb5bd36f84db38ea4bc131513d8a45c83b5389339a23533847b53762bfff9290d7afe70467e02b46d76639a72630503a670ca1032cb70ec11330e67b62a3c
-EBUILD minecraft-server-1.16.4.ebuild 1198 BLAKE2B dc3b9e714f93f5bb5604a70bc570fbc65e1c280c3f5b151ff190a77c465fbe3f3f472d844e7ccc71158682ba33f369a1cd6457bc1a8005d210e0d9bdaaf1c211 SHA512 e887a35c3bb6a1569bcaca9c84f2f9009519ca6bd0ea2acff67c852369c24265265d23753b1869c0dcc0cd1f73716674825d6593de261f7fc122f3a9a446c45e
+EBUILD minecraft-server-1.16.4.ebuild 1196 BLAKE2B a724ead671566be5928c6c8b17b0244a2314010b36bf8f2af2658bb2530f2fe32decd24428cd8d76a0db3f1851befa671a646fa96477eb053e625ade4f799794 SHA512 23df446ca608ca336fd75adb387513ba4e13c617c969257af65e641c6b17275a7d4a218da7d3bf5ac1cb65fd3722bfeee92aeb8698caa7b4aed877779cafd43b
 MISC metadata.xml 934 BLAKE2B 96dae32908e92724e43b4fe1c75e8e861be515567de1866e7fb67c66aad9869ac8094c2537c0b852fe937b64e1a8f5276532c9377fe96401328aa2b70adbe462 SHA512 1930ef90ba19556269a83c934252712bedd92eb218f0773d9656a81bc447c88837dfa2a931da0f660c343fa85cb259e6997485e7e28810b0ece034481c99a784
diff --git a/games-server/minecraft-server/minecraft-server-1.16.3.ebuild b/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
deleted file mode 100644
index 388f8aaceb69..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="f02f4473dbf152c23d7d484952121db0b36698cb"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2
-
-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 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
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.16.4.ebuild b/games-server/minecraft-server/minecraft-server-1.16.4.ebuild
index a8f5432619f5..95540a10c568 100644
--- a/games-server/minecraft-server/minecraft-server-1.16.4.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.16.4.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