gentoo resync : 25.11.2020

21 files changed, 48 insertions, 251 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index a379f8141529..f33c57c7e8d1 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 710f2e277d3d..11544a7e52e3 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,8 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
-AUX bedrock-server.initd-r1 1558 BLAKE2B 5d65fe612092777002e9e4b0b62041aa1637e6c6aaaebb64c1be956cfa7ceb355afb337c4d84ef6e66c25167a3544c9bb0791843cb2bf98aca7c712eef02e143 SHA512 fa2c99461650d99ad45e63d7b2166431882e6fb5a73795a468a837a46a3ab47ce641ce0aee8e4ca220f25422af128746f24125da6a3fbb35829f27c1bd397c23
 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.100.04.zip 89007325 BLAKE2B baaa1244297385938ea45ed0559e9965d6b0c03f13ccaa6a85e9ee4b272ad46eeb9ce0b1a23fd3eb1b4cfdda730d3251a7df86470bdfebe617dea2f87e5c35b0 SHA512 7442237169dbc64d11629321a5ec75b004f4e29e28b3c031cfca98498d079b759bcecb56fe0c7f8df8c3fca4bdc7127b282614a50adeb7afa41aa89f190f1fc7
 DIST bedrock-server-1.16.40.02.zip 69910097 BLAKE2B 6c074a3f99bcd9dfe0214a43550d08714af9a58ee619765bf6713b59b997c1c322bba906966c18181fdb3c5e3e5791140fa49d25146820b649f30ace1c147adb SHA512 e0d012719a413656ed0f4b8ffc0ca96d537e3dbfc306ce8e05d757442e209ce2b1f9a43c1152c3a36ed251a35f68f6072401742e1ab2cf75d75ef9420232702b
-EBUILD bedrock-server-1.16.1.02.ebuild 1058 BLAKE2B aa58efb9b838a7f9c1f0659d0687fd985fc210ade149b0f64f89f3da19e6ea248cf98e7b9b9cfad6d1345ee4032ef8db67d962d95981c366a5a7c8c04da8fc77 SHA512 4eebb8ac43662595706b80d06d0844ec083f44478554073e4843b548eeddebf11ce890d66f160b0b205a2f1c2d20e76ef9f7627d8dc397594816619cd49122df
-EBUILD bedrock-server-1.16.40.02.ebuild 1119 BLAKE2B b76800f2862d9a9237cb22b877a03b607b84f7cf12572d75b0b52bb0360c641033e53a3f14ab82c62ce44af71ac2690e7d28a0ba9530fd3cb1261446272a00e1 SHA512 1672257c9b81808bd913712167d152a981f5cf9deca0224a057e4c25f5bbacef0b7dcf6fe72080efd47b807d3b7b00639db344c143468c2d95f82663bcb9e1d4
+EBUILD bedrock-server-1.16.100.04.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.1.02.ebuild b/games-server/bedrock-server/bedrock-server-1.16.100.04.ebuild
index ceeced788eae..a60cb02addb6 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.1.02.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.100.04.ebuild
@@ -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
@@ -46,7 +46,8 @@ src_install() {
 	dodir /opt/bin
 	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
 
-	newinitd "${FILESDIR}"/bedrock-server.initd-r1 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/bedrock-server-1.16.40.02.ebuild b/games-server/bedrock-server/bedrock-server-1.16.40.02.ebuild
index a60cb02addb6..c7480a4e40c6 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.40.02.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.40.02.ebuild
@@ -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/files/bedrock-server.initd-r1 b/games-server/bedrock-server/files/bedrock-server.initd-r1
deleted file mode 100644
index 5f71b80edb21..000000000000
--- a/games-server/bedrock-server/files/bedrock-server.initd-r1
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 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}"
-
-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
-}
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 068c3bfd78f5..9d50dd9237c8 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,11 +1,9 @@
-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
 AUX minecraft-server.initd-r4 1996 BLAKE2B 34c4d6e41135224cf1b4bf96d93059897448a8646cb659ef63eb57cc45fbf9b766db5dce80aaad22062d4232eab1a55e2d6b2938aac0dae0fe6d8c897acc0b0f SHA512 fdc4cbc89852e2538f332911acec281e83f185534a996a83c5eb2094be7245a892b7a8139fb77a50b49abaf8e311bf629a21fee0f85906ecd87abce865740ae0
-DIST minecraft-server-1.16.1.jar 37968964 BLAKE2B 08c9f3f5b7c5618fd55b40e77a3ab92ed2d8cdf64771fe171292045ee611b6c549f0e732ed3dec2553f2219c219ff8f9b2187563717be14edbffa68ceb05b555 SHA512 8fa8bf001cb50e59351f58598fdbd4b7b13cee8d5a6ae7d4486f6259d419c8101123cb18efc96cac7c796ca98483d6d1e9ac3888d6b364d81b86927aee3f350d
+AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
 DIST minecraft-server-1.16.3.jar 37942656 BLAKE2B 1ed70ac476dd202797f46a4844519d816f17c272d0703791d74b651fa8ac4c343a6939b50c5a0230d5bf149a564af6c7603297f0b114ce9fd2487f4bebef1c7e SHA512 ef9956ec55638b54e21e3b504ba2d2ce1b9d09769b5e118a36fbf2d97bd84a5bb49adf9a07328ae3e1c9fd76fe3da0b7d56baaa77bdc55b99d0f45039ada2ac3
-EBUILD minecraft-server-1.16.1.ebuild 1046 BLAKE2B 57d1b7cb7e65473306991b283c8fde425bf6ae67b7773ed466e83170e9f899d7184a9585a40ed63619d57595c15e308d9dd7c38255ab6bb1d8178dc1efe48754 SHA512 acd4e9863e33f8fb491c7805190a36d8a9698f78bc092052488540fd2b00a21cab84431ee69e63ad3d6447e4039a5d469472ce98d0a95145378a859247cb8d1a
-EBUILD minecraft-server-1.16.3.ebuild 1101 BLAKE2B 6571a15b27f72bbf81decf0c92c64255423357818460a16a1b7d2c1229a68aea03d09b0f640cff465557694b60afe85c7e123b2d43a44637ca83a998e1331dfb SHA512 f6c45cadb50d7b22c756b41561222356b98313b57b56aca0d1629d06b4135357db3b02ec47abc5aba60a64e3d86c5be739ffa1f14af4711076f4c02fba037fa4
+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
 MISC metadata.xml 934 BLAKE2B 96dae32908e92724e43b4fe1c75e8e861be515567de1866e7fb67c66aad9869ac8094c2537c0b852fe937b64e1a8f5276532c9377fe96401328aa2b70adbe462 SHA512 1930ef90ba19556269a83c934252712bedd92eb218f0773d9656a81bc447c88837dfa2a931da0f660c343fa85cb259e6997485e7e28810b0ece034481c99a784
diff --git a/games-server/minecraft-server/files/README.gentoo b/games-server/minecraft-server/files/README.gentoo
deleted file mode 100644
index ae8c62a9cbf2..000000000000
--- a/games-server/minecraft-server/files/README.gentoo
+++ /dev/null
@@ -1,20 +0,0 @@
-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'.
diff --git a/games-server/minecraft-server/files/minecraft-server.confd b/games-server/minecraft-server/files/minecraft-server.confd
deleted file mode 100644
index 700498e5aead..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# 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-r3 b/games-server/minecraft-server/files/minecraft-server.initd-r3
deleted file mode 100644
index a76d6d23e67f..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.initd-r3
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 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}'"
-
-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/minecraft.${SVCNAME}!"
-		return 1
-	fi
-}
diff --git a/games-server/minecraft-server/files/minecraft-server.service b/games-server/minecraft-server/files/minecraft-server.service
new file mode 100644
index 000000000000..ad9167e5b1c9
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Minecraft Server (World: %I)
+After=network.target
+
+[Service]
+User=minecraft
+Group=minecraft
+WorkingDirectory=-/var/lib/minecraft-server/%I
+PIDFile=/run/minecraft-server.%I.pid
+ExecStartPre=!/bin/mkdir -p /var/lib/minecraft-server/%I
+ExecStartPre=!/bin/chown -R minecraft:minecraft /var/lib/minecraft-server/%I
+ExecStartPre=/bin/sh -c 'echo "eula=true" > /var/lib/minecraft-server/%I/eula.txt'
+ExecStart=/bin/sh -c '/usr/bin/dtach -N $(mktemp -u) /usr/bin/minecraft-server'
+
+[Install]
+WantedBy=multi-user.target
diff --git a/games-server/minecraft-server/minecraft-server-1.16.3.ebuild b/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
index 3d8866f30ac2..388f8aaceb69 100644
--- a/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
@@ -14,7 +14,7 @@ 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
diff --git a/games-server/minecraft-server/minecraft-server-1.16.1.ebuild b/games-server/minecraft-server/minecraft-server-1.16.4.ebuild
index 4c207ff17911..a8f5432619f5 100644
--- a/games-server/minecraft-server/minecraft-server-1.16.1.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.16.4.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
-EGIT_COMMIT="a412fd69db1f81db3f511c1463fd304675244077"
+EGIT_COMMIT="35139deedbd5182953cf1caa23835da59ca3d7cd"
+README_GENTOO_SUFFIX="-r1"
 
-inherit readme.gentoo-r1 java-pkg-2
+inherit readme.gentoo-r1 java-pkg-2 systemd
 
 DESCRIPTION="The official server for the sandbox video game"
 HOMEPAGE="https://www.minecraft.net/"
@@ -13,7 +14,7 @@ SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	acct-group/minecraft
@@ -30,15 +31,20 @@ RESTRICT="bindist mirror"
 S="${WORKDIR}"
 
 src_unpack() {
-	cp "${DISTDIR}"/${A} "${WORKDIR}" || die
+	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-r3 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
+	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
 }
diff --git a/games-server/mtavc/Manifest b/games-server/mtavc/Manifest
index 0de17511ff4c..b1f8b39b010f 100644
--- a/games-server/mtavc/Manifest
+++ b/games-server/mtavc/Manifest
@@ -1,4 +1,4 @@
 AUX mtavc 46 BLAKE2B 0f35cd14bac92c2f761a152b1f9b895de9ca4b8c86cca34c982e1cfd3d0d8205d4eefdd5e0c9a188311db207201f1b6db385ec3341b2146b36921d792dc7056a SHA512 e71aed1a05ade048665c9ffd4c272a8a9eb74a14b05ff95baa4ac61cd53d5d67d0c6dd7a1d0798cd89ff70cf12f7153e7dbf31e9f10df55e773f01313458430e
 DIST MTAServer0_5-linux.tar.gz 229056 BLAKE2B d46784a532046bfe28bb2110470ad8c07dc2c9d1f68366663bdce519f3214bcf74bf4975495a4013b8f9c104921a52a42fe7d6599bf6a012171a1d120e6678b1 SHA512 eed0ec109427c53c9627826f1977b4a2454be0130d445b2ff7288e3f93b93d76d21b22ffdb706d306009baffd37bd317f9573a9650477e25146ff5d3b49f9c1f
-EBUILD mtavc-0.5-r2.ebuild 903 BLAKE2B 7cafededa73a4e0e81e5360dab0d68f6f07351753b743fa724880b26edd28ea862c769cd97fb9ec011ff0ce665af3bd1f15a1e95333f1df214416622f6eb0d06 SHA512 3d617b6a7b6369896e4a6c2f83bb28547126e8787a8b47c45a2ac8bb085ecd1dfe2a59fedf4ddd66bab1f5d822c27ba8c2467df0f27377ba4d4405bdd99e4686
+EBUILD mtavc-0.5-r2.ebuild 908 BLAKE2B be3d2062d3e9b6b866b48637a9e802c71e722295e809853a254b9b884d570e8d70d2b7a9d9ffa8efb22b5668db28116407953b13a6a16cfcacee8049f9a3a045 SHA512 f6c8d296ddbc9a10158417cff8e4c70184423cd20f7d0166cc99b0abea153d4b8687df7da12c91b1d31c866f657ef6e075fa4d5e5c193aafd4ed78810cba16d8
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/mtavc/mtavc-0.5-r2.ebuild b/games-server/mtavc/mtavc-0.5-r2.ebuild
index 224b9f29ea3c..4d828a967955 100644
--- a/games-server/mtavc/mtavc-0.5-r2.ebuild
+++ b/games-server/mtavc/mtavc-0.5-r2.ebuild
@@ -41,6 +41,6 @@ src_install() {
 	doins ${files}
 	dodoc README CHANGELOG
 	for f in ${files} ; do
-		dosym /etc/${PN}/${f} "${dir}"/${f}
+		dosym ../../etc/${PN}/${f} "${dir}"/${f}
 	done
 }
diff --git a/games-server/steamcmd/Manifest b/games-server/steamcmd/Manifest
index 0f535eea79ee..2bc04d552153 100644
--- a/games-server/steamcmd/Manifest
+++ b/games-server/steamcmd/Manifest
@@ -1,9 +1,6 @@
 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
+EBUILD steamcmd-1.0-r3.ebuild 1133 BLAKE2B e4fb40c369e45e20eeae7d06b995433ea4f9298b326cf130758d8033794b6a5fa0d454558a8ddf892ab201283f580b0cb3b0ef6500ab4bb0c8771b922cc41e21 SHA512 51674dd05c221f82bf3ba0f5f6a296eac5dbc21e0c7fd2c95f730e5da6e2609298645ce841dbb201c9b82a5b0f6af620d22e57bd36f219cdec30beef0c92d550
 MISC metadata.xml 635 BLAKE2B 1e57286c55cdd028c5cb0e81e068f557f3d0d64f1efebdb53716805f25e671918a4e038cf329a6a97e76142e87faf0efe8020fd8501d0e72e4d06d951e55a7dc SHA512 afdf6f2e8e1903634803ade00b5ed3230e2f24d0272c0a1a0bbdb3708517dedf1ecd3f8a88c1a752289ce7b7d361fbb7d80977a092cbe66e8c92b3ed548ef0c9
diff --git a/games-server/steamcmd/files/steamcmd.confd-r1 b/games-server/steamcmd/files/steamcmd.confd-r1
deleted file mode 100644
index b5d8b4198493..000000000000
--- a/games-server/steamcmd/files/steamcmd.confd-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# 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-r1 b/games-server/steamcmd/files/steamcmd.initd-r1
deleted file mode 100644
index 327b47734ec6..000000000000
--- a/games-server/steamcmd/files/steamcmd.initd-r1
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "steamcmd" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#steamcmd.}"
-fi
-
-name="SteamCMD (Mod: ${instance})"
-pidfile="/run/steamcmd.${instance}.pid"
-screen_name="steamcmd.${instance}"
-start_stop_daemon_args="--chdir ${STEAMCMD_PATH}"
-
-command="screen"
-command_args="-DmUS ${screen_name} ${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/steamcmd.${SVCNAME} are not set!"
-		return 1
-	fi
-	return 0
-}
diff --git a/games-server/steamcmd/steamcmd-1.0-r2.ebuild b/games-server/steamcmd/steamcmd-1.0-r2.ebuild
deleted file mode 100644
index 102dc5e774ed..000000000000
--- a/games-server/steamcmd/steamcmd-1.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 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/screen
-"
-
-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-r1 steamcmd
-	newconfd "${FILESDIR}"/steamcmd.confd-r1 steamcmd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/steamcmd/steamcmd-1.0-r3.ebuild b/games-server/steamcmd/steamcmd-1.0-r3.ebuild
index 1c33b66301d8..b31bdda9ecde 100644
--- a/games-server/steamcmd/steamcmd-1.0-r3.ebuild
+++ b/games-server/steamcmd/steamcmd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz
 
 LICENSE="LGPL-2.1+ Steam"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	acct-group/steamcmd
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
index 26ac316ca72f..637691f217da 100644
--- a/games-server/ut2004-ded/Manifest
+++ b/games-server/ut2004-ded/Manifest
@@ -3,5 +3,5 @@ AUX ut2004-ded.initd 320 BLAKE2B 34e3fdf38eb9e5bc2623581c73fea3af040f9dca829c8c4
 DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B 883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325 SHA512 353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
-EBUILD ut2004-ded-3369.3-r2.ebuild 2623 BLAKE2B c6f2990eb2a0d10d6c5154545ce1359f751e8d03833cc020d7d86f8f56cabb7683efee0c66d59d2a89b69106be33e56279aa069a7dfd698222d16ca3a6f4c4ef SHA512 59cb24ba36d170a221e7e2fcb77d12c4519b54f2cd26d61b15f0fa804d3fb3b598847388c4481010ed326888169690896597632038d7aa6405e2e8c69d4f616a
+EBUILD ut2004-ded-3369.3-r2.ebuild 2621 BLAKE2B 1debe5247e9525470387330ed7ab93b007bcd6d2c261509762e588884653005e25bd64b9b72422f4a0e15d0d32946cfd504b28b7b1f45df5e38f340af008d1e8 SHA512 7536c3840a685fa0aeeb95b53ea47d32cc735697f1a6e8f3b995edebae06f5ccee0e43da980c791da1925191fbc1d8a65afa1437bec85468f1745d41a4809486
 MISC metadata.xml 641 BLAKE2B 6f4b33ffb4810e9161f185859d8a822bf655f70f40220968a1638398072506486a72180065d2f1589446f09d61416b2cc379bdfafd540162bf8b817834002849 SHA512 637588c313e117912d01da6345324d455f7c1c658e413d936b60f1fcceff88d8ecae084e11727479c8cf72438f14412336d9c81d94cccc1ffb54a5ec2d69ebc7
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
index 63f7dcb52408..2f6413ad120a 100644
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
+++ b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,8 +10,8 @@ PATCH_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
 DESCRIPTION="Unreal Tournament 2004 Linux Dedicated Server"
 HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
 SRC_URI="
-	https://ut2004.ut-files.com/Entire_Server_Download/${BONUSPACK_P}
-	https://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
+	http://ut2004.ut-files.com/Entire_Server_Download/${BONUSPACK_P}
+	http://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
 	https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
 "