Version bump

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 154 insertions, 8 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 16a3f9262352..45bd7371edc9 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/scorched3d
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.36 2006/10/17 15:26:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.37 2006/10/29 23:36:24 nyhm Exp $
+
+*scorched3d-40.1b (29 Oct 2006)
+
+  29 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/scorched3d-40.1b-freealut.patch, +scorched3d-40.1b.ebuild:
+  Version bump
 
   17 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   +files/scorched3d-40-gcc4.patch, scorched3d-40.ebuild:
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 7ea08d4dbd2a..2e0bb7e6ad49 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -13,15 +13,24 @@ AUX scorched3d-40-unicode.patch 1759 RMD160 89b0ce779ad07ad8dcb4252be3029e8251e9
 MD5 dad88edac755cb2ed6d706d2688823a3 files/scorched3d-40-unicode.patch 1759
 RMD160 89b0ce779ad07ad8dcb4252be3029e8251e94c0e files/scorched3d-40-unicode.patch 1759
 SHA256 c84ef2cd1f60bba076ab44f8ee4417476dfd0969da0136b2c6a98727c6efbb3a files/scorched3d-40-unicode.patch 1759
+AUX scorched3d-40.1b-freealut.patch 1441 RMD160 4b12f99f9dff61504b95168f74f16eb433fd0654 SHA1 16a50065e27f201fc1fae84bb799ea78335400ee SHA256 b67b346e25212a14c5142402ae620bc0afbfbab4fb132b417a4945272752678a
+MD5 f275c62a98a9eb671a91b49f38567b56 files/scorched3d-40.1b-freealut.patch 1441
+RMD160 4b12f99f9dff61504b95168f74f16eb433fd0654 files/scorched3d-40.1b-freealut.patch 1441
+SHA256 b67b346e25212a14c5142402ae620bc0afbfbab4fb132b417a4945272752678a files/scorched3d-40.1b-freealut.patch 1441
 DIST Scorched3D-40-src.tar.gz 55427740 RMD160 2e900986a8a9262d3ffb85d1f6e6bfd4b4d9b9a6 SHA1 91a80b8a968532b505082d477c646b3a8e805ecd SHA256 8722d1f06e50f25f8e373f4388668a8b056e978dba8b86f197a45c3fa1f9008b
+DIST Scorched3D-40.1b-src.tar.gz 55686131 RMD160 1d53f5228810d7d150836aea6a4971b8b067e8c8 SHA1 57cffe651ffe6c3550c1d3171e746bab51166a9d SHA256 3b3ccf8e35ea40a9afbfa80ef7c64bc02761e0e364f6aa301695827b223db93a
+EBUILD scorched3d-40.1b.ebuild 1237 RMD160 90afd83d0e0c791fcd772ca8b9c9b87fa3906ceb SHA1 3e414fe39093c3146664df98b84c15b38c5c18ea SHA256 31fcc8714b9455bf66c320cb6c383a4440b628adb30d10badbd39672091273f8
+MD5 f08c9966487347dd680e9fe2faf5a0e3 scorched3d-40.1b.ebuild 1237
+RMD160 90afd83d0e0c791fcd772ca8b9c9b87fa3906ceb scorched3d-40.1b.ebuild 1237
+SHA256 31fcc8714b9455bf66c320cb6c383a4440b628adb30d10badbd39672091273f8 scorched3d-40.1b.ebuild 1237
 EBUILD scorched3d-40.ebuild 1445 RMD160 1d902faf3dbae44ae40d2089bc749b3cd22c750d SHA1 9b58c34362d50f15e84552020f683eb808717222 SHA256 1f18b6bfb756f4683a03de7e4a103fe4e42db64d413bd6bab945cbe351a09f55
 MD5 977318e737b5514879b5161750f054c4 scorched3d-40.ebuild 1445
 RMD160 1d902faf3dbae44ae40d2089bc749b3cd22c750d scorched3d-40.ebuild 1445
 SHA256 1f18b6bfb756f4683a03de7e4a103fe4e42db64d413bd6bab945cbe351a09f55 scorched3d-40.ebuild 1445
-MISC ChangeLog 4866 RMD160 78cc7475f4151f1846b094c91f59c4d5029b9cfe SHA1 0191022cd6eaea292cf25161cb5f7f30f32388cd SHA256 539cdd1453ed12523e54ee6736605ee56791237e7cc56462624a3cc1cb30979c
-MD5 63cf7ab3586f139cd37dd9e87138df9e ChangeLog 4866
-RMD160 78cc7475f4151f1846b094c91f59c4d5029b9cfe ChangeLog 4866
-SHA256 539cdd1453ed12523e54ee6736605ee56791237e7cc56462624a3cc1cb30979c ChangeLog 4866
+MISC ChangeLog 5027 RMD160 b3907089d6980b00738118462a7b57e53ee2bf9d SHA1 78f5ee16dcc4c1d16eee8c98570b562bc3e84681 SHA256 de0ee041d1de90fe47814623bb6d712456ff06735aaf1beed0a627a1a3d74fba
+MD5 6fef2c63aa97360dea70f56892148d19 ChangeLog 5027
+RMD160 b3907089d6980b00738118462a7b57e53ee2bf9d ChangeLog 5027
+SHA256 de0ee041d1de90fe47814623bb6d712456ff06735aaf1beed0a627a1a3d74fba ChangeLog 5027
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -29,10 +38,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 46acb721ced930a58d0ec5e4cdd7dbf8 files/digest-scorched3d-40 259
 RMD160 e66449962fd7234ee9774d1f5d46c13af5ecd6ac files/digest-scorched3d-40 259
 SHA256 b892449b76a28869efd1fbd3df0537f743f17a82493c3c9094ee923a8eea2ddc files/digest-scorched3d-40 259
+MD5 4e2c2960cb501fcfac9d6a3e7edcec1d files/digest-scorched3d-40.1b 268
+RMD160 7913aa88646334d42e02510d7d2bda928fe58d1e files/digest-scorched3d-40.1b 268
+SHA256 11b4a78ecc9a8fd168f7b0260b97675ff826e4cfc277b193b718349f67c67ba7 files/digest-scorched3d-40.1b 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNPUCkT4lNIS36YERAtERAJ0TsuJ3Rx656vXPkYo3wwR1K7GhdACfakza
-44znJBJkBkpJfOszMPuc2aY=
-=EGXa
+iD8DBQFFRTr+dz7hIScOURERAtlNAJ45wXvG/DvWewzG6DBGOT8taXG0HACgiXkP
+Y4pVfi1tnyxGonSs+r1uqs8=
+=FWXF
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/scorched3d/files/digest-scorched3d-40.1b b/games-strategy/scorched3d/files/digest-scorched3d-40.1b
new file mode 100644
index 000000000000..5ae0ce00077e
--- /dev/null
+++ b/games-strategy/scorched3d/files/digest-scorched3d-40.1b
@@ -0,0 +1,3 @@
+MD5 bcf4a138149cc8070901e151027eb203 Scorched3D-40.1b-src.tar.gz 55686131
+RMD160 1d53f5228810d7d150836aea6a4971b8b067e8c8 Scorched3D-40.1b-src.tar.gz 55686131
+SHA256 3b3ccf8e35ea40a9afbfa80ef7c64bc02761e0e364f6aa301695827b223db93a Scorched3D-40.1b-src.tar.gz 55686131
diff --git a/games-strategy/scorched3d/files/scorched3d-40.1b-freealut.patch b/games-strategy/scorched3d/files/scorched3d-40.1b-freealut.patch
new file mode 100644
index 000000000000..19be920baba8
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-40.1b-freealut.patch
@@ -0,0 +1,70 @@
+--- configure
++++ configure
+@@ -4010,6 +4010,7 @@
+ 
+ 	CFLAGS="$CFLAGS `$FREEALUT_CONFIG --cflags`"
+ 	CXXFLAGS="$CXXFLAGS `$FREEALUT_CONFIG --cflags`"
++	LIBS="$LIBS `$FREEALUT_CONFIG --libs`"
+ 
+ 	echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+--- src/sound/SoundBufferStaticWav.cpp
++++ src/sound/SoundBufferStaticWav.cpp
+@@ -57,44 +57,7 @@
+ 	SoundBuffer(fileName),
+ 	buffer_(0)
+ {
+-	unsigned int error;
+-
+-	// Create a buffer
+-	alGetError();
+-	alGenBuffers(1, &buffer_);
+-	if ((error = alGetError()) != AL_NO_ERROR)
+-	{
+-		return;
+-	}
+-
+-	// Load WAV
+-	void *data;
+-	ALenum format;
+-	ALsizei size;
+-	ALsizei freq;
+-	ALboolean loop;
+-
+-#ifdef __DARWIN__
+-	alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq);
+-#else
+-	alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq,&loop);
+-#endif
+-
+-	if ((error = alGetError()) != AL_NO_ERROR)
+-	{
+-		return;
+-	}
+-
+-	// Load WAV into buffer
+-	alBufferData(buffer_,format,data,size,freq);
+-	if ((error = alGetError()) != AL_NO_ERROR)
+-	{
+-		return;
+-	}
+-
+-	// Delete WAV memory
+-	alutUnloadWAV(format,data,size,freq);
+-	if ((error = alGetError()) != AL_NO_ERROR)
++	if ((buffer_ = alutCreateBufferFromFile(fileName)) == AL_NONE)
+ 	{
+ 		return;
+ 	}
+
+--- src/sound/Sound.cpp
++++ src/sound/Sound.cpp
+@@ -152,6 +152,7 @@
+ 		totalSources_.push_back(source);
+ 		availableSources_.push_back(source);
+ 	}
++	alutInitWithoutContext(NULL, NULL);
+ 
+ 	init_ = true;
+ 	return init_;
diff --git a/games-strategy/scorched3d/scorched3d-40.1b.ebuild b/games-strategy/scorched3d/scorched3d-40.1b.ebuild
new file mode 100644
index 000000000000..74044460b637
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-40.1b.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-40.1b.ebuild,v 1.1 2006/10/29 23:36:24 nyhm Exp $
+
+inherit eutils wxwidgets games
+
+DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
+HOMEPAGE="http://www.scorched3d.co.uk/"
+SRC_URI="mirror://sourceforge/${PN}/Scorched3D-${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql"
+
+DEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/freealut
+	media-libs/libsdl
+	media-libs/sdl-net
+	>=x11-libs/wxGTK-2.6
+	>=media-libs/freetype-2
+	mysql? ( dev-db/mysql )"
+
+S=${WORKDIR}/scorched
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-freealut.patch
+}
+
+pkg_setup() {
+	games_pkg_setup
+	WX_GTK_VER="2.6" need-wxwidgets unicode
+}
+
+src_compile() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--datadir="${GAMES_DATADIR}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		--with-wx-config="${WX_CONFIG}" \
+		$(use_with mysql) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	prepgamesdirs
+}