Version bump. Bug #410845 by slepnoga and Matthias P. Braendli.

(Portage version: 2.2.0_alpha101_p6/cvs/Linux x86_64)

4 files changed, 110 insertions, 5 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 2a1dacaff746..da93b7e1ac14 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/scorched3d
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.82 2011/09/12 12:44:05 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.83 2012/05/12 14:41:22 slyfox Exp $
+
+*scorched3d-43.3d (12 May 2012)
+
+  12 May 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/scorched3d-43.3d-fixups.patch, +scorched3d-43.3d.ebuild,
+  scorched3d-43.2a.ebuild:
+  Version bump. Bug #410845 by slepnoga and Matthias P. Braendli.
 
   12 Sep 2011; Tupone Alfredo <tupone@gentoo.org>
   +files/scorched3d-43.2a-png15.patch:
diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch
new file mode 100644
index 000000000000..c054829546e6
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch
@@ -0,0 +1,26 @@
+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-43.2a.ebuild b/games-strategy/scorched3d/scorched3d-43.2a.ebuild
index e091ca540856..4c45dc40d9d8 100644
--- a/games-strategy/scorched3d/scorched3d-43.2a.ebuild
+++ b/games-strategy/scorched3d/scorched3d-43.2a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.2a.ebuild,v 1.6 2011/03/25 12:18:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.2a.ebuild,v 1.7 2012/05/12 14:41:22 slyfox Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="dedicated mysql"
 
-DEPEND="media-libs/libsdl[video]
+RDEPEND="media-libs/libsdl[video]
 	media-libs/sdl-net
 	media-libs/libpng
 	virtual/jpeg:0
@@ -33,6 +33,8 @@ DEPEND="media-libs/libsdl[video]
 	)
 	mysql? ( virtual/mysql )"
 
+DEPEND="$RDEPEND"
+
 S=${WORKDIR}/scorched
 
 src_prepare() {
diff --git a/games-strategy/scorched3d/scorched3d-43.3d.ebuild b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
new file mode 100644
index 000000000000..c24f2d8fdc65
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.1 2012/05/12 14:41:22 slyfox Exp $
+
+EAPI=2
+WX_GTK_VER=2.8
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dedicated mysql"
+
+RDEPEND="media-libs/libsdl[video]
+	media-libs/sdl-net
+	media-libs/libpng
+	virtual/jpeg:0
+	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 )"
+
+DEPEND="$RDEPEND"
+
+S=${WORKDIR}/scorched
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fixups.patch
+	epatch "${FILESDIR}"/${PN}-43.2a-gcc43.patch
+	epatch "${FILESDIR}"/${PN}-43.2a-odbc.patch
+	epatch "${FILESDIR}"/${PN}-43.2a-png15.patch
+	epatch "${FILESDIR}"/${PN}-43.2a-win32.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/images/tank-old.bmp ${PN}.bmp || die
+		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
+	fi
+	prepgamesdirs
+}