fixums

16 files changed, 107 insertions, 567 deletions

diff --git a/sys-apps/at/at-3.1.8-r3.ebuild b/sys-apps/at/at-3.1.8-r3.ebuild
index 6d7f933818e9..5a5ff3766e77 100644
--- a/sys-apps/at/at-3.1.8-r3.ebuild
+++ b/sys-apps/at/at-3.1.8-r3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r3.ebuild,v 1.3 2001/09/02 03:39:24 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r3.ebuild,v 1.4 2001/10/06 17:04:49 drobbins Exp $
 
-A="${P}.tar.bz2 ${P}.dif"
 S=${WORKDIR}/${P}
 DESCRIPTION="queues jobs for later execution"
 SRC_URI="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.tar.bz2
diff --git a/sys-apps/baselayout/baselayout-1.5-r3.ebuild b/sys-apps/baselayout/baselayout-1.5-r3.ebuild
index 12aed16a1a55..715623872cfe 100644
--- a/sys-apps/baselayout/baselayout-1.5-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.5-r3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r3.ebuild,v 1.21 2001/07/18 17:31:27 drobbins Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r3.ebuild,v 1.22 2001/10/06 17:04:49 drobbins Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
 
-A=""
 S=${WORKDIR}/${P}
 DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts)"
 SRC_URI=""
diff --git a/sys-apps/baselayout/baselayout-1.5-r4.ebuild b/sys-apps/baselayout/baselayout-1.5-r4.ebuild
index a76beab1325c..0a3ed8c7be1f 100644
--- a/sys-apps/baselayout/baselayout-1.5-r4.ebuild
+++ b/sys-apps/baselayout/baselayout-1.5-r4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r4.ebuild,v 1.2 2001/08/08 20:37:43 pete Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r4.ebuild,v 1.3 2001/10/06 17:04:49 drobbins Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
 
-A=""
 S=${WORKDIR}/${P}
 DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts)"
 SRC_URI=""
diff --git a/sys-apps/fileutils/fileutils-4.1-r1.ebuild b/sys-apps/fileutils/fileutils-4.1-r1.ebuild
deleted file mode 100644
index c71c7568f1a1..000000000000
--- a/sys-apps/fileutils/fileutils-4.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1-r1.ebuild,v 1.1 2001/04/30 18:00:35 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}"
-HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.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 --prefix=/usr --mandir=/usr/share/man \
-        --infodir=/usr/share/info --bindir=/bin ${myconf}
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static
-    fi
-}
-
-src_install() {
-
-    if [ -z "`use build`" ]
-    then
-	    make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info bindir=${D}/bin install
-	    cd ${D}
-        dodir /usr/bin
-        rm -rf usr/lib
-        cd usr/bin
-        ln -s ../../bin/* .
-        cd ${S}
-        dodoc COPYING NEWS README*  THANKS TODO ChangeLog ChangeLog-1997 AUTHORS
-     else
-        cd ${S}/src
-	    into /
-        dobin  chgrp chown dd dir du ln mkdir mknod rm touch \
-               chmod cp df ls mkfifo mv rmdir sync
-        newbin ginstall install
-        dosym /bin/install /usr/bin/install
-     fi
-
-}
-
diff --git a/sys-apps/fileutils/fileutils-4.1-r2.ebuild b/sys-apps/fileutils/fileutils-4.1-r2.ebuild
index 0e3605ad8ace..a99bbd0d2e9d 100644
--- a/sys-apps/fileutils/fileutils-4.1-r2.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1-r2.ebuild
@@ -1,51 +1,37 @@
-# 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 Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1-r2.ebuild,v 1.2 2001/08/04 18:22:45 pete Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>, Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1-r2.ebuild,v 1.3 2001/10/06 17:04:49 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}"
+SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
 
-DEPEND="virtual/glibc
-        nls? ( sys-devel/gettext )"
+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 --prefix=/usr --mandir=/usr/share/man \
-        --infodir=/usr/share/info --bindir=/bin ${myconf}
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static
-    fi
+	local myconf
+	[ -z "`use nls`" ] && myconf="--disable-nls"
+	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --bindir=/bin ${myconf} || die
+	emake || die
 }
 
 src_install() {
-
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info bindir=${D}/bin install
+	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info bindir=${D}/bin install || die
 	cd ${D}
 	dodir /usr/bin
 	rm -rf usr/lib
 	cd usr/bin
 	ln -s ../../bin/* .
-	if [ -z "`use bootcd`" ] && [ -z "`use build`" ]
+	if [ -z "`use build`" ]
 	then
 		cd ${S}
 		dodoc COPYING NEWS README*  THANKS TODO ChangeLog ChangeLog-1997 AUTHORS
 	else
 		rm -rf ${D}/usr/share
 	fi
-
 }
 
diff --git a/sys-apps/findutils/findutils-4.1-r5.ebuild b/sys-apps/findutils/findutils-4.1-r5.ebuild
deleted file mode 100644
index 4d0eb964391b..000000000000
--- a/sys-apps/findutils/findutils-4.1-r5.ebuild
+++ /dev/null
@@ -1,70 +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/findutils/findutils-4.1-r5.ebuild,v 1.2 2001/06/18 12:50:24 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU utilities to find files"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/findutils/${A}
-	 ftp://prep.ai.mit.edu/gnu/findutils/${A}"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-
-DEPEND="virtual/glibc sys-devel/gettext"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-
-    unpack ${A}
-    echo "Applying Patch..."
-    #using sed to apply minor patches to files
-    cd ${S}
-
-    cd find
-    cp fstype.c fstype.c.orig
-    sed -e "33d" -e "34d" fstype.c.orig > fstype.c
-    cp parser.c parser.c.orig
-    sed -e "55d" parser.c.orig > parser.c
-    cp pred.c pred.c.orig
-    sed -e '29i\' -e '#define FNM_CASEFOLD (1<<4)' pred.c.orig > pred.c
-    cd ${S}/lib
-    cp nextelem.c nextelem.c.orig
-    sed -e "35d" nextelem.c.orig > nextelem.c
-    cd ${S}/xargs
-    cp xargs.c xargs.c.orig
-    sed -e "63d" -e "64d" xargs.c.orig > xargs.c
-}
-
-src_compile() {
-
-    try ./configure --host=${CHOST} --prefix=/usr
-
-    # do not use pmake recursive
-
-    if [ -z "`use static`" ]
-    then
-        try make LOCATE_DB=/var/lib/misc/locatedb  \
-	    libexecdir=/usr/lib/find $MAKEOPTS
-    else
-        try make LOCATE_DB=/var/lib/misc/locatedb  \
-	    libexecdir=/usr/lib/find $MAKEOPTS LDFLAGS=-static
-    fi
-}
-
-src_install() {
-
-    try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/find \
-	LOCATE_DB=${D}/var/lib/misc/locatedb install
-    dosed "s:TMPDIR=/usr/tmp:TMPDIR=/tmp:" usr/bin/updatedb
-
-    rm -fr ${D}/usr/var
-
-    if [ -z "`use build`" ]
-    then
-        dodoc COPYING NEWS README TODO ChangeLog
-    else
-        rm -fr ${D}/usr/share/man ${D}/usr/share/info    
-    fi
-
-}
-
diff --git a/sys-apps/findutils/findutils-4.1-r6.ebuild b/sys-apps/findutils/findutils-4.1-r6.ebuild
index 545b85c137ce..c73786d282b7 100644
--- a/sys-apps/findutils/findutils-4.1-r6.ebuild
+++ b/sys-apps/findutils/findutils-4.1-r6.ebuild
@@ -1,70 +1,49 @@
-# 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/findutils/findutils-4.1-r6.ebuild,v 1.1 2001/07/28 15:49:20 pete Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1-r6.ebuild,v 1.2 2001/10/06 17:04:49 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU utilities to find files"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/findutils/${A}
-	 ftp://prep.ai.mit.edu/gnu/findutils/${A}"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/findutils/${P}.tar.gz ftp://prep.ai.mit.edu/gnu/findutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-
 DEPEND="virtual/glibc sys-devel/gettext"
 RDEPEND="virtual/glibc"
 
 src_unpack() {
-
-    unpack ${A}
-    echo "Applying Patch..."
-    #using sed to apply minor patches to files
-    cd ${S}
-
-    cd find
-    cp fstype.c fstype.c.orig
-    sed -e "33d" -e "34d" fstype.c.orig > fstype.c
-    cp parser.c parser.c.orig
-    sed -e "55d" parser.c.orig > parser.c
-    cp pred.c pred.c.orig
-    sed -e '29i\' -e '#define FNM_CASEFOLD (1<<4)' pred.c.orig > pred.c
-    cd ${S}/lib
-    cp nextelem.c nextelem.c.orig
-    sed -e "35d" nextelem.c.orig > nextelem.c
-    cd ${S}/xargs
-    cp xargs.c xargs.c.orig
-    sed -e "63d" -e "64d" xargs.c.orig > xargs.c
+	unpack ${A}
+	echo "Applying Patch..."
+	#using sed to apply minor patches to files
+	cd ${S}
+	cd find
+	cp fstype.c fstype.c.orig
+	sed -e "33d" -e "34d" fstype.c.orig > fstype.c
+	cp parser.c parser.c.orig
+	sed -e "55d" parser.c.orig > parser.c
+	cp pred.c pred.c.orig
+	sed -e '29i\' -e '#define FNM_CASEFOLD (1<<4)' pred.c.orig > pred.c
+	cd ${S}/lib
+	cp nextelem.c nextelem.c.orig
+	sed -e "35d" nextelem.c.orig > nextelem.c
+	cd ${S}/xargs
+	cp xargs.c xargs.c.orig
+	sed -e "63d" -e "64d" xargs.c.orig > xargs.c
 }
 
 src_compile() {
-
-    try ./configure --host=${CHOST} --prefix=/usr
-
-    # do not use pmake recursive
-
-    if [ -z "`use static`" ]
-    then
-        try make LOCATE_DB=/var/lib/misc/locatedb  \
-	    libexecdir=/usr/lib/find $MAKEOPTS
-    else
-        try make LOCATE_DB=/var/lib/misc/locatedb  \
-	    libexecdir=/usr/lib/find $MAKEOPTS LDFLAGS=-static
-    fi
+	./configure --host=${CHOST} --prefix=/usr || die
+	emake LOCATE_DB=/var/lib/misc/locatedb libexecdir=/usr/lib/find || die
 }
 
 src_install() {
-
-    try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/find \
-	LOCATE_DB=${D}/var/lib/misc/locatedb install
-    dosed "s:TMPDIR=/usr/tmp:TMPDIR=/tmp:" usr/bin/updatedb
-
-    rm -fr ${D}/usr/var
-
-    if [ -z "`use build`" ] && [ -z "`use bootcd`" ]
-    then
-        dodoc COPYING NEWS README TODO ChangeLog
-    else
-        rm -fr ${D}/usr/share
-    fi
-
+	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/find LOCATE_DB=${D}/var/lib/misc/locatedb install || die
+	dosed "s:TMPDIR=/usr/tmp:TMPDIR=/tmp:" usr/bin/updatedb
+	rm -rf ${D}/usr/var
+	if [ -z "`use build`" ] 
+	then
+		dodoc COPYING NEWS README TODO ChangeLog
+	else
+		rm -rf ${D}/usr/share
+	fi
 }
 
diff --git a/sys-apps/gawk/gawk-3.0.6-r3.ebuild b/sys-apps/gawk/gawk-3.0.6-r3.ebuild
deleted file mode 100644
index 381280717c31..000000000000
--- a/sys-apps/gawk/gawk-3.0.6-r3.ebuild
+++ /dev/null
@@ -1,52 +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/gawk/gawk-3.0.6-r3.ebuild,v 1.1 2001/02/27 16:39:39 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU awk pattern-matching language"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${A}
-	 ftp://prep.ai.mit.edu/gnu/gawk/${A}"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-	try ./configure --prefix=/usr --libexecdir=/usr/lib/awk --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static
-    fi
-
-}
-
-src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/awk install
-
-    if [ -z "`use build`" ]
-    then
-        dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-        dodoc ChangeLog ACKNOWLEDGMENT COPYING FUTURES
-	    dodoc LIMITATIONS NEWS PROBLEMS README
-	    docinto README_d
-	    dodoc README_d/*
-	    docinto atari
-	    dodoc atari/ChangeLog atari/README.1st
-	    docinto awklib
-	    dodoc awklib/ChangeLog
-	    docinto pc
-	    dodoc pc/ChangeLog
-	    docinto posix
-	    dodoc posix/ChangeLog
-     else
-        rm -rf ${D}/usr/share/man ${D}/usr/share/info
-     fi
-
-}
-
-
-
diff --git a/sys-apps/gawk/gawk-3.0.6-r4.ebuild b/sys-apps/gawk/gawk-3.0.6-r4.ebuild
index 0b04ab9d862c..c6797009dd38 100644
--- a/sys-apps/gawk/gawk-3.0.6-r4.ebuild
+++ b/sys-apps/gawk/gawk-3.0.6-r4.ebuild
@@ -1,49 +1,37 @@
-# 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/gawk/gawk-3.0.6-r4.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/gawk/gawk-3.0.6-r4.ebuild,v 1.3 2001/10/06 17:04:49 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU awk pattern-matching language"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${A}
-	 ftp://prep.ai.mit.edu/gnu/gawk/${A}"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz ftp://prep.ai.mit.edu/gnu/gawk/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
 DEPEND="virtual/glibc"
 
 src_compile() {
-
-	try ./configure --prefix=/usr --libexecdir=/usr/lib/awk --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static
-    fi
-
+	./configure --prefix=/usr --libexecdir=/usr/lib/awk --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST} || die
+	emake || die
 }
 
 src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/awk install
-
-    if [ -z "`use build`" ] && [ -z "`use bootcd`" ]
-    then
-        dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-        dodoc ChangeLog ACKNOWLEDGMENT COPYING FUTURES
-	    dodoc LIMITATIONS NEWS PROBLEMS README
-	    docinto README_d
-	    dodoc README_d/*
-	    docinto atari
-	    dodoc atari/ChangeLog atari/README.1st
-	    docinto awklib
-	    dodoc awklib/ChangeLog
-	    docinto pc
-	    dodoc pc/ChangeLog
-	    docinto posix
-	    dodoc posix/ChangeLog
-     else
-        rm -rf ${D}/usr/share
-     fi
-
+	make prefix=${D}/usr mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/awk install || die
+	if [ -z "`use build`" ] 
+	then
+		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
+		dodoc ChangeLog ACKNOWLEDGMENT COPYING FUTURES
+		dodoc LIMITATIONS NEWS PROBLEMS README
+		docinto README_d
+		dodoc README_d/*
+		docinto atari
+		dodoc atari/ChangeLog atari/README.1st
+		docinto awklib
+		dodoc awklib/ChangeLog
+		docinto pc
+		dodoc pc/ChangeLog
+		docinto posix
+		dodoc posix/ChangeLog
+	else
+		rm -rf ${D}/usr/share
+	fi
 }
diff --git a/sys-apps/grep/grep-2.4.2-r3.ebuild b/sys-apps/grep/grep-2.4.2-r3.ebuild
deleted file mode 100644
index aeaacbf3e93c..000000000000
--- a/sys-apps/grep/grep-2.4.2-r3.ebuild
+++ /dev/null
@@ -1,50 +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/grep/grep-2.4.2-r3.ebuild,v 1.1 2001/02/27 16:42:39 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU regular expression matcher"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/grep/${A}
-	 ftp://prep.ai.mit.edu/gnu/grep/${A}"
-HOMEPAGE="http://www.gnu.org/software/grep/grep.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 --prefix=/usr --mandir=/usr/share/man \
-        --infodir=/usr/share/info --host=${CHOST} ${myconf}
-
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make LDFLAGS=-static ${MAKEOPTS}
-    fi
-}
-
-src_install() {
-
-    try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-    
-    if [ -z "`use build`" ]
-    then
-        dodoc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
-    else
-        rm -rf ${D}/usr/share/man ${D}/usr/share/info
-    fi
-
-}
-
-
-
diff --git a/sys-apps/grep/grep-2.4.2-r4.ebuild b/sys-apps/grep/grep-2.4.2-r4.ebuild
index 9e4e3026c20d..65dcf594a85a 100644
--- a/sys-apps/grep/grep-2.4.2-r4.ebuild
+++ b/sys-apps/grep/grep-2.4.2-r4.ebuild
@@ -1,49 +1,30 @@
-# 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/grep/grep-2.4.2-r4.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/grep/grep-2.4.2-r4.ebuild,v 1.3 2001/10/06 17:04:49 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU regular expression matcher"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/grep/${A}
-	 ftp://prep.ai.mit.edu/gnu/grep/${A}"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/grep/${P}.tar.gz ftp://prep.ai.mit.edu/gnu/grep/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
-
-DEPEND="virtual/glibc
-        nls? ( sys-devel/gettext )"
-
+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 --prefix=/usr --mandir=/usr/share/man \
-        --infodir=/usr/share/info --host=${CHOST} ${myconf}
-
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make LDFLAGS=-static ${MAKEOPTS}
-    fi
+	local myconf
+	[ -z "`use nls`" ] && myconf="--disable-nls"
+	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST} ${myconf} || die
+	emake || die
 }
 
 src_install() {
-
-    try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-    
-    if [ -z "`use build`" ] && [ -z "`use bootcd`" ]
-    then
+	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install || die
+	if [ -z "`use build`" ]
+	then
 		dodoc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
-    else
-        rm -rf ${D}/usr/share
-    fi
-
+	else
+		rm -rf ${D}/usr/share
+	fi
 }
 
 
diff --git a/sys-apps/groff/groff-1.16.1-r1.ebuild b/sys-apps/groff/groff-1.16.1-r1.ebuild
index e40b69e0004c..973eff9081b6 100644
--- a/sys-apps/groff/groff-1.16.1-r1.ebuild
+++ b/sys-apps/groff/groff-1.16.1-r1.ebuild
@@ -1,33 +1,22 @@
-# 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/groff/groff-1.16.1-r1.ebuild,v 1.2 2001/05/11 14:01:40 achim Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.16.1-r1.ebuild,v 1.3 2001/10/06 17:04:49 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Text formatter used for man pages"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${A}
-	 ftp://prep.ai.mit.edu/gnu/groff/${A}"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz ftp://prep.ai.mit.edu/gnu/groff/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
-
 DEPEND="virtual/glibc"
 
 src_compile() {
-
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man
-	# pmake does not work !
-	try make
+	./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man || die
+	# emake doesn't work
+	make || die
 }
 
 src_install() {
-
-        dodir /usr
-	try make prefix=${D}/usr manroot=${D}/usr/share/man install
-
-        dodoc NEWS PROBLEMS PROJECTS README TODO VERSION \
-	      BUG-REPORT COPYING ChangeLog FDL MORE.STUFF \
-	      REVISION
-
+	dodir /usr
+	make prefix=${D}/usr manroot=${D}/usr/share/man install || die
+	dodoc NEWS PROBLEMS PROJECTS README TODO VERSION BUG-REPORT COPYING ChangeLog FDL MORE.STUFF REVISION
 }
-
-
diff --git a/sys-apps/grub/grub-0.5.96.1-r2.ebuild b/sys-apps/grub/grub-0.5.96.1-r2.ebuild
deleted file mode 100644
index 58f2e734c0a5..000000000000
--- a/sys-apps/grub/grub-0.5.96.1-r2.ebuild
+++ /dev/null
@@ -1,36 +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/grub/grub-0.5.96.1-r2.ebuild,v 1.3 2001/08/05 22:22:40 blocke Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU GRUB boot loader"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${A}"
-HOMEPAGE="http://www.gnu.org/software/grub"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2-r2"
-
-src_compile() {
-
-	try     ./configure --prefix=/usr  \
-                --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
-
-	try make ${MAKEOPTS} -e  CPPFLAGS="-Wall -Wmissing-prototypes -Wunused -Wshadow -malign-jumps=1 -malign-loops=1 -malign-functions=1 -Wundef"
-}
-
-src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-
-        dodir /boot/boot/grub
-	cd ${D}/usr/share/grub/i386-pc
-	cp stage1 stage2 *stage1_5 ${D}/boot/boot/grub
-
-        cd ${S}
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-}
-
-
-
diff --git a/sys-apps/grub/grub-0.5.96.1-r3.ebuild b/sys-apps/grub/grub-0.5.96.1-r3.ebuild
deleted file mode 100644
index bbfeb4ede583..000000000000
--- a/sys-apps/grub/grub-0.5.96.1-r3.ebuild
+++ /dev/null
@@ -1,44 +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>
-# /home/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r2.ebuild,v 1.2 2001/02/07 20:05:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r3.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU GRUB boot loader"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${A}"
-HOMEPAGE="http://www.gnu.org/software/grub"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	try patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-
-	try     ./configure --prefix=/usr  \
-                --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
-
-	try make ${MAKEOPTS} -e  CPPFLAGS="-Wall -Wmissing-prototypes -Wunused -Wshadow -malign-jumps=1 -malign-loops=1 -malign-functions=1 -Wundef"
-}
-
-src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-
-        dodir /boot/boot/grub
-	cd ${D}/usr/share/grub/i386-pc
-	cp stage1 stage2 *stage1_5 ${D}/boot/boot/grub
-
-        cd ${S}
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-}
-
-
-
diff --git a/sys-apps/grub/grub-0.5.96.1-r4.ebuild b/sys-apps/grub/grub-0.5.96.1-r4.ebuild
index b637650e5c83..6c429ae06d13 100644
--- a/sys-apps/grub/grub-0.5.96.1-r4.ebuild
+++ b/sys-apps/grub/grub-0.5.96.1-r4.ebuild
@@ -1,9 +1,7 @@
-# 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>
-# /home/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r2.ebuild,v 1.2 2001/02/07 20:05:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r4.ebuild,v 1.6 2001/08/31 03:23:39 pm Exp $
-
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r4.ebuild,v 1.7 2001/10/06 17:04:49 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU GRUB boot loader"
@@ -15,7 +13,7 @@ DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	try patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
 }
 
 src_compile() {
@@ -24,17 +22,11 @@ src_compile() {
 }
 
 src_install() {
-	try make prefix=${D}/usr sbindir=${D}/sbin mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-	
-	if [ -z "`use bootcd`" ]
-	then
-        dodir /boot/grub
-		cd ${D}/usr/share/grub/i386-pc
-		cp stage1 stage2 *stage1_5 ${D}/boot/grub
-		dosym . /boot/boot		
-        cd ${S}
-		dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	else
-		rm -rf ${D}/usr/share/{man,info,doc}
-	fi
+	make prefix=${D}/usr sbindir=${D}/sbin mandir=${D}/usr/share/man infodir=${D}/usr/share/info install || die
+	dodir /boot/grub
+	cd ${D}/usr/share/grub/i386-pc
+	cp stage1 stage2 *stage1_5 ${D}/boot/grub
+	dosym . /boot/boot		
+	cd ${S}
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
 }
diff --git a/sys-apps/grub/grub-0.90.ebuild b/sys-apps/grub/grub-0.90.ebuild
deleted file mode 100644
index f9ae69469a47..000000000000
--- a/sys-apps/grub/grub-0.90.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <hallski@gentoo.org>
-# /home/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r2.ebuild,v 1.2 2001/02/07 20:05:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.90.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU GRUB boot loader"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${A}"
-HOMEPAGE="http://www.gnu.org/software/grub"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.5.97-vga16.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-special-raid-devices.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-dont-give-mem-to-kernel.patch
-#	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-configfile.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-vga16-keypressclear.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-passwordprompt.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-install.in.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-installcopyonly.patch
-}
-
-src_compile() {
-
-	./configure --prefix=/usr --sbindir=/sbin 			  \
-                    --mandir=/usr/share/man --infodir=/usr/share/info 	  \
-		    --host=${CHOST} 
-	assert "Configuration of package failed."
-
-	# Have to do this since the configure-script seems a little brooken
-	echo "#define VGA16 1" >> config.h
-
-	emake -e CPPFLAGS="-Wall -Wmissing-prototypes -Wunused 		  \
-	                   -Wshadow -malign-jumps=1 -malign-loops=1	  \
-		  	   -malign-functions=1 -Wundef"
-        assert "Building failed."
-}
-
-src_install() {
-	
-	make prefix=${D}/usr sbindir=${D}/sbin mandir=${D}/usr/share/man  \
-	     infodir=${D}/usr/share/info install
-	assert "Installation failed."
-	
-	if [ -z "`use bootcd`" ]
-	then
-        	dodir /boot/grub
-		cd ${D}/usr/share/grub/i386-pc
-		cp stage1 stage2 *stage1_5 ${D}/boot/grub
-                cp ${FILESDIR}/${P}/splash.xpm.gz ${D}/boot/grub
-		
-        	cd ${S}
-		dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	else
-		rm -rf ${D}/usr/share/{man,info,doc}
-	fi
-}