Version bump

Package-Manager: portage-2.1.2_rc2

5 files changed, 154 insertions, 8 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 2e50ed212f8d..3a06deb5fd9f 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.38 2006/11/15 11:08:05 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.39 2006/11/18 19:34:18 nyhm Exp $
+
+*scorched3d-40.1d (18 Nov 2006)
+
+  18 Nov 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/scorched3d-40.1d-freealut.patch, +scorched3d-40.1d.ebuild:
+  Version bump
 
 *scorched3d-40.1c (15 Nov 2006)
 
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 41e17d04a942..c515d9276747 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -17,20 +17,29 @@ AUX scorched3d-40.1c-freealut.patch 1441 RMD160 4b12f99f9dff61504b95168f74f16eb4
 MD5 f275c62a98a9eb671a91b49f38567b56 files/scorched3d-40.1c-freealut.patch 1441
 RMD160 4b12f99f9dff61504b95168f74f16eb433fd0654 files/scorched3d-40.1c-freealut.patch 1441
 SHA256 b67b346e25212a14c5142402ae620bc0afbfbab4fb132b417a4945272752678a files/scorched3d-40.1c-freealut.patch 1441
+AUX scorched3d-40.1d-freealut.patch 1441 RMD160 4b12f99f9dff61504b95168f74f16eb433fd0654 SHA1 16a50065e27f201fc1fae84bb799ea78335400ee SHA256 b67b346e25212a14c5142402ae620bc0afbfbab4fb132b417a4945272752678a
+MD5 f275c62a98a9eb671a91b49f38567b56 files/scorched3d-40.1d-freealut.patch 1441
+RMD160 4b12f99f9dff61504b95168f74f16eb433fd0654 files/scorched3d-40.1d-freealut.patch 1441
+SHA256 b67b346e25212a14c5142402ae620bc0afbfbab4fb132b417a4945272752678a files/scorched3d-40.1d-freealut.patch 1441
 DIST Scorched3D-40-src.tar.gz 55427740 RMD160 2e900986a8a9262d3ffb85d1f6e6bfd4b4d9b9a6 SHA1 91a80b8a968532b505082d477c646b3a8e805ecd SHA256 8722d1f06e50f25f8e373f4388668a8b056e978dba8b86f197a45c3fa1f9008b
 DIST Scorched3D-40.1c-src.tar.gz 55063066 RMD160 24f6050e590624d1d44dbabfa55e599cbacfba37 SHA1 a30fa2e07fb43b9eafd2a8fdf39c9a6369b879c7 SHA256 7fd57324bd930857e29f1caf8f2ff3b42f975f1639305050ed5043ec28c2ce85
+DIST Scorched3D-40.1d-src.tar.gz 55701460 RMD160 0585295e1bc32b80329be7da2203b3dfc549f95f SHA1 14f0291534572273f74daa7e925c8e85a2971eb7 SHA256 76fc3eb70923551e978d3f35801d5731402c70c7c992063fafe403f0c6334252
 EBUILD scorched3d-40.1c.ebuild 1237 RMD160 bf7b6829cc2710c037d470d4a89d6d8f8180cea2 SHA1 c3b69fdd6b3568b8d85c3844cfda90e9da2a276e SHA256 e4fb22ae6c3e073b48f6f227658db81c3760d51d3c187c7f18c3bf816866d280
 MD5 807e963df7d8997256f26c2a986bb8df scorched3d-40.1c.ebuild 1237
 RMD160 bf7b6829cc2710c037d470d4a89d6d8f8180cea2 scorched3d-40.1c.ebuild 1237
 SHA256 e4fb22ae6c3e073b48f6f227658db81c3760d51d3c187c7f18c3bf816866d280 scorched3d-40.1c.ebuild 1237
+EBUILD scorched3d-40.1d.ebuild 1237 RMD160 93370b322d83812b1962ed8967589ac25673d9b1 SHA1 5103bb238427427fc671089120777cfca7fe2372 SHA256 15d7bb4e083ca06dd6b897b02b7a194a50f7a666e41af9d90053eec9ca04ce04
+MD5 5b17cb402a9a3f6a5c6141df30a40eb0 scorched3d-40.1d.ebuild 1237
+RMD160 93370b322d83812b1962ed8967589ac25673d9b1 scorched3d-40.1d.ebuild 1237
+SHA256 15d7bb4e083ca06dd6b897b02b7a194a50f7a666e41af9d90053eec9ca04ce04 scorched3d-40.1d.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 5262 RMD160 8c51f3632faab6dfdae7674940a837117a8e6898 SHA1 50a221ab09c8b5e4233ef9b1591503a952f58deb SHA256 8175ddfb5c2025c63e18a43a3e2c2e476aab1f7f24c52ae577a94c890ad17819
-MD5 05ba7423272b30eecc7ac7b78cc803a9 ChangeLog 5262
-RMD160 8c51f3632faab6dfdae7674940a837117a8e6898 ChangeLog 5262
-SHA256 8175ddfb5c2025c63e18a43a3e2c2e476aab1f7f24c52ae577a94c890ad17819 ChangeLog 5262
+MISC ChangeLog 5427 RMD160 d1448f75ec831efc61cdd46a120ec12ca596b68a SHA1 a92c961f0abe7795a216d3396de92c73da4a9e8a SHA256 de9fe7c7e5c38026781259e2c3f110a12438c69b71f3bec6eb4132cdeb33227e
+MD5 f9361ff6cc759fba2ce97dfa555ca84a ChangeLog 5427
+RMD160 d1448f75ec831efc61cdd46a120ec12ca596b68a ChangeLog 5427
+SHA256 de9fe7c7e5c38026781259e2c3f110a12438c69b71f3bec6eb4132cdeb33227e ChangeLog 5427
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -41,10 +50,13 @@ SHA256 b892449b76a28869efd1fbd3df0537f743f17a82493c3c9094ee923a8eea2ddc files/di
 MD5 4fee8a09c8242a441b5c0db24b101307 files/digest-scorched3d-40.1c 268
 RMD160 42e38b81aa801c37894420cbcf5282dd0773e832 files/digest-scorched3d-40.1c 268
 SHA256 7d22ff1deca2c2a9f3d28772d04b5fcc9337a4bf1ce695ef51b1542163cfb6f5 files/digest-scorched3d-40.1c 268
+MD5 f72c3d802af589fdfb40d73f9b12e0e9 files/digest-scorched3d-40.1d 268
+RMD160 796c57bfbb7dc79fc349d5d405958684cc83a41d files/digest-scorched3d-40.1d 268
+SHA256 f6da9071ada6d9d7fb77f67df2cafdb9d74bed1d4374288bd489cd274bf9136b files/digest-scorched3d-40.1d 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFWvUcdz7hIScOURERAqqtAKC7uekEWmkaCcNLIsqJkkTJr+My9wCeKH/V
-36CRxAJglKN85guj/AjRww0=
-=6IjJ
+iD8DBQFFX2BCdz7hIScOURERAvdMAKCurYx2ffZWic/n3kXFPXVgyOxjSQCfT71J
+vwq4Hnm/x9nKlOTmp4KRGoQ=
+=iSgu
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/scorched3d/files/digest-scorched3d-40.1d b/games-strategy/scorched3d/files/digest-scorched3d-40.1d
new file mode 100644
index 000000000000..4419c5246722
--- /dev/null
+++ b/games-strategy/scorched3d/files/digest-scorched3d-40.1d
@@ -0,0 +1,3 @@
+MD5 263d2c1be168860d783426c4d6c7060c Scorched3D-40.1d-src.tar.gz 55701460
+RMD160 0585295e1bc32b80329be7da2203b3dfc549f95f Scorched3D-40.1d-src.tar.gz 55701460
+SHA256 76fc3eb70923551e978d3f35801d5731402c70c7c992063fafe403f0c6334252 Scorched3D-40.1d-src.tar.gz 55701460
diff --git a/games-strategy/scorched3d/files/scorched3d-40.1d-freealut.patch b/games-strategy/scorched3d/files/scorched3d-40.1d-freealut.patch
new file mode 100644
index 000000000000..19be920baba8
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-40.1d-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.1d.ebuild b/games-strategy/scorched3d/scorched3d-40.1d.ebuild
new file mode 100644
index 000000000000..19bcad569d6f
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-40.1d.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.1d.ebuild,v 1.1 2006/11/18 19:34:18 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
+}