version bump - ebuild submitted by Aleksandr Yakimov via bug #233461

Package-Manager: portage-2.1.4.4

5 files changed, 132 insertions, 12 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/Manifest b/games-action/btanks/Manifest
index 8908dabc4353..fb19d67460fe 100644
--- a/games-action/btanks/Manifest
+++ b/games-action/btanks/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX btanks-0.7.5800-gcc43.patch 2093 RMD160 feaaf84c116a115f58cfcb5b9a386f08c000c158 SHA1 b862defe2b1327378cecb2cfc0f3664c699363a0 SHA256 f1fef6ad7e7196e3f2db6590832abe557ef1c9e3d52f789009018ba4d7a7b754
 AUX btanks-0.7.5800-scons-blows.patch 1397 RMD160 c7bd6b710bbe2f158eb08266a35add5a82843cea SHA1 8083911d08a001ba107af85bdce7a842a9bfc4ec SHA256 b5bfba498922828dd43a989c5b6361c6e75ed1c90000b4cdab49cd0ec80a68b5
+AUX btanks-0.8.7479-build.patch 1301 RMD160 d7f7a8caf9acff921e50ef361e0ddbba5cf9482c SHA1 fab5669443499b9cddcb9b8bca920b91f54dc1b5 SHA256 5032fcf196022c2f6ecabce077de0ff7b9341dd8625f5eea580b668a2a8e6535
+AUX btanks-0.8.7479-scons-blows.patch 863 RMD160 403a061752f5a673960033b193eb0f2ab2df0ca5 SHA1 56fba72fe0915232b6a9a247ef00cc9367fa62a5 SHA256 2392dc642379477ed69e535c7dd12e2b103d74a303816b542d0ffe3d8e4f6001
 DIST btanks-0.7.5800.tar.bz2 56610996 RMD160 101da9fe749a80456c675ca9dc6f26ca3fb53038 SHA1 3892249c71130847756290b48ae0181b9ee6ddbf SHA256 1c82a2a1d1acd9bba7498be6623ad94a05783aba23fb0ac84330049a02107c2f
+DIST btanks-0.8.7479.tar.bz2 59417541 RMD160 9dcd92b185967b0d31fc385c0f847fe2ded2b8e3 SHA1 0e444af751cac7b86a10270ea514145ad2fb7a36 SHA256 c838043669b8f91c50205820a4f17a0ff1ed0fe5a51f2402866d07b5e03bbd44
 EBUILD btanks-0.7.5800.ebuild 1473 RMD160 b705ab754af768808e12497b2129568e928edf43 SHA1 b4309f4805939b17d23195e064cf432030645c23 SHA256 49b8de37eed786a2bec0be88851276382f8db951523a1b1abc07c112fc8ac92b
-MISC ChangeLog 2198 RMD160 92d3f48c24f39f4d989dc9ef6c83d7c303b6e480 SHA1 d087e86e639d016d9cf4aed069f3b34427b91695 SHA256 44086d1bced2cbae9479c2fbfeae70085fe05796e4315fb7955e7c5083a3f100
+EBUILD btanks-0.8.7479.ebuild 1509 RMD160 4d69b5fbfa68d43bb7e132a317790c77e824cf2e SHA1 3533a3dbb79f5ce017d160e620d1443b4f947c01 SHA256 488b30286648a330971919eacd8f0df7f381b86e0c2c6592d94367ad6f4ef21c
+MISC ChangeLog 2467 RMD160 36829f1c61dab497e6836bb36809d07a3dfd56b6 SHA1 8a771bf2a8e4d59f511291e5e7efa59cde677f58 SHA256 fb428855b54e9c9dc3392a8811de9ff02adc8b3fecc102df2c6b0b31d75bf702
 MISC metadata.xml 602 RMD160 7bcf0da779e8e1cc2a225f25cba147e7d743d671 SHA1 2a04ca616e925cb64cd5df0f4dd96e1512b4aeb0 SHA256 f2fba9fde47806ea5f4d7a16dfe1a5edd4869619118f28a30a91ec8a629cfb2c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFICwq0j9hvisErhMIRAqbJAKDXnVgrOKnkeS9D43Bm1NS0DRKD9QCgyf+4
-rOIu9wcP0y6e+/JB/Q6XeMo=
-=2z0a
------END PGP SIGNATURE-----
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()