Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/visualboyadvance/, profiles/, ...
Date: Mon, 30 Jan 2017 08:28:14
Message-Id: 1485764811.e806269ddce77f1a66136695d9a52e12a74434cb.soap@gentoo
1 commit: e806269ddce77f1a66136695d9a52e12a74434cb
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 30 08:26:51 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 30 08:26:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e806269d
7
8 games-emulation/visualboyadvance: Remove from tree
9
10 games-emulation/visualboyadvance/Manifest | 2 -
11 .../visualboyadvance/files/1.7.2-gcc34.patch | 41 ------
12 .../visualboyadvance/files/1.7.2-gcc41.patch | 27 ----
13 .../visualboyadvance/files/1.7.2-homedir.patch | 11 --
14 .../files/visualboyadvance-1.7.2-gcc47.patch | 32 -----
15 .../files/visualboyadvance-1.7.2-glibc2.10.patch | 76 -----------
16 .../files/visualboyadvance-1.7.2-libpng15.patch | 11 --
17 .../files/visualboyadvance-1.7.2-libsigc26.patch | 17 ---
18 .../files/visualboyadvance-1.7.2-ovflfix.patch | 11 --
19 .../files/visualboyadvance-1.7.2-sys-types.patch | 12 --
20 .../files/visualboyadvance-1.7.2-uninit.patch | 13 --
21 .../files/visualboyadvance-1.7.2-zlib-1.2.6.patch | 12 --
22 .../files/visualboyadvance-1.7.2-zlib.patch | 145 ---------------------
23 games-emulation/visualboyadvance/metadata.xml | 11 --
24 .../visualboyadvance-1.7.2-r4.ebuild | 86 ------------
25 profiles/package.mask | 6 -
26 16 files changed, 513 deletions(-)
27
28 diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
29 deleted file mode 100644
30 index 4eb1022..00000000
31 --- a/games-emulation/visualboyadvance/Manifest
32 +++ /dev/null
33 @@ -1,2 +0,0 @@
34 -DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7 SHA512 58066cb438683c342c292c620cc87d9f2dff2b96849c46ff4c720146de5c7fb743588e42cd8de73e57866d4a191ccdadeab16da5e51da5a138199cc93ec4c932 WHIRLPOOL 05e8409f1d24022fc50ef44da462b6cc7866fa82b7de66c9cc68270912105e457a6ceeae7cb43476ae62a55c533a8e80c58d404d58cfb3b5e23b137f999c854b
35 -DIST visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2 2892 SHA256 cf61ddf1e806d3c3152a7102414929d96614319a84481333a9fca7dc640dd74b SHA512 420df630d5472c1f1f84eb27741e059ca340300f82747f1c03cf8e6931f2cd6658df2e1e32ad5f3ac2bac4a9769e7aa48399463d4d080fc91b929e956b198ad0 WHIRLPOOL 7db1965baf94626fa0f2bb7627d9afefa6531782a4a43d9812edecb25b5f8b719ca740a6425ce574ff6d917ea8bc8f4e3d6ce35450d93b123f95c2588401d29a
36
37 diff --git a/games-emulation/visualboyadvance/files/1.7.2-gcc34.patch b/games-emulation/visualboyadvance/files/1.7.2-gcc34.patch
38 deleted file mode 100644
39 index 5ce4802..00000000
40 --- a/games-emulation/visualboyadvance/files/1.7.2-gcc34.patch
41 +++ /dev/null
42 @@ -1,41 +0,0 @@
43 -diff -ur VisualBoyAdvance-1.7.2.orig/src/gtk/joypadconfig.h VisualBoyAdvance-1.7.2/src/gtk/joypadconfig.h
44 ---- VisualBoyAdvance-1.7.2.orig/src/gtk/joypadconfig.h 2004-05-10 16:43:21.000000000 +0200
45 -+++ VisualBoyAdvance-1.7.2/src/gtk/joypadconfig.h 2004-08-12 22:30:20.838039064 +0200
46 -@@ -22,8 +22,8 @@
47 -
48 - #include <vector>
49 -
50 --#include <libglademm.h>
51 - #include <gtkmm.h>
52 -+#include <libglademm.h>
53 -
54 - #ifndef GTKMM20
55 - # include "sigccompat.h"
56 -diff -ur VisualBoyAdvance-1.7.2.orig/src/gtk/main.cpp VisualBoyAdvance-1.7.2/src/gtk/main.cpp
57 ---- VisualBoyAdvance-1.7.2.orig/src/gtk/main.cpp 2004-05-21 18:02:35.000000000 +0200
58 -+++ VisualBoyAdvance-1.7.2/src/gtk/main.cpp 2004-08-12 22:39:08.633801912 +0200
59 -@@ -22,10 +22,10 @@
60 -
61 - #include <list>
62 -
63 --#include <libglademm.h>
64 - #include <gtkmm/main.h>
65 - #include <gtkmm/window.h>
66 - #include <gtkmm/messagedialog.h>
67 -+#include <libglademm.h>
68 -
69 - #include "images/vba-wm-pixbufs.h"
70 -
71 -diff -ur VisualBoyAdvance-1.7.2.orig/src/gtk/window.h VisualBoyAdvance-1.7.2/src/gtk/window.h
72 ---- VisualBoyAdvance-1.7.2.orig/src/gtk/window.h 2004-05-21 15:25:41.000000000 +0200
73 -+++ VisualBoyAdvance-1.7.2/src/gtk/window.h 2004-08-12 22:30:58.650290728 +0200
74 -@@ -23,8 +23,8 @@
75 - #include <sys/types.h>
76 - #include <stdarg.h>
77 -
78 --#include <libglademm.h>
79 - #include <gtkmm.h>
80 -+#include <libglademm.h>
81 -
82 - #ifndef GTKMM20
83 - # include "sigccompat.h"
84
85 diff --git a/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch b/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch
86 deleted file mode 100644
87 index 7f6cc07..00000000
88 --- a/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch
89 +++ /dev/null
90 @@ -1,27 +0,0 @@
91 -diff -ru /root/VisualBoyAdvance-1.7.2/src/prof/prof.cpp VisualBoyAdvance-1.7.2/src/prof/prof.cpp
92 ---- a/VisualBoyAdvance-1.7.2/src/prof/prof.cpp 2004-05-14 00:31:58.000000000 +1000
93 -+++ b/VisualBoyAdvance-1.7.2/src/prof/prof.cpp 2006-06-03 13:49:41.000000000 +1000
94 -@@ -266,7 +266,7 @@
95 - for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) {
96 - if(profWrite8(fd, GMON_TAG_CG_ARC) ||
97 - profWrite32(fd, (u32)frompc) ||
98 -- profWrite32(fd, (u32)tos[toindex].selfpc) ||
99 -+ profWrite32(fd, (u32)(intptr_t)tos[toindex].selfpc) ||
100 - profWrite32(fd, tos[toindex].count)) {
101 - systemMessage(0, "mcount: arc");
102 - fclose(fd);
103 -diff -ru /root/VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp
104 ---- a/VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp 2004-05-14 00:13:14.000000000 +1000
105 -+++ b/VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp 2006-06-03 13:49:57.000000000 +1000
106 -@@ -950,9 +950,9 @@
107 - {
108 - u32 address = 0;
109 - if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
110 -- address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
111 -+ address = 0x2000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&workRAM[0]);
112 - else
113 -- address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
114 -+ address = 0x3000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&internalRAM[0]);
115 -
116 - if(size == 2)
117 - printf("Breakpoint (on write) address %08x old:%08x new:%08x\n",
118
119 diff --git a/games-emulation/visualboyadvance/files/1.7.2-homedir.patch b/games-emulation/visualboyadvance/files/1.7.2-homedir.patch
120 deleted file mode 100644
121 index e93d32c..00000000
122 --- a/games-emulation/visualboyadvance/files/1.7.2-homedir.patch
123 +++ /dev/null
124 @@ -1,11 +0,0 @@
125 ---- src/sdl/SDL.cpp.orig 2004-08-15 02:43:28.232750688 -0400
126 -+++ src/sdl/SDL.cpp 2004-08-15 02:44:01.557684528 -0400
127 -@@ -887,7 +887,7 @@
128 -
129 - if(home != NULL) {
130 - fprintf(stderr, "Searching home directory: %s\n", home);
131 -- sprintf(path, "%s%c%s", home, FILE_SEP, name);
132 -+ sprintf(path, "%s%c.%s%c%s", home, FILE_SEP, EXE_NAME, FILE_SEP, name);
133 - f = fopen(path, "r");
134 - if(f != NULL)
135 - return f;
136
137 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-gcc47.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-gcc47.patch
138 deleted file mode 100644
139 index 816122f..00000000
140 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-gcc47.patch
141 +++ /dev/null
142 @@ -1,32 +0,0 @@
143 ---- src/sdl/debugger.cpp.old 2012-07-24 09:01:55.062533139 +0200
144 -+++ src/sdl/debugger.cpp 2012-07-24 09:03:31.927731884 +0200
145 -@@ -1280,7 +1280,8 @@
146 - if(n == 2) {
147 - u32 addr = 0;
148 - sscanf(args[1], "%x", &addr);
149 -- for(int i = 0; i < 16; i++) {
150 -+ int i;
151 -+ for(i = 0; i < 16; i++) {
152 - int a = debuggerReadByte(addr);
153 - int b = debuggerReadByte(addr+1);
154 - int c = debuggerReadByte(addr+2);
155 -@@ -1316,7 +1317,8 @@
156 - u32 addr = 0;
157 - sscanf(args[1], "%x", &addr);
158 - addr = addr & 0xfffffffe;
159 -- for(int i = 0; i < 16; i++) {
160 -+ int i;
161 -+ for(i = 0; i < 16; i++) {
162 - int a = debuggerReadByte(addr);
163 - int b = debuggerReadByte(addr+1);
164 - int c = debuggerReadByte(addr+2);
165 -@@ -1352,7 +1354,8 @@
166 - u32 addr = 0;
167 - sscanf(args[1], "%x", &addr);
168 - addr = addr & 0xfffffffc;
169 -- for(int i = 0; i < 16; i++) {
170 -+ int i;
171 -+ for(i = 0; i < 16; i++) {
172 - int a = debuggerReadByte(addr);
173 - int b = debuggerReadByte(addr+1);
174 - int c = debuggerReadByte(addr+2);
175
176 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-glibc2.10.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-glibc2.10.patch
177 deleted file mode 100644
178 index 5211b36..00000000
179 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-glibc2.10.patch
180 +++ /dev/null
181 @@ -1,76 +0,0 @@
182 ---- src/GBA.cpp
183 -+++ src/GBA.cpp
184 -@@ -1130,7 +1130,7 @@
185 - bool CPUIsZipFile(const char * file)
186 - {
187 - if(strlen(file) > 4) {
188 -- char * p = strrchr(file,'.');
189 -+ const char * p = strrchr(file,'.');
190 -
191 - if(p != NULL) {
192 - if(_stricmp(p, ".zip") == 0)
193 -@@ -1145,7 +1145,7 @@
194 - {
195 - cpuIsMultiBoot = false;
196 - if(strlen(file) > 4) {
197 -- char * p = strrchr(file,'.');
198 -+ const char * p = strrchr(file,'.');
199 -
200 - if(p != NULL) {
201 - if(_stricmp(p, ".gba") == 0)
202 -@@ -1169,7 +1169,7 @@
203 - bool CPUIsGBABios(const char * file)
204 - {
205 - if(strlen(file) > 4) {
206 -- char * p = strrchr(file,'.');
207 -+ const char * p = strrchr(file,'.');
208 -
209 - if(p != NULL) {
210 - if(_stricmp(p, ".gba") == 0)
211 -@@ -1189,7 +1189,7 @@
212 - bool CPUIsELF(const char *file)
213 - {
214 - if(strlen(file) > 4) {
215 -- char * p = strrchr(file,'.');
216 -+ const char * p = strrchr(file,'.');
217 -
218 - if(p != NULL) {
219 - if(_stricmp(p, ".elf") == 0)
220 ---- src/Util.cpp
221 -+++ src/Util.cpp
222 -@@ -478,7 +478,7 @@
223 - {
224 - cpuIsMultiBoot = false;
225 - if(strlen(file) > 4) {
226 -- char * p = strrchr(file,'.');
227 -+ const char * p = strrchr(file,'.');
228 -
229 - if(p != NULL) {
230 - if(_stricmp(p, ".gba") == 0)
231 -@@ -502,7 +502,7 @@
232 - bool utilIsGBImage(const char * file)
233 - {
234 - if(strlen(file) > 4) {
235 -- char * p = strrchr(file,'.');
236 -+ const char * p = strrchr(file,'.');
237 -
238 - if(p != NULL) {
239 - if(_stricmp(p, ".gb") == 0)
240 -@@ -522,7 +522,7 @@
241 - bool utilIsZipFile(const char *file)
242 - {
243 - if(strlen(file) > 4) {
244 -- char * p = strrchr(file,'.');
245 -+ const char * p = strrchr(file,'.');
246 -
247 - if(p != NULL) {
248 - if(_stricmp(p, ".zip") == 0)
249 -@@ -552,7 +552,7 @@
250 - bool utilIsGzipFile(const char *file)
251 - {
252 - if(strlen(file) > 3) {
253 -- char * p = strrchr(file,'.');
254 -+ const char * p = strrchr(file,'.');
255 -
256 - if(p != NULL) {
257 - if(_stricmp(p, ".gz") == 0)
258
259 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch
260 deleted file mode 100644
261 index bee96dc..00000000
262 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch
263 +++ /dev/null
264 @@ -1,11 +0,0 @@
265 ---- src/Util.cpp
266 -+++ src/Util.cpp
267 -@@ -79,7 +79,7 @@
268 - return false;
269 - }
270 -
271 -- if(setjmp(png_ptr->jmpbuf)) {
272 -+ if(setjmp(png_jmpbuf(png_ptr))) {
273 - png_destroy_write_struct(&png_ptr,NULL);
274 - fclose(fp);
275 - return false;
276
277 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch
278 deleted file mode 100644
279 index bd98676..00000000
280 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch
281 +++ /dev/null
282 @@ -1,17 +0,0 @@
283 -From: Etienne Millon <me@×××××××.org>
284 -Subject: Remove deprecated header in sigccompat.h
285 -
286 -libsigc++ 2.5.2 removed the <sigc++/object.h> header as it was useless.
287 -Removing the #include directive makes the build succeed with later versions of
288 -libsigc++.
289 -
290 ---- a/src/gtk/sigccompat.h
291 -+++ b/src/gtk/sigccompat.h
292 -@@ -25,7 +25,6 @@
293 - #include <sigc++/connection.h>
294 -
295 - #include <sigc++/slot.h>
296 --#include <sigc++/object.h>
297 - #include <sigc++/functors/mem_fun.h>
298 -
299 -
300
301 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-ovflfix.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-ovflfix.patch
302 deleted file mode 100644
303 index e3a7d7b..00000000
304 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-ovflfix.patch
305 +++ /dev/null
306 @@ -1,11 +0,0 @@
307 ---- src/sdl/debugger.cpp.old 2010-11-02 15:37:53.000000000 +0100
308 -+++ src/sdl/debugger.cpp 2010-11-02 15:38:13.000000000 +0100
309 -@@ -1389,7 +1389,7 @@
310 - {
311 - char buffer[10];
312 - printf("Are you sure you want to quit (y/n)? ");
313 -- fgets(buffer, 1024, stdin);
314 -+ fgets(buffer, sizeof(buffer), stdin);
315 -
316 - if(buffer[0] == 'y' || buffer[0] == 'Y') {
317 - debugger = false;
318
319 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-sys-types.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-sys-types.patch
320 deleted file mode 100644
321 index 8f78d6e..00000000
322 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-sys-types.patch
323 +++ /dev/null
324 @@ -1,12 +0,0 @@
325 -diff --git a/src/expr.cpp b/src/expr.cpp
326 -index 25c68f6..47237cb 100644
327 ---- a/src/expr.cpp
328 -+++ b/src/expr.cpp
329 -@@ -19,6 +19,7 @@ namespace std {
330 - #include <memory.h>
331 - #include <stdlib.h>
332 - #include <string.h>
333 -+#include <sys/types.h>
334 - }
335 -
336 - using namespace std;
337
338 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch
339 deleted file mode 100644
340 index 5fabdf1..00000000
341 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch
342 +++ /dev/null
343 @@ -1,13 +0,0 @@
344 -diff -ru /root/VisualBoyAdvance-1.7.2/src/gtk/window.cpp VisualBoyAdvance-1.7.2/src/gtk/window.cpp
345 ---- a/VisualBoyAdvance-1.7.2/src/gtk/window.cpp 2004-05-14 00:31:58.000000000 +1000
346 -+++ b/VisualBoyAdvance-1.7.2/src/gtk/window.cpp 2007-03-17 14:57:22.000000000 -0500
347 -@@ -91,7 +91,8 @@
348 - m_iFilterIBMin (FirstFilterIB),
349 - m_iFilterIBMax (LastFilterIB),
350 - m_iJoypadMin (1),
351 -- m_iJoypadMax (4)
352 -+ m_iJoypadMax (4),
353 -+ m_poKeymap (NULL)
354 - {
355 - m_poXml = _poXml;
356 - m_poFileOpenDialog = NULL;
357
358 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib-1.2.6.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib-1.2.6.patch
359 deleted file mode 100644
360 index a24ddcb..00000000
361 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib-1.2.6.patch
362 +++ /dev/null
363 @@ -1,12 +0,0 @@
364 -diff -ur VisualBoyAdvance-1.7.2.orig/src/Util.cpp VisualBoyAdvance-1.7.2/src/Util.cpp
365 ---- VisualBoyAdvance-1.7.2.orig/src/Util.cpp 2004-05-20 10:42:37.000000000 -0700
366 -+++ VisualBoyAdvance-1.7.2/src/Util.cpp 2012-02-18 00:21:40.655194387 -0800
367 -@@ -984,7 +984,7 @@
368 -
369 - gzFile utilGzOpen(const char *file, const char *mode)
370 - {
371 -- utilGzWriteFunc = (int (*)(void *,void * const, unsigned int))gzwrite;
372 -+ utilGzWriteFunc = (int (*)(gzFile, void * const, unsigned int))gzwrite;
373 - utilGzReadFunc = gzread;
374 - utilGzCloseFunc = gzclose;
375 -
376
377 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib.patch
378 deleted file mode 100644
379 index d397676..00000000
380 --- a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-zlib.patch
381 +++ /dev/null
382 @@ -1,145 +0,0 @@
383 ---- src/gb/GB.cpp.old 2011-12-12 11:28:33.412463305 +0100
384 -+++ src/gb/GB.cpp 2011-12-12 11:29:09.592463481 +0100
385 -@@ -29,7 +29,6 @@
386 - #include "gbMemory.h"
387 - #include "gbSGB.h"
388 - #include "gbSound.h"
389 --#include "../unzip.h"
390 - #include "../Util.h"
391 -
392 - #ifdef __GNUC__
393 ---- src/sdl/TestEmu.cpp.old 2011-12-12 11:49:42.802469335 +0100
394 -+++ src/sdl/TestEmu.cpp 2011-12-12 11:49:57.682469414 +0100
395 -@@ -28,7 +28,7 @@
396 - #include "GBA.h"
397 - #include "debugger.h"
398 - #include "Sound.h"
399 --#include "unzip.h"
400 -+#include <minizip/unzip.h>
401 - #include "Util.h"
402 - #include "gb/GB.h"
403 - #include "gb/gbGlobals.h"
404 ---- ./src/sdl/SDL.cpp.old 2011-12-12 11:29:45.072463639 +0100
405 -+++ ./src/sdl/SDL.cpp 2011-12-12 11:29:56.372463698 +0100
406 -@@ -34,7 +34,7 @@
407 - #include "RTC.h"
408 - #include "Sound.h"
409 - #include "Text.h"
410 --#include "unzip.h"
411 -+#include <minizip/unzip.h>
412 - #include "Util.h"
413 - #include "gb/GB.h"
414 - #include "gb/gbGlobals.h"
415 ---- ./src/System.h.old 2011-12-12 11:27:56.382463126 +0100
416 -+++ ./src/System.h 2011-12-12 11:28:13.202463209 +0100
417 -@@ -20,7 +20,7 @@
418 - #ifndef VBA_SYSTEM_H
419 - #define VBA_SYSTEM_H
420 -
421 --#include "unzip.h"
422 -+#include <minizip/unzip.h>
423 -
424 - #ifndef NULL
425 - #define NULL 0
426 ---- src/memgzio.c.old 2011-12-12 11:37:12.912465774 +0100
427 -+++ src/memgzio.c 2011-12-12 11:42:25.682467264 +0100
428 -@@ -66,13 +66,13 @@
429 - } mem_stream;
430 -
431 -
432 --local gzFile gz_open OF((char *memory, const int available, const char *mode));
433 --local int do_flush OF((gzFile file, int flush));
434 --local int get_byte OF((mem_stream *s));
435 --local void check_header OF((mem_stream *s));
436 --local int destroy OF((mem_stream *s));
437 --local void putLong OF((MEMFILE *file, uLong x));
438 --local uLong getLong OF((mem_stream *s));
439 -+local gzFile gz_open _Z_OF((char *memory, const int available, const char *mode));
440 -+local int do_flush _Z_OF((gzFile file, int flush));
441 -+local int get_byte _Z_OF((mem_stream *s));
442 -+local void check_header _Z_OF((mem_stream *s));
443 -+local int destroy _Z_OF((mem_stream *s));
444 -+local void putLong _Z_OF((MEMFILE *file, uLong x));
445 -+local uLong getLong _Z_OF((mem_stream *s));
446 -
447 - local MEMFILE *memOpen(char *memory, int available, char mode)
448 - {
449 ---- src/GBA.cpp.old 2011-12-12 11:30:35.262463885 +0100
450 -+++ src/GBA.cpp 2011-12-12 11:30:47.402463941 +0100
451 -@@ -31,7 +31,7 @@
452 - #include "Sound.h"
453 - #include "Sram.h"
454 - #include "bios.h"
455 --#include "unzip.h"
456 -+#include <minizip/unzip.h>
457 - #include "Cheats.h"
458 - #include "NLS.h"
459 - #include "elf.h"
460 ---- win32/include/zlib/zutil.h.old 2011-12-12 11:35:21.282465241 +0100
461 -+++ win32/include/zlib/zutil.h 2011-12-12 12:00:51.712472515 +0100
462 -@@ -207,10 +207,10 @@
463 - #endif
464 -
465 -
466 --typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
467 -+typedef uLong (ZEXPORT *check_func) _Z_OF((uLong check, const Bytef *buf,
468 - uInt len));
469 --voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
470 --void zcfree OF((voidpf opaque, voidpf ptr));
471 -+voidpf zcalloc _Z_OF((voidpf opaque, unsigned items, unsigned size));
472 -+void zcfree _Z_OF((voidpf opaque, voidpf ptr));
473 -
474 - #define ZALLOC(strm, items, size) \
475 - (*((strm)->zalloc))((strm)->opaque, (items), (size))
476 ---- src/sdl/Makefile.am.old 2011-12-12 12:09:53.442475093 +0100
477 -+++ src/sdl/Makefile.am 2011-12-12 12:10:31.582475274 +0100
478 -@@ -71,11 +71,9 @@
479 - ../remote.cpp \
480 - ../scanline.cpp \
481 - ../simple2x.cpp \
482 -- ../thumb.h \
483 -- ../unzip.cpp \
484 -- ../unzip.h
485 -+ ../thumb.h
486 -
487 --VisualBoyAdvance_LDADD = @VBA_LIBS@ @SDL_LIBS@
488 -+VisualBoyAdvance_LDADD = @VBA_LIBS@ @SDL_LIBS@ -lminizip
489 -
490 - VisualBoyAdvance_DEPENDENCIES = @VBA_LIBS@
491 -
492 -@@ -143,11 +141,9 @@
493 - ../remote.cpp \
494 - ../scanline.cpp \
495 - ../simple2x.cpp \
496 -- ../thumb.h \
497 -- ../unzip.cpp \
498 -- ../unzip.h
499 -+ ../thumb.h
500 -
501 --TestEmu_LDADD = @VBA_LIBS@ @SDL_LIBS@
502 -+TestEmu_LDADD = @VBA_LIBS@ @SDL_LIBS@ -lminizip
503 -
504 - TestEmu_DEPENDENCIES = @VBA_LIBS@
505 -
506 ---- src/gtk/Makefile.am.old 2011-12-12 12:13:42.552476181 +0100
507 -+++ src/gtk/Makefile.am 2011-12-12 12:14:20.272476359 +0100
508 -@@ -26,7 +26,7 @@
509 - window.cpp \
510 - window.h
511 -
512 --gvba_LDADD = libgba.a @VBA_LIBS@ @GTKMM_LIBS@ @LIBINTL@ @SDL_LIBS@
513 -+gvba_LDADD = libgba.a @VBA_LIBS@ @GTKMM_LIBS@ @LIBINTL@ @SDL_LIBS@ -lminizip
514 -
515 - gvba_DEPENDENCIES = libgba.a @VBA_LIBS@
516 -
517 -@@ -99,9 +99,7 @@
518 - ../remote.cpp \
519 - ../scanline.cpp \
520 - ../simple2x.cpp \
521 -- ../thumb.h \
522 -- ../unzip.cpp \
523 -- ../unzip.h
524 -+ ../thumb.h
525 -
526 - libgba_a_CPPFLAGS = -DSDL
527 -
528
529 diff --git a/games-emulation/visualboyadvance/metadata.xml b/games-emulation/visualboyadvance/metadata.xml
530 deleted file mode 100644
531 index 1a42d48..00000000
532 --- a/games-emulation/visualboyadvance/metadata.xml
533 +++ /dev/null
534 @@ -1,11 +0,0 @@
535 -<?xml version="1.0" encoding="UTF-8"?>
536 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
537 -<pkgmetadata>
538 - <maintainer type="project">
539 - <email>games@g.o</email>
540 - <name>Gentoo Games Project</name>
541 - </maintainer>
542 - <upstream>
543 - <remote-id type="sourceforge">vba</remote-id>
544 - </upstream>
545 -</pkgmetadata>
546
547 diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
548 deleted file mode 100644
549 index 6957536..00000000
550 --- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
551 +++ /dev/null
552 @@ -1,86 +0,0 @@
553 -# Copyright 1999-2015 Gentoo Foundation
554 -# Distributed under the terms of the GNU General Public License v2
555 -# $Id$
556 -
557 -EAPI=5
558 -inherit eutils flag-o-matic autotools games
559 -
560 -DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
561 -HOMEPAGE="http://vba.ngemu.com/"
562 -SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz
563 - mirror://gentoo/${P}-deprecatedsigc++.patch.bz2"
564 -
565 -LICENSE="GPL-2"
566 -SLOT="0"
567 -KEYWORDS="amd64 ppc x86 ~x86-fbsd"
568 -IUSE="gtk cpu_flags_x86_mmx nls"
569 -
570 -RDEPEND="media-libs/libpng:0
571 - media-libs/libsdl[joystick,sound,video]
572 - sys-libs/zlib[minizip]
573 - gtk? (
574 - >=x11-libs/gtk+-2.4:2
575 - >=dev-cpp/gtkmm-2.4:2.4
576 - >=dev-cpp/libglademm-2.4:2.4
577 - >=dev-libs/libsigc++-2.6:2
578 - )
579 - nls? ( virtual/libintl )"
580 -DEPEND="${RDEPEND}
581 - virtual/pkgconfig
582 - cpu_flags_x86_mmx? ( dev-lang/nasm )
583 - nls? ( sys-devel/gettext )"
584 -
585 -S=${WORKDIR}/VisualBoyAdvance-${PV}
586 -
587 -src_prepare() {
588 - cat >> src/i386/2xSaImmx.asm <<-EOF
589 - %ifidn __OUTPUT_FORMAT__,elf
590 - section .note.GNU-stack noalloc noexec nowrite progbits
591 - %endif
592 - EOF
593 -
594 - epatch \
595 - "${FILESDIR}"/${PV}-homedir.patch \
596 - "${FILESDIR}"/${PV}-gcc34.patch \
597 - "${FILESDIR}"/${PV}-gcc41.patch \
598 - "${FILESDIR}"/${P}-gcc47.patch \
599 - "${WORKDIR}"/${P}-deprecatedsigc++.patch \
600 - "${FILESDIR}"/${P}-uninit.patch \
601 - "${FILESDIR}"/${P}-glibc2.10.patch \
602 - "${FILESDIR}"/${P}-ovflfix.patch \
603 - "${FILESDIR}"/${P}-libpng15.patch \
604 - "${FILESDIR}"/${P}-zlib.patch \
605 - "${FILESDIR}"/${P}-zlib-1.2.6.patch \
606 - "${FILESDIR}"/${P}-sys-types.patch \
607 - "${FILESDIR}"/${P}-libsigc26.patch
608 -
609 - mv configure.in configure.ac || die
610 - eautoreconf
611 -
612 - sed -i \
613 - -e 's:$(localedir):/usr/share/locale:' \
614 - -e 's:$(datadir)/locale:/usr/share/locale:' \
615 - $(find . -name 'Makefile.in*') || die
616 -}
617 -
618 -src_configure() {
619 - # -O3 causes GCC to behave badly and hog memory, bug #64670.
620 - replace-flags -O3 -O2
621 -
622 - append-cxxflags -std=c++11
623 -
624 - # Removed --enable-c-core as it *should* determine this based on arch
625 - egamesconf \
626 - $(use_with cpu_flags_x86_mmx mmx) \
627 - $(use_enable gtk gtk 2.4) \
628 - $(use_enable nls)
629 -}
630 -
631 -src_install() {
632 - default
633 - if use gtk ; then
634 - newicon src/gtk/images/vba-64.png ${PN}.png
635 - make_desktop_entry gvba VisualBoyAdvance
636 - fi
637 - prepgamesdirs
638 -}
639
640 diff --git a/profiles/package.mask b/profiles/package.mask
641 index 931c9f0..60eb4e9 100644
642 --- a/profiles/package.mask
643 +++ b/profiles/package.mask
644 @@ -316,12 +316,6 @@ dev-php/propel-runtime
645 =x11-misc/alock-94-r1
646 =x11-misc/alock-94-r2
647
648 -# David Seifert <soap@g.o> (29 Dec 2016)
649 -# Ancient codebase, maintenance nightmare, dead
650 -# upstream, games-emulation/vbam is spiritual successor
651 -# Removal in 30 days, #598607
652 -games-emulation/visualboyadvance
653 -
654 # Hans de Graaff <graaff@g.o> (13 Dec 2016)
655 # Mask Rails 4.1.x for removal.
656 # This version of Rails has not been supported upstream since Rails