From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 games-server/Manifest.gz                           | Bin 1898 -> 1896 bytes
 games-server/bedrock-server/Manifest               |   8 ++-
 .../bedrock-server/bedrock-server-1.14.60.5.ebuild |  52 -----------------
 .../bedrock-server/bedrock-server-1.16.1.02.ebuild |  52 +++++++++++++++++
 .../bedrock-server-1.16.20.03-r1.ebuild            |  53 ++++++++++++++++++
 .../bedrock-server/files/bedrock-server.confd      |   7 +++
 .../bedrock-server/files/bedrock-server.initd-r2   |  62 +++++++++++++++++++++
 games-server/minecraft-server/Manifest             |  11 +++-
 .../minecraft-server/files/README.gentoo-r1        |  26 +++++++++
 .../files/minecraft-server.confd-r1                |  12 ++++
 .../files/minecraft-server.initd-r4                |  62 +++++++++++++++++++++
 games-server/minecraft-server/metadata.xml         |  14 ++++-
 .../minecraft-server-1.15.2.ebuild                 |  48 ----------------
 .../minecraft-server-1.16.1.ebuild                 |  48 ++++++++++++++++
 .../minecraft-server-1.16.2-r1.ebuild              |  49 ++++++++++++++++
 games-server/steamcmd/Manifest                     |   3 +
 games-server/steamcmd/files/steamcmd.confd-r2      |  20 +++++++
 games-server/steamcmd/files/steamcmd.initd-r2      |  47 ++++++++++++++++
 games-server/steamcmd/steamcmd-1.0-r3.ebuild       |  52 +++++++++++++++++
 19 files changed, 520 insertions(+), 106 deletions(-)
 delete mode 100644 games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild
 create mode 100644 games-server/bedrock-server/bedrock-server-1.16.1.02.ebuild
 create mode 100644 games-server/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild
 create mode 100644 games-server/bedrock-server/files/bedrock-server.confd
 create mode 100644 games-server/bedrock-server/files/bedrock-server.initd-r2
 create mode 100644 games-server/minecraft-server/files/README.gentoo-r1
 create mode 100644 games-server/minecraft-server/files/minecraft-server.confd-r1
 create mode 100644 games-server/minecraft-server/files/minecraft-server.initd-r4
 delete mode 100644 games-server/minecraft-server/minecraft-server-1.15.2.ebuild
 create mode 100644 games-server/minecraft-server/minecraft-server-1.16.1.ebuild
 create mode 100644 games-server/minecraft-server/minecraft-server-1.16.2-r1.ebuild
 create mode 100644 games-server/steamcmd/files/steamcmd.confd-r2
 create mode 100644 games-server/steamcmd/files/steamcmd.initd-r2
 create mode 100644 games-server/steamcmd/steamcmd-1.0-r3.ebuild

(limited to 'games-server')

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 6fd5995cfab4..8a30276874ff 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 71a3aec2fb1a..7827de2cbec7 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,4 +1,8 @@
+AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r1 1558 BLAKE2B 5d65fe612092777002e9e4b0b62041aa1637e6c6aaaebb64c1be956cfa7ceb355afb337c4d84ef6e66c25167a3544c9bb0791843cb2bf98aca7c712eef02e143 SHA512 fa2c99461650d99ad45e63d7b2166431882e6fb5a73795a468a837a46a3ab47ce641ce0aee8e4ca220f25422af128746f24125da6a3fbb35829f27c1bd397c23
-DIST bedrock-server-1.14.60.5.zip 288044278 BLAKE2B 11fa18f892b95eac8fa2108adce6af14b213f4a409c82d4a59b9cf17ce2d8921f1ef1d6e74cc53757f5453daa84298c36230884f15e56408b74e3a70ca50b74b SHA512 d295f7090fb26c87d8259cd5e7581699d59292425362139035929548e27055e78c3a8c64b02f99c3da24d8edf8657f3ca656253c7979d30b1495ebf6000b9308
-EBUILD bedrock-server-1.14.60.5.ebuild 1058 BLAKE2B aa58efb9b838a7f9c1f0659d0687fd985fc210ade149b0f64f89f3da19e6ea248cf98e7b9b9cfad6d1345ee4032ef8db67d962d95981c366a5a7c8c04da8fc77 SHA512 4eebb8ac43662595706b80d06d0844ec083f44478554073e4843b548eeddebf11ce890d66f160b0b205a2f1c2d20e76ef9f7627d8dc397594816619cd49122df
+AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
+DIST bedrock-server-1.16.1.02.zip 69830343 BLAKE2B c35d68f8527df9c6b96662ded02f8195ecb0bc11fa2cd93b3a0f4522cf6cbe4332f76749cc5d688179fa810edaf7c3dbb8244ad7bef1a2ee73205ab0852cc9ac SHA512 c8a79167c22e86e93e38c5a1e3d35911247011e954d49539cb8a33eb1345d49c085a1682efd4dda9681a0d1123f9caac3c4deba88e48fcccf4d1f0f7dea878b8
+DIST bedrock-server-1.16.20.03.zip 69934892 BLAKE2B 17beeff7a00b47c99eaf2d3552c3ec1af8902c16e945e6df745ba5c82cc201effde8083868a18ae58920af8bd3517d02393ca9ab3533b858a4ef84aa539d6eb2 SHA512 b7b6621dfa6855ca15a3bdd2e6f55de48d5e53b1afd0adaf0a2f595fd3b962831e0cef65b0eb2d18c4dce19baf18bbbfb6d314b2026ae8a03adf4ff9a568c314
+EBUILD bedrock-server-1.16.1.02.ebuild 1058 BLAKE2B aa58efb9b838a7f9c1f0659d0687fd985fc210ade149b0f64f89f3da19e6ea248cf98e7b9b9cfad6d1345ee4032ef8db67d962d95981c366a5a7c8c04da8fc77 SHA512 4eebb8ac43662595706b80d06d0844ec083f44478554073e4843b548eeddebf11ce890d66f160b0b205a2f1c2d20e76ef9f7627d8dc397594816619cd49122df
+EBUILD bedrock-server-1.16.20.03-r1.ebuild 1119 BLAKE2B b76800f2862d9a9237cb22b877a03b607b84f7cf12572d75b0b52bb0360c641033e53a3f14ab82c62ce44af71ac2690e7d28a0ba9530fd3cb1261446272a00e1 SHA512 1672257c9b81808bd913712167d152a981f5cf9deca0224a057e4c25f5bbacef0b7dcf6fe72080efd47b807d3b7b00639db344c143468c2d95f82663bcb9e1d4
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild b/games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild
deleted file mode 100644
index ceeced788eae..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild
+++ /dev/null
@@ -1,52 +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-r1 bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/bedrock-server/bedrock-server-1.16.1.02.ebuild b/games-server/bedrock-server/bedrock-server-1.16.1.02.ebuild
new file mode 100644
index 000000000000..ceeced788eae
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.16.1.02.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/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild b/games-server/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild
new file mode 100644
index 000000000000..a60cb02addb6
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild
@@ -0,0 +1,53 @@
+# 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/bedrock-server/files/bedrock-server.confd b/games-server/bedrock-server/files/bedrock-server.confd
new file mode 100644
index 000000000000..d4185934e066
--- /dev/null
+++ b/games-server/bedrock-server/files/bedrock-server.confd
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Dtach options, which will used, when the `attach` extra command is called.
+# By default, CTRL+D is used, and no redraw is done,
+# when you want to detach from the attached console.
+DTACH_OPTS="-e '^D' -r none"
diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r2 b/games-server/bedrock-server/files/bedrock-server.initd-r2
new file mode 100644
index 000000000000..1ff60aa7816f
--- /dev/null
+++ b/games-server/bedrock-server/files/bedrock-server.initd-r2
@@ -0,0 +1,62 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "bedrock-server" ]; then
+	instance="main"
+else
+	instance="${SVCNAME#*.}"
+fi
+
+bedrock_command="/opt/bin/bedrock-server"
+bedrock_path="/var/lib/bedrock-server"
+bedrock_path_data="/opt/bedrock-server"
+bedrock_path_instance="${bedrock_path}/${instance}"
+dtach_tmpfile="$(mktemp -u)"
+name="Minecraft Bedrock server (${instance})"
+pidfile="/run/bedrock-server.${instance}.pid"
+start_stop_daemon_args="--chdir ${bedrock_path_instance}"
+
+description_attach="Attaches to the session (interactive console) of the Minecraft Bedrock server"
+extra_started_commands="attach"
+
+command="/usr/bin/dtach"
+command_background="true"
+command_args="-N ${dtach_tmpfile} ${bedrock_command}"
+command_group="bedrock"
+command_user="bedrock"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}"
+
+	local bedrock_configs=( "permissions.json" "server.properties" "whitelist.json" )
+	for bedrock_config in ${bedrock_configs[@]}; do
+		if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then
+			cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}"
+			checkpath -f -o "${command_user}:${command_group}" -q "${bedrock_path_instance}/${bedrock_config}"
+		fi
+	done
+
+	local bedrock_ressources=( "behavior_packs" "definitions" "resource_packs" "structures" )
+	for bedrock_ressource in ${bedrock_ressources[@]}; do
+		if [ ! -L "${bedrock_path_instance}/${bedrock_ressource}" ]; then
+			ln -sf "${bedrock_path_data}/${bedrock_ressource}" "${bedrock_path_instance}"
+		fi
+	done
+}
+
+attach() {
+	pidnumber="$(cat ${pidfile})"
+	dtach_tmpfile="$(cat /proc/${pidnumber}/cmdline | tr '\0' ' ' | awk '{print $3}')"
+
+	if [ -S "${dtach_tmpfile}" ]; then
+		eval "${command}" -a "${dtach_tmpfile}" "${DTACH_OPTS}"
+	else
+		eerror "The determined socket file for dtach could not be found!"
+		eerror "Did the process crash?"
+	fi
+}
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 9af9e6c8c251..623914d69908 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,6 +1,11 @@
 AUX README.gentoo 602 BLAKE2B 53d39bd63283a570b0de64481de26a4eb481b84f00619f34fceb7b2293c837ea6dc0aa057da45450c2157c65164d8b567d84df1abc96b570225c0bd756f4f601 SHA512 16100671cdb2885aec89f725d1061eb17090a7df2fdc4fb9717012f119c975e026d42a68fd721ec6fd6947af11fd2712af807eaa34a28a31e6d9ee980d93ff60
+AUX README.gentoo-r1 776 BLAKE2B 3c514a09e07524568c8cbe6045069b569005c7754bdff0f2e6087a7ef5e166298b80306cf67158d6a2dcd0548b95ef3a11db6c747bf23e8dcd28e81fb00c195f SHA512 b11193f9738aa513190e4735057e8e551c1028e02fc711bad9dcb2f64a412f85cfad0a833871edc78fef850e382c761c9bbdbdf4d1d1c1cfc45063f4d3690c1a
 AUX minecraft-server.confd 318 BLAKE2B c4ae9a7e68e0db71f9cf648aeab10030264a544927f697d005016662a402bd1d64ea02779eb6b645c16845cec6b22842cf08c51734d608f90eb0d45f6c786a67 SHA512 bad9df2874a862f28a2a34f70509c34086ab5d63e6bfda79905f4058a029141ada592dc435d9773b6aa6332447c875675d68e7152ddf18b55a6157b81ed82f95
+AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r3 1542 BLAKE2B c0c3a173b0f5b30bbe75c753ccd6759264298782bae8b268caa8936d4e293df1aaa7453a086c97bd5336fa9537565ddacd96b8ab3b7ecf35265476e4b5e665ba SHA512 ff6d6ed5cfae16e6db25664c4476b5335b566248b05dd92e6761aa6023aabf1191d43c5730fc3ac8242e7035887b7ab5114ea45910991a805a2c27b8b5a80077
-DIST minecraft-server-1.15.2.jar 36175593 BLAKE2B f226a029a9ef2efea955fd44f915d5956fd24bb7c69d35bbbe132fcafc87cfcf023dbe834d9e973dafc25505b59d34b21ca6e36a0ad262316929f98807e47072 SHA512 21f5e77a58ac1e357425c99e259d3a688cf825483d391907403c7c9939abcf5b4a8fc73ff8d6277eaa373f376299027d6d7e0d8a5dd59d5791947efa1695490b
-EBUILD minecraft-server-1.15.2.ebuild 1046 BLAKE2B 0b693c1ad5f038b385343719a824ea4c9a7068905aba59dfbbcddc201c7ae1b7a6db2242aaeab4be972b4c138f405f62ea876d9d9f460cd5133bc642035f5323 SHA512 3287ed6a60b9b21fd993ad4a59c9f2217330385146c71002ebd451050d0ad6fab1a9cae1ca0885702dcf6ba937dd2c0c11712294dc6ac697fe4f6f327fb9d403
-MISC metadata.xml 495 BLAKE2B 9a4008401b01bce93293509fbba7d7f63eb1669f99cc0d2a372629230f7562f2f9357f952c148f27f9651d074270689cae19973b9c8ff255e8b3613122a8806c SHA512 00f1591c734e81e6289d086e1e9dde272d0548c512fef8b205a09d945dc1262d46a68014eb156c3ea2ff93eb052c2b3e28494fbf103a34220bf854a0df618e2b
+AUX minecraft-server.initd-r4 1996 BLAKE2B 34c4d6e41135224cf1b4bf96d93059897448a8646cb659ef63eb57cc45fbf9b766db5dce80aaad22062d4232eab1a55e2d6b2938aac0dae0fe6d8c897acc0b0f SHA512 fdc4cbc89852e2538f332911acec281e83f185534a996a83c5eb2094be7245a892b7a8139fb77a50b49abaf8e311bf629a21fee0f85906ecd87abce865740ae0
+DIST minecraft-server-1.16.1.jar 37968964 BLAKE2B 08c9f3f5b7c5618fd55b40e77a3ab92ed2d8cdf64771fe171292045ee611b6c549f0e732ed3dec2553f2219c219ff8f9b2187563717be14edbffa68ceb05b555 SHA512 8fa8bf001cb50e59351f58598fdbd4b7b13cee8d5a6ae7d4486f6259d419c8101123cb18efc96cac7c796ca98483d6d1e9ac3888d6b364d81b86927aee3f350d
+DIST minecraft-server-1.16.2.jar 37942337 BLAKE2B 538eef87ecfaa13c55a2a177a813914761ff6bc91f5017016207ff90af7eaa02432c3277d01c42b55cfc173f4654d202f954e0058c77b2200c1cebd6839a0021 SHA512 c95500c30e7008784766d8fea2356949eb8477ad7f1eed5e6aa478929468d05437ed322d5c805c26e430a59301f5c96cad79aa258412870ecc0ddc4efe13550f
+EBUILD minecraft-server-1.16.1.ebuild 1046 BLAKE2B 57d1b7cb7e65473306991b283c8fde425bf6ae67b7773ed466e83170e9f899d7184a9585a40ed63619d57595c15e308d9dd7c38255ab6bb1d8178dc1efe48754 SHA512 acd4e9863e33f8fb491c7805190a36d8a9698f78bc092052488540fd2b00a21cab84431ee69e63ad3d6447e4039a5d469472ce98d0a95145378a859247cb8d1a
+EBUILD minecraft-server-1.16.2-r1.ebuild 1078 BLAKE2B 44f502b7c1104558df71e43388fa158d044b5aedf16eb96641256892598fab9176ebc4b1224445a13ce3459b286531b794d11c377600fb8edda1595d3741064c SHA512 f014e1259b3e39e9fe823ba152d9afb6b1e0c87fcbfa25988faab9ae5ff93068d8e718cdfbd43541ca68f373c685c5d6c44caf02eb0ed2bb3b3e05178db92ed6
+MISC metadata.xml 934 BLAKE2B 96dae32908e92724e43b4fe1c75e8e861be515567de1866e7fb67c66aad9869ac8094c2537c0b852fe937b64e1a8f5276532c9377fe96401328aa2b70adbe462 SHA512 1930ef90ba19556269a83c934252712bedd92eb218f0773d9656a81bc447c88837dfa2a931da0f660c343fa85cb259e6997485e7e28810b0ece034481c99a784
diff --git a/games-server/minecraft-server/files/README.gentoo-r1 b/games-server/minecraft-server/files/README.gentoo-r1
new file mode 100644
index 000000000000..903ef5a7d9d7
--- /dev/null
+++ b/games-server/minecraft-server/files/README.gentoo-r1
@@ -0,0 +1,26 @@
+This package provides an init script and a conf file.
+You don't have to modify those files directly,
+but instead you can make a symlink of that init script
+and a copy of that conf file.
+You would do this for every server, you want to setup.
+
+For example, you wan't to setup an world called 'gentoo',
+you would do:
+
+cd /etc/init.d
+ln -s minecraft-server minecraft-server.gentoo
+
+cd /etc/conf.d
+cp minecraft-server minecraft-server.gentoo
+
+After that, make your settings in
+/etc/conf.d/minecraft-server.gentoo.
+
+If you don't make a symlink, but use the default scripts,
+your world will be called 'main'.
+
+To interact with the console of the corresponding world,
+you can use the extra command attach:
+
+rc-service minecraft-server attach
+rc-service minecraft-server.gentoo attach
diff --git a/games-server/minecraft-server/files/minecraft-server.confd-r1 b/games-server/minecraft-server/files/minecraft-server.confd-r1
new file mode 100644
index 000000000000..8b380349e9ac
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.confd-r1
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Dtach options, which will used, when the `attach` extra command is called.
+# By default, CTRL+D is used, and no redraw is done,
+# when you want to detach from the attached console.
+DTACH_OPTS="-e '^D' -r none"
+
+# Java options for your started server
+# You should at least define some memory settings (-Xms, -Xmx),
+# for maximum memory, as the java default is far to low for Minecraft
+MINECRAFT_OPTS="-Xms1024m -Xmx1024m"
diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r4 b/games-server/minecraft-server/files/minecraft-server.initd-r4
new file mode 100644
index 000000000000..e81337a7d19f
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.initd-r4
@@ -0,0 +1,62 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "minecraft-server" ]; then
+	instance="main"
+else
+	instance="${SVCNAME#minecraft-server.}"
+fi
+
+dtach_tmpfile="$(mktemp -u)"
+minecraft_command="/usr/bin/minecraft-server"
+minecraft_logs="/var/log/minecraft-server"
+minecraft_logs_instance="${minecraft_logs}/${instance}"
+minecraft_path="/var/lib/minecraft-server"
+minecraft_path_instance="${minecraft_path}/${instance}"
+name="Minecraft Server (World: ${instance})"
+pidfile="/run/minecraft-server.${instance}.pid"
+start_stop_daemon_args="--chdir ${minecraft_path_instance} --env JAVA_OPTS='${MINECRAFT_OPTS}'"
+
+description_attach="Attaches to the session (interactive console) of the Minecraft server"
+extra_started_commands="attach"
+
+command="/usr/bin/dtach"
+command_background="true"
+command_args="-N ${dtach_tmpfile} ${minecraft_command}"
+command_group="minecraft"
+command_user="minecraft"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}" "${minecraft_path_instance}"
+
+	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path_instance}"/eula.txt
+	echo "eula=true" > "${minecraft_path_instance}"/eula.txt
+
+	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}" "${minecraft_logs_instance}"
+
+	if [ ! -L "${minecraft_path_instance}"/logs ]; then
+		cd "${minecraft_path_instance}" && ln -s ../../../log/minecraft-server/"${instance}" logs
+	fi
+
+	if [ -z "${MINECRAFT_OPTS}" ]; then
+		eerror "You must define 'MINECRAFT_OPTS' in '/etc/conf.d/${SVCNAME}'!"
+		return 1
+	fi
+}
+
+attach() {
+	pidnumber="$(cat ${pidfile})"
+	dtach_tmpfile="$(cat /proc/${pidnumber}/cmdline | tr '\0' ' ' | awk '{print $3}')"
+
+	if [ -S "${dtach_tmpfile}" ]; then
+		eval "${command}" -a "${dtach_tmpfile}" "${DTACH_OPTS}"
+	else
+		eerror "The determined socket file for dtach could not be found!"
+		eerror "Did the process crash?"
+	fi
+}
diff --git a/games-server/minecraft-server/metadata.xml b/games-server/minecraft-server/metadata.xml
index 8c681902aca6..c3b4c421bb12 100644
--- a/games-server/minecraft-server/metadata.xml
+++ b/games-server/minecraft-server/metadata.xml
@@ -5,10 +5,22 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<longdescription>
+	<longdescription lang="en">
 		Minecraft is a sandbox video game created and designed
 		by Swedish game designer Markus "Notch" Persson,
 		and later fully developed and published by Mojang.
 		This is the headless server for Minecraft.
 	</longdescription>
+	<longdescription lang="fr">
+		Minecraft est un jeu vidéo bac à sable créé et conçu par
+		le développeur Markus Person (alias "Notch"), et plus
+		tard, pleinement maintenu et édité par Mojang.
+		Ceci est le serveur "headless" pour Minecraft.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://bugs.mojang.com/projects/MC/issues</bugs-to>
+		<maintainer status="active">
+			<name>Mojang</name>
+		</maintainer>
+	</upstream>
 </pkgmetadata>
diff --git a/games-server/minecraft-server/minecraft-server-1.15.2.ebuild b/games-server/minecraft-server/minecraft-server-1.15.2.ebuild
deleted file mode 100644
index d846eba514fc..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="bb2b6b1aefcd70dfd1892149ac3a215f6c636b07"
-
-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_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-r3 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.16.1.ebuild b/games-server/minecraft-server/minecraft-server-1.16.1.ebuild
new file mode 100644
index 000000000000..4c207ff17911
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.16.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="a412fd69db1f81db3f511c1463fd304675244077"
+
+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_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-r3 minecraft-server
+	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-server/minecraft-server/minecraft-server-1.16.2-r1.ebuild b/games-server/minecraft-server/minecraft-server-1.16.2-r1.ebuild
new file mode 100644
index 000000000000..e219f3882840
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.16.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="c5f6fb23c3876461d46ec380421e42b289789530"
+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_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/steamcmd/Manifest b/games-server/steamcmd/Manifest
index 64bdb1bef981..0f535eea79ee 100644
--- a/games-server/steamcmd/Manifest
+++ b/games-server/steamcmd/Manifest
@@ -1,6 +1,9 @@
 AUX README.gentoo 1420 BLAKE2B 470f3a40acf5eb150c583697a5dc2b80b6a8d1814b8c4e2c74757479e24540c5f38297b27096e8edd57b685fa0458f5175d75e34d08bd2acf45f4d7aa2c12fa8 SHA512 103ebd60a5e8c9bce0ba742ed945734d19330f5567e738317a0d8e37b2625b852c6606678487c8aa27937c7cd25a05680a7d165cc8f33a0044a993d801e5a65d
 AUX steamcmd.confd-r1 576 BLAKE2B 6e944d2a707c1428a73dccd51abbd07732d622707aad00ccad79e796c313fcbdb4b7f484b82a05774c08c403526a09ae7387da4b2b744f4ec8fbd79062d6c0d0 SHA512 73fe7f4be500628e89f9905263b032e86c7e2792971ddc5f6d27b911f9c3a13601fb2d3dcd5a3a6dd4926d04c14fd6b3b297e55343ce5f5c2372e69c315df3f0
+AUX steamcmd.confd-r2 786 BLAKE2B 064be96c4052fd8ec5d7c10e18959fd1465637d9680ba79e08c3779efb5f8e706bac58a5f70602ff07aa00eb08d2e84f6312aecb0a792f84dcb4261ea038b2b1 SHA512 76cc695f74e71747cd5f1e083d38c13db105af0d8f4f465d2a2d53c0b0933022ff4acc9920e961868d9177dc0c2a6648aa20401f60952e9af94e622801cde5b8
 AUX steamcmd.initd-r1 791 BLAKE2B 9ba1002a7faed781bd24f1e0534ec09ba0036b1fc97be3ba4a57aadc764c50573059b5c4cbe60808ddaa7e3cf808a5c8b43ec2bc25a0fd3039d41fa902962725 SHA512 56f8fa87d3cfc0de635fb95516b0e8e6c471155e3f397b8ab40e877ce770ff3aabc2846156f98de9ba8810e71f18a3fb202f9c098efaa1b97ecdca11ff689bbe
+AUX steamcmd.initd-r2 1248 BLAKE2B 881c45498dc1097ad9852661d866c2de152b0bf061567ac1b036a3cf3c3088fd7c3dd12c9cdd5aff07cb2e6368f50c40f61355983533e320e28fbd1422a25947 SHA512 79e7bf2a15dfc041c77d1c97fc66855f993905a791b8d25121163246feb9ba98a72f97647d9a2ce3ed7fd2590533b2da92992abe4fb39fcba6ebd13ef5c3a501
 DIST steamcmd-1.0.tar.gz 2428561 BLAKE2B c51dbb8c7731222eb748508b8a84a4cbda55168c85116078074bd0da85018a344ca088b7af41a07a96c15e64d0aeb28fb90cd85d99f444e9425f5a326c1823fe SHA512 b37debfa45e5578cc065924770258a026adad339aae86da1a66e71ac4ee80d2ddbca9060ca4c734affd2c6902635e7b32e2b3efe11bb600969654b3abeb3839e
 EBUILD steamcmd-1.0-r2.ebuild 1134 BLAKE2B cfdb069a7fb3f4474549e503cc8e72b210c412c0dcaf295793beba28758df1158a702b69bcaa5dc0eb037f26d45ec743f26b82b750554cb0846f15a1e3be141f SHA512 4e944a7d7b06a7d7b1b6d71b086ccb06e89267967f4604803c6c25a4fd22d1edfb232f7efe7c445e851f84484bb201b28a1a1cec193ab79c65d2cadd0702c427
+EBUILD steamcmd-1.0-r3.ebuild 1135 BLAKE2B fa32461a7efc4059deeec69312409e6166375c37bfd8a69b5a367747965b4da84ee64999304bf9351bdac963b947a12f7e76e3b04e809237794d8be39b00c2bc SHA512 7171affdc02e47abdfbf84afeae965ffa98351806657e5b1203f14da51a4e74e63ff124b6206675ded47da66de3ef9d88c74c5932d22b464f001ef92eee76c9e
 MISC metadata.xml 635 BLAKE2B 1e57286c55cdd028c5cb0e81e068f557f3d0d64f1efebdb53716805f25e671918a4e038cf329a6a97e76142e87faf0efe8020fd8501d0e72e4d06d951e55a7dc SHA512 afdf6f2e8e1903634803ade00b5ed3230e2f24d0272c0a1a0bbdb3708517dedf1ecd3f8a88c1a752289ce7b7d361fbb7d80977a092cbe66e8c92b3ed548ef0c9
diff --git a/games-server/steamcmd/files/steamcmd.confd-r2 b/games-server/steamcmd/files/steamcmd.confd-r2
new file mode 100644
index 000000000000..5cd84e169f5a
--- /dev/null
+++ b/games-server/steamcmd/files/steamcmd.confd-r2
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Dtach options, which will used, when the `attach` extra command is called.
+# By default, CTRL+D is used, and no signal is send,
+# when you want to detach from the attached console.
+DTACH_OPTS="-e '^D' -r none"
+
+# Specifies, which server binary is used.
+# This could be 'hlds_run' or 'srcds_run', depending on your game.
+# STEAMCMD_BINARY="hlds_run"
+
+# Path to the files of your started server.
+# It's recommended to use:
+# '/opt/steamcmd/hlds' for older HL1 based mods.
+# '/opt/steamcmd/srcds' for newer HL2 based mods.
+# STEAMCMD_PATH="/opt/steamcmd/hlds"
+
+# Options for your server binary.
+# STEAMCMD_OPTS="-game valve +ip 127.0.0.1 +maxplayers 32 +map crossfire -pingboost 3"
diff --git a/games-server/steamcmd/files/steamcmd.initd-r2 b/games-server/steamcmd/files/steamcmd.initd-r2
new file mode 100644
index 000000000000..4564d4526813
--- /dev/null
+++ b/games-server/steamcmd/files/steamcmd.initd-r2
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "steamcmd" ]; then
+	instance="main"
+else
+	instance="${SVCNAME#steamcmd.}"
+fi
+
+dtach_tmpfile="$(mktemp -u)"
+name="SteamCMD (Mod: ${instance})"
+pidfile="/run/steamcmd.${instance}.pid"
+start_stop_daemon_args="--chdir ${STEAMCMD_PATH}"
+
+description_attach="Attaches to the session (non-interactive console) of the SteamCMD game server"
+extra_started_commands="attach"
+
+command="/usr/bin/dtach"
+command_args="-N ${dtach_tmpfile} ${STEAMCMD_PATH}/${STEAMCMD_BINARY} ${STEAMCMD_OPTS}"
+command_background="true"
+command_group="steamcmd"
+command_user="steamcmd"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -z "${STEAMCMD_BINARY}" ] || [ -z "${STEAMCMD_PATH}" ]; then
+		eerror "One or more STEAMCMD_* variables in /etc/conf.d/${SVCNAME} are not set!"
+		return 1
+	fi
+	return 0
+}
+
+attach() {
+	pidnumber="$(cat ${pidfile})"
+	dtach_tmpfile="$(cat /proc/${pidnumber}/cmdline | tr '\0' ' ' | awk '{print $3}')"
+
+	if [ -S "${dtach_tmpfile}" ]; then
+		eval "${command}" -a "${dtach_tmpfile}" "${DTACH_OPTS}"
+	else
+		eerror "The determined socket file for dtach could not be found!"
+		eerror "Did the process crash?"
+	fi
+}
diff --git a/games-server/steamcmd/steamcmd-1.0-r3.ebuild b/games-server/steamcmd/steamcmd-1.0-r3.ebuild
new file mode 100644
index 000000000000..1c33b66301d8
--- /dev/null
+++ b/games-server/steamcmd/steamcmd-1.0-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="This is the command-line version of the Steam client for dedicated servers"
+HOMEPAGE="https://developer.valvesoftware.com/wiki/SteamCMD"
+SRC_URI="https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ Steam"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	acct-group/steamcmd
+	acct-user/steamcmd
+	app-misc/dtach
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/steamcmd/linux32/libstdc++.so.6
+	opt/steamcmd/linux32/steamcmd
+"
+
+src_install() {
+	diropts -o steamcmd -g steamcmd
+	dodir /opt/steamcmd
+	keepdir /opt/steamcmd/{.steam,.steam/sdk32,linux32}
+
+	exeopts -o steamcmd -g steamcmd
+	exeinto /opt/steamcmd
+	doexe steamcmd.sh
+
+	exeopts -o steamcmd -g steamcmd
+	exeinto /opt/steamcmd/linux32
+	doexe linux32/steamcmd linux32/libstdc++.so.6
+
+	newinitd "${FILESDIR}"/steamcmd.initd-r2 steamcmd
+	newconfd "${FILESDIR}"/steamcmd.confd-r2 steamcmd
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
-- 
cgit v1.2.3