header and form updates

25 files changed, 306 insertions, 245 deletions

diff --git a/sys-apps/acl/acl-1.1.3.ebuild b/sys-apps/acl/acl-1.1.3.ebuild
index dbbc18002b83..e6110b677ea9 100644
--- a/sys-apps/acl/acl-1.1.3.ebuild
+++ b/sys-apps/acl/acl-1.1.3.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-1.1.3.ebuild,v 1.1 2001/11/17 08:44:07 drobbins Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-1.1.3.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
-DESCRIPTION="xfs dump/restore utilities"
+DESCRIPTION="XFS dump/restore utilities"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/latest/cmd_tars/${P}.src.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 
@@ -23,13 +22,18 @@ src_compile() {
 	# 3) we remove a hard-coded "-O1"
 	# 4) we fix some Makefile-created library symlinks that contains absolute paths
 	cp include/builddefs include/builddefs.orig
-	sed -e 's:^PKG_\(.*\)_DIR = \(.*\)$:PKG_\1_DIR = ${DESTDIR}\2:' -e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:" -e 's:-O1::' -e 's:-S \(.*\) $(PKG_.*_DIR)/\(.*$\):-S \1 \2:' include/builddefs.orig > include/builddefs || die
+	sed -e 's:^PKG_\(.*\)_DIR = \(.*\)$:PKG_\1_DIR = ${DESTDIR}\2:' \
+		-e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:" \
+		-e 's:-O1::' \
+		-e 's:-S \(.*\) $(PKG_.*_DIR)/\(.*$\):-S \1 \2:' \
+		include/builddefs.orig > include/builddefs || die
 	# 5) We now fix some absolute path symlinks in various makefiles
 #	local x
 #	for x in dump restore
 ##	do
 #		cp ${x}/Makefile ${x}/Makefile.orig
-#		sed -e 's:$(INSTALL) -S $(PKG_.*_DIR)/\(.*\) \(.*/.*\):$(INSTALL) -S ../../sbin/\1 \2:' ${x}/Makefile.orig > ${x}/Makefile
+#		sed -e 's:$(INSTALL) -S $(PKG_.*_DIR)/\(.*\) \(.*/.*\):$(INSTALL) -S ../../sbin/\1 \2:' \
+#			${x}/Makefile.orig > ${x}/Makefile
 #	done
 	emake || die
 }
diff --git a/sys-apps/acpid/acpid-1.0.0.ebuild b/sys-apps/acpid/acpid-1.0.0.ebuild
index 933ef72e4106..a353e53cb1fb 100644
--- a/sys-apps/acpid/acpid-1.0.0.ebuild
+++ b/sys-apps/acpid/acpid-1.0.0.ebuild
@@ -1,6 +1,7 @@
-# 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 Martin Schlemmer <azarah@gentoo.org>
+# Maintainer: Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.0.ebuild,v 1.3 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Daemon for Advanced Configuration and Power Interface."
@@ -15,7 +16,7 @@ DEPEND="virtual/glibc
 
 src_compile() {
 
-	# DONT compile with optimizations !
+	# DO NOT compile with optimizations !
 	make INSTPREFIX=${D} ||die
 }
 
diff --git a/sys-apps/apcupsd/apcupsd-3.8.1.ebuild b/sys-apps/apcupsd/apcupsd-3.8.1.ebuild
index 2637dec8e347..bc12891abab8 100644
--- a/sys-apps/apcupsd/apcupsd-3.8.1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.8.1.ebuild
@@ -1,10 +1,7 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org> 
-# Author: Holger Brueckner <darks@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.8.1.ebuild,v 1.5 2001/10/06 16:44:02 drobbins Exp $
-
-# WARNING: THIS EBUILD HAS ONLY BEEN PARTIALLY CONVERTED TO THE NEW RC6 INITSCRIPTS
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.8.1.ebuild,v 1.6 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
diff --git a/sys-apps/apmd/apmd-3.0.1-r6.ebuild b/sys-apps/apmd/apmd-3.0.1-r6.ebuild
index 01bfe6dae711..9fa53eaa1a35 100644
--- a/sys-apps/apmd/apmd-3.0.1-r6.ebuild
+++ b/sys-apps/apmd/apmd-3.0.1-r6.ebuild
@@ -1,11 +1,12 @@
-# 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 Craig Joly <joly@ee.ualberta.ca>, Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.1-r6.ebuild,v 1.1 2001/10/14 09:11:36 woodchip Exp $
+# Maintainer: Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.1-r6.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
+MY_P=${P/-/_}
 S=${WORKDIR}/${P}
 DESCRIPTION="Advanced Power Management Daemon"
-SRC_URI="ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.0.1-1.tar.gz"
+SRC_URI="ftp://ftp.debian.org/debian/pool/main/a/apmd/${MY_P}-1.tar.gz"
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
 
 DEPEND="virtual/glibc X? ( virtual/x11 )"
@@ -21,7 +22,10 @@ src_unpack() {
 	    -e "s:MANDIR\=\${PREFIX}\/man:MANDIR\=\${PREFIX}\/share\/man:" \
 	    Makefile.orig > Makefile
 
-	use X || sed -e "/^EXES=/s/xapm//" -e "/install.*xapm/d" Makefile | cat > Makefile
+	cp Makefile Makefile.orig2
+	use X || sed -e "/^EXES=/s/xapm//" \
+			-e "/install.*xapm/d" \
+			Makefile.orig2 > Makefile
 }
 
 src_compile() {
diff --git a/sys-apps/at/at-3.1.8-r6.ebuild b/sys-apps/at/at-3.1.8-r6.ebuild
index 8bcf753cce34..de8c2a952707 100644
--- a/sys-apps/at/at-3.1.8-r6.ebuild
+++ b/sys-apps/at/at-3.1.8-r6.ebuild
@@ -1,10 +1,10 @@
-# 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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r6.ebuild,v 1.2 2001/10/06 16:44:02 drobbins Exp $
+# Maintainer: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r6.ebuild,v 1.3 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
-DESCRIPTION="queues jobs for later execution"
+DESCRIPTION="Queues jobs for later execution"
 SRC_URI="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.tar.bz2
 	 ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/${P}.dif"
 HOMEPAGE=""
@@ -15,25 +15,23 @@ RDEPEND="virtual/glibc"
 
 src_unpack() {
 
-    unpack ${P}.tar.bz2
-    cd ${S}
-    patch -p0 < ${DISTDIR}/${P}.dif || die
-    cp configure.in configure.orig
-    patch -p0 < ${FILESDIR}/${P}-configure.in-sendmail-gentoo.diff || die
-    patch -p0 < ${FILESDIR}/${P}-configure-sendmail-gentoo.diff || die
+	unpack ${P}.tar.bz2
+	cd ${S}
+	patch -p0 < ${DISTDIR}/${P}.dif || die
+	cp configure.in configure.orig
+	patch -p0 < ${FILESDIR}/${P}-configure.in-sendmail-gentoo.diff || die
+	patch -p0 < ${FILESDIR}/${P}-configure-sendmail-gentoo.diff || die
 }
 
 src_compile() {
 
-    ./configure --host=${CHOST/-pc/} --sysconfdir=/etc/at \
-	--with-jobdir=/var/cron/atjobs \
-	--with-atspool=/var/cron/atspool \
-	--with-etcdir=/etc/at \
-	--with-daemon_username=at \
-	--with-daemon_groupname=at
-    assert
-
-    emake || die
+	./configure --host=${CHOST/-pc/} --sysconfdir=/etc/at \
+		--with-jobdir=/var/cron/atjobs \
+		--with-atspool=/var/cron/atspool \
+		--with-etcdir=/etc/at \
+		--with-daemon_username=at \
+		--with-daemon_groupname=at || die
+	emake || die
 }
 
 src_install() {
@@ -49,10 +47,10 @@ src_install() {
 
 	for i in atjobs atspool
 	do
-	  dodir /var/cron/${i}
-	  fperms 700 /var/cron/${i}
-	  fowners at.at /var/cron/${i}
-	  touch ${D}/var/cron/${i}/.SEQ
+		dodir /var/cron/${i}
+		fperms 700 /var/cron/${i}
+		fowners at.at /var/cron/${i}
+		touch ${D}/var/cron/${i}/.SEQ
 	done
 
 	exeinto /etc/init.d
diff --git a/sys-apps/bash/bash-2.04-r4.ebuild b/sys-apps/bash/bash-2.04-r4.ebuild
index a071dceb8c55..5dc50e1eef44 100644
--- a/sys-apps/bash/bash-2.04-r4.ebuild
+++ b/sys-apps/bash/bash-2.04-r4.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2001 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/bash/bash-2.04-r4.ebuild,v 1.6 2001/12/09 07:45:54 drobbins Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bash/bash-2.04-r4.ebuild,v 1.7 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The standard GNU Bourne again shell"
 SRC_URI="ftp://ftp.gnu.org/gnu/bash/${P}.tar.gz"
-
 HOMEPAGE="http://www.gnu.org/software/bash/bash.html"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-4.1-r2 )"
@@ -14,31 +13,41 @@ DEPEND=">=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-4.1-r2 )"
 RDEPEND="virtual/glibc"
 
 src_compile() {
-    local myconf
-    [ "`use readline`" ] && myconf="--with-installed-readline"
-    [ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	./configure --prefix=/ --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST} --disable-profiling --with-curses --enable-static-link ${myconf} || die
+
+	local myconf
+	[ "`use readline`" ] && myconf="--with-installed-readline"
+	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
+	./configure --prefix=/ \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--host=${CHOST} \
+		--disable-profiling \
+		--with-curses \
+		--enable-static-link \
+		${myconf} || die
 	emake || die
 }
 
 src_install() {
-    make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-    dodir /bin
-    mv ${D}/usr/bin/bash ${D}/bin
-    dosym bash /bin/sh
-
-    if [ -z "`use build`" ]
-    then
-	    doman doc/*.1
-
-        if [ -z "`use readline`" ]
-        then
-          doman doc/*.3
-        fi
-	    dodoc README NEWS AUTHORS CHANGES COMPAT COPYING Y2K
-	    dodoc doc/FAQ doc/INTRO
-
-     else
-        rm -rf ${D}/usr
-     fi
+
+	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
+	dodir /bin
+	mv ${D}/usr/bin/bash ${D}/bin
+	dosym bash /bin/sh
+
+	if [ -z "`use build`" ]
+	then
+		doman doc/*.1
+
+		if [ -z "`use readline`" ]
+		then
+			doman doc/*.3
+		fi
+		
+		dodoc README NEWS AUTHORS CHANGES COMPAT COPYING Y2K
+		dodoc doc/FAQ doc/INTRO
+
+	else
+		rm -rf ${D}/usr
+	fi
 }
diff --git a/sys-apps/bzip2/bzip2-1.0.1-r4.ebuild b/sys-apps/bzip2/bzip2-1.0.1-r4.ebuild
index 04fe8ca32b35..b97f2f633269 100644
--- a/sys-apps/bzip2/bzip2-1.0.1-r4.ebuild
+++ b/sys-apps/bzip2/bzip2-1.0.1-r4.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2001 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/bzip2/bzip2-1.0.1-r4.ebuild,v 1.2 2001/10/06 16:44:02 drobbins Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.1-r4.ebuild,v 1.3 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-SRC_URI="ftp://sourceware.cygnus.com/pub/bzip2/v100/${P}.tar.gz ftp://ftp.freesoftware.com/pub/sourceware/bzip2/v100/${P}.tar.gz"
+SRC_URI="ftp://sourceware.cygnus.com/pub/bzip2/v100/${P}.tar.gz
+	ftp://ftp.freesoftware.com/pub/sourceware/bzip2/v100/${P}.tar.gz"
 HOMEPAGE="http://sourceware.cygnus.com/bzip2/"
+
 DEPEND="virtual/glibc"
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 	patch -p0 < ${FILESDIR}/bzip2-1.0.1-Makefile-gentoo.diff
@@ -17,13 +20,16 @@ src_unpack() {
 }
 
 src_compile() {
+
 	if [ -z "`use build`" ]
 	then
 		emake -f Makefile-libbz2_so all || die
 	fi
 	emake all || die
 }
+
 src_install() {
+
 	if [ -z "`use build`" ]
 	then
 		make DESTDIR=${D} install || die
diff --git a/sys-apps/console-data/console-data-1999.08.29-r2.ebuild b/sys-apps/console-data/console-data-1999.08.29-r2.ebuild
index a95c203b9be8..42c2f65c120b 100644
--- a/sys-apps/console-data/console-data-1999.08.29-r2.ebuild
+++ b/sys-apps/console-data/console-data-1999.08.29-r2.ebuild
@@ -1,7 +1,7 @@
-# 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/console-data/console-data-1999.08.29-r2.ebuild,v 1.1 2001/02/07 15:51:27 achim Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-data/console-data-1999.08.29-r2.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Data (fonts, keymaps) for the consoletools package"
@@ -10,25 +10,23 @@ HOMEPAGE="http://altern.org/ydirson/en/lct/data.html"
 
 src_compile() {
 
-	try ./configure --host=${CHOST} --prefix=/usr
+	./configure --host=${CHOST} \
+		--prefix=/usr || die
 	# do not use pmake
-	try make
+	make || die
 
 }
 
 src_install() {
 
-    try make DESTDIR=${D} install
-
-    dodoc ChangeLog
-    docinto txt
-    dodoc doc/README.*
-    docinto txt/fonts
-    dodoc doc/fonts/*
-    docinto txt/keymaps
-    dodoc doc/keymaps/*
-
+	make DESTDIR=${D} install || die
 
+	dodoc ChangeLog
+	docinto txt
+	dodoc doc/README.*
+	docinto txt/fonts
+	dodoc doc/fonts/*
+	docinto txt/keymaps
+	dodoc doc/keymaps/*
 }
 
-
diff --git a/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild b/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild
index 6f2270054aec..a88c7409f1ec 100644
--- a/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild
+++ b/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild
@@ -1,7 +1,7 @@
-# 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/console-tools/console-tools-0.2.3-r4.ebuild,v 1.2 2001/08/09 18:05:42 drobbins Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r4.ebuild,v 1.3 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Console and font utilities"
@@ -17,38 +17,39 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}.patch
-
-    patch -p0 < ${FILESDIR}/${P}-po-Makefile.in.in-gentoo.diff
-	try aclocal
-	try libtoolize --force -c
-	try autoheader
-	try automake -c
-	try autoconf
+	patch -p1 < ${FILESDIR}/${P}.patch || die
+	patch -p0 < ${FILESDIR}/${P}-po-Makefile.in.in-gentoo.diff || die
+	aclocal || die
+	libtoolize --force -c || die
+	autoheader || die
+	automake -c || die
+	autoconf || die
 }
 
 src_compile() {
 
-	local myconf
-
+	local myconf=""
 	if [ "$DEBUG" ]
-        then
-	  myconf="--enable-debugging"
+	then
+		myconf="--enable-debugging"
+	fi
+	if [ -z "`use nls`" ]
+	then
+		myconf="${myconf} --disable-nls"
 	fi
-    if [ -z "`use nls`" ]
-    then
-      myconf="${myconf} --disable-nls"
-    fi
 
-	try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf}
-	try make $MAKEOPTS all
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		${myconf} || die
+	make $MAKEOPTS all || die
 }
 
 src_install() {
 
-    # DESTDIR does not work correct
-    try make DESTDIR=${D} install
-    
+	# DESTDIR does not work correct
+	make DESTDIR=${D} install || die
+
 	if [ -z "`use bootcd`" ]
 	then
 		dodoc BUGS COPYING* CREDITS ChangeLog NEWS README RELEASE TODO
diff --git a/sys-apps/cpio/cpio-2.4.2-r4.ebuild b/sys-apps/cpio/cpio-2.4.2-r4.ebuild
index 644f3ca295e0..384671367caf 100644
--- a/sys-apps/cpio/cpio-2.4.2-r4.ebuild
+++ b/sys-apps/cpio/cpio-2.4.2-r4.ebuild
@@ -1,20 +1,16 @@
-# 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/cpio/cpio-2.4.2-r4.ebuild,v 1.3 2001/11/24 18:36:40 drobbins Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.4.2-r4.ebuild,v 1.4 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A file archival tool which can also read and write tar files"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/cpio/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
+
 DEPEND="virtual/glibc"
 RDEPEND="virtual/glibc"
 
-src_compile() {
-	./configure --host=${CHOST} --prefix=/usr || die
-	emake || die
-}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -24,6 +20,12 @@ src_unpack() {
 	sed -e "85d" userspec.c.orig > userspec.c
 }
 
+src_compile() {
+	./configure --host=${CHOST} \
+		--prefix=/usr || die
+	emake || die
+}
+
 src_install() {
 	#our official mt is now the mt in app-arch/mt-st (supports Linux 2.4, unlike this one)
 	dobin cpio
diff --git a/sys-apps/daemontools/daemontools-0.76-r1.ebuild b/sys-apps/daemontools/daemontools-0.76-r1.ebuild
index bddf94c072bb..c660413ac25e 100644
--- a/sys-apps/daemontools/daemontools-0.76-r1.ebuild
+++ b/sys-apps/daemontools/daemontools-0.76-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Geert Bevin <gbevin@theleaf.be>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r1.ebuild,v 1.1 2001/12/07 17:55:16 gbevin Exp $
-
+# Maintainer: Geert Bevin <gbevin@theleaf.be>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r1.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/admin/${P}
 DESCRIPTION="Collection of tools for managing UNIX services"
@@ -13,42 +12,38 @@ DEPEND="virtual/glibc"
 
 src_unpack() {
 
-    unpack ${A}
-
-    cd ${S}
-    echo "gcc ${CFLAGS}" > src/conf-cc
-    echo "gcc" > src/conf-ld
-    echo ${S} > src/home
+	unpack ${A}
 
+	cd ${S}
+	echo "gcc ${CFLAGS}" > src/conf-cc
+	echo "gcc" > src/conf-ld
+	echo ${S} > src/home
 }
 
 src_compile() {
 
-    cd ${S}/src
-    emake || die
-
+	cd ${S}/src
+	emake || die
 }
 
 src_install() {
 
-    einfo "Creating service directory ..."
-    dodir /service
+	einfo "Creating service directory ..."
+	dodir /service
 	touch ${D}/service/.keep
 
-    einfo "Installing package ..."
-    cd ${S}/src
-    exeinto /usr/bin
-    for x in `cat ../package/commands`; do
-        doexe $x
-    done
-    dodoc CHANGES ../package/README TODO
-
-    einfo "Installing the svscan startup file ..."
-    insinto /etc/init.d
-    insopts -m755
-    doins ${FILESDIR}/svscan
-
+	einfo "Installing package ..."
+	cd ${S}/src
+	exeinto /usr/bin
+	for x in `cat ../package/commands`
+	do
+		doexe $x
+	done
+	dodoc CHANGES ../package/README TODO
+
+	einfo "Installing the svscan startup file ..."
+	insinto /etc/init.d
+	insopts -m755
+	doins ${FILESDIR}/svscan
 }
 
-
-
diff --git a/sys-apps/dcron/dcron-2.7-r6.ebuild b/sys-apps/dcron/dcron-2.7-r6.ebuild
index d795f1e26748..aececc5d03fa 100644
--- a/sys-apps/dcron/dcron-2.7-r6.ebuild
+++ b/sys-apps/dcron/dcron-2.7-r6.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>, Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r6.ebuild,v 1.3 2001/11/13 18:32:30 azarah Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r6.ebuild,v 1.4 2001/12/31 23:47:55 azarah Exp $
 
 # to use this, you must be part of the "cron" group
 
diff --git a/sys-apps/debianutils/debianutils-1.13.3-r4.ebuild b/sys-apps/debianutils/debianutils-1.13.3-r4.ebuild
index 7f329d74a14c..5a580d4eb386 100644
--- a/sys-apps/debianutils/debianutils-1.13.3-r4.ebuild
+++ b/sys-apps/debianutils/debianutils-1.13.3-r4.ebuild
@@ -1,7 +1,7 @@
-# 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/debianutils/debianutils-1.13.3-r4.ebuild,v 1.2 2001/08/04 18:22:45 pete Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.13.3-r4.ebuild,v 1.3 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A selection of tools from Debian"
@@ -11,20 +11,19 @@ DEPEND="virtual/glibc"
 
 src_unpack() {
 
-    unpack ${A}
-    cd ${S}
-    patch -p0 < ${FILESDIR}/${P}-Makefile-gentoo.diff
-
+	unpack ${A}
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${P}-Makefile-gentoo.diff
 }
 
 src_compile() {
 
-    if [ -z "`use static`" ]
-    then
-	    try pmake
-    else
-        try pmake LDFLAGS=-static
-    fi
+	if [ -z "`use static`" ]
+	then
+		pmake || die
+	else
+		pmake LDFLAGS=-static || die
+	fi
 }
 
 
@@ -33,12 +32,12 @@ src_install() {
 	into /
 	dobin readlink tempfile mktemp
 
-    if [ -z "`use build`" ]
-    then
-        dobin run-parts
-	    insopts -m755
-	    exeinto /usr/sbin
-	    doexe savelog
+	if [ -z "`use build`" ]
+	then
+		dobin run-parts
+		insopts -m755
+		exeinto /usr/sbin
+		doexe savelog
 		
 		if [ -z "`use bootcd`" ]
 		then
@@ -48,9 +47,6 @@ src_install() {
 			cd debian
 			dodoc changelog control copyright
 		fi
-    fi
-
+	fi
 }
 
-
-
diff --git a/sys-apps/devfsd/devfsd-1.3.20.ebuild b/sys-apps/devfsd/devfsd-1.3.20.ebuild
index decfd05c3cc0..22cf79811b0c 100644
--- a/sys-apps/devfsd/devfsd-1.3.20.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.20.ebuild
@@ -1,7 +1,7 @@
-# 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 et al <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.20.ebuild,v 1.5 2001/12/06 22:11:34 drobbins Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.20.ebuild,v 1.6 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Daemon for the Linux Device Filesystem"
@@ -28,7 +28,7 @@ src_compile() {
 }
 
 src_install() {
-  	dodir /sbin /usr/share/man /etc
+	dodir /sbin /usr/share/man /etc
 	make PREFIX=${D} install || die
 	rm -f ${D}/etc/devfsd.conf
 }
diff --git a/sys-apps/diffutils/diffutils-2.7.5.ebuild b/sys-apps/diffutils/diffutils-2.7.5.ebuild
index b58006acd6ef..59090e2bbf15 100644
--- a/sys-apps/diffutils/diffutils-2.7.5.ebuild
+++ b/sys-apps/diffutils/diffutils-2.7.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2001 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/diffutils/diffutils-2.7.5.ebuild,v 1.1 2001/12/17 12:36:41 azarah Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.7.5.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools to make diffs and compare files"
@@ -24,20 +24,27 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
+	local myconf=""
 	[ -z "`use nls`" ] && myconf="--disable-nls"
-	./configure --host=${CHOST} --prefix=/usr ${myconf} || die
+	./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
+		sed -e 's/^all: ${PROGRAMS} info/all: ${PROGRAMS}/g' \
+			Makefile.orig > Makefile
 	fi
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr infodir=${D}/usr/share/info install || die
+	make prefix=${D}/usr \
+		infodir=${D}/usr/share/info \
+		install || die
+		
 	if [ -z "`use build`" ]
 	then
 		dodoc COPYING ChangeLog NEWS README
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.25-r3.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.25-r3.ebuild
index 346968985045..271b967c5497 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.25-r3.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.25-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.25-r3.ebuild,v 1.3 2001/12/19 16:20:13 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.25-r3.ebuild,v 1.4 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
-DESCRIPTION="Standard ext2 and ext3 filesystem utilities"
+DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.gz"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 
@@ -20,7 +20,13 @@ src_compile() {
 	else
 		myconf="--disable-nls"
 	fi
-	./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-dynamic-e2fsck --enable-elf-shlibs ${myconf} || die
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-dynamic-e2fsck \
+		--enable-elf-shlibs \
+		${myconf} || die
 	# Parallel make sometimes fails
 	make || die
 }
diff --git a/sys-apps/ed/ed-0.2-r3.ebuild b/sys-apps/ed/ed-0.2-r3.ebuild
index ebcdcdb9c045..dba1bda1205a 100644
--- a/sys-apps/ed/ed-0.2-r3.ebuild
+++ b/sys-apps/ed/ed-0.2-r3.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r3.ebuild,v 1.3 2001/11/24 18:36:40 drobbins Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r3.ebuild,v 1.4 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Your basic line editor"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/ed/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/ed/"
+
 DEPEND="virtual/glibc sys-apps/texinfo"
 
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die
 }
 
 src_compile() {  
@@ -22,7 +22,11 @@ src_compile() {
 }
 
 src_install() {                               
-	make prefix=${D}/ mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info install || die
+	make prefix=${D}/ \
+		mandir=${D}/usr/share/man/man1 \
+		infodir=${D}/usr/share/info \
+		install || die
+		
 	if [ -z "`use bootcd`" ]
 	then
 		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 3fcb3209b051..836f55801afe 100644
--- a/sys-apps/eject/eject-2.0.6.ebuild
+++ b/sys-apps/eject/eject-2.0.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2001 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/eject/eject-2.0.6.ebuild,v 1.2 2001/10/06 16:51:30 drobbins Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.6.ebuild,v 1.3 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
@@ -11,8 +11,9 @@ HOMEPAGE="http://www.pobox.com/~tranter/eject.html"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	./configure --prefix=/usr --mandir=/usr/share/man || die
-	make 
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man || die
+	make || die
 }
 
 src_install () {
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 76c86bc8daa7..3c17e7981b69 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# 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 $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.3 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A utility to set the framebuffer videomode"
diff --git a/sys-apps/file/file-3.37.ebuild b/sys-apps/file/file-3.37.ebuild
index fb1e079f486e..038ceb93acab 100644
--- a/sys-apps/file/file-3.37.ebuild
+++ b/sys-apps/file/file-3.37.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2001 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/file/file-3.37.ebuild,v 1.1 2001/11/02 08:45:05 woodchip Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.37.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
@@ -12,9 +12,10 @@ DEPEND="virtual/glibc"
 
 src_compile() {
 
-	./configure \
-	--prefix=/usr --mandir=/usr/share/man \
-	--datadir=/usr/share/misc --host=${CHOST} || die
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share/misc \
+		--host=${CHOST} || die
 
 	emake || die
 }
diff --git a/sys-apps/fileutils/fileutils-4.1.4.ebuild b/sys-apps/fileutils/fileutils-4.1.4.ebuild
index 9ec9da86ee99..f0e7fb1edf12 100644
--- a/sys-apps/fileutils/fileutils-4.1.4.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>, Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.4.ebuild,v 1.1 2001/12/17 13:57:28 azarah Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.4.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
@@ -14,12 +14,20 @@ RDEPEND="virtual/glibc"
 src_compile() {
 	local myconf
 	[ -z "`use nls`" ] && myconf="--disable-nls"
-	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --bindir=/bin ${myconf} || die
+	./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 || die
+	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
diff --git a/sys-apps/findutils/findutils-4.1.7.ebuild b/sys-apps/findutils/findutils-4.1.7.ebuild
index a5b5ac35b56f..b9be9af5c315 100644
--- a/sys-apps/findutils/findutils-4.1.7.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7.ebuild,v 1.2 2001/12/18 22:59:22 azarah Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7.ebuild,v 1.3 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU utilities to find files"
@@ -12,15 +11,24 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 DEPEND="virtual/glibc sys-devel/gettext"
 RDEPEND="virtual/glibc"
 
-
 src_compile() {
-	./configure --host=${CHOST} --prefix=/usr --localstatedir=/var/spool/locate || die
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--localstatedir=/var/spool/locate || die
 	emake libexecdir=/usr/lib/find || die
 }
 
 src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info \
-		localstatedir=/var/spool/locate libexecdir=${D}/usr/lib/find install || die
+	#do not change 'localstatedir=/var/spool/locate' to
+	#'localstatedir=${D}/var/spool/locate', as it will then be hardcoded
+	#into locate and updatedb
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		localstatedir=/var/spool/locate \
+		libexecdir=${D}/usr/lib/find \
+		install || die
+		
 	dosed "s:TMPDIR=/usr/tmp:TMPDIR=/tmp:" usr/bin/updatedb
 	rm -rf ${D}/usr/var
 	if [ -z "`use build`" ] 
diff --git a/sys-apps/gawk/gawk-3.1.0.ebuild b/sys-apps/gawk/gawk-3.1.0.ebuild
index 400a9584b817..fb60e701f6c1 100644
--- a/sys-apps/gawk/gawk-3.1.0.ebuild
+++ b/sys-apps/gawk/gawk-3.1.0.ebuild
@@ -1,21 +1,30 @@
-# Copyright 1999-2001 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/gawk/gawk-3.1.0.ebuild,v 1.3 2001/12/21 20:47:26 azarah Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.0.ebuild,v 1.4 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU awk pattern-matching language"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
+
 DEPEND="virtual/glibc"
 
 src_compile() {
-	./configure --prefix=/usr --libexecdir=/usr/lib/awk --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST} || die
+	./configure --prefix=/usr \
+		--libexecdir=/usr/lib/awk \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--host=${CHOST} || die
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/awk install || die
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		libexecdir=${D}/usr/lib/awk \
+		install || die
 	cd ${D}/usr/bin
 	rm gawk
 	ln -s gawk-${PV} gawk
diff --git a/sys-apps/gluelog/gluelog-1.0-r2.ebuild b/sys-apps/gluelog/gluelog-1.0-r2.ebuild
index 44e29dc3cc58..19bcf50ba9c5 100644
--- a/sys-apps/gluelog/gluelog-1.0-r2.ebuild
+++ b/sys-apps/gluelog/gluelog-1.0-r2.ebuild
@@ -1,7 +1,7 @@
-# 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/gluelog/gluelog-1.0-r2.ebuild,v 1.1 2001/02/07 15:51:27 achim Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/gluelog-1.0-r2.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Pipe and socket fittings for the system and kernel logs"
@@ -14,8 +14,8 @@ src_compile() {
 	mkdir ${S}
 
 	cd ${FILESDIR}
-	try gcc ${CFLAGS} gluelog.c -o ${S}/gluelog
-	try gcc ${CFLAGS} glueklog.c -o ${S}/glueklog
+	gcc ${CFLAGS} gluelog.c -o ${S}/gluelog || die
+	gcc ${CFLAGS} glueklog.c -o ${S}/glueklog || die
 }
 
 src_install() {
@@ -35,6 +35,5 @@ src_install() {
 	done
 
         dodoc ${FILESDIR}/README
-
 }
 
diff --git a/sys-apps/grep/grep-2.4.2-r5.ebuild b/sys-apps/grep/grep-2.4.2-r5.ebuild
index 178df754ca4f..14d9063ae311 100644
--- a/sys-apps/grep/grep-2.4.2-r5.ebuild
+++ b/sys-apps/grep/grep-2.4.2-r5.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2001 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/grep/grep-2.4.2-r5.ebuild,v 1.1 2001/12/17 21:32:00 azarah Exp $
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.4.2-r5.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU regular expression matcher"
 SRC_URI="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 )"
 RDEPEND="virtual/glibc"
 
 src_compile() {
 	local myconf
 	[ -z "`use nls`" ] && myconf="--disable-nls"
-	./configure --prefix=/usr --bindir=/bin --mandir=/usr/share/man \
-		--infodir=/usr/share/info --host=${CHOST} ${myconf} || die
+	./configure --prefix=/usr \
+		--bindir=/bin \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--host=${CHOST} \
+		${myconf} || die
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr bindir=${D}/bin mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info install || die
+	make prefix=${D}/usr \
+		bindir=${D}/bin \
+		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