version bump

(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 106 insertions, 2 deletions

diff --git a/games-strategy/boswars/ChangeLog b/games-strategy/boswars/ChangeLog
index f92807b05fd9..6a8527e60192 100644
--- a/games-strategy/boswars/ChangeLog
+++ b/games-strategy/boswars/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/boswars
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.20 2012/10/12 02:29:29 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.21 2013/06/24 16:11:50 mr_bones_ Exp $
+
+*boswars-2.7 (24 Jun 2013)
+
+  24 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org> +boswars-2.7.ebuild,
+  +files/boswars-2.7-gentoo.patch, +files/boswars-2.7-scons-blows.patch:
+  version bump
 
   12 Oct 2012; Michael Sterrett <mr_bones_@gentoo.org> boswars-2.6.1.ebuild:
   slot dep for libpng; tidy
diff --git a/games-strategy/boswars/boswars-2.7.ebuild b/games-strategy/boswars/boswars-2.7.ebuild
new file mode 100644
index 000000000000..3f5d1667ab72
--- /dev/null
+++ b/games-strategy/boswars/boswars-2.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.7.ebuild,v 1.1 2013/06/24 16:11:50 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils scons-utils 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=""
+
+DEPEND="dev-lang/lua
+	media-libs/libsdl[audio,video]
+	media-libs/libpng:0
+	media-libs/libvorbis
+	media-libs/libtheora
+	media-libs/libogg
+	virtual/opengl
+	x11-libs/libX11"
+
+S=${WORKDIR}/${P}-src
+
+src_prepare() {
+	rm -f doc/{README-SDL.txt,guichan-copyright.txt}
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-scons-blows.patch
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		engine/include/stratagus.h \
+		|| die
+	sed -i \
+		-e "/-O2/s:-O2.*math:${CXXFLAGS} -Wall:" \
+		SConstruct \
+		|| die
+}
+
+src_compile() {
+	escons || die
+}
+
+src_install() {
+	newgamesbin build/${PN}-release ${PN} || die
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r campaigns graphics intro languages maps patches scripts sounds units \
+		|| die
+	newicon "${DISTDIR}"/bos.png ${PN}.png
+	make_desktop_entry ${PN} "Bos Wars"
+	# COPYRIGHT.txt is referenced by the html
+	dodoc CHANGELOG COPYRIGHT.txt README.txt
+	dohtml -r doc/*
+	prepgamesdirs
+}
diff --git a/games-strategy/boswars/files/boswars-2.7-gentoo.patch b/games-strategy/boswars/files/boswars-2.7-gentoo.patch
new file mode 100644
index 000000000000..9459c77d89bc
--- /dev/null
+++ b/games-strategy/boswars/files/boswars-2.7-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ru boswars-2.6.1-src.orig/engine/include/stratagus.h boswars-2.6.1-src/engine/include/stratagus.h
+--- boswars-2.6.1-src.orig/engine/include/stratagus.h	2010-04-11 08:12:18.000000000 -0400
++++ boswars-2.6.1-src/engine/include/stratagus.h	2010-05-22 02:33:50.021377764 -0400
+@@ -133,7 +133,7 @@
+ --  General
+ ----------------------------------------------------------------------------*/
+ #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
diff --git a/games-strategy/boswars/files/boswars-2.7-scons-blows.patch b/games-strategy/boswars/files/boswars-2.7-scons-blows.patch
new file mode 100644
index 000000000000..0a7029df4971
--- /dev/null
+++ b/games-strategy/boswars/files/boswars-2.7-scons-blows.patch
@@ -0,0 +1,27 @@
+--- SConstruct.orig	2010-11-19 21:09:45.724976603 -0500
++++ SConstruct	2010-11-19 21:11:05.723197985 -0500
+@@ -22,6 +22,7 @@
+ ##
+ 
+ import os
++import SCons.Util
+ import sys
+ import glob
+ from stat import *
+@@ -50,6 +51,16 @@
+ 
+ opts = DefineOptions("build_options.py", ARGUMENTS)
+ env = Environment(ENV = {'PATH':os.environ['PATH']}) # for an unknown reason Environment(options=opts) doesnt work well
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ opts.Update(env) # Needed as Environment(options=opts) doesnt seem to work
+ Help(opts.GenerateHelpText(env))
+ mingw = env.Clone()