version bump

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

5 files changed, 111 insertions, 3 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/Manifest b/games-strategy/boswars/Manifest
index 0332c7c286ad..614b77287360 100644
--- a/games-strategy/boswars/Manifest
+++ b/games-strategy/boswars/Manifest
@@ -1,7 +1,11 @@
 AUX boswars-2.6.1-gentoo.patch 616 SHA256 bb10a4e9ea3be0bff2fc485833154205855983e5f8ec1eb333ad08367351eddb SHA512 b27c8000c6985e572b53a3601082f3b0f8eee84cd02acc1cb36fbd29601d60e2e1e5d5e253b8b754ba82c89c2efc781e6a017aecfb894c371058acc9d32a8747 WHIRLPOOL ed98c9b7d9a5277d208031982bb9dffc9aa8f55b9536c36c8e123773902e7b30dd55696fc92a657dbe7483a8021636e512424cf60b4ffe092d81300998297d93
 AUX boswars-2.6.1-scons-blows.patch 945 SHA256 85fa46dbe677dde77246336a0067b448905be8d34712dd486b6bc73400daae55 SHA512 162d289ac0b33f3ea40ade2335375a98f526b210a683b6a012051970f79e3ce38c7e002ec4c4024da61473df4eb5ad5adb54212b0787bb9add14474838f48e31 WHIRLPOOL 787f2add800d701e16a6c41b267d93b959ab559d5b80317249333d782efc6345bd44786f8ddcab4392eb5cde2f27a3da03b7fb07836dcb544b00568e24a76257
+AUX boswars-2.7-gentoo.patch 616 SHA256 bb10a4e9ea3be0bff2fc485833154205855983e5f8ec1eb333ad08367351eddb SHA512 b27c8000c6985e572b53a3601082f3b0f8eee84cd02acc1cb36fbd29601d60e2e1e5d5e253b8b754ba82c89c2efc781e6a017aecfb894c371058acc9d32a8747 WHIRLPOOL ed98c9b7d9a5277d208031982bb9dffc9aa8f55b9536c36c8e123773902e7b30dd55696fc92a657dbe7483a8021636e512424cf60b4ffe092d81300998297d93
+AUX boswars-2.7-scons-blows.patch 945 SHA256 85fa46dbe677dde77246336a0067b448905be8d34712dd486b6bc73400daae55 SHA512 162d289ac0b33f3ea40ade2335375a98f526b210a683b6a012051970f79e3ce38c7e002ec4c4024da61473df4eb5ad5adb54212b0787bb9add14474838f48e31 WHIRLPOOL 787f2add800d701e16a6c41b267d93b959ab559d5b80317249333d782efc6345bd44786f8ddcab4392eb5cde2f27a3da03b7fb07836dcb544b00568e24a76257
 DIST bos.png 620 SHA256 fe1d24bc722093bd3882ecab15c15f61b6b0edee263bfd58af662825e76d8b0a SHA512 6a15a5c82f9cff3462d498620a1dd1c7a2a460119689078157e61b27e7e5243a8ac2da7f01c1848d614167a3a748ca1f3e03c1f218479ede3a1c2c0ae85b3cc3 WHIRLPOOL 4688e15b35a4c6e6888b867f16e646e520bf00cbb04d586b08567b2177fe9e82d0a2e1c31060c18ac2149df727f8a781f4394936c77a0d0b6ef846051ff760e7
 DIST boswars-2.6.1-src.tar.gz 64708620 SHA256 6003307692bde9913f6b5c227bf351e43e33d44ffaab198f0d0677e8fef86315 SHA512 6ea24ec0fc4544044c4bf7685ffc404433f915bc9a81e4a67a003ded72dbec7b0693fb8cb4f3ada97ed55c06893bf7a5b4de6c9c186dbd8d2ceeff281e65acce WHIRLPOOL d87f1c1bba009472e01a877dfdd26ce271c00dac910e16e89ebe932a46876fb1f2b0e8b4f3f5c024ead4ce9e3f2bc9123622b7123626485af70e28f3ad278252
+DIST boswars-2.7-src.tar.gz 77280735 SHA256 dc3718f531e9ea413cf37e1333b62a4c5e69f1405502d9c59b9e424635135e3e SHA512 2573c61684e83f356a80292adcf780cc001a4be2a31abba20e6f93ed6deaa38b8eca87f29935a4fe0edc9b4e0fdc3f78ddd709b8132aaaa048ffbcd6c498ec80 WHIRLPOOL f8e0156fbf2d868eb4066bab0592a9fc5c1fce055aba81c056da1d10da4112913f50312fc1526a0ff62159a84b9463907c92b8ae54445fab20dc5879bf961322
 EBUILD boswars-2.6.1.ebuild 1385 SHA256 da37d3f155b0b35da3537962da897102165fc71cf2b07bb28915e3acecc0248e SHA512 75704121188b5708e43e1e8fa9e585ce65f8268acd9e831761f6ee767576d4e95331e32307be48eceb4c92c78ec231ab92da3dda2c9ea77fbc762103f861f04b WHIRLPOOL 02ad85bf75e853d179b6e9c6372e95d380aff6e2b2118d461654657f2f75b2914c5f766d26115c7d78f381078891edd93aaecac603993e553fc2b0ad2933afaa
-MISC ChangeLog 2962 SHA256 45c493bd23debf14cc4e06a9cca8564349dc09e589d68e8ff2a7437918b2c4a3 SHA512 81a76b5413a01f38aaf9d3fdf02243b7c78193070213f8b874899288d47de3512ce9f5c1a1f9fde8ed22661baa6bfe98900363a41d834374c93a73782e41809a WHIRLPOOL 8d02626937764940f2002b601437b33552cbe62ab645561f4c20e200545fc7af83794b33d4d5adc994906940403afdb11201d09cae9c2c8868789a9969d2691f
+EBUILD boswars-2.7.ebuild 1449 SHA256 93ada9805855748121d7d2d7962e5d28297349c529bf8082f0699c52b753434f SHA512 1a70b5e576b6f963fb46f890b8f05b26664fc5ee0d472718fc7b3dae487598b49b3862a3dc8e944d2ea39cf74c0cb608c19221cfb6e0622edc08594d4a2f54f2 WHIRLPOOL e8420b814e64af2c380e002380ec3f89359c2c9902d22f60f0414b6796b250a869576766bd6e71b2c304977648a4d68d5b652c0aed1e590a0c0605857ad569be
+MISC ChangeLog 3155 SHA256 7e42dbaa60ce1080bfd407982694a35c908e73c222eebe9e1a030de8cc464a79 SHA512 632921865cfc5deeb2d4dc8ae7d3819a0725e89fcce78eb0b6a1c4e01a18874fbb48e7bbfb413d4cd684ca6f32daca20797f03c7a879dc4d82f3d3f230fb4393 WHIRLPOOL 688afd6eb7f0a417c0b7a686226c30b1007e46c47990cf01523cb6eb008444b7c7ff96a4eed8e2f9dea682ae820868fa019ca9365f35233c6574197c43fd789d
 MISC metadata.xml 423 SHA256 7e533fc54fb9f2a01faecc29086a7de01949da7f1e1e46edf8f0e6a7b76764cf SHA512 a61e2731f821d761a8c8969fd85f3c8cfc9f857af15c95c147c20b7f6aeebff223493a6bd420d0ce0309ec7b1e2ee14240a996455f974bd75dfbbda1f2140dfb WHIRLPOOL 2bd80af6db1d1d90941cbfd969b0bdf390c9157464630bb10ce9ae6e1874d46de765c847c4b53612c916799b3bee07e5592c9e777c13581f141c35d981e49016
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()