From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- games-server/Manifest.gz | Bin 2223 -> 2227 bytes games-server/minecraft-server/Manifest | 7 ++- games-server/minecraft-server/files/README.gentoo | 20 ++++++ .../files/minecraft-server-r1.initd | 47 +++++++++++++++ .../minecraft-server/files/minecraft-server.initd | 48 --------------- .../minecraft-server-1.12.2.ebuild | 67 --------------------- .../minecraft-server/minecraft-server-1.13.ebuild | 55 +++++++++++++++++ 7 files changed, 126 insertions(+), 118 deletions(-) create mode 100644 games-server/minecraft-server/files/README.gentoo create mode 100644 games-server/minecraft-server/files/minecraft-server-r1.initd delete mode 100644 games-server/minecraft-server/files/minecraft-server.initd delete mode 100644 games-server/minecraft-server/minecraft-server-1.12.2.ebuild create mode 100644 games-server/minecraft-server/minecraft-server-1.13.ebuild (limited to 'games-server') diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz index 2414af966efd..a8c830d177f0 100644 Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest index 518f357e2ab2..e4fb74575591 100644 --- a/games-server/minecraft-server/Manifest +++ b/games-server/minecraft-server/Manifest @@ -1,5 +1,6 @@ +AUX README.gentoo 602 BLAKE2B 53d39bd63283a570b0de64481de26a4eb481b84f00619f34fceb7b2293c837ea6dc0aa057da45450c2157c65164d8b567d84df1abc96b570225c0bd756f4f601 SHA512 16100671cdb2885aec89f725d1061eb17090a7df2fdc4fb9717012f119c975e026d42a68fd721ec6fd6947af11fd2712af807eaa34a28a31e6d9ee980d93ff60 +AUX minecraft-server-r1.initd 1374 BLAKE2B ae0ed543d16978656f7307fdbaef0376b6b34baa256965095ae10d902c72ee0f468c1f27fb1ce4fc1847865944c5905a35acc29e4f5c81f327d98e1fb1c8b6a6 SHA512 ccbb743059394ef199412906d9b72384c5565efc9ab2280be14229d3d0b0bb0808c2ab9bc1ab8ebf798c4d2903a2f31db1b36cc409b42c80652b4782dfb5ec61 AUX minecraft-server.confd 318 BLAKE2B c4ae9a7e68e0db71f9cf648aeab10030264a544927f697d005016662a402bd1d64ea02779eb6b645c16845cec6b22842cf08c51734d608f90eb0d45f6c786a67 SHA512 bad9df2874a862f28a2a34f70509c34086ab5d63e6bfda79905f4058a029141ada592dc435d9773b6aa6332447c875675d68e7152ddf18b55a6157b81ed82f95 -AUX minecraft-server.initd 1421 BLAKE2B a59a6ab1270fb8110ec0ede580a52373626ffa2c42a75f63dc7508fc07b6f4e05ee85d04777d3f1a04a23229632f4de088164121bc351d7a38ea076b7e463e28 SHA512 6ef9df7d33cebb60981fc4fb4cbf1c4d737f3d957902effd02f8a278a6d4cedddd38fd89ecec0ac3ff5e25f236fcf484715fe3583d0f8865a83a1ae673775aee -DIST minecraft-server-1.12.2.jar 30222121 BLAKE2B 91733822789405dbec5d335fc67e47d3278138929280c4fdcf6053fb0824651474c8e2310c342862fc1aefdf74f55d0a21d78b3c34f32484ec8196b7c5921d72 SHA512 327196bfb833160ae6fb7d12b7d372d031bc0ffbac3455481c1635b01e00f0d5502d4698fbc4f8e7ee59cc3902d56c41261c45d1f1c8f3972e192631f504a0fc -EBUILD minecraft-server-1.12.2.ebuild 1865 BLAKE2B 5392b409ac7db38a997d5c4218f1de34120215b9732bec6aad610029ac548ffae220d328c98319911d6d89b173daa5296e841499015a94e417fb6baa5e6f462a SHA512 686219de7fecbf02b4f2d4957d5dc048d05aefe4f7ef1aec303896e9184ff1f1c6e4177194436a06a701bd7858816a33855501ec74939d9765f5dad705e8bb5d +DIST minecraft-server-1.13.jar 32649675 BLAKE2B c137e8009ea201fafe148277aa2d81f7683b99653f74f335659ec239a2cdb3b1271eea290bbda58967fd81075f76edf14622d64d4f25e92e92bb186348acea5d SHA512 726e9775163338660429886dbf940e9ad43d75fa315a8bb2936d23491e8c5717fbd365490b91ff74f876eb498a3674b88f41a526b06a64acbc33d8670b48c342 +EBUILD minecraft-server-1.13.ebuild 1265 BLAKE2B bcf25c76f33402ebbe2822068645ddb18ca590867d12ff36ce857f759bdd1502d3a8ed0478e00833544c348781b6a7013ce684d3beafdedfe107735c729fe82c SHA512 82d695f73fc3c8138da3d42a5a61eb7f457fa2a880d89dec505520a44244dc7dd628d884f4d689ca852af3779951e18cef12a0d6965d1cc27e9ac5a89c3d4455 MISC metadata.xml 614 BLAKE2B 78e166781dd7310c6e8a148ba0bc1e36c8e6a21a64587d65b5239f43e7dda4b494b77b254b420e3c1317390debad03ec35847eadbf345aec3c0ba1a6d759f546 SHA512 0deb2afc6cfcfc57351b210f21506ffb5dca43e51aeda268a92781640d8940ce71024ed71a8de249b4ac135da92fd5e741bd8be5e5c00cf0d4b26100b838ac10 diff --git a/games-server/minecraft-server/files/README.gentoo b/games-server/minecraft-server/files/README.gentoo new file mode 100644 index 000000000000..ae8c62a9cbf2 --- /dev/null +++ b/games-server/minecraft-server/files/README.gentoo @@ -0,0 +1,20 @@ +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-r1.initd b/games-server/minecraft-server/files/minecraft-server-r1.initd new file mode 100644 index 000000000000..872885ecd643 --- /dev/null +++ b/games-server/minecraft-server/files/minecraft-server-r1.initd @@ -0,0 +1,47 @@ +#!/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/files/minecraft-server.initd b/games-server/minecraft-server/files/minecraft-server.initd deleted file mode 100644 index 630c88871d76..000000000000 --- a/games-server/minecraft-server/files/minecraft-server.initd +++ /dev/null @@ -1,48 +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 - -java="${JAVA_HOME-/usr}"/bin/java -minecraft_jar="/usr/share/games/minecraft-server/minecraft-server.jar" -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}" - -command="screen" -command_args="-DmUS ${screen_name} ${java} ${MINECRAFT_OPTS} -jar ${minecraft_jar}" -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.12.2.ebuild b/games-server/minecraft-server/minecraft-server-1.12.2.ebuild deleted file mode 100644 index 5b0f749a4556..000000000000 --- a/games-server/minecraft-server/minecraft-server-1.12.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user - -DESCRIPTION="The official server for the sandbox video game Minecraft" -HOMEPAGE="https://www.minecraft.net/" -SRC_URI="https://s3.amazonaws.com/Minecraft.Download/versions/${PV}/minecraft_server.${PV}.jar -> ${P}.jar" - -LICENSE="Mojang" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="app-misc/screen - virtual/jre" - -RESTRICT="bindist mirror strip" - -S="${WORKDIR}" - -pkg_setup() { - enewgroup minecraft - enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft -} - -src_unpack() { - # Don't unpack that jar, just copy it to WORKDIR - cp "${DISTDIR}"/${A} "${WORKDIR}" || die -} - -src_install() { - insinto /usr/share/games/minecraft-server - insopts -o minecraft -g minecraft - newins minecraft-server-${PV}.jar minecraft-server.jar - - newinitd "${FILESDIR}"/minecraft-server.initd minecraft-server - newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server - - diropts -o minecraft -g minecraft - keepdir /var/lib/minecraft-server - keepdir /var/log/minecraft-server -} - -pkg_postinst() { - elog "This package provides an init script and a conf file." - elog "You don't have to modify those files directly," - elog "but instead you can make a symlink of that init script" - elog "and a copy of that conf file." - elog "You would do this for every server, you want to setup." - elog "" - elog "For example, you wan't to setup an world called 'gentoo'," - elog "you would do:" - elog "" - elog "cd /etc/init.d" - elog "ln -s minecraft-server minecraft-server.gentoo" - elog "" - elog "cd /etc/conf.d" - elog "cp minecraft-server minecraft-server.gentoo" - elog "" - elog "After that, make your settings in" - elog "/etc/conf.d/minecraft-server.gentoo." - elog "" - elog "If you don't make a symlink, but use the default scripts," - elog "your world will be called 'main'" -} diff --git a/games-server/minecraft-server/minecraft-server-1.13.ebuild b/games-server/minecraft-server/minecraft-server-1.13.ebuild new file mode 100644 index 000000000000..2ef64c02f1a4 --- /dev/null +++ b/games-server/minecraft-server/minecraft-server-1.13.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +MY_PV="d0caafb8438ebd206f99930cfaecfa6c9a13dca0" + +inherit readme.gentoo-r1 java-pkg-2 user + +DESCRIPTION="The official server for the sandbox video game" +HOMEPAGE="https://www.minecraft.net/" +SRC_URI="https://launcher.mojang.com/mc/game/${PV}/server/${MY_PV}/server.jar -> ${P}.jar" + +LICENSE="Mojang" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-misc/screen + >=virtual/jre-1.8" + +RESTRICT="bindist mirror strip" + +S="${WORKDIR}" + +pkg_setup() { + enewgroup minecraft + enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft +} + +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-r1.initd 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 +} + +pkg_postinst() { + readme.gentoo_print_elog +} -- cgit v1.2.3