gentoo resync : 25.11.2020

7 files changed, 33 insertions, 87 deletions

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
 }