1 |
commit: 5fc357c548d78ec5b4535645a70257f29f1456d8 |
2 |
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Sep 12 13:33:43 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 19 21:49:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc357c5 |
7 |
|
8 |
games-action/minetest: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
11 |
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/12909 |
13 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
14 |
|
15 |
games-action/minetest/Manifest | 1 - |
16 |
games-action/minetest/metadata.xml | 1 - |
17 |
games-action/minetest/minetest-0.4.17.1.ebuild | 136 ---------------------- |
18 |
games-action/minetest/minetest-5.0.1-r2.ebuild | 150 ------------------------- |
19 |
4 files changed, 288 deletions(-) |
20 |
|
21 |
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest |
22 |
index 7249d821afb..2228aa4c77c 100644 |
23 |
--- a/games-action/minetest/Manifest |
24 |
+++ b/games-action/minetest/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST minetest-0.4.17.1.tar.gz 7758675 BLAKE2B 93f5f1ce32b98bb78a6ae5bc2ab9110902e118480b37b8c9cf87f1c6aa986f379e1191e82d4a764fb2aa0a0747c113e80cd014e6a06e0a485a59e516c4644fc6 SHA512 9f84ae45ebe181cb1cd2dff6b71b558eb276472efdfcd73bd02a111b2761793d49681bdfbbeaccc28f4a2f49e15b80d04b78db2f2f728c852c188b0c96aae618 |
27 |
DIST minetest-5.0.1.tar.gz 8761122 BLAKE2B 888e29b956d66543dd506b8e7eadd2e9d37324aebd4f84989745090fe927e97355c2baa7d615f5e0f8e2a074724b89bdf5f807c297cce1bc8483e500b0248e22 SHA512 00f0c77c19eb9619387285e5dad690c8aa9969ff11c4de0bdae99ee6e9a4508a8c2f977837fc2e01aebc5d4c1a5191d4f56acb131182d73c8f50da1458695607 |
28 |
|
29 |
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml |
30 |
index be715192bea..8ca84936bcb 100644 |
31 |
--- a/games-action/minetest/metadata.xml |
32 |
+++ b/games-action/minetest/metadata.xml |
33 |
@@ -43,7 +43,6 @@ |
34 |
</maintainer> |
35 |
<use> |
36 |
<flag name="client">Build Minetest client</flag> |
37 |
- <flag name="jsoncpp">Enable using a system-wide JSONCPP</flag> |
38 |
<flag name="leveldb">Enable LevelDB backend</flag> |
39 |
<flag name="redis">Enable redis backend via <pkg>dev-libs/hiredis</pkg></flag> |
40 |
<flag name="server">Build Minetest server</flag> |
41 |
|
42 |
diff --git a/games-action/minetest/minetest-0.4.17.1.ebuild b/games-action/minetest/minetest-0.4.17.1.ebuild |
43 |
deleted file mode 100644 |
44 |
index b71ccc4d197..00000000000 |
45 |
--- a/games-action/minetest/minetest-0.4.17.1.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,136 +0,0 @@ |
48 |
-# Copyright 1999-2018 Gentoo Foundation |
49 |
-# Distributed under the terms of the GNU General Public License v2 |
50 |
- |
51 |
-EAPI=6 |
52 |
-inherit cmake-utils gnome2-utils user |
53 |
- |
54 |
-DESCRIPTION="An InfiniMiner/Minecraft inspired game" |
55 |
-HOMEPAGE="https://www.minetest.net" |
56 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
57 |
- |
58 |
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" |
59 |
-SLOT="0" |
60 |
-KEYWORDS="~amd64 ~x86" |
61 |
-IUSE="+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype" |
62 |
- |
63 |
-RDEPEND="dev-db/sqlite:3 |
64 |
- sys-libs/zlib |
65 |
- curl? ( net-misc/curl ) |
66 |
- !dedicated? ( |
67 |
- app-arch/bzip2 |
68 |
- >=dev-games/irrlicht-1.8-r2 |
69 |
- dev-libs/gmp:0= |
70 |
- media-libs/libpng:0= |
71 |
- virtual/jpeg:0 |
72 |
- virtual/opengl |
73 |
- x11-libs/libX11 |
74 |
- x11-libs/libXxf86vm |
75 |
- sound? ( |
76 |
- media-libs/libogg:= |
77 |
- media-libs/libvorbis:= |
78 |
- media-libs/openal:= |
79 |
- ) |
80 |
- truetype? ( media-libs/freetype:2 ) |
81 |
- ) |
82 |
- jsoncpp? ( dev-libs/jsoncpp ) |
83 |
- leveldb? ( dev-libs/leveldb:= ) |
84 |
- luajit? ( dev-lang/luajit:2 ) |
85 |
- ncurses? ( sys-libs/ncurses:0= ) |
86 |
- nls? ( virtual/libintl ) |
87 |
- postgres? ( >=dev-db/postgresql-9.5:= ) |
88 |
- redis? ( dev-libs/hiredis ) |
89 |
- spatial? ( sci-libs/libspatialindex )" |
90 |
-DEPEND="${RDEPEND} |
91 |
- >=dev-games/irrlicht-1.8-r2 |
92 |
- doc? ( |
93 |
- app-doc/doxygen |
94 |
- media-gfx/graphviz |
95 |
- ) |
96 |
- nls? ( sys-devel/gettext )" |
97 |
- |
98 |
-pkg_setup() { |
99 |
- if use server || use dedicated ; then |
100 |
- enewgroup ${PN} |
101 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} |
102 |
- fi |
103 |
-} |
104 |
- |
105 |
-src_prepare() { |
106 |
- cmake-utils_src_prepare |
107 |
- # set paths |
108 |
- sed \ |
109 |
- -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \ |
110 |
- -e "s#@GROUP@#${PN}#g" \ |
111 |
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die |
112 |
-} |
113 |
- |
114 |
-src_configure() { |
115 |
- local mycmakeargs=( |
116 |
- -DBUILD_CLIENT=$(usex !dedicated) |
117 |
- -DCUSTOM_BINDIR="${EPREFIX}/usr/bin" |
118 |
- -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" |
119 |
- -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}" |
120 |
- -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale" |
121 |
- -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" |
122 |
- -DENABLE_CURL=$(usex curl) |
123 |
- -DENABLE_CURSES=$(usex ncurses) |
124 |
- -DENABLE_FREETYPE=$(usex truetype) |
125 |
- -DENABLE_GETTEXT=$(usex nls) |
126 |
- -DENABLE_GLES=0 |
127 |
- -DENABLE_LEVELDB=$(usex leveldb) |
128 |
- -DENABLE_LUAJIT=$(usex luajit) |
129 |
- -DENABLE_POSTGRESQL=$(usex postgres) |
130 |
- -DENABLE_REDIS=$(usex redis) |
131 |
- -DENABLE_SPATIAL=$(usex spatial) |
132 |
- -DENABLE_SOUND=$(usex sound) |
133 |
- -DENABLE_SYSTEM_JSONCPP=$(usex jsoncpp) |
134 |
- -DRUN_IN_PLACE=0 |
135 |
- ) |
136 |
- |
137 |
- use dedicated && mycmakeargs+=( |
138 |
- -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht" |
139 |
- ) |
140 |
- |
141 |
- cmake-utils_src_configure |
142 |
-} |
143 |
- |
144 |
-src_compile() { |
145 |
- cmake-utils_src_compile |
146 |
- |
147 |
- if use doc ; then |
148 |
- cmake-utils_src_compile doc |
149 |
- HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. ) |
150 |
- fi |
151 |
-} |
152 |
- |
153 |
-src_install() { |
154 |
- cmake-utils_src_install |
155 |
- |
156 |
- if use server || use dedicated ; then |
157 |
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server |
158 |
- newconfd "${T}"/minetestserver.confd minetest-server |
159 |
- fi |
160 |
-} |
161 |
- |
162 |
-pkg_postinst() { |
163 |
- gnome2_icon_cache_update |
164 |
- |
165 |
- if ! use dedicated ; then |
166 |
- elog |
167 |
- elog "optional dependencies:" |
168 |
- elog " games-action/minetest_game (official mod)" |
169 |
- elog |
170 |
- fi |
171 |
- |
172 |
- if use server || use dedicated ; then |
173 |
- elog |
174 |
- elog "Configure your server via /etc/conf.d/minetest-server" |
175 |
- elog "The user \"minetest\" is created with /var/lib/${PN} homedir." |
176 |
- elog "Default logfile is ~/minetest-server.log" |
177 |
- elog |
178 |
- fi |
179 |
-} |
180 |
- |
181 |
-pkg_postrm() { |
182 |
- gnome2_icon_cache_update |
183 |
-} |
184 |
|
185 |
diff --git a/games-action/minetest/minetest-5.0.1-r2.ebuild b/games-action/minetest/minetest-5.0.1-r2.ebuild |
186 |
deleted file mode 100644 |
187 |
index 072c5eda672..00000000000 |
188 |
--- a/games-action/minetest/minetest-5.0.1-r2.ebuild |
189 |
+++ /dev/null |
190 |
@@ -1,150 +0,0 @@ |
191 |
-# Copyright 1999-2019 Gentoo Authors |
192 |
-# Distributed under the terms of the GNU General Public License v2 |
193 |
- |
194 |
-EAPI=7 |
195 |
- |
196 |
-inherit cmake-utils user xdg |
197 |
- |
198 |
-DESCRIPTION="An InfiniMiner/Minecraft inspired game" |
199 |
-HOMEPAGE="https://www.minetest.net" |
200 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
201 |
- |
202 |
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" |
203 |
-SLOT="0" |
204 |
-KEYWORDS="~amd64 ~x86" |
205 |
-IUSE="+client +curl doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype" |
206 |
-REQUIRED_USE="|| ( client server )" |
207 |
- |
208 |
-RDEPEND=" |
209 |
- dev-db/sqlite:3 |
210 |
- dev-libs/gmp:0= |
211 |
- dev-libs/jsoncpp:= |
212 |
- sys-libs/zlib |
213 |
- client? ( |
214 |
- app-arch/bzip2 |
215 |
- dev-games/irrlicht |
216 |
- media-libs/libpng:0= |
217 |
- virtual/jpeg:0 |
218 |
- virtual/opengl |
219 |
- x11-libs/libX11 |
220 |
- x11-libs/libXxf86vm |
221 |
- sound? ( |
222 |
- media-libs/libogg:= |
223 |
- media-libs/libvorbis:= |
224 |
- media-libs/openal:= |
225 |
- ) |
226 |
- truetype? ( media-libs/freetype:2 ) |
227 |
- ) |
228 |
- curl? ( net-misc/curl ) |
229 |
- leveldb? ( dev-libs/leveldb:= ) |
230 |
- luajit? ( dev-lang/luajit:2 ) |
231 |
- ncurses? ( sys-libs/ncurses:0= ) |
232 |
- nls? ( virtual/libintl ) |
233 |
- postgres? ( >=dev-db/postgresql-9.5:= ) |
234 |
- redis? ( dev-libs/hiredis ) |
235 |
- spatial? ( sci-libs/libspatialindex )" |
236 |
-DEPEND="${RDEPEND}" |
237 |
-BDEPEND=" |
238 |
- doc? ( |
239 |
- app-doc/doxygen |
240 |
- media-gfx/graphviz |
241 |
- ) |
242 |
- nls? ( sys-devel/gettext )" |
243 |
- |
244 |
-pkg_setup() { |
245 |
- if use server ; then |
246 |
- enewgroup ${PN} |
247 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} |
248 |
- fi |
249 |
-} |
250 |
- |
251 |
-src_prepare() { |
252 |
- cmake-utils_src_prepare |
253 |
- # set paths |
254 |
- sed \ |
255 |
- -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \ |
256 |
- -e "s#@GROUP@#${PN}#g" \ |
257 |
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die |
258 |
- |
259 |
- # remove bundled gmp/jsoncpp |
260 |
- rm -rf lib/{gmp,jsoncpp} || die |
261 |
-} |
262 |
- |
263 |
-src_configure() { |
264 |
- local mycmakeargs=( |
265 |
- -DBUILD_CLIENT=$(usex client) |
266 |
- -DBUILD_SERVER=$(usex server) |
267 |
- -DCUSTOM_BINDIR="${EPREFIX}/usr/bin" |
268 |
- -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" |
269 |
- -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}" |
270 |
- -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale" |
271 |
- -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" |
272 |
- -DENABLE_CURL=$(usex curl) |
273 |
- -DENABLE_CURSES=$(usex ncurses) |
274 |
- -DENABLE_FREETYPE=$(usex truetype) |
275 |
- -DENABLE_GETTEXT=$(usex nls) |
276 |
- -DENABLE_GLES=0 |
277 |
- -DENABLE_LEVELDB=$(usex leveldb) |
278 |
- -DENABLE_LUAJIT=$(usex luajit) |
279 |
- -DENABLE_POSTGRESQL=$(usex postgres) |
280 |
- -DENABLE_REDIS=$(usex redis) |
281 |
- -DENABLE_SPATIAL=$(usex spatial) |
282 |
- -DENABLE_SOUND=$(usex sound) |
283 |
- -DENABLE_SYSTEM_JSONCPP=1 |
284 |
- -DRUN_IN_PLACE=0 |
285 |
- ) |
286 |
- |
287 |
- use server && mycmakeargs+=( |
288 |
- -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht" |
289 |
- ) |
290 |
- |
291 |
- cmake-utils_src_configure |
292 |
-} |
293 |
- |
294 |
-src_compile() { |
295 |
- cmake-utils_src_compile |
296 |
- |
297 |
- if use doc ; then |
298 |
- cmake-utils_src_compile doc |
299 |
- HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) |
300 |
- fi |
301 |
-} |
302 |
- |
303 |
-src_install() { |
304 |
- cmake-utils_src_install |
305 |
- |
306 |
- if use server ; then |
307 |
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server |
308 |
- newconfd "${T}"/minetestserver.confd minetest-server |
309 |
- fi |
310 |
-} |
311 |
- |
312 |
-pkg_postinst() { |
313 |
- xdg_pkg_postinst |
314 |
- |
315 |
- if use client ; then |
316 |
- elog |
317 |
- elog "optional dependencies:" |
318 |
- elog " games-action/minetest_game (official mod)" |
319 |
- elog |
320 |
- fi |
321 |
- |
322 |
- if use server ; then |
323 |
- elog |
324 |
- elog "Configure your server via /etc/conf.d/minetest-server" |
325 |
- elog "The user \"minetest\" is created with /var/lib/${PN} homedir." |
326 |
- elog "Default logfile is ~/minetest-server.log" |
327 |
- elog |
328 |
- fi |
329 |
- |
330 |
- elog |
331 |
- elog "The version 5.x series is not compatible to the version 0.4 series." |
332 |
- elog "This applies to clients and servers, other content such as mods," |
333 |
- elog "texture packs and worlds is unaffected and backwards-compatible" |
334 |
- elog "as usual." |
335 |
- elog |
336 |
-} |
337 |
- |
338 |
-pkg_postrm() { |
339 |
- xdg_pkg_postrm |
340 |
-} |