gentoo resync : 05.02.2020

6 files changed, 62 insertions, 65 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index e371d7a7a68f..18acb2759881 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 8e60e738e7b5..493fe35fc5ff 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,4 +1,6 @@
 AUX bedrock-server.initd-r1 1558 BLAKE2B 5d65fe612092777002e9e4b0b62041aa1637e6c6aaaebb64c1be956cfa7ceb355afb337c4d84ef6e66c25167a3544c9bb0791843cb2bf98aca7c712eef02e143 SHA512 fa2c99461650d99ad45e63d7b2166431882e6fb5a73795a468a837a46a3ab47ce641ce0aee8e4ca220f25422af128746f24125da6a3fbb35829f27c1bd397c23
 DIST bedrock-server-1.14.1.4.zip 49395245 BLAKE2B 987de7d8e009dedb87e01b14e81ba857dd374f7d6621d3f13e137d7a51ad763d952452a1f8d34ff943add8ae3df8c7aff7fc5fe315d2ee29986fe967926a3969 SHA512 765d31aa3fd75c3e654ae65e5888ef3fc094fb12a49d9f0d5b0d94c58dfb508884218288dd4bb1cbda007305bff969219d6d438db4d9732295590678561bfcc3
+DIST bedrock-server-1.14.21.0.zip 49423726 BLAKE2B b461f5925c52b4cdb70718429c02df44df5a19daf7c6412a8304af1c1272a10a1495eeca2a6e03bebeca7c95e85158a9a6b22239273c7a73e075fb5b106b3733 SHA512 37608b446e54ac151a884c401be5dbcd5650c9796a7ce655a355b4cb33d0e261b786e796b75b29abf164f5634d5a346f844ece1f1c504698a587e8bb46e6cc92
 EBUILD bedrock-server-1.14.1.4.ebuild 1058 BLAKE2B aa58efb9b838a7f9c1f0659d0687fd985fc210ade149b0f64f89f3da19e6ea248cf98e7b9b9cfad6d1345ee4032ef8db67d962d95981c366a5a7c8c04da8fc77 SHA512 4eebb8ac43662595706b80d06d0844ec083f44478554073e4843b548eeddebf11ce890d66f160b0b205a2f1c2d20e76ef9f7627d8dc397594816619cd49122df
+EBUILD bedrock-server-1.14.21.0.ebuild 1059 BLAKE2B 3fbbf9ffd6f069b71d48bf9e85509e44464b1367a32b6acae96089b7deb09883db297a567efb00f5d6ab8de9a573f4b7ee21f63e745bdf74676759bebf8a9d6b SHA512 7cdd954f368fb288383f8e256dcabb000f18046fe5d627c166bc7d95fbd8f142089d02d1edc9b30ad2c3d7e73f282375df48f164c3846d8905784b04bc6a5ac3
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.14.21.0.ebuild b/games-server/bedrock-server/bedrock-server-1.14.21.0.ebuild
new file mode 100644
index 000000000000..c7229a9f1d2e
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.14.21.0.ebuild
@@ -0,0 +1,52 @@
+# 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-r1 bedrock-server
+
+	einstalldocs
+}
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index cb2f667fbeff..c665695def99 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,9 +1,8 @@
 AUX README.gentoo 602 BLAKE2B 53d39bd63283a570b0de64481de26a4eb481b84f00619f34fceb7b2293c837ea6dc0aa057da45450c2157c65164d8b567d84df1abc96b570225c0bd756f4f601 SHA512 16100671cdb2885aec89f725d1061eb17090a7df2fdc4fb9717012f119c975e026d42a68fd721ec6fd6947af11fd2712af807eaa34a28a31e6d9ee980d93ff60
 AUX minecraft-server.confd 318 BLAKE2B c4ae9a7e68e0db71f9cf648aeab10030264a544927f697d005016662a402bd1d64ea02779eb6b645c16845cec6b22842cf08c51734d608f90eb0d45f6c786a67 SHA512 bad9df2874a862f28a2a34f70509c34086ab5d63e6bfda79905f4058a029141ada592dc435d9773b6aa6332447c875675d68e7152ddf18b55a6157b81ed82f95
-AUX minecraft-server.initd-r2 1376 BLAKE2B 70dd8c49bee705e4e64ead008125af4b021ec205067c86a74fb197e66762fbd064672ef19d334ad3ad2486094bdaff74b1367b39c885a38f487f8d17aee40850 SHA512 1034cd5219f1cd1d9360138ab4fb1142f682db68abe66ae0e5bab3190b6606ec1976488420fa940b7467e7989c987e4520813b93bd86918cc1ed6f0a9b319fa9
 AUX minecraft-server.initd-r3 1542 BLAKE2B c0c3a173b0f5b30bbe75c753ccd6759264298782bae8b268caa8936d4e293df1aaa7453a086c97bd5336fa9537565ddacd96b8ab3b7ecf35265476e4b5e665ba SHA512 ff6d6ed5cfae16e6db25664c4476b5335b566248b05dd92e6761aa6023aabf1191d43c5730fc3ac8242e7035887b7ab5114ea45910991a805a2c27b8b5a80077
-DIST minecraft-server-1.14.4.jar 35958734 BLAKE2B 058d6609296394e4714a159976d4de0261a552a919e33db1e54d97e3d2ee90cd4356b60190b807050d3c7ab336149d1c9be55093ba002735ccc6a162706c6ee3 SHA512 b3d2852c6fa1b996bbf2fa9fc1fb860c6bca5136bcc5ddd3d236d85789c6bce81620f6b2d69eaa10c41d020fe0bb54de2fa601b3df3093af2691853a4445e1f8
 DIST minecraft-server-1.15.1.jar 36164938 BLAKE2B 21ee30c92b3060810fb766a54924b5273f44bfb906592770c101bed3f41cd65fc0cd05b9610fce805860f71088ccf89ac6cbf6a364eb8ca16047b39b8f0aa69f SHA512 4458daa6cd87b04ddbf0819dfc0538d24b8d08c529a94f1abff9b894d24ffb4eb3d0b23b8bfb088b2b6f43fb6f71d17700d9f80dab2ed56dc51c5bef329ba6bb
-EBUILD minecraft-server-1.14.4.ebuild 1232 BLAKE2B 77d810e9c3c3ed136b6c8438f4370f9988c740a04cb36bd23ff0117ad84acbc3c586ff2f2393846e619669b1610e05ba76f473a045a30cdc737f6675653ae7e8 SHA512 6e85b30f8f36ca74407bea33698b1a8f8423f86dde0a6a2b36786695eddf0d5db2e9f9d042c6341aaa42a1cd2c988c995654998e9fe6356d6e9cd041de8d940e
+DIST minecraft-server-1.15.2.jar 36175593 BLAKE2B f226a029a9ef2efea955fd44f915d5956fd24bb7c69d35bbbe132fcafc87cfcf023dbe834d9e973dafc25505b59d34b21ca6e36a0ad262316929f98807e47072 SHA512 21f5e77a58ac1e357425c99e259d3a688cf825483d391907403c7c9939abcf5b4a8fc73ff8d6277eaa373f376299027d6d7e0d8a5dd59d5791947efa1695490b
 EBUILD minecraft-server-1.15.1.ebuild 1046 BLAKE2B 1e3fa6e57e1ad4c2aa6c564b3ed666a7c92c75994f88d88c270f996961cc31211f415eea7f53dadefad2c60272635c323650a5aefd632428ce911dbb5abca363 SHA512 1251694e7b91506f3deab7714a835a953e6ee46e4c6a82ad2f0499c6dcdebe40b5d1a31ba1fcb5cae9d6fc04094cf1180252dbc47eebb30d74d6139a4e536244
+EBUILD minecraft-server-1.15.2.ebuild 1048 BLAKE2B 9b7a0cc83ad3c61acc29256bb6d6e687e5f74c479dad4fc47e3d9eaec63641545888eed57ccd2600dbef0a55ad5317c55c8662ea910e9bbc06971ecd831cac48 SHA512 55f167c37c0de0e1e9d0741a68eff50cd1d736e1a1b8cfb90a3c791b3ceb8d837aafa0a4d14e9fa22b841081d8a544b52e0332b712d9ca87e3cc3f5c2dd273e0
 MISC metadata.xml 495 BLAKE2B 9a4008401b01bce93293509fbba7d7f63eb1669f99cc0d2a372629230f7562f2f9357f952c148f27f9651d074270689cae19973b9c8ff255e8b3613122a8806c SHA512 00f1591c734e81e6289d086e1e9dde272d0548c512fef8b205a09d945dc1262d46a68014eb156c3ea2ff93eb052c2b3e28494fbf103a34220bf854a0df618e2b
diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r2 b/games-server/minecraft-server/files/minecraft-server.initd-r2
deleted file mode 100644
index ec659d145f85..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.initd-r2
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "minecraft-server" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#minecraft-server.}"
-fi
-
-minecraft_command="/usr/bin/minecraft-server"
-minecraft_logs="/var/log/minecraft-server"
-minecraft_path="/var/lib/minecraft-server/${instance}"
-name="Minecraft Server (World: ${instance})"
-pidfile="/run/minecraft-server.${instance}.pid"
-screen_name="minecraft-server.${instance}"
-start_stop_daemon_args="--chdir ${minecraft_path} --env JAVA_OPTS=\"${MINECRAFT_OPTS}\""
-
-command="screen"
-command_args="-DmUS ${screen_name} ${minecraft_command}"
-command_background="true"
-command_group="minecraft"
-command_user="minecraft"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}"
-
-	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path}"/eula.txt
-	echo "eula=true" > "${minecraft_path}"/eula.txt
-
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}"/"${instance}"
-
-	if [ ! -L "${minecraft_path}"/logs ]; then
-		cd "${minecraft_path}" && ln -s ../../../log/minecraft-server/"${instance}" logs
-	fi
-
-	if [ -z "${MINECRAFT_OPTS}" ]; then
-		eerror "You must define MINECRAFT_OPTS in /etc/conf.d/minecraft.${SVCNAME}!"
-		return 1
-	fi
-
-	return 0
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.14.4.ebuild b/games-server/minecraft-server/minecraft-server-1.15.2.ebuild
index cfddb597af26..a5c1ec3b50c6 100644
--- a/games-server/minecraft-server/minecraft-server-1.14.4.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.15.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_COMMIT="3dc3d84a581f14691199cf6831b71ed1296a9fdf"
+EGIT_COMMIT="bb2b6b1aefcd70dfd1892149ac3a215f6c636b07"
 
 inherit readme.gentoo-r1 java-pkg-2
 
@@ -13,42 +13,33 @@ SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	acct-group/minecraft
 	acct-user/minecraft
-	app-misc/screen
+	app-misc/dtach
 	|| (
 		>=virtual/jre-1.8
 		>=virtual/jdk-1.8
 	)
 "
 
-RESTRICT="bindist mirror strip"
+RESTRICT="bindist mirror"
 
 S="${WORKDIR}"
 
 src_unpack() {
-	# Don't unpack that jar, just copy it to WORKDIR
 	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-r2 minecraft-server
+	newinitd "${FILESDIR}"/minecraft-server.initd-r3 minecraft-server
 	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
 
-	diropts -o minecraft -g minecraft
-	keepdir /var/lib/minecraft-server
-	keepdir /var/log/minecraft-server
-
 	readme.gentoo_create_doc
 }