summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Griffis <agriffis@gentoo.org>2004-06-05 14:34:23 +0000
committerAron Griffis <agriffis@gentoo.org>2004-06-05 14:34:23 +0000
commit01f2e3c2acd1850a15afb2d58bd0f0f182784733 (patch)
tree9c9af6dcbdb1b18b04b0def727fe3338100cd119 /dev-lang/nasm
parentStable on alpha. (diff)
downloadhistorical-01f2e3c2acd1850a15afb2d58bd0f0f182784733.tar.gz
historical-01f2e3c2acd1850a15afb2d58bd0f0f182784733.tar.bz2
historical-01f2e3c2acd1850a15afb2d58bd0f0f182784733.zip
Use make rules instead of applying a useless patch.
Diffstat (limited to 'dev-lang/nasm')
-rw-r--r--dev-lang/nasm/ChangeLog5
-rw-r--r--dev-lang/nasm/Manifest6
-rw-r--r--dev-lang/nasm/nasm-0.98.38.ebuild22
3 files changed, 17 insertions, 16 deletions
diff --git a/dev-lang/nasm/ChangeLog b/dev-lang/nasm/ChangeLog
index 6ed571b6ad64..209354640450 100644
--- a/dev-lang/nasm/ChangeLog
+++ b/dev-lang/nasm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/nasm
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.25 2004/05/11 09:23:18 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.26 2004/06/05 14:34:23 agriffis Exp $
+
+ 05 Jun 2004; Aron Griffis <agriffis@gentoo.org> nasm-0.98.38.ebuild:
+ Use make rules instead of applying a useless patch.
11 May 2004; Travis Tilley <lv@gentoo.org> nasm-0.98.38.ebuild:
added ~amd64 keyword
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 5530dc66d962..f8cf3739fa09 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,6 +1,6 @@
-MD5 1600b1d27d1723c1c161bb9c8476dd07 nasm-0.98.36.ebuild 1105
-MD5 242258858ad7acda001ea50651ca5745 nasm-0.98.38.ebuild 1138
-MD5 965eb91146a3d3a6923cd9d1ae9dfee1 ChangeLog 3825
+MD5 d8b4ccb7dfb90df7298758f95b355197 nasm-0.98.36.ebuild 1104
+MD5 4f363bc41a68a6fdbe5dac48a7da0fa3 nasm-0.98.38.ebuild 1049
+MD5 e72760ec7b4eaeab470819b833e29219 ChangeLog 3956
MD5 8524fffd916a234a0fa40149506746ee metadata.xml 738
MD5 88550348598115ac7f0345ed60988c29 files/nasm-0.98.36-remove-doc-target.diff 958
MD5 a8068e96360f80d35fcdc23d81852269 files/digest-nasm-0.98.36 65
diff --git a/dev-lang/nasm/nasm-0.98.38.ebuild b/dev-lang/nasm/nasm-0.98.38.ebuild
index 2831a8d18a3b..79d6035ceec6 100644
--- a/dev-lang/nasm/nasm-0.98.38.ebuild
+++ b/dev-lang/nasm/nasm-0.98.38.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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.38.ebuild,v 1.5 2004/05/11 09:23:18 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.38.ebuild,v 1.6 2004/06/05 14:34:23 agriffis Exp $
inherit eutils
@@ -17,31 +17,29 @@ DEPEND="!build? ( dev-lang/perl )
doc? ( virtual/ghostscript sys-apps/texinfo )
sys-devel/gcc"
-src_unpack() {
- unpack ${A}
-
- [ -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
- make nasm
+ if use build; then
+ make nasm || die
else
- make everything || die
+ make all rdf || die
+ if use doc; then
+ make doc || die
+ fi
fi
+
}
src_install() {
- if [ `use build` ] ; then
+ 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 ChangeLog INSTALL README TODO
- if [ `use doc` ] ; then
+ if use doc; then
doinfo doc/info/*
dohtml doc/html/*
dodoc doc/nasmdoc.*