[gentoo-commits] gentoo-x86 commit in games-strategy/boswars: ChangeLog boswars-2.5.ebuild

[Michael Sterrett (mr_bones_)]

mr_bones_    10/01/05 08:39:26

  Modified:             ChangeLog boswars-2.5.ebuild
  Log:
  EAPI=2; respect CXX
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.10                 games-strategy/boswars/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/boswars/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/boswars/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/boswars/ChangeLog?r1=1.9&r2=1.10

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog	21 Jun 2009 00:59:07 -0000	1.9
+++ ChangeLog	5 Jan 2010 08:39:25 -0000	1.10
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/boswars
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.9 2009/06/21 00:59:07 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.10 2010/01/05 08:39:25 mr_bones_ Exp $
+
+  05 Jan 2010; Michael Sterrett <mr_bones_@g.o> boswars-2.5.ebuild:
+  EAPI=2; respect CXX
 
   21 Jun 2009; Tristan Heaven <nyhm@g.o> boswars-2.5.ebuild,
   +files/boswars-2.5-gcc44.patch:



1.4                  games-strategy/boswars/boswars-2.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild?r1=1.3&r2=1.4

Index: boswars-2.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- boswars-2.5.ebuild	21 Jun 2009 00:59:07 -0000	1.3
+++ boswars-2.5.ebuild	5 Jan 2010 08:39:25 -0000	1.4
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.5.ebuild,v 1.3 2009/06/21 00:59:07 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild,v 1.4 2010/01/05 08:39:25 mr_bones_ Exp $
 
-inherit eutils games
+EAPI=2
+inherit toolchain-funcs eutils games
 
 DESCRIPTION="Futuristic real-time strategy game"
 HOMEPAGE="http://www.boswars.org/"
@@ -15,7 +16,7 @@
 IUSE=""
 
 RDEPEND="dev-lang/lua
-	media-libs/libsdl
+	media-libs/libsdl[audio,video]
 	media-libs/libpng
 	media-libs/libvorbis
 	media-libs/libtheora
@@ -27,9 +28,7 @@
 
 S=${WORKDIR}/${P}-src
 
-src_unpack() {
-	unpack ${A/bos.png}
-	cd "${S}"
+src_prepare() {
 	rm -f doc/{README-SDL.txt,guichan-copyright.txt}
 	epatch \
 		"${FILESDIR}"/${P}-gentoo.patch \
@@ -46,7 +45,9 @@
 }
 
 src_compile() {
-	scons || die "scons failed"
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[:space:]*[0-9]\+\).*/\1/; p }")
+
+	scons CXX=$(tc-getCXX) ${sconsopts} || die "scons failed"
 }
 
 src_install() {