Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, games-fps/aaquake2/, games-fps/aaquake2/files/
Date: Sat, 28 Jul 2018 11:52:19
Message-Id: 1532778617.77dfd2da408e488b21a07cb10ef1102642ca4f9e.mgorny@gentoo
1 commit: 77dfd2da408e488b21a07cb10ef1102642ca4f9e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 28 11:50:17 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 28 11:50:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77dfd2da
7
8 games-fps/aaquake2: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/654348
11
12 games-fps/aaquake2/Manifest | 2 -
13 games-fps/aaquake2/aaquake2-0.1.ebuild | 62 --------------
14 games-fps/aaquake2/files/0.1-gentoo.patch | 90 --------------------
15 games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch | 39 ---------
16 games-fps/aaquake2/files/aaquake2-0.1-glibc.patch | 22 -----
17 .../aaquake2/files/aaquake2-0.1-ldflags.patch | 97 ----------------------
18 games-fps/aaquake2/metadata.xml | 21 -----
19 profiles/package.mask | 5 --
20 8 files changed, 338 deletions(-)
21
22 diff --git a/games-fps/aaquake2/Manifest b/games-fps/aaquake2/Manifest
23 deleted file mode 100644
24 index fafb92e7fb7..00000000000
25 --- a/games-fps/aaquake2/Manifest
26 +++ /dev/null
27 @@ -1,2 +0,0 @@
28 -DIST q2source-3.21.zip 1477764 BLAKE2B afdeeff318e23397d24f9ecc68f4015b03d58d3f7794dd23febc4e285a916b2cf8c93b872a62a33dc1a4b7c2fff34ad92781e0320296cc13d4721b8cd5bf345a SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752
29 -DIST quake2-ref_softaa-0.1.tar.gz 12931 BLAKE2B b20644662b903e7604f53283008b54c86e83e7b1dd6b66a505bbaa41fdfaa3c783cbb73d320418595498b54ddc2f72e94d53096bc82cb173be9fcdd192dee2b9 SHA512 d5f7e46485084217f5cb8fdcfa360106eafbfac9dad03e4853367e9cf6857a9789ec4d37d3bca656730282649b3e33b0ab04d4c0a73de36f794d98f3c048401c
30
31 diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
32 deleted file mode 100644
33 index a7aa57c721b..00000000000
34 --- a/games-fps/aaquake2/aaquake2-0.1.ebuild
35 +++ /dev/null
36 @@ -1,62 +0,0 @@
37 -# Copyright 1999-2017 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=5
41 -inherit eutils games
42 -
43 -DESCRIPTION="text mode Quake II"
44 -HOMEPAGE="https://www.jfedor.org/aaquake2/"
45 -SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
46 - https://www.jfedor.org/aaquake2/quake2-ref_softaa-${PV}.tar.gz"
47 -
48 -LICENSE="GPL-2"
49 -SLOT="0"
50 -KEYWORDS="~x86"
51 -IUSE=""
52 -
53 -RDEPEND="media-libs/aalib"
54 -DEPEND="${RDEPEND}
55 - app-arch/unzip"
56 -
57 -S=${WORKDIR}/quake2-3.21/linux
58 -
59 -src_prepare() {
60 - cd .. && epatch \
61 - "${FILESDIR}"/${PV}-gentoo.patch \
62 - "${FILESDIR}"/${P}-gcc41.patch
63 - cd "${S}" && epatch \
64 - "${FILESDIR}"/${P}-glibc.patch \
65 - "${FILESDIR}"/${P}-ldflags.patch
66 - sed -i \
67 - -e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c || die
68 - sed -i \
69 - -e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
70 - sys_linux.c vid_so.c || die
71 -}
72 -
73 -src_compile() {
74 - mkdir -p releasei386-glibc/ref_soft
75 - emake -j1 \
76 - GENTOO_CFLAGS="${CFLAGS}" \
77 - GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
78 - build_release
79 -}
80 -
81 -src_install() {
82 - cd release* || die
83 -
84 - exeinto "$(games_get_libdir)"/${PN}
85 - doexe gamei386.so ref_softaa.so
86 - dosym ref_softaa.so "$(games_get_libdir)"/${PN}/ref_softx.so
87 - dosym ref_softaa.so "$(games_get_libdir)"/${PN}/ref_soft.so
88 - exeinto "$(games_get_libdir)"/${PN}/ctf
89 - doexe ctf/gamei386.so
90 -
91 - newgamesbin quake2 aaquake2
92 -
93 - insinto "${GAMES_SYSCONFDIR}"
94 - echo "$(games_get_libdir)"/${PN} > ${PN}.conf
95 - doins ${PN}.conf
96 -
97 - prepgamesdirs
98 -}
99
100 diff --git a/games-fps/aaquake2/files/0.1-gentoo.patch b/games-fps/aaquake2/files/0.1-gentoo.patch
101 deleted file mode 100644
102 index cc7bb1733f6..00000000000
103 --- a/games-fps/aaquake2/files/0.1-gentoo.patch
104 +++ /dev/null
105 @@ -1,90 +0,0 @@
106 ---- linux/Makefile.old
107 -+++ linux/Makefile
108 -@@ -54,7 +54,7 @@
109 - RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
110 - -fomit-frame-pointer -fexpensive-optimizations
111 - else
112 --RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \
113 -+RELEASE_CFLAGS=$(BASE_CFLAGS) -g $(GENTOO_CFLAGS) -DGENTOO_DATADIR=\\\"$(GENTOO_DATADIR)\\\" -O6 -ffast-math -funroll-loops \
114 - -fomit-frame-pointer -fexpensive-optimizations
115 - endif
116 -
117 -@@ -92,7 +92,7 @@
118 - #############################################################################
119 -
120 - ifeq ($(ARCH),axp)
121 --TARGETS=$(BUILDDIR)/q2ded \
122 -+TARGETS=\
123 - $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
124 - $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
125 - # $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \
126 -@@ -100,11 +100,7 @@
127 - else
128 - TARGETS=$(BUILDDIR)/quake2 \
129 - $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
130 -- $(BUILDDIR)/ref_soft.$(SHLIBEXT) \
131 -- $(BUILDDIR)/ref_softx.$(SHLIBEXT) \
132 - $(BUILDDIR)/ref_softaa.$(SHLIBEXT) \
133 -- $(BUILDDIR)/ref_gl.$(SHLIBEXT) \
134 -- $(BUILDDIR)/ref_glx.$(SHLIBEXT) \
135 - $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
136 - # $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \
137 - # $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT)
138 -@@ -125,9 +121,6 @@
139 - build_release:
140 - @-mkdir $(BUILD_RELEASE_DIR) \
141 - $(BUILD_RELEASE_DIR)/client \
142 -- $(BUILD_RELEASE_DIR)/ded \
143 -- $(BUILD_RELEASE_DIR)/ref_soft \
144 -- $(BUILD_RELEASE_DIR)/ref_gl \
145 - $(BUILD_RELEASE_DIR)/game \
146 - $(BUILD_RELEASE_DIR)/ctf \
147 - # $(BUILD_RELEASE_DIR)/xatrix \
148 ---- linux/sys_linux.c.old
149 -+++ linux/sys_linux.c
150 -@@ -220,7 +220,7 @@
151 - char curpath[MAX_OSPATH];
152 - char *path;
153 - #ifdef __i386__
154 -- const char *gamename = "gamei386.so";
155 -+ const char *gamename = "GENTOO_DIR/gamei386.so";
156 - #elif defined __alpha__
157 - const char *gamename = "gameaxp.so";
158 - #else
159 -@@ -250,6 +250,14 @@
160 - {
161 - Com_Printf ("LoadLibrary (%s)\n",name);
162 - break;
163 -+ } else {
164 -+ sprintf (name, "%s", gamename);
165 -+ game_library = dlopen (name, RTLD_LAZY );
166 -+ if (game_library)
167 -+ {
168 -+ Com_Printf ("LoadLibrary (%s)\n",name);
169 -+ break;
170 -+ }
171 - }
172 - }
173 -
174 ---- qcommon/files.c.old
175 -+++ qcommon/files.c
176 -@@ -865,7 +865,7 @@
177 - //
178 - // start up with baseq2 by default
179 - //
180 -- FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );
181 -+ FS_AddGameDirectory (va(BASEDIRNAME) );
182 -
183 - // any set gamedirs will be freed up to here
184 - fs_base_searchpaths = fs_searchpaths;
185 ---- qcommon/qcommon.h.old
186 -+++ qcommon/qcommon.h
187 -@@ -25,7 +25,7 @@
188 -
189 - #define VERSION 3.21
190 -
191 --#define BASEDIRNAME "baseq2"
192 -+#define BASEDIRNAME GENTOO_DATADIR
193 -
194 - #ifdef WIN32
195 -
196
197 diff --git a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
198 deleted file mode 100644
199 index bb2e8e5979e..00000000000
200 --- a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
201 +++ /dev/null
202 @@ -1,39 +0,0 @@
203 ---- game/g_local.h.old
204 -+++ game/g_local.h
205 -@@ -458,11 +458,6 @@
206 - extern int sm_meat_index;
207 - extern int snd_fry;
208 -
209 --extern int jacket_armor_index;
210 --extern int combat_armor_index;
211 --extern int body_armor_index;
212 --
213 --
214 - // means of death
215 - #define MOD_UNKNOWN 0
216 - #define MOD_BLASTER 1
217 ---- ctf/g_local.h.old
218 -+++ ctf/g_local.h
219 -@@ -466,11 +466,6 @@
220 - extern int sm_meat_index;
221 - extern int snd_fry;
222 -
223 --extern int jacket_armor_index;
224 --extern int combat_armor_index;
225 --extern int body_armor_index;
226 --
227 --
228 - // means of death
229 - #define MOD_UNKNOWN 0
230 - #define MOD_BLASTER 1
231 -@@ -556,10 +556,6 @@
232 -
233 - extern cvar_t *sv_maplist;
234 -
235 --//ZOID
236 --extern qboolean is_quad;
237 --//ZOID
238 --
239 - #define world (&g_edicts[0])
240 -
241 - // item spawnflags
242
243 diff --git a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
244 deleted file mode 100644
245 index 638e91b2c39..00000000000
246 --- a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
247 +++ /dev/null
248 @@ -1,22 +0,0 @@
249 ---- rw_aa.c.old
250 -+++ rw_aa.c
251 -@@ -61,7 +61,7 @@
252 - #include <signal.h>
253 - #include <sys/mman.h>
254 -
255 --#include <asm/io.h>
256 -+#include <sys/io.h>
257 -
258 - #include <aalib.h>
259 -
260 ---- rw_in_aa.c.old
261 -+++ rw_in_aa.c
262 -@@ -46,7 +46,7 @@
263 - #include <signal.h>
264 - #include <sys/mman.h>
265 -
266 --#include <asm/io.h>
267 -+#include <sys/io.h>
268 -
269 - #include <aalib.h>
270 -
271
272 diff --git a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
273 deleted file mode 100644
274 index dc2359ac48d..00000000000
275 --- a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
276 +++ /dev/null
277 @@ -1,97 +0,0 @@
278 ---- Makefile.old
279 -+++ Makefile
280 -@@ -59,7 +59,7 @@
281 - endif
282 -
283 - DEBUG_CFLAGS=$(BASE_CFLAGS) -g
284 --LDFLAGS=-ldl -lm
285 -+LDLIBS=-ldl -lm
286 - SVGALDFLAGS=-lvga -lm
287 - XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
288 - AALDFLAGS=-lm -laa
289 -@@ -195,7 +195,7 @@
290 - endif
291 -
292 - $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS)
293 -- $(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
294 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS)
295 -
296 - $(BUILDDIR)/client/cl_cin.o : $(CLIENT_DIR)/cl_cin.c
297 - $(DO_CC)
298 -@@ -374,7 +374,7 @@
299 - $(BUILDDIR)/ded/cd_null.o
300 -
301 - $(BUILDDIR)/q2ded : $(Q2DED_OBJS)
302 -- $(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS)
303 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS)
304 -
305 - $(BUILDDIR)/ded/cmd.o : $(COMMON_DIR)/cmd.c
306 - $(DO_DED_CC)
307 -@@ -503,7 +503,7 @@
308 - $(BUILDDIR)/game/m_flash.o
309 -
310 - $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
311 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
312 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
313 -
314 - $(BUILDDIR)/game/g_ai.o : $(GAME_DIR)/g_ai.c
315 - $(DO_SHLIB_CC)
316 -@@ -682,7 +682,7 @@
317 - $(BUILDDIR)/ctf/q_shared.o
318 -
319 - $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) : $(CTF_OBJS)
320 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
321 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
322 -
323 - $(BUILDDIR)/ctf/g_ai.o : $(CTF_DIR)/g_ai.c
324 - $(DO_SHLIB_CC)
325 -@@ -821,7 +821,7 @@
326 - $(BUILDDIR)/xatrix/q_shared.o
327 -
328 - $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) : $(XATRIX_OBJS)
329 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
330 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
331 -
332 - $(BUILDDIR)/xatrix/g_ai.o : $(XATRIX_DIR)/g_ai.c
333 - $(DO_SHLIB_CC)
334 -@@ -1048,7 +1048,7 @@
335 - $(BUILDDIR)/rogue/q_shared.o
336 -
337 - $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) : $(ROGUE_OBJS)
338 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
339 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
340 -
341 - $(BUILDDIR)/rogue/dm_ball.o : $(ROGUE_DIR)/dm_ball.c
342 - $(DO_SHLIB_CC)
343 -@@ -1291,15 +1291,15 @@
344 - $(BUILDDIR)/ref_soft/rw_in_aa.o
345 -
346 - $(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS)
347 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
348 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
349 - $(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS)
350 -
351 - $(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS)
352 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
353 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
354 - $(REF_SOFT_X11_OBJS) $(XLDFLAGS)
355 -
356 - $(BUILDDIR)/ref_softaa.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_AA_OBJS)
357 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
358 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
359 - $(REF_SOFT_AA_OBJS) $(AALDFLAGS)
360 -
361 - $(BUILDDIR)/ref_soft/r_aclip.o : $(REF_SOFT_DIR)/r_aclip.c
362 -@@ -1445,10 +1445,10 @@
363 - $(BUILDDIR)/ref_gl/gl_glx.o
364 -
365 - $(BUILDDIR)/ref_gl.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS)
366 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
367 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
368 -
369 - $(BUILDDIR)/ref_glx.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
370 -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
371 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
372 -
373 - $(BUILDDIR)/ref_gl/gl_draw.o : $(REF_GL_DIR)/gl_draw.c
374 - $(DO_GL_SHLIB_CC)
375
376 diff --git a/games-fps/aaquake2/metadata.xml b/games-fps/aaquake2/metadata.xml
377 deleted file mode 100644
378 index 0ac91211590..00000000000
379 --- a/games-fps/aaquake2/metadata.xml
380 +++ /dev/null
381 @@ -1,21 +0,0 @@
382 -<?xml version="1.0" encoding="UTF-8"?>
383 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
384 -<pkgmetadata>
385 -<maintainer type="project">
386 - <email>games@g.o</email>
387 - <name>Gentoo Games Project</name>
388 -</maintainer>
389 -<longdescription>
390 -aaquake2 - Text Mode Quake II
391 -
392 -What?
393 -Just what you heard - text mode Quake II.
394 -
395 -Why?
396 -Why not? You can watch TV in text mode, you can play DVDs in text mode,
397 -you can play Quake 1 in text mode. Quake II is the logical next step.
398 -
399 -Or, as the author of ttyquake put it, "If you have to ask why, you're
400 -not a member of the intended audience."
401 -</longdescription>
402 -</pkgmetadata>
403
404 diff --git a/profiles/package.mask b/profiles/package.mask
405 index 15fbacb53e0..8721d7ec4a0 100644
406 --- a/profiles/package.mask
407 +++ b/profiles/package.mask
408 @@ -319,11 +319,6 @@ games-emulation/kigb
409 # ebuild is needed (#654336). Removal in a month.
410 games-emulation/raine
411
412 -# Pacho Ramos <pacho@g.o> (17 Jun 2018)
413 -# Upstream dead for a long time, not compatible with amd64, people can use
414 -# quake2-icculus with aalib under SDL (#654348). Removal in a month.
415 -games-fps/aaquake2
416 -
417 # Mart Raudsepp <leio@g.o> (16 Jun 2018)
418 # No upstream (website disappeared), no upstream plugin maintainer,
419 # and pretty much a fringe format anyway.