version bump

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28.1 i686

4 files changed, 133 insertions, 13 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 0f8db05968f8..32768a87e770 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/scorched3d
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.58 2008/12/15 20:15:43 nyhm Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.59 2009/02/16 03:19:07 mr_bones_ Exp $
+
+*scorched3d-42 (16 Feb 2009)
+
+  16 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scorched3d-42-fixups.patch, +scorched3d-42.ebuild:
+  version bump
 
   15 Dec 2008; Tristan Heaven <nyhm@gentoo.org> scorched3d-41.3-r1.ebuild:
   Fix compilation with openal-1.5, bug #245797
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 401da3afb937..5e10bfd55f3f 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scorched3d-41.3-gcc43.patch 1822 RMD160 1ec0e6808f78e3431fd2c7634774943a55a7b4d0 SHA1 42a92eae55440f7da3c2c60278686515ab217fcd SHA256 7430531c43b80f9cd4331c245297e1428efd0623347a0050bb4d8ef61156f87d
+AUX scorched3d-42-fixups.patch 1968 RMD160 a6bea8219e80fa693d2e820ed0a92d5da8ba56ce SHA1 df77a0e0806cb9d0a8348bb5e87a2ff855f1471e SHA256 d48d6677c228b991d2bb4e611d6259d62a7a63d96c77e67499b4f23122b652cd
 DIST Scorched3D-41.3-src.tar.gz 60672892 RMD160 517689d2fd8c9d03a975e8fdc396c235de08c144 SHA1 c38fa05ca801b484c859012086dbbc03244ae71c SHA256 a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03
+DIST Scorched3D-42-src.tar 166389760 RMD160 8e0a5add29adf604a431e28119f44b0fd5a56611 SHA1 30e245fc0fbd52026ee5885c82488f5126edd6a9 SHA256 b9576223396b15e3cf55d005cd48dcfa32f7481f85d7ef8d16ac070c38bdc233
 EBUILD scorched3d-41.3-r1.ebuild 1808 RMD160 2c5cda4b5587393e3b71a6f6aa99da9b38c5967f SHA1 1beb80ad2df2f2b389e6bf68f72b248b5a714657 SHA256 a7ea93c29fdfb63688c2725499f429ecfac6b87c4ddd8540dc7813f4c8c683cf
-MISC ChangeLog 7847 RMD160 023e4cb4b1da972cad2a0f8a657799a3e9e681a7 SHA1 52bbc6c0c88cadff879b33e935628576dabdf997 SHA256 4df82269c04126d318e1c68c2950125b66b65c36015d917381cda38ba45ca001
+EBUILD scorched3d-42.ebuild 1540 RMD160 2dd00624a2e07029edf65bcbd3363bbbbc5c73a7 SHA1 a8f6a1fcf97fa0b828a3fc5474be96e3903a0e8d SHA256 52f5cdc8443537987391690c437953e1f6a1e15e933ab71ca96352285eb1cb1b
+MISC ChangeLog 8013 RMD160 b2d1be400d0d59b549265f70043f2bdcdeeacd99 SHA1 e8d44bedf4f45d149aa39ce7802342047a98db3e SHA256 0a6c8f5ee1e785960f560f6e5831aed29ebc6ee6be402649b3e22a9262714099
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklGu3cACgkQdz7hIScOURH4EACgm/Zol9KZo/d0VkeNd0AY/1pf
-O48AoIHGIHgnuOvBqKSYkhP6DPxYl/R5
-=r5mU
------END PGP SIGNATURE-----
diff --git a/games-strategy/scorched3d/files/scorched3d-42-fixups.patch b/games-strategy/scorched3d/files/scorched3d-42-fixups.patch
new file mode 100644
index 000000000000..347877ace583
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-42-fixups.patch
@@ -0,0 +1,58 @@
+diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4
+--- scorched.orig/configure-al.m4	2008-03-03 16:17:18.000000000 -0500
++++ scorched/configure-al.m4	2009-02-15 20:43:35.000000000 -0500
+@@ -7,25 +7,9 @@
+ 	[  --disable-openaltest    Do not try to compile and run a test OpenAL program],
+ 		    , enable_openaltest=yes)
+ AC_MSG_CHECKING(for OpenAL support)
+-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
+-if test x$OPENAL_CONFIG = xno; then
+-	echo "*** The openal-config script installed by OpenAL could not be found"
+-	echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG"
+-	echo "*** environment variable to the full path to openal-config."
+-
+-	AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
+-else
+-
+-	if test x"$use_static_openal" = x"yes"; then
+-		AL_LIBS="/usr/local/lib/libopenal.a"
+-	else
+-		AL_LIBS="`$OPENAL_CONFIG --libs`"
+-	fi
+-	
+-	AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
+-
+-	AC_MSG_RESULT(yes)
+-fi
++AL_LIBS="-lopenal"
++AL_CFLAGS="-I/auto/include/AL"
++AC_MSG_RESULT(yes)
+ 
+ AC_MSG_CHECKING(for Freealut support)
+ AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
+diff -ru scorched.orig/configure.ac scorched/configure.ac
+--- scorched.orig/configure.ac	2008-03-03 16:17:18.000000000 -0500
++++ scorched/configure.ac	2009-02-15 20:40:30.000000000 -0500
+@@ -13,22 +13,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
+-
+-if test `uname` == Darwin; then
+-LDFLAGS="$LDFLAGS -lmx"
+-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
+-else
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-fi
+-
+-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
+-	echo "Warning: No beer found in fridge!";
+-	echo "We highly suggest that you rectify this situation immediately."
+-])
+-
+ AC_ARG_ENABLE(serveronly, 
+ 	[  --enable-serveronly Enable server only compilation],
+ 		    , enable_serveronly=no,
diff --git a/games-strategy/scorched3d/scorched3d-42.ebuild b/games-strategy/scorched3d/scorched3d-42.ebuild
new file mode 100644
index 000000000000..ed6b5c89a71d
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-42.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.ebuild,v 1.1 2009/02/16 03:19:07 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools 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 -> Scorched3D-${PV}-src.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dedicated mysql"
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-net
+	media-libs/libpng
+	media-libs/jpeg
+	dev-libs/expat
+	!dedicated? (
+		virtual/opengl
+		virtual/glu
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/freealut
+		x11-libs/wxGTK:2.8[X]
+		media-libs/freetype:2
+		sci-libs/fftw:3.0
+	)
+	mysql? ( virtual/mysql )"
+
+S=${WORKDIR}/scorched
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fixups.patch
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--with-fftw=/usr \
+		--with-ogg=/usr \
+		--with-vorbis=/usr \
+		--datadir="${GAMES_DATADIR}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		--with-wx-config="${WX_CONFIG}" \
+		--without-pgsql \
+		$(use_with mysql) \
+		$(use_enable dedicated serveronly)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if ! use dedicated ; then
+		newicon data/windows/tank.bmp ${PN}.bmp
+		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
+	fi
+	prepgamesdirs
+}