Fix crash with "Select Style" wrt #298611.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

3 files changed, 91 insertions, 3 deletions

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index d3d80bb48e50..1367513ee1c2 100644
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/stepmania
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.32 2009/09/07 07:30:11 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.33 2010/02/24 21:26:02 ssuominen Exp $
+
+*stepmania-3.9-r2 (24 Feb 2010)
+
+  24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +stepmania-3.9-r2.ebuild:
+  Fix crash with "Select Style" wrt #298611.
 
   07 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
   stepmania-3.9-r1.ebuild:
diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index 46c35223e071..de02580081d4 100644
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -2,6 +2,8 @@ AUX stepmania-3.9-gentoo.patch 941 RMD160 d352bf2106973e9a993293d3f1d6f14f7f125a
 DIST StepMania-3.9-linux.tar.gz 10174400 RMD160 426b11d652669be85753161f2cd03f2fe81df860 SHA1 100b1a2771fec1d208798ef03ba164259a589bf2 SHA256 ccb6e549e8d026e79de7d6bbfadc7f1ac7f7c05242a90edf56cf652f5ddeaae0
 DIST StepMania-3.9-src.tar.gz 3090223 RMD160 e7451192fe67f53a7a93baf99bf9a20bc3d1f7cf SHA1 b2d2c3a50c23506844ba7e22289e59d270bb8b2e SHA256 31082d388fa64b9764aee4d7628f377bc0fe47b8f157b8bcc66d9e3678479c85
 DIST stepmania-3.9-patches-5.tar.bz2 10306 RMD160 e4a1c8b0977208e974e8624600b24c9c966a161c SHA1 aae46ff8d4f39e2f5c08388dfea419a5c70a75c3 SHA256 2ff8b659093ce38e92f3d78ed872f99c95ed2c6a22945257f21182952e783ac5
+DIST stepmania-3.9-patches-6.tar.bz2 10577 RMD160 23ed35d8c25f3421bce3da0b3889cb917cb03fc4 SHA1 c39d3e747ecdb563117156d903313f897ec18cf2 SHA256 3ea399d5dd99f0285f9b0c88eb1c60802bd85617a8934bb9810ac8773b854264
 EBUILD stepmania-3.9-r1.ebuild 2015 RMD160 4109b9b4902116a99e57515f8af218c27595575b SHA1 833e79d86a3421447014ac4f7b9286dd8c2bf370 SHA256 5ff9b5d82bb27f2e5a1024ee8bd9bc985db336beb7088386897df73ba88b6fc6
-MISC ChangeLog 5564 RMD160 e36515387030e3dd97f03ffb15de016fcfa38d60 SHA1 d94f79d5e66738db0179547c14cd87f078f48d7c SHA256 ef917a5aee43999a069d8c0ac19d1c0b0ddda9cd63df16d966ff14d7ceff4a2e
+EBUILD stepmania-3.9-r2.ebuild 2032 RMD160 5eada340d84e64c65699dc5f00e0c8fabd64fe3e SHA1 b49a1d05224af566a09aa2689048ec1eaae6a66a SHA256 3964847fd675407766a8f9c45f50d4cdc7acf88f096cded7be5ef445378eb387
+MISC ChangeLog 5725 RMD160 19173cb37f88dd7d0d36516df5dea74eed551f4e SHA1 2dab988f5d44ec203e918b304a86ce9e06614f79 SHA256 963f13ef430e718bca45cecc17ef12d3e6a326cd78e33fc9fe13b46917450fca
 MISC metadata.xml 328 RMD160 c7bbe6fdc6af00a1d3f76a4cf8033e31a5c020db SHA1 edd8a37f67220289312d3536ff2ab8f0918c57b4 SHA256 276314f486b56b53f4bbaad58741b9ecab165502c877f3aa35977c2cf31e696f
diff --git a/games-arcade/stepmania/stepmania-3.9-r2.ebuild b/games-arcade/stepmania/stepmania-3.9-r2.ebuild
new file mode 100644
index 000000000000..6ca7ab5f7e90
--- /dev/null
+++ b/games-arcade/stepmania/stepmania-3.9-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9-r2.ebuild,v 1.1 2010/02/24 21:26:02 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils games
+
+MY_P=StepMania-${PV}
+DESCRIPTION="An advanced DDR simulator"
+HOMEPAGE="http://www.stepmania.com/stepmania/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz
+	mirror://sourceforge/${PN}/${MY_P}-linux.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}-patches-6.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ffmpeg force-oss gtk jpeg mad vorbis"
+
+RESTRICT="test"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	mad? ( media-libs/libmad )
+	>=dev-lang/lua-5
+	media-libs/libsdl[joystick,opengl]
+	jpeg? ( media-libs/jpeg )
+	media-libs/libpng
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	vorbis? ( media-libs/libvorbis )
+	virtual/opengl
+	virtual/glu"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}-src
+
+src_prepare() {
+	sed "s:/usr/share/games/${PN}:${GAMES_DATADIR}/${PN}:" \
+		"${FILESDIR}"/${P}-gentoo.patch > "${T}"/${P}.patch
+
+	EPATCH_SUFFIX=patch epatch "${T}"/${P}.patch "${WORKDIR}"/patches
+	AT_M4DIR=autoconf/m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_with debug) \
+		$(use_with jpeg) \
+		$(use_with vorbis) \
+		$(use_with mad mp3) \
+		$(use_enable gtk gtk2) \
+		$(use_enable force-oss)
+}
+
+src_install() {
+	local dir=${GAMES_DATADIR}/${PN}
+
+	exeinto "${dir}"
+	doexe src/stepmania || die "doexe failed"
+
+	if use gtk; then
+		doexe src/GtkModule.so || die "doexe failed"
+	fi
+
+	cd "${WORKDIR}"/${MY_P}
+
+	insinto "${dir}"
+	doins -r Announcers BGAnimations CDTitles Characters Courses Data Docs \
+		NoteSkins RandomMovies Songs Themes Visualizations || die "doins failed"
+
+	dodoc Copying.txt NEWS
+	dohtml README-FIRST.html
+
+	newicon "Themes/default/Graphics/Common window icon.png" ${PN}.png
+	make_desktop_entry ${PN} StepMania
+
+	games_make_wrapper ${PN} "${dir}"/${PN} "${dir}"
+	prepgamesdirs
+}