nasm version bump and cleanup directory

13 files changed, 17 insertions, 268 deletions

diff --git a/dev-lang/nasm/ChangeLog b/dev-lang/nasm/ChangeLog
index 611ada6fbb37..a5194a400458 100644
--- a/dev-lang/nasm/ChangeLog
+++ b/dev-lang/nasm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2003/07/11 22:14:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.18 2003/08/30 13:47:34 hanno Exp $
+
+*nasm-0.98.37 (30 Aug 2003)
+
+  30 Aug 2003; Hanno Boeck <hanno@gentoo.org> nasm-0.98.37.ebuild:
+  Version bump.
 
 *nasm-0.98.36 (24 Mar 2003)
 
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index dce60e025176..4006cb03128f 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,14 +1,6 @@
-MD5 145a1d0112ff0d7d29702adf8607e499 nasm-0.98.34.ebuild 1201
 MD5 5092af3b59c30d3d170e89afb8401a01 nasm-0.98.36.ebuild 1193
-MD5 b01384e06973d2a0c0281906ed1d4d62 nasm-0.98.31.ebuild 1041
-MD5 03fc8df46256967dc0457e5f8c1c221e ChangeLog 3008
-MD5 03cc9f0067518cdf151b8cd73a17b157 nasm-0.98.31-r1.ebuild 1206
-MD5 87e159d87dfea66cf5b601332b349408 nasm-0.98.35.ebuild 1193
-MD5 88550348598115ac7f0345ed60988c29 files/nasm-0.98.36-remove-doc-target.diff 958
-MD5 88550348598115ac7f0345ed60988c29 files/nasm-0.98.34-remove-doc-target.diff 958
-MD5 597ddc8138bf06fb90db7d65638e27f6 files/nasm-0.98.31-remove-doc-target.diff 992
-MD5 fda6f3dd541712ca2af1af3182127f5d files/digest-nasm-0.98.31 65
-MD5 98e68992e4fe3df00e1c1a44a8b33680 files/digest-nasm-0.98.34 65
-MD5 ba287fbc5833532a1799d5cbd953d826 files/digest-nasm-0.98.35 65
+MD5 4101290710fbd21796ca972650a7cab5 nasm-0.98.37.ebuild 1195
+MD5 d70d00b3f2a35b4354d38fca2b1e3052 ChangeLog 3122
 MD5 a8068e96360f80d35fcdc23d81852269 files/digest-nasm-0.98.36 65
-MD5 fda6f3dd541712ca2af1af3182127f5d files/digest-nasm-0.98.31-r1 65
+MD5 c630822366bb6f18444c619566a4831b files/digest-nasm-0.98.37 65
+MD5 88550348598115ac7f0345ed60988c29 files/nasm-0.98.36-remove-doc-target.diff 958
diff --git a/dev-lang/nasm/files/digest-nasm-0.98.31 b/dev-lang/nasm/files/digest-nasm-0.98.31
deleted file mode 100644
index ddff4e89d954..000000000000
--- a/dev-lang/nasm/files/digest-nasm-0.98.31
+++ /dev/null
@@ -1 +0,0 @@
-MD5 29fd6a8fde4fbd8d6dbd57413d0532cb nasm-0.98.31.tar.bz2 474473
diff --git a/dev-lang/nasm/files/digest-nasm-0.98.31-r1 b/dev-lang/nasm/files/digest-nasm-0.98.31-r1
deleted file mode 100644
index ddff4e89d954..000000000000
--- a/dev-lang/nasm/files/digest-nasm-0.98.31-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 29fd6a8fde4fbd8d6dbd57413d0532cb nasm-0.98.31.tar.bz2 474473
diff --git a/dev-lang/nasm/files/digest-nasm-0.98.34 b/dev-lang/nasm/files/digest-nasm-0.98.34
deleted file mode 100644
index dcb7ec53f013..000000000000
--- a/dev-lang/nasm/files/digest-nasm-0.98.34
+++ /dev/null
@@ -1 +0,0 @@
-MD5 11689ffb9b7ab0bb3432e76bfc1d292e nasm-0.98.34.tar.bz2 517229
diff --git a/dev-lang/nasm/files/digest-nasm-0.98.35 b/dev-lang/nasm/files/digest-nasm-0.98.35
deleted file mode 100644
index b3acb8fee3c7..000000000000
--- a/dev-lang/nasm/files/digest-nasm-0.98.35
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d62dd9e551016322ba0ce9c895644585 nasm-0.98.35.tar.bz2 518381
diff --git a/dev-lang/nasm/files/digest-nasm-0.98.37 b/dev-lang/nasm/files/digest-nasm-0.98.37
new file mode 100644
index 000000000000..98d461ad2e81
--- /dev/null
+++ b/dev-lang/nasm/files/digest-nasm-0.98.37
@@ -0,0 +1 @@
+MD5 dbb9c410bfcf5cd0ccf6f71963d66abc nasm-0.98.37.tar.bz2 536545
diff --git a/dev-lang/nasm/files/nasm-0.98.31-remove-doc-target.diff b/dev-lang/nasm/files/nasm-0.98.31-remove-doc-target.diff
deleted file mode 100644
index 2ceaad5b7e1e..000000000000
--- a/dev-lang/nasm/files/nasm-0.98.31-remove-doc-target.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.in.orig	Mon May  6 02:48:07 2002
-+++ Makefile.in	Sat May 18 19:32:52 2002
-@@ -26,8 +26,8 @@
- 
- .SUFFIXES: .c .i .s .o .1 .man
- 
--.PHONY: all doc rdf install clean distclean cleaner spotless install_rdf
--.PHONY: install_doc everything install_everything strip perlreq dist
-+.PHONY: all rdf install clean distclean cleaner spotless install_rdf
-+.PHONY: everything install_everything strip perlreq dist
- 
- .c.o:
- 	$(CC) -c $(CFLAGS) -o $@ $<
-@@ -133,7 +133,6 @@
- cleaner: clean
- 	rm -f insnsa.c insnsd.c insnsi.h insnsn.c macros.c *.man
- 	rm -f nasm.spec
--	cd doc && $(MAKE) clean
- 
- spotless: distclean cleaner
- 
-@@ -146,15 +145,9 @@
- rdf_install install_rdf:
- 	cd rdoff && $(MAKE) install
- 
--doc:
--	cd doc && $(MAKE) all
-+everything: all rdf
- 
--doc_install install_doc:
--	cd doc && $(MAKE) install
--
--everything: all doc rdf
--
--install_everything: everything install install_doc install_rdf
-+install_everything: everything install install_rdf
- 
- dist: spotless perlreq
- 	autoconf
diff --git a/dev-lang/nasm/files/nasm-0.98.34-remove-doc-target.diff b/dev-lang/nasm/files/nasm-0.98.34-remove-doc-target.diff
deleted file mode 100644
index 4d8c8f4565dc..000000000000
--- a/dev-lang/nasm/files/nasm-0.98.34-remove-doc-target.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.in.orig	Sun Sep  8 03:43:30 2002
-+++ Makefile.in	Sun Sep  8 03:46:45 2002
-@@ -32,8 +32,8 @@
- 
- .SUFFIXES: .c .i .s .$(O) .1 .man
- 
--.PHONY: all doc rdf install clean distclean cleaner spotless install_rdf
--.PHONY: install_doc everything install_everything strip perlreq dist
-+.PHONY: all rdf install clean distclean cleaner spotless install_rdf
-+.PHONY: everything install_everything strip perlreq dist
- 
- .c.$(O):
- 	$(CC) -c $(CFLAGS) -o $@ $<
-@@ -135,7 +135,6 @@
- 
- cleaner: clean
- 	rm -f $(PERLREQ) *.man nasm.spec
--	cd doc && $(MAKE) clean
- 
- spotless: distclean cleaner
- 
-@@ -148,15 +147,9 @@
- rdf_install install_rdf:
- 	cd rdoff && $(MAKE) install
- 
--doc:
--	cd doc && $(MAKE) all
-+everything: all rdf
- 
--doc_install install_doc:
--	cd doc && $(MAKE) install
--
--everything: all doc rdf
--
--install_everything: everything install install_doc install_rdf
-+install_everything: everything install install_rdf
- 
- dist: spotless perlreq
- 	autoconf
diff --git a/dev-lang/nasm/nasm-0.98.31-r1.ebuild b/dev-lang/nasm/nasm-0.98.31-r1.ebuild
deleted file mode 100644
index dd67040471c5..000000000000
--- a/dev-lang/nasm/nasm-0.98.31-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.13 2003/03/25 18:00:44 carpaski Exp $
-
-IUSE="doc build"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="groovy little assembler"
-SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
-HOMEPAGE="http://nasm.sourceforge.net/"
-
-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 "
-
-src_unpack() {
-
-	cd ${WORKDIR}
-	unpack ${A}
-
-	if [ -z "`use doc`" ]; then
-		cd ${S}
-		patch -p0 < ${FILESDIR}/${P}-remove-doc-target.diff
-	fi
-
-}
-
-src_compile() {			   
-
-	./configure --prefix=/usr || die
-
-	if [ "`use build`" ]; then
-		make nasm 
-	else
-		make everything || die
-	fi
-	
-}
-
-src_install() {
-
-	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.*
-		fi
-	fi
-
-}
diff --git a/dev-lang/nasm/nasm-0.98.31.ebuild b/dev-lang/nasm/nasm-0.98.31.ebuild
deleted file mode 100644
index 4be8d65ee574..000000000000
--- a/dev-lang/nasm/nasm-0.98.31.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.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 !build? ( dev-lang/perl )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 -ppc -sparc "
-
-src_compile() {			   
-	./configure --prefix=/usr || die
-
-	if [ "`use build`" ]; then
-		make nasm
-	else
-		make || die
-		cd doc
-		make || die
-	fi
-}
-
-src_install() {
-	if [ "`use build`" ]; then
-		dobin nasm
-	else
-		dobin nasm ndisasm
-		dobin rdoff/ldrdf rdoff/rdf2bin rdoff/rdfdump rdoff/rdflib rdoff/rdx
-		doman nasm.1 ndisasm.1
-		dodoc COPYING Changes Licence MODIFIED Readme Wishlist
-		docinto txt
-		cd doc
-		dodoc nasmdoc.txt
-		dohtml html/*.html
-		docinto ps
-		dodoc nasmdoc.ps
-		docinto rtf
-		dodoc nasmdoc.rtf
-
-		doinfo info/*.info*
-	fi
-}
diff --git a/dev-lang/nasm/nasm-0.98.34.ebuild b/dev-lang/nasm/nasm-0.98.34.ebuild
deleted file mode 100644
index 80d2cb2a075f..000000000000
--- a/dev-lang/nasm/nasm-0.98.34.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.9 2003/07/22 18:35:01 tester Exp $
-
-IUSE="doc build"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="groovy little assembler"
-SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
-HOMEPAGE="http://nasm.sourceforge.net/"
-
-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 amd64"
-
-src_unpack() {
-
-	cd ${WORKDIR}
-	unpack ${A}
-
-	if [ -z "`use doc`" ]; then
-		cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-remove-doc-target.diff
-	fi
-
-}
-
-src_compile() {			   
-
-	./configure --prefix=/usr || die
-
-	if [ "`use build`" ]; then
-		make nasm 
-	else
-		make everything || die
-	fi
-	
-}
-
-src_install() {
-
-	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.*
-	fi
-	fi
-
-}
diff --git a/dev-lang/nasm/nasm-0.98.35.ebuild b/dev-lang/nasm/nasm-0.98.37.ebuild
index d649b43026b3..2be5f9dd4d28 100644
--- a/dev-lang/nasm/nasm-0.98.35.ebuild
+++ b/dev-lang/nasm/nasm-0.98.37.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.3 2003/07/11 22:14:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.37.ebuild,v 1.1 2003/08/30 13:47:34 hanno Exp $
 
 IUSE="doc build"
 
@@ -15,7 +15,7 @@ DEPEND="!build? ( dev-lang/perl )
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 -ppc -sparc -alpha"
+KEYWORDS="~x86 -ppc -sparc -alpha"
 
 src_unpack() {
 
@@ -24,21 +24,21 @@ src_unpack() {
 
 	if [ -z "`use doc`" ]; then
 		cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-remove-doc-target.diff
+	patch -p0 < ${FILESDIR}/nasm-0.98.36-remove-doc-target.diff
 	fi
 
 }
 
-src_compile() {			   
+src_compile() {
 
 	./configure --prefix=/usr || die
 
 	if [ "`use build`" ]; then
-		make nasm 
+		make nasm
 	else
 		make everything || die
 	fi
-	
+
 }
 
 src_install() {