diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-06-08 07:17:35 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-06-08 07:17:35 +0000 |
| commit | ad56c2340883afaa7a0d9c11a9fa51674d6c05a6 (patch) | |
| tree | d1ab5cc6e37ee59b247344a52194175b0cdfe074 /games-fps | |
| parent | Disable online test (diff) | |
| download | gentoo-2-ad56c2340883afaa7a0d9c11a9fa51674d6c05a6.tar.gz gentoo-2-ad56c2340883afaa7a0d9c11a9fa51674d6c05a6.tar.bz2 gentoo-2-ad56c2340883afaa7a0d9c11a9fa51674d6c05a6.zip | |
Fix parallel make bug #272669
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/blackshades/ChangeLog | 9 | ||||
| -rw-r--r-- | games-fps/blackshades/blackshades-20031110-r1.ebuild | 5 | ||||
| -rw-r--r-- | games-fps/blackshades/blackshades-20070723.ebuild | 15 |
3 files changed, 20 insertions, 9 deletions
diff --git a/games-fps/blackshades/ChangeLog b/games-fps/blackshades/ChangeLog index 2ea36e389c6e..8d3c5c293c8c 100644 --- a/games-fps/blackshades/ChangeLog +++ b/games-fps/blackshades/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/blackshades -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades/ChangeLog,v 1.2 2007/07/23 16:07:26 nyhm Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades/ChangeLog,v 1.3 2009/06/08 07:17:35 tupone Exp $ + + 08 Jun 2009; Alfredo Tupone <tupone@gentoo.org> + blackshades-20031110-r1.ebuild, blackshades-20070723.ebuild: + Fix parallel make bug #272669 by Christian Faulhammer <fauli@gentoo.org> + Repoman QA *blackshades-20070723 (23 Jul 2007) diff --git a/games-fps/blackshades/blackshades-20031110-r1.ebuild b/games-fps/blackshades/blackshades-20031110-r1.ebuild index 22d377cd5fbc..b156dc8f6155 100644 --- a/games-fps/blackshades/blackshades-20031110-r1.ebuild +++ b/games-fps/blackshades/blackshades-20031110-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades/blackshades-20031110-r1.ebuild,v 1.1 2007/07/23 12:39:34 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades/blackshades-20031110-r1.ebuild,v 1.2 2009/06/08 07:17:35 tupone Exp $ #ECVS_PASS="anonymous" #ECVS_SERVER="icculus.org:/cvs/cvsroot" @@ -24,6 +24,7 @@ DEPEND="virtual/opengl media-libs/openal media-libs/freealut media-libs/libsdl" +RDEPEND="${DEPEND}" S=${WORKDIR}/${ECVS_MODULE} diff --git a/games-fps/blackshades/blackshades-20070723.ebuild b/games-fps/blackshades/blackshades-20070723.ebuild index 3546f62a3914..d3ecbd31dac6 100644 --- a/games-fps/blackshades/blackshades-20070723.ebuild +++ b/games-fps/blackshades/blackshades-20070723.ebuild @@ -1,6 +1,7 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades/blackshades-20070723.ebuild,v 1.1 2007/07/23 16:07:26 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades/blackshades-20070723.ebuild,v 1.2 2009/06/08 07:17:35 tupone Exp $ +EAPI=2 inherit eutils games @@ -21,12 +22,11 @@ DEPEND="virtual/opengl media-libs/openal media-libs/freealut media-libs/libsdl" +RDEPEND="${DEPEND}" S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { rm -rf Data/Textures rm -f ../Textures/{,Blood/}._* mv -f ../Textures Data || die "mv failed" @@ -41,6 +41,11 @@ src_unpack() { || die "sed Main.cpp failed" } +src_compile() { + emake bindir || die "emake bindir failed" + emake || die "emake failed" +} + src_install() { newgamesbin objs/blackshades ${PN} || die "newgamesbin failed" insinto "${GAMES_DATADIR}"/${PN} |