version bump; also works around bug #370657

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

6 files changed, 249 insertions, 26 deletions

diff --git a/games-emulation/sdlmame/ChangeLog b/games-emulation/sdlmame/ChangeLog
index 5f571aecce6d..1c5b03d06e90 100644
--- a/games-emulation/sdlmame/ChangeLog
+++ b/games-emulation/sdlmame/ChangeLog
@@ -1,6 +1,14 @@
 # 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.48 2011/05/29 16:26:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.49 2011/06/15 16:39:01 mr_bones_ Exp $
+
+*sdlmame-0.142_p5 (15 Jun 2011)
+
+  15 Jun 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +sdlmame-0.142_p5.ebuild, files/sdlmame-0.142-makefile.patch,
+  +files/sdlmame-0.142_p5-makefile.patch,
+  +files/sdlmame-0.142_p5-no-opengl.patch:
+  version bump; also works around bug #370657 
 
   29 May 2011; Markos Chandras <hwoarang@gentoo.org> sdlmame-0.142.ebuild:
   Stable on amd64 wrt bug #367123
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index bb13dc28aed8..030c8ca45d2b 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,11 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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 sdlmame-0.142-makefile.patch 1746 RMD160 c9f212f04481aaf89c6d6ec77afccef4aff00c65 SHA1 c1ebd02c0efc29562d4de3d910ce93535b0646b3 SHA256 f59407b1aa7d2f69aacbc207cf238be50a986b4dbd6d12d97bd9a7d17db7fb45
+AUX sdlmame-0.142-makefile.patch 1632 RMD160 ac00c5ce5481c1e022f7ac5be68b1c6bf1cb9a76 SHA1 72504e88dbd0ae8b349543b389479fbc13a70a1b SHA256 ff440b1003ff1d2dbf5d83d85d01fe39e94786f35920b63576ff79ef6978f3dc
+AUX sdlmame-0.142_p5-makefile.patch 1571 RMD160 49deff9cc0436be874fc49be0ef1a0a95aed056d SHA1 335c71fb70c794649c583fd25c5bc88e1effc985 SHA256 c7a98ebaa50808fe8ad3a4734373e925fc066d90ff2fd57da29645f205e038b3
+AUX sdlmame-0.142_p5-no-opengl.patch 309 RMD160 d4315b3fd66ae8396596921038e00b724c42fd91 SHA1 02403e7846b9abe1f0092d777628dcb93f1098bd SHA256 2f2412df37a50bf5e84df5620926dcb2d82a79f4ea1f307e96a18513c44690c4
 AUX vector.ini 116 RMD160 e63ed40b21a2426b28571d514933efab6ccce7e8 SHA1 c6615ce44d08b89a65435dfe7e0af9ac6d8459df SHA256 408aeaaffcb2ecccd20db457f22d2d5efa930c0f62a92987b0fbefaf6c038c23
 DIST mame0141s.zip 17092788 RMD160 c09ef461280dfd7e45ca638caaa66d8752a9794b SHA1 80225e2694469dac39a75815f227b864a4992f5e SHA256 27c8829c55041886edafaa459b83452b0a327df31ce922c0b6a2ee91877504f8
 DIST mame0142s.zip 17657289 RMD160 20b7fc0af868521462e8081021acbfbe98bea16d SHA1 6d70b7a2a15abfdb7955772844ac4c6eae50ced4 SHA256 d5ccb987088522a203bf978a34eab8fa8c8560947a13373d48c11b2a496b6986
@@ -15,25 +14,14 @@ DIST sdlmame0136.zip 18936113 RMD160 1cb9b24ae6f97c0f223f13ed97a074de14e2892e SH
 DIST sdlmame0141u1_diff.zip 1152125 RMD160 81d5a7ade7c83ee7302bf80d28cdbec132811090 SHA1 05cddd7c915833c6dbffd12a49f8999ca26cc036 SHA256 2576180d3e344d9a0963dffbbf3248b416a8f1f75aff8ea89b466f8356fcccc5
 DIST sdlmame0141u2_diff.zip 878752 RMD160 3c27330000dd8ab0f16d331159e38432f36fad7a SHA1 f277813cc67f78f5ac6e29a462147e7faa976ae7 SHA256 48901d03d9999a92d81fd90248c1fb00a4f44e444030dd5c0d3226553d39d614
 DIST sdlmame0141u3_diff.zip 1257622 RMD160 62c6a368a7949f6db766a4c40c5feb316570ad74 SHA1 4139b43620ae6148f4e1fa1d3159e0894f93a5b5 SHA256 d1c9cb608ddb34548245b7a3de91f6ccf5faf27db3cf751a37816fa308210b4b
+DIST sdlmame0142u1_diff.zip 707350 RMD160 ee81bdcd7a77b4bd6f61d062f48b7aba5dcebd77 SHA1 edc84de9230669b5ef8b9b7d13f7f26a227375d7 SHA256 07be32275fc510b6b336cfd03de71e9c665914c41b0e8a39de694cc4e5fd3581
+DIST sdlmame0142u2_diff.zip 246135 RMD160 e153edb7c87db0b70a71e6083c31954aabb4ac92 SHA1 3de457c91245087779bc23a2311c2194652e46c9 SHA256 decbf4ac431b802fe3b9d5f87141c6b1a5057d3ee8ec619af070dccbdfc89e42
+DIST sdlmame0142u3_diff.zip 1282970 RMD160 698453bffee1d5982b83c748205336fbb60f8988 SHA1 054c82e47e456e4a292e7531be9fdbc37029653d SHA256 a43eff4e1e660e4f313f865be568c9a57670af79f326d7cfe947f982b0eaed3c
+DIST sdlmame0142u4_diff.zip 628941 RMD160 2caf2fe4a59bccfe582d618a5c37209324d6fbfe SHA1 e4e8897ba40caed0d2ee6bfb23f7462562a6ee81 SHA256 13831921bb6bf3843245b9008c4443dbd825acf4fd5025fa0eb5fc22786c1fa4
+DIST sdlmame0142u5_diff.zip 326906 RMD160 a8c43e1254cc9d159d499510a184396e45d39b42 SHA1 70be01a63038380fd96b18a6ea176743c08eb4cf SHA256 134a493bf215d6bf416ba992b4bc9976525f4e41c7f9ea308a793b47282dc666
 EBUILD sdlmame-0.136.ebuild 3384 RMD160 1d79b94c2af8e8a4dbbf76bb3ad80b796828f85c SHA1 c32128b66147ee8c6cfe01f28f49989711b6a6e9 SHA256 31c6ce4b49f273a2c6fb3d85f8efe1ac91a9bbd85868aa877ff56b16bff54506
 EBUILD sdlmame-0.141_p3.ebuild 4005 RMD160 23d00e710b351dc0ffd3dd9403e6c87b7b3c4556 SHA1 a7775b7b692847680ec7a6356bbc8c718d4a3003 SHA256 1c78221a600937515112a4090fff6f26e38ae44e744a6b7e83839be668d0975e
 EBUILD sdlmame-0.142.ebuild 3846 RMD160 f3bb8cd199ee94730d6dd5b4f253002fb0cf1aff SHA1 1f8eb7a2cfcedc50e1ba2eca8feefaaff7160c18 SHA256 89b01f39040e4f83b8e38e4e95b30a45ab92944d78613a256746ad3732f31baa
-MISC ChangeLog 6229 RMD160 eb1b5a0f32902da6eebeb3031c447394d97da336 SHA1 26218a5509dd137e8110728eae7a90fb349e52d5 SHA256 cc17666061564ae17212bbb3938277cb583c18c47012ea3a32e336e635829ba2
+EBUILD sdlmame-0.142_p5.ebuild 3897 RMD160 5b325e94e49a5f4d3c8649b948ad06966b1c3750 SHA1 7b2d083c3ba157a64a11bb98d4fb3ad56dd873e2 SHA256 995df0134cd4dec037943a6ce4976946f42c494a99baa575939f5b9a7e8ee2d5
+MISC ChangeLog 6515 RMD160 c3f8ee5c010ec9c51c2a2e19054f90c76c28652f SHA1 308672dfa7f335d42993278cf57d49531bcf4393 SHA256 7f960757415ee4f4d88bd010a91595959630d90ef36085dd1bd31eac3eaff9d0
 MISC metadata.xml 1089 RMD160 9c8a425da7e10ddc2cdf1bfbbf60b23257eca1e7 SHA1 9ba3821b6dc312016d9cecc295555411e8bc044c SHA256 67982ede09eba43a5e84327f2f529031242424222e0d5170f31c8f2e647e937f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN4nOvAAoJEPqDWhW0r/LC3sEP/3k1gVPgyGMo23UhHpjd/Wkv
-fTiU+zxFmJVBF7+MlvvJH4xoQ5CdOtth5ZKWweExr34f+73d8X5T+N7MBRsuxS9x
-T+VdvImmlegGtwv8MsQcH1gT1EILoXJijca7rISSCD0FfNqfKeXHfeMUkp3Fv6Z+
-hltaMVfAfzrLFZauH0bjivMol0PURJNpngEznRIppPLcUcBx9jPQRQCyjD6IGUQp
-dbyhR22lawtJEfRSHhhdJMYcyErYQUDC4Vj5lC418P+mohYln24gKRA7HLAurE2p
-XIBcL6C/VRzQQqin32S9fNyNm8o8KGuMODuLxacsa/FPgytQG7XkuIh36+EwukPW
-Qo9hfbdJyWRcIvAn9t811gIQeuiMcHgAAuUxBjJvOIJL/X4itRglnhxrRdrAiSuX
-vksLIaUgw2HNbxSZPWue62y4EVKSxrjKli0wjmRgouAAJlW4M+STelBxccJ7L+fq
-gxQhQUC3zT2IXOpgT/eQE+ditWsB1X04QTQuirS8hfT9ihcsKTs5Dt1xPKfQLA7U
-WA0MZIKXQgPtaAdAwumAhnSPxn/27jXC83xJGlEyrEmYd0YCuTEmL4TtiuyJOqBp
-7N7RN7QV1IPBWGm27splnOuO+0Lxv8gXTDMLEo3lJnGORKqgnvW7BDPOdsICkaC2
-q2muTWfOLyeMupxaJc2y
-=NUHe
------END PGP SIGNATURE-----
diff --git a/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
index f03ea82fc5d6..09b34628d1b5 100644
--- a/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
+++ b/games-emulation/sdlmame/files/sdlmame-0.142-makefile.patch
@@ -1,6 +1,5 @@
-diff -ru work.orig/makefile work/makefile
---- work.orig/makefile	2011-02-12 15:17:48.000000000 -0500
-+++ work/makefile	2011-05-22 17:27:47.006482020 -0400
+--- work.orig/makefile
++++ work/makefile
 @@ -431,9 +431,6 @@
  CPPONLYFLAGS += -x c++ -std=gnu++98

  COBJFLAGS += -x objective-c++

diff --git a/games-emulation/sdlmame/files/sdlmame-0.142_p5-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.142_p5-makefile.patch
new file mode 100644
index 000000000000..444c5e9688b2
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.142_p5-makefile.patch
@@ -0,0 +1,67 @@
+--- 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.142_p5-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.142_p5-no-opengl.patch
new file mode 100644
index 000000000000..87eeae5b50c7
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.142_p5-no-opengl.patch
@@ -0,0 +1,11 @@
+--- ./src/osd/sdl/osdsdl.h.orig
++++ ./src/osd/sdl/osdsdl.h
+@@ -225,6 +225,8 @@
+ 	const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); }
+ #if USE_OPENGL
+ 	const char *gl_lib() const { return value(SDLOPTION_GL_LIB); }
++#else
++	const char *gl_lib() const { return NULL; }
+ #endif
+ 
+ private:
diff --git a/games-emulation/sdlmame/sdlmame-0.142_p5.ebuild b/games-emulation/sdlmame/sdlmame-0.142_p5.ebuild
new file mode 100644
index 000000000000..bcb26378638f
--- /dev/null
+++ b/games-emulation/sdlmame/sdlmame-0.142_p5.ebuild
@@ -0,0 +1,150 @@
+# 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_p5.ebuild,v 1.1 2011/06/15 16:39:01 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]
+	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 $(grep +++ *diff | awk '{ print $2 }' | sort -u) *diff 2> /dev/null
+		einfo "Patching release with source updates"
+		epatch ${MY_PV%%_p*}*.diff
+	fi
+	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
+}