cleanup

5 files changed, 46 insertions, 92 deletions

diff --git a/sys-apps/mkisofs/files/digest-mkisofs-1.13-r1 b/sys-apps/mkisofs/files/digest-mkisofs-1.13-r1
deleted file mode 100644
index c8ab7499e21d..000000000000
--- a/sys-apps/mkisofs/files/digest-mkisofs-1.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8d802d9f5892c214562c6af71e6a5714 mkisofs-1.13.tar.gz 772176
diff --git a/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild b/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild
deleted file mode 100644
index 2cab73994bfd..000000000000
--- a/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild,v 1.3 2000/09/15 20:09:20 drobbins Exp $
-
-P=mkisofs-1.13
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Prints out location of specified executables that are in your path"
-SRC_URI="ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/$A"
-HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/mkisofs.html"
-
-src_compile() {                           
-    try make
-}
-
-src_install() {                               
-    into /usr
-    dobin mkisofs/OBJ/i686-linux-cc/mkisofs
-    dobin mkisofs/diag/OBJ/i686-linux-cc/devdump
-    dobin mkisofs/diag/OBJ/i686-linux-cc/isodump
-    dobin mkisofs/diag/OBJ/i686-linux-cc/isoinfo
-    dobin mkisofs/diag/OBJ/i686-linux-cc/isovfy
-    doman mkisofs/mkisofs.8 mkisofs/mkhybrid.8 mkisofs/apple_driver.8
-    doman mkisofs/diag/isoinfo.8
-    dodoc ABOUT BUILD COMPILE COPYING MKNOD* PORTING README*
-    docinto mkisofs
-    dodoc mkisofs/ChangeLog
-    dodoc mkisofs/README* mkisofs/TODO
-}
-
-
diff --git a/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild b/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild
index 37115984a586..304a032bc959 100644
--- a/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild
+++ b/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild
@@ -1,42 +1,34 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild,v 1.1 2001/08/07 08:20:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkisofs/mkisofs-1.13-r2.ebuild,v 1.2 2002/04/27 21:33:32 seemant Exp $
 # -r2 by Dan Armak
 
-P=mkisofs-1.13
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Premastering program for creating iso9660 volumes"
-SRC_URI="ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/$A"
+SRC_URI="ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/${P}.tar.gz"
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/mkisofs.html"
 
-src_compile() {                           
-    try make
+src_install() {							   
+	
+	into /usr
+	
+	[ -d mkisofs/OBJ/i686-linux-cc ] && DIR=i686-linux-cc
+	[ -d mkisofs/OBJ/i586-linux-cc ] && DIR=i586-linux-cc
+	[ -d mkisofs/OBJ/i486-linux-cc ] && DIR=i486-linux-cc
+	[ -d mkisofs/OBJ/i386-linux-cc ] && DIR=i386-linux-cc
+	
+	dobin mkisofs/OBJ/${DIR}/mkisofs
+	dobin mkisofs/diag/OBJ/${DIR}/devdump
+	dobin mkisofs/diag/OBJ/${DIR}/isodump
+	dobin mkisofs/diag/OBJ/${DIR}/isoinfo
+	dobin mkisofs/diag/OBJ/${DIR}/isovfy
+	
+	doman mkisofs/mkisofs.8 mkisofs/mkhybrid.8 mkisofs/apple_driver.8
+	doman mkisofs/diag/isoinfo.8
+	dodoc ABOUT BUILD COMPILE COPYING MKNOD* PORTING README*
+	docinto mkisofs
+	dodoc mkisofs/ChangeLog
+	dodoc mkisofs/README* mkisofs/TODO
+	
 }
-
-src_install() {                               
-    
-    into /usr
-    
-    [ -d mkisofs/OBJ/i686-linux-cc ] && DIR=i686-linux-cc
-    [ -d mkisofs/OBJ/i586-linux-cc ] && DIR=i586-linux-cc
-    [ -d mkisofs/OBJ/i486-linux-cc ] && DIR=i486-linux-cc
-    [ -d mkisofs/OBJ/i386-linux-cc ] && DIR=i386-linux-cc
-    
-    dobin mkisofs/OBJ/${DIR}/mkisofs
-    dobin mkisofs/diag/OBJ/${DIR}/devdump
-    dobin mkisofs/diag/OBJ/${DIR}/isodump
-    dobin mkisofs/diag/OBJ/${DIR}/isoinfo
-    dobin mkisofs/diag/OBJ/${DIR}/isovfy
-    
-    doman mkisofs/mkisofs.8 mkisofs/mkhybrid.8 mkisofs/apple_driver.8
-    doman mkisofs/diag/isoinfo.8
-    dodoc ABOUT BUILD COMPILE COPYING MKNOD* PORTING README*
-    docinto mkisofs
-    dodoc mkisofs/ChangeLog
-    dodoc mkisofs/README* mkisofs/TODO
-    
-}
-
-
diff --git a/sys-apps/nbd/nbd-14.ebuild b/sys-apps/nbd/nbd-14.ebuild
index ea8167179287..79cee01addd1 100644
--- a/sys-apps/nbd/nbd-14.ebuild
+++ b/sys-apps/nbd/nbd-14.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Chris Houser <chouser@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-14.ebuild,v 1.1 2002/02/19 00:48:34 chouser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-14.ebuild,v 1.2 2002/04/27 21:34:29 seemant Exp $
 
-P=${P//-/.}
+MY_PP=${P//-/.}
 S=${WORKDIR}/${PN}
 DESCRIPTION="Userland client/server for kernel network block device"
-SRC_URI="http://atrey.karlin.mff.cuni.cz/~pavel/nbd/${P}.tar.gz"
+SRC_URI="http://atrey.karlin.mff.cuni.cz/~pavel/nbd/${MY_P}.tar.gz"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~pavel/nbd/nbd.html"
 
 DEPEND=">=sys-devel/gcc-2.95.3
diff --git a/sys-apps/setserial/setserial-2.17-r2.ebuild b/sys-apps/setserial/setserial-2.17-r2.ebuild
index d722613454ac..bc498a274fa4 100644
--- a/sys-apps/setserial/setserial-2.17-r2.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r2.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r2.ebuild,v 1.1 2001/02/07 15:51:28 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r2.ebuild,v 1.2 2002/04/27 21:36:17 seemant Exp $
 
-P=setserial-2.17
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Configure your serial ports with it"
-SRC_URI="ftp://tsx-11.mit.edu/pub/linux/sources/sbin/${A}
-	 ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/${A}"
+SRC_URI="ftp://tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz
+	 ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz"
 
 DEPEND="virtual/glibc"
 
-src_compile() {                           
+src_compile() {						   
 
-    try ./configure 
-    try pmake setserial
+	econf || die
+	pmake setserial || die
 
 }
 
-src_install() {      
-                         
-    doman setserial.8
-    into /
-    dobin setserial
-
-    dodoc README 
-    docinto txt
-    dodoc Documentation/*
-    insinto /etc
-    doins serial.conf
+src_install() {	  
+						 
+	doman setserial.8
+	into /
+	dobin setserial
+
+	dodoc README 
+	docinto txt
+	dodoc Documentation/*
+	insinto /etc
+	doins serial.conf
 }
-
-
-