version bump wrt #474638

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

7 files changed, 488 insertions, 10 deletions

diff --git a/games-emulation/sdlmame/ChangeLog b/games-emulation/sdlmame/ChangeLog
index bf678ee02241..ac417f3fea2b 100644
--- a/games-emulation/sdlmame/ChangeLog
+++ b/games-emulation/sdlmame/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/sdlmame
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.62 2013/03/15 19:31:07 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.63 2013/06/26 13:14:28 hasufell Exp $
+
+*sdlmame-0.149 (26 Jun 2013)
+
+  26 Jun 2013; Julian Ospald <hasufell@gentoo.org> +sdlmame-0.149.ebuild,
+  +files/sdlmame-0.149-QA.patch, +files/sdlmame-0.149-debugger-linking.patch,
+  +files/sdlmame-0.149-no-opengl.patch, +files/sdlmame-0.149-system-lua.patch:
+  version bump wrt #474638
 
 *sdlmame-0.148_p1-r1 (15 Mar 2013)
 
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 3cceb2c5798e..5f9e7114071a 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -8,10 +8,15 @@ AUX sdlmame-0.144-makefile.patch 1934 SHA256 f7b7d9705efa1e3db683fc234d358de9948
 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 vector.ini 116 SHA256 408aeaaffcb2ecccd20db457f22d2d5efa930c0f62a92987b0fbefaf6c038c23 SHA512 6d84eb7b9c4e9f134b57e64ba9ae30dcaaa620296830f7c9858611fde9064f803bd7d230a989a5cce34d8b815b5a98d323b19d3eef3d4c688b5c32b96b299f5f WHIRLPOOL f60543015a0195487917c696640cc66e29109298ac8f9bd1309346f6ab1b46d8e2ce83d00506c17a9ea588f6b3bac82f0f66d7e75bbf88656ba897cd50fa3dac
 DIST mame0142s.zip 17657289 SHA256 d5ccb987088522a203bf978a34eab8fa8c8560947a13373d48c11b2a496b6986 SHA512 4d6a1f8a0f8c10e009c1b7de7ff51682cbf6c32db13eec0a7aa70d1631e17f14a680c2edbdbc7d73cd3bf65120a5e331379c25404041dc96c2436ca5c3a17e3f WHIRLPOOL 8854bc7b8f101f95bf75d298ce2391b1ba33987992a9b9c7fbbf76e7b4a5109a3859bab35047d0110801ccf6b9624d5be1f60daa1b4c6f81a2006165c84c0da2
 DIST mame0144s.zip 19676308 SHA256 8f0191b40f80f8a3393d341f411c5f02aca6933d6a9f347bec0d2f7206c38e06 SHA512 3267137dae592ff45aac0acdf0d653db425ff9f59ceefa1c8d4cc6af1643490ea02c0ee1da4cc298f54f5ebb9b9e7609910bc34329d7f0fac9c13b7344f8574c WHIRLPOOL 52c869d19d3987d537b0e59890313adf4011eb6349c928e01ccc66455cd15bb2bf4ac071bc38d4bb5e8eeaa4dcce1b44a7aae5ed6d7b81497dedfdcd95b78cc4
 DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a
+DIST mame0149s.zip 35160585 SHA256 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b SHA512 4b8bd72e93f71fdb52c643776ecefb87fe605effe3f8c1724156cf7fafb8107330d92914eb14208a170cd5a0ee2775e7ea8d8edd0b525a35bbb0d5514172c1c3 WHIRLPOOL c5821ffc0f640e93986cd88f9e530be36e5ba0405a5dbc69a5021c828248dc74541340d5d9d49ece19635b5239bbaeeeb93bad2800fc46e9f441d8ffd3751ca5
 DIST sdlmame-ui.bdf.gz 114727 SHA256 f2ec11dd926bbeae8647e68607107516a30790239464939f3e99a0f62fc7f17e SHA512 67ba1bc632c1ac51b97acf8c1061477edd3519fea3d1233951723741c926ff72e259c274babb036abf4db92f217db507c58a6fc6e438db4b14c5fe5789b2ed64 WHIRLPOOL 2150053b38d8318804bf40cdcd9cdefdd2976c4cfab563c90021f0d9be0a0a57174166ece8b51658d9f2192e07343f198358299667a1db32f146c9fb9c528956
 DIST sdlmame0142u1_diff.zip 707350 SHA256 07be32275fc510b6b336cfd03de71e9c665914c41b0e8a39de694cc4e5fd3581 SHA512 791bd2b005b228484168e3db47fbbc8ece6dfb0c0e397d5f7e2b67aee021fc3b47652a34b956542ed777301a702e8bea3faebb669c45206ae6c6d89dcc45c48e WHIRLPOOL b8b1946c6a1b654383e2895d5d0d77a3cea40136a4f8a37d0d6dac9e8e5d518f7ecef2a86a82302a3b0d5fd01afa3695c43df633f09a2be136924e1a84590451
 DIST sdlmame0142u2_diff.zip 246135 SHA256 decbf4ac431b802fe3b9d5f87141c6b1a5057d3ee8ec619af070dccbdfc89e42 SHA512 dcda9066582de227f42bfbdc4d507062fc2a77269b4b3565a9214aa9c6ed88461b027eb1fdbfd3616b98a1e2ecf8a9ce8ce86ea9d18d4cd04ce7848cbf03e50e WHIRLPOOL 2f9e8f1a0b0ab17fce3b45b739f3337205449e85071f529c2365f4f3eecf50d8440dbb4935bafe693b6b4669ecc202c2f8bdcd79f8a2c3d0555c21e19a5e06f9
@@ -23,16 +28,17 @@ EBUILD sdlmame-0.142_p5.ebuild 3899 SHA256 ddc8eb28298b27c76ae249a20440d8423345b
 EBUILD sdlmame-0.144.ebuild 3932 SHA256 30847caaa08cceaa485c0a349e8da629241f38d5b211ea7e40f83e614ae0381b SHA512 ac683fbb31a01673434869ac897fac37fd8991bd295bf99fa5c59d134352f19e5ccce28e5393fa9ed65fc1eb12630eb06a2c2cd3475486e3169b0f2ddccd15b1 WHIRLPOOL f82289ad42d84a714cd5cb2628a7ca05c74831b17b09a59f24246544ac880b73d34a26f11eb02e8e491f111302b595d3968d17d53f99122ec22d7f45b9dea723
 EBUILD sdlmame-0.148_p1-r1.ebuild 4457 SHA256 cc2520c23bd2b3efd8dfa7a89e82014ca173055c2d287387615fccfea71f6d7d SHA512 7d86d1ad9647560fe62e00524042cca870bac4eec4ce82fd74499ae7866263aa261c610ff4cb767f8f2cc642431e01e687c60802f907ff1a83ae10859e63ec3a WHIRLPOOL 5b2416ba536a3656ae624d03bbeb43504a1c870111e13bebb1f3df7324a4f110af2e5eeffee83ef5837c7fc7d460b6df91f31e28e41d7cc171529befb9a39377
 EBUILD sdlmame-0.148_p1.ebuild 4390 SHA256 aa8744bd4582d2d5012abf74ce1d1b364dae9e744cc05e6c18bb73c5f9b15156 SHA512 59bc80b4ecbf0535f3482dcba424cc791ddcf80f43428316891725fb6aaf422db6535f2414aa19ed0b91718e0485df4ce48c874a289fee78e60067101bd0ecd9 WHIRLPOOL f5a565c99550936513978cac5546425ce870fb130b868ea6832e52fbd9aaef4a6682907a72fbebc0ca6652dc8df2627cdd32cfc9db273ff7ec2433d742b0f352
-MISC ChangeLog 9127 SHA256 334de5a3deaca5f6531b58884589010a0004ae977cd3b8cbf7ec2b4d6a7b98b8 SHA512 580fceff09e87292e308b9bae6e4ba6f206609a600a01c38a22b3fd31ca29f5532ae4fea834469e26c2fa610733c8d9f07c9dbb07ba5085f1fec140112adfef2 WHIRLPOOL 0bcbd24c16158556f5950dcfcffe17d86a7489ce1f3600d47a66f7c22e7f6e5031add8741c2cbba312a7603541983f270e39546f12e8d5417e0381b65dc7d6c4
+EBUILD sdlmame-0.149.ebuild 4716 SHA256 028ad6f82096196fbd0c7162d71f892a95d4463effa1e9f17726f4f1c7f496d7 SHA512 260600495b64d0650562081eaa47da46f7e359da06a0fc51a9e23f9e3affafc3ee5e38da1b7fc9d6e19e6697db4b642ccc1c8cff9571b59f7b1a76c7d96ad9f5 WHIRLPOOL 9d56d6e724fc103b80c87621dcc0b289760febf7679471fae28cdf72e985297211728552953b096d7fffa0761a6c7fad2e3307867da46b39bf9edee1c5590c54
+MISC ChangeLog 9416 SHA256 65f842b9f30a9bac45eb02c0e10b52cf4ad5e2a7ed202ba1873e2b4f74a4b345 SHA512 8ecf7d89a7bd6712b503ccc1eb4fb05df1b1db4799b83e045fd48832a0f8b20e20971632373917afbca2b4130f0263e810d9c0a705f02e804c644d16cfe2afc3 WHIRLPOOL b11851bdcbb32bd0c67eff3efad6152083300edbb48a9b9d08a5a1a91a744412a03cc368364345443b4afe9cb2e394571cf0341b06240b59c108fcfcb8bc5442
 MISC metadata.xml 1089 SHA256 67982ede09eba43a5e84327f2f529031242424222e0d5170f31c8f2e647e937f SHA512 fabc3270c7ca7688881db69e07eaeafc8fca973f54a505bde22a56b914550c6dbb226eb96b89655565e51296290464bf754bc1a5a6895fb50f8cc530ec5d1feb WHIRLPOOL c924a0f7f846e7ee417106eea3c5893d1d98874b6ea61df9f53ec5ae0337115c9ee04b6b48cf40a1265522850ace75bba3add0b8b52343de79ad9950eb8bd3d8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRQ3cAAAoJEFpvPKfnPDWzzkoH/3m0SU7YxYMvX/x+/7Gvf2pa
-BD45D5A+dlL8lEDWsE5cz5XmUp/bACyrEtyI9hrIaQfJpyp7djYkarlAHd7Xk+Y/
-5Edhk+alZ+3ICYtAWWgvCp2hsqRu2WA1e3Fw43q0uJgYtPJ4AiZSpmPXf+PZweWF
-OWxr37v03mm8Y7l8P4YvuvMBRNdwGRDz8tZbwDWLsLfjSXJYoYfw4ZWebs5r9BCC
-BNBARwIBb5bOEPBGOsmsqRhrU8AIuI1MpYiXUm92ZeAMBYhT2wjLcyly4Jn8XGI3
-a3WOurqGKi+FCU0YSsu0IzstAPfNcFNSTUG3VlgBUGRvlf2HqzTtANg7wiYuh28=
-=vxRJ
+iQEcBAEBCAAGBQJRyuk3AAoJEFpvPKfnPDWz4xcH/0LoLexVQCHBjrVC1+eQDgU4
+C/RHhsK9u8iyerPb/bw0QXdlTymreBg0iLOf1sfdZkKhKcc9R/MaC5GdZLBxLY5L
+YfJjPpuQUER+QJr+D6oo6/fvZg6fRvuqy/ploURBL1Sk5yEWHhlAkgDMtpXBIaSh
+L1ihUKrtMSw3deRZqrPVzA3yIVg7fcEooz994oDeaPef5ksNP+SRYPITH7VCLLZp
++j1a7SyRq+hSSTxLJTUcRrO5dO2CGgTiLeF1kr7m4U/7SODsGEwQWmjbll9puIDY
+HcKUwhQjoGL0uKWFNj9ZKKmpATUlBwWgoahcOWKfTLa4uEpRsYwVr18Lsk4SOTU=
+=dddQ
 -----END PGP SIGNATURE-----
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 000000000000..97e4b8f41c10
--- /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 000000000000..6c7cd5d64199
--- /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 000000000000..cd32cd35d075
--- /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 000000000000..8460497f1d68
--- /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/sdlmame-0.149.ebuild b/games-emulation/sdlmame/sdlmame-0.149.ebuild
new file mode 100644
index 000000000000..2717d7f40a10
--- /dev/null
+++ b/games-emulation/sdlmame/sdlmame-0.149.ebuild
@@ -0,0 +1,194 @@
+# 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_PV=${PV/.}
+MY_CONF_PN=${PN/sdl}
+MY_P=sdlmame${MY_PV}
+MY_P=${MY_P%%_p*}
+MY_CONF_VER="0.139"
+
+# patches
+SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "http://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)"
+
+DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
+HOMEPAGE="http://mamedev.org/"
+# Upstream doesn't allow fetching with unknown User-Agent such as wget
+SRC_URI="$SRC_URI http://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.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-lang/lua-5.2
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/flac
+	>=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	virtual/jpeg
+	alsa? ( media-libs/alsa-lib )
+	debug? (
+		x11-libs/gtk+:2
+		gnome-base/gconf
+	)
+	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() {
+	if [[ $PV == *_p* ]] ; then
+		edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff
+		einfo "Patching release with source updates"
+		epatch ${MY_PV%%_p*}*.diff
+	fi
+	edos2unix makefile src/osd/sdl/{osdsdl.h,sdl.mak}
+
+	epatch \
+		"${FILESDIR}"/${P}-QA.patch \
+		"${FILESDIR}"/${P}-system-lua.patch \
+		"${FILESDIR}"/${P}-no-opengl.patch \
+		"${FILESDIR}"/${P}-debugger-linking.patch
+
+	# Don't compile zlib and expat
+	einfo "Disabling embedded libraries: expat, flac, jpeg, zlib, lua"
+	disable_feature BUILD_EXPAT
+	disable_feature BUILD_FLAC
+	disable_feature BUILD_JPEG
+	disable_feature BUILD_ZLIB
+	disable_feature BUILD_LUA
+
+	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 \
+		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}$(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}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".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
+}