fixums

8 files changed, 50 insertions, 232 deletions

diff --git a/sys-apps/diffutils/diffutils-2.7-r3.ebuild b/sys-apps/diffutils/diffutils-2.7-r3.ebuild
deleted file mode 100644
index 525111abe20c..000000000000
--- a/sys-apps/diffutils/diffutils-2.7-r3.ebuild
+++ /dev/null
@@ -1,46 +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/diffutils/diffutils-2.7-r3.ebuild,v 1.1 2001/02/27 15:07:25 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools to make diffs and compare files"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/diffutils/${A}
-	 ftp://ftp.gnu.org/gnu/diffutils/${A}"
-
-HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
-src_compile() {
-
-    local myconf
-    if [ -z "`use nls`" ]
-    then
-      myconf="--disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/usr ${myconf}
-
-    if [ -z "`use static`" ]
-    then
-        try pmake
-    else
-        try pmake LDFLAGS=-static
-    fi
-
-}
-
-src_install() {
-
-    try make prefix=${D}/usr infodir=${D}/usr/share/info install
-
-    if [ -z "`use build`" ]
-    then
-	    dodoc COPYING ChangeLog NEWS README
-    else
-      rm -rf ${D}/usr/share/info
-    fi
-
-}
-
-
diff --git a/sys-apps/diffutils/diffutils-2.7-r4.ebuild b/sys-apps/diffutils/diffutils-2.7-r4.ebuild
index 469f73735e90..04dd11ff984c 100644
--- a/sys-apps/diffutils/diffutils-2.7-r4.ebuild
+++ b/sys-apps/diffutils/diffutils-2.7-r4.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2001 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/diffutils/diffutils-2.7-r4.ebuild,v 1.3 2001/08/13 19:20:17 drobbins Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.7-r4.ebuild,v 1.4 2001/10/06 16:51:30 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools to make diffs and compare files"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/diffutils/${A}
-	 ftp://ftp.gnu.org/gnu/diffutils/${A}"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/diffutils/${P}.tar.gz ftp://ftp.gnu.org/gnu/diffutils/${P}.tar.gz"
 
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
+
 if [ -z "`use build`" ]
 then
 	DEPEND="$DEPEND sys-apps/texinfo"
 fi
+
 RDEPEND="virtual/glibc"
 
 src_unpack() {
@@ -24,41 +24,26 @@ src_unpack() {
 }
 
 src_compile() {
-
-    local myconf
-    if [ -z "`use nls`" ]
-    then
-      myconf="--disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/usr ${myconf}
-
+	local myconf
+	[ -z "`use nls`" ] && myconf="--disable-nls"
+	./configure --host=${CHOST} --prefix=/usr ${myconf} || die
 	if [ "`use build`" ]
 	then
 		#disable texinfo building so we can remove the dep
 		cp Makefile Makefile.orig
 		sed -e 's/^all: ${PROGRAMS} info/all: ${PROGRAMS}/g' Makefile.orig > Makefile
 	fi
-
-    if [ -z "`use static`" ]
-    then
-        try emake
-    else
-        try emake LDFLAGS=-static
-    fi
-
+	emake || die
 }
 
 src_install() {
-
-    try make prefix=${D}/usr infodir=${D}/usr/share/info install
-
-    if [ -z "`use build`" ]
-    then
-	    dodoc COPYING ChangeLog NEWS README
-    else
-      rm -rf ${D}/usr/share/info
-    fi
-
+	make prefix=${D}/usr infodir=${D}/usr/share/info install || die
+	if [ -z "`use build`" ]
+	then
+		dodoc COPYING ChangeLog NEWS README
+	else
+		rm -rf ${D}/usr/share/info
+	fi
 }
 
 
diff --git a/sys-apps/ed/ed-0.2-r1.ebuild b/sys-apps/ed/ed-0.2-r1.ebuild
deleted file mode 100644
index df77f7ba0ee8..000000000000
--- a/sys-apps/ed/ed-0.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/ebuild
-# 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/ed/ed-0.2-r1.ebuild,v 1.1 2001/02/07 15:51:27 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Your basic line editor"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/ed/${A}
-	 ftp://ftp.gnu.org/pub/gnu/ed/${A}"
-HOMEPAGE="http://www.gnu.org/software/ed/"
-DEPEND="virtual/glibc"
-
-src_compile() {  
-                         
-	try ./configure --prefix=/ --host=${CHOST}
-	try pmake
-}
-
-src_install() {                               
-
-	try make prefix=${D}/ mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info \
-		install
-	dodoc COPYING ChangeLog NEWS POSIX README THANKS TODO
-
-}
-
-
diff --git a/sys-apps/ed/ed-0.2-r2.ebuild b/sys-apps/ed/ed-0.2-r2.ebuild
deleted file mode 100644
index d1ae979fce0a..000000000000
--- a/sys-apps/ed/ed-0.2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/ebuild
-# 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/ed/ed-0.2-r2.ebuild,v 1.1 2001/08/03 23:13:40 chadh Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Your basic line editor"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/ed/${A}
-	 ftp://ftp.gnu.org/pub/gnu/ed/${A}"
-HOMEPAGE="http://www.gnu.org/software/ed/"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {  
-                         
-	try ./configure --prefix=/ --host=${CHOST}
-	try pmake
-}
-
-src_install() {                               
-
-	try make prefix=${D}/ mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info \
-		install
-	dodoc COPYING ChangeLog NEWS POSIX README THANKS TODO
-
-}
-
-
diff --git a/sys-apps/eject/eject-2.0.6.ebuild b/sys-apps/eject/eject-2.0.6.ebuild
index fc37604b838e..3fcb3209b051 100644
--- a/sys-apps/eject/eject-2.0.6.ebuild
+++ b/sys-apps/eject/eject-2.0.6.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.6.ebuild,v 1.1 2001/05/14 10:48:12 achim Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.6.ebuild,v 1.2 2001/10/06 16:51:30 drobbins Exp $
 
-#P=
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
-DESCRIPTION=""
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${A}"
+DESCRIPTION="A command to eject a disc from the CD-ROM drive"
+SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz"
 HOMEPAGE="http://www.pobox.com/~tranter/eject.html"
 
 DEPEND="virtual/glibc"
 
 src_compile() {
-    try ./configure --prefix=/usr --mandir=/usr/share/man
-    try make 
+	./configure --prefix=/usr --mandir=/usr/share/man || die
+	make 
 }
 
 src_install () {
-    dodir /usr/bin /usr/share/man/man1
-    try make DESTDIR=${D} install
-    dodoc ChangeLog COPYING README PORTING TODO 
-    dodoc AUTHORS NEWS PROBLEMS
+	dodir /usr/bin /usr/share/man/man1
+	make DESTDIR=${D} install || die
+	dodoc ChangeLog COPYING README PORTING TODO 
+	dodoc AUTHORS NEWS PROBLEMS
 }
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index f21d74b8bae6..76c86bc8daa7 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,28 +1,23 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.1 2001/08/08 20:37:43 pete Exp $
+# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.2 2001/10/06 16:51:30 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A utility to set the framebuffer videomode"
-SRC_URI="http://home.tvd.be/cr26864/Linux/fbdev/${A}"
+SRC_URI="http://home.tvd.be/cr26864/Linux/fbdev/${P}.tar.gz"
 HOMEPAGE="http://linux-fbdev.org"
 
 DEPEND="virtual/glibc"
 
 src_compile() {
-
-    try make
-
+	make || die
 }
 
 src_install () {
-
-    dobin fbset modeline2fb
-    doman *.[58]
-    dodoc etc/fb.modes.*
-    dodoc INSTALL
-
+	dobin fbset modeline2fb
+	doman *.[58]
+	dodoc etc/fb.modes.*
+	dodoc INSTALL
 }
 
diff --git a/sys-apps/file/file-3.33-r2.ebuild b/sys-apps/file/file-3.33-r2.ebuild
deleted file mode 100644
index 06f0a17bc4d8..000000000000
--- a/sys-apps/file/file-3.33-r2.ebuild
+++ /dev/null
@@ -1,40 +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/file/file-3.33-r2.ebuild,v 1.1 2001/02/27 16:29:30 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Program to identify a file's format by scanning binary data for patters"
-#unfortunately, this ftp site doesn't support passive ftp
-#maybe we can find an alternative for those behind firewalls, or mirror
-#on cvs.gentoo.org
-SRC_URI="ftp://ftp.astron.com/pub/file/${A}"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/misc --host=${CHOST}
-    if [ -z "`use static`" ]
-    then
-        try pmake
-    else
-        try pmake LDFLAGS=-static
-    fi
-}
-
-src_install() {
-
-	try make DESTDIR=${D} install
-    if [ -z "`use build`" ]
-    then
-	    dodoc LEGAL.NOTICE MAINT README
-    else
-      rm -rf ${D}/usr/share/man
-    fi
-
-}
-
-
-
diff --git a/sys-apps/file/file-3.33-r3.ebuild b/sys-apps/file/file-3.33-r3.ebuild
index 48876dd62a8d..96a0b4ff5393 100644
--- a/sys-apps/file/file-3.33-r3.ebuild
+++ b/sys-apps/file/file-3.33-r3.ebuild
@@ -1,37 +1,27 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2001 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/file/file-3.33-r3.ebuild,v 1.2 2001/08/04 18:22:45 pete Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.33-r3.ebuild,v 1.3 2001/10/06 16:51:30 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
-DESCRIPTION="Program to identify a file's format by scanning binary data for patters"
-#unfortunately, this ftp site doesn't support passive ftp
-#maybe we can find an alternative for those behind firewalls, or mirror
-#on cvs.gentoo.org
-SRC_URI="ftp://ftp.astron.com/pub/file/${A}"
+DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
+SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.bz"
 
 DEPEND="virtual/glibc"
 
 src_compile() {
-
-    try ./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/misc --host=${CHOST}
-    if [ -z "`use static`" ]
-    then
-        try pmake
-    else
-        try pmake LDFLAGS=-static
-    fi
+	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/misc --host=${CHOST} || die
+	emake || die
 }
 
 src_install() {
-	try make DESTDIR=${D} install
-    if [ -z "`use build`" ] && [ -z "`use bootcd`" ]
-    then
-	    dodoc LEGAL.NOTICE MAINT README
-    else
+	make DESTDIR=${D} install || die
+if [ -z "`use build`" ]
+	then
+		dodoc LEGAL.NOTICE MAINT README
+	else
 		rm -rf ${D}/usr/share/man
-    fi
+	fi
 }