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-simulation/dangerdeep/, games-simulation/dangerdeep/files/
Date: Sat, 28 Jul 2018 12:06:33
Message-Id: 1532779342.abf18fe077ccbd1638960f36fae854631bc631b6.mgorny@gentoo
1 commit: abf18fe077ccbd1638960f36fae854631bc631b6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 28 12:02:22 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 28 12:02:22 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf18fe0
7
8 games-simulation/dangerdeep: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/630576
11
12 games-simulation/dangerdeep/Manifest | 2 -
13 .../dangerdeep/dangerdeep-0.3.0.ebuild | 63 -----------------
14 .../dangerdeep/files/dangerdeep-0.3.0-build.patch | 39 -----------
15 .../dangerdeep/files/dangerdeep-0.3.0-gcc43.patch | 80 ----------------------
16 .../dangerdeep/files/dangerdeep-0.3.0-gcc44.patch | 20 ------
17 .../dangerdeep/files/dangerdeep-0.3.0-gcc47.patch | 10 ---
18 .../dangerdeep/files/dangerdeep-0.3.0-gcc6.patch | 38 ----------
19 games-simulation/dangerdeep/metadata.xml | 11 ---
20 profiles/package.mask | 4 --
21 9 files changed, 267 deletions(-)
22
23 diff --git a/games-simulation/dangerdeep/Manifest b/games-simulation/dangerdeep/Manifest
24 deleted file mode 100644
25 index 73519e3f51f..00000000000
26 --- a/games-simulation/dangerdeep/Manifest
27 +++ /dev/null
28 @@ -1,2 +0,0 @@
29 -DIST dangerdeep-0.3.0.tar.gz 1100972 BLAKE2B 5f0de6c1e37759a480a8d6f835efb6dba96321697fb5a15559d35cb27a35356c4a307bf1138c237af1722365f18a9d341cf6cab122c8ebe4f1bacc088abc666a SHA512 97d47654d6d3728365ec0f7955f360a35ad105442663f5dd05f0a37ae6ae67216eb33f183df788c3cd0ba9878dbef22d607ddac86bf43159e87ef1c2429b7f87
30 -DIST dangerdeep-data-0.3.0.zip 61914764 BLAKE2B a727364509e8dc166338bb0c587d48f0b2ffbf406fde94aecae7435b8b1707af128ec80b6c74f04de46eb56d48189f7b7149f20f6a1836e4547fa30aa4c2eb42 SHA512 c6d7de055abc77c1c61d0f999d885f44121934d66f89c8e4e55231cc20605ef679cd278bebadc879862e3da07d46bae3ab02f97d3ee4179762efd895e8f91b3e
31
32 diff --git a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild b/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
33 deleted file mode 100644
34 index 44122c119cf..00000000000
35 --- a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
36 +++ /dev/null
37 @@ -1,63 +0,0 @@
38 -# Copyright 1999-2017 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=5
42 -inherit eutils scons-utils games
43 -
44 -DESCRIPTION="a World War II German submarine simulation"
45 -HOMEPAGE="http://dangerdeep.sourceforge.net/"
46 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
47 - mirror://sourceforge/${PN}/${PN}-data-${PV}.zip"
48 -
49 -LICENSE="GPL-2 CC-BY-NC-ND-2.0"
50 -SLOT="0"
51 -KEYWORDS="~amd64 ~x86"
52 -IUSE="cpu_flags_x86_sse debug"
53 -
54 -RDEPEND="virtual/opengl
55 - virtual/glu
56 - sci-libs/fftw:3.0
57 - media-libs/libsdl[joystick,opengl,video]
58 - media-libs/sdl-mixer[vorbis]
59 - media-libs/sdl-image[jpeg,png]
60 - media-libs/sdl-net"
61 -DEPEND="${RDEPEND}
62 - app-arch/unzip"
63 -
64 -src_prepare() {
65 - epatch \
66 - "${FILESDIR}"/${P}-build.patch \
67 - "${FILESDIR}"/${P}-gcc43.patch \
68 - "${FILESDIR}"/${P}-gcc47.patch \
69 - "${FILESDIR}"/${P}-gcc44.patch \
70 - "${FILESDIR}"/${P}-gcc6.patch
71 - sed -i -e "/console_log.txt/ s:fopen.*:stderr;:" src/system.cpp || die
72 -}
73 -
74 -src_compile() {
75 - local sse=-1
76 -
77 - if use cpu_flags_x86_sse ; then
78 - use amd64 && sse=3 || sse=1
79 - fi
80 -
81 - escons \
82 - usex86sse=${sse} \
83 - datadir="${GAMES_DATADIR}"/${PN} \
84 - $(use_scons debug)
85 -}
86 -
87 -src_install() {
88 - dogamesbin build/linux/${PN}
89 -
90 - insinto "${GAMES_DATADIR}"/${PN}
91 - doins -r ../data/*
92 -
93 - newicon dftd_icon.png ${PN}.png
94 - make_desktop_entry ${PN} "Danger from the Deep"
95 -
96 - dodoc ChangeLog CREDITS README
97 - doman doc/man/${PN}.6
98 -
99 - prepgamesdirs
100 -}
101
102 diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
103 deleted file mode 100644
104 index 367db1cfbb9..00000000000
105 --- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
106 +++ /dev/null
107 @@ -1,39 +0,0 @@
108 ---- SConstruct
109 -+++ SConstruct
110 -@@ -119,6 +119,7 @@
111 -
112 - else:
113 - print "Compiling for Unix/Posix/Linux Environment"
114 -+ SConsignFile()
115 - env = Environment(ENV = os.environ)
116 - env.Append(CPPPATH = ['/usr/include/SDL', '/usr/include/GL'])
117 - libpath = ['/usr/X11R6/lib']
118 -@@ -126,13 +127,18 @@
119 - sdllibs = ['SDL', 'SDL_image']
120 - ccflags = '-Wall `sdl-config --cflags` `pkg-config --cflags x11`'
121 - env.Append(LINKFLAGS = '`pkg-config --libs-only-L x11`')
122 -+ if os.environ.has_key('CXX'):
123 -+ env['CXX'] = os.environ['CXX']
124 -+ if os.environ.has_key('CXXFLAGS'):
125 -+ ccflags += os.environ['CXXFLAGS']
126 -+ if os.environ.has_key('LDFLAGS'):
127 -+ env.Append(LINKFLAGS = os.environ['LDFLAGS'])
128 - if (debug >= 3):
129 - ccflags += ' -g -pg -O3' # profiling
130 - elif (debug == 2):
131 - ccflags += ' -g -O0'
132 - env.Append(CPPDEFINES = ['DEBUG'])
133 - elif (debug == 1):
134 -- ccflags += ' -g -O1'
135 - env.Append(CPPDEFINES = ['DEBUG'])
136 - elif (debug == -1):
137 - ccflags += ' -g -O3 -march=athlon-xp -mfpmath=sse -mmmx -msse -m3dnow'
138 -@@ -140,8 +144,6 @@
139 - ccflags += ' -g -O3 -march=athlon-xp -mfpmath=sse -mmmx -msse -m3dnow -ftree-vectorize -ftree-vectorizer-verbose=2'
140 - elif (debug == -3): # special g++4.0+ auto vectorization
141 - ccflags += ' -g -O3 -march=athlon64 -mfpmath=sse -mmmx -msse -msse2 -m3dnow -ftree-vectorize -ftree-vectorizer-verbose=2'
142 -- else:
143 -- ccflags += ' -g -O2' # debug symbols will be stripped by the linker for a debian package
144 - # choose specific architecture if requested
145 - if archflag != '':
146 - ccflags += ' -march=' + archflag
147
148 diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch
149 deleted file mode 100644
150 index 1588b0bbae0..00000000000
151 --- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch
152 +++ /dev/null
153 @@ -1,80 +0,0 @@
154 ---- src/bspline_test.cpp
155 -+++ src/bspline_test.cpp
156 -@@ -1,6 +1,7 @@
157 - // some test code for the 2d bsplines!
158 - #include "bspline.h"
159 - #include <fstream>
160 -+#include <cstdlib>
161 - using namespace std;
162 -
163 - double rnd() { return double(rand())/RAND_MAX; }
164 ---- src/convoy.h
165 -+++ src/convoy.h
166 -@@ -27,6 +27,7 @@
167 - #include "vector2.h"
168 - #include <new>
169 - #include <list>
170 -+#include <memory>
171 - class ship;
172 -
173 - ///\brief Grouping of ships and other objects with central control.
174 ---- src/date.cpp
175 -+++ src/date.cpp
176 -@@ -21,6 +21,7 @@
177 - // subsim (C)+(W) Markus Petermann and Thorsten Jordan. SEE LICENSE
178 -
179 - #include <iomanip>
180 -+#include <cstdlib>
181 - #include "date.h"
182 - #include "texts.h"
183 -
184 ---- src/ocean_wave_generator.h
185 -+++ src/ocean_wave_generator.h
186 -@@ -29,6 +29,7 @@
187 - #include "environment.h"
188 - #include <complex>
189 - #include <vector>
190 -+#include <cstdlib>
191 -
192 - // use float fftw (faster) or double (default) ?
193 - #ifdef WITH_FLOAT_FFTW
194 ---- src/ptrlist.h
195 -+++ src/ptrlist.h
196 -@@ -25,6 +25,7 @@
197 -
198 - #include <list>
199 - #include <stdexcept>
200 -+#include <memory>
201 -
202 - // same as std::list regarding the interface (partly), but handles pointers.
203 - template <class T>
204 ---- src/ptrvector.h
205 -+++ src/ptrvector.h
206 -@@ -25,6 +25,7 @@
207 -
208 - #include <vector>
209 - #include <stdexcept>
210 -+#include <memory>
211 -
212 - // same as std::vector regarding the interface, but handles pointers.
213 - template <class T>
214 ---- src/sea_object.h
215 -+++ src/sea_object.h
216 -@@ -27,6 +27,7 @@
217 - #include "ptrvector.h"
218 - #include <new>
219 - #include <stdexcept>
220 -+#include <memory>
221 -
222 - #include "vector3.h"
223 - #include "angle.h"
224 ---- src/widget.cpp
225 -+++ src/widget.cpp
226 -@@ -32,6 +32,7 @@
227 - #include "datadirs.h"
228 - #include <set>
229 - #include <sstream>
230 -+#include <algorithm>
231 - using std::vector;
232 - using std::list;
233 - using std::string;
234
235 diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch
236 deleted file mode 100644
237 index 23d3c470c90..00000000000
238 --- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch
239 +++ /dev/null
240 @@ -1,20 +0,0 @@
241 ---- src/date.cpp
242 -+++ src/date.cpp
243 -@@ -22,6 +22,7 @@
244 -
245 - #include <iomanip>
246 - #include <cstdlib>
247 -+#include <cstdio>
248 - #include "date.h"
249 - #include "texts.h"
250 -
251 ---- src/filehelper.cpp
252 -+++ src/filehelper.cpp
253 -@@ -23,6 +23,7 @@
254 - #include "filehelper.h"
255 - #include "error.h"
256 - #include <vector>
257 -+#include <cstdio>
258 - using namespace std;
259 -
260 - #ifdef WIN32
261
262 diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch
263 deleted file mode 100644
264 index 54adcec10da..00000000000
265 --- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch
266 +++ /dev/null
267 @@ -1,10 +0,0 @@
268 ---- src/faulthandler.h.old 2012-07-25 14:37:32.000000000 +0200
269 -+++ src/faulthandler.h 2012-07-25 14:38:16.000000000 +0200
270 -@@ -50,6 +50,7 @@
271 - #include <signal.h>
272 - #include <string>
273 - #include <sstream>
274 -+#include <unistd.h>
275 -
276 - // Note: use --export-dynamic as linker option or you won't get function names here.
277 -
278
279 diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch
280 deleted file mode 100644
281 index 1634aa763e4..00000000000
282 --- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch
283 +++ /dev/null
284 @@ -1,38 +0,0 @@
285 -Bug: https://bugs.gentoo.org/show_bug.cgi?id=610654
286 -Upstream Ticket: https://sourceforge.net/p/dangerdeep/patches/26/
287 -
288 ---- a/src/system.cpp
289 -+++ b/src/system.cpp
290 -@@ -178,7 +178,7 @@
291 - instance = this;
292 - }
293 -
294 --system::~system()
295 -+system::~system() DTOR_NOEXCEPT
296 - {
297 - if (!instance) {
298 - SDL_Quit();
299 ---- a/src/system.h
300 -+++ b/src/system.h
301 -@@ -52,6 +52,12 @@
302 - #define ASSERT(a,...)
303 - #endif
304 -
305 -+#if __cplusplus >= 201103L
306 -+#define DTOR_NOEXCEPT noexcept(false)
307 -+#else
308 -+#define DTOR_NOEXCEPT
309 -+#endif
310 -+
311 - class font;
312 - class texture;
313 -
314 -@@ -61,7 +67,7 @@
315 - public:
316 - enum button_type { left_button=0x1, right_button=0x2, middle_button=0x4, wheel_up=0x8, wheel_down=0x10 };
317 - system(double nearz_, double farz_, unsigned res_x=1024, unsigned res_y=768, bool fullscreen=true);
318 -- ~system();
319 -+ ~system() DTOR_NOEXCEPT;
320 - void set_video_mode(unsigned res_x_, unsigned res_y_, bool fullscreen);
321 - void swap_buffers();
322 -
323
324 diff --git a/games-simulation/dangerdeep/metadata.xml b/games-simulation/dangerdeep/metadata.xml
325 deleted file mode 100644
326 index 461e3ba8e89..00000000000
327 --- a/games-simulation/dangerdeep/metadata.xml
328 +++ /dev/null
329 @@ -1,11 +0,0 @@
330 -<?xml version="1.0" encoding="UTF-8"?>
331 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
332 -<pkgmetadata>
333 - <maintainer type="project">
334 - <email>games@g.o</email>
335 - <name>Gentoo Games Project</name>
336 - </maintainer>
337 - <upstream>
338 - <remote-id type="sourceforge">dangerdeep</remote-id>
339 - </upstream>
340 -</pkgmetadata>
341
342 diff --git a/profiles/package.mask b/profiles/package.mask
343 index 30cd715f8f9..a4b3b2fa67b 100644
344 --- a/profiles/package.mask
345 +++ b/profiles/package.mask
346 @@ -249,10 +249,6 @@ sci-physics/hoomd-blue
347 # (like soundconverter) instead (#629182). Removal in a month.
348 media-sound/gnac
349
350 -# Pacho Ramos <pacho@g.o> (17 Jun 2018)
351 -# Fails to run (#630576). Removal in a month.
352 -games-simulation/dangerdeep
353 -
354 # Pacho Ramos <pacho@g.o> (17 Jun 2018)
355 # Dead since 2013, not compatible with latest profiles (#642568). Removal in
356 # a month