version bump

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 83 insertions, 2 deletions

diff --git a/games-strategy/boswars/ChangeLog b/games-strategy/boswars/ChangeLog
index 7998c20d9989..df85b3e7c5cc 100644
--- a/games-strategy/boswars/ChangeLog
+++ b/games-strategy/boswars/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/boswars
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.12 2010/04/01 06:35:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.13 2010/04/12 05:34:09 mr_bones_ Exp $
+
+*boswars-2.6 (12 Apr 2010)
+
+  12 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> +boswars-2.6.ebuild,
+  +files/boswars-2.6-gentoo.patch:
+  version bump
 
   01 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> boswars-2.5.ebuild:
   x86 stable wrt bug #308531
diff --git a/games-strategy/boswars/Manifest b/games-strategy/boswars/Manifest
index ee64c41d460a..ebfabd39a3a6 100644
--- a/games-strategy/boswars/Manifest
+++ b/games-strategy/boswars/Manifest
@@ -1,8 +1,11 @@
 AUX boswars-2.5-gcc43.patch 465 RMD160 01bd439ab17f7402b3cfd62f27a4973d1bf60175 SHA1 69f2bbd7948b4f5630874af75bbaaff060b66d7e SHA256 ad117646bb8ae25ee317948da0e3ba750dcca10f6905e66e8e8c0f6632a955c4
 AUX boswars-2.5-gcc44.patch 438 RMD160 53f8384d0fe76037ed1c78622161deaafddd1c3f SHA1 5d5a9bb0c85a55f4f698321802455c0709403824 SHA256 8ecee13e5846391c0f3c346b158d437ee0c15ba57d24e6ed141a65338339e167
 AUX boswars-2.5-gentoo.patch 1025 RMD160 e1308e93f80eeac323f5dda5c9586abe2db1d088 SHA1 3b9ef3962d2cc37e64bb9f575e99971a2ef036da SHA256 cdd3bc4beaa5060343c7cb7ac5219b5eb6fb9384cf251590d8f2df3cdb840546
+AUX boswars-2.6-gentoo.patch 404 RMD160 7424773ee97c8e769aa29269ea064be14913c5fc SHA1 7d59952a30ea08c75e76f3d704f85df4556b9474 SHA256 e2520b917354b0dbc318ea989524b623ea350716a8c123a172413f9de004d72b
 DIST bos.png 620 RMD160 19822ea636b7a7995a348332dffb40e302c61a6e SHA1 e0088d4e3d9b7376563e4bb31dba30e1820dcf66 SHA256 fe1d24bc722093bd3882ecab15c15f61b6b0edee263bfd58af662825e76d8b0a
 DIST boswars-2.5-src.tar.gz 63851225 RMD160 dc42410f3d89c588b579ee7c0d47627c5d455362 SHA1 7305eaea67a0df8dd689df821573dab17e8de01a SHA256 ac5d9c8227fec012087ff617ea62666c7517b7bf2ac4c52be9030bd5ccef7f13
+DIST boswars-2.6-src.tar.gz 64796498 RMD160 f0701a6bd800f3767ba44a2ee05661fecf3717b9 SHA1 b6a93e374a1af57ca944fa123c29bf7c99b5e6d2 SHA256 82ae5688cc7baeb4c1f8afff8a0d6dac437940a6da3824f3e51cabb894c65f26
 EBUILD boswars-2.5.ebuild 1663 RMD160 abb84b525187cdab6cb68ade09205a43ff6ef282 SHA1 6db91d7e25cdb0b58713a6fd50682bde047ffbd6 SHA256 9b38337e159b3bedf51cd294aecf46531979cd69482cc81d7348e32119f74980
-MISC ChangeLog 1916 RMD160 cec316f48872a02319cf8e6e32a1a6734fdd0493 SHA1 1fc25fa27774aa47ee768db86888880fab6e3c3f SHA256 c363c89567f9ea7904c427168921e8960b6baf373de01ce4917acb8e33192a26
+EBUILD boswars-2.6.ebuild 1594 RMD160 6ac20a30b222742b87899058c73d52afb35f3e55 SHA1 81d76a00ee66a81d891a98de010d09d16b9dce03 SHA256 1799f95fe371955712487e6b4ed9eedcd57a2324d697ca5e3b1932a585839b70
+MISC ChangeLog 2070 RMD160 8fa1ce57f9ad46996c0758406807efb26000960d SHA1 73424f1f9bc2ed77a590f90be61f376f0b302776 SHA256 f25b590be2f4bd6ee0255a67b1be4804f3efe80af39c3f6bca595df0ef4d7516
 MISC metadata.xml 423 RMD160 9d009a8f49f9779eb0e508af34e0cc9e8d08c5f6 SHA1 c45842ff445b38e3085cc00ca266c097ebb1df14 SHA256 7e533fc54fb9f2a01faecc29086a7de01949da7f1e1e46edf8f0e6a7b76764cf
diff --git a/games-strategy/boswars/boswars-2.6.ebuild b/games-strategy/boswars/boswars-2.6.ebuild
new file mode 100644
index 000000000000..fcc5f543eab3
--- /dev/null
+++ b/games-strategy/boswars/boswars-2.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.6.ebuild,v 1.1 2010/04/12 05:34:09 mr_bones_ Exp $
+
+EAPI=2
+inherit toolchain-funcs eutils games
+
+DESCRIPTION="Futuristic real-time strategy game"
+HOMEPAGE="http://www.boswars.org/"
+SRC_URI="http://www.boswars.org/dist/releases/${P}-src.tar.gz
+	mirror://gentoo/bos.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/lua
+	media-libs/libsdl[audio,video]
+	media-libs/libpng
+	media-libs/libvorbis
+	media-libs/libtheora
+	media-libs/libogg
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+S=${WORKDIR}/${P}-src
+
+src_prepare() {
+	rm -f doc/{README-SDL.txt,guichan-copyright.txt}
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		engine/include/stratagus.h \
+		|| die "sed stratagus.h failed"
+	sed -i \
+		-e "/-O2/s:-O2.*math:${CXXFLAGS} -Wall:" \
+		SConstruct \
+		|| die "sed SConstruct failed"
+}
+
+src_compile() {
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[:space:]*[0-9]\+\).*/\1/; p }")
+
+	scons CXX=$(tc-getCXX) ${sconsopts} || die "scons failed"
+}
+
+src_install() {
+	dogamesbin ${PN} || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r campaigns graphics intro languages maps scripts sounds units \
+		|| die "doins failed"
+	doicon "${DISTDIR}"/bos.png
+	make_desktop_entry ${PN} "Bos Wars"	bos
+	dodoc CHANGELOG COPYRIGHT.txt README.txt
+	dohtml -r doc/*
+	prepgamesdirs
+}
diff --git a/games-strategy/boswars/files/boswars-2.6-gentoo.patch b/games-strategy/boswars/files/boswars-2.6-gentoo.patch
new file mode 100644
index 000000000000..39b7f6cb30ed
--- /dev/null
+++ b/games-strategy/boswars/files/boswars-2.6-gentoo.patch
@@ -0,0 +1,11 @@
+--- engine/include/stratagus.h.old	2007-08-04 21:54:17.000000000 +0200
++++ engine/include/stratagus.h	2007-08-04 21:55:20.000000000 +0200
+@@ -188,7 +188,7 @@
+ extern char NameLine[];
+ 
+ #ifndef STRATAGUS_LIB_PATH
+-#define STRATAGUS_LIB_PATH  "."      /// Where to find the data files
++#define STRATAGUS_LIB_PATH  "@GENTOO_DATADIR@" /// Where to find the data files
+ #endif
+ 
+ #ifndef STRATAGUS_HOME_PATH