version bump (bug #382529)

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

diff --git a/games-emulation/sdlmame/ChangeLog b/games-emulation/sdlmame/ChangeLog
index eb6adf2f3d57a874b1de363eff6de6b5f37e7e32..95a352b2038b531a7832e404f3cb6b936007a2f3 100644 (file)
--- 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.52 2011/09/04 17:35:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/ChangeLog,v 1.53 2011/09/11 06:10:42 mr_bones_ Exp $
+
+*sdlmame-0.143_p5 (11 Sep 2011)
+
+  11 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +sdlmame-0.143_p5.ebuild, +files/sdlmame-0.143_p5-makefile.patch,
+  +files/sdlmame-0.143_p5-no-opengl.patch:
+  version bump (bug #382529)
 
   04 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> sdlmame-0.142_p5.ebuild:
   x86 stable wrt bug #380183

diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
index 23bcb381190f1deb3361a48a8f8e408bb0bc7c55..919bcc3afaafa62b80e68159da4ec6b83b36972d 100644 (file)
--- a/games-emulation/sdlmame/Manifest
+++ b/games-emulation/sdlmame/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,6 +7,8 @@ AUX sdlmame-0.142_p5-makefile.patch 1571 RMD160 49deff9cc0436be874fc49be0ef1a0a9
 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 sdlmame-0.143_p5-makefile.patch 1571 RMD160 49deff9cc0436be874fc49be0ef1a0a95aed056d SHA1 335c71fb70c794649c583fd25c5bc88e1effc985 SHA256 c7a98ebaa50808fe8ad3a4734373e925fc066d90ff2fd57da29645f205e038b3
+AUX sdlmame-0.143_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
@@ -29,17 +28,12 @@ DIST sdlmame0143u1_diff.zip 250465 RMD160 332a7ebb50750bd628819e39d0ca6b9249d618
 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
+DIST sdlmame0143u5_diff.zip 314547 RMD160 948e3f70d1e000a3df9433baa5089308546a9d03 SHA1 069efd5490523d03f5e16fd8fac290134eb24cf4 SHA256 290d61609b1ffff661ba9be32b61baeb187970fc9883471741f001d25decc8a6
 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 3896 RMD160 de8310feff8a3db7d5e8e75a5b85309ae8f357f8 SHA1 2f48ee8a2f61b124b065169f74be4cda0b9f939a SHA256 20a07fd9800abc4054c80820267a8ac5e1c306159077c38056a6f129184f7ef6
 EBUILD sdlmame-0.143_p4.ebuild 3929 RMD160 787550b0800a9c3061707f6aa1b87cf3add0470d SHA1 5397da1097d2676673474a15489c74abd76d08c7 SHA256 a1befb297a01b5a9ceed89c5c848fee203e8171354afff74826aa13ed455decb
-MISC ChangeLog 7005 RMD160 513bc8082082270301f7c2d3a07ab9dd494ddbc7 SHA1 a45b8c6310112b11eee6f62f4b655e859ec82301 SHA256 95d0c3eb9092b4284739d82c16969881e29b7e4d0e472fcc9c1ad472769e5eeb
+EBUILD sdlmame-0.143_p5.ebuild 3929 RMD160 69a0a9c019c6e680007686b6fb84aec4473bb634 SHA1 2dc2b2bee417b8352ab19bf9e0347b4ad8626d83 SHA256 4081d0ffa374cc1ce4d5ec41e003e2b71c57385d1cafce796541f5ea73516529
+MISC ChangeLog 7233 RMD160 07eb70683ec3dc51766ff53c10018d003d2a0174 SHA1 dc85b503140b35edf33b537dfdd33274981890f7 SHA256 511221be6bb3b43d004be73a5bccbee66fcdd31549346428da2ce3c1c3f90dda
 MISC metadata.xml 1089 RMD160 9c8a425da7e10ddc2cdf1bfbbf60b23257eca1e7 SHA1 9ba3821b6dc312016d9cecc295555411e8bc044c SHA256 67982ede09eba43a5e84327f2f529031242424222e0d5170f31c8f2e647e937f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk5jtucACgkQuUQtlDBCeQLhoQCfdAB7RDtZ9Pzw0kFHTG8WP+Nh
-ChQAnjzp2BM0VqdXuM2C0qh0K33/Pqnq
-=lTI/
------END PGP SIGNATURE-----

diff --git a/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p5-makefile.patch
new file mode 100644 (file)
index 0000000..444c5e9
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.143_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.143_p5-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.143_p5-no-opengl.patch
new file mode 100644 (file)
index 0000000..87eeae5
--- /dev/null
+++ b/games-emulation/sdlmame/files/sdlmame-0.143_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.143_p5.ebuild b/games-emulation/sdlmame/sdlmame-0.143_p5.ebuild
new file mode 100644 (file)
index 0000000..5727ee8
--- /dev/null
+++ b/games-emulation/sdlmame/sdlmame-0.143_p5.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_p5.ebuild,v 1.1 2011/09/11 06:10:42 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
+}