use scons-utils; honor LDFLAGS

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

4 files changed, 43 insertions, 14 deletions

diff --git a/games-strategy/boswars/ChangeLog b/games-strategy/boswars/ChangeLog
index 8e74c0648481..faeae728d7b3 100644
--- a/games-strategy/boswars/ChangeLog
+++ b/games-strategy/boswars/ChangeLog
@@ -1,6 +1,10 @@
 # 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.18 2010/11/17 00:46:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.19 2010/11/20 02:15:54 mr_bones_ Exp $
+
+  20 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org> boswars-2.6.1.ebuild,
+  +files/boswars-2.6.1-scons-blows.patch:
+  use scons-utils; honor LDFLAGS
 
   17 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
   +files/boswars-2.6.1-gentoo.patch, -files/boswars-2.6-gentoo.patch:
diff --git a/games-strategy/boswars/Manifest b/games-strategy/boswars/Manifest
index f740e5d0d5da..84b9b8d9c84a 100644
--- a/games-strategy/boswars/Manifest
+++ b/games-strategy/boswars/Manifest
@@ -1,6 +1,7 @@
 AUX boswars-2.6.1-gentoo.patch 616 RMD160 db889d7e875ab53f5efea6b8ca9cdf77b5dac10f SHA1 fea6ef8f4c89edd082ebd10dbd5ab7e5032b13e7 SHA256 bb10a4e9ea3be0bff2fc485833154205855983e5f8ec1eb333ad08367351eddb
+AUX boswars-2.6.1-scons-blows.patch 945 RMD160 9dd7e1deb644e71335af9a40daf455d55ee18294 SHA1 284818b55b00f291df79391ccc87ee2338a2257d SHA256 85fa46dbe677dde77246336a0067b448905be8d34712dd486b6bc73400daae55
 DIST bos.png 620 RMD160 19822ea636b7a7995a348332dffb40e302c61a6e SHA1 e0088d4e3d9b7376563e4bb31dba30e1820dcf66 SHA256 fe1d24bc722093bd3882ecab15c15f61b6b0edee263bfd58af662825e76d8b0a
 DIST boswars-2.6.1-src.tar.gz 64708620 RMD160 f7c41b3c9276d21aab19e93af0de851646dc4bac SHA1 4a482064e6c22c28a519abe4861887595b99782d SHA256 6003307692bde9913f6b5c227bf351e43e33d44ffaab198f0d0677e8fef86315
-EBUILD boswars-2.6.1.ebuild 1622 RMD160 4a13bdd228745976c8c1466f98f419988489ab60 SHA1 30398a8b6977818d6721535d908f9c880358b6c1 SHA256 553448bb49932039ac8bb88705ed7b70fc3648c4d3df7c43b18486800499846b
-MISC ChangeLog 2704 RMD160 82cc93f7198dff087b2cf0e14f4e33c2b733ed6c SHA1 ba21c8cb85123cd831c8ec4ab11a258c632a2575 SHA256 9599c3b335950f616ff7432bf17b598ba74864f1a073d127e6dbac7de3310bed
+EBUILD boswars-2.6.1.ebuild 1467 RMD160 49db05aab74196ea54cbb96cb081aeda3d6203a1 SHA1 b62fa6cc71e19f6d492b5ddb7cb4310b7773ff24 SHA256 5ed2c6b2c7c20e33a6d1f873c472f8d2614c9e99684ba6fa1680c45dd5ffd1dc
+MISC ChangeLog 2857 RMD160 e01bd73ea6c60f52c6bf1cf2be4f1506acf5a9c0 SHA1 d9e1c9bcd73db0cf2c33213c93a0d531fc1d07ec SHA256 a36c207e7144f50fa78c7104f9d5621e8c361a7e9210ab3721e23f199a50256e
 MISC metadata.xml 423 RMD160 9d009a8f49f9779eb0e508af34e0cc9e8d08c5f6 SHA1 c45842ff445b38e3085cc00ca266c097ebb1df14 SHA256 7e533fc54fb9f2a01faecc29086a7de01949da7f1e1e46edf8f0e6a7b76764cf
diff --git a/games-strategy/boswars/boswars-2.6.1.ebuild b/games-strategy/boswars/boswars-2.6.1.ebuild
index 5e03a0cb1219..0f3131afb054 100644
--- a/games-strategy/boswars/boswars-2.6.1.ebuild
+++ b/games-strategy/boswars/boswars-2.6.1.ebuild
@@ -1,9 +1,9 @@
 # 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.1.ebuild,v 1.4 2010/10/15 12:55:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.6.1.ebuild,v 1.5 2010/11/20 02:15:54 mr_bones_ Exp $
 
 EAPI=2
-inherit toolchain-funcs eutils games
+inherit eutils scons-utils games
 
 DESCRIPTION="Futuristic real-time strategy game"
 HOMEPAGE="http://www.boswars.org/"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-RDEPEND="dev-lang/lua
+DEPEND="dev-lang/lua
 	media-libs/libsdl[audio,video]
 	media-libs/libpng
 	media-libs/libvorbis
@@ -23,15 +23,14 @@ RDEPEND="dev-lang/lua
 	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
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-scons-blows.patch
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
 		engine/include/stratagus.h \
@@ -43,9 +42,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[:space:]*[0-9]\+\).*/\1/; p }")
-
-	scons CXX=$(tc-getCXX) LINKFLAGS="${LDFLAGS}" ${sconsopts} || die "scons failed"
+	escons || die
 }
 
 src_install() {
@@ -53,8 +50,8 @@ src_install() {
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r campaigns graphics intro languages maps patches scripts sounds units \
 		|| die "doins failed"
-	doicon "${DISTDIR}"/bos.png
-	make_desktop_entry ${PN} "Bos Wars"	bos
+	newicon "${DISTDIR}"/bos.png ${PN}.png
+	make_desktop_entry ${PN} "Bos Wars"
 	dodoc CHANGELOG COPYRIGHT.txt README.txt
 	dohtml -r doc/*
 	prepgamesdirs
diff --git a/games-strategy/boswars/files/boswars-2.6.1-scons-blows.patch b/games-strategy/boswars/files/boswars-2.6.1-scons-blows.patch
new file mode 100644
index 000000000000..0a7029df4971
--- /dev/null
+++ b/games-strategy/boswars/files/boswars-2.6.1-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()