version bump

(Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)

3 files changed, 129 insertions, 2 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/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
+}