Version bump

(Portage version: 2.1.2-r5)

16 files changed, 22 insertions, 425 deletions

diff --git a/games-sports/ultimatestunts/ChangeLog b/games-sports/ultimatestunts/ChangeLog
index 1fc336ea364f..9ad70cbd0d35 100644
--- a/games-sports/ultimatestunts/ChangeLog
+++ b/games-sports/ultimatestunts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-sports/ultimatestunts
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ChangeLog,v 1.12 2006/12/06 20:30:06 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ChangeLog,v 1.13 2007/01/31 16:44:48 nyhm Exp $
+
+*ultimatestunts-0.7.0 (31 Jan 2007)
+
+  31 Jan 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/ultimatestunts-0.7.0-paths.patch, +ultimatestunts-0.7.0.ebuild:
+  Version bump
 
   06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ultimatestunts-0.6.1-r1.ebuild:
diff --git a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1 b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1
deleted file mode 100644
index 6072f2efe79b..000000000000
--- a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aa0524704fefe873b7dae77e88a86c9c ultimatestunts-srcdata-0611.tar.gz 23171268
-RMD160 4ca3d691fe05bfa714129ad7eaeb358e1c4b2f02 ultimatestunts-srcdata-0611.tar.gz 23171268
-SHA256 d1ac09ad03e7b81611b014bdef5956910be01e53cab7b0bafdfbfe7047547fe7 ultimatestunts-srcdata-0611.tar.gz 23171268
diff --git a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2 b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2
deleted file mode 100644
index 2aa1595ed91c..000000000000
--- a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 173c9e915d4bcaf7206d8b872b387ad9 ultimatestunts-srcdata-0621.tar.gz 25355968
-RMD160 5b65bf35dcefaa5036b382c9b3edb5974471a1f9 ultimatestunts-srcdata-0621.tar.gz 25355968
-SHA256 363e1bc582cc3417dfbc2b629da502ce9b3151c1a83a5d54841f4112bfde7be3 ultimatestunts-srcdata-0621.tar.gz 25355968
diff --git a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.3 b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.3
deleted file mode 100644
index 1a169152b7e3..000000000000
--- a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4b20bf56049b5d36358f0c12e9991d52 ultimatestunts-srcdata-0631.tar.gz 13298201
-RMD160 7dbe0b7cfecb2c6ae3157e0164534407d9235463 ultimatestunts-srcdata-0631.tar.gz 13298201
-SHA256 132fa493d5322dff50a6b14c6e833fbf3535e575e4fd2e21cf0b3172763d84cb ultimatestunts-srcdata-0631.tar.gz 13298201
diff --git a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.7.0 b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.7.0
new file mode 100644
index 000000000000..b705c3e3b8a9
--- /dev/null
+++ b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.7.0
@@ -0,0 +1,3 @@
+MD5 a03459c3642898b6a8a7520ef0b191a5 ultimatestunts-srcdata-0701.tar.gz 15046586
+RMD160 88a514ab54a5423930937a826cb7b7a552064297 ultimatestunts-srcdata-0701.tar.gz 15046586
+SHA256 88f7f14e02d9e4ca4b7ecc7eebb572039d159e5013d5912537cd3251765266d6 ultimatestunts-srcdata-0701.tar.gz 15046586
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-64bits.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-64bits.patch
deleted file mode 100644
index a6fda4f92782..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-64bits.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- simulation/replayer.cpp.original	2006-03-25 01:47:32.000000000 +0100
-+++ simulation/replayer.cpp	2006-03-25 01:48:30.000000000 +0100
-@@ -107,12 +107,12 @@
- 	writel(m_TrackFile);
- 
- 	//object choices
--	writel(m_ObjectList.size());
-+	writel((int)m_ObjectList.size());
- 	for(unsigned int i=0; i < m_ObjectList.size(); i++)
- 	{
- 		CBinBuffer b;
- 		m_ObjectList[i].getData(b);
--		writel(b.size());
-+		writel((int)b.size());
- 		writeBytes(b);
- 	}
- 
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-freealut.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-freealut.patch
deleted file mode 100644
index 6d20da0c6074..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-freealut.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure
-+++ configure
-@@ -6908,7 +6908,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_openal_alGetError" >&5
- echo "${ECHO_T}$ac_cv_lib_openal_alGetError" >&6
- if test $ac_cv_lib_openal_alGetError = yes; then
--  soundlibs="-lopenal $soundlibs";cat >>confdefs.h <<\_ACEOF
-+  soundlibs="-lopenal -lalut $soundlibs";cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBOPENAL 1
- _ACEOF
- 
---- ultimatestunts/sndsample.cpp
-+++ ultimatestunts/sndsample.cpp
-@@ -96,10 +96,7 @@
- 	//data (and default values)
- 	void *wave = NULL;
- 	ALsizei
--		format = AL_FORMAT_MONO16,
--		size = 0,
--		bits = 0,
--		freq = 44100;
-+		size = 0;
- 
- 	CString extension = realfile.mid(realfile.length() - 4);
- 	extension.toLower();
-@@ -108,7 +105,7 @@
- 	{
- 		//the loading proc
- 		ALboolean (*alutLoadVorbis)(ALuint, ALvoid *, ALint) =
--			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) VORBISFUNC);
-+			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(VORBISFUNC);
- 
- 		if(alutLoadVorbis == NULL)
- 		{
-@@ -134,7 +131,7 @@
- 	{
- 		//the loading proc
- 		ALboolean (*alutLoadMP3)(ALuint, ALvoid *, ALint) =
--			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) MP3FUNC);
-+			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(MP3FUNC);
- 
- 		if(alutLoadMP3 == NULL)
- 		{
-@@ -158,9 +155,9 @@
- 	}
- 	else //default: load as wave file
- 	{
--		alGenBuffers(1, &m_Buffer);
--		alutLoadWAV(realfile.c_str(), &wave, &format, &size, &bits, &freq);
--		alBufferData(m_Buffer, format, wave, size, freq);
-+		m_Buffer = alutCreateBufferFromFile(realfile.c_str());
-+		if(m_Buffer == AL_NONE)
-+			printf("alutCreateBufferFromFile failed\n");
- 	}
- 
- 	free(wave);
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-gcc41.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-gcc41.patch
deleted file mode 100644
index c8fd41393088..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-gcc41.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur ultimatestunts-srcdata-0611-orig/config.h.in ultimatestunts-srcdata-0611/config.h.in
---- ultimatestunts-srcdata-0611-orig/config.h.in	2006-04-27 03:17:57.690772729 +0000
-+++ ultimatestunts-srcdata-0611/config.h.in	2006-04-27 03:23:36.094239366 +0000
-@@ -22,3 +22,7 @@
- #undef HAVE_LIBOPENAL
- 
- #undef HAVE_SDL
-+
-+#undef HAVE_STPCPY
-+
-+#undef HAVE_MEMPCPY
-diff -ur ultimatestunts-srcdata-0611-orig/shared/lconfig.h ultimatestunts-srcdata-0611/shared/lconfig.h
---- ultimatestunts-srcdata-0611-orig/shared/lconfig.h	2006-04-27 03:17:57.706773461 +0000
-+++ ultimatestunts-srcdata-0611/shared/lconfig.h	2006-04-27 03:24:21.216301790 +0000
-@@ -38,7 +38,7 @@
- 
- public:
- 
--	CStringArray CLCData::findAllFields(CString) const;
-+	CStringArray findAllFields(CString) const;
- 	CLCData();
- 	virtual ~CLCData();
- 	bool push(CString, CString, CString, CString);
-
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-freealut.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-freealut.patch
deleted file mode 100644
index 2ecc58f602b1..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-freealut.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -129,7 +129,7 @@
- dnl Check openAL audio library (currently default)
- dnl ------------------------
- AC_CHECK_HEADER(AL/al.h, AC_DEFINE([OPENAL_HEADER], [], [OpenAL headers]))
--AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal $soundlibs";AC_DEFINE([HAVE_LIBOPENAL], [], [OpenAL Lib]))
-+AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal -lalut $soundlibs";AC_DEFINE([HAVE_LIBOPENAL], [], [OpenAL Lib]))
- 
- if test "x$soundlibs" = "x" ; then
- 
---- ultimatestunts/sndsample.cpp
-+++ ultimatestunts/sndsample.cpp
-@@ -96,10 +96,7 @@
- 	//data (and default values)
- 	void *wave = NULL;
- 	ALsizei
--		format = AL_FORMAT_MONO16,
--		size = 0,
--		bits = 0,
--		freq = 44100;
-+		size = 0;
- 
- 	CString extension = realfile.mid(realfile.length() - 4);
- 	extension.toLower();
-@@ -108,7 +105,7 @@
- 	{
- 		//the loading proc
- 		ALboolean (*alutLoadVorbis)(ALuint, ALvoid *, ALint) =
--			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) VORBISFUNC);
-+			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(VORBISFUNC);
- 
- 		if(alutLoadVorbis == NULL)
- 		{
-@@ -134,7 +131,7 @@
- 	{
- 		//the loading proc
- 		ALboolean (*alutLoadMP3)(ALuint, ALvoid *, ALint) =
--			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) MP3FUNC);
-+			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(MP3FUNC);
- 
- 		if(alutLoadMP3 == NULL)
- 		{
-@@ -158,9 +155,9 @@
- 	}
- 	else //default: load as wave file
- 	{
--		alGenBuffers(1, &m_Buffer);
--		alutLoadWAV(realfile.c_str(), &wave, &format, &size, &bits, &freq);
--		alBufferData(m_Buffer, format, wave, size, freq);
-+		m_Buffer = alutCreateBufferFromFile(realfile.c_str());
-+		if(m_Buffer == AL_NONE)
-+			printf("%s\n", alutGetErrorString(alutGetError()));
- 	}
- 
- 	free(wave);
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-gcc41.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-gcc41.patch
deleted file mode 100644
index 36f20c2580e1..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- shared/lconfig.h
-+++ shared/lconfig.h
-@@ -38,7 +38,7 @@
- 
- public:
- 
--	CStringArray CLCData::findAllFields(CString) const;
-+	CStringArray findAllFields(CString) const;
- 	CLCData();
- 	virtual ~CLCData();
- 	bool push(CString, CString, CString, CString);
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-paths.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-paths.patch
deleted file mode 100644
index 36a677db5f3c..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -210,9 +210,9 @@
- dnl ------------------
- dnl The directory locations
- dnl ------------------
--usdatadir="${prefix}/share/ultimatestunts/"
-+usdatadir="${datadir}/ultimatestunts/"
- 
--AC_DEFINE_UNQUOTED([PREFIXDIR], ["$prefix"], [Prefix dir])
-+AC_DEFINE_UNQUOTED([PREFIXDIR], ["$sysconfdir"], [Prefix dir])
- 
- AC_SUBST(netlibs)
- AC_SUBST(soundlibs)
-
---- data/Makefile.am
-+++ data/Makefile.am
-@@ -1,4 +1,4 @@
--usdatadir=@usdatadir@
-+usdatadir=$(DESTDIR)/@usdatadir@
- 
- install:
- 	$(mkinstalldirs) ${usdatadir}
-
---- shared/usmisc.cpp
-+++ shared/usmisc.cpp
-@@ -42,7 +42,7 @@
- 	printf("prefix = %s\n", prefixdir.c_str());
- 
- 	std::vector<CString> locations;
--	locations.push_back(prefixdir + "/etc/ultimatestunts.conf");
-+	locations.push_back(prefixdir + "/ultimatestunts.conf");
- 	locations.push_back("/etc/ultimatestunts.conf");
- 	locations.push_back("/usr/local/etc/ultimatestunts.conf");
- 	locations.push_back("./ultimatestunts.conf");
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.3-freealut.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.3-freealut.patch
deleted file mode 100644
index 2ecc58f602b1..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.6.3-freealut.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -129,7 +129,7 @@
- dnl Check openAL audio library (currently default)
- dnl ------------------------
- AC_CHECK_HEADER(AL/al.h, AC_DEFINE([OPENAL_HEADER], [], [OpenAL headers]))
--AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal $soundlibs";AC_DEFINE([HAVE_LIBOPENAL], [], [OpenAL Lib]))
-+AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal -lalut $soundlibs";AC_DEFINE([HAVE_LIBOPENAL], [], [OpenAL Lib]))
- 
- if test "x$soundlibs" = "x" ; then
- 
---- ultimatestunts/sndsample.cpp
-+++ ultimatestunts/sndsample.cpp
-@@ -96,10 +96,7 @@
- 	//data (and default values)
- 	void *wave = NULL;
- 	ALsizei
--		format = AL_FORMAT_MONO16,
--		size = 0,
--		bits = 0,
--		freq = 44100;
-+		size = 0;
- 
- 	CString extension = realfile.mid(realfile.length() - 4);
- 	extension.toLower();
-@@ -108,7 +105,7 @@
- 	{
- 		//the loading proc
- 		ALboolean (*alutLoadVorbis)(ALuint, ALvoid *, ALint) =
--			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) VORBISFUNC);
-+			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(VORBISFUNC);
- 
- 		if(alutLoadVorbis == NULL)
- 		{
-@@ -134,7 +131,7 @@
- 	{
- 		//the loading proc
- 		ALboolean (*alutLoadMP3)(ALuint, ALvoid *, ALint) =
--			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) MP3FUNC);
-+			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(MP3FUNC);
- 
- 		if(alutLoadMP3 == NULL)
- 		{
-@@ -158,9 +155,9 @@
- 	}
- 	else //default: load as wave file
- 	{
--		alGenBuffers(1, &m_Buffer);
--		alutLoadWAV(realfile.c_str(), &wave, &format, &size, &bits, &freq);
--		alBufferData(m_Buffer, format, wave, size, freq);
-+		m_Buffer = alutCreateBufferFromFile(realfile.c_str());
-+		if(m_Buffer == AL_NONE)
-+			printf("%s\n", alutGetErrorString(alutGetError()));
- 	}
- 
- 	free(wave);
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.6.3-paths.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.7.0-paths.patch
index 36a677db5f3c..848b12be083a 100644
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.6.3-paths.patch
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.7.0-paths.patch
@@ -1,6 +1,6 @@
 --- configure.ac
 +++ configure.ac
-@@ -210,9 +210,9 @@
+@@ -222,9 +222,9 @@
  dnl ------------------
  dnl The directory locations
  dnl ------------------
@@ -12,7 +12,6 @@
  
  AC_SUBST(netlibs)
  AC_SUBST(soundlibs)
-
 --- data/Makefile.am
 +++ data/Makefile.am
 @@ -1,4 +1,4 @@
@@ -21,7 +20,6 @@
  
  install:
  	$(mkinstalldirs) ${usdatadir}
-
 --- shared/usmisc.cpp
 +++ shared/usmisc.cpp
 @@ -42,7 +42,7 @@
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild
deleted file mode 100644
index 534b60795cbf..000000000000
--- a/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild,v 1.3 2006/12/06 20:30:06 wolf31o2 Exp $
-
-inherit eutils versionator games
-
-MY_PV=$(replace_all_version_separators '')1
-MY_P=${PN}-srcdata-${MY_PV}
-
-DESCRIPTION="Remake of the famous Stunts game"
-HOMEPAGE="http://www.ultimatestunts.nl"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/openal
-	media-libs/freealut
-	virtual/opengl
-	virtual/glu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s:/etc/ultimatestunts.conf:${GAMES_SYSCONFDIR}/ultimatestunts.conf:" \
-		shared/usmisc.cpp \
-		|| die "sed failed"
-
-	sed -i \
-		-e '302,306s#${usdatadir}#$(DESTDIR)${usdatadir}#' \
-		data/Makefile.in \
-		|| die "sed failed"
-
-	#fix up install paths (bug #130513)
-	sed -i \
-		-e "s:\${prefix}/share/ultimatestunts/:${GAMES_DATADIR}/ultimatestunts/:" \
-		configure \
-		|| die "sed failed"
-
-	epatch \
-		"${FILESDIR}/${P}"-64bits.patch \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-freealut.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	make_desktop_entry ustunts "Ultimate Stunts"
-	dodoc AUTHORS README TODO
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	einfo "Please update or remove ~/.ultimatestunts/ultimatestunts.conf"
-	einfo "if you have it to update the path for the data files."
-	echo
-}
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild
deleted file mode 100644
index 39d42980587b..000000000000
--- a/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild,v 1.3 2006/10/26 19:12:27 mr_bones_ Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit autotools eutils versionator games
-
-MY_P=${PN}-srcdata-$(replace_all_version_separators)1
-DESCRIPTION="Remake of the famous Stunts game"
-HOMEPAGE="http://www.ultimatestunts.nl/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="media-libs/libsdl
-	media-libs/openal
-	media-libs/freealut
-	virtual/opengl
-	virtual/glu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/cvs
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-freealut.patch \
-		"${FILESDIR}"/${P}-paths.patch
-
-	autopoint -f || die "autopoint failed"
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-	egamesconf $(use_enable nls) || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	make_desktop_entry ustunts "Ultimate Stunts"
-	dodoc AUTHORS README
-
-	rm -rf $(find "${D}" -name CVS)
-	prepgamesdirs
-}
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.6.3.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.7.0.ebuild
index 4106ed0240ff..72c8a63de133 100644
--- a/games-sports/ultimatestunts/ultimatestunts-0.6.3.ebuild
+++ b/games-sports/ultimatestunts/ultimatestunts-0.7.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ultimatestunts-0.6.3.ebuild,v 1.1 2006/11/13 14:17:04 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ultimatestunts-0.7.0.ebuild,v 1.1 2007/01/31 16:44:48 nyhm Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
 inherit autotools eutils versionator games
 
 MY_P=${PN}-srcdata-$(replace_all_version_separators)1
@@ -22,13 +20,6 @@ RDEPEND="media-libs/libsdl
 	media-libs/freealut
 	virtual/opengl
 	virtual/glu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/cvs
@@ -39,26 +30,26 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch \
-		"${FILESDIR}"/${P}-freealut.patch \
-		"${FILESDIR}"/${P}-paths.patch
-
+	epatch "${FILESDIR}"/${P}-paths.patch
 	autopoint -f || die "autopoint failed"
+	sed -i 's:$(datadir)/locale:@top_srcdir@/data/lang:' po/Makefile.in.in \
+		|| die "sed failed"
 	AT_M4DIR=m4 eautoreconf
 }
 
 src_compile() {
-	egamesconf $(use_enable nls) || die
+	egamesconf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-
+	newicon data/cars/diablo/steer.png ${PN}.png
 	make_desktop_entry ustunts "Ultimate Stunts"
 	dodoc AUTHORS README
-
 	rm -rf $(find "${D}" -name CVS)
 	prepgamesdirs
 }