don't rdepend on nasm

9 files changed, 49 insertions, 28 deletions

diff --git a/dev-games/crystalspace-cvs/ChangeLog b/dev-games/crystalspace-cvs/ChangeLog
index 044e84fa05ce..63438ea1e957 100644
--- a/dev-games/crystalspace-cvs/ChangeLog
+++ b/dev-games/crystalspace-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/crystalspace-cvs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace-cvs/ChangeLog,v 1.3 2003/12/10 05:32:55 mr_bones_ Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace-cvs/ChangeLog,v 1.4 2004/03/31 06:55:30 mr_bones_ Exp $
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  crystalspace-cvs-0.97.ebuild:
+  don't rdepend on nasm
 
   09 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org>
   crystalspace-cvs-0.97.ebuild:
diff --git a/dev-games/crystalspace-cvs/crystalspace-cvs-0.97.ebuild b/dev-games/crystalspace-cvs/crystalspace-cvs-0.97.ebuild
index b0bce6c2c244..a39886bb9e65 100644
--- a/dev-games/crystalspace-cvs/crystalspace-cvs-0.97.ebuild
+++ b/dev-games/crystalspace-cvs/crystalspace-cvs-0.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace-cvs/crystalspace-cvs-0.97.ebuild,v 1.9 2004/02/20 07:44:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace-cvs/crystalspace-cvs-0.97.ebuild,v 1.10 2004/03/31 06:55:30 mr_bones_ Exp $
 
 inherit cvs
 ECVS_SERVER="cvs.sourceforge.net:/cvsroot/crystal"
@@ -16,7 +16,7 @@ SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="~x86 ~ppc"
 
-DEPEND=">=media-libs/libpng-1.2.1
+RDEPEND=">=media-libs/libpng-1.2.1
 	>=media-libs/jpeg-6b
 	mng? ( media-libs/libmng )
 	mikmod? ( media-libs/libmikmod )
@@ -24,12 +24,14 @@ DEPEND=">=media-libs/libpng-1.2.1
 	freetype? ( >=media-libs/freetype-2.0 )
 	openal? ( media-libs/openal )
 	zlib? ( sys-libs/zlib )
-	oggvorbis? ( >=media-libs/libogg-1.0
+	oggvorbis? (
+		>=media-libs/libogg-1.0
 		>=media-libs/libvorbis-1.0 )
-	x86? ( dev-lang/nasm )
 	dev-games/ode
 	>=dev-lang/perl-5.6.1
 	!dev-games/crystalspace"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
 
 CRYSTAL_PREFIX=/opt/crystal
 
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index b95144c4234d..d086516f9d14 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/crystalspace
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.2 2003/07/26 07:38:07 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.3 2004/03/31 06:54:36 mr_bones_ Exp $
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  crystalspace-20030413-r1.ebuild:
+  don't rdepend on nasm
 
 *crystalspace-20030413-r1 (17 Apr 2003)
 
diff --git a/dev-games/crystalspace/crystalspace-20030413-r1.ebuild b/dev-games/crystalspace/crystalspace-20030413-r1.ebuild
index 1cd59f0a81cd..fa663f155aba 100644
--- a/dev-games/crystalspace/crystalspace-20030413-r1.ebuild
+++ b/dev-games/crystalspace/crystalspace-20030413-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-20030413-r1.ebuild,v 1.11 2004/02/20 07:44:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-20030413-r1.ebuild,v 1.12 2004/03/31 06:54:36 mr_bones_ Exp $
 
 DESCRIPTION="portable 3D Game Development Kit written in C++"
 SRC_URI="mirror://gentoo/distfiles/${P}.tar.gz"
@@ -11,7 +11,7 @@ LICENSE="LGPL-2"
 KEYWORDS="x86 ppc"
 IUSE="oggvorbis mikmod openal truetype 3ds mng"
 
-DEPEND=">=media-libs/libpng-1.2.1
+RDEPEND=">=media-libs/libpng-1.2.1
 	>=media-libs/jpeg-6b
 	mng? ( media-libs/libmng )
 	mikmod? ( media-libs/libmikmod )
@@ -19,14 +19,16 @@ DEPEND=">=media-libs/libpng-1.2.1
 	truetype? ( >=media-libs/freetype-2.0 )
 	openal? ( media-libs/openal )
 	zlib? ( sys-libs/zlib )
-	oggvorbis? ( >=media-libs/libogg-1.0
+	oggvorbis? (
+		>=media-libs/libogg-1.0
 		>=media-libs/libvorbis-1.0 )
-	x86? ( dev-lang/nasm )
 	dev-games/ode
 	>=dev-lang/perl-5.6.1
 	!dev-games/crystalspace-cvs"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
 
-S=${WORKDIR}/CS
+S="${WORKDIR}/CS"
 
 CRYSTAL_PREFIX=/opt/crystal
 
diff --git a/games-action/d2x/ChangeLog b/games-action/d2x/ChangeLog
index c85840deedc6..e80bf541cb54 100644
--- a/games-action/d2x/ChangeLog
+++ b/games-action/d2x/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/d2x
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.2 2003/09/10 20:27:47 vapier Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.3 2004/03/31 06:53:08 mr_bones_ Exp $
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> d2x-0.2.5.ebuild:
+  don't rdepend on nasm
 
 *d2x-0.2.5 (19 Jul 2003)
 
diff --git a/games-action/d2x/d2x-0.2.5.ebuild b/games-action/d2x/d2x-0.2.5.ebuild
index bf0e689304f0..c77cd4089d6a 100644
--- a/games-action/d2x/d2x-0.2.5.ebuild
+++ b/games-action/d2x/d2x-0.2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5.ebuild,v 1.3 2004/03/14 18:19:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5.ebuild,v 1.4 2004/03/31 06:53:08 mr_bones_ Exp $
 
-inherit games flag-o-matic eutils
+inherit flag-o-matic eutils games
 
-DATAFILE=d2shar10
+DATAFILE="d2shar10"
 DESCRIPTION="Descent 2"
 HOMEPAGE="http://icculus.org/d2x/"
 SRC_URI="http://icculus.org/d2x/src/${P}.tar.gz
@@ -15,11 +15,12 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE="debug opengl ggi svga"
 
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	opengl? ( virtual/opengl )
 	ggi? ( media-libs/libggi )
-	svga? ( media-libs/svgalib )
+	svga? ( media-libs/svgalib )"
+DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
 src_unpack() {
diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index 8fbbbd3c7b7d..914e8208ab04 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.9 2004/03/24 06:44:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.10 2004/03/31 06:57:03 mr_bones_ Exp $
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  visualboyadvance-1.7.1.ebuild, visualboyadvance-1.7.ebuild:
+  don't rdepend on nasm
 
   23 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
   visualboyadvance-1.7.1.ebuild:
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.1.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.1.ebuild
index d1d912388588..d018d258d15a 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.1.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.1.ebuild,v 1.3 2004/03/24 06:44:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.1.ebuild,v 1.4 2004/03/31 06:57:03 mr_bones_ Exp $
 
 inherit games
 
@@ -14,11 +14,11 @@ KEYWORDS="x86 ~ppc"
 IUSE="mmx debug"
 
 RDEPEND="virtual/x11
-	mmx? ( dev-lang/nasm )
 	media-libs/libpng
 	sys-libs/zlib
 	media-libs/libsdl"
 DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )
 	>=sys-apps/sed-4"
 
 S=${WORKDIR}/VisualBoyAdvance-${PV}
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild
index d3cb75739809..b74de326998e 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild,v 1.2 2004/01/03 23:57:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.ebuild,v 1.3 2004/03/31 06:57:03 mr_bones_ Exp $
 
 inherit games
 
@@ -14,14 +14,15 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="mmx debug"
 
-DEPEND="virtual/x11
-	mmx? ( dev-lang/nasm )
+RDEPEND="virtual/x11
 	media-libs/libpng
 	sys-libs/zlib
-	media-libs/libsdl
+	media-libs/libsdl"
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )
 	>=sys-apps/sed-4"
 
-S=${WORKDIR}/VisualBoyAdvance-${PV}
+S="${WORKDIR}/VisualBoyAdvance-${PV}"
 
 src_unpack() {
 	unpack ${A}