summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2005-05-09 21:07:29 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2005-05-09 21:07:29 +0000
commita3c7cc750160da05f222f99b65697fba0a933a55 (patch)
tree0f2a9aee04fd289e1f9c5861a88302d8e7f7263c /dev-lang/nasm
parentmask links-2.1_pre17-r1 (diff)
downloadgentoo-2-a3c7cc750160da05f222f99b65697fba0a933a55.tar.gz
gentoo-2-a3c7cc750160da05f222f99b65697fba0a933a55.tar.bz2
gentoo-2-a3c7cc750160da05f222f99b65697fba0a933a55.zip
tidy; sed in src_unpack, not src_compile
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-lang/nasm')
-rw-r--r--dev-lang/nasm/ChangeLog6
-rw-r--r--dev-lang/nasm/nasm-0.98.38-r1.ebuild4
-rw-r--r--dev-lang/nasm/nasm-0.98.39.ebuild24
3 files changed, 23 insertions, 11 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/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() {