Added new (masked) revision which depends on the split openal/freealut. Closing bug #132819.

Package-Manager: portage-2.1_pre10-r5

5 files changed, 159 insertions, 5 deletions

diff --git a/games-sports/ultimatestunts/ChangeLog b/games-sports/ultimatestunts/ChangeLog
index 7a050e686d13..28c85270c3ef 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.5 2006/05/02 02:58:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ultimatestunts/ChangeLog,v 1.6 2006/05/12 18:18:19 wolf31o2 Exp $
+
+*ultimatestunts-0.6.1-r1 (12 May 2006)
+
+  12 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/ultimatestunts-0.6.1-freealut.patch,
+  +ultimatestunts-0.6.1-r1.ebuild:
+  Added new (masked) revision which depends on the split openal/freealut.
+  Closing bug #132819.
 
   02 May 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -ultimatestunts-0.6.0.ebuild, ultimatestunts-0.6.1.ebuild:
diff --git a/games-sports/ultimatestunts/Manifest b/games-sports/ultimatestunts/Manifest
index 120625f9c841..2efee5d3b6c8 100644
--- a/games-sports/ultimatestunts/Manifest
+++ b/games-sports/ultimatestunts/Manifest
@@ -2,19 +2,27 @@ AUX ultimatestunts-0.6.1-64bits.patch 447 RMD160 1a9733e7cfe39dc40f1364b2d0346b7
 MD5 5c17cd6b82de4a6dcd1c83415a2fa05e files/ultimatestunts-0.6.1-64bits.patch 447
 RMD160 1a9733e7cfe39dc40f1364b2d0346b7e50aaaf47 files/ultimatestunts-0.6.1-64bits.patch 447
 SHA256 95e854737e6c3b567db6b87740b07e6b9659a33ceb9fd574b45185ad56083c02 files/ultimatestunts-0.6.1-64bits.patch 447
+AUX ultimatestunts-0.6.1-freealut.patch 1661 RMD160 bd171fd39cd21616bef26ee56ff6f650401727da SHA1 1b1c82045782f294495e01a018bd9ecb31dad4c4 SHA256 4c9660b06458e7a94b8224a2c9ad0eff09cc837c9e8a4dd78ff1871145231d83 size 1661
+MD5 3dc73fef6d16a0e090b0150ad939fe00 files/ultimatestunts-0.6.1-freealut.patch 1661
+RMD160 bd171fd39cd21616bef26ee56ff6f650401727da files/ultimatestunts-0.6.1-freealut.patch 1661
+SHA256 4c9660b06458e7a94b8224a2c9ad0eff09cc837c9e8a4dd78ff1871145231d83 files/ultimatestunts-0.6.1-freealut.patch 1661
 AUX ultimatestunts-0.6.1-gcc41.patch 858 RMD160 0bad9ab0d16470d9aa1712b1d2c3491ef7b605a7 SHA1 cd6448973538597fde676ca22aab7bb61bd69f9a SHA256 f0af5b886ef558d99ad4e52bad09ac16f7350600e45f164a9b223b7ce51ba2c3 size 858
 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
 DIST ultimatestunts-srcdata-0611.tar.gz 23171268 RMD160 4ca3d691fe05bfa714129ad7eaeb358e1c4b2f02 SHA256 d1ac09ad03e7b81611b014bdef5956910be01e53cab7b0bafdfbfe7047547fe7 size 23171268
+EBUILD ultimatestunts-0.6.1-r1.ebuild 1740 RMD160 48f5fdf1e5374a3ec509ea6a73ec929961d8159b SHA1 87f8876a96dc6a22bcd39bdc8920db707db56af2 SHA256 b908fba13fcbbb8a849351cc68171c046b23e7b7895e9438b8194bc14b7acaf5 size 1740
+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
 EBUILD ultimatestunts-0.6.1.ebuild 1672 RMD160 f92ba24a0e3552decbb95e8a25ab261a68a9bae8 SHA1 8cade0e0cc6b088fbef4959dbfc82ab21e66add3 SHA256 445e5c8b48b568aefdb28a5495ac652a22ca809ef3c3e86f391790112ce759a8 size 1672
 MD5 b68e6e5ca2fd2b98edcd7ad2fc815d94 ultimatestunts-0.6.1.ebuild 1672
 RMD160 f92ba24a0e3552decbb95e8a25ab261a68a9bae8 ultimatestunts-0.6.1.ebuild 1672
 SHA256 445e5c8b48b568aefdb28a5495ac652a22ca809ef3c3e86f391790112ce759a8 ultimatestunts-0.6.1.ebuild 1672
-MISC ChangeLog 1341 RMD160 30835228de38a5cb8fb57c1316d9e9acd96fa182 SHA1 79eabf189cde08ffdfae012e926a367f12606db4 SHA256 0ffc9feab96cd7857f9cea8cae9dce6fd310f2f9fcd75ba3acd027c9f6836745 size 1341
-MD5 8301d2e3f9a6722591fef8a89efa928a ChangeLog 1341
-RMD160 30835228de38a5cb8fb57c1316d9e9acd96fa182 ChangeLog 1341
-SHA256 0ffc9feab96cd7857f9cea8cae9dce6fd310f2f9fcd75ba3acd027c9f6836745 ChangeLog 1341
+MISC ChangeLog 1613 RMD160 c0401b7f8fafcf1d7421ae218670465e4eb006d8 SHA1 24a9d5150a49270a65b7ae7e3d89338123cbb2d3 SHA256 2a88aee6796b11ccccf641deeeb52d1f9b6f083878db2380f046d53d96a30b0a size 1613
+MD5 bf297c75f50952120cfc9b4dc52e5cdd ChangeLog 1613
+RMD160 c0401b7f8fafcf1d7421ae218670465e4eb006d8 ChangeLog 1613
+SHA256 2a88aee6796b11ccccf641deeeb52d1f9b6f083878db2380f046d53d96a30b0a ChangeLog 1613
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -22,3 +30,6 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 c2eaab7aee73be6cf1dcf5abc0c1738e files/digest-ultimatestunts-0.6.1 289
 RMD160 81f6791af20eb39423c1b6dc16c36acaafee9075 files/digest-ultimatestunts-0.6.1 289
 SHA256 0fdb950d0d96f2474d5c64453e07b0af33719300beae42c2dbc14f0147103e4a files/digest-ultimatestunts-0.6.1 289
+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
diff --git a/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1 b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1
new file mode 100644
index 000000000000..6072f2efe79b
--- /dev/null
+++ b/games-sports/ultimatestunts/files/digest-ultimatestunts-0.6.1-r1
@@ -0,0 +1,3 @@
+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/ultimatestunts-0.6.1-freealut.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-freealut.patch
new file mode 100644
index 000000000000..6d20da0c6074
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.6.1-freealut.patch
@@ -0,0 +1,56 @@
+--- 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/ultimatestunts-0.6.1-r1.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..0dab6086c5ba
--- /dev/null
+++ b/games-sports/ultimatestunts/ultimatestunts-0.6.1-r1.ebuild
@@ -0,0 +1,76 @@
+# 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.1 2006/05/12 18:18:19 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-0.0.8
+	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 )
+		virtual/x11 )"
+
+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
+}