tidy; sed in src_unpack, not src_compile

Package-Manager: portage-2.0.51.19

4 files changed, 26 insertions, 14 deletions

diff --git a/dev-lang/nasm/ChangeLog b/dev-lang/nasm/ChangeLog
index be7d6d89f37f..5b49ac9fcbb6 100644
--- a/dev-lang/nasm/ChangeLog
+++ b/dev-lang/nasm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/nasm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.32 2005/04/11 05:57:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.33 2005/05/09 21:07:29 mr_bones_ Exp $
+
+  09 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  nasm-0.98.38-r1.ebuild, nasm-0.98.39.ebuild:
+  tidy; sed in src_unpack, not src_compile
 
   11 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org> nasm-0.98.39.ebuild:
   stable for x86
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index e7f8e3e02c8a..155d65242e3f 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,7 +1,7 @@
-MD5 b02d051fa9fa416be2221f1fead76203 nasm-0.98.38-r1.ebuild 1281
+MD5 3e974ea497d6358e1a36e51c95f01ad8 nasm-0.98.38-r1.ebuild 1281
 MD5 8524fffd916a234a0fa40149506746ee metadata.xml 738
-MD5 7c773e2db84a971ea6fbf4afdc109896 nasm-0.98.39.ebuild 1288
-MD5 fe6961079899fa1da369bda206f5553b ChangeLog 4726
+MD5 c23802d24d63f6497c134fe024345f0a nasm-0.98.39.ebuild 1337
+MD5 bd5ce6bf161df4b821c1e7ef5e80f0f0 ChangeLog 4872
 MD5 0de637127f4fc709e07c5505573c4887 files/0.98.38-overflow.patch 13476
 MD5 98c253856c4823fdfe9095d900744ff6 files/digest-nasm-0.98.39 65
 MD5 988e60ffeb3fbb254a0b1537789b69bb files/digest-nasm-0.98.38-r1 65
diff --git a/dev-lang/nasm/nasm-0.98.38-r1.ebuild b/dev-lang/nasm/nasm-0.98.38-r1.ebuild
index 60b22e4baac7..9e31c24b41f0 100644
--- a/dev-lang/nasm/nasm-0.98.38-r1.ebuild
+++ b/dev-lang/nasm/nasm-0.98.38-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.38-r1.ebuild,v 1.3 2005/02/01 07:16:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.38-r1.ebuild,v 1.4 2005/05/09 21:07:29 mr_bones_ Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* amd64 x86"
 IUSE="doc build"
 
 DEPEND="!build? ( dev-lang/perl )
diff --git a/dev-lang/nasm/nasm-0.98.39.ebuild b/dev-lang/nasm/nasm-0.98.39.ebuild
index 14377d0d4755..4d42d41f78ae 100644
--- a/dev-lang/nasm/nasm-0.98.39.ebuild
+++ b/dev-lang/nasm/nasm-0.98.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.39.ebuild,v 1.3 2005/04/11 05:57:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.39.ebuild,v 1.4 2005/05/09 21:07:29 mr_bones_ Exp $
 
 inherit toolchain-funcs
 
@@ -17,24 +17,32 @@ DEPEND="!build? ( dev-lang/perl )
 	doc? ( virtual/ghostscript
 		sys-apps/texinfo )
 	sys-devel/gcc"
-RDEPEND="virtual/libc"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if [ "$(gcc-major-version)" -eq "2" ] ; then
+		sed -i \
+			-e 's:-std=c99::g' \
+			configure \
+			|| die "sed failed"
+	fi
 
-src_compile() {
-	[ "$(gcc-major-version)" -eq "2" ] && \
-		sed -i -e 's:-std=c99::g' ${S}/configure
+}
 
-	./configure --prefix=/usr || die
+src_compile() {
+	econf || die
 
 	if use build; then
 		emake nasm || die "emake failed"
 	else
 		emake all || die "emake failed"
 		emake rdf || die "emake failed"
-		if use doc; then
+		if use doc ; then
 			emake doc || die "emake failed"
 		fi
 	fi
-
 }
 
 src_install() {