diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-01-05 08:39:25 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-01-05 08:39:25 +0000 |
| commit | a0705860fe28b41e4bfcf4b46461dcc05de70f46 (patch) | |
| tree | 7e9665164d47357f6038c71b9f335df51802617b /games-strategy | |
| parent | Revert previous change as upstream has renamed the branch again, bug 299667. (diff) | |
| download | historical-a0705860fe28b41e4bfcf4b46461dcc05de70f46.tar.gz historical-a0705860fe28b41e4bfcf4b46461dcc05de70f46.tar.bz2 historical-a0705860fe28b41e4bfcf4b46461dcc05de70f46.zip | |
EAPI=2; respect CXX
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/boswars/ChangeLog | 7 | ||||
| -rw-r--r-- | games-strategy/boswars/Manifest | 14 | ||||
| -rw-r--r-- | games-strategy/boswars/boswars-2.5.ebuild | 17 |
3 files changed, 16 insertions, 22 deletions
diff --git a/games-strategy/boswars/ChangeLog b/games-strategy/boswars/ChangeLog index e4ff18226e70..24caccfcda1e 100644 --- a/games-strategy/boswars/ChangeLog +++ b/games-strategy/boswars/ChangeLog @@ -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_@gentoo.org> boswars-2.5.ebuild: + EAPI=2; respect CXX 21 Jun 2009; Tristan Heaven <nyhm@gentoo.org> boswars-2.5.ebuild, +files/boswars-2.5-gcc44.patch: diff --git a/games-strategy/boswars/Manifest b/games-strategy/boswars/Manifest index ce111ad27457..80bf8a8ff4a0 100644 --- a/games-strategy/boswars/Manifest +++ b/games-strategy/boswars/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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 DIST bos.png 620 RMD160 19822ea636b7a7995a348332dffb40e302c61a6e SHA1 e0088d4e3d9b7376563e4bb31dba30e1820dcf66 SHA256 fe1d24bc722093bd3882ecab15c15f61b6b0edee263bfd58af662825e76d8b0a DIST boswars-2.5-src.tar.gz 63851225 RMD160 dc42410f3d89c588b579ee7c0d47627c5d455362 SHA1 7305eaea67a0df8dd689df821573dab17e8de01a SHA256 ac5d9c8227fec012087ff617ea62666c7517b7bf2ac4c52be9030bd5ccef7f13 -EBUILD boswars-2.5.ebuild 1526 RMD160 33cea0d6d47290c6f955679d8e1d9f8c0ae6d23d SHA1 be22a958ff18c51b050f92298064d64cfc1a2633 SHA256 0d9dd3e567e4909e7dd9f12fd11b2f22ed81a721df55eb203ab3c5f759cb4071 -MISC ChangeLog 1613 RMD160 2bc48eaeeed2c7fe0b2f8b319868cd4edf7c9dc9 SHA1 b261bb37933078bad76cbbc9164af7b7ab22b576 SHA256 438188a4fe6677656316c965532132bcb9963443091f2072d7c8cd2f13e7964c +EBUILD boswars-2.5.ebuild 1664 RMD160 8ebef59262488b93ae7d6d86bd88eb02b62292ae SHA1 7788603ca0d7678267f1337976b53c33609d3a3c SHA256 0fef9f014335746ad6d0be252879d16253df57a7de92281c00b63499c334dbcb +MISC ChangeLog 1717 RMD160 6ce513c3dfacb007bb25a7dd10e46d27256e693e SHA1 dbfb0ee478dbca081db0a6a2295d14fe703267d7 SHA256 783dc0082929dc9939b5b48143d99a9d231b686a75353e8a92c6941e3cfbf082 MISC metadata.xml 423 RMD160 9d009a8f49f9779eb0e508af34e0cc9e8d08c5f6 SHA1 c45842ff445b38e3085cc00ca266c097ebb1df14 SHA256 7e533fc54fb9f2a01faecc29086a7de01949da7f1e1e46edf8f0e6a7b76764cf ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAko9heQACgkQdz7hIScOURHJDACg4SVWXvHvGx8cmsWwHEjcdA5M -H28AnRRHwb1HR86gC4IkSnpKbnlXDKyd -=jS/e ------END PGP SIGNATURE----- diff --git a/games-strategy/boswars/boswars-2.5.ebuild b/games-strategy/boswars/boswars-2.5.ebuild index c8bb709616c1..12c3274df3da 100644 --- a/games-strategy/boswars/boswars-2.5.ebuild +++ b/games-strategy/boswars/boswars-2.5.ebuild @@ -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 @@ KEYWORDS="~amd64 ~ppc ~x86" 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 @@ DEPEND="${RDEPEND} 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_unpack() { } 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() { |