gentoo resync : 15.12.2019

4 files changed, 100 insertions, 6 deletions

diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index f8afbe212363..e0673ef4b98f 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,6 +1,9 @@
 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.0.jar 36164465 BLAKE2B e209abacd4a90964b7ccf19333224c0235c91f6f560a9c83f585c92cc973f3dea292032a67ef99aac8e8f17aedd557a0d8f548edda5a187c6a20def091e1ed9a SHA512 66775b4be5a38fe7e3fc94c50b870d58cc21d4da1b4f4437d749b5b6f93680a2206b5a1eac7e55b42072619686b0bdf16ed5850ce8db9c65f6d2508529bac0a4
 EBUILD minecraft-server-1.14.4.ebuild 1232 BLAKE2B 77d810e9c3c3ed136b6c8438f4370f9988c740a04cb36bd23ff0117ad84acbc3c586ff2f2393846e619669b1610e05ba76f473a045a30cdc737f6675653ae7e8 SHA512 6e85b30f8f36ca74407bea33698b1a8f8423f86dde0a6a2b36786695eddf0d5db2e9f9d042c6341aaa42a1cd2c988c995654998e9fe6356d6e9cd041de8d940e
-MISC metadata.xml 614 BLAKE2B 78e166781dd7310c6e8a148ba0bc1e36c8e6a21a64587d65b5239f43e7dda4b494b77b254b420e3c1317390debad03ec35847eadbf345aec3c0ba1a6d759f546 SHA512 0deb2afc6cfcfc57351b210f21506ffb5dca43e51aeda268a92781640d8940ce71024ed71a8de249b4ac135da92fd5e741bd8be5e5c00cf0d4b26100b838ac10
+EBUILD minecraft-server-1.15.0.ebuild 1048 BLAKE2B a46c8c93247237b21b1154c7143dce8b9a38ea4a0f592a23df0a477173058306472ca4a01b2c66433a637b8637c89c94b18b9d834405a8e12bc12bf7f983448d SHA512 d8c01c8c5017ef799da4f58b4fa3221da82d88a4af6813075c464d29a021dca556429d11f05cca6d8aad6d79f613d9246c260c687c5fd1afd1ee6e6cfd8a885e
+MISC metadata.xml 495 BLAKE2B 9a4008401b01bce93293509fbba7d7f63eb1669f99cc0d2a372629230f7562f2f9357f952c148f27f9651d074270689cae19973b9c8ff255e8b3613122a8806c SHA512 00f1591c734e81e6289d086e1e9dde272d0548c512fef8b205a09d945dc1262d46a68014eb156c3ea2ff93eb052c2b3e28494fbf103a34220bf854a0df618e2b
diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r3 b/games-server/minecraft-server/files/minecraft-server.initd-r3
new file mode 100644
index 000000000000..a76d6d23e67f
--- /dev/null
+++ b/games-server/minecraft-server/files/minecraft-server.initd-r3
@@ -0,0 +1,47 @@
+#!/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/metadata.xml b/games-server/minecraft-server/metadata.xml
index 45b32f4be812..8c681902aca6 100644
--- a/games-server/minecraft-server/metadata.xml
+++ b/games-server/minecraft-server/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Minecraft is a sandbox video game created and designed
 		by Swedish game designer Markus "Notch" Persson,
diff --git a/games-server/minecraft-server/minecraft-server-1.15.0.ebuild b/games-server/minecraft-server/minecraft-server-1.15.0.ebuild
new file mode 100644
index 000000000000..83a226fa6960
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.15.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="e9f105b3c5c7e85c7b445249a93362a22f62442d"
+
+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
+}