4 files changed, 127 insertions, 1 deletions
diff --git a/games-action/btanks/ChangeLog b/games-action/btanks/ChangeLog
index 0a6426529cf8..faeebc8d29fb 100644
--- a/games-action/btanks/ChangeLog
+++ b/games-action/btanks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-action/btanks
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/ChangeLog,v 1.12 2008/04/20 09:19:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/ChangeLog,v 1.13 2008/08/04 20:47:09 mr_bones_ Exp $
+
+*btanks-0.8.7479 (04 Aug 2008)
+
+  04 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/btanks-0.8.7479-build.patch,
+  +files/btanks-0.8.7479-scons-blows.patch, +btanks-0.8.7479.ebuild:
+  version bump - ebuild submitted by Aleksandr Yakimov via bug #233461
 
   20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
   +files/btanks-0.7.5800-gcc43.patch, btanks-0.7.5800.ebuild:
diff --git a/games-action/btanks/btanks-0.8.7479.ebuild b/games-action/btanks/btanks-0.8.7479.ebuild
new file mode 100644
index 000000000000..c85b7c8bc872
--- /dev/null
+++ b/games-action/btanks/btanks-0.8.7479.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/btanks-0.8.7479.ebuild,v 1.1 2008/08/04 20:47:09 mr_bones_ Exp $
+
+inherit eutils games
+
+DESCRIPTION="Fast 2D tank arcade game with multiplayer and split-screen modes"
+HOMEPAGE="http://btanks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1
+	media-libs/openal
+	media-libs/libsdl
+	media-libs/libvorbis
+	virtual/opengl
+	dev-libs/expat
+	media-libs/sdl-image"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-scons-blows.patch \
+		"${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	scons \
+		mode='release' \
+		prefix=/usr \
+		lib_dir="$(games_get_libdir)/${PN}" \
+		resources_dir="${GAMES_DATADIR}/${PN}" \
+		|| die 'scons'
+}
+
+src_install() {
+	newgamesbin btanks btanks || die 'newgamesbin'
+	newgamesbin bted btanksed || die 'newgamesbin'
+
+	insinto "$(games_get_libdir)"/${PN}
+	doins lib{mrt,bt,sdlx,clunk}.so || die 'doins for lib.so failed'
+
+	exeinto "${GAMES_DATADIR}/${PN}"
+	doexe libbt_objects.so || die 'doins for libbt_objects.so failed'
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data || die 'doins for data failed'
+	dodoc ChangeLog *.txt
+
+	newicon engine/src/bt.xpm ${PN}.xpm || die 'newicon'
+	make_desktop_entry ${PN} 'Battle Tanks' ${PN}
+
+	prepgamesdirs
+}
diff --git a/games-action/btanks/files/btanks-0.8.7479-build.patch b/games-action/btanks/files/btanks-0.8.7479-build.patch
new file mode 100644
index 000000000000..c25266c2f404
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.8.7479-build.patch
@@ -0,0 +1,33 @@
+diff -urN btanks-0.8.7479-orig/engine/src/finder.cpp btanks-0.8.7479/engine/src/finder.cpp
+--- btanks-0.8.7479-orig/engine/src/finder.cpp	2008-06-08 13:02:39.000000000 +0400
++++ btanks-0.8.7479/engine/src/finder.cpp	2008-07-30 15:57:31.000000000 +0400
+@@ -102,14 +102,14 @@
+ 					//LOG_DEBUG(("data_dir = %s", dname.c_str()));
+ 					path.push_back(dname.c_str());
+ #ifdef PLUGINS_DIR
+-					path.push_back(PLUGINS_DIR + "/" + dname); //plugins loaded from path ../bt_objects.
++					path.push_back(std::string(PLUGINS_DIR) + "/" + std::string(dname)); //plugins loaded from path ../bt_objects.
+ #endif
+ 			}
+ 		} CATCH("scan", )
+ 	}
+ #ifdef RESOURCES_DIR
+ 	std::string dname = RESOURCES_DIR "/data";
+-	std::string rname = RESOURCES_DIR + "/resources.dat";
++	std::string rname = std::string(RESOURCES_DIR) + "/resources.dat";
+ #else
+ 	std::string dname = "data";
+ 	std::string rname = "resources.dat";
+diff -urN btanks-0.8.7479-orig/mrt/fs_node.cpp btanks-0.8.7479/mrt/fs_node.cpp
+--- btanks-0.8.7479-orig/mrt/fs_node.cpp	2008-06-08 13:02:39.000000000 +0400
++++ btanks-0.8.7479/mrt/fs_node.cpp	2008-07-30 15:57:31.000000000 +0400
+@@ -129,7 +129,8 @@
+ 		}
+ 		r.push_back(p[i]);
+ 	}
+-	mrt::join(path, r, "/");
++// Commented because strip leading symbol '/'
++//	mrt::join(path, r, "/");
+ 	return path;
+ }
+ 
diff --git a/games-action/btanks/files/btanks-0.8.7479-scons-blows.patch b/games-action/btanks/files/btanks-0.8.7479-scons-blows.patch
new file mode 100644
index 000000000000..f54578345988
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.8.7479-scons-blows.patch
@@ -0,0 +1,25 @@
+Don't force crappy flags.
+
+--- SConstruct.orig	2008-08-04 11:10:58.000000000 -0400
++++ SConstruct	2008-08-04 12:37:10.000000000 -0400
+@@ -90,18 +90,8 @@
+ 		#env.Append(CPPDEFINES = ['NDEBUG']) 
+ 
+ else:
+-	if env['gcc_visibility']: 
+-		env.Append(CCFLAGS=['-fvisibility=hidden']);
+-		env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden']);
+-	if debug:
+-		env.Append(CCFLAGS=['-ggdb'])
+-		env.Append(CPPFLAGS=['-ggdb'])
+-	else: 
+-		env.Append(CCFLAGS=['-O3'])
+-		env.Append(CPPFLAGS=['-O3'])
+-		
+-	env.Append(CPPFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
+-	env.Append(CCFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
++	env.Append(CPPFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pthread'])
++	env.Append(CCFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pthread'])
+ 
+ 
+ conf_env = env.Clone()