Version bump

Package-Manager: portage-2.1.2_pre2

7 files changed, 201 insertions, 5 deletions

diff --git a/games-sports/ultimatestunts/ChangeLog b/games-sports/ultimatestunts/ChangeLog
index 28c85270c3ef..09d204392275 100644
--- a/games-sports/ultimatestunts/ChangeLog
+++ b/games-sports/ultimatestunts/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2006/05/12 18:18:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ChangeLog,v 1.7 2006/10/01 19:42:03 nyhm Exp $
+
+*ultimatestunts-0.6.2 (01 Oct 2006)
+
+  01 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/ultimatestunts-0.6.2-freealut.patch,
+  +files/ultimatestunts-0.6.2-gcc41.patch,
+  +files/ultimatestunts-0.6.2-paths.patch, +ultimatestunts-0.6.2.ebuild:
+  Version bump
 
 *ultimatestunts-0.6.1-r1 (12 May 2006)
 
diff --git a/games-sports/ultimatestunts/Manifest b/games-sports/ultimatestunts/Manifest
index 770db02c51e3..86a5ea2bec27 100644
--- a/games-sports/ultimatestunts/Manifest
+++ b/games-sports/ultimatestunts/Manifest
@@ -10,15 +10,32 @@ AUX ultimatestunts-0.6.1-gcc41.patch 858 RMD160 0bad9ab0d16470d9aa1712b1d2c3491e
 MD5 dce806a525d3addbb1775c28501b1c46 files/ultimatestunts-0.6.1-gcc41.patch 858
 RMD160 0bad9ab0d16470d9aa1712b1d2c3491ef7b605a7 files/ultimatestunts-0.6.1-gcc41.patch 858
 SHA256 f0af5b886ef558d99ad4e52bad09ac16f7350600e45f164a9b223b7ce51ba2c3 files/ultimatestunts-0.6.1-gcc41.patch 858
+AUX ultimatestunts-0.6.2-freealut.patch 1771 RMD160 4a1d02bb6c8a176ed9cce1ceb0f937ff26f5ed12 SHA1 fea15bcf1c307e3e7ca98d86078cbcfa49b0c814 SHA256 c8e863c7c062ed16bc7f8f9e892e4db358732f68599ab93fb04634426c0f206d
+MD5 a2622cce3548c5ec0aa946b7452dcc7c files/ultimatestunts-0.6.2-freealut.patch 1771
+RMD160 4a1d02bb6c8a176ed9cce1ceb0f937ff26f5ed12 files/ultimatestunts-0.6.2-freealut.patch 1771
+SHA256 c8e863c7c062ed16bc7f8f9e892e4db358732f68599ab93fb04634426c0f206d files/ultimatestunts-0.6.2-freealut.patch 1771
+AUX ultimatestunts-0.6.2-gcc41.patch 256 RMD160 ea0708f4faadfd9495ea0f0fa3197101481b499f SHA1 1ed301d5b317462a74c22e31d84151f591750432 SHA256 4a49bfe697b732923256956201140ac8abf6f11b5dddd56c09daa69956d8df50
+MD5 cc70568ccd2ac9e1887241ac7248c582 files/ultimatestunts-0.6.2-gcc41.patch 256
+RMD160 ea0708f4faadfd9495ea0f0fa3197101481b499f files/ultimatestunts-0.6.2-gcc41.patch 256
+SHA256 4a49bfe697b732923256956201140ac8abf6f11b5dddd56c09daa69956d8df50 files/ultimatestunts-0.6.2-gcc41.patch 256
+AUX ultimatestunts-0.6.2-paths.patch 971 RMD160 192be2964670c6385ecd9fedbf64f86a6dec0892 SHA1 5b0f901f7192e608448f3732a357dfa0c491c718 SHA256 f1a356523fd4fdd53b66f40793aa14f64eebc408186409e1f2a51df6c46cecb1
+MD5 72a9c6f064603fd1223a1e822e8ef95b files/ultimatestunts-0.6.2-paths.patch 971
+RMD160 192be2964670c6385ecd9fedbf64f86a6dec0892 files/ultimatestunts-0.6.2-paths.patch 971
+SHA256 f1a356523fd4fdd53b66f40793aa14f64eebc408186409e1f2a51df6c46cecb1 files/ultimatestunts-0.6.2-paths.patch 971
 DIST ultimatestunts-srcdata-0611.tar.gz 23171268 RMD160 4ca3d691fe05bfa714129ad7eaeb358e1c4b2f02 SHA1 25a69c70346dd2ca1394645f03224927a86bd511 SHA256 d1ac09ad03e7b81611b014bdef5956910be01e53cab7b0bafdfbfe7047547fe7
+DIST ultimatestunts-srcdata-0621.tar.gz 25355968 RMD160 5b65bf35dcefaa5036b382c9b3edb5974471a1f9 SHA1 c99cd8d94ead4eaf3d080f6dc2e64417df6faef1 SHA256 363e1bc582cc3417dfbc2b629da502ce9b3151c1a83a5d54841f4112bfde7be3
 EBUILD ultimatestunts-0.6.1-r1.ebuild 1740 RMD160 48f5fdf1e5374a3ec509ea6a73ec929961d8159b SHA1 87f8876a96dc6a22bcd39bdc8920db707db56af2 SHA256 b908fba13fcbbb8a849351cc68171c046b23e7b7895e9438b8194bc14b7acaf5
 MD5 8ad84dcf54980e34322669a5afedb168 ultimatestunts-0.6.1-r1.ebuild 1740
 RMD160 48f5fdf1e5374a3ec509ea6a73ec929961d8159b ultimatestunts-0.6.1-r1.ebuild 1740
 SHA256 b908fba13fcbbb8a849351cc68171c046b23e7b7895e9438b8194bc14b7acaf5 ultimatestunts-0.6.1-r1.ebuild 1740
-MISC ChangeLog 1613 RMD160 c0401b7f8fafcf1d7421ae218670465e4eb006d8 SHA1 24a9d5150a49270a65b7ae7e3d89338123cbb2d3 SHA256 2a88aee6796b11ccccf641deeeb52d1f9b6f083878db2380f046d53d96a30b0a
-MD5 bf297c75f50952120cfc9b4dc52e5cdd ChangeLog 1613
-RMD160 c0401b7f8fafcf1d7421ae218670465e4eb006d8 ChangeLog 1613
-SHA256 2a88aee6796b11ccccf641deeeb52d1f9b6f083878db2380f046d53d96a30b0a ChangeLog 1613
+EBUILD ultimatestunts-0.6.2.ebuild 1398 RMD160 81d0560a239423417e9e05841f0bc0eec21481ab SHA1 afff54782577063cd3bdcfd5efe1eabe21ce6e72 SHA256 261445b2dc4e75e3f8e60805440a8cd0e4a3ca0d81fe69b6dc1cc34cd0a7a369
+MD5 18a4f9e1f5e13c756f92a1d8c882a5c4 ultimatestunts-0.6.2.ebuild 1398
+RMD160 81d0560a239423417e9e05841f0bc0eec21481ab ultimatestunts-0.6.2.ebuild 1398
+SHA256 261445b2dc4e75e3f8e60805440a8cd0e4a3ca0d81fe69b6dc1cc34cd0a7a369 ultimatestunts-0.6.2.ebuild 1398
+MISC ChangeLog 1872 RMD160 0e5c01c0b4b7f662c8f6bb5c46cbd6ea43828531 SHA1 a80d118da6cc3c2cd970617cac9b118fa4ff517b SHA256 7a358bc876e6285ef6e4a2f25cde684aa6298dc520c00a707523a043f2689b77
+MD5 1cca57ba37bec66c96e8c09dc255942a ChangeLog 1872
+RMD160 0e5c01c0b4b7f662c8f6bb5c46cbd6ea43828531 ChangeLog 1872
+SHA256 7a358bc876e6285ef6e4a2f25cde684aa6298dc520c00a707523a043f2689b77 ChangeLog 1872
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,3 +43,6 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 c2eaab7aee73be6cf1dcf5abc0c1738e files/digest-ultimatestunts-0.6.1-r1 289
 RMD160 81f6791af20eb39423c1b6dc16c36acaafee9075 files/digest-ultimatestunts-0.6.1-r1 289
 SHA256 0fdb950d0d96f2474d5c64453e07b0af33719300beae42c2dbc14f0147103e4a files/digest-ultimatestunts-0.6.1-r1 289
+MD5 fcd8b94c2978939d6b7536fa6b916339 files/digest-ultimatestunts-0.6.2 289
+RMD160 a85a9b71a0ebe8ea6c5b0c226d9edef4f7f21500 files/digest-ultimatestunts-0.6.2 289
+SHA256 71461b6c3079833bf9193baad5e3992e0e544a2259c50f0b5b2b8d346921fc6e files/digest-ultimatestunts-0.6.2 289
diff --git a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2 b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2
new file mode 100644
index 000000000000..2aa1595ed91c
--- /dev/null
+++ b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.2
@@ -0,0 +1,3 @@
+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/ultimatestunts-0.6.2-freealut.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-freealut.patch
new file mode 100644
index 000000000000..2ecc58f602b1
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-freealut.patch
@@ -0,0 +1,56 @@
+--- 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
new file mode 100644
index 000000000000..36f20c2580e1
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-gcc41.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..36a677db5f3c
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.6.2-paths.patch
@@ -0,0 +1,35 @@
+--- 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/ultimatestunts-0.6.2.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild
new file mode 100644
index 000000000000..25165e049840
--- /dev/null
+++ b/games-sports/ultimatestunts/ultimatestunts-0.6.2.ebuild
@@ -0,0 +1,63 @@
+# 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.1 2006/10/01 19:42:03 nyhm 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}
+	nls? ( 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
+}