version bump

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

14 files changed, 903 insertions, 27 deletions

diff --git a/games-emulation/sdlmametools/ChangeLog b/games-emulation/sdlmametools/ChangeLog
index 1d7710aa62e6..b1e6e43109cc 100644
--- a/games-emulation/sdlmametools/ChangeLog
+++ b/games-emulation/sdlmametools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-emulation/sdlmametools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmametools/ChangeLog,v 1.1 2013/03/15 19:36:48 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmametools/ChangeLog,v 1.2 2013/06/26 13:17:17 hasufell Exp $
+
+*sdlmametools-0.149 (26 Jun 2013)
+
+  26 Jun 2013; Julian Ospald <hasufell@gentoo.org> +sdlmametools-0.149.ebuild,
+  +files/sdlmametools-0.149-QA.patch,
+  +files/sdlmametools-0.149-debugger-linking.patch,
+  +files/sdlmametools-0.149-no-opengl.patch,
+  +files/sdlmametools-0.149-system-lua.patch:
+  version bump
 
 *sdlmametools-0.148_p1 (15 Mar 2013)
 
diff --git a/games-emulation/sdlmametools/Manifest b/games-emulation/sdlmametools/Manifest
index 7363e4f7f7ac..45eae15c5e96 100644
--- a/games-emulation/sdlmametools/Manifest
+++ b/games-emulation/sdlmametools/Manifest
@@ -3,19 +3,25 @@ Hash: SHA256
 
 AUX sdlmametools-0.148_p1-makefile.patch 4801 SHA256 1428162c7f80671b4919f81cdf8bdaf0d23cb3596fbf43deefeaabf8f22cbe43 SHA512 d6d6040fdbcce1cee24742fb3242e2c6372c34fd993933e6df8e6e12c1ef488d309f9dbaba23d91528f6e97411d1865c72f9d465176bcf91c95594bf33a2b2ad WHIRLPOOL 4cae6d00b4bcfab9a52e583ba1914c1f84f7a21aff31792e1c485d9f229b0e9b743f28cabc3acafcb5e50e16fb7f4a2843adcba84304013c2a9b0c5eec6b4a27
 AUX sdlmametools-0.148_p1-no-opengl.patch 436 SHA256 9c5052e2f942f4841175e260d9914dc052b1bcb9805086bb284758eeb37a918a SHA512 1ea614758b6726b8300d0c4a2c3801b76d59b21d8e121304ebb0700ff6478fe2d386170cf5a21fb553825dae06944b1ff6b020d042ccb888ba63dcd6e400e617 WHIRLPOOL ec79181dad422d0bf2ba5b751a23c69d81d9fe5855133aed28d6e1e32425b67cbd711808c1752fe6c25b5832b327d079085a681fa074126d4fcb1993dc409b8a
+AUX sdlmametools-0.149-QA.patch 5427 SHA256 c3e8e2cbe358f9c335f62c0c40a2157a9e158ea317c3445ba0f1dd2b74fd8aa3 SHA512 4974f121f4d1a14f9ec57a68504d9f3eb4ac4f518cf515fa8d1f5cdd976409d72f81b948573a8a2cff86c73d4eb5ac8299e119911960bb0575e3fe6e57b0fccb WHIRLPOOL 8e9f76aecdfbb81cb61a457f7a25613c4b9f0fe7f8730cb81bcf2fd0dfb2d434abd9d3901505c152cef93bd0daebed1b35635b262db4fd07bfb8ec04c5ce81da
+AUX sdlmametools-0.149-debugger-linking.patch 944 SHA256 5e9ed23651cd9f79f1303ef245d933ac94ffd92c8c950dd623bca9c292fc52b0 SHA512 24123983a613530d6bf4f52f2f5d191b1bed997f27384fb34b19c5fa629f8ebb09dceca334138ac93122fa2482834cbdecbfca91f290bcb9ab62bc0db829b99f WHIRLPOOL 31e8deefc11f1bfc58c63b7908ca540e658e2a62170968514aaaf029a6fe251c66eebd01cb7a71cf8b92ac1702209558896dc03f0f7249c6ede6e29ee3447685
+AUX sdlmametools-0.149-no-opengl.patch 558 SHA256 9d2b61809532f909439709c97bdcb7d6e167573753ce0166c9d50a60c311465a SHA512 f0a728262855367b2039c68c6bb676f3e957033334dd8d3a8ce82ebb28b51d759408a67c47fd8dd1705a3c883eb9362c633692fdf9dcdfe5a79ccbe19dc44dc8 WHIRLPOOL 6c752080ac2d233e7bbc606d641cd0e80235a8edaefbbe6fedf4e82afab03236575cc14ca60ca5bad768935b7e86dfefdaf1d4f8aac186d5b444464615f155f1
+AUX sdlmametools-0.149-system-lua.patch 851 SHA256 2ca1875b4425f1136a29003cdf54283e3785d2488c930e5611a7148c89a17bc1 SHA512 91c73f9992e326595bfa96820985de4ede9029df75e63ab28ac8d55d38021744ba5542178d788f68105d91f233513d26ceaf10c771a19f0545d07f39515c5db2 WHIRLPOOL 1e959a45a3f23bcdce30126976fb06422a90fdd02876615eaad035d5b34afeed4b055197bb84d928268cdf997d2944482d6ab915a1fda9dc3020c613523d6771
 DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a
+DIST mame0149s.zip 35160585 SHA256 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b SHA512 4b8bd72e93f71fdb52c643776ecefb87fe605effe3f8c1724156cf7fafb8107330d92914eb14208a170cd5a0ee2775e7ea8d8edd0b525a35bbb0d5514172c1c3 WHIRLPOOL c5821ffc0f640e93986cd88f9e530be36e5ba0405a5dbc69a5021c828248dc74541340d5d9d49ece19635b5239bbaeeeb93bad2800fc46e9f441d8ffd3751ca5
 DIST sdlmame0148u1_diff.zip 3386949 SHA256 27378d09e50f31ca0dd4f39df4c474016671946657eb7af9ea5aa0ffbae1d9bb SHA512 f62aa8ebfc3cfa96d2fd5e58c921cc2adfbe3704a745ef49bc247060ecd3333ecc12e1a3add810c6237f3f7a1946cf1b9d46e6d72aeb87baffebadb933de44de WHIRLPOOL 550f2e777363f307b8e56b4ec31f4852abe89434af5ce596bd6e6023f35a728e4078033b1edc4b302e0cf50fa646a190ec02be9329127379405aec2e9b591531
 EBUILD sdlmametools-0.148_p1.ebuild 2711 SHA256 8d749c459981b652e9001bbb70527ea03cd11e767fe22690254b1447306ec3a6 SHA512 9ceeb882e847efa82d4646036398b54353a312ab3242925a2989167983c5f091327d70688b2cfc6d84b852bab143ad6f59643ef9fc0701b8aa8f45e03bbfb1e2 WHIRLPOOL 0a2ce53d7f300b046dd53a46208c5de2a3852064cb84357d2c3ee26c5647d4ccf9cda7128d121d06a0d389af531b78df2c17c3371d3701824378c4779c7bd2e4
-MISC ChangeLog 518 SHA256 ac8cf7b415ac978baede17c900a57c24ee7cd91682de0524a10b900317d514cd SHA512 b99d37d0658ef7288696586a05f875fef3f29515fa935b0c5b0c2bc0f26e110749413d6445ba5f3e7770fbf0ef806f79623bd96bca919de995ab3bed6882dbc5 WHIRLPOOL e7524876f158be2ab22aa7b7090bdbf27d1d99d1716bfbf040d82b69f4c6424d1e7a5847eda980d79cb9c168eeefca6eb05c8dd4266c8df897e4dd48eae918f8
+EBUILD sdlmametools-0.149.ebuild 2761 SHA256 a6906b4868b763278755863194b8e481003fc71c5a1b1365a4ad96c12c2445ef SHA512 100a8c4f70583816a89550db7c4a981b5a841359b1e08e78c6ef88bc9b13b8fc03c3908cb85f3f86f89b199625923331649b7ed77da80f01dc2165e81632396d WHIRLPOOL 0c990705eabc389cdce1ac20773544dc351d4e44ba7082e0dcad7b0a3995b6131d4a963a0b2c363ad688d57cd985f89c26a0a94e53850a503f25561f2ba59a47
+MISC ChangeLog 829 SHA256 733553817f0c55dde92c82751da7deee08d577c3a7d5179a634f3014c561160f SHA512 aba5c615beae4e5256c743683507d7e724e369faa65d28bc6a8d616651cf0d6a549e2a9cbf5a6a05edd626ac4b651916cf85a72936d8b79cbe445b6a14074913 WHIRLPOOL fac6b4b32a2e690e8ee2734e95045dfb958d1c82fbf68cf4f142aa1c7d42ac0aa4b382b7a956a549855398046a781107c6f6ce47f5c33b698ef9d578692a2729
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRQ3hRAAoJEFpvPKfnPDWz8OAH/iWRCUCW9B7N3RvW4y+pzEP4
-P5uPxBH53NJudpSjys9lQo1ocX/89ShDv/rj4ekt6//Lqt83MMHIE0HyWa9QibEQ
-l/+qYjSvuajutNkh1LCPD1ArzVFrMJdPkcs7zBuDYQwnMNreVgTV1CEBaayZ6NkD
-yQwT7PbiuAM9CM9R/o0/uhHHiWsGjfwO5G/1z+TIKFCX4EcYlNbMKxWFejS+GOlc
-xVas/g+oNLMG8VBWt0x5yr3juAxeC3tHV5RVMq5iGMNQZpO467w4kiA5YNoTN5Su
-9iOq+Z2p5xTXIEwvHJvL5oxLUiUaNmxLLF+vpu8Hm+voMelqsIWVvZPoKtGigE4=
-=Y0KD
+iQEcBAEBCAAGBQJRyuneAAoJEFpvPKfnPDWzv6cIAJiWOIdJTVXkefY+iIJlM2te
+d8ikEsNRbw9NOZ9N3YMq2hl1E+2lKGoGqtsKQvhGuo0QXDkn4R56rluCC4cdRTsQ
+t1wjF2tq51KfKT8RwRk3rJ30WCH4kcjFR2b9CHZk1p/OL+sGXPqYdEWXRFbjZBLr
+4/1ddYnlkLAZIoenRxs5KJDgO/kvWEKIfY+Th6FeuHEjXkU9sx+USCmPO0Z4SAYs
+uggxPcCQBW//bsS1sQa9E5U0fyBOmMPh2wx8nxqXZ2XpPtSmdpws3+q5pRNaOO6E
+cYmMlMChUdEG5gg6/+UcxDkSSGLUXN3EF1K6RtsrI5c0b7bWsmYBypswrXlAkgE=
+=0dxh
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/sdlmametools/files/sdlmametools-0.149-QA.patch b/games-emulation/sdlmametools/files/sdlmametools-0.149-QA.patch
new file mode 100644
index 000000000000..97e4b8f41c10
--- /dev/null
+++ b/games-emulation/sdlmametools/files/sdlmametools-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/sdlmametools/files/sdlmametools-0.149-debugger-linking.patch b/games-emulation/sdlmametools/files/sdlmametools-0.149-debugger-linking.patch
new file mode 100644
index 000000000000..6c7cd5d64199
--- /dev/null
+++ b/games-emulation/sdlmametools/files/sdlmametools-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/sdlmametools/files/sdlmametools-0.149-no-opengl.patch b/games-emulation/sdlmametools/files/sdlmametools-0.149-no-opengl.patch
new file mode 100644
index 000000000000..cd32cd35d075
--- /dev/null
+++ b/games-emulation/sdlmametools/files/sdlmametools-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/sdlmametools/files/sdlmametools-0.149-system-lua.patch b/games-emulation/sdlmametools/files/sdlmametools-0.149-system-lua.patch
new file mode 100644
index 000000000000..8460497f1d68
--- /dev/null
+++ b/games-emulation/sdlmametools/files/sdlmametools-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/sdlmametools/sdlmametools-0.149.ebuild b/games-emulation/sdlmametools/sdlmametools-0.149.ebuild
new file mode 100644
index 000000000000..f08ae5509df5
--- /dev/null
+++ b/games-emulation/sdlmametools/sdlmametools-0.149.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmametools/sdlmametools-0.149.ebuild,v 1.1 2013/06/26 13:17:17 hasufell Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit eutils flag-o-matic python-any-r1 games
+
+MY_PV=${PV/.}
+MY_P=${PN%tools}${MY_PV}
+MY_P=${MY_P%%_p*}
+
+# 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="Set of development tools shared between sdlmame and sdlmess"
+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"
+
+LICENSE="XMAME"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/expat
+	media-libs/flac
+	>=media-libs/libsdl-1.2.10
+	media-libs/sdl-ttf
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+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
+
+	# unused, avoid linking
+#	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
+
+	enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak
+	enable_feature NO_USE_QTDEBUG src/osd/sdl/sdl.mak
+	enable_feature NO_OPENGL src/osd/sdl/sdl.mak
+	enable_feature NO_X11 src/osd/sdl/sdl.mak
+}
+
+src_compile() {
+	emake \
+		NO_DEBUGGER=1 tools
+}
+
+src_install() {
+	for i in chdman jedutil ldresample ldverify romcmp testkeys ; do
+		newgamesbin ${i} sdlmame-${i}
+		nonfatal newman src/osd/sdl/man/${i}.1 sdlmame-${i}.1
+	done
+
+	prepgamesdirs
+}
diff --git a/games-emulation/sdlmess/ChangeLog b/games-emulation/sdlmess/ChangeLog
index 9768dcff2f5f..fb8ca420074f 100644
--- a/games-emulation/sdlmess/ChangeLog
+++ b/games-emulation/sdlmess/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/sdlmess
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmess/ChangeLog,v 1.3 2013/05/01 10:36:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmess/ChangeLog,v 1.4 2013/06/26 13:16:12 hasufell Exp $
+
+*sdlmess-0.149 (26 Jun 2013)
+
+  26 Jun 2013; Julian Ospald <hasufell@gentoo.org> +sdlmess-0.149.ebuild,
+  +files/sdlmess-0.149-QA.patch, +files/sdlmess-0.149-debugger-linking.patch,
+  +files/sdlmess-0.149-no-opengl.patch, +files/sdlmess-0.149-system-lua.patch:
+  version bump
 
   01 May 2013; Agostino Sarubbo <ago@gentoo.org> sdlmess-0.148_p1.ebuild:
   Stable for x86, wrt bug #468054
diff --git a/games-emulation/sdlmess/Manifest b/games-emulation/sdlmess/Manifest
index e0fe74653a3e..3e6d614495d1 100644
--- a/games-emulation/sdlmess/Manifest
+++ b/games-emulation/sdlmess/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX mess-0.148.ini.in 7060 SHA256 988de3cd855ebf45c8b9c208d9f3afb0092cfa145f58cf266130281b7c6bc7b9 SHA512 2b9c08f07b0f9b2bc9599534c26dbf1988f6e40dd6bb90e543ddbf1528c4065a55e4c2826fd0781c4fd9677806157dc46dc172c9c622bcaed0bb68abe87258e4 WHIRLPOOL 089a41628bdfa792e518972ce128e3d222d981f6388489f5eef58dda286a5118af6687b92eb4c1c05411dbb4b8ca7fe98f741325e06961335bdcb21dad5de8bb
 AUX sdlmess-0.148_p1-makefile.patch 4801 SHA256 1428162c7f80671b4919f81cdf8bdaf0d23cb3596fbf43deefeaabf8f22cbe43 SHA512 d6d6040fdbcce1cee24742fb3242e2c6372c34fd993933e6df8e6e12c1ef488d309f9dbaba23d91528f6e97411d1865c72f9d465176bcf91c95594bf33a2b2ad WHIRLPOOL 4cae6d00b4bcfab9a52e583ba1914c1f84f7a21aff31792e1c485d9f229b0e9b743f28cabc3acafcb5e50e16fb7f4a2843adcba84304013c2a9b0c5eec6b4a27
 AUX sdlmess-0.148_p1-no-opengl.patch 436 SHA256 9c5052e2f942f4841175e260d9914dc052b1bcb9805086bb284758eeb37a918a SHA512 1ea614758b6726b8300d0c4a2c3801b76d59b21d8e121304ebb0700ff6478fe2d386170cf5a21fb553825dae06944b1ff6b020d042ccb888ba63dcd6e400e617 WHIRLPOOL ec79181dad422d0bf2ba5b751a23c69d81d9fe5855133aed28d6e1e32425b67cbd711808c1752fe6c25b5832b327d079085a681fa074126d4fcb1993dc409b8a
+AUX sdlmess-0.149-QA.patch 5427 SHA256 c3e8e2cbe358f9c335f62c0c40a2157a9e158ea317c3445ba0f1dd2b74fd8aa3 SHA512 4974f121f4d1a14f9ec57a68504d9f3eb4ac4f518cf515fa8d1f5cdd976409d72f81b948573a8a2cff86c73d4eb5ac8299e119911960bb0575e3fe6e57b0fccb WHIRLPOOL 8e9f76aecdfbb81cb61a457f7a25613c4b9f0fe7f8730cb81bcf2fd0dfb2d434abd9d3901505c152cef93bd0daebed1b35635b262db4fd07bfb8ec04c5ce81da
+AUX sdlmess-0.149-debugger-linking.patch 944 SHA256 5e9ed23651cd9f79f1303ef245d933ac94ffd92c8c950dd623bca9c292fc52b0 SHA512 24123983a613530d6bf4f52f2f5d191b1bed997f27384fb34b19c5fa629f8ebb09dceca334138ac93122fa2482834cbdecbfca91f290bcb9ab62bc0db829b99f WHIRLPOOL 31e8deefc11f1bfc58c63b7908ca540e658e2a62170968514aaaf029a6fe251c66eebd01cb7a71cf8b92ac1702209558896dc03f0f7249c6ede6e29ee3447685
+AUX sdlmess-0.149-no-opengl.patch 558 SHA256 9d2b61809532f909439709c97bdcb7d6e167573753ce0166c9d50a60c311465a SHA512 f0a728262855367b2039c68c6bb676f3e957033334dd8d3a8ce82ebb28b51d759408a67c47fd8dd1705a3c883eb9362c633692fdf9dcdfe5a79ccbe19dc44dc8 WHIRLPOOL 6c752080ac2d233e7bbc606d641cd0e80235a8edaefbbe6fedf4e82afab03236575cc14ca60ca5bad768935b7e86dfefdaf1d4f8aac186d5b444464615f155f1
+AUX sdlmess-0.149-system-lua.patch 851 SHA256 2ca1875b4425f1136a29003cdf54283e3785d2488c930e5611a7148c89a17bc1 SHA512 91c73f9992e326595bfa96820985de4ede9029df75e63ab28ac8d55d38021744ba5542178d788f68105d91f233513d26ceaf10c771a19f0545d07f39515c5db2 WHIRLPOOL 1e959a45a3f23bcdce30126976fb06422a90fdd02876615eaad035d5b34afeed4b055197bb84d928268cdf997d2944482d6ab915a1fda9dc3020c613523d6771
 AUX vector.ini 116 SHA256 408aeaaffcb2ecccd20db457f22d2d5efa930c0f62a92987b0fbefaf6c038c23 SHA512 6d84eb7b9c4e9f134b57e64ba9ae30dcaaa620296830f7c9858611fde9064f803bd7d230a989a5cce34d8b815b5a98d323b19d3eef3d4c688b5c32b96b299f5f WHIRLPOOL f60543015a0195487917c696640cc66e29109298ac8f9bd1309346f6ab1b46d8e2ce83d00506c17a9ea588f6b3bac82f0f66d7e75bbf88656ba897cd50fa3dac
 DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a
+DIST mame0149s.zip 35160585 SHA256 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b SHA512 4b8bd72e93f71fdb52c643776ecefb87fe605effe3f8c1724156cf7fafb8107330d92914eb14208a170cd5a0ee2775e7ea8d8edd0b525a35bbb0d5514172c1c3 WHIRLPOOL c5821ffc0f640e93986cd88f9e530be36e5ba0405a5dbc69a5021c828248dc74541340d5d9d49ece19635b5239bbaeeeb93bad2800fc46e9f441d8ffd3751ca5
 DIST sdlmame0148u1_diff.zip 3386949 SHA256 27378d09e50f31ca0dd4f39df4c474016671946657eb7af9ea5aa0ffbae1d9bb SHA512 f62aa8ebfc3cfa96d2fd5e58c921cc2adfbe3704a745ef49bc247060ecd3333ecc12e1a3add810c6237f3f7a1946cf1b9d46e6d72aeb87baffebadb933de44de WHIRLPOOL 550f2e777363f307b8e56b4ec31f4852abe89434af5ce596bd6e6023f35a728e4078033b1edc4b302e0cf50fa646a190ec02be9329127379405aec2e9b591531
 EBUILD sdlmess-0.148_p1.ebuild 4442 SHA256 0fb074d27c32ab9adabae27a59e0639700cc68ec5277f8d6307ef7f3aeb1948f SHA512 70fae4ba2def4761eafb72b7185a3db8f68fcfa32654002dc593191c48df93c333e54bcc258eac09535cea31492f883ae03a46088486a502749d1cc2697da1c0 WHIRLPOOL 84487968d7ca3e90f8bba1359f7bd65737cb866cc2c5c7ab883a8f0e334baf3857ad67c47b9438cd5d367e33684c3ab50563486104869c27fc0bcf0025c25bfd
-MISC ChangeLog 747 SHA256 80d45911ab45a92bb4bd2ba36b8ef46327ee56bafc808eea14c08cf14bf57d95 SHA512 e054b928a2d17a835ee76ee19bb0af6676d930938cec83559e2942c06ce2b5c2f6eae416285d6b27907acd1843a58dcf5a793edc28ced91ba5253b9577088fd9 WHIRLPOOL 7a45798898bb1d760de887897928a4ff2211e9743753646ce9bdcaac4a7d12a4f4154d58abd0ec8b684c2cd8fbed946de5a5d6945b3fff0644da7813c5646855
+EBUILD sdlmess-0.149.ebuild 4711 SHA256 da1fa400e3807c718a6e0e50852cab4abe0e972b946fdd7ab8d9ac250d2ca048 SHA512 08b777602c462295f226d50953bf425a15c134092004c1c6b97a7abd14c465d7127c81b08bb2c659736888d1e6b7d3779aa05f5858ea8b6cba174d6fec1dab11 WHIRLPOOL 208faf890744a1c6a1a3ad9161f9f2084e36f4a3cafd041e41b643867b7bfe4afd26938dbd6ce60be740290eac23c29b9cef05f2259d4ff8407b746573e61a3b
+MISC ChangeLog 1029 SHA256 e291c95968c9b881c58fc2d06edc10fd57be94d82d71ce3e423d550db5213c94 SHA512 566f27fd43796b4f1d9378e07add464142a3dc429b357b82ef57290723d3910c556cdbac5499de5f5244573141f36b6ccfe3ad65e236ee5274a1b4ef756af880 WHIRLPOOL e07abd1d3e5215b19025afdfe0fd424807c1770df495facb4c4997c79960217d0c1a4f41f459b9b47701605e6cfb0702f3532513755c351e517e4253f4b3794d
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRgPAtAAoJELp701BxlEWfkXkQAL9DojiCxqpQvl5bL5gLlGmL
-YKY57cu9CEv/+1/tLtxL1Qu4dLma67w0pR+0kU4sbTqPpP1xwzaskYBEwzd3q1X+
-z9UnjyQcTzEgbW/HuWPNecOy28Sm1Nw+w8PZjG63awoH/xoXEN1UY/E9WqJ7rfB1
-ZrmXUyXteW0bOCsZ+mE1Fw/yiwYm64WyWe+erh7f6DVgmHwXaX2vbsYP+Uni6BiO
-/s0wVQexWEpEGUGYi6w9mygkF4fssWFydm+1xP6DcN3ogF5UxbxYEfO7a5PDjxpc
-B0AtoKGTTsvz7VyXA/z5lG3B7globiLs+USO6DYG22hO5YI23eJFkrOu/5+gOS+I
-j1ciEQJQufFsWG3Kx8ZQ24qVVpzry/oSaNiWo89W61yhsd1SNW0dwRIqVgJ+HkgI
-B4UlCm+46yNAy0I9SUojRx8q9veTn89Q3fkob8zZwf5ec/Y6Tgz+uExoh98MzG89
-HHe8HGPIbAkLMTOPVM71tF/rqjWe2Z/dqFhzcAOwFZCPO8N6XK19SUNakTzKAa65
-WaKz4rlA8cGT8XFjqDOgZpMPw+OzfjG23CdYcvy3FJhqgKWvur5LT6vE1/qWIwH0
-u4qkT1HRyNDBlShZif/5zUnFbXrcAG/SF/Gp/QteB+v+6p6WVzAfJA0kYwRmt/pN
-HT9r4xI/Qtpmx3FHguZN
-=eDb1
+iQEcBAEBCAAGBQJRyumeAAoJEFpvPKfnPDWz9NoH/3TG2iMXNDh5r60u3XcIR7Ze
+sB31epd7+5dZZL8rrVehjaMio57DmMUbI+cFYT0u+uTnCdhoBasfCQ4IblKaZ2fa
+bG/3BrECdi8BvkzxXQPc1yICJdPi4+O0v2mhajiIXirM6rjBVAwD6Ompr478n8cD
+Rx9E48NHNZNNBnM5pmmXWoWqdnkKbyd/6bqomooLymW2jOPSwuxR2bhPNMiPs4q+
+TJcvMahfiO4Rdc4XQXwOfnpYo3eJqckGrKI5YmLhUJSlNcm0q/BImiJ5vq+0MeIq
+3u7Yz3RDJl3grtaQgSaB2dOiffM1mgZKCdIFb1kWcrtA6GXNYHqypcQsWBsJSUg=
+=5nt5
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/sdlmess/files/sdlmess-0.149-QA.patch b/games-emulation/sdlmess/files/sdlmess-0.149-QA.patch
new file mode 100644
index 000000000000..97e4b8f41c10
--- /dev/null
+++ b/games-emulation/sdlmess/files/sdlmess-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/sdlmess/files/sdlmess-0.149-debugger-linking.patch b/games-emulation/sdlmess/files/sdlmess-0.149-debugger-linking.patch
new file mode 100644
index 000000000000..6c7cd5d64199
--- /dev/null
+++ b/games-emulation/sdlmess/files/sdlmess-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/sdlmess/files/sdlmess-0.149-no-opengl.patch b/games-emulation/sdlmess/files/sdlmess-0.149-no-opengl.patch
new file mode 100644
index 000000000000..cd32cd35d075
--- /dev/null
+++ b/games-emulation/sdlmess/files/sdlmess-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/sdlmess/files/sdlmess-0.149-system-lua.patch b/games-emulation/sdlmess/files/sdlmess-0.149-system-lua.patch
new file mode 100644
index 000000000000..8460497f1d68
--- /dev/null
+++ b/games-emulation/sdlmess/files/sdlmess-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/sdlmess/sdlmess-0.149.ebuild b/games-emulation/sdlmess/sdlmess-0.149.ebuild
new file mode 100644
index 000000000000..fe823bdf921f
--- /dev/null
+++ b/games-emulation/sdlmess/sdlmess-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/sdlmess/sdlmess-0.149.ebuild,v 1.1 2013/06/26 13:16:12 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.148"
+
+# 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="Multi Emulator Super System (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
+}