version bump

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

5 files changed, 246 insertions, 12 deletions

diff --git a/games-emulation/sdlmame/ChangeLog b/games-emulation/sdlmame/ChangeLog
index dfe3e45795e3..3042d1d1d3aa 100644
--- a/games-emulation/sdlmame/ChangeLog
+++ b/games-emulation/sdlmame/ChangeLog
@@ -1,6 +1,13 @@
 # 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.50 2011/08/22 14:19:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.51 2011/09/04 02:40:54 mr_bones_ Exp $
+
+*sdlmame-0.143_p4 (04 Sep 2011)
+
+  04 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +sdlmame-0.143_p4.ebuild, +files/sdlmame-0.143_p4-makefile.patch,
+  +files/sdlmame-0.143_p4-no-opengl.patch:
+  version bump
 
   22 Aug 2011; Tony Vroon <chainsaw@gentoo.org> sdlmame-0.142_p5.ebuild:
   Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney in bug
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 7b33d982bbb6..ebca0b8906f5 100644
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -8,9 +5,12 @@ AUX sdlmame-0.136-nodebug.patch 952 RMD160 4098730d8cdf205b8dfc4f4a4dbcccf36ddff
 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 sdlmame-0.143_p4-makefile.patch 1571 RMD160 49deff9cc0436be874fc49be0ef1a0a95aed056d SHA1 335c71fb70c794649c583fd25c5bc88e1effc985 SHA256 c7a98ebaa50808fe8ad3a4734373e925fc066d90ff2fd57da29645f205e038b3
+AUX sdlmame-0.143_p4-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
+DIST mame0143s.zip 17902802 RMD160 0cfffdf5939fb740abdb030256011a8e6ca6ee54 SHA1 dd7cf43ec9f31321ee698facce3b2d3b21cebf15 SHA256 677f04756ed7bc00e1adc6e68bbb174f89845887758dc287c7244a58e6ac266f
 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
@@ -22,16 +22,14 @@ DIST sdlmame0142u2_diff.zip 246135 RMD160 e153edb7c87db0b70a71e6083c31954aabb4ac
 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
+DIST sdlmame0143u1_diff.zip 250465 RMD160 332a7ebb50750bd628819e39d0ca6b9249d618b7 SHA1 57a9b9960b48c2a3377953c01bbb8540224e560c SHA256 307172c6956f58251590a5c30c454c99fbdf02ae554d0e3aaa0133fc9989eee8
+DIST sdlmame0143u2_diff.zip 679992 RMD160 28ed6b5910fd72a8cfd24d01e76a588b14eec3f5 SHA1 4fc015691392c6aac5798b7511dc28afdd0f3bdb SHA256 4f6fa5961fe9fe99dfd6d315daf5280b2516ac96213b2a2c0fcf849c284db086
+DIST sdlmame0143u3_diff.zip 492365 RMD160 1e03893fc17652e1c1cef65412612137e51e7b4d SHA1 ba9b6e2ff179e79a00715ced5fde655047718498 SHA256 243f8a23e7b36520c1bd0c73e6bdc5a35b0442d43719884ed8d388e0775ce5a7
+DIST sdlmame0143u4_diff.zip 858755 RMD160 88b7dad4c61ae3dbf740c179f69175763cbead17 SHA1 fc22f483645186edecf0cdb4102bbea30e8fa902 SHA256 a9d90392e123758003a6cc48eb1e295d9d69059b9014b6556cfd5fa2dfba2597
 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
 EBUILD sdlmame-0.142_p5.ebuild 3895 RMD160 678dca39a468212c8e6d8ea4cd3c1299d6678331 SHA1 55eb5442902fd5e0dd4c13c1ff80e1035b8a71af SHA256 bc25ce2b170f521f6b33df59f236e103091f3ce2550bab24bc15bb39c67a4994
-MISC ChangeLog 6678 RMD160 935e555b516fac16f6af82fdb078f89bb001996f SHA1 3233564b6c6cb7420758799b7b843f797e5220f3 SHA256 4c7aa581d9187119bc730e6c45fda69f1178fdd52b05ed52caf34b9b4ba5b490
+EBUILD sdlmame-0.143_p4.ebuild 3929 RMD160 787550b0800a9c3061707f6aa1b87cf3add0470d SHA1 5397da1097d2676673474a15489c74abd76d08c7 SHA256 a1befb297a01b5a9ceed89c5c848fee203e8171354afff74826aa13ed455decb
+MISC ChangeLog 6894 RMD160 d40e1463e937726a4a1a002848b36df4189e1a46 SHA1 ee91f7194418506d6919d7d900b37b734a2296dc SHA256 87c90d436643466a3e3141293d313095be062eea6359fdc80d13169c200c50ff
 MISC metadata.xml 1089 RMD160 9c8a425da7e10ddc2cdf1bfbbf60b23257eca1e7 SHA1 9ba3821b6dc312016d9cecc295555411e8bc044c SHA256 67982ede09eba43a5e84327f2f529031242424222e0d5170f31c8f2e647e937f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk5SZZIACgkQp5vW4rUFj5rsggCgpSkzHOYsKDNDJx5eX+VI85bM
-nKIAnRoTxjFpExj3xcidlTyYsDp1ZxZK
-=tXgx
------END PGP SIGNATURE-----
diff --git a/games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p4-makefile.patch
new file mode 100644
index 000000000000..444c5e9688b2
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.143_p4-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.143_p4-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p4-no-opengl.patch
new file mode 100644
index 000000000000..87eeae5b50c7
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.143_p4-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.143_p4.ebuild b/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild
new file mode 100644
index 000000000000..bd91042a5cd6
--- /dev/null
+++ b/games-emulation/sdlmame/sdlmame-0.143_p4.ebuild
@@ -0,0 +1,151 @@
+# 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.1 2011/09/04 02:40:54 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
+	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
+}