version bump; cleanup patch from Christian Birchinger via bug #337304

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 433 insertions, 2 deletions

diff --git a/games-emulation/sdlmame/ChangeLog b/games-emulation/sdlmame/ChangeLog
index 0fbb02751aad..78f04b54ae2d 100644
--- a/games-emulation/sdlmame/ChangeLog
+++ b/games-emulation/sdlmame/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/sdlmame
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.33 2010/09/09 16:01:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.34 2010/09/20 20:30:20 mr_bones_ Exp $
+
+*sdlmame-0.139_p3 (20 Sep 2010)
+
+  20 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +sdlmame-0.139_p3.ebuild, +files/mame-0.139.ini.in:
+  version bump; cleanup patch from Christian Birchinger via bug #337304
 
 *sdlmame-0.139_p2 (03 Sep 2010)
 
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 6a2767b5576e..52d7c95884f2 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,13 +1,17 @@
 AUX joymap.dat 223 RMD160 d86c536a5d33bec9ecd6efbee2f7389835495328 SHA1 011d631b844316ea5b113ac01407665ea674d1f9 SHA256 bf6e7473b2b1ed573aacf697446e4bdb61e0f63b6e3d55c5b8fac93fb49059f9
+AUX mame-0.139.ini.in 6688 RMD160 0e9cbdca2dc2f30971544298fda3d4ff8003c22e SHA1 f0eb42695dc3fa46452565c69a91c027686acebd SHA256 4788e0c7bccc6d286cf1b3cbfe39aa1be6f210a94dea37954d4821a97bfb14da
 AUX mame.ini.in 5962 RMD160 6eb4c315b29d5e6da24a40ad94a646bb56b27998 SHA1 fadb0546bdac23e7162833fad60533c0a4fcf772 SHA256 6205c738b7e57ead9c05885bdaeb3ebfb143bec9dc1de7a97016b791bea532d8
 AUX sdlmame-0.136-nodebug.patch 952 RMD160 4098730d8cdf205b8dfc4f4a4dbcccf36ddff787 SHA1 19365ec2431f808311e49732413b88844b1d0ccc SHA256 92486bf8ff6ba153ef4759205d1250c8294c1f7cd2187e194ab10d0cc7cada17
 AUX vector.ini 116 RMD160 e63ed40b21a2426b28571d514933efab6ccce7e8 SHA1 c6615ce44d08b89a65435dfe7e0af9ac6d8459df SHA256 408aeaaffcb2ecccd20db457f22d2d5efa930c0f62a92987b0fbefaf6c038c23
 DIST mame0139s.zip 16706970 RMD160 f673a9ffe9dfe5b1527adde3f8a5981cbf75ba51 SHA1 76319aabf63df42852bbae3254cb90eacf544516 SHA256 e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6
 DIST sdlmame-manpages.tar.gz 14400 RMD160 14660470488458a8897a8a924c12f7ab961d6729 SHA1 279fbf37668282c0e4e86d62a29f5ec53fa0ab1a SHA256 507240258dfb816fbfddc674c5995a126c7a975158c2aad1ada8cb064c5e3d08
+DIST sdlmame-ui.bdf.gz 114727 RMD160 2311dbd3ae508619a8327ca8b9c0a7184f9b5b66 SHA1 ada88e613c0573bb5703a37f81790c176cb8c884 SHA256 f2ec11dd926bbeae8647e68607107516a30790239464939f3e99a0f62fc7f17e
 DIST sdlmame0136.zip 18936113 RMD160 1cb9b24ae6f97c0f223f13ed97a074de14e2892e SHA1 19c11abc3b3ab2633df62f3867921b3541bb582e SHA256 863c34af4850b7687de358601e5b13fbb4ed1c121e11654179e87fb39e7ede2d
 DIST sdlmame0139u1_diff.zip 651444 RMD160 515716ff6bcca8bf6a0386cc3fa03f18987689f9 SHA1 65d31d7ac33261b80dce87f7868f7f0829ff03a6 SHA256 0c05912c3f16fc4d79024c6e702f9b03dcb7a91fd8be98910856d3bcb65788b5
 DIST sdlmame0139u2_diff.zip 679257 RMD160 0e3bce1cfc0001ca49505845507e374548eb9294 SHA1 e4469d6e416d39f221b595b9a7c9c9f3a23f00ab SHA256 b7619ae96847aef45653e81a4b63c15af7e7e5bcc574fa1ee89dc80c413dd873
+DIST sdlmame0139u3_diff.zip 761786 RMD160 8ea3d96586374e5ff8ac2ce728d0dafd53296b62 SHA1 5760330640172bfbcc245e8371ca45b5ed1b4202 SHA256 68b7b9e3f589f09b7676ee812e4490137677fcc37e88c2dc96fa54ef874ee414
 EBUILD sdlmame-0.136.ebuild 3384 RMD160 1d79b94c2af8e8a4dbbf76bb3ad80b796828f85c SHA1 c32128b66147ee8c6cfe01f28f49989711b6a6e9 SHA256 31c6ce4b49f273a2c6fb3d85f8efe1ac91a9bbd85868aa877ff56b16bff54506
 EBUILD sdlmame-0.139_p2.ebuild 3615 RMD160 9041d73d4c9647bec6de8f14ce41452f482084f7 SHA1 9a66badf3ef0bd59fafbb2a3b39e0506412d81b8 SHA256 637d0dbf87b8003e8bdb2e4fd1b48b780cadd179a61f9b63293532a785c98344
-MISC ChangeLog 4053 RMD160 51c9e934d7949f583528ae272be3b85fe0ccd4a3 SHA1 765450279be70ad0e72038032f1d7f0dc9fddd47 SHA256 8735f8967ec80625bb8c54b6b73b72deaa31c5ecb67cb63b999030991e785155
+EBUILD sdlmame-0.139_p3.ebuild 3784 RMD160 bda0008e4e077ea886ff4cca004fc8aa3ada1e83 SHA1 f594a59aa037e07c8eba5d0ce2d297896e12710d SHA256 97ed70688047510678859769fd17697b8d07fe0f65ef08f47ddbc166c304ced9
+MISC ChangeLog 4268 RMD160 7d0d2856bcfee60068da185cf4de9a4e0a4976f8 SHA1 14babfe13f01afb8923ec334d68afb541f4f6a1f SHA256 126e8cc302a4cadac1bfe334f2c2c00dcc1f1b4a14412d59e1c5b476d97ac317
 MISC metadata.xml 1089 RMD160 9c8a425da7e10ddc2cdf1bfbbf60b23257eca1e7 SHA1 9ba3821b6dc312016d9cecc295555411e8bc044c SHA256 67982ede09eba43a5e84327f2f529031242424222e0d5170f31c8f2e647e937f
diff --git a/games-emulation/sdlmame/files/mame-0.139.ini.in b/games-emulation/sdlmame/files/mame-0.139.ini.in
new file mode 100644
index 000000000000..7b69f182a356
--- /dev/null
+++ b/games-emulation/sdlmame/files/mame-0.139.ini.in
@@ -0,0 +1,270 @@
+#
+# CORE CONFIGURATION OPTIONS
+#
+readconfig                1
+writeconfig               0
+
+#
+# CORE SEARCH PATH OPTIONS
+#
+rompath                   $HOME/.sdlmame/roms;@GAMES_DATADIR@/sdlmame/roms
+samplepath                $HOME/.sdlmame/samples;@GAMES_DATADIR@/sdlmame/samples
+artpath                   $HOME/.sdlmame/artwork;@GAMES_DATADIR@/sdlmame/artwork
+ctrlrpath                 $HOME/.sdlmame/ctrlr;@GAMES_SYSCONFDIR@/sdlmame/ctrlr;@GAMES_DATADIR@/sdlmame/ctrlr
+inipath                   $HOME/.sdlmame;@GAMES_SYSCONFDIR@/sdlmame
+fontpath                  $HOME/.sdlmame;@GAMES_DATADIR@/sdlmame
+cheatpath                 $HOME/.sdlmame/cheats;@GAMES_SYSCONFDIR@/sdlmame/cheats;@GAMES_DATADIR@/sdlmame/cheats
+crosshairpath             $HOME/.sdlmame/crosshair;@GAMES_DATADIR@/sdlmame/crosshair
+
+#
+# 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 STATE/PLAYBACK OPTIONS
+#
+state                     
+autosave                  0
+playback                  
+record                    
+mngwrite                  
+aviwrite                  
+wavwrite                  
+snapname                  %g/%i
+snapsize                  auto
+snapview                  internal
+burnin                    0
+
+#
+# CORE PERFORMANCE OPTIONS
+#
+autoframeskip             0
+frameskip                 0
+seconds_to_run            0
+throttle                  1
+sleep                     1
+speed                     1.0
+refreshspeed              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
+#
+coin_lockout              1
+ctrlr                     
+mouse                     0
+joystick                  1
+lightgun                  0
+multikeyboard             0
+multimouse                0
+steadykey                 0
+offscreen_reload          0
+joystick_map              auto
+joystick_deadzone         0.3
+joystick_saturation       0.85
+natural                   0
+uimodekey                 auto
+
+#
+# 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
+update_in_pause           0
+debug                     0
+debugscript               
+debug_internal            0
+
+#
+# CORE MISC OPTIONS
+#
+bios                      
+cheat                     0
+skip_gameinfo             0
+
+#
+# DEBUGGING OPTIONS
+#
+oslog                     0
+
+#
+# PERFORMANCE OPTIONS
+#
+multithreading            0
+numprocessors             auto
+sdlvideofps               0
+
+#
+# VIDEO OPTIONS
+#
+video                     soft
+numscreens                1
+window                    0
+maximize                  1
+keepaspect                1
+unevenstretch             1
+effect                    none
+centerh                   1
+centerv                   1
+waitvsync                 0
+scalemode                 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
+
+#
+# SDL KEYBOARD MAPPING
+#
+keymap                    0
+keymap_file               $HOME/.sdlmame/keymap.dat
+#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
+#
+joy_idx1                  auto
+joy_idx2                  auto
+joy_idx3                  auto
+joy_idx4                  auto
+joy_idx5                  auto
+joy_idx6                  auto
+joy_idx7                  auto
+joy_idx8                  auto
+sixaxis                   0
+
+#
+# SDL LOWLEVEL DRIVER OPTIONS
+#
+videodriver               auto
+audiodriver               auto
+gl_lib                    auto
diff --git a/games-emulation/sdlmame/sdlmame-0.139_p3.ebuild b/games-emulation/sdlmame/sdlmame-0.139_p3.ebuild
new file mode 100644
index 000000000000..5ab395c5c983
--- /dev/null
+++ b/games-emulation/sdlmame/sdlmame-0.139_p3.ebuild
@@ -0,0 +1,151 @@
+# 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.139_p3.ebuild,v 1.1 2010/09/20 20:30:20 mr_bones_ 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]
+	dev-libs/expat
+	x11-libs/libXinerama
+	debug? (
+		x11-libs/gtk+:2
+		gnome-base/gconf
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	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}"/makefile \
+		|| die "sed failed"
+}
+
+src_unpack() {
+	base_src_unpack
+	unpack ./mame.zip
+	rm -f mame.zip
+}
+
+src_prepare() {
+	if [[ $PV == *_p* ]] ; then
+		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
+	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}"'\"'" ${CXXFLAGS}" \
+		CC="${CXX}" \
+		SUFFIX="" \
+		${make_opts} \
+		all \
+		|| die "emake failed"
+}
+
+src_install() {
+	dogamesbin ${PN}$(use amd64 && echo 64) || 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
+}