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: games-action/btanks/, games-action/btanks/files/, profiles/
Date: Mon, 26 Oct 2020 07:39:49
Message-Id: 1603697940.a7af8dd2c93642dc75f42ff31b6ce3f6e6701c01.mgorny@gentoo
1 commit: a7af8dd2c93642dc75f42ff31b6ce3f6e6701c01
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 07:32:27 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 07:39:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7af8dd2
7
8 games-action/btanks: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735532
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 games-action/btanks/Manifest | 1 -
14 games-action/btanks/btanks-0.9.8083.ebuild | 54 -----------
15 .../btanks/files/btanks-0.9.8083-gcc46.patch | 10 --
16 .../btanks/files/btanks-0.9.8083-gcc47.patch | 103 ---------------------
17 .../btanks/files/btanks-0.9.8083-gcc6.patch | 34 -------
18 .../btanks/files/btanks-0.9.8083-scons-blows.patch | 93 -------------------
19 games-action/btanks/metadata.xml | 19 ----
20 profiles/package.mask | 1 -
21 8 files changed, 315 deletions(-)
22
23 diff --git a/games-action/btanks/Manifest b/games-action/btanks/Manifest
24 deleted file mode 100644
25 index afcf2b05db9..00000000000
26 --- a/games-action/btanks/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST btanks-0.9.8083.tar.bz2 28754069 BLAKE2B c187fe1deca9cdb5efcbb279215c369542e1e5e1ce93b0cecac077733a1b56359caa9dd49629305c566d8c86da1f05a6f4f61d1e41888c6c8076c9494fe5df03 SHA512 beef8f480e4c20c4f3d29aaa63fd52b370b89cceb8a7dda92f0d0fa5517969abf1fce6b0109782300f1b5bb92cf3c599677b168cd66f3b44c2d2dd1742ce0241
30
31 diff --git a/games-action/btanks/btanks-0.9.8083.ebuild b/games-action/btanks/btanks-0.9.8083.ebuild
32 deleted file mode 100644
33 index 6036ed703de..00000000000
34 --- a/games-action/btanks/btanks-0.9.8083.ebuild
35 +++ /dev/null
36 @@ -1,54 +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 scons-utils games
42 -
43 -DESCRIPTION="Fast 2D tank arcade game with multiplayer and split-screen modes"
44 -HOMEPAGE="http://btanks.sourceforge.net/"
45 -SRC_URI="mirror://sourceforge/btanks/${P}.tar.bz2"
46 -
47 -LICENSE="GPL-2"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~x86"
50 -IUSE=""
51 -
52 -RDEPEND=">=dev-lang/lua-5.1:0
53 - media-libs/libsdl[joystick,video]
54 - media-libs/libvorbis
55 - virtual/opengl
56 - dev-libs/expat
57 - media-libs/smpeg
58 - media-libs/sdl-image[jpeg,png]
59 - media-libs/sdl-gfx"
60 -DEPEND="${RDEPEND}
61 - virtual/pkgconfig"
62 -
63 -src_prepare() {
64 - rm -rf sdlx/gfx
65 - epatch "${FILESDIR}"/${P}-scons-blows.patch \
66 - "${FILESDIR}"/${P}-gcc46.patch \
67 - "${FILESDIR}"/${P}-gcc47.patch \
68 - "${FILESDIR}"/${P}-gcc6.patch
69 -}
70 -
71 -src_compile() {
72 - escons \
73 - prefix="${GAMES_PREFIX}" \
74 - lib_dir="$(games_get_libdir)"/${PN} \
75 - plugins_dir="$(games_get_libdir)"/${PN} \
76 - resources_dir="${GAMES_DATADIR}"/${PN}
77 -}
78 -
79 -src_install() {
80 - dogamesbin build/release/engine/btanks
81 - newgamesbin build/release/editor/bted btanksed
82 - exeinto "$(games_get_libdir)"/${PN}
83 - doexe build/release/*/*.so
84 - insinto "${GAMES_DATADIR}"/${PN}
85 - doins -r data
86 - newicon engine/src/bt.xpm ${PN}.xpm
87 - make_desktop_entry ${PN} "Battle Tanks"
88 - dodoc ChangeLog *.txt
89 - prepgamesdirs
90 -}
91
92 diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch b/games-action/btanks/files/btanks-0.9.8083-gcc46.patch
93 deleted file mode 100644
94 index 367c33cc6f2..00000000000
95 --- a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch
96 +++ /dev/null
97 @@ -1,10 +0,0 @@
98 ---- engine/sl08/sl08.h.old 2011-04-19 17:20:34.055776870 +0200
99 -+++ engine/sl08/sl08.h 2011-04-19 17:20:59.471398921 +0200
100 -@@ -22,6 +22,7 @@
101 - /* DO NOT MODIFY THIS FILE: IT'S AUTOGENERATED */
102 -
103 - #include <list>
104 -+#include <cstddef>
105 -
106 - #ifndef NULL
107 - #define NULL ((void*) 0)
108
109 diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
110 deleted file mode 100644
111 index 13a4cf3723a..00000000000
112 --- a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
113 +++ /dev/null
114 @@ -1,103 +0,0 @@
115 ---- mrt/base_file.h.old 2012-10-08 10:16:43.941487723 +0200
116 -+++ mrt/base_file.h 2012-10-08 10:18:55.788771445 +0200
117 -@@ -20,6 +20,7 @@
118 - */
119 -
120 - #include <string>
121 -+#include <unistd.h>
122 - #include "export_mrt.h"
123 -
124 - namespace mrt {
125 ---- math/range_list.h.old 2012-10-08 09:49:34.283887937 +0200
126 -+++ math/range_list.h 2012-10-08 09:50:36.258212096 +0200
127 -@@ -53,14 +53,14 @@
128 - return;
129 - }
130 -
131 -- typename parent_type::iterator i = lower_bound(value);
132 -+ typename parent_type::iterator i = this->lower_bound(value);
133 - if (i != parent_type::end()) {
134 - if (i->first == value)
135 - return;
136 -
137 - if (value + 1 == i->first) {
138 - T e = i->second;
139 -- erase(i);
140 -+ this->erase(i);
141 - i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
142 - i = pack_left(i);
143 - }
144 ---- engine/sl08/sl08.h.old 2012-10-04 09:50:37.845681514 +0200
145 -+++ engine/sl08/sl08.h 2012-10-08 09:58:32.873166723 +0200
146 -@@ -272,7 +272,7 @@
147 - inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
148 -
149 - inline void assign(object_type *o, func_t f) { object = o; func = f; }
150 -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
151 -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
152 -
153 - inline return_type operator() (arg1_type a1) const {
154 - return (object->*func) (a1) ;
155 -@@ -293,7 +293,7 @@
156 - inline slot1 () : object(NULL), func(NULL) {}
157 - inline slot1 (object_type *object, func_t func) : object(object), func(func) {}
158 - inline void assign(object_type *o, func_t f) { object = o; func = f; }
159 -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
160 -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
161 -
162 - inline void operator() (arg1_type a1) const {
163 - (object->*func) (a1);
164 -@@ -447,7 +447,7 @@
165 - inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
166 -
167 - inline void assign(object_type *o, func_t f) { object = o; func = f; }
168 -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
169 -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
170 -
171 - inline return_type operator() (arg1_type a1, arg2_type a2) const {
172 - return (object->*func) (a1, a2) ;
173 -@@ -468,7 +468,7 @@
174 - inline slot2 () : object(NULL), func(NULL) {}
175 - inline slot2 (object_type *object, func_t func) : object(object), func(func) {}
176 - inline void assign(object_type *o, func_t f) { object = o; func = f; }
177 -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
178 -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
179 -
180 - inline void operator() (arg1_type a1, arg2_type a2) const {
181 - (object->*func) (a1, a2);
182 -@@ -643,7 +643,7 @@
183 - inline slot3 () : object(NULL), func(NULL) {}
184 - inline slot3 (object_type *object, func_t func) : object(object), func(func) {}
185 - inline void assign(object_type *o, func_t f) { object = o; func = f; }
186 -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
187 -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
188 -
189 - inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const {
190 - (object->*func) (a1, a2, a3);
191 -@@ -797,7 +797,7 @@
192 - inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
193 -
194 - inline void assign(object_type *o, func_t f) { object = o; func = f; }
195 -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
196 -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
197 -
198 - inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const {
199 - return (object->*func) (a1, a2, a3, a4) ;
200 -@@ -818,7 +818,7 @@
201 - inline slot4 () : object(NULL), func(NULL) {}
202 - inline slot4 (object_type *object, func_t func) : object(object), func(func) {}
203 - inline void assign(object_type *o, func_t f) { object = o; func = f; }
204 -- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
205 -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
206 -
207 - inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const {
208 - (object->*func) (a1, a2, a3, a4);
209 -@@ -972,7 +972,7 @@
210 - inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
211 -
212 - inline void assign(object_type *o, func_t f) { object = o; func = f; }
213 -- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
214 -+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
215 -
216 - inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const {
217 - return (object->*func) (a1, a2, a3, a4, a5) ;
218
219 diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc6.patch b/games-action/btanks/files/btanks-0.9.8083-gcc6.patch
220 deleted file mode 100644
221 index 5f11379d805..00000000000
222 --- a/games-action/btanks/files/btanks-0.9.8083-gcc6.patch
223 +++ /dev/null
224 @@ -1,34 +0,0 @@
225 -Bug: https://bugs.gentoo.org/609692
226 -
227 ---- a/mrt/timespy.cpp
228 -+++ b/mrt/timespy.cpp
229 -@@ -43,7 +43,7 @@
230 - throw_io(("gettimeofday"));
231 - }
232 -
233 --TimeSpy::~TimeSpy() {
234 -+TimeSpy::~TimeSpy() DTOR_NOEXCEPT {
235 - struct timeval now;
236 - if (gettimeofday(&now, NULL) == -1)
237 - throw_io(("gettimeofday"));
238 ---- a/mrt/timespy.h
239 -+++ b/mrt/timespy.h
240 -@@ -37,11 +37,17 @@
241 - #include "fmt.h"
242 - #include "export_mrt.h"
243 -
244 -+#if __cplusplus >= 201103L
245 -+#define DTOR_NOEXCEPT noexcept(false)
246 -+#else
247 -+#define DTOR_NOEXCEPT
248 -+#endif
249 -+
250 - namespace mrt {
251 - class MRTAPI TimeSpy {
252 - public:
253 - TimeSpy(const std::string &message);
254 -- ~TimeSpy();
255 -+ ~TimeSpy() DTOR_NOEXCEPT;
256 - private:
257 - TimeSpy(const TimeSpy&);
258 - const TimeSpy& operator=(const TimeSpy&);
259
260 diff --git a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch
261 deleted file mode 100644
262 index 47ce410f0bf..00000000000
263 --- a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch
264 +++ /dev/null
265 @@ -1,93 +0,0 @@
266 ---- mrt/export_base.h.old 2010-01-09 17:38:47.000000000 +0100
267 -+++ mrt/export_base.h 2010-01-09 17:39:23.000000000 +0100
268 -@@ -1,7 +1,7 @@
269 - #ifndef MRT_EXPORT_MACRO_H__
270 - #define MRT_EXPORT_MACRO_H__
271 -
272 --// Shared library support
273 -+/* Shared library support */
274 - #ifdef _WINDOWS
275 -
276 - # pragma warning(disable:4251) /* needs to have dll-interface used by client */
277 ---- SConstruct.old 2010-01-09 17:43:36.000000000 +0100
278 -+++ SConstruct 2010-01-09 17:45:25.000000000 +0100
279 -@@ -50,7 +50,7 @@
280 - if os.environ.has_key('CC'):
281 - env['CC'] = os.environ['CC']
282 - if os.environ.has_key('CFLAGS'):
283 -- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
284 -+ env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
285 - if os.environ.has_key('CXX'):
286 - env['CXX'] = os.environ['CXX']
287 - if os.environ.has_key('CXXFLAGS'):
288 -@@ -91,19 +91,9 @@
289 - #env.Append(CPPDEFINES = ['NDEBUG'])
290 -
291 - else:
292 -- if env['gcc_visibility']:
293 -- env.Append(CCFLAGS=['-fvisibility=hidden']);
294 -- env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden']);
295 --
296 -- if debug:
297 -- env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
298 -- env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
299 -- else:
300 -- env.Append(CCFLAGS=['-O3'])
301 -- env.Append(CPPFLAGS=['-O3'])
302 -
303 -- env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
304 -- env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
305 -+ env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread'])
306 -+ env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread'])
307 -
308 -
309 - conf_env = env.Clone()
310 ---- sdlx/SConscript.old 2010-01-09 17:46:05.000000000 +0100
311 -+++ sdlx/SConscript 2010-01-09 17:46:55.000000000 +0100
312 -@@ -12,7 +12,7 @@
313 -
314 - env.MergeFlags(sdl_cflags, sdl_libs)
315 -
316 --libs = ['mrt', 'SDL', 'SDL_image']
317 -+libs = ['mrt', 'SDL', 'SDL_image', 'SDL_gfx']
318 -
319 - if sys.platform != "win32":
320 - c_map_env= env.Clone()
321 -@@ -35,7 +35,6 @@
322 - sdlx_sources = ['cursor.cpp', 'sdl_ex.cpp', 'surface.cpp', 'system.cpp', 'joystick.cpp',
323 - 'thread.cpp', 'mutex.cpp', 'semaphore.cpp', 'color.cpp',
324 - c_map, 'font.cpp', 'timer.cpp', 'module.cpp', 'file_rw.cpp',
325 -- 'gfx/SDL_rotozoom.c',
326 - ] # 'ttf.cpp',
327 -
328 - if sys.platform == 'win32':
329 ---- sdlx/surface.cpp.old 2010-01-09 17:47:33.000000000 +0100
330 -+++ sdlx/surface.cpp 2010-01-09 17:48:19.000000000 +0100
331 -@@ -425,7 +425,7 @@
332 - throw_sdl(("SDL_SetColorKey"));
333 - }
334 -
335 --#include "gfx/SDL_rotozoom.h"
336 -+#include <SDL_rotozoom.h>
337 -
338 - void Surface::rotozoom(const sdlx::Surface &src, double angle, double zoom, bool smooth) {
339 - if (src.isNull())
340 ---- sdlx/wrappers/glSDL.c.old 2010-01-09 17:48:50.000000000 +0100
341 -+++ sdlx/wrappers/glSDL.c 2010-01-09 17:49:23.000000000 +0100
342 -@@ -11,8 +11,6 @@
343 -
344 - #ifdef HAVE_OPENGL
345 -
346 --//#define LEAK_TRACKING
347 --
348 - #define DBG(x) /*error messages, warnings*/
349 - #define DBG2(x) /*texture allocation*/
350 - #define DBG3(x) /*chopping/tiling*/
351 -@@ -951,7 +949,6 @@
352 - }
353 - gl_doublebuf = flags & SDL_DOUBLEBUF;
354 - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, gl_doublebuf);
355 -- //SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, gl_doublebuf ? 1: 0);
356 -
357 - scale = 1;
358 -
359
360 diff --git a/games-action/btanks/metadata.xml b/games-action/btanks/metadata.xml
361 deleted file mode 100644
362 index 3574b919826..00000000000
363 --- a/games-action/btanks/metadata.xml
364 +++ /dev/null
365 @@ -1,19 +0,0 @@
366 -<?xml version="1.0" encoding="UTF-8"?>
367 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
368 -<pkgmetadata>
369 - <maintainer type="project">
370 - <email>games@g.o</email>
371 - <name>Gentoo Games Project</name>
372 - </maintainer>
373 - <longdescription lang="en">
374 -"Battle Tanks" is a funny battle on your desk, where you can choose one of three
375 -vehicles and eliminate your enemy using the whole arsenal of weapons. It has
376 -original cartoon-like graphics and cool music, it's fun and dynamic, it has
377 -several network modes for deathmatch and cooperative --- what else is needed to
378 -have fun with your friends? And all is packed and ready for you in "Battle
379 -Tanks".
380 -</longdescription>
381 - <upstream>
382 - <remote-id type="sourceforge">btanks</remote-id>
383 - </upstream>
384 -</pkgmetadata>
385
386 diff --git a/profiles/package.mask b/profiles/package.mask
387 index e9683f4ab7a..7a8a99453c1 100644
388 --- a/profiles/package.mask
389 +++ b/profiles/package.mask
390 @@ -260,7 +260,6 @@ dev-python/singledispatch
391 # from this list unless you actually port them to Python 3.
392 # Removal in 30 days. Please find relevant bugs on tracker bug #635934.
393 dev-libs/mongo-cxx-driver
394 -games-action/btanks
395
396 # Michał Górny <mgorny@g.o> (2020-09-25)
397 # PyPy3.7 alpha. Known to break a few packages. Masked until it