touchups

2 files changed, 42 insertions, 64 deletions

diff --git a/dev-lang/nasm/nasm-0.98.36.ebuild b/dev-lang/nasm/nasm-0.98.36.ebuild
index ac5b01024fd0..9c631d72ab06 100644
--- a/dev-lang/nasm/nasm-0.98.36.ebuild
+++ b/dev-lang/nasm/nasm-0.98.36.ebuild
@@ -1,40 +1,31 @@
 # 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.3 2003/07/11 22:14:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.36.ebuild,v 1.4 2003/09/05 13:22:04 vapier Exp $
 
-IUSE="doc build"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="groovy little assembler"
-SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE="doc build"
 
 DEPEND="!build? ( dev-lang/perl )
 	doc? ( app-text/ghostscript sys-apps/texinfo )
 	sys-devel/gcc"
 
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
 src_unpack() {
-
-	cd ${WORKDIR}
 	unpack ${A}
 
-	if [ -z "`use doc`" ]; then
-		cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-remove-doc-target.diff
-	fi
-
+	[ -z "`use doc`" ] && cd ${S} && epatch ${FILESDIR}/${P}-remove-doc-target.diff
 }
 
-src_compile() {			   
-
+src_compile() {
 	./configure --prefix=/usr || die
 
-	if [ "`use build`" ]; then
-		make nasm 
+	if [ `use build` ] ; then
+		make nasm
 	else
 		make everything || die
 	fi
@@ -42,19 +33,17 @@ src_compile() {
 }
 
 src_install() {
-
-	if [ "`use build`" ]; then
-	dobin nasm
+	if [ `use build` ] ; then
+		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.*
+		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 [ `use doc` ] ; then
+			doinfo doc/info/*
+			dohtml doc/html/*
+			dodoc doc/nasmdoc.*
+		fi
 	fi
-	fi
-
 }
diff --git a/dev-lang/nasm/nasm-0.98.37.ebuild b/dev-lang/nasm/nasm-0.98.37.ebuild
index 2be5f9dd4d28..6d5862c22cef 100644
--- a/dev-lang/nasm/nasm-0.98.37.ebuild
+++ b/dev-lang/nasm/nasm-0.98.37.ebuild
@@ -1,39 +1,30 @@
 # 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.37.ebuild,v 1.1 2003/08/30 13:47:34 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.37.ebuild,v 1.2 2003/09/05 13:22:04 vapier Exp $
 
-IUSE="doc build"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="groovy little assembler"
-SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="doc build"
 
 DEPEND="!build? ( dev-lang/perl )
 	doc? ( app-text/ghostscript sys-apps/texinfo )
 	sys-devel/gcc"
 
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-
 src_unpack() {
-
-	cd ${WORKDIR}
 	unpack ${A}
 
-	if [ -z "`use doc`" ]; then
-		cd ${S}
-	patch -p0 < ${FILESDIR}/nasm-0.98.36-remove-doc-target.diff
-	fi
-
+	[ -z "`use doc`" ] && cd ${S} && epatch ${FILESDIR}/nasm-0.98.36-remove-doc-target.diff
 }
 
 src_compile() {
-
 	./configure --prefix=/usr || die
 
-	if [ "`use build`" ]; then
+	if [ `use build` ] ; then
 		make nasm
 	else
 		make everything || die
@@ -42,19 +33,17 @@ src_compile() {
 }
 
 src_install() {
-
-	if [ "`use build`" ]; then
-	dobin nasm
+	if [ `use build` ] ; then
+		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.*
+		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 [ `use doc` ] ; then
+			doinfo doc/info/*
+			dohtml doc/html/*
+			dodoc doc/nasmdoc.*
+		fi
 	fi
-	fi
-
 }