From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2079E138350 for ; Tue, 4 Feb 2020 18:09:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE168E0848; Tue, 4 Feb 2020 18:09:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E9A9E07F9 for ; Tue, 4 Feb 2020 18:09:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3EF5434E743 for ; Tue, 4 Feb 2020 18:09:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AE209C for ; Tue, 4 Feb 2020 18:09:09 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1580838497.1b30f4cb34da0d573e81d5e0c9047a43cff6a497.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/files/, games-server/minecraft-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-server/minecraft-server/Manifest games-server/minecraft-server/files/minecraft-server.initd-r2 games-server/minecraft-server/minecraft-server-1.14.4.ebuild X-VCS-Directories: games-server/minecraft-server/ games-server/minecraft-server/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 1b30f4cb34da0d573e81d5e0c9047a43cff6a497 X-VCS-Branch: master Date: Tue, 4 Feb 2020 18:09:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: acb7ffe2-0240-4926-904c-5bfc0aa104ab X-Archives-Hash: a01c2b5023eafca35e312e9adc5b2afe commit: 1b30f4cb34da0d573e81d5e0c9047a43cff6a497 Author: Conrad Kostecki gentoo org> AuthorDate: Tue Feb 4 15:15:18 2020 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Feb 4 17:48:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b30f4cb games-server/minecraft-server: drop old version Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Conrad Kostecki gentoo.org> games-server/minecraft-server/Manifest | 1 - .../files/minecraft-server.initd-r2 | 47 ------------------ .../minecraft-server-1.14.4.ebuild | 57 ---------------------- 3 files changed, 105 deletions(-) diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest index 4bddfad1928..29a41498d75 100644 --- a/games-server/minecraft-server/Manifest +++ b/games-server/minecraft-server/Manifest @@ -1,2 +1 @@ -DIST minecraft-server-1.14.4.jar 35958734 BLAKE2B 058d6609296394e4714a159976d4de0261a552a919e33db1e54d97e3d2ee90cd4356b60190b807050d3c7ab336149d1c9be55093ba002735ccc6a162706c6ee3 SHA512 b3d2852c6fa1b996bbf2fa9fc1fb860c6bca5136bcc5ddd3d236d85789c6bce81620f6b2d69eaa10c41d020fe0bb54de2fa601b3df3093af2691853a4445e1f8 DIST minecraft-server-1.15.1.jar 36164938 BLAKE2B 21ee30c92b3060810fb766a54924b5273f44bfb906592770c101bed3f41cd65fc0cd05b9610fce805860f71088ccf89ac6cbf6a364eb8ca16047b39b8f0aa69f SHA512 4458daa6cd87b04ddbf0819dfc0538d24b8d08c529a94f1abff9b894d24ffb4eb3d0b23b8bfb088b2b6f43fb6f71d17700d9f80dab2ed56dc51c5bef329ba6bb diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r2 b/games-server/minecraft-server/files/minecraft-server.initd-r2 deleted file mode 100644 index ec659d145f8..00000000000 --- a/games-server/minecraft-server/files/minecraft-server.initd-r2 +++ /dev/null @@ -1,47 +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 - -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/minecraft-server-1.14.4.ebuild b/games-server/minecraft-server/minecraft-server-1.14.4.ebuild deleted file mode 100644 index cfddb597af2..00000000000 --- a/games-server/minecraft-server/minecraft-server-1.14.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT="3dc3d84a581f14691199cf6831b71ed1296a9fdf" - -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/screen - || ( - >=virtual/jre-1.8 - >=virtual/jdk-1.8 - ) -" - -RESTRICT="bindist mirror strip" - -S="${WORKDIR}" - -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.initd-r2 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 -}