Added patch from Charles Christie <sonicbhoc@gmail.com> and closing bug #148781.

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 175 insertions, 16 deletions

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index bd0991afe86a..6eaedc544a39 100644
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/stepmania
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.15 2006/12/10 21:55:08 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.16 2006/12/12 17:51:33 wolf31o2 Exp $
+
+  12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/stepmania-3.9-alias.patch, stepmania-3.9.ebuild:
+  Added patch from Charles Christie <sonicbhoc@gmail.com> and closing bug
+  #148781.
 
   10 Dec 2006; Tristan Heaven <nyhm@gentoo.org> stepmania-3.9.ebuild:
   Fix typo and cleanup, bug #157601
diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index d28e5c21acc4..2bc50d3780fe 100644
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -5,6 +5,10 @@ AUX stepmania-3.9-64bits.patch 2208 RMD160 9a0a1080431504ecb2b27e3658bd341aba865
 MD5 c557de9a2d4e09419c3d4a960948e20e files/stepmania-3.9-64bits.patch 2208
 RMD160 9a0a1080431504ecb2b27e3658bd341aba865a30 files/stepmania-3.9-64bits.patch 2208
 SHA256 cbbf15a9e83e4a20dd0640bb47731f0386951586c00fb5a34bac9fbf5e8b22c8 files/stepmania-3.9-64bits.patch 2208
+AUX stepmania-3.9-alias.patch 5173 RMD160 476b47a34a8d63a9c282e04ec0a94c70e88029d9 SHA1 170134f63c18173ce42ce9c62deaf4d255c528f6 SHA256 d15ec48c0aa6ba754d419c04b2c14c5d1f756d6588180e8c82a59d1c7efb4b0b
+MD5 85457e86101ecc1e07e49e25e8b25b36 files/stepmania-3.9-alias.patch 5173
+RMD160 476b47a34a8d63a9c282e04ec0a94c70e88029d9 files/stepmania-3.9-alias.patch 5173
+SHA256 d15ec48c0aa6ba754d419c04b2c14c5d1f756d6588180e8c82a59d1c7efb4b0b files/stepmania-3.9-alias.patch 5173
 AUX stepmania-3.9-alsa.patch 356 RMD160 e1c9b0abe3e8013fbe81f9c22f67bf9ec963e467 SHA1 6ba76db3ed7a25d5136fdcada515dd98c1085a82 SHA256 d08657046a074dde4206267e56fc54ae745bd3987278af55a41851373caf28eb
 MD5 ce4eefeff7a193046f23b1090aff6107 files/stepmania-3.9-alsa.patch 356
 RMD160 e1c9b0abe3e8013fbe81f9c22f67bf9ec963e467 files/stepmania-3.9-alsa.patch 356
@@ -31,14 +35,14 @@ RMD160 fdac52f93d738ecdb9f91aeb2ea23ec509c213eb files/stepmania-3.9-vorbis.patch
 SHA256 ea8992e76c5240f96257e7b78594709b222274df9c58a4f4082ae462d51030ba files/stepmania-3.9-vorbis.patch 616
 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
-EBUILD stepmania-3.9.ebuild 2335 RMD160 4c20fd8c5f1d4ba74edc6f5df2c67cece38712aa SHA1 8d73621c2fb25d877127378a5d98d08c023e139b SHA256 fcaa1eb50ca32e4b72ba8308f7cffd9d941ef1b731d2787a935ca8f7b8e9982b
-MD5 45ded3e7d8f927f68f75d7f57b688169 stepmania-3.9.ebuild 2335
-RMD160 4c20fd8c5f1d4ba74edc6f5df2c67cece38712aa stepmania-3.9.ebuild 2335
-SHA256 fcaa1eb50ca32e4b72ba8308f7cffd9d941ef1b731d2787a935ca8f7b8e9982b stepmania-3.9.ebuild 2335
-MISC ChangeLog 2701 RMD160 e148124803593dd98b4de6dc3ed0d5cbb03ccc6b SHA1 a37de0eca9a4ab9aa16dc1bfef140cbb20c603bf SHA256 584b3495da94dbc811617c369af4889ffc43d7e506a7f7f146524b47ec640048
-MD5 a4c2d50b476a6d0b281200d0a6e9e9f1 ChangeLog 2701
-RMD160 e148124803593dd98b4de6dc3ed0d5cbb03ccc6b ChangeLog 2701
-SHA256 584b3495da94dbc811617c369af4889ffc43d7e506a7f7f146524b47ec640048 ChangeLog 2701
+EBUILD stepmania-3.9.ebuild 2374 RMD160 0ffd56865661f035840377f0ea05210a66cc6f87 SHA1 1f4693f4daa311cab32c26f8e61af50652c25377 SHA256 eb0fee23daf8e66e94250c32311453eb2b0feef9e73f86f45464ba98f5769b7f
+MD5 f610bafd87619887a6e5ac94da54d7e6 stepmania-3.9.ebuild 2374
+RMD160 0ffd56865661f035840377f0ea05210a66cc6f87 stepmania-3.9.ebuild 2374
+SHA256 eb0fee23daf8e66e94250c32311453eb2b0feef9e73f86f45464ba98f5769b7f stepmania-3.9.ebuild 2374
+MISC ChangeLog 2903 RMD160 ed6b22f60a4a87fc447de92fb4c7fdb71f01cc94 SHA1 d90e00be2db75ea20f9732d29f601da5c0886c95 SHA256 c072dde9fa66e52cbd4504b7951d27f1445167c3bc5706e5220974a5b2bc7667
+MD5 6b96bfaab013f89303d43f7521b040ef ChangeLog 2903
+RMD160 ed6b22f60a4a87fc447de92fb4c7fdb71f01cc94 ChangeLog 2903
+SHA256 c072dde9fa66e52cbd4504b7951d27f1445167c3bc5706e5220974a5b2bc7667 ChangeLog 2903
 MISC metadata.xml 220 RMD160 9644806f89f8b8d272e5ece60b993df5cd41a900 SHA1 97c2910ccf82c9a3600a4bb822777a7bf342a17a SHA256 2482823056583dedefb8c75afb2d017147227f6d93f81655e2f7b0721d178178
 MD5 441e3a625f4d1889a960a7f9adefe87b metadata.xml 220
 RMD160 9644806f89f8b8d272e5ece60b993df5cd41a900 metadata.xml 220
@@ -47,9 +51,9 @@ MD5 c1e3bef52068916fd35ad333c8bc9729 files/digest-stepmania-3.9 521
 RMD160 8de9c7da4cd2c2689dc0da18f83213b514f507e1 files/digest-stepmania-3.9 521
 SHA256 d808db368491b77f5196ebef8f35817eead695add6514ed9337dbc24bc2a1f0c files/digest-stepmania-3.9 521
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFfIJCdz7hIScOURERAqijAJ0eu3cqJ0FqU5PFI9wNuEB9F7AZowCgvUVv
-pWt4S6Dy5/1t/Mwk94LC+yY=
-=P2FI
+iD8DBQFFfuwwkT4lNIS36YERAizxAKCD00Y230OuuXlTIC7rVHthP96wQQCfaxry
+aBPu5l/YniV8WWDzFulF04I=
+=ev3P
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/stepmania/files/stepmania-3.9-alias.patch b/games-arcade/stepmania/files/stepmania-3.9-alias.patch
new file mode 100644
index 000000000000..17ca00467983
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-alias.patch
@@ -0,0 +1,149 @@
+diff -u StepMania-3.9-src-orig/src/Difficulty.cpp StepMania-3.9-src/src/Difficulty.cpp
+--- StepMania-3.9-src-orig/src/Difficulty.cpp	2004-07-11 09:21:29.000000000 +0200
++++ StepMania-3.9-src/src/Difficulty.cpp	2006-11-27 00:15:25.000000000 +0100
+@@ -57,7 +57,7 @@
+ 
+ CourseDifficulty GetNextShownCourseDifficulty( CourseDifficulty cd )
+ {
+-	for( CourseDifficulty d=(CourseDifficulty)(cd+1); d<NUM_DIFFICULTIES; ((int&)d)++ )
++	for( CourseDifficulty d=(CourseDifficulty)(cd+1); d<NUM_DIFFICULTIES; enum_add(d, 1) )
+ 	{
+ 		if( GAMESTATE->IsCourseDifficultyShown(d) )
+ 			return d;
+diff -u StepMania-3.9-src-orig/src/PlayerNumber.cpp StepMania-3.9-src/src/PlayerNumber.cpp
+--- StepMania-3.9-src-orig/src/PlayerNumber.cpp	2004-07-18 00:15:39.000000000 +0200
++++ StepMania-3.9-src/src/PlayerNumber.cpp	2006-11-27 00:15:25.000000000 +0100
+@@ -22,41 +22,33 @@
+ 
+ PlayerNumber GetNextHumanPlayer( PlayerNumber pn )
+ {
+-	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
+-	{
+-		if( GAMESTATE->IsHumanPlayer(p) )
+-			return p;
+-	}
++	for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
++		if( GAMESTATE->IsHumanPlayer(pn) )
++			return pn;
+ 	return PLAYER_INVALID;
+ }
+ 
+ PlayerNumber GetNextEnabledPlayer( PlayerNumber pn )
+ {
+-	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
+-	{
+-		if( GAMESTATE->IsPlayerEnabled(p) )
+-			return p;
+-	}
++	for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
++		if( GAMESTATE->IsPlayerEnabled(pn) )
++			return pn;
+ 	return PLAYER_INVALID;
+ }
+ 
+ PlayerNumber GetNextCpuPlayer( PlayerNumber pn )
+ {
+-	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
+-	{
+-		if( GAMESTATE->IsCpuPlayer(p) )
+-			return p;
+-	}
++	for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
++		if( GAMESTATE->IsCpuPlayer(pn) )
++			return pn;
+ 	return PLAYER_INVALID;
+ }
+ 
+ PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn )
+ {
+-	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
+-	{
+-		if( !GAMESTATE->IsHumanPlayer(p) )
+-			return p;
+-	}
++	for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
++		if( !GAMESTATE->IsHumanPlayer(pn) )
++			return pn;
+ 	return PLAYER_INVALID;
+ }
+ 
+diff -u StepMania-3.9-src-orig/src/RageUtil.h StepMania-3.9-src/src/RageUtil.h
+--- StepMania-3.9-src-orig/src/RageUtil.h	2004-10-07 19:56:16.000000000 +0200
++++ StepMania-3.9-src/src/RageUtil.h	2006-11-27 00:15:25.000000000 +0100
+@@ -53,6 +53,14 @@
+ 	return false;
+ }
+ 
++template<class T>
++inline bool ENUM_CLAMP( T &x, T l, T h )
++{
++	if (x > h)	{ x = h; return true; }
++	else if (x < l) { x = l; return true; }
++	return false;
++}
++
+ inline void wrap( int &x, int n)
+ {
+ 	if (x<0)
+diff -u StepMania-3.9-src-orig/src/ScreenBookkeeping.cpp StepMania-3.9-src/src/ScreenBookkeeping.cpp
+--- StepMania-3.9-src-orig/src/ScreenBookkeeping.cpp	2004-08-22 18:28:19.000000000 +0200
++++ StepMania-3.9-src/src/ScreenBookkeeping.cpp	2006-11-27 00:15:25.000000000 +0100
+@@ -74,14 +74,14 @@
+ void ScreenBookkeeping::MenuLeft( PlayerNumber pn )
+ {
+ 	m_View = (View)(m_View-1);
+-	CLAMP( (int&)m_View, 0, NUM_VIEWS-1 );
++	ENUM_CLAMP( m_View, View(0), View(NUM_VIEWS-1) );
+ 	ChangeView( m_View );
+ }
+ 
+ void ScreenBookkeeping::MenuRight( PlayerNumber pn )
+ {
+ 	m_View = (View)(m_View+1);
+-	CLAMP( (int&)m_View, 0, NUM_VIEWS-1 );
++	ENUM_CLAMP( m_View, View(0), View(NUM_VIEWS-1) );
+ 	ChangeView( m_View );
+ }
+ 
+diff -u StepMania-3.9-src-orig/src/ScreenSetTime.cpp StepMania-3.9-src/src/ScreenSetTime.cpp
+--- StepMania-3.9-src-orig/src/ScreenSetTime.cpp	2004-08-31 10:29:34.000000000 +0200
++++ StepMania-3.9-src/src/ScreenSetTime.cpp	2006-11-27 00:15:25.000000000 +0100
+@@ -160,7 +160,7 @@
+ 	SetTimeSelection OldSelection = m_Selection;
+ 	enum_add<SetTimeSelection>( m_Selection, iDirection );
+ 
+-	CLAMP( (int&)m_Selection, 0, NUM_SET_TIME_SELECTIONS-1 );
++	ENUM_CLAMP( m_Selection, SetTimeSelection(0), SetTimeSelection(NUM_SET_TIME_SELECTIONS-1) );
+ 	if( iDirection != 0 && m_Selection == OldSelection )
+ 		return; // can't move any more
+ 
+diff -u StepMania-3.9-src-orig/src/Song.cpp StepMania-3.9-src/src/Song.cpp
+--- StepMania-3.9-src-orig/src/Song.cpp	2004-12-20 23:25:12.000000000 +0100
++++ StepMania-3.9-src/src/Song.cpp	2006-11-27 00:15:25.000000000 +0100
+@@ -916,22 +916,22 @@
+ 	if( pSteps )
+ 		return pSteps;
+ 	newDC = (Difficulty)(dc-1);
+-	CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 );
++	ENUM_CLAMP( newDC, Difficulty(0), Difficulty(NUM_DIFFICULTIES-1) );
+ 	pSteps = GetStepsByDifficulty( st, newDC );
+ 	if( pSteps )
+ 		return pSteps;
+ 	newDC = (Difficulty)(dc+1);
+-	CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 );
++	ENUM_CLAMP( newDC, Difficulty(0), Difficulty(NUM_DIFFICULTIES-1) );
+ 	pSteps = GetStepsByDifficulty( st, newDC );
+ 	if( pSteps )
+ 		return pSteps;
+ 	newDC = (Difficulty)(dc-2);
+-	CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 );
++	ENUM_CLAMP( newDC, Difficulty(0), Difficulty(NUM_DIFFICULTIES-1) );
+ 	pSteps = GetStepsByDifficulty( st, newDC );
+ 	if( pSteps )
+ 		return pSteps;
+ 	newDC = (Difficulty)(dc+2);
+-	CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 );
++	ENUM_CLAMP( newDC, Difficulty(0), Difficulty(NUM_DIFFICULTIES-1) );
+ 	pSteps = GetStepsByDifficulty( st, newDC );
+ 	return pSteps;
+ }
diff --git a/games-arcade/stepmania/stepmania-3.9.ebuild b/games-arcade/stepmania/stepmania-3.9.ebuild
index c60bed52fb4f..5f989bc85b64 100644
--- a/games-arcade/stepmania/stepmania-3.9.ebuild
+++ b/games-arcade/stepmania/stepmania-3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.7 2006/12/10 21:55:08 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.8 2006/12/12 17:51:33 wolf31o2 Exp $
 
 WANT_AUTOCONF=latest
 inherit eutils autotools games
@@ -48,8 +48,9 @@ src_unpack() {
 		"${FILESDIR}/${P}"-64bits.patch \
 		"${FILESDIR}/${P}"-ffmpeg.patch \
 		"${FILESDIR}/${P}"-vorbis.patch \
-		"${FILESDIR}"/${P}-sdl.patch \
-		"${FILESDIR}/${P}"-alsa.patch
+		"${FILESDIR}/${P}"-sdl.patch \
+		"${FILESDIR}/${P}"-alsa.patch \
+		"${FILESDIR}/${P}"-alias.patch
 	eautoconf
 }