gentoo resync : 22.01.2021

6 files changed, 59 insertions, 58 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 4fafa829f426..6335f745ac3a 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 4c6d6ddc115b..c51febfc8962 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,7 +1,5 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
 DIST bedrock-server-1.16.201.02.zip 89832697 BLAKE2B 055d19866daabf8479fa051dd9ddec0b89e620c02713cf6b98299eaa9b1423c92fa15bdf0a2203e9580ce38e82321e2f2b5420ad11ea45bb01606487c5477a01 SHA512 6238dfccde26780d22337a7f0a1e1fbe75b86e43c4ecd77a551dc7d31bf22fad3705f0f9e328c00cf5ffbee252a70e94f586606aa26e23b32101e3e6a23636a3
-DIST bedrock-server-1.16.40.02.zip 69910097 BLAKE2B 6c074a3f99bcd9dfe0214a43550d08714af9a58ee619765bf6713b59b997c1c322bba906966c18181fdb3c5e3e5791140fa49d25146820b649f30ace1c147adb SHA512 e0d012719a413656ed0f4b8ffc0ca96d537e3dbfc306ce8e05d757442e209ce2b1f9a43c1152c3a36ed251a35f68f6072401742e1ab2cf75d75ef9420232702b
-EBUILD bedrock-server-1.16.201.02.ebuild 1119 BLAKE2B b76800f2862d9a9237cb22b877a03b607b84f7cf12572d75b0b52bb0360c641033e53a3f14ab82c62ce44af71ac2690e7d28a0ba9530fd3cb1261446272a00e1 SHA512 1672257c9b81808bd913712167d152a981f5cf9deca0224a057e4c25f5bbacef0b7dcf6fe72080efd47b807d3b7b00639db344c143468c2d95f82663bcb9e1d4
-EBUILD bedrock-server-1.16.40.02.ebuild 1118 BLAKE2B 15615680a29dd763080f6fe275a1289b1590943c6f4584328fa8cd4ab9d5d911cb9b274f5f8ecb854d1534c5d264a1bf929aa363b870ebfbd37ae1191acb1a13 SHA512 97462a2c38905e4063886cc4fe214d7c98cb93d15fe77bc84451b62f18904cd6ba3510132e9e52ed7f748af6cf5249178b9eec4729013143484269c36e14e2e4
+EBUILD bedrock-server-1.16.201.02.ebuild 1118 BLAKE2B 934d922ad930135c070f2c56bad09e89b434841f189ffc76fb6ad68738d0668dca9bd19ec49877af3e3f5eb26cee5a17fe6936f260549cf3772aac7af1dbd72e SHA512 71aadf668d37aa046c17659d43128df3d21bdc37edbd5c9e98682f80b9e801160d05d78c8eb3ab2124e469e8ff285d03c8a950a8f219781a6caf74dfe0a68311
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild b/games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild
index a60cb02addb6..63ced0dc4c9e 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 RDEPEND="
 	acct-group/bedrock
diff --git a/games-server/bedrock-server/bedrock-server-1.16.40.02.ebuild b/games-server/bedrock-server/bedrock-server-1.16.40.02.ebuild
deleted file mode 100644
index c7480a4e40c6..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.16.40.02.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
-
-DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/dtach
-	dev-libs/openssl:0/1.1
-	net-misc/curl[ssl]
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="
-	opt/bedrock-server/bedrock_server
-	opt/bedrock-server/libCrypto.so
-"
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server libCrypto.so
-
-	insinto /opt/bedrock-server
-	doins {permissions,whitelist}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd-r2 bedrock-server
-	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 61d3beb9e0d8..c700c64fd312 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -3,5 +3,7 @@ AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a8
 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
 MISC metadata.xml 934 BLAKE2B 96dae32908e92724e43b4fe1c75e8e861be515567de1866e7fb67c66aad9869ac8094c2537c0b852fe937b64e1a8f5276532c9377fe96401328aa2b70adbe462 SHA512 1930ef90ba19556269a83c934252712bedd92eb218f0773d9656a81bc447c88837dfa2a931da0f660c343fa85cb259e6997485e7e28810b0ece034481c99a784
diff --git a/games-server/minecraft-server/minecraft-server-1.16.5.ebuild b/games-server/minecraft-server/minecraft-server-1.16.5.ebuild
new file mode 100644
index 000000000000..5a052dd2df7d
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.16.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="1b557e7b033b583cd9f66746b7a9ab1ec1673ced"
+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
+}