build? --> !build?

6 files changed, 34 insertions, 26 deletions

diff --git a/dev-lang/nasm/ChangeLog b/dev-lang/nasm/ChangeLog
index 3c09841bdb4c..2f0bbc36d796 100644
--- a/dev-lang/nasm/ChangeLog
+++ b/dev-lang/nasm/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for dev-lang/nasm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.15 2003/03/24 22:03:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.16 2003/03/25 18:00:44 carpaski Exp $
 
 *nasm-0.98.36 (24 Mar 2003)
 
+	25 Mar 2003; Nicholas Jones <carpaski@gentoo.org> .ebuild:
+	Fixing improper dependencies. build? in this case.
+
   24 Mar 2003; Aron Griffis <agriffis@gentoo.org> nasm-0.98.35.ebuild,
   nasm-0.98.36.ebuild:
   Update to recent version. Thanks to Michael Sterrett for the heads-up in bug
@@ -13,6 +16,9 @@
  
 *nasm-0.98.34 (08 Sep 2002)
 
+	25 Mar 2003; Nicholas Jones <carpaski@gentoo.org> .ebuild:
+	Fixing improper dependencies. build? in this case.
+
   15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nasm-0.98.34.ebuild :
   Add -alpha to KEYWORDS
   
@@ -21,6 +27,9 @@
 
 *nasm-0.98.31-r1 (18 May 2002)
 
+	25 Mar 2003; Nicholas Jones <carpaski@gentoo.org> .ebuild:
+	Fixing improper dependencies. build? in this case.
+
   05 Sep 2002; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
 
   cleaned out old ebuilds, and tagged the remaining ones x86 only.
@@ -31,6 +40,9 @@
 
 *nasm-0.98.31 (17 May 2002)
 
+	25 Mar 2003; Nicholas Jones <carpaski@gentoo.org> .ebuild:
+	Fixing improper dependencies. build? in this case.
+
   20 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
   Updated HOMEPAGE variable
 
diff --git a/dev-lang/nasm/nasm-0.98.31-r1.ebuild b/dev-lang/nasm/nasm-0.98.31-r1.ebuild
index 2b0835a7662c..dd67040471c5 100644
--- a/dev-lang/nasm/nasm-0.98.31-r1.ebuild
+++ b/dev-lang/nasm/nasm-0.98.31-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.31-r1.ebuild,v 1.12 2003/03/11 21:11:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.31-r1.ebuild,v 1.13 2003/03/25 18:00:44 carpaski Exp $
 
 IUSE="doc build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="groovy little assembler"
 SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
 
-DEPEND="build? ( dev-lang/perl )
+DEPEND="!build? ( dev-lang/perl )
 	doc? ( app-text/ghostscript sys-apps/texinfo )
 	sys-devel/gcc"
 
@@ -24,7 +24,7 @@ src_unpack() {
 
 	if [ -z "`use doc`" ]; then
 		cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-remove-doc-target.diff
+		patch -p0 < ${FILESDIR}/${P}-remove-doc-target.diff
 	fi
 
 }
@@ -44,17 +44,17 @@ src_compile() {
 src_install() {
 
 	if [ "`use build`" ]; then
-	dobin nasm
+		dobin nasm
 	else
-	dobin nasm ndisasm rdoff/{ldrdf,rdf2bin,rdf2ihx,rdfdump,rdflib,rdx}
-	dosym /usr/bin/rdf2bin /usr/bin/rdf2com
-	doman nasm.1 ndisasm.1
-	dodoc AUTHORS CHANGES COPYING ChangeLog INSTALL README TODO
-	if [ -n "`use doc`" ]; then
-		doinfo doc/info/*
-		dohtml doc/html/*
-		dodoc doc/nasmdoc.*
-	fi
+		dobin nasm ndisasm rdoff/{ldrdf,rdf2bin,rdf2ihx,rdfdump,rdflib,rdx}
+		dosym /usr/bin/rdf2bin /usr/bin/rdf2com
+		doman nasm.1 ndisasm.1
+		dodoc AUTHORS CHANGES COPYING ChangeLog INSTALL README TODO
+		if [ -n "`use doc`" ]; then
+			doinfo doc/info/*
+			dohtml doc/html/*
+			dodoc doc/nasmdoc.*
+		fi
 	fi
 
 }
diff --git a/dev-lang/nasm/nasm-0.98.31.ebuild b/dev-lang/nasm/nasm-0.98.31.ebuild
index 54321bc61dbe..4be8d65ee574 100644
--- a/dev-lang/nasm/nasm-0.98.31.ebuild
+++ b/dev-lang/nasm/nasm-0.98.31.ebuild
@@ -1,17 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.31.ebuild,v 1.11 2003/03/11 21:11:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.31.ebuild,v 1.12 2003/03/25 18:00:44 carpaski Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="groovy little assembler"
 SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
 
-DEPEND="virtual/glibc sys-apps/texinfo"
-
-if [ -z "`use build`" ]; then
-	DEPEND="${DEPEND} dev-lang/perl"
-fi
+DEPEND="virtual/glibc sys-apps/texinfo !build? ( dev-lang/perl )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
diff --git a/dev-lang/nasm/nasm-0.98.34.ebuild b/dev-lang/nasm/nasm-0.98.34.ebuild
index 0192ce6db7c4..f6477118b833 100644
--- a/dev-lang/nasm/nasm-0.98.34.ebuild
+++ b/dev-lang/nasm/nasm-0.98.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.34.ebuild,v 1.7 2003/03/11 21:11:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.34.ebuild,v 1.8 2003/03/25 18:00:44 carpaski Exp $
 
 IUSE="doc build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="groovy little assembler"
 SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
 
-DEPEND="build? ( dev-lang/perl )
+DEPEND="!build? ( dev-lang/perl )
 	doc? ( app-text/ghostscript sys-apps/texinfo )
 	sys-devel/gcc"
 
diff --git a/dev-lang/nasm/nasm-0.98.35.ebuild b/dev-lang/nasm/nasm-0.98.35.ebuild
index 883836454d3f..8ce70967bfd7 100644
--- a/dev-lang/nasm/nasm-0.98.35.ebuild
+++ b/dev-lang/nasm/nasm-0.98.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.35.ebuild,v 1.1 2003/03/24 22:03:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.35.ebuild,v 1.2 2003/03/25 18:00:44 carpaski Exp $
 
 IUSE="doc build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="groovy little assembler"
 SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
 
-DEPEND="build? ( dev-lang/perl )
+DEPEND="!build? ( dev-lang/perl )
 	doc? ( app-text/ghostscript sys-apps/texinfo )
 	sys-devel/gcc"
 
diff --git a/dev-lang/nasm/nasm-0.98.36.ebuild b/dev-lang/nasm/nasm-0.98.36.ebuild
index 224a6730b390..be8601a44e0d 100644
--- a/dev-lang/nasm/nasm-0.98.36.ebuild
+++ b/dev-lang/nasm/nasm-0.98.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.36.ebuild,v 1.1 2003/03/24 22:03:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.36.ebuild,v 1.2 2003/03/25 18:00:44 carpaski Exp $
 
 IUSE="doc build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="groovy little assembler"
 SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
 
-DEPEND="build? ( dev-lang/perl )
+DEPEND="!build? ( dev-lang/perl )
 	doc? ( app-text/ghostscript sys-apps/texinfo )
 	sys-devel/gcc"