From 83d3053e08212f617bbe2d430c50056bbba6ac9c Mon Sep 17 00:00:00 2001
From: root <root@mslug>
Date: Mon, 22 Jun 2015 17:16:04 +0200
Subject: [PATCH] clean up sdlmame directory

---
 games-emulation/sdlmame/Manifest              |  15 +-
 .../{mame-0.159.ini.in => mame-0.139.ini.in}  |   0
 .../files/sdlmame-0.144-makefile.patch        |  79 ++++++++
 .../files/sdlmame-0.144-no-opengl.patch       |  11 +
 .../files/sdlmame-0.148_p1-makefile.patch     | 177 ++++++++++++++++
 .../files/sdlmame-0.148_p1-no-opengl.patch    |  12 ++
 .../sdlmame/files/sdlmame-0.149-QA.patch      | 191 ++++++++++++++++++
 .../sdlmame-0.149-debugger-linking.patch      |  28 +++
 .../files/sdlmame-0.149-no-opengl.patch       |  19 ++
 .../files/sdlmame-0.149-system-lua.patch      |  33 +++
 .../sdlmame/files/sdlmame-0.159-QA.patch      | 132 ------------
 .../sdlmame-0.159-debugger-linking.patch      |  19 --
 .../sdlmame/files/sdlmame-0.159-sdl_ttf.patch |  30 ---
 games-emulation/sdlmame/sdlmame-0.159.ebuild  | 183 -----------------
 14 files changed, 563 insertions(+), 366 deletions(-)
 rename games-emulation/sdlmame/files/{mame-0.159.ini.in => mame-0.139.ini.in} (100%)
 create mode 100644 games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
 create mode 100644 games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
 create mode 100644 games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch
 create mode 100644 games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch
 create mode 100644 games-emulation/sdlmame/files/sdlmame-0.149-QA.patch
 create mode 100644 games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch
 create mode 100644 games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch
 create mode 100644 games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch
 delete mode 100644 games-emulation/sdlmame/files/sdlmame-0.159-QA.patch
 delete mode 100644 games-emulation/sdlmame/files/sdlmame-0.159-debugger-linking.patch
 delete mode 100644 games-emulation/sdlmame/files/sdlmame-0.159-sdl_ttf.patch
 delete mode 100644 games-emulation/sdlmame/sdlmame-0.159.ebuild

diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index c22067a..9551e12 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,8 +1,19 @@
+AUX mame-0.139.ini.in 6688 SHA256 4788e0c7bccc6d286cf1b3cbfe39aa1be6f210a94dea37954d4821a97bfb14da SHA512 e577c18b8403afdce4ae1c95a284ccb3aa4a0c7375f1e1eb2d93396e03f2ed0101d49c786f797a37b7a43e612434fbe368e9af7af9f032b0bc06e3014316d283 WHIRLPOOL 7686f4a28f110efd2d9797a79d46a0dc16094fb86a0d7a688186128a7c59ff256defa788351975e0de9f472c68fd1962a411c8885a8cebee2064d90d14cf7077
 AUX mame-0.159.ini.in 6688 SHA256 4788e0c7bccc6d286cf1b3cbfe39aa1be6f210a94dea37954d4821a97bfb14da SHA512 e577c18b8403afdce4ae1c95a284ccb3aa4a0c7375f1e1eb2d93396e03f2ed0101d49c786f797a37b7a43e612434fbe368e9af7af9f032b0bc06e3014316d283 WHIRLPOOL 7686f4a28f110efd2d9797a79d46a0dc16094fb86a0d7a688186128a7c59ff256defa788351975e0de9f472c68fd1962a411c8885a8cebee2064d90d14cf7077
+AUX sdlmame-0.144-makefile.patch 1934 SHA256 f7b7d9705efa1e3db683fc234d358de99484200c1f6f56b9e9727ffb97234c2a SHA512 739d5c07dbdaabc0d54ec734886ce0672a6966e36730610a05f20c9c32a33429d88c93d2cb6899ae1b054aacb34b06b4074c7bddc1274a2388cd9d0f7ce2927d WHIRLPOOL 0b4ee5b910513608e45a19157f0b6fe4e99f5412113efd846365ebb01f869d5a9529e704ced0f475cb0e3cf8d7ca09ea46e79601489d3759a241c363c9bdcb36
+AUX sdlmame-0.144-no-opengl.patch 309 SHA256 2f2412df37a50bf5e84df5620926dcb2d82a79f4ea1f307e96a18513c44690c4 SHA512 383a4c42ec319846e37f1682382ddcf8c127820f52aafef6f93b4548a2c164945c36534e246a87842ff81f4c8e47e9c9fed4af9e47b4dd4eca1989b527d7dd1c WHIRLPOOL a0e1fcc06ffa453db850fe1cc56071fac809d9b501ae3253b14c29ff413165267b9e77acbb70d80a8617e1f84d08a36c4733d5e81419c26e4712790dfacd8bdb
+AUX sdlmame-0.148_p1-makefile.patch 4801 SHA256 1428162c7f80671b4919f81cdf8bdaf0d23cb3596fbf43deefeaabf8f22cbe43 SHA512 d6d6040fdbcce1cee24742fb3242e2c6372c34fd993933e6df8e6e12c1ef488d309f9dbaba23d91528f6e97411d1865c72f9d465176bcf91c95594bf33a2b2ad WHIRLPOOL 4cae6d00b4bcfab9a52e583ba1914c1f84f7a21aff31792e1c485d9f229b0e9b743f28cabc3acafcb5e50e16fb7f4a2843adcba84304013c2a9b0c5eec6b4a27
+AUX sdlmame-0.148_p1-no-opengl.patch 436 SHA256 9c5052e2f942f4841175e260d9914dc052b1bcb9805086bb284758eeb37a918a SHA512 1ea614758b6726b8300d0c4a2c3801b76d59b21d8e121304ebb0700ff6478fe2d386170cf5a21fb553825dae06944b1ff6b020d042ccb888ba63dcd6e400e617 WHIRLPOOL ec79181dad422d0bf2ba5b751a23c69d81d9fe5855133aed28d6e1e32425b67cbd711808c1752fe6c25b5832b327d079085a681fa074126d4fcb1993dc409b8a
+AUX sdlmame-0.149-QA.patch 5427 SHA256 c3e8e2cbe358f9c335f62c0c40a2157a9e158ea317c3445ba0f1dd2b74fd8aa3 SHA512 4974f121f4d1a14f9ec57a68504d9f3eb4ac4f518cf515fa8d1f5cdd976409d72f81b948573a8a2cff86c73d4eb5ac8299e119911960bb0575e3fe6e57b0fccb WHIRLPOOL 8e9f76aecdfbb81cb61a457f7a25613c4b9f0fe7f8730cb81bcf2fd0dfb2d434abd9d3901505c152cef93bd0daebed1b35635b262db4fd07bfb8ec04c5ce81da
+AUX sdlmame-0.149-debugger-linking.patch 944 SHA256 5e9ed23651cd9f79f1303ef245d933ac94ffd92c8c950dd623bca9c292fc52b0 SHA512 24123983a613530d6bf4f52f2f5d191b1bed997f27384fb34b19c5fa629f8ebb09dceca334138ac93122fa2482834cbdecbfca91f290bcb9ab62bc0db829b99f WHIRLPOOL 31e8deefc11f1bfc58c63b7908ca540e658e2a62170968514aaaf029a6fe251c66eebd01cb7a71cf8b92ac1702209558896dc03f0f7249c6ede6e29ee3447685
+AUX sdlmame-0.149-no-opengl.patch 558 SHA256 9d2b61809532f909439709c97bdcb7d6e167573753ce0166c9d50a60c311465a SHA512 f0a728262855367b2039c68c6bb676f3e957033334dd8d3a8ce82ebb28b51d759408a67c47fd8dd1705a3c883eb9362c633692fdf9dcdfe5a79ccbe19dc44dc8 WHIRLPOOL 6c752080ac2d233e7bbc606d641cd0e80235a8edaefbbe6fedf4e82afab03236575cc14ca60ca5bad768935b7e86dfefdaf1d4f8aac186d5b444464615f155f1
+AUX sdlmame-0.149-system-lua.patch 851 SHA256 2ca1875b4425f1136a29003cdf54283e3785d2488c930e5611a7148c89a17bc1 SHA512 91c73f9992e326595bfa96820985de4ede9029df75e63ab28ac8d55d38021744ba5542178d788f68105d91f233513d26ceaf10c771a19f0545d07f39515c5db2 WHIRLPOOL 1e959a45a3f23bcdce30126976fb06422a90fdd02876615eaad035d5b34afeed4b055197bb84d928268cdf997d2944482d6ab915a1fda9dc3020c613523d6771
 AUX sdlmame-0.159-QA.patch 3317 SHA256 0048d22f37d901730c4fa7006de1dc11735bc8d3341dfd326481a5d72a257927 SHA512 fdfb8c8f7fe334c63a4240867689acb1f63cae2358253090d366c96db2df6adcc061f4080f95f2b42e5c4647a35f08877a5a759b7d302beb5d68c01b8c11bd82 WHIRLPOOL 1bbcc7769e23c362853d779ad5e37781b4b70757c448999396dc72f4971a28c700d378a47bb7714bb9eba0b86028cdcf8da5ce8aa16f48b6ceb4f59bd674a69a
 AUX sdlmame-0.159-debugger-linking.patch 592 SHA256 b8df68ec51d5869f706b33bb035ec78c7abf7b198fd7e132b640da1fbcc6e99e SHA512 fd94c3e57b032cc46d44065053a4d71e0a96de8566f5af3af33a0b50e966911e1fb4658a619dd0b1eaef503eee1abb18c44d3df9cd773c0e3aa10f91df932593 WHIRLPOOL 14e8436bca894df4d82d845d3634df2dc5152ac9d82905e87bc32f0295a15cf77240a100e9a0e88c788aa9eee458a921be4f1a0a8e64ccc17be294aae053f36f
 AUX sdlmame-0.159-sdl_ttf.patch 1009 SHA256 a548a6f7e584bab10ad9559185e69564a388d8cc66d732c1cb84146ca3075197 SHA512 421ec61d784447f6c4c1177f03a1e2e42fd1fd145dd3c90dc7274bec71dbdd65b4b37b1195408ddca7963a745215e7aee27983d381532179a57157c91f4976d8 WHIRLPOOL ffb1bba6963d8d23d3b195b2f06d1665d07f4fce8784cd7596206ca6b93714c4b57da2b8ca40c74193c201c69f6c073d46455e0cfbefe0826ce5ee7f4028c403
 AUX vector.ini 116 SHA256 408aeaaffcb2ecccd20db457f22d2d5efa930c0f62a92987b0fbefaf6c038c23 SHA512 6d84eb7b9c4e9f134b57e64ba9ae30dcaaa620296830f7c9858611fde9064f803bd7d230a989a5cce34d8b815b5a98d323b19d3eef3d4c688b5c32b96b299f5f WHIRLPOOL f60543015a0195487917c696640cc66e29109298ac8f9bd1309346f6ab1b46d8e2ce83d00506c17a9ea588f6b3bac82f0f66d7e75bbf88656ba897cd50fa3dac
-DIST mame0159s.zip 80801723 SHA256 22a7eb29e508b033b6289a2a20733f4227c037844e653ef3f3c2a1ea03703d00 SHA512 572254852cd18db0ae2d0ea1eb8086cc17b7cc465445e1d01ba7500bd893627e91446e8fa7793e155d6ea8fb8f133474f08f628dc090fec4b64edcd8e5a6636d WHIRLPOOL 2b9d14afa05cb67322eef3cba9ab146f5cdab6b369d7109e1027a849271ebe92a2a401d7150084eadc154eda4ed4207838840ab3ca74bebfbfb82fb3642898b1
+DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a
 DIST sdlmame-ui.bdf.gz 114727 SHA256 f2ec11dd926bbeae8647e68607107516a30790239464939f3e99a0f62fc7f17e SHA512 67ba1bc632c1ac51b97acf8c1061477edd3519fea3d1233951723741c926ff72e259c274babb036abf4db92f217db507c58a6fc6e438db4b14c5fe5789b2ed64 WHIRLPOOL 2150053b38d8318804bf40cdcd9cdefdd2976c4cfab563c90021f0d9be0a0a57174166ece8b51658d9f2192e07343f198358299667a1db32f146c9fb9c528956
-EBUILD sdlmame-0.159.ebuild 4132 SHA256 c0c75f69d2a8d7858f33ef96346134a2ffdead7e128874ae404d81872fc8c8a1 SHA512 fd5c78d1aa5bb81a56488bcc4b3315d6ebb411639823440ba682290537808ae7ec2785930ea87accf14ef97d408f06c4643f36d59a66a984da39b27d04ea421d WHIRLPOOL e7be7660288a02c7069f1c79c88ea8ad8297e315fa62e2d03ff70407346037e9b534ae6daf75768ec803593838ef2b796ad9f64b96342f4eafe8c4171434a3cd
+DIST sdlmame0148u1_diff.zip 3386949 SHA256 27378d09e50f31ca0dd4f39df4c474016671946657eb7af9ea5aa0ffbae1d9bb SHA512 f62aa8ebfc3cfa96d2fd5e58c921cc2adfbe3704a745ef49bc247060ecd3333ecc12e1a3add810c6237f3f7a1946cf1b9d46e6d72aeb87baffebadb933de44de WHIRLPOOL 550f2e777363f307b8e56b4ec31f4852abe89434af5ce596bd6e6023f35a728e4078033b1edc4b302e0cf50fa646a190ec02be9329127379405aec2e9b591531
+EBUILD sdlmame-0.148_p1-r88.ebuild 4786 SHA256 d604ff02f53305ca7848f18013c248c17229c7aae9aae2b1c7c4c72c64c58d90 SHA512 61f72be57642e89896ea9fcea8c29b15ef7f22b1db4b1392af1a73354f2e65ccdbe5b95288511310eab75e1990e1b10f94fd44df08dd809ec3ec3fdacd1237bd WHIRLPOOL 4745a04c7ea5995e397778597161fd517a87ea8d805ce914e5ca523e3026c54600b3984f619de24def0c8a31d23de209eec408a46f8c8bf1e96123b9b58eb056
+MISC Manifest.orig 6879 SHA256 1b277c4bec7e2bb74bf2b3511dfee6aa585ebab7d467b75519f32a996ceacd01 SHA512 b07fb2b59051d1e49d47717dc5fa24a22688349d12cbf70fd0478f1bc8e0616e69719c46b5e4fcf736993f6aa220f39c72a70a99c12405b7562c8b7766cdeb7f WHIRLPOOL 67222e87a3b42696adbea20a7c44eb0a58e2bf8aa8c953cc23da9cfc058140187c4d32e07796f1af0faf7d08af47333cbaba01c7327fe2f7a367a5bfec440ea4
diff --git a/games-emulation/sdlmame/files/mame-0.159.ini.in b/games-emulation/sdlmame/files/mame-0.139.ini.in
similarity index 100%
rename from games-emulation/sdlmame/files/mame-0.159.ini.in
rename to games-emulation/sdlmame/files/mame-0.139.ini.in
diff --git a/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
new file mode 100644
index 0000000..f69cfe4
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
@@ -0,0 +1,79 @@
+--- work.orig/makefile	2011-11-09 22:40:30.000000000 -0500
++++ work/makefile	2011-11-16 19:24:24.615419949 -0500
+@@ -435,9 +435,6 @@
+ CPPONLYFLAGS += -x c++ -std=gnu++98
+ COBJFLAGS += -x objective-c++
+ 
+-# this speeds it up a bit by piping between the preprocessor/compiler/assembler
+-CCOMFLAGS += -pipe
+-
+ # add -g if we need symbols, and ensure we have frame pointers
+ ifdef SYMBOLS
+ CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
+@@ -442,7 +442,6 @@
+ 
+ # add -v if we need verbose build information
+ ifdef VERBOSE
+-CCOMFLAGS += -v
+ endif
+ 
+ # add profiling information for the compiler
+@@ -453,23 +450,6 @@
+ CCOMFLAGS += -pg
+ endif
+ 
+-# add the optimization flag
+-CCOMFLAGS += -O$(OPTIMIZE)
+-
+-# if we are optimizing, include optimization options
+-# and make all errors into warnings
+-ifneq ($(OPTIMIZE),0)
+-ifneq ($(TARGETOS),os2)
+-ifndef NOWERROR
+-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
+-else
+-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
+-endif
+-else
+-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
+-endif
+-endif
+-
+ # add a basic set of warnings
+ CCOMFLAGS += \
+ 	-Wall \
+@@ -524,20 +504,6 @@
+ endif
+ 
+ 
+-#-------------------------------------------------
+-# linking flags
+-#-------------------------------------------------
+-
+-# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
+-# flags only used when linking the core emulator
+-LDFLAGS =
+-ifneq ($(TARGETOS),macosx)
+-ifneq ($(TARGETOS),os2)
+-ifneq ($(TARGETOS),solaris)
+-LDFLAGS = -Wl,--warn-common
+-endif
+-endif
+-endif
+ LDFLAGSEMULATOR =
+ 
+ # add profiling information for the linker
+@@ -545,13 +511,6 @@
+ LDFLAGS += -pg
+ endif
+ 
+-# strip symbols and other metadata in non-symbols and non profiling builds
+-ifndef SYMBOLS
+-ifneq ($(TARGETOS),macosx)
+-LDFLAGS += -s
+-endif
+-endif
+-
+ # output a map file (emulator only)
+ ifdef MAP
+ LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
diff --git a/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
new file mode 100644
index 0000000..87eeae5
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
@@ -0,0 +1,11 @@
+--- ./src/osd/sdl/osdsdl.h.orig
++++ ./src/osd/sdl/osdsdl.h
+@@ -225,6 +225,8 @@
+ 	const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
+ #if USE_OPENGL
+ 	const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
++#else
++	const char *gl_lib() const { return NULL; }
+ #endif
+ 
+ private:
diff --git a/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch
new file mode 100644
index 0000000..7ba5969
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch
@@ -0,0 +1,177 @@
+--- makefile
++++ makefile
+@@ -314,13 +314,14 @@
+ endif
+ 
+ # compiler, linker and utilities
+-AR = @ar
+-CC = @gcc
+-LD = @g++
++AR ?= @ar
++CC ?= @gcc
++CXX ?= @g++
++LD = $(CXX)
+ MD = -mkdir$(EXE)
+ RM = @rm -f
+ OBJDUMP = @objdump
+-PYTHON = @python
++PYTHON ?= @python
+ 
+ 
+ #-------------------------------------------------
+@@ -455,7 +456,7 @@
+ 
+ # CFLAGS is defined based on C or C++ targets
+ # (remember, expansion only happens when used, so doing it here is ok)
+-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
++CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
+ 
+ # we compile C-only to C89 standard with GNU extensions
+ # we compile C++ code to C++98 standard with GNU extensions
+@@ -463,9 +464,6 @@
+ CPPONLYFLAGS += -x c++ -std=gnu++98
+ COBJFLAGS += -x objective-c++
+ 
+-# this speeds it up a bit by piping between the preprocessor/compiler/assembler
+-CCOMFLAGS += -pipe
+-
+ # add -g if we need symbols, and ensure we have frame pointers
+ ifdef SYMBOLS
+ CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
+@@ -479,19 +477,6 @@
+ # add profiling information for the compiler
+ ifdef PROFILE
+ CCOMFLAGS += -pg
+-endif
+-
+-# add the optimization flag
+-CCOMFLAGS += -O$(OPTIMIZE)
+-
+-# add the error warning flag
+-ifndef NOWERROR
+-CCOMFLAGS += -Werror
+-endif
+-
+-# if we are optimizing, include optimization options
+-ifneq ($(OPTIMIZE),0)
+-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
+ endif
+ 
+ # add a basic set of warnings
+@@ -565,26 +550,11 @@
+ 
+ # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
+ # flags only used when linking the core emulator
+-LDFLAGS =
+-ifneq ($(TARGETOS),macosx)
+-ifneq ($(TARGETOS),os2)
+-ifneq ($(TARGETOS),solaris)
+-LDFLAGS = -Wl,--warn-common
+-endif
+-endif
+-endif
+ LDFLAGSEMULATOR =
+ 
+ # add profiling information for the linker
+ ifdef PROFILE
+ LDFLAGS += -pg
+-endif
+-
+-# strip symbols and other metadata in non-symbols and non profiling builds
+-ifndef SYMBOLS
+-ifneq ($(TARGETOS),macosx)
+-LDFLAGS += -s
+-endif
+ endif
+ 
+ # output a map file (emulator only)
+--- src/osd/sdl/sdl.mak
++++ src/osd/sdl/sdl.mak
+@@ -24,6 +24,8 @@
+ # uncomment and edit next line to specify a distribution
+ # supported debian-stable, ubuntu-intrepid
+ 
++PKG_CONFIG ?= pkg-config
++
+ # DISTRO = debian-stable
+ # DISTRO = ubuntu-intrepid
+ # DISTRO = gcc44-generic
+@@ -91,9 +93,9 @@
+ endif
+ 
+ ifdef SDL_INSTALL_ROOT
+-SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
++SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
+ else
+-SDL_CONFIG = $(SDL_LIBVER)-config
++SDL_CONFIG ?= $(SDL_LIBVER)-config
+ endif
+ 
+ ifeq ($(SDL_LIBVER),sdl2)
+@@ -190,8 +192,8 @@
+ SDL_NETWORK = taptun
+ 
+ ifndef NO_USE_MIDI
+-INCPATH += `pkg-config --cflags alsa`
+-LIBS += `pkg-config --libs alsa`
++INCPATH += $(shell $(PKG_CONFIG) --cflags alsa)
++LIBS += $(shell $(PKG_CONFIG) --libs alsa)
+ endif
+ 
+ endif
+@@ -476,10 +478,10 @@
+ # Remove the "/SDL" component from the include path so that we can compile
+ # files (header files are #include "SDL/something.h", so the extra "/SDL"
+ # causes a significant problem)
+-INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
++INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
+ CCOMFLAGS += -DNO_SDL_GLEXT
+ # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
+-LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
++LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread
+ DEFS += -DMACOSX_USE_LIBSDL
+ endif   # MACOSX_USE_LIBSDL
+ 
+@@ -532,8 +534,8 @@
+ endif
+ endif
+ 
+-INCPATH += `pkg-config --cflags fontconfig`
+-LIBS += `pkg-config --libs fontconfig`
++INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig)
++LIBS += $(shell $(PKG_CONFIG) --libs fontconfig)
+ 
+ ifeq ($(SDL_LIBVER),sdl2)
+ LIBS += -lSDL2_ttf
+@@ -616,8 +618,8 @@
+ 
+ ifeq ($(BASE_TARGETOS),os2)
+ 
+-INCPATH += `sdl-config --cflags`
+-LIBS += `sdl-config --libs`
++INCPATH += $(shell $(SDL_CONFIG) --cflags)
++LIBS += $(shell $(SDL_CONFIG) --libs)
+ 
+ endif # OS2
+ 
+@@ -690,15 +692,15 @@
+ 
+ # the new debugger relies on GTK+ in addition to the base SDLMAME needs
+ # Non-X11 builds can not use the debugger
+-INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
+-CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
+-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
++INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
++CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
++LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
+ #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
+ 
+ # The newer debugger uses QT
+ ifdef USE_QTDEBUG
+-INCPATH += `pkg-config QtGui --cflags`
+-LIBS += `pkg-config QtGui --libs`
++INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
++LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
+ endif
+ 
+ # some systems still put important things in a different prefix
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
new file mode 100644
index 0000000..7b339ba
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
+--- a/src/osd/sdl/osdsdl.h	2012-07-11 20:49:55.070264487 +0200
++++ b/src/osd/sdl/osdsdl.h	2012-07-11 20:51:45.976264395 +0200
+@@ -216,6 +216,8 @@
+ 	const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
+ #if USE_OPENGL
+ 	const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
++#else
++    const char *gl_lib() const { return NULL; }
+ #endif
+ 
+ private:
diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch b/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch
new file mode 100644
index 0000000..97e4b8f
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch
@@ -0,0 +1,191 @@
+commit 938cfdf1f01bcc9ac736249ee6458a774d560738
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Jun 25 23:48:02 2013 +0200
+
+    QA: respect several environment variables
+    
+    such as CC,CFLAGS,PKG_CONFIG...
+
+diff --git a/makefile b/makefile
+index ad6ae2d..dd4598d 100644
+--- a/makefile
++++ b/makefile
+@@ -317,13 +317,15 @@ BUILD_EXE = $(EXE)
+ endif
+ 
+ # compiler, linker and utilities
+-AR = @ar
+-CC = @gcc
+-LD = @g++
++AR ?= @ar
++CC ?= @gcc
++CXX ?= @g++
++LD = $(CXX)
+ MD = -mkdir$(EXE)
+ RM = @rm -f
+ OBJDUMP = @objdump
+-PYTHON = @python
++PYTHON ?= @python
++PKG_CONFIG ?= pkg-config
+ 
+ 
+ #-------------------------------------------------
+@@ -458,7 +460,7 @@ CPPONLYFLAGS =
+ 
+ # CFLAGS is defined based on C or C++ targets
+ # (remember, expansion only happens when used, so doing it here is ok)
+-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
++CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
+ 
+ # we compile C-only to C89 standard with GNU extensions
+ # we compile C++ code to C++98 standard with GNU extensions
+@@ -466,9 +468,6 @@ CONLYFLAGS += -std=gnu89
+ CPPONLYFLAGS += -x c++ -std=gnu++98
+ COBJFLAGS += -x objective-c++
+ 
+-# this speeds it up a bit by piping between the preprocessor/compiler/assembler
+-CCOMFLAGS += -pipe
+-
+ # add -g if we need symbols, and ensure we have frame pointers
+ ifdef SYMBOLS
+ CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
+@@ -484,19 +483,6 @@ ifdef PROFILE
+ CCOMFLAGS += -pg
+ endif
+ 
+-# add the optimization flag
+-CCOMFLAGS += -O$(OPTIMIZE)
+-
+-# add the error warning flag
+-ifndef NOWERROR
+-CCOMFLAGS += -Werror
+-endif
+-
+-# if we are optimizing, include optimization options
+-ifneq ($(OPTIMIZE),0)
+-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
+-endif
+-
+ # add a basic set of warnings
+ CCOMFLAGS += \
+ 	-Wall \
+@@ -576,14 +562,6 @@ endif
+ 
+ # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
+ # flags only used when linking the core emulator
+-LDFLAGS =
+-ifneq ($(TARGETOS),macosx)
+-ifneq ($(TARGETOS),os2)
+-ifneq ($(TARGETOS),solaris)
+-LDFLAGS = -Wl,--warn-common
+-endif
+-endif
+-endif
+ LDFLAGSEMULATOR =
+ 
+ # add profiling information for the linker
+@@ -591,13 +569,6 @@ ifdef PROFILE
+ LDFLAGS += -pg
+ endif
+ 
+-# strip symbols and other metadata in non-symbols and non profiling builds
+-ifndef SYMBOLS
+-ifneq ($(TARGETOS),macosx)
+-LDFLAGS += -s
+-endif
+-endif
+-
+ # output a map file (emulator only)
+ ifdef MAP
+ LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
+diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
+index 84332ef..36655d3 100644
+--- a/src/osd/sdl/sdl.mak
++++ b/src/osd/sdl/sdl.mak
+@@ -24,6 +24,8 @@
+ # uncomment and edit next line to specify a distribution
+ # supported debian-stable, ubuntu-intrepid
+ 
++PKG_CONFIG ?= pkg-config
++
+ # DISTRO = debian-stable
+ # DISTRO = ubuntu-intrepid
+ # DISTRO = gcc44-generic
+@@ -88,9 +90,9 @@ SDL_LIBVER = sdl
+ endif
+ 
+ ifdef SDL_INSTALL_ROOT
+-SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
++SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
+ else
+-SDL_CONFIG = $(SDL_LIBVER)-config
++SDL_CONFIG ?= $(SDL_LIBVER)-config
+ endif
+ 
+ ifeq ($(SDL_LIBVER),sdl2)
+@@ -187,8 +189,8 @@ SYNC_IMPLEMENTATION = tc
+ SDL_NETWORK = taptun
+ 
+ ifndef NO_USE_MIDI
+-INCPATH += `pkg-config --cflags alsa`
+-LIBS += `pkg-config --libs alsa`
++INCPATH += $(shell $(PKG_CONFIG) --cflags alsa)
++LIBS += $(shell $(PKG_CONFIG) --libs alsa)
+ endif
+ 
+ endif
+@@ -478,10 +480,10 @@ else
+ # Remove the "/SDL" component from the include path so that we can compile
+ # files (header files are #include "SDL/something.h", so the extra "/SDL"
+ # causes a significant problem)
+-INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
++INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
+ CCOMFLAGS += -DNO_SDL_GLEXT
+ # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
+-LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
++LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread
+ DEFS += -DMACOSX_USE_LIBSDL
+ endif   # MACOSX_USE_LIBSDL
+ 
+@@ -534,8 +536,8 @@ INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb
+ endif
+ endif
+ 
+-INCPATH += `pkg-config --cflags fontconfig`
+-LIBS += `pkg-config --libs fontconfig`
++INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig)
++LIBS += $(shell $(PKG_CONFIG) --libs fontconfig)
+ 
+ ifeq ($(SDL_LIBVER),sdl2)
+ LIBS += -lSDL2_ttf
+@@ -620,8 +622,8 @@ endif   # Win32
+ 
+ ifeq ($(BASE_TARGETOS),os2)
+ 
+-INCPATH += `sdl-config --cflags`
+-LIBS += `sdl-config --libs`
++INCPATH += $(shell $(SDL_CONFIG) --cflags)
++LIBS += $(shell $(SDL_CONFIG) --libs)
+ 
+ endif # OS2
+ 
+@@ -696,14 +698,14 @@ LIBS += -lX11 -lXinerama
+ 
+ # The newer debugger uses QT
+ ifndef NO_USE_QTDEBUG
+-INCPATH += `pkg-config QtGui --cflags`
+-LIBS += `pkg-config QtGui --libs`
++INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
++LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
+ else
+ # the old-new debugger relies on GTK+ in addition to the base SDLMAME needs
+ # Non-X11 builds can not use the debugger
+-INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
+-CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
+-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
++INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
++CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
++LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
+ endif
+ 
+ # some systems still put important things in a different prefix
diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch b/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch
new file mode 100644
index 0000000..6c7cd5d
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch
@@ -0,0 +1,28 @@
+commit ec92ac2b0180b101c30748e62eb8b76cdf0cb439
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jun 26 14:33:01 2013 +0200
+
+    remove unneeded linking
+    
+    if we don't build the debugger, we don't want gtk+ linking
+
+diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
+index 36655d3..2089707 100644
+--- a/src/osd/sdl/sdl.mak
++++ b/src/osd/sdl/sdl.mak
+@@ -696,6 +696,7 @@ else
+ DEFS += -DSDLMAME_X11
+ LIBS += -lX11 -lXinerama
+ 
++ifneq ($(NO_DEBUGGER),1)
+ # The newer debugger uses QT
+ ifndef NO_USE_QTDEBUG
+ INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
+@@ -707,6 +708,7 @@ INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
+ CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
+ LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
+ endif
++endif # NO_DEBUGGER
+ 
+ # some systems still put important things in a different prefix
+ LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib
diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch
new file mode 100644
index 0000000..cd32cd3
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch
@@ -0,0 +1,19 @@
+commit 6ee372b3693857372a7b4855039ad1a94d3aebca
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Jun 25 23:51:12 2013 +0200
+
+    fix for disabled opengl
+
+diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
+index ed0b66b..03d68f9 100644
+--- a/src/osd/sdl/osdsdl.h
++++ b/src/osd/sdl/osdsdl.h
+@@ -219,6 +219,8 @@ public:
+ 	const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
+ #if USE_OPENGL
+ 	const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
++#else
++    const char *gl_lib() const { return NULL; }
+ #endif
+ 
+ private:
diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch b/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch
new file mode 100644
index 0000000..8460497
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch
@@ -0,0 +1,33 @@
+commit ea514c9ded266aa365976649d88fa5593ef7ebf5
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Jun 25 23:48:26 2013 +0200
+
+    add switch to use system lua
+
+diff --git a/makefile b/makefile
+index dd4598d..bdf22d2 100644
+--- a/makefile
++++ b/makefile
+@@ -228,6 +228,9 @@ BUILD_JPEGLIB = 1
+ # uncomment next line to build PortMidi as part of MAME/MESS build
+ BUILD_MIDILIB = 1
+ 
++# uncomment next line to build Lua-5.2 as part of MAME/MESS build
++BUILD_LUA = 1
++
+ # uncomment next line to include the symbols
+ # SYMBOLS = 1
+ 
+@@ -664,7 +667,12 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a
+ FORMATS_LIB = $(OBJ)/libformats.a
+ 
+ # add LUA library
++ifeq ($(BUILD_LUA),1)
+ LUA_LIB = $(OBJ)/liblua.a
++else
++LIBS += $(shell $(PKG_CONFIG) --libs lua)
++INCPATH += $(shell $(PKG_CONFIG) --cflags lua)
++endif
+ 
+ # add PortMidi MIDI library
+ ifeq ($(BUILD_MIDILIB),1)
diff --git a/games-emulation/sdlmame/files/sdlmame-0.159-QA.patch b/games-emulation/sdlmame/files/sdlmame-0.159-QA.patch
deleted file mode 100644
index c17a009..0000000
--- a/games-emulation/sdlmame/files/sdlmame-0.159-QA.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -ru work.orig/makefile work/makefile
---- work.orig/makefile	2015-03-11 18:38:24.955335239 -0700
-+++ work/makefile	2015-03-11 18:39:03.870276079 -0700
-@@ -363,14 +363,16 @@
- 
- # compiler, linker and utilities
- ifneq ($(TARGETOS),emscripten)
--AR = @ar
--CC = @gcc
--LD = @g++
-+AR ?= @ar
-+CC ?= @gcc
-+CXX ?= @g++
-+LD = $(CXX)
- endif
- MD = -mkdir$(BUILD_EXE)
- RM = @rm -f
- OBJDUMP = @objdump
--PYTHON = @python
-+PYTHON ?= @python
-+PKG_CONFIG ?= pkg-config
- 
- #-------------------------------------------------
- # form the name of the executable
-@@ -523,7 +525,7 @@
- 
- # CFLAGS is defined based on C or C++ targets
- # (remember, expansion only happens when used, so doing it here is ok)
--CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH)
-+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH)
- 
- # we compile C-only to C89 standard with GNU extensions
- # we compile C++ code to C++98 standard with GNU extensions
-@@ -535,9 +537,6 @@
- endif
- COBJFLAGS += -x objective-c++
- 
--# this speeds it up a bit by piping between the preprocessor/compiler/assembler
--CCOMFLAGS += -pipe
--
- # add -g if we need symbols, and ensure we have frame pointers
- ifdef SYMBOLS
- CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -fno-optimize-sibling-calls
-@@ -564,22 +563,6 @@
- CCOMFLAGS += -pg
- endif
- 
--# add the optimization flag
--CCOMFLAGS += -O$(OPTIMIZE)
--
--# add the error warning flag
--ifndef NOWERROR
--CCOMFLAGS += -Werror
--endif
--
--# if we are optimizing, include optimization options
--ifneq ($(OPTIMIZE),0)
--CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
--ifdef LTO
--CCOMFLAGS += -flto
--endif
--endif
--
- ifdef SSE2
- CCOMFLAGS += -msse2
- endif
-@@ -662,30 +645,11 @@
- # linking flags
- #-------------------------------------------------
- 
--# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
--# flags only used when linking the core emulator
--LDFLAGS =
--ifneq ($(TARGETOS),macosx)
--ifneq ($(TARGETOS),os2)
--ifneq ($(TARGETOS),solaris)
--LDFLAGS = -Wl,--warn-common
--endif
--endif
--endif
--LDFLAGSEMULATOR =
--
- # add profiling information for the linker
- ifdef PROFILE
- LDFLAGS += -pg
- endif
- 
--# strip symbols and other metadata in non-symbols and non profiling builds
--ifndef SYMBOLS
--ifneq ($(TARGETOS),macosx)
--LDFLAGS += -s
--endif
--endif
--
- ifneq ($(OPTIMIZE),0)
- ifdef LTO
- LDFLAGS += -flto
-diff -ru work.orig/src/osd/sdl/sdl.mak work/src/osd/sdl/sdl.mak
---- work.orig/src/osd/sdl/sdl.mak	2015-03-11 18:38:20.074217228 -0700
-+++ work/src/osd/sdl/sdl.mak	2015-03-11 18:41:08.653292939 -0700
-@@ -24,6 +24,8 @@
- # uncomment and edit next line to specify a distribution
- # supported debian-stable, ubuntu-intrepid
- 
-+PKG_CONFIG ?= pkg-config
-+
- # DISTRO = debian-stable
- # DISTRO = ubuntu-intrepid
- # DISTRO = gcc44-generic
-@@ -107,9 +109,9 @@
- endif
- 
- ifdef SDL_INSTALL_ROOT
--SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
-+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
- else
--SDL_CONFIG = $(SDL_LIBVER)-config
-+SDL_CONFIG ?= $(SDL_LIBVER)-config
- endif
- 
- ifeq ($(SDL_LIBVER),sdl2)
-@@ -761,8 +763,8 @@
- #-------------------------------------------------
- 
- ifndef NO_USE_QTDEBUG
--$(OSDOBJ)/%.moc.c: $(OSDSRC)/%.h
--	$(MOC) $(MOCINCPATH) $< -o $@
-+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
-+LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
- 
- DEBUGOBJS = \
- 	$(OSDOBJ)/modules/debugger/qt/debuggerview.o \
diff --git a/games-emulation/sdlmame/files/sdlmame-0.159-debugger-linking.patch b/games-emulation/sdlmame/files/sdlmame-0.159-debugger-linking.patch
deleted file mode 100644
index 5b44a80..0000000
--- a/games-emulation/sdlmame/files/sdlmame-0.159-debugger-linking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru work.orig/src/osd/sdl/sdl.mak work/src/osd/sdl/sdl.mak
---- work.orig/src/osd/sdl/sdl.mak	2015-03-11 18:42:22.102068698 -0700
-+++ work/src/osd/sdl/sdl.mak	2015-03-11 18:43:24.594579570 -0700
-@@ -855,6 +855,7 @@
- BASELIBS += -lX11
- endif
- 
-+ifneq ($(NO_DEBUGGER),1)
- # The newer debugger uses QT
- ifndef NO_USE_QTDEBUG
- QTCFLAGS := $(shell pkg-config --cflags QtGui)
-@@ -863,6 +864,7 @@
- INCPATH += $(QTCFLAGS)
- LIBS += $(QTLIBS)
- endif
-+endif # NO_DEBUGGER
- 
- # some systems still put important things in a different prefix
- LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib
diff --git a/games-emulation/sdlmame/files/sdlmame-0.159-sdl_ttf.patch b/games-emulation/sdlmame/files/sdlmame-0.159-sdl_ttf.patch
deleted file mode 100644
index 661bff0..0000000
--- a/games-emulation/sdlmame/files/sdlmame-0.159-sdl_ttf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru work.orig/src/osd/modules/font/font_sdl.c work/src/osd/modules/font/font_sdl.c
---- work.orig/src/osd/modules/font/font_sdl.c	2015-03-11 18:43:43.528037322 -0700
-+++ work/src/osd/modules/font/font_sdl.c	2015-03-11 18:44:00.170439682 -0700
-@@ -8,11 +8,7 @@
- 
- #if defined(SDLMAME_UNIX) && (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_SOLARIS)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN))
- 
--#if (SDLMAME_SDL2)
--#include <SDL2/SDL_ttf.h>
--#else
- #include <SDL/SDL_ttf.h>
--#endif
- #ifndef SDLMAME_HAIKU
- #include <fontconfig/fontconfig.h>
- #endif
-diff -ru work.orig/src/osd/sdl/sdl.mak work/src/osd/sdl/sdl.mak
---- work.orig/src/osd/sdl/sdl.mak	2015-03-11 18:43:43.526037273 -0700
-+++ work/src/osd/sdl/sdl.mak	2015-03-11 18:44:00.170439682 -0700
-@@ -649,11 +649,7 @@
- endif
- LIBS += $(FONTCONFIGLIBS)
- 
--ifeq ($(SDL_LIBVER),sdl2)
--LIBS += -lSDL2_ttf
--else
- LIBS += -lSDL_ttf
--endif
- 
- # FIXME: should be dealt with elsewhere
- # libs that Haiku doesn't want but are mandatory on *IX
diff --git a/games-emulation/sdlmame/sdlmame-0.159.ebuild b/games-emulation/sdlmame/sdlmame-0.159.ebuild
deleted file mode 100644
index 9307134..0000000
--- a/games-emulation/sdlmame/sdlmame-0.159.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.149.ebuild,v 1.1 2013/06/26 13:14:28 hasufell Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit eutils flag-o-matic python-any-r1 games
-
-MY_ZIP="mame0159s.zip"
-
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-
-HOMEPAGE="http://mamedev.org/"
-
-RESTRICT="mirror"
-
-SRC_URI="http://mamedev.org/downloader.php?file=releases/${MY_ZIP}"
-if [[ ${PN} == "sdlmame" ]] ; then
-	SRC_URI="$SRC_URI http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-fi
-
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="X alsa debug opengl"
-REQUIRED_USE="debug? ( X )"
-
-RDEPEND="dev-libs/expat
-	media-libs/fontconfig
-	media-libs/flac
-	>=media-libs/libsdl2-2.0.3[sound,joystick,opengl?,video]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	virtual/jpeg
-	alsa? ( media-libs/alsa-lib )
-	debug? (
-		>=dev-qt/qtgui-4.7
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXinerama
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	virtual/pkgconfig
-	X? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
-	sed -i \
-		-e "/$1.*=/s:^:# :" \
-		"${S}"/${2:-makefile} \
-		|| die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
-	sed -i \
-		-e "/^#.*$1.*=/s:^#::"  \
-		"${S}"/${2:-makefile} \
-		|| die "sed failed"
-}
-
-pkg_setup() {
-	games_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	unpack ./mame.zip
-	rm -f mame.zip
-}
-
-src_prepare() {
-	edos2unix makefile src/osd/sdl/{osdsdl.h,sdl.mak}
-
-	epatch \
-		"${FILESDIR}"/${P}-QA.patch \
-		"${FILESDIR}"/${P}-debugger-linking.patch \
-		"${FILESDIR}"/${P}-sdl_ttf.patch
-
-	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: expat, flac, jpeg, zlib"
-	disable_feature BUILD_EXPAT
-	disable_feature BUILD_FLAC
-	disable_feature BUILD_JPEG
-	disable_feature BUILD_ZLIB
-
-	if use amd64; then
-		einfo "Enabling 64-bit support"
-		enable_feature PTR64
-	fi
-
-	if use ppc; then
-		einfo "Enabling PPC support"
-		enable_feature BIGENDIAN
-	fi
-
-	if use debug; then
-		einfo "Enabling debug support"
-		enable_feature DEBUG
-		enable_feature DEBUG src/osd/sdl/sdl.mak
-	fi
-
-	enable_feature NO_USE_QTDEBUG src/osd/sdl/sdl.mak
-
-	if ! use opengl ; then
-		einfo "Disabling opengl support"
-		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
-	fi
-
-	if ! use alsa ; then
-		einfo "Disabling alsa midi support"
-		enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak
-	fi
-
-	if ! use X ; then
-		einfo "Disabling X support"
-		enable_feature NO_X11 src/osd/sdl/sdl.mak
-	fi
-}
-
-src_compile() {
-	emake \
-		PYTHON=python2
-		TARGET="${PN#sdl}" \
-		NAME="${PN}" \
-		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"' \
-		NO_DEBUGGER=$(usex debug "0" "1") default
-}
-
-src_install() {
-	newgamesbin ${PN#sdl}$(use amd64 && echo 64)$(use debug && echo d) ${PN}
-
-	newman src/osd/sdl/man/${PN#sdl}.6 ${PN}.6
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r src/osd/sdl/keymaps
-	[[ ${PN} == "sdlmame" ]] && newins sdlmame-ui.bdf ui.bdf
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${FILESDIR}"/vector.ini
-
-	sed \
-		-e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
-		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
-		"${FILESDIR}/${PN/sdl}-${PV}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${PN/sdl}.ini" \
-		|| die "sed failed"
-
-	dodoc docs/{config,mame,newvideo}.txt
-	if [[ ${PN} == "sdlmame" ]] ; then
-		dodoc whatsnew*.txt
-	else
-		dodoc messnew*.txt
-	fi
-
-	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
-		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "optional dependencies:"
-	elog "  games-emulation/sdlmametools (development tools)"
-	echo
-	elog "It's strongly recommended that you change either the system-wide"
-	elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}"
-
-	if use opengl; then
-		echo
-		elog "You built ${PN} with opengl support and should set"
-		elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that"
-	fi
-}