Fix parallel make bug #272669

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

4 files changed, 23 insertions, 12 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/Manifest b/games-fps/blackshades/Manifest
index c5080cf58dfa..1e1baeb3e12d 100644
--- a/games-fps/blackshades/Manifest
+++ b/games-fps/blackshades/Manifest
@@ -4,7 +4,7 @@ AUX blackshades-gcc42.patch 654 RMD160 07bb2c4d0c512602626497048891e3d0365ae73c
 DIST Textures.tar.bz2 340110 RMD160 6fa3072a7a013649093da0d586e69be3bba02b54 SHA1 78f18061a65d656c345f981bbca27ed3375b52c0 SHA256 084f4592e1c83a0ae79a14823f59fe210dc6ae83ff35111972d3b0239b276607
 DIST blackshades-20031110.tar.bz2 765970 RMD160 8ed3b2c3d683bbd3c0e56179d8d69b71c9642ad9 SHA1 65f0810615a96816dad90dd43fde8f604fb4c6b2 SHA256 2fd16d4b1c7a5b48854040e2a7857089fc0cbd7d72d489005530b89b769fd003
 DIST blackshades-20070723.tar.bz2 761669 RMD160 1618e1ef9f30160d89c8d7e7de84bc0576c8f7b7 SHA1 c878ea1747ffda2bb4ffca33a57a962b082eb9e6 SHA256 2fbd1ed3778a834010fe4de94063149b60461d6e9d155b281747c2e14fc30056
-EBUILD blackshades-20031110-r1.ebuild 1988 RMD160 d460a1e816dd4f9c27bfe7ae1c7c3ddad154cc67 SHA1 e7b1437cd4f9345ed72f5c98a05facddb94adf2b SHA256 76fd7be2af704c0dabf0758357a2fb9ae1a04a1e3c92a9ff494d43bc223f1049
-EBUILD blackshades-20070723.ebuild 1407 RMD160 40dcc508ef2ed5989cd18ba7a01896ee43a551e6 SHA1 70c7cdbd6dc5a6347a79d439ba4fb34a244559d5 SHA256 c0bd5c79fbb4696380eafc971d1155047da6025398d190c7c4c4ae73ff542795
-MISC ChangeLog 2832 RMD160 fb8711fdb409b2100a963bf979f41cfa08cf6119 SHA1 f0ec297d55c726698a903996468eaf6fd17bd20c SHA256 ef37d1b0ec097f111afd280e0ecf2f1e65c7f912d63b3df077c7efb2417e4eb3
+EBUILD blackshades-20031110-r1.ebuild 2010 RMD160 ee941fbc90175c9390325704419bc30e9c1252d7 SHA1 3810eaf8b60a0bc8acb55f8c2a170bb5f5e7c3d4 SHA256 8b56bf6f79bc4fb0dd14e20e7ad3cd062e3bc37ba717d5d1e00fd9f145913f46
+EBUILD blackshades-20070723.ebuild 1504 RMD160 547b63b1c9b9d18ed52e88a13978967c305d9170 SHA1 6ea8c02c9d9b9a7189921f635d59d1d1d625bdeb SHA256 0df76f3f491b7533fb2871862cbeea5cd3b8a666cb085786a9f93da1124e66f1
+MISC ChangeLog 3036 RMD160 3ba940c5e47a6441265477358c64c71a97e9cf30 SHA1 5f9cc6b12423a924dc8a0b0d02e7660ccd2cba8e SHA256 378d94a20ab9408120d1a0f4860d6c6c1757b52c5bee31d4cc172d200084d863
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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}