1 |
commit: 16ba4dab8c9dd60b55e85b72b3a305f05ca6ecf5 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 3 07:47:53 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 3 08:20:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ba4dab |
7 |
|
8 |
games-server/minecraft-server: drop old version |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
12 |
|
13 |
games-server/minecraft-server/Manifest | 1 - |
14 |
games-server/minecraft-server/files/README.gentoo | 20 --------- |
15 |
.../minecraft-server/files/minecraft-server.confd | 7 ---- |
16 |
.../files/minecraft-server.initd-r3 | 47 --------------------- |
17 |
.../minecraft-server-1.16.1.ebuild | 48 ---------------------- |
18 |
5 files changed, 123 deletions(-) |
19 |
|
20 |
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest |
21 |
index 8c6ae129bfd..f7dc629e613 100644 |
22 |
--- a/games-server/minecraft-server/Manifest |
23 |
+++ b/games-server/minecraft-server/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST minecraft-server-1.16.1.jar 37968964 BLAKE2B 08c9f3f5b7c5618fd55b40e77a3ab92ed2d8cdf64771fe171292045ee611b6c549f0e732ed3dec2553f2219c219ff8f9b2187563717be14edbffa68ceb05b555 SHA512 8fa8bf001cb50e59351f58598fdbd4b7b13cee8d5a6ae7d4486f6259d419c8101123cb18efc96cac7c796ca98483d6d1e9ac3888d6b364d81b86927aee3f350d |
26 |
DIST minecraft-server-1.16.3.jar 37942656 BLAKE2B 1ed70ac476dd202797f46a4844519d816f17c272d0703791d74b651fa8ac4c343a6939b50c5a0230d5bf149a564af6c7603297f0b114ce9fd2487f4bebef1c7e SHA512 ef9956ec55638b54e21e3b504ba2d2ce1b9d09769b5e118a36fbf2d97bd84a5bb49adf9a07328ae3e1c9fd76fe3da0b7d56baaa77bdc55b99d0f45039ada2ac3 |
27 |
|
28 |
diff --git a/games-server/minecraft-server/files/README.gentoo b/games-server/minecraft-server/files/README.gentoo |
29 |
deleted file mode 100644 |
30 |
index ae8c62a9cbf..00000000000 |
31 |
--- a/games-server/minecraft-server/files/README.gentoo |
32 |
+++ /dev/null |
33 |
@@ -1,20 +0,0 @@ |
34 |
-This package provides an init script and a conf file. |
35 |
-You don't have to modify those files directly, |
36 |
-but instead you can make a symlink of that init script |
37 |
-and a copy of that conf file. |
38 |
-You would do this for every server, you want to setup. |
39 |
- |
40 |
-For example, you wan't to setup an world called 'gentoo', |
41 |
-you would do: |
42 |
- |
43 |
-cd /etc/init.d |
44 |
-ln -s minecraft-server minecraft-server.gentoo |
45 |
- |
46 |
-cd /etc/conf.d |
47 |
-cp minecraft-server minecraft-server.gentoo |
48 |
- |
49 |
-After that, make your settings in |
50 |
-/etc/conf.d/minecraft-server.gentoo. |
51 |
- |
52 |
-If you don't make a symlink, but use the default scripts, |
53 |
-your world will be called 'main'. |
54 |
|
55 |
diff --git a/games-server/minecraft-server/files/minecraft-server.confd b/games-server/minecraft-server/files/minecraft-server.confd |
56 |
deleted file mode 100644 |
57 |
index 700498e5aea..00000000000 |
58 |
--- a/games-server/minecraft-server/files/minecraft-server.confd |
59 |
+++ /dev/null |
60 |
@@ -1,7 +0,0 @@ |
61 |
-# Copyright 1999-2018 Gentoo Foundation |
62 |
-# Distributed under the terms of the GNU General Public License v2 |
63 |
- |
64 |
-# Java options for your started server |
65 |
-# You should at least define some memory settings (-Xms, -Xmx), |
66 |
-# for maximum memory, as the java default is far to low for Minecraft |
67 |
-MINECRAFT_OPTS="-Xms1024m -Xmx1024m" |
68 |
|
69 |
diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r3 b/games-server/minecraft-server/files/minecraft-server.initd-r3 |
70 |
deleted file mode 100644 |
71 |
index a76d6d23e67..00000000000 |
72 |
--- a/games-server/minecraft-server/files/minecraft-server.initd-r3 |
73 |
+++ /dev/null |
74 |
@@ -1,47 +0,0 @@ |
75 |
-#!/sbin/openrc-run |
76 |
-# Copyright 1999-2019 Gentoo Authors |
77 |
-# Distributed under the terms of the GNU General Public License v2 |
78 |
- |
79 |
-if [ "${SVCNAME}" = "minecraft-server" ]; then |
80 |
- instance="main" |
81 |
-else |
82 |
- instance="${SVCNAME#minecraft-server.}" |
83 |
-fi |
84 |
- |
85 |
-dtach_tmpfile="$(mktemp -u)" |
86 |
-minecraft_command="/usr/bin/minecraft-server" |
87 |
-minecraft_logs="/var/log/minecraft-server" |
88 |
-minecraft_logs_instance="${minecraft_logs}/${instance}" |
89 |
-minecraft_path="/var/lib/minecraft-server" |
90 |
-minecraft_path_instance="${minecraft_path}/${instance}" |
91 |
-name="Minecraft Server (World: ${instance})" |
92 |
-pidfile="/run/minecraft-server.${instance}.pid" |
93 |
-start_stop_daemon_args="--chdir ${minecraft_path_instance} --env JAVA_OPTS='${MINECRAFT_OPTS}'" |
94 |
- |
95 |
-command="/usr/bin/dtach" |
96 |
-command_background="true" |
97 |
-command_args="-N ${dtach_tmpfile} ${minecraft_command}" |
98 |
-command_group="minecraft" |
99 |
-command_user="minecraft" |
100 |
- |
101 |
-depend() { |
102 |
- use net |
103 |
-} |
104 |
- |
105 |
-start_pre() { |
106 |
- checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}" "${minecraft_path_instance}" |
107 |
- |
108 |
- checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path_instance}"/eula.txt |
109 |
- echo "eula=true" > "${minecraft_path_instance}"/eula.txt |
110 |
- |
111 |
- checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}" "${minecraft_logs_instance}" |
112 |
- |
113 |
- if [ ! -L "${minecraft_path_instance}"/logs ]; then |
114 |
- cd "${minecraft_path_instance}" && ln -s ../../../log/minecraft-server/"${instance}" logs |
115 |
- fi |
116 |
- |
117 |
- if [ -z "${MINECRAFT_OPTS}" ]; then |
118 |
- eerror "You must define MINECRAFT_OPTS in /etc/conf.d/minecraft.${SVCNAME}!" |
119 |
- return 1 |
120 |
- fi |
121 |
-} |
122 |
|
123 |
diff --git a/games-server/minecraft-server/minecraft-server-1.16.1.ebuild b/games-server/minecraft-server/minecraft-server-1.16.1.ebuild |
124 |
deleted file mode 100644 |
125 |
index 4c207ff1791..00000000000 |
126 |
--- a/games-server/minecraft-server/minecraft-server-1.16.1.ebuild |
127 |
+++ /dev/null |
128 |
@@ -1,48 +0,0 @@ |
129 |
-# Copyright 1999-2020 Gentoo Authors |
130 |
-# Distributed under the terms of the GNU General Public License v2 |
131 |
- |
132 |
-EAPI=7 |
133 |
- |
134 |
-EGIT_COMMIT="a412fd69db1f81db3f511c1463fd304675244077" |
135 |
- |
136 |
-inherit readme.gentoo-r1 java-pkg-2 |
137 |
- |
138 |
-DESCRIPTION="The official server for the sandbox video game" |
139 |
-HOMEPAGE="https://www.minecraft.net/" |
140 |
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar" |
141 |
- |
142 |
-LICENSE="Mojang" |
143 |
-SLOT="0" |
144 |
-KEYWORDS="amd64 x86" |
145 |
- |
146 |
-RDEPEND=" |
147 |
- acct-group/minecraft |
148 |
- acct-user/minecraft |
149 |
- app-misc/dtach |
150 |
- || ( |
151 |
- >=virtual/jre-1.8 |
152 |
- >=virtual/jdk-1.8 |
153 |
- ) |
154 |
-" |
155 |
- |
156 |
-RESTRICT="bindist mirror" |
157 |
- |
158 |
-S="${WORKDIR}" |
159 |
- |
160 |
-src_unpack() { |
161 |
- cp "${DISTDIR}"/${A} "${WORKDIR}" || die |
162 |
-} |
163 |
- |
164 |
-src_install() { |
165 |
- java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar |
166 |
- java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}" |
167 |
- |
168 |
- newinitd "${FILESDIR}"/minecraft-server.initd-r3 minecraft-server |
169 |
- newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server |
170 |
- |
171 |
- readme.gentoo_create_doc |
172 |
-} |
173 |
- |
174 |
-pkg_postinst() { |
175 |
- readme.gentoo_print_elog |
176 |
-} |