touchups

2 files changed, 23 insertions, 46 deletions

diff --git a/app-sci/spice/spice-3.5.5.ebuild b/app-sci/spice/spice-3.5.5.ebuild
index 19bd8bca0e3b..eb66c56648ac 100644
--- a/app-sci/spice/spice-3.5.5.ebuild
+++ b/app-sci/spice/spice-3.5.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/spice/spice-3.5.5.ebuild,v 1.4 2003/02/13 09:26:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/spice/spice-3.5.5.ebuild,v 1.5 2003/03/01 03:43:38 vapier Exp $
 
 MY_P="spice3f5sfix"
-DESCRIPTION="SPICE 3 is a general-purpose circuit simulation program"
+DESCRIPTION="general-purpose circuit simulation program"
 HOMEPAGE="http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/apps/circuits/${MY_P}.tar.gz"
 
@@ -13,37 +13,35 @@ KEYWORDS="x86"
 
 DEPEND="virtual/glibc
 	sys-libs/ncurses"
+
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A} ; cd ${S}/conf
-	sed -e "s:termcap:ncurses:g" linux > linux.1
-	sed -e "s:joe:emacs:g" linux.1 > linux.2
-	sed -e "s:-O2 -s:${CFLAGS}:g" linux.2 > linux.3
-	sed -e "s:SPICE_DIR)/lib:SPICE_DIR)/lib/spice:g" linux.3 > linux.4
-	sed -e "s:/usr/local/spice:/usr:g" linux.4 > linux
+	cp linux{,.orig}
+	sed -e "s:termcap:ncurses:g" \
+		-e "s:joe:emacs:g" \
+		-e "s:-O2 -s:${CFLAGS}:g" \
+		-e "s:SPICE_DIR)/lib:SPICE_DIR)/lib/spice:g" \
+		-e "s:/usr/local/spice:/usr:g" \
+		linux.orig > linux
 }
 
 src_compile() {
-	./util/build linux
-	obj/bin/makeidx lib/helpdir/spice.txt
+	./util/build linux || die
+	obj/bin/makeidx lib/helpdir/spice.txt || die
 }
 
 src_install() {
 	# install binaries
-	install -d ${D}/usr/bin
-	install -s obj/bin/spice3 ${D}/usr/bin
+	dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod}
+	newbin obj/bin/help spice.help
 	dosym /usr/bin/spice3 /usr/bin/spice
-	install -s obj/bin/help ${D}/usr/bin/spice.help
-	install -s obj/bin/nutmeg ${D}/usr/bin
-	install -s obj/bin/sconvert ${D}/usr/bin
-	install -s obj/bin/multidec ${D}/usr/bin
-	install -s obj/bin/proc2mod ${D}/usr/bin
 	# install runtime stuff
 	rm -f lib/make*
 	dodir /usr/lib/spice
 	cp -R lib/* ${D}/usr/lib/spice/
 	# install docs
-	doman man/man1/*
+	doman man/man1/*.1
 	dodoc doc readme readme.Linux notes/spice2
 }
diff --git a/app-sci/units/units-1.74.ebuild b/app-sci/units/units-1.74.ebuild
index 98338c2acbbb..327ea0db8d0f 100644
--- a/app-sci/units/units-1.74.ebuild
+++ b/app-sci/units/units-1.74.ebuild
@@ -1,11 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/units/units-1.74.ebuild,v 1.8 2003/02/13 09:26:28 vapier Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Units is a program for units conversion and units calculation."
+# $Header: /var/cvsroot/gentoo-x86/app-sci/units/units-1.74.ebuild,v 1.9 2003/03/01 03:48:26 vapier Exp $
 
+DESCRIPTION="program for units conversion and units calculation"
 SRC_URI="ftp://ftp.gnu.org/gnu/units/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/units/units.html"
 
@@ -14,33 +11,15 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 
 DEPEND=">=sys-libs/readline-4.1-r2
-		>=sys-libs/ncurses-5.2-r3"
-
+	>=sys-libs/ncurses-5.2-r3"
 
 src_compile() {
-    
-#Note: the trailing / is required in the datadir path.
-	./configure --infodir=/usr/share/info \
-				--mandir=/usr/share/man \
-				--datadir=/usr/share/${PN}/ \
-				--prefix=/usr \
-				--host=${CHOST} || die "./configure failed"
-	
+	#Note: the trailing / is required in the datadir path.
+	econf --datadir=/usr/share/${PN}/ || die
 	emake || die
-
 }
 
-src_install () {
-	
-#Note: the trailing / is required in the datadir path.
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share/${PN}/ \
-		install || die
-	
-dodoc COPYING ChangeLog INSTALL NEWS README 
-
+src_install() {
+	einstall datadir=${D}/usr/share/${PN}/ || die
+	dodoc ChangeLog NEWS README 
 }
-