Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/sdlmame/, games-emulation/sdlmame/files/
Date: Thu, 18 Feb 2016 18:30:11
Message-Id: 1455820151.fa416fb520e9ac382eb63baf9ce98b5cee5680ab.mr_bones_@gentoo
1 commit: fa416fb520e9ac382eb63baf9ce98b5cee5680ab
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 18 18:28:40 2016 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 18 18:29:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa416fb5
7
8 games-emulation/sdlmame: clean old; dropping support for ppc
9
10 Package-Manager: portage-2.2.26
11
12 games-emulation/sdlmame/Manifest | 4 -
13 games-emulation/sdlmame/files/mame-0.139.ini.in | 270 ---------------------
14 .../sdlmame/files/sdlmame-0.144-makefile.patch | 79 ------
15 .../sdlmame/files/sdlmame-0.144-no-opengl.patch | 11 -
16 .../sdlmame/files/sdlmame-0.148_p1-makefile.patch | 177 --------------
17 .../sdlmame/files/sdlmame-0.148_p1-no-opengl.patch | 12 -
18 .../sdlmame/files/sdlmame-0.149-QA.patch | 191 ---------------
19 .../files/sdlmame-0.149-debugger-linking.patch | 28 ---
20 .../sdlmame/files/sdlmame-0.149-no-opengl.patch | 19 --
21 .../sdlmame/files/sdlmame-0.149-system-lua.patch | 33 ---
22 games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild | 186 --------------
23 games-emulation/sdlmame/sdlmame-0.149.ebuild | 194 ---------------
24 12 files changed, 1204 deletions(-)
25
26 diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
27 index 80dcd95..27c42ad 100644
28 --- a/games-emulation/sdlmame/Manifest
29 +++ b/games-emulation/sdlmame/Manifest
30 @@ -1,5 +1 @@
31 DIST mame-0.168.zip 82770536 SHA256 f91e014c3d3bf3da790284a25437f231a84228a6adbf42db35ca34a57f8a3092 SHA512 14b0519682f8aeb2379cd29b9e0ad8f3c54866296ac158876435425b79c3bf19a2dc520df7a44fe301a8e8cbbc335185602f4998edf6e95324f527c50c72411e WHIRLPOOL 41ddbe191423e3653a52f7734cc85088f1c663fd9aefdbd00ceefbe86f27bde190d14505be7fa69f76c7a39c6bbb5ab196685c2e001c8517cb90f4f7f27e8a51
32 -DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a
33 -DIST mame0149s.zip 35160585 SHA256 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b SHA512 4b8bd72e93f71fdb52c643776ecefb87fe605effe3f8c1724156cf7fafb8107330d92914eb14208a170cd5a0ee2775e7ea8d8edd0b525a35bbb0d5514172c1c3 WHIRLPOOL c5821ffc0f640e93986cd88f9e530be36e5ba0405a5dbc69a5021c828248dc74541340d5d9d49ece19635b5239bbaeeeb93bad2800fc46e9f441d8ffd3751ca5
34 -DIST sdlmame-ui.bdf.gz 114727 SHA256 f2ec11dd926bbeae8647e68607107516a30790239464939f3e99a0f62fc7f17e SHA512 67ba1bc632c1ac51b97acf8c1061477edd3519fea3d1233951723741c926ff72e259c274babb036abf4db92f217db507c58a6fc6e438db4b14c5fe5789b2ed64 WHIRLPOOL 2150053b38d8318804bf40cdcd9cdefdd2976c4cfab563c90021f0d9be0a0a57174166ece8b51658d9f2192e07343f198358299667a1db32f146c9fb9c528956
35 -DIST sdlmame0148u1_diff.zip 3386949 SHA256 27378d09e50f31ca0dd4f39df4c474016671946657eb7af9ea5aa0ffbae1d9bb SHA512 f62aa8ebfc3cfa96d2fd5e58c921cc2adfbe3704a745ef49bc247060ecd3333ecc12e1a3add810c6237f3f7a1946cf1b9d46e6d72aeb87baffebadb933de44de WHIRLPOOL 550f2e777363f307b8e56b4ec31f4852abe89434af5ce596bd6e6023f35a728e4078033b1edc4b302e0cf50fa646a190ec02be9329127379405aec2e9b591531
36
37 diff --git a/games-emulation/sdlmame/files/mame-0.139.ini.in b/games-emulation/sdlmame/files/mame-0.139.ini.in
38 deleted file mode 100644
39 index 7b69f18..0000000
40 --- a/games-emulation/sdlmame/files/mame-0.139.ini.in
41 +++ /dev/null
42 @@ -1,270 +0,0 @@
43 -#
44 -# CORE CONFIGURATION OPTIONS
45 -#
46 -readconfig 1
47 -writeconfig 0
48 -
49 -#
50 -# CORE SEARCH PATH OPTIONS
51 -#
52 -rompath $HOME/.sdlmame/roms;@GAMES_DATADIR@/sdlmame/roms
53 -samplepath $HOME/.sdlmame/samples;@GAMES_DATADIR@/sdlmame/samples
54 -artpath $HOME/.sdlmame/artwork;@GAMES_DATADIR@/sdlmame/artwork
55 -ctrlrpath $HOME/.sdlmame/ctrlr;@GAMES_SYSCONFDIR@/sdlmame/ctrlr;@GAMES_DATADIR@/sdlmame/ctrlr
56 -inipath $HOME/.sdlmame;@GAMES_SYSCONFDIR@/sdlmame
57 -fontpath $HOME/.sdlmame;@GAMES_DATADIR@/sdlmame
58 -cheatpath $HOME/.sdlmame/cheats;@GAMES_SYSCONFDIR@/sdlmame/cheats;@GAMES_DATADIR@/sdlmame/cheats
59 -crosshairpath $HOME/.sdlmame/crosshair;@GAMES_DATADIR@/sdlmame/crosshair
60 -
61 -#
62 -# CORE OUTPUT DIRECTORY OPTIONS
63 -#
64 -cfg_directory $HOME/.sdlmame/cfg
65 -nvram_directory $HOME/.sdlmame/nvram
66 -memcard_directory $HOME/.sdlmame/memcard
67 -input_directory $HOME/.sdlmame/inp
68 -state_directory $HOME/.sdlmame/sta
69 -snapshot_directory $HOME/.sdlmame/snap
70 -diff_directory $HOME/.sdlmame/diff
71 -comment_directory $HOME/.sdlmame/comments
72 -
73 -#
74 -# CORE STATE/PLAYBACK OPTIONS
75 -#
76 -state
77 -autosave 0
78 -playback
79 -record
80 -mngwrite
81 -aviwrite
82 -wavwrite
83 -snapname %g/%i
84 -snapsize auto
85 -snapview internal
86 -burnin 0
87 -
88 -#
89 -# CORE PERFORMANCE OPTIONS
90 -#
91 -autoframeskip 0
92 -frameskip 0
93 -seconds_to_run 0
94 -throttle 1
95 -sleep 1
96 -speed 1.0
97 -refreshspeed 0
98 -
99 -#
100 -# CORE ROTATION OPTIONS
101 -#
102 -rotate 1
103 -ror 0
104 -rol 0
105 -autoror 0
106 -autorol 0
107 -flipx 0
108 -flipy 0
109 -
110 -#
111 -# CORE ARTWORK OPTIONS
112 -#
113 -artwork_crop 0
114 -use_backdrops 1
115 -use_overlays 1
116 -use_bezels 1
117 -
118 -#
119 -# CORE SCREEN OPTIONS
120 -#
121 -brightness 1.0
122 -contrast 1.0
123 -gamma 1.0
124 -pause_brightness 0.65
125 -
126 -#
127 -# CORE VECTOR OPTIONS
128 -#
129 -antialias 1
130 -beam 1.0
131 -flicker 0
132 -
133 -#
134 -# CORE SOUND OPTIONS
135 -#
136 -sound 1
137 -samplerate 48000
138 -samples 1
139 -volume 0
140 -
141 -#
142 -# CORE INPUT OPTIONS
143 -#
144 -coin_lockout 1
145 -ctrlr
146 -mouse 0
147 -joystick 1
148 -lightgun 0
149 -multikeyboard 0
150 -multimouse 0
151 -steadykey 0
152 -offscreen_reload 0
153 -joystick_map auto
154 -joystick_deadzone 0.3
155 -joystick_saturation 0.85
156 -natural 0
157 -uimodekey auto
158 -
159 -#
160 -# CORE INPUT AUTOMATIC ENABLE OPTIONS
161 -#
162 -paddle_device keyboard
163 -adstick_device keyboard
164 -pedal_device keyboard
165 -dial_device keyboard
166 -trackball_device keyboard
167 -lightgun_device keyboard
168 -positional_device keyboard
169 -mouse_device mouse
170 -
171 -#
172 -# CORE DEBUGGING OPTIONS
173 -#
174 -log 0
175 -verbose 0
176 -update_in_pause 0
177 -debug 0
178 -debugscript
179 -debug_internal 0
180 -
181 -#
182 -# CORE MISC OPTIONS
183 -#
184 -bios
185 -cheat 0
186 -skip_gameinfo 0
187 -
188 -#
189 -# DEBUGGING OPTIONS
190 -#
191 -oslog 0
192 -
193 -#
194 -# PERFORMANCE OPTIONS
195 -#
196 -multithreading 0
197 -numprocessors auto
198 -sdlvideofps 0
199 -
200 -#
201 -# VIDEO OPTIONS
202 -#
203 -video soft
204 -numscreens 1
205 -window 0
206 -maximize 1
207 -keepaspect 1
208 -unevenstretch 1
209 -effect none
210 -centerh 1
211 -centerv 1
212 -waitvsync 0
213 -scalemode none
214 -
215 -#
216 -# OpenGL-SPECIFIC OPTIONS
217 -#
218 -filter 1
219 -prescale 1
220 -gl_forcepow2texture 0
221 -gl_notexturerect 0
222 -gl_vbo 1
223 -gl_pbo 1
224 -gl_glsl 0
225 -gl_glsl_filter 1
226 -glsl_shader_mame0 none
227 -glsl_shader_mame1 none
228 -glsl_shader_mame2 none
229 -glsl_shader_mame3 none
230 -glsl_shader_mame4 none
231 -glsl_shader_mame5 none
232 -glsl_shader_mame6 none
233 -glsl_shader_mame7 none
234 -glsl_shader_mame8 none
235 -glsl_shader_mame9 none
236 -glsl_shader_screen0 none
237 -glsl_shader_screen1 none
238 -glsl_shader_screen2 none
239 -glsl_shader_screen3 none
240 -glsl_shader_screen4 none
241 -glsl_shader_screen5 none
242 -glsl_shader_screen6 none
243 -glsl_shader_screen7 none
244 -glsl_shader_screen8 none
245 -glsl_shader_screen9 none
246 -gl_glsl_vid_attr 1
247 -
248 -#
249 -# PER-WINDOW VIDEO OPTIONS
250 -#
251 -screen auto
252 -aspect auto
253 -resolution auto
254 -view auto
255 -screen0 auto
256 -aspect0 auto
257 -resolution0 auto
258 -view0 auto
259 -screen1 auto
260 -aspect1 auto
261 -resolution1 auto
262 -view1 auto
263 -screen2 auto
264 -aspect2 auto
265 -resolution2 auto
266 -view2 auto
267 -screen3 auto
268 -aspect3 auto
269 -resolution3 auto
270 -view3 auto
271 -
272 -#
273 -# FULL SCREEN OPTIONS
274 -#
275 -switchres 0
276 -useallheads 0
277 -
278 -#
279 -# SOUND OPTIONS
280 -#
281 -audio_latency 3
282 -
283 -#
284 -# SDL KEYBOARD MAPPING
285 -#
286 -keymap 0
287 -keymap_file $HOME/.sdlmame/keymap.dat
288 -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-be.txt
289 -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-ch.txt
290 -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-de.txt
291 -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-fr.txt
292 -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km_it.txt
293 -
294 -#
295 -# SDL JOYSTICK MAPPING
296 -#
297 -joy_idx1 auto
298 -joy_idx2 auto
299 -joy_idx3 auto
300 -joy_idx4 auto
301 -joy_idx5 auto
302 -joy_idx6 auto
303 -joy_idx7 auto
304 -joy_idx8 auto
305 -sixaxis 0
306 -
307 -#
308 -# SDL LOWLEVEL DRIVER OPTIONS
309 -#
310 -videodriver auto
311 -audiodriver auto
312 -gl_lib auto
313
314 diff --git a/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
315 deleted file mode 100644
316 index f69cfe4..0000000
317 --- a/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
318 +++ /dev/null
319 @@ -1,79 +0,0 @@
320 ---- work.orig/makefile 2011-11-09 22:40:30.000000000 -0500
321 -+++ work/makefile 2011-11-16 19:24:24.615419949 -0500
322 -@@ -435,9 +435,6 @@
323 - CPPONLYFLAGS += -x c++ -std=gnu++98
324 - COBJFLAGS += -x objective-c++
325 -
326 --# this speeds it up a bit by piping between the preprocessor/compiler/assembler
327 --CCOMFLAGS += -pipe
328 --
329 - # add -g if we need symbols, and ensure we have frame pointers
330 - ifdef SYMBOLS
331 - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
332 -@@ -442,7 +442,6 @@
333 -
334 - # add -v if we need verbose build information
335 - ifdef VERBOSE
336 --CCOMFLAGS += -v
337 - endif
338 -
339 - # add profiling information for the compiler
340 -@@ -453,23 +450,6 @@
341 - CCOMFLAGS += -pg
342 - endif
343 -
344 --# add the optimization flag
345 --CCOMFLAGS += -O$(OPTIMIZE)
346 --
347 --# if we are optimizing, include optimization options
348 --# and make all errors into warnings
349 --ifneq ($(OPTIMIZE),0)
350 --ifneq ($(TARGETOS),os2)
351 --ifndef NOWERROR
352 --CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
353 --else
354 --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
355 --endif
356 --else
357 --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
358 --endif
359 --endif
360 --
361 - # add a basic set of warnings
362 - CCOMFLAGS += \
363 - -Wall \
364 -@@ -524,20 +504,6 @@
365 - endif
366 -
367 -
368 --#-------------------------------------------------
369 --# linking flags
370 --#-------------------------------------------------
371 --
372 --# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
373 --# flags only used when linking the core emulator
374 --LDFLAGS =
375 --ifneq ($(TARGETOS),macosx)
376 --ifneq ($(TARGETOS),os2)
377 --ifneq ($(TARGETOS),solaris)
378 --LDFLAGS = -Wl,--warn-common
379 --endif
380 --endif
381 --endif
382 - LDFLAGSEMULATOR =
383 -
384 - # add profiling information for the linker
385 -@@ -545,13 +511,6 @@
386 - LDFLAGS += -pg
387 - endif
388 -
389 --# strip symbols and other metadata in non-symbols and non profiling builds
390 --ifndef SYMBOLS
391 --ifneq ($(TARGETOS),macosx)
392 --LDFLAGS += -s
393 --endif
394 --endif
395 --
396 - # output a map file (emulator only)
397 - ifdef MAP
398 - LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
399
400 diff --git a/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
401 deleted file mode 100644
402 index 87eeae5..0000000
403 --- a/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
404 +++ /dev/null
405 @@ -1,11 +0,0 @@
406 ---- ./src/osd/sdl/osdsdl.h.orig
407 -+++ ./src/osd/sdl/osdsdl.h
408 -@@ -225,6 +225,8 @@
409 - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
410 - #if USE_OPENGL
411 - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
412 -+#else
413 -+ const char *gl_lib() const { return NULL; }
414 - #endif
415 -
416 - private:
417
418 diff --git a/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch
419 deleted file mode 100644
420 index 7ba5969..0000000
421 --- a/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch
422 +++ /dev/null
423 @@ -1,177 +0,0 @@
424 ---- makefile
425 -+++ makefile
426 -@@ -314,13 +314,14 @@
427 - endif
428 -
429 - # compiler, linker and utilities
430 --AR = @ar
431 --CC = @gcc
432 --LD = @g++
433 -+AR ?= @ar
434 -+CC ?= @gcc
435 -+CXX ?= @g++
436 -+LD = $(CXX)
437 - MD = -mkdir$(EXE)
438 - RM = @rm -f
439 - OBJDUMP = @objdump
440 --PYTHON = @python
441 -+PYTHON ?= @python
442 -
443 -
444 - #-------------------------------------------------
445 -@@ -455,7 +456,7 @@
446 -
447 - # CFLAGS is defined based on C or C++ targets
448 - # (remember, expansion only happens when used, so doing it here is ok)
449 --CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
450 -+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
451 -
452 - # we compile C-only to C89 standard with GNU extensions
453 - # we compile C++ code to C++98 standard with GNU extensions
454 -@@ -463,9 +464,6 @@
455 - CPPONLYFLAGS += -x c++ -std=gnu++98
456 - COBJFLAGS += -x objective-c++
457 -
458 --# this speeds it up a bit by piping between the preprocessor/compiler/assembler
459 --CCOMFLAGS += -pipe
460 --
461 - # add -g if we need symbols, and ensure we have frame pointers
462 - ifdef SYMBOLS
463 - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
464 -@@ -479,19 +477,6 @@
465 - # add profiling information for the compiler
466 - ifdef PROFILE
467 - CCOMFLAGS += -pg
468 --endif
469 --
470 --# add the optimization flag
471 --CCOMFLAGS += -O$(OPTIMIZE)
472 --
473 --# add the error warning flag
474 --ifndef NOWERROR
475 --CCOMFLAGS += -Werror
476 --endif
477 --
478 --# if we are optimizing, include optimization options
479 --ifneq ($(OPTIMIZE),0)
480 --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
481 - endif
482 -
483 - # add a basic set of warnings
484 -@@ -565,26 +550,11 @@
485 -
486 - # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
487 - # flags only used when linking the core emulator
488 --LDFLAGS =
489 --ifneq ($(TARGETOS),macosx)
490 --ifneq ($(TARGETOS),os2)
491 --ifneq ($(TARGETOS),solaris)
492 --LDFLAGS = -Wl,--warn-common
493 --endif
494 --endif
495 --endif
496 - LDFLAGSEMULATOR =
497 -
498 - # add profiling information for the linker
499 - ifdef PROFILE
500 - LDFLAGS += -pg
501 --endif
502 --
503 --# strip symbols and other metadata in non-symbols and non profiling builds
504 --ifndef SYMBOLS
505 --ifneq ($(TARGETOS),macosx)
506 --LDFLAGS += -s
507 --endif
508 - endif
509 -
510 - # output a map file (emulator only)
511 ---- src/osd/sdl/sdl.mak
512 -+++ src/osd/sdl/sdl.mak
513 -@@ -24,6 +24,8 @@
514 - # uncomment and edit next line to specify a distribution
515 - # supported debian-stable, ubuntu-intrepid
516 -
517 -+PKG_CONFIG ?= pkg-config
518 -+
519 - # DISTRO = debian-stable
520 - # DISTRO = ubuntu-intrepid
521 - # DISTRO = gcc44-generic
522 -@@ -91,9 +93,9 @@
523 - endif
524 -
525 - ifdef SDL_INSTALL_ROOT
526 --SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
527 -+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
528 - else
529 --SDL_CONFIG = $(SDL_LIBVER)-config
530 -+SDL_CONFIG ?= $(SDL_LIBVER)-config
531 - endif
532 -
533 - ifeq ($(SDL_LIBVER),sdl2)
534 -@@ -190,8 +192,8 @@
535 - SDL_NETWORK = taptun
536 -
537 - ifndef NO_USE_MIDI
538 --INCPATH += `pkg-config --cflags alsa`
539 --LIBS += `pkg-config --libs alsa`
540 -+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa)
541 -+LIBS += $(shell $(PKG_CONFIG) --libs alsa)
542 - endif
543 -
544 - endif
545 -@@ -476,10 +478,10 @@
546 - # Remove the "/SDL" component from the include path so that we can compile
547 - # files (header files are #include "SDL/something.h", so the extra "/SDL"
548 - # causes a significant problem)
549 --INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
550 -+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
551 - CCOMFLAGS += -DNO_SDL_GLEXT
552 - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
553 --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
554 -+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread
555 - DEFS += -DMACOSX_USE_LIBSDL
556 - endif # MACOSX_USE_LIBSDL
557 -
558 -@@ -532,8 +534,8 @@
559 - endif
560 - endif
561 -
562 --INCPATH += `pkg-config --cflags fontconfig`
563 --LIBS += `pkg-config --libs fontconfig`
564 -+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig)
565 -+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig)
566 -
567 - ifeq ($(SDL_LIBVER),sdl2)
568 - LIBS += -lSDL2_ttf
569 -@@ -616,8 +618,8 @@
570 -
571 - ifeq ($(BASE_TARGETOS),os2)
572 -
573 --INCPATH += `sdl-config --cflags`
574 --LIBS += `sdl-config --libs`
575 -+INCPATH += $(shell $(SDL_CONFIG) --cflags)
576 -+LIBS += $(shell $(SDL_CONFIG) --libs)
577 -
578 - endif # OS2
579 -
580 -@@ -690,15 +692,15 @@
581 -
582 - # the new debugger relies on GTK+ in addition to the base SDLMAME needs
583 - # Non-X11 builds can not use the debugger
584 --INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
585 --CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
586 --LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
587 -+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
588 -+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
589 -+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
590 - #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
591 -
592 - # The newer debugger uses QT
593 - ifdef USE_QTDEBUG
594 --INCPATH += `pkg-config QtGui --cflags`
595 --LIBS += `pkg-config QtGui --libs`
596 -+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
597 -+LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
598 - endif
599 -
600 - # some systems still put important things in a different prefix
601
602 diff --git a/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch
603 deleted file mode 100644
604 index 7b339ba..0000000
605 --- a/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch
606 +++ /dev/null
607 @@ -1,12 +0,0 @@
608 -diff -Naur a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
609 ---- a/src/osd/sdl/osdsdl.h 2012-07-11 20:49:55.070264487 +0200
610 -+++ b/src/osd/sdl/osdsdl.h 2012-07-11 20:51:45.976264395 +0200
611 -@@ -216,6 +216,8 @@
612 - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
613 - #if USE_OPENGL
614 - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
615 -+#else
616 -+ const char *gl_lib() const { return NULL; }
617 - #endif
618 -
619 - private:
620
621 diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch b/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch
622 deleted file mode 100644
623 index 97e4b8f..0000000
624 --- a/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch
625 +++ /dev/null
626 @@ -1,191 +0,0 @@
627 -commit 938cfdf1f01bcc9ac736249ee6458a774d560738
628 -Author: hasufell <hasufell@g.o>
629 -Date: Tue Jun 25 23:48:02 2013 +0200
630 -
631 - QA: respect several environment variables
632 -
633 - such as CC,CFLAGS,PKG_CONFIG...
634 -
635 -diff --git a/makefile b/makefile
636 -index ad6ae2d..dd4598d 100644
637 ---- a/makefile
638 -+++ b/makefile
639 -@@ -317,13 +317,15 @@ BUILD_EXE = $(EXE)
640 - endif
641 -
642 - # compiler, linker and utilities
643 --AR = @ar
644 --CC = @gcc
645 --LD = @g++
646 -+AR ?= @ar
647 -+CC ?= @gcc
648 -+CXX ?= @g++
649 -+LD = $(CXX)
650 - MD = -mkdir$(EXE)
651 - RM = @rm -f
652 - OBJDUMP = @objdump
653 --PYTHON = @python
654 -+PYTHON ?= @python
655 -+PKG_CONFIG ?= pkg-config
656 -
657 -
658 - #-------------------------------------------------
659 -@@ -458,7 +460,7 @@ CPPONLYFLAGS =
660 -
661 - # CFLAGS is defined based on C or C++ targets
662 - # (remember, expansion only happens when used, so doing it here is ok)
663 --CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
664 -+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
665 -
666 - # we compile C-only to C89 standard with GNU extensions
667 - # we compile C++ code to C++98 standard with GNU extensions
668 -@@ -466,9 +468,6 @@ CONLYFLAGS += -std=gnu89
669 - CPPONLYFLAGS += -x c++ -std=gnu++98
670 - COBJFLAGS += -x objective-c++
671 -
672 --# this speeds it up a bit by piping between the preprocessor/compiler/assembler
673 --CCOMFLAGS += -pipe
674 --
675 - # add -g if we need symbols, and ensure we have frame pointers
676 - ifdef SYMBOLS
677 - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
678 -@@ -484,19 +483,6 @@ ifdef PROFILE
679 - CCOMFLAGS += -pg
680 - endif
681 -
682 --# add the optimization flag
683 --CCOMFLAGS += -O$(OPTIMIZE)
684 --
685 --# add the error warning flag
686 --ifndef NOWERROR
687 --CCOMFLAGS += -Werror
688 --endif
689 --
690 --# if we are optimizing, include optimization options
691 --ifneq ($(OPTIMIZE),0)
692 --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
693 --endif
694 --
695 - # add a basic set of warnings
696 - CCOMFLAGS += \
697 - -Wall \
698 -@@ -576,14 +562,6 @@ endif
699 -
700 - # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
701 - # flags only used when linking the core emulator
702 --LDFLAGS =
703 --ifneq ($(TARGETOS),macosx)
704 --ifneq ($(TARGETOS),os2)
705 --ifneq ($(TARGETOS),solaris)
706 --LDFLAGS = -Wl,--warn-common
707 --endif
708 --endif
709 --endif
710 - LDFLAGSEMULATOR =
711 -
712 - # add profiling information for the linker
713 -@@ -591,13 +569,6 @@ ifdef PROFILE
714 - LDFLAGS += -pg
715 - endif
716 -
717 --# strip symbols and other metadata in non-symbols and non profiling builds
718 --ifndef SYMBOLS
719 --ifneq ($(TARGETOS),macosx)
720 --LDFLAGS += -s
721 --endif
722 --endif
723 --
724 - # output a map file (emulator only)
725 - ifdef MAP
726 - LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
727 -diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
728 -index 84332ef..36655d3 100644
729 ---- a/src/osd/sdl/sdl.mak
730 -+++ b/src/osd/sdl/sdl.mak
731 -@@ -24,6 +24,8 @@
732 - # uncomment and edit next line to specify a distribution
733 - # supported debian-stable, ubuntu-intrepid
734 -
735 -+PKG_CONFIG ?= pkg-config
736 -+
737 - # DISTRO = debian-stable
738 - # DISTRO = ubuntu-intrepid
739 - # DISTRO = gcc44-generic
740 -@@ -88,9 +90,9 @@ SDL_LIBVER = sdl
741 - endif
742 -
743 - ifdef SDL_INSTALL_ROOT
744 --SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
745 -+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
746 - else
747 --SDL_CONFIG = $(SDL_LIBVER)-config
748 -+SDL_CONFIG ?= $(SDL_LIBVER)-config
749 - endif
750 -
751 - ifeq ($(SDL_LIBVER),sdl2)
752 -@@ -187,8 +189,8 @@ SYNC_IMPLEMENTATION = tc
753 - SDL_NETWORK = taptun
754 -
755 - ifndef NO_USE_MIDI
756 --INCPATH += `pkg-config --cflags alsa`
757 --LIBS += `pkg-config --libs alsa`
758 -+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa)
759 -+LIBS += $(shell $(PKG_CONFIG) --libs alsa)
760 - endif
761 -
762 - endif
763 -@@ -478,10 +480,10 @@ else
764 - # Remove the "/SDL" component from the include path so that we can compile
765 - # files (header files are #include "SDL/something.h", so the extra "/SDL"
766 - # causes a significant problem)
767 --INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
768 -+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
769 - CCOMFLAGS += -DNO_SDL_GLEXT
770 - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
771 --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
772 -+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread
773 - DEFS += -DMACOSX_USE_LIBSDL
774 - endif # MACOSX_USE_LIBSDL
775 -
776 -@@ -534,8 +536,8 @@ INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb
777 - endif
778 - endif
779 -
780 --INCPATH += `pkg-config --cflags fontconfig`
781 --LIBS += `pkg-config --libs fontconfig`
782 -+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig)
783 -+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig)
784 -
785 - ifeq ($(SDL_LIBVER),sdl2)
786 - LIBS += -lSDL2_ttf
787 -@@ -620,8 +622,8 @@ endif # Win32
788 -
789 - ifeq ($(BASE_TARGETOS),os2)
790 -
791 --INCPATH += `sdl-config --cflags`
792 --LIBS += `sdl-config --libs`
793 -+INCPATH += $(shell $(SDL_CONFIG) --cflags)
794 -+LIBS += $(shell $(SDL_CONFIG) --libs)
795 -
796 - endif # OS2
797 -
798 -@@ -696,14 +698,14 @@ LIBS += -lX11 -lXinerama
799 -
800 - # The newer debugger uses QT
801 - ifndef NO_USE_QTDEBUG
802 --INCPATH += `pkg-config QtGui --cflags`
803 --LIBS += `pkg-config QtGui --libs`
804 -+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
805 -+LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
806 - else
807 - # the old-new debugger relies on GTK+ in addition to the base SDLMAME needs
808 - # Non-X11 builds can not use the debugger
809 --INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
810 --CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
811 --LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
812 -+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
813 -+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
814 -+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
815 - endif
816 -
817 - # some systems still put important things in a different prefix
818
819 diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch b/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch
820 deleted file mode 100644
821 index 6c7cd5d..0000000
822 --- a/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch
823 +++ /dev/null
824 @@ -1,28 +0,0 @@
825 -commit ec92ac2b0180b101c30748e62eb8b76cdf0cb439
826 -Author: hasufell <hasufell@g.o>
827 -Date: Wed Jun 26 14:33:01 2013 +0200
828 -
829 - remove unneeded linking
830 -
831 - if we don't build the debugger, we don't want gtk+ linking
832 -
833 -diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
834 -index 36655d3..2089707 100644
835 ---- a/src/osd/sdl/sdl.mak
836 -+++ b/src/osd/sdl/sdl.mak
837 -@@ -696,6 +696,7 @@ else
838 - DEFS += -DSDLMAME_X11
839 - LIBS += -lX11 -lXinerama
840 -
841 -+ifneq ($(NO_DEBUGGER),1)
842 - # The newer debugger uses QT
843 - ifndef NO_USE_QTDEBUG
844 - INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
845 -@@ -707,6 +708,7 @@ INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
846 - CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
847 - LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
848 - endif
849 -+endif # NO_DEBUGGER
850 -
851 - # some systems still put important things in a different prefix
852 - LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib
853
854 diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch
855 deleted file mode 100644
856 index cd32cd3..0000000
857 --- a/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch
858 +++ /dev/null
859 @@ -1,19 +0,0 @@
860 -commit 6ee372b3693857372a7b4855039ad1a94d3aebca
861 -Author: hasufell <hasufell@g.o>
862 -Date: Tue Jun 25 23:51:12 2013 +0200
863 -
864 - fix for disabled opengl
865 -
866 -diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
867 -index ed0b66b..03d68f9 100644
868 ---- a/src/osd/sdl/osdsdl.h
869 -+++ b/src/osd/sdl/osdsdl.h
870 -@@ -219,6 +219,8 @@ public:
871 - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
872 - #if USE_OPENGL
873 - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
874 -+#else
875 -+ const char *gl_lib() const { return NULL; }
876 - #endif
877 -
878 - private:
879
880 diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch b/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch
881 deleted file mode 100644
882 index 8460497..0000000
883 --- a/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch
884 +++ /dev/null
885 @@ -1,33 +0,0 @@
886 -commit ea514c9ded266aa365976649d88fa5593ef7ebf5
887 -Author: hasufell <hasufell@g.o>
888 -Date: Tue Jun 25 23:48:26 2013 +0200
889 -
890 - add switch to use system lua
891 -
892 -diff --git a/makefile b/makefile
893 -index dd4598d..bdf22d2 100644
894 ---- a/makefile
895 -+++ b/makefile
896 -@@ -228,6 +228,9 @@ BUILD_JPEGLIB = 1
897 - # uncomment next line to build PortMidi as part of MAME/MESS build
898 - BUILD_MIDILIB = 1
899 -
900 -+# uncomment next line to build Lua-5.2 as part of MAME/MESS build
901 -+BUILD_LUA = 1
902 -+
903 - # uncomment next line to include the symbols
904 - # SYMBOLS = 1
905 -
906 -@@ -664,7 +667,12 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a
907 - FORMATS_LIB = $(OBJ)/libformats.a
908 -
909 - # add LUA library
910 -+ifeq ($(BUILD_LUA),1)
911 - LUA_LIB = $(OBJ)/liblua.a
912 -+else
913 -+LIBS += $(shell $(PKG_CONFIG) --libs lua)
914 -+INCPATH += $(shell $(PKG_CONFIG) --cflags lua)
915 -+endif
916 -
917 - # add PortMidi MIDI library
918 - ifeq ($(BUILD_MIDILIB),1)
919
920 diff --git a/games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild b/games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild
921 deleted file mode 100644
922 index bedc691..0000000
923 --- a/games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild
924 +++ /dev/null
925 @@ -1,186 +0,0 @@
926 -# Copyright 1999-2015 Gentoo Foundation
927 -# Distributed under the terms of the GNU General Public License v2
928 -# $Id$
929 -
930 -EAPI=5
931 -PYTHON_COMPAT=( python2_7 )
932 -inherit eutils flag-o-matic python-any-r1 games
933 -
934 -MY_PV=${PV/.}
935 -MY_CONF_PN=${PN/sdl}
936 -MY_P=sdlmame${MY_PV}
937 -MY_P=${MY_P%%_p*}
938 -MY_CONF_VER="0.139"
939 -
940 -# patches
941 -SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "https://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)"
942 -
943 -DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
944 -HOMEPAGE="http://mamedev.org/"
945 -# Upstream doesn't allow fetching with unknown User-Agent such as wget
946 -SRC_URI="$SRC_URI https://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip"
947 -if [[ ${PN} == "sdlmame" ]] ; then
948 - SRC_URI="$SRC_URI http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
949 -fi
950 -
951 -LICENSE="XMAME"
952 -SLOT="0"
953 -KEYWORDS="amd64 ~ppc x86"
954 -IUSE="X alsa debug opengl"
955 -REQUIRED_USE="debug? ( X )"
956 -
957 -RDEPEND="dev-libs/expat
958 - media-libs/fontconfig
959 - media-libs/flac
960 - >=media-libs/libsdl-1.2.10[X,sound,joystick,opengl?,video]
961 - media-libs/sdl-ttf
962 - sys-libs/zlib
963 - virtual/jpeg
964 - alsa? ( media-libs/alsa-lib )
965 - X? (
966 - gnome-base/gconf
967 - x11-libs/gtk+:2
968 - x11-libs/libX11
969 - x11-libs/libXinerama
970 - )"
971 -DEPEND="${RDEPEND}
972 - ${PYTHON_DEPS}
973 - app-arch/unzip
974 - media-libs/alsa-lib
975 - virtual/pkgconfig
976 - X? ( x11-proto/xineramaproto )"
977 -
978 -S=${WORKDIR}
979 -
980 -# Function to disable a makefile option
981 -disable_feature() {
982 - sed -i \
983 - -e "/$1.*=/s:^:# :" \
984 - "${S}"/makefile \
985 - || die "sed failed"
986 -}
987 -
988 -# Function to enable a makefile option
989 -enable_feature() {
990 - sed -i \
991 - -e "/^#.*$1.*=/s:^#::" \
992 - "${S}"/${2:-makefile} \
993 - || die "sed failed"
994 -}
995 -
996 -pkg_setup() {
997 - games_pkg_setup
998 - python-any-r1_pkg_setup
999 -}
1000 -
1001 -src_unpack() {
1002 - default
1003 - unpack ./mame.zip
1004 - rm -f mame.zip
1005 -}
1006 -
1007 -src_prepare() {
1008 - if [[ $PV == *_p* ]] ; then
1009 - edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff
1010 - einfo "Patching release with source updates"
1011 - epatch ${MY_PV%%_p*}*.diff
1012 - fi
1013 - edos2unix src/osd/sdl/osdsdl.h
1014 -
1015 - epatch \
1016 - "${FILESDIR}"/${P}-makefile.patch \
1017 - "${FILESDIR}"/${P}-no-opengl.patch
1018 -
1019 - # Don't compile zlib and expat
1020 - einfo "Disabling embedded libraries: expat, flac, jpeg, zlib"
1021 - disable_feature BUILD_EXPAT
1022 - disable_feature BUILD_FLAC
1023 - disable_feature BUILD_JPEG
1024 - disable_feature BUILD_ZLIB
1025 -
1026 - if use amd64; then
1027 - einfo "Enabling 64-bit support"
1028 - enable_feature PTR64
1029 - fi
1030 -
1031 - if use ppc; then
1032 - einfo "Enabling PPC support"
1033 - enable_feature BIGENDIAN
1034 - fi
1035 -
1036 - if use debug; then
1037 - einfo "Enabling debug support"
1038 - enable_feature DEBUG
1039 - fi
1040 -
1041 - if ! use opengl ; then
1042 - einfo "Disabling opengl support"
1043 - enable_feature NO_OPENGL src/osd/sdl/sdl.mak
1044 - fi
1045 -
1046 - if ! use alsa ; then
1047 - einfo "Disabling alsa midi support"
1048 - enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak
1049 - fi
1050 -
1051 - if ! use X ; then
1052 - einfo "Disabling X support"
1053 - enable_feature NO_X11 src/osd/sdl/sdl.mak
1054 - fi
1055 -}
1056 -
1057 -src_compile() {
1058 - emake \
1059 - TARGET="${PN#sdl}" \
1060 - NAME="${PN}" \
1061 - OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"' \
1062 - NO_DEBUGGER=$(usex debug "0" "1") default
1063 -}
1064 -
1065 -src_install() {
1066 - newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN}
1067 -
1068 - newman src/osd/sdl/man/${PN#sdl}.6 ${PN}.6
1069 -
1070 - insinto "${GAMES_DATADIR}/${PN}"
1071 - doins -r src/osd/sdl/keymaps
1072 - [[ ${PN} == "sdlmame" ]] && newins sdlmame-ui.bdf ui.bdf
1073 -
1074 - insinto "${GAMES_SYSCONFDIR}/${PN}"
1075 - doins "${FILESDIR}"/vector.ini
1076 -
1077 - sed \
1078 - -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
1079 - -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
1080 - "${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \
1081 - || die "sed failed"
1082 -
1083 - dodoc docs/{config,mame,newvideo}.txt
1084 - if [[ ${PN} == "sdlmame" ]] ; then
1085 - dodoc whatsnew*.txt
1086 - else
1087 - dodoc messnew*.txt
1088 - fi
1089 -
1090 - keepdir \
1091 - "${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
1092 - "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
1093 -
1094 - prepgamesdirs
1095 -}
1096 -
1097 -pkg_postinst() {
1098 - games_pkg_postinst
1099 -
1100 - elog "optional dependencies:"
1101 - elog " games-emulation/sdlmametools (development tools)"
1102 - echo
1103 - elog "It's strongly recommended that you change either the system-wide"
1104 - elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
1105 -
1106 - if use opengl; then
1107 - echo
1108 - elog "You built ${PN} with opengl support and should set"
1109 - elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
1110 - fi
1111 -}
1112
1113 diff --git a/games-emulation/sdlmame/sdlmame-0.149.ebuild b/games-emulation/sdlmame/sdlmame-0.149.ebuild
1114 deleted file mode 100644
1115 index 5ee488b..0000000
1116 --- a/games-emulation/sdlmame/sdlmame-0.149.ebuild
1117 +++ /dev/null
1118 @@ -1,194 +0,0 @@
1119 -# Copyright 1999-2015 Gentoo Foundation
1120 -# Distributed under the terms of the GNU General Public License v2
1121 -# $Id$
1122 -
1123 -EAPI=5
1124 -PYTHON_COMPAT=( python2_7 )
1125 -inherit eutils flag-o-matic python-any-r1 games
1126 -
1127 -MY_PV=${PV/.}
1128 -MY_CONF_PN=${PN/sdl}
1129 -MY_P=sdlmame${MY_PV}
1130 -MY_P=${MY_P%%_p*}
1131 -MY_CONF_VER="0.139"
1132 -
1133 -# patches
1134 -SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "https://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)"
1135 -
1136 -DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
1137 -HOMEPAGE="http://mamedev.org/"
1138 -# Upstream doesn't allow fetching with unknown User-Agent such as wget
1139 -SRC_URI="$SRC_URI https://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip"
1140 -if [[ ${PN} == "sdlmame" ]] ; then
1141 - SRC_URI="$SRC_URI http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
1142 -fi
1143 -
1144 -LICENSE="XMAME"
1145 -SLOT="0"
1146 -KEYWORDS="~amd64 ~ppc ~x86"
1147 -IUSE="X alsa debug opengl"
1148 -REQUIRED_USE="debug? ( X )"
1149 -
1150 -RDEPEND=">=dev-lang/lua-5.2
1151 - dev-libs/expat
1152 - media-libs/fontconfig
1153 - media-libs/flac
1154 - >=media-libs/libsdl-1.2.10[sound,joystick,opengl?,video]
1155 - media-libs/sdl-ttf
1156 - sys-libs/zlib
1157 - virtual/jpeg
1158 - alsa? ( media-libs/alsa-lib )
1159 - debug? (
1160 - x11-libs/gtk+:2
1161 - gnome-base/gconf
1162 - )
1163 - X? (
1164 - x11-libs/libX11
1165 - x11-libs/libXinerama
1166 - )"
1167 -DEPEND="${RDEPEND}
1168 - ${PYTHON_DEPS}
1169 - app-arch/unzip
1170 - virtual/pkgconfig
1171 - X? ( x11-proto/xineramaproto )"
1172 -
1173 -S=${WORKDIR}
1174 -
1175 -# Function to disable a makefile option
1176 -disable_feature() {
1177 - sed -i \
1178 - -e "/$1.*=/s:^:# :" \
1179 - "${S}"/${2:-makefile} \
1180 - || die "sed failed"
1181 -}
1182 -
1183 -# Function to enable a makefile option
1184 -enable_feature() {
1185 - sed -i \
1186 - -e "/^#.*$1.*=/s:^#::" \
1187 - "${S}"/${2:-makefile} \
1188 - || die "sed failed"
1189 -}
1190 -
1191 -pkg_setup() {
1192 - games_pkg_setup
1193 - python-any-r1_pkg_setup
1194 -}
1195 -
1196 -src_unpack() {
1197 - default
1198 - unpack ./mame.zip
1199 - rm -f mame.zip
1200 -}
1201 -
1202 -src_prepare() {
1203 - if [[ $PV == *_p* ]] ; then
1204 - edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff
1205 - einfo "Patching release with source updates"
1206 - epatch ${MY_PV%%_p*}*.diff
1207 - fi
1208 - edos2unix makefile src/osd/sdl/{osdsdl.h,sdl.mak}
1209 -
1210 - epatch \
1211 - "${FILESDIR}"/${P}-QA.patch \
1212 - "${FILESDIR}"/${P}-system-lua.patch \
1213 - "${FILESDIR}"/${P}-no-opengl.patch \
1214 - "${FILESDIR}"/${P}-debugger-linking.patch
1215 -
1216 - # Don't compile zlib and expat
1217 - einfo "Disabling embedded libraries: expat, flac, jpeg, zlib, lua"
1218 - disable_feature BUILD_EXPAT
1219 - disable_feature BUILD_FLAC
1220 - disable_feature BUILD_JPEG
1221 - disable_feature BUILD_ZLIB
1222 - disable_feature BUILD_LUA
1223 -
1224 - if use amd64; then
1225 - einfo "Enabling 64-bit support"
1226 - enable_feature PTR64
1227 - fi
1228 -
1229 - if use ppc; then
1230 - einfo "Enabling PPC support"
1231 - enable_feature BIGENDIAN
1232 - fi
1233 -
1234 - if use debug; then
1235 - einfo "Enabling debug support"
1236 - enable_feature DEBUG
1237 - enable_feature DEBUG src/osd/sdl/sdl.mak
1238 - fi
1239 -
1240 - enable_feature NO_USE_QTDEBUG src/osd/sdl/sdl.mak
1241 -
1242 - if ! use opengl ; then
1243 - einfo "Disabling opengl support"
1244 - enable_feature NO_OPENGL src/osd/sdl/sdl.mak
1245 - fi
1246 -
1247 - if ! use alsa ; then
1248 - einfo "Disabling alsa midi support"
1249 - enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak
1250 - fi
1251 -
1252 - if ! use X ; then
1253 - einfo "Disabling X support"
1254 - enable_feature NO_X11 src/osd/sdl/sdl.mak
1255 - fi
1256 -}
1257 -
1258 -src_compile() {
1259 - emake \
1260 - TARGET="${PN#sdl}" \
1261 - NAME="${PN}" \
1262 - OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"' \
1263 - NO_DEBUGGER=$(usex debug "0" "1") default
1264 -}
1265 -
1266 -src_install() {
1267 - newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN}
1268 -
1269 - newman src/osd/sdl/man/${PN#sdl}.6 ${PN}.6
1270 -
1271 - insinto "${GAMES_DATADIR}/${PN}"
1272 - doins -r src/osd/sdl/keymaps
1273 - [[ ${PN} == "sdlmame" ]] && newins sdlmame-ui.bdf ui.bdf
1274 -
1275 - insinto "${GAMES_SYSCONFDIR}/${PN}"
1276 - doins "${FILESDIR}"/vector.ini
1277 -
1278 - sed \
1279 - -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
1280 - -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
1281 - "${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \
1282 - || die "sed failed"
1283 -
1284 - dodoc docs/{config,mame,newvideo}.txt
1285 - if [[ ${PN} == "sdlmame" ]] ; then
1286 - dodoc whatsnew*.txt
1287 - else
1288 - dodoc messnew*.txt
1289 - fi
1290 -
1291 - keepdir \
1292 - "${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
1293 - "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
1294 -
1295 - prepgamesdirs
1296 -}
1297 -
1298 -pkg_postinst() {
1299 - games_pkg_postinst
1300 -
1301 - elog "optional dependencies:"
1302 - elog " games-emulation/sdlmametools (development tools)"
1303 - echo
1304 - elog "It's strongly recommended that you change either the system-wide"
1305 - elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
1306 -
1307 - if use opengl; then
1308 - echo
1309 - elog "You built ${PN} with opengl support and should set"
1310 - elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
1311 - fi
1312 -}