version bump; drop ppc to ~

(Portage version: 2.1.10.11/cvs/Linux i686)

14 files changed, 87 insertions, 1105 deletions

diff --git a/games-emulation/sdlmame/ChangeLog b/games-emulation/sdlmame/ChangeLog
index 896f84441e13..ebacbe3fdb47 100644
--- a/games-emulation/sdlmame/ChangeLog
+++ b/games-emulation/sdlmame/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for games-emulation/sdlmame
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.54 2011/09/30 16:50:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.55 2011/11/17 06:47:50 mr_bones_ Exp $
+
+*sdlmame-0.144 (17 Nov 2011)
+
+  17 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> -sdlmame-0.136.ebuild,
+  -files/sdlmame-0.136-nodebug.patch, -sdlmame-0.141_p3.ebuild,
+  -sdlmame-0.142.ebuild, -files/sdlmame-0.142-makefile.patch,
+  -sdlmame-0.143_p4.ebuild, -sdlmame-0.143_p5.ebuild,
+  -files/sdlmame-0.143_p4-makefile.patch,
+  -files/sdlmame-0.143_p4-no-opengl.patch,
+  -files/sdlmame-0.143_p5-makefile.patch,
+  -files/sdlmame-0.143_p5-no-opengl.patch, +sdlmame-0.144.ebuild,
+  +files/sdlmame-0.144-makefile.patch, +files/sdlmame-0.144-no-opengl.patch,
+  -files/joymap.dat, -files/mame.ini.in:
+  version bump; drop ppc to ~
 
   30 Sep 2011; Mike Frysinger <vapier@gentoo.org> sdlmame-0.141_p3.ebuild,
   sdlmame-0.142.ebuild, sdlmame-0.142_p5.ebuild, sdlmame-0.143_p4.ebuild,
diff --git a/games-emulation/sdlmame/files/joymap.dat b/games-emulation/sdlmame/files/joymap.dat
deleted file mode 100644
index ec6490d5e4b3..000000000000
--- a/games-emulation/sdlmame/files/joymap.dat
+++ /dev/null
@@ -1,9 +0,0 @@
-# Joystick mapping file
-# =====================
-#
-# Contains mapping between name and logical (i.e. mame) joystick index
-#
-# Index   Name
-# -----   ----
-#   1     MOSIC USB 2A4K GamePad
-#   0     Logitech Logitech Attack 3
diff --git a/games-emulation/sdlmame/files/mame.ini.in b/games-emulation/sdlmame/files/mame.ini.in
deleted file mode 100644
index 9cc0351a9bf5..000000000000
--- a/games-emulation/sdlmame/files/mame.ini.in
+++ /dev/null
@@ -1,260 +0,0 @@
-#
-# CORE CONFIGURATION OPTIONS
-#
-readconfig                1
-
-#
-# CORE SEARCH PATH OPTIONS
-#
-rompath                   $HOME/.sdlmame/roms;@GAMES_SYSCONFDIR@/sdlmame/roms
-samplepath                $HOME/.sdlmame/samples;@GAMES_SYSCONFDIR@/sdlmame/samples
-artpath                   $HOME/.sdlmame/artwork;@GAMES_SYSCONFDIR@/sdlmame/artwork
-ctrlrpath                 $HOME/.sdlmame/ctrlr;@GAMES_SYSCONFDIR@/sdlmame/ctrlr
-inipath                   $HOME/.sdlmame;@GAMES_SYSCONFDIR@/sdlmame
-fontpath                  $HOME/.sdlmame;@GAMES_DATADIR@/sdlmame
-
-#
-# CORE OUTPUT DIRECTORY OPTIONS
-#
-cfg_directory             $HOME/.sdlmame/cfg
-nvram_directory           $HOME/.sdlmame/nvram
-memcard_directory         $HOME/.sdlmame/memcard
-input_directory           $HOME/.sdlmame/inp
-state_directory           $HOME/.sdlmame/sta
-snapshot_directory        $HOME/.sdlmame/snap
-diff_directory            $HOME/.sdlmame/diff
-comment_directory         $HOME/.sdlmame/comments
-
-#
-# CORE FILENAME OPTIONS
-#
-cheat_file                @GAMES_DATADIR@/sdlmame/cheat.dat
-
-#
-# CORE STATE/PLAYBACK OPTIONS
-#
-state                     
-autosave                  0
-playback                  
-record                    
-mngwrite                  
-wavwrite                  
-
-#
-# CORE PERFORMANCE OPTIONS
-#
-autoframeskip             0
-frameskip                 0
-seconds_to_run            0
-throttle                  1
-sleep                     1
-speed                     1.0
-
-#
-# CORE ROTATION OPTIONS
-#
-rotate                    1
-ror                       0
-rol                       0
-autoror                   0
-autorol                   0
-flipx                     0
-flipy                     0
-
-#
-# CORE ARTWORK OPTIONS
-#
-artwork_crop              0
-use_backdrops             1
-use_overlays              1
-use_bezels                1
-
-#
-# CORE SCREEN OPTIONS
-#
-brightness                1.0
-contrast                  1.0
-gamma                     1.0
-pause_brightness          0.65
-
-#
-# CORE VECTOR OPTIONS
-#
-antialias                 1
-beam                      1.0
-flicker                   0
-
-#
-# CORE SOUND OPTIONS
-#
-sound                     1
-samplerate                48000
-samples                   1
-volume                    0
-
-#
-# CORE INPUT OPTIONS
-#
-ctrlr                     
-mouse                     1
-joystick                  1
-lightgun                  0
-multikeyboard             0
-multimouse                0
-steadykey                 0
-offscreen_reload          0
-joystick_map              auto
-joystick_deadzone         0.3
-joystick_saturation       0.85
-
-#
-# CORE INPUT AUTOMATIC ENABLE OPTIONS
-#
-paddle_device             keyboard
-adstick_device            keyboard
-pedal_device              keyboard
-dial_device               keyboard
-trackball_device          keyboard
-lightgun_device           keyboard
-positional_device         keyboard
-mouse_device              mouse
-
-#
-# CORE DEBUGGING OPTIONS
-#
-log                       0
-verbose                   0
-
-#
-# CORE MISC OPTIONS
-#
-bios                      default
-cheat                     0
-skip_gameinfo             0
-
-#
-# DEBUGGING OPTIONS
-#
-oslog                     0
-
-#
-# PERFORMANCE OPTIONS
-#
-multithreading            0
-sdlvideofps               0
-
-#
-# VIDEO OPTIONS
-#
-video                     soft
-numscreens                1
-window                    0
-keepaspect                1
-unevenstretch             1
-effect                    none
-centerh                   1
-centerv                   1
-waitvsync                 0
-yuvmode                   none
-
-#
-# OpenGL-SPECIFIC OPTIONS
-#
-filter                    1
-prescale                  1
-gl_forcepow2texture       0
-gl_notexturerect          0
-gl_vbo                    1
-gl_pbo                    1
-gl_glsl                   0
-gl_glsl_filter            1
-glsl_shader_mame0         none
-glsl_shader_mame1         none
-glsl_shader_mame2         none
-glsl_shader_mame3         none
-glsl_shader_mame4         none
-glsl_shader_mame5         none
-glsl_shader_mame6         none
-glsl_shader_mame7         none
-glsl_shader_mame8         none
-glsl_shader_mame9         none
-glsl_shader_screen0       none
-glsl_shader_screen1       none
-glsl_shader_screen2       none
-glsl_shader_screen3       none
-glsl_shader_screen4       none
-glsl_shader_screen5       none
-glsl_shader_screen6       none
-glsl_shader_screen7       none
-glsl_shader_screen8       none
-glsl_shader_screen9       none
-gl_glsl_vid_attr          1
-
-#
-# PER-WINDOW VIDEO OPTIONS
-#
-screen                    auto
-aspect                    auto
-resolution                auto
-view                      auto
-screen0                   auto
-aspect0                   auto
-resolution0               auto
-view0                     auto
-screen1                   auto
-aspect1                   auto
-resolution1               auto
-view1                     auto
-screen2                   auto
-aspect2                   auto
-resolution2               auto
-view2                     auto
-screen3                   auto
-aspect3                   auto
-resolution3               auto
-view3                     auto
-
-#
-# FULL SCREEN OPTIONS
-#
-switchres                 0
-useallheads               0
-
-#
-# SOUND OPTIONS
-#
-audio_latency             3
-
-#
-# INPUT DEVICE OPTIONS
-#
-
-#
-# SDL KEYBOARD MAPPING
-#
-# If you are using one of the available non-us keyboard layouts
-# set keymap to 1 and uncomment the appropriate line below
-keymap                    0
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km-be.txt
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km-ch.txt
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km-de.txt
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km-fr.txt
-#keymap_file               @GAMES_DATADIR@/sdlmame/keymaps/km_it.txt
-
-#
-# SDL JOYSTICK MAPPING
-#
-remapjoys                 0
-remapjoyfile              @GAMES_SYSCONFDIR@/sdlmame/joymap.dat
-
-#
-# CORE COMMANDS
-#
-
-#
-# CONFIGURATION COMMANDS
-#
-
-#
-# FRONTEND COMMANDS
-#
diff --git a/games-emulation/sdlmame/files/sdlmame-0.136-nodebug.patch b/games-emulation/sdlmame/files/sdlmame-0.136-nodebug.patch
deleted file mode 100644
index 0779a907d51b..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.136-nodebug.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/osd/sdl/sdl.mak
-+++ src/osd/sdl/sdl.mak
-@@ -37,6 +37,10 @@
- 
- # NO_X11 = 1
- 
-+# comment next line to build with debugging support
-+
-+NO_DEBUGGER = 1
-+
- # uncomment and adapt next line to link against specific GL-Library
- # this will also add a rpath to the executable
- # MESA_INSTALL_ROOT = /usr/local/dfb_GL
-@@ -297,12 +301,17 @@
- # the new debugger relies on GTK+ in addition to the base SDLMAME needs
- # Non-X11 builds can not use the debugger
- ifndef NO_X11
-+ifndef NO_DEBUGGER
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
- CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` 
- LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
- CFLAGS += -DGTK_DISABLE_DEPRECATED
- else
- OSDCOREOBJS += $(SDLOBJ)/debugwin.o
-+DEFS += -DNO_DEBUGGER
-+endif # NO_DEBUGGER
-+else
-+OSDCOREOBJS += $(SDLOBJ)/debugwin.o
- endif # NO_X11
- 
- # make sure we can find X headers
diff --git a/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
deleted file mode 100644
index 09b34628d1b5..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- work.orig/makefile
-+++ work/makefile
-@@ -431,9 +431,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

-@@ -449,23 +446,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 \

-@@ -523,16 +503,6 @@
- # 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

-@@ -540,13 +510,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.143_p5-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch
deleted file mode 100644
index 444c5e9688b2..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- work.orig/makefile
-+++ work/makefile
-@@ -431,9 +431,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
-@@ -449,23 +446,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,16 +504,6 @@
- # 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
-@@ -541,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.143_p5-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch
deleted file mode 100644
index 87eeae5b50c7..000000000000
--- a/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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.143_p4-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
index 444c5e9688b2..db0c141c9a70 100644
--- a/games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch
+++ b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch
@@ -1,67 +1,71 @@
---- work.orig/makefile
-+++ work/makefile
-@@ -431,9 +431,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
-@@ -449,23 +446,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,16 +504,6 @@
- # 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
-@@ -541,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
+--- 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

+@@ -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.143_p4-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
index 87eeae5b50c7..87eeae5b50c7 100644
--- a/games-emulation/sdlmame/files/sdlmame-0.143_p4-no-opengl.patch
+++ b/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch
diff --git a/games-emulation/sdlmame/sdlmame-0.136.ebuild b/games-emulation/sdlmame/sdlmame-0.136.ebuild
deleted file mode 100644
index c0f2776a5c39..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.136.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.136.ebuild,v 1.6 2010/08/17 19:59:29 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/.}
-MY_PV=${MY_PV/_p/u}
-MY_P=${PN}${MY_PV}
-MY_CONF_PN=${PN/sdl}
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://rbelmont.mameworld.info/?page_id=163"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="mirror://gentoo/${MY_P}.zip
-	mirror://gentoo/${PN}-manpages.tar.gz"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug opengl"
-
-RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
-	dev-libs/expat
-	x11-libs/libXinerama
-	debug? (
-		x11-libs/gtk+:2
-		gnome-base/gconf
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	x11-proto/xineramaproto"
-
-S=${WORKDIR}/${MY_P}
-
-# Function to disable a makefile option
-disable_feature() {
-	sed -i \
-		-e "/$1.*=/s:^:# :" \
-		"${S}"/makefile \
-		|| die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
-	sed -i \
-		-e "/^#.*$1.*=/s:^# ::"  \
-		"${S}"/makefile \
-		|| die "sed failed"
-}
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS += -O$(OPTIMIZE)/s:^:# :' \
-		-e '/CFLAGS += -pipe/s:^:# :' \
-		-e '/LDFLAGS += -s/s:^:# :' \
-		-e 's:-Werror::' \
-		makefile \
-		|| die "sed failed"
-	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: zlib and expat"
-	disable_feature BUILD_ZLIB
-	disable_feature BUILD_EXPAT
-
-	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 "Disabling Debugging"
-		epatch "${FILESDIR}"/${P}-nodebug.patch
-	fi
-}
-
-src_compile() {
-	local make_opts
-
-	use opengl || make_opts="${make_opts} NO_OPENGL=1"
-
-	emake \
-		NAME="${PN}" \
-		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CFLAGS}" \
-		SUFFIX="" \
-		${make_opts} \
-		|| die "emake failed"
-}
-
-src_install() {
-	dogamesbin ${PN} || die "dogamesbin ${PN} failed"
-
-	# Follows xmame ebuild, avoiding collision on /usr/games/bin/jedutil
-	exeinto "$(games_get_libdir)/${PN}"
-	local f
-	for f in chdman ldverify jedutil romcmp testkeys; do
-		doexe "${f}" || die "doexe ${f} failed"
-	done
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins ui.bdf || die "doins ui.bdf failed"
-	doins -r keymaps || die "doins -r keymaps failed"
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${FILESDIR}"/{joymap.dat,vector.ini} || die "doins joymap.dat vector.ini failed"
-
-	sed \
-		-e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
-		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
-		"${FILESDIR}"/mame.ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/"mame.ini \
-		|| die "sed failed"
-
-	dodoc docs/{config,mame,newvideo}.txt *.txt
-	doman "${WORKDIR}/${PN}-manpages"/*
-
-	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{roms,samples,artwork} \
-		"${GAMES_SYSCONFDIR}/${PN}"/ctrlr
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	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
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.141_p3.ebuild b/games-emulation/sdlmame/sdlmame-0.141_p3.ebuild
deleted file mode 100644
index 3119266b1405..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.141_p3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.141_p3.ebuild,v 1.2 2011/09/30 16:50:10 vapier Exp $
-
-EAPI=2
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/.}
-MY_CONF_PN=${PN/sdl}
-MY_P=${PN}${MY_PV}
-MY_P=${MY_P%%_p*}
-MY_CONF_VER="0.139"
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://mamedev.org/"
-UPDATES="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "mirror://gentoo/${MY_P}u${PATCH_VER}_diff.zip"; done)"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="mirror://gentoo/${MY_P/sdl}s.zip $UPDATES
-	http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug opengl"
-
-RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
-	media-libs/sdl-ttf
-	dev-libs/expat
-	debug? (
-		x11-libs/gtk+:2
-		gnome-base/gconf
-		x11-libs/libXinerama
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	debug? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
-	sed -i \
-		-e "/$1.*=/s:^:# :" \
-		"${S}"/makefile \
-		|| die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
-	sed -i \
-		-e "/^#.*$1.*=/s:^# ::"  \
-		"${S}"/${2:-makefile} \
-		|| die "sed failed"
-}
-
-src_unpack() {
-	base_src_unpack
-	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
-	sed -i \
-		-e '/CFLAGS += -O$(OPTIMIZE)/s:^:# :' \
-		-e '/CFLAGS += -pipe/s:^:# :' \
-		-e '/LDFLAGS += -s/s:^:# :' \
-		-e '/LDFLAGS =/d' \
-		-e 's:-Werror::' \
-		makefile \
-		|| die "sed failed"
-	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: zlib and expat"
-	disable_feature BUILD_ZLIB
-	disable_feature BUILD_EXPAT
-
-	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
-	else
-		einfo "Disabling debug support"
-		enable_feature NO_X11 src/osd/sdl/sdl.mak
-	fi
-
-	if ! use opengl ; then
-		einfo "Disabling opengl support"
-		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
-	fi
-}
-
-src_compile() {
-	emake \
-		NAME="${PN}" \
-		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CXXFLAGS}" \
-		CC="${CXX}" \
-		all || die
-}
-
-src_install() {
-	newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} || die
-
-	# Avoid collision on /usr/games/bin/jedutil
-	exeinto "$(games_get_libdir)/${PN}"
-	doexe chdman jedutil ldverify romcmp testkeys || die
-	doman src/osd/sdl/man/{chdman,jedutil,ldverify,romcmp,testkeys}.1
-	newman src/osd/sdl/man/mame.1 ${PN}.1
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r src/osd/sdl/keymaps || die "doins -r keymaps failed"
-	newins sdlmame-ui.bdf ui.bdf || die "newins ui.bdf failed"
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${FILESDIR}"/vector.ini || die "doins vector.ini failed"
-
-	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 whatsnew*.txt
-
-	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
-		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	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
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.142.ebuild b/games-emulation/sdlmame/sdlmame-0.142.ebuild
deleted file mode 100644
index 69eade905cba..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.142.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.142.ebuild,v 1.5 2011/09/30 16:50:10 vapier Exp $
-
-EAPI=2
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/.}
-MY_CONF_PN=${PN/sdl}
-MY_P=${PN}${MY_PV}
-MY_P=${MY_P%%_p*}
-MY_CONF_VER="0.139"
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://mamedev.org/"
-UPDATES="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "mirror://gentoo/${MY_P}u${PATCH_VER}_diff.zip"; done)"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="mirror://gentoo/${MY_P/sdl}s.zip $UPDATES
-	http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug opengl"
-
-RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
-	media-libs/sdl-ttf
-	dev-libs/expat
-	debug? (
-		x11-libs/gtk+:2
-		gnome-base/gconf
-		x11-libs/libXinerama
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	debug? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
-	sed -i \
-		-e "/$1.*=/s:^:# :" \
-		"${S}"/makefile \
-		|| die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
-	sed -i \
-		-e "/^#.*$1.*=/s:^# ::"  \
-		"${S}"/${2:-makefile} \
-		|| die "sed failed"
-}
-
-src_unpack() {
-	base_src_unpack
-	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
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: zlib and expat"
-	disable_feature BUILD_ZLIB
-	disable_feature BUILD_EXPAT
-
-	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
-	else
-		einfo "Disabling debug support"
-		enable_feature NO_X11 src/osd/sdl/sdl.mak
-	fi
-
-	if ! use opengl ; then
-		einfo "Disabling opengl support"
-		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
-	fi
-}
-
-src_compile() {
-	emake \
-		NAME="${PN}" \
-		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CXXFLAGS}" \
-		CC="${CXX}" \
-		all || die
-}
-
-src_install() {
-	newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} || die
-
-	# Avoid collision on /usr/games/bin/jedutil
-	exeinto "$(games_get_libdir)/${PN}"
-	doexe chdman jedutil ldverify romcmp testkeys || die
-	doman src/osd/sdl/man/{chdman,jedutil,ldverify,romcmp,testkeys}.1
-	newman src/osd/sdl/man/mame.1 ${PN}.1
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r src/osd/sdl/keymaps || die "doins -r keymaps failed"
-	newins sdlmame-ui.bdf ui.bdf || die "newins ui.bdf failed"
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${FILESDIR}"/vector.ini || die "doins vector.ini failed"
-
-	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 whatsnew*.txt
-
-	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
-		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	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
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild b/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild
deleted file mode 100644
index e86f0454d02f..000000000000
--- a/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild,v 1.2 2011/09/30 16:50:10 vapier Exp $
-
-EAPI=2
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/.}
-MY_CONF_PN=${PN/sdl}
-MY_P=${PN}${MY_PV}
-MY_P=${MY_P%%_p*}
-MY_CONF_VER="0.139"
-DESCRIPTION="Multiple Arcade Machine Emulator (SDL)"
-HOMEPAGE="http://mamedev.org/"
-UPDATES="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "mirror://gentoo/${MY_P}u${PATCH_VER}_diff.zip"; done)"
-# Upstream doesn't allow fetching with unknown User-Agent such as wget
-SRC_URI="mirror://gentoo/${MY_P/sdl}s.zip $UPDATES
-	http://www.netswarm.net/misc/sdlmame-ui.bdf.gz"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug opengl"
-
-RDEPEND=">=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video]
-	media-libs/sdl-ttf
-	dev-libs/expat
-	debug? (
-		x11-libs/gtk+:2
-		gnome-base/gconf
-		x11-libs/libXinerama
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	debug? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
-	sed -i \
-		-e "/$1.*=/s:^:# :" \
-		"${S}"/makefile \
-		|| die "sed failed"
-}
-
-# Function to enable a makefile option
-enable_feature() {
-	sed -i \
-		-e "/^#.*$1.*=/s:^# ::"  \
-		"${S}"/${2:-makefile} \
-		|| die "sed failed"
-}
-
-src_unpack() {
-	base_src_unpack
-	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 src/osd/sdl/osdsdl.h
-	epatch \
-			"${FILESDIR}"/${P}-makefile.patch \
-			"${FILESDIR}"/${P}-no-opengl.patch
-
-	# Don't compile zlib and expat
-	einfo "Disabling embedded libraries: zlib and expat"
-	disable_feature BUILD_ZLIB
-	disable_feature BUILD_EXPAT
-
-	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
-	else
-		einfo "Disabling debug support"
-		enable_feature NO_X11 src/osd/sdl/sdl.mak
-	fi
-
-	if ! use opengl ; then
-		einfo "Disabling opengl support"
-		enable_feature NO_OPENGL src/osd/sdl/sdl.mak
-	fi
-}
-
-src_compile() {
-	emake \
-		NAME="${PN}" \
-		OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"'" ${CXXFLAGS}" \
-		CC="${CXX}" \
-		all || die
-}
-
-src_install() {
-	newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} || die
-
-	# Avoid collision on /usr/games/bin/jedutil
-	exeinto "$(games_get_libdir)/${PN}"
-	doexe chdman jedutil ldverify romcmp testkeys || die
-	doman src/osd/sdl/man/{chdman,jedutil,ldverify,romcmp,testkeys}.1
-	newman src/osd/sdl/man/mame.1 ${PN}.1
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r src/osd/sdl/keymaps || die "doins -r keymaps failed"
-	newins sdlmame-ui.bdf ui.bdf || die "newins ui.bdf failed"
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins "${FILESDIR}"/vector.ini || die "doins vector.ini failed"
-
-	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 whatsnew*.txt
-
-	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
-		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	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
-}
diff --git a/games-emulation/sdlmame/sdlmame-0.143_p5.ebuild b/games-emulation/sdlmame/sdlmame-0.144.ebuild
index b7e9d6310952..c86af091fb5e 100644
--- a/games-emulation/sdlmame/sdlmame-0.143_p5.ebuild
+++ b/games-emulation/sdlmame/sdlmame-0.144.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.143_p5.ebuild,v 1.2 2011/09/30 16:50:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.144.ebuild,v 1.1 2011/11/17 06:47:50 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games