lintool fixes for #9258

29 files changed, 205 insertions, 274 deletions

diff --git a/sys-apps/quik/quik-2.0.1.0-r1.ebuild b/sys-apps/quik/quik-2.0.1.0-r1.ebuild
index 2cf30eb0121d..05a98cf39f9f 100644
--- a/sys-apps/quik/quik-2.0.1.0-r1.ebuild
+++ b/sys-apps/quik/quik-2.0.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1.0-r1.ebuild,v 1.8 2002/10/19 02:52:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quik/quik-2.0.1.0-r1.ebuild,v 1.9 2002/10/19 03:21:24 vapier Exp $
 
 inherit mount-boot
 
@@ -49,7 +49,7 @@ src_install() {
 	install -m 644 man/quik.8 man/bootstrap.8 \
 			${D}/usr/share/man/man8 || DIE
 
-	install -m 444 first/first.b second/second.b	\
+	install -m 444 first/first.b second/second.b \
 					second/second ${D}/boot || die
 	install -m 644 etc/quik.conf ${D}/etc || die
 }
diff --git a/sys-apps/raidtools/raidtools-0.90-r2.ebuild b/sys-apps/raidtools/raidtools-0.90-r2.ebuild
index ec1ce502ad3b..410cc590264d 100644
--- a/sys-apps/raidtools/raidtools-0.90-r2.ebuild
+++ b/sys-apps/raidtools/raidtools-0.90-r2.ebuild
@@ -1,32 +1,33 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-0.90-r2.ebuild,v 1.11 2002/10/04 06:29:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-0.90-r2.ebuild,v 1.12 2002/10/19 03:21:24 vapier Exp $
 
 S=${WORKDIR}/raidtools-0.90
 DESCRIPTION="Linux RAID 0/1/4/5 utilities"
 SRC_URI="http://people.redhat.com/mingo/raid-patches/raidtools-dangerous-0.90-20000116.tar.gz"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 HOMEPAGE="http://people.redhat.com/mingo/raidtools/"
 KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
 LICENSE="GPL-2"
 
 src_compile() {
-    ./configure || die
-    cp Makefile Makefile.orig
-    sed -e "s/-O2//" -e "s/ -g/ /" Makefile.orig > Makefile
-    #emake appears to kill this every now and then (drobbins, 15 Sep 2002)
+	./configure || die
+	cp Makefile Makefile.orig
+	sed -e "s/-O2//" -e "s/ -g/ /" Makefile.orig > Makefile
+	#emake appears to kill this every now and then (drobbins, 15 Sep 2002)
 	make || die
 }
 
 src_install() {
-    into /
-    dosbin mkraid raidstart mkpv
-    for x in raidstop raidhotadd raidhotremove raidsetfaulty
-    do
+	into /
+	dosbin mkraid raidstart mkpv
+	for x in raidstop raidhotadd raidhotremove raidsetfaulty
+	do
 		dosym raidstart /sbin/${x}
-    done
-    dosym mkraid /sbin/raid0run
+	done
+	dosym mkraid /sbin/raid0run
 
 	if [ -z "`use build`" ]
 	then
@@ -40,4 +41,3 @@ src_install() {
 		dodoc *.sample
 	fi
 }
-
diff --git a/sys-apps/s3switch/s3switch-19990826.ebuild b/sys-apps/s3switch/s3switch-19990826.ebuild
index a4ee82a51005..7144e3edd395 100644
--- a/sys-apps/s3switch/s3switch-19990826.ebuild
+++ b/sys-apps/s3switch/s3switch-19990826.ebuild
@@ -1,6 +1,6 @@
-#Copyright 2002 Gentoo Technologies, Inc.
-#Distributed under the terms of the GNU General Public License v2
-#$Header: /var/cvsroot/gentoo-x86/sys-apps/s3switch/s3switch-19990826.ebuild,v 1.6 2002/10/04 06:29:43 vapier Exp $
+# Copyright 2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s3switch/s3switch-19990826.ebuild,v 1.7 2002/10/19 03:21:24 vapier Exp $
 
 DESCRIPTION="S3 video chipset output selection utility"
 HOMEPAGE="http://www.probo.com/timr/savage40.html"
@@ -13,13 +13,13 @@ S=${WORKDIR}
 
 RDEPEND="virtual/glibc
 	app-arch/unzip"
-DEPEND="$RDEPEND"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	dobin s3switch
 	doman s3switch.1x
 }
diff --git a/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild b/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild
index 3a36067418c9..9dc76747444f 100644
--- a/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild
+++ b/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild,v 1.7 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild,v 1.8 2002/10/19 03:21:24 vapier Exp $
 
 IUSE="nls static build"
 
@@ -10,15 +10,14 @@ SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/shellutils/shellutils.html"
 
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
-
 RDEPEND="virtual/glibc"
 
 SLOT="0"
-LICENSE="GPL"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${A}
 	cd ${S}
 
 	# patch to remove Stallman's su/wheel group rant and to add processor
@@ -90,4 +89,3 @@ pkg_postinst() {
 		rm -f ${ROOT}/usr/bin/hostname
 	fi
 }
-
diff --git a/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild b/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild
index 76bd280b32b4..41d03bf3097b 100644
--- a/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild
+++ b/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild,v 1.7 2002/10/04 06:30:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild,v 1.8 2002/10/19 03:21:24 vapier Exp $
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 DESCRIPTION="Tools to deal with shar archives"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/sharutils/${A}"
+SRC_URI="ftp://prep.ai.mit.edu/gnu/sharutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
 KEYWORDS="x86"
 SLOT="0"
@@ -13,42 +12,36 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc sys-apps/texinfo >=sys-devel/gettext-0.10.35"
 RDEPEND="virtual/glibc"
 
-
 src_unpack() {
-
-     unpack ${A}
-     cd ${WORKDIR}
-     patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-     cd ${S}/po
-     mv nl.po nl.po.orig
-     sed -e 's/aangemaakt/aangemaakt\\n/' nl.po.orig > nl.po
-     mv pt.po pt.po.orig
-     sed -e 's/de %dk/de %dk\\n/' pt.po.orig > pt.po
-
+	unpack ${A}
+	cd ${WORKDIR}
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	cd ${S}/po
+	mv nl.po nl.po.orig
+	sed -e 's/aangemaakt/aangemaakt\\n/' nl.po.orig > nl.po
+	mv pt.po pt.po.orig
+	sed -e 's/de %dk/de %dk\\n/' pt.po.orig > pt.po
 }
 
 src_compile() {
-
-	try ./configure --host=${CHOST} --prefix=/usr
-	try make ${MAKEOPTS} localedir=/usr/share/locale
+	./configure --host=${CHOST} --prefix=/usr || die
+	make ${MAKEOPTS} localedir=/usr/share/locale || die
 }
 
 src_install() {
-
-	try make prefix=${D}/usr localedir=${D}/usr/share/locale infodir=${D}/usr/share/info install
+	make prefix=${D}/usr localedir=${D}/usr/share/locale \
+		infodir=${D}/usr/share/info install || die
 
 	doman doc/*.[15]
         #Remove some strange locals
         cd ${D}/usr/share/locale
-        for i in *.
-        do
-           rm -rf ${i}
-        done
+	for i in *.
+	do
+		rm -rf ${i}
+	done
 	rm -rf ${D}/usr/lib
 
 	cd ${S}
 	dodoc AUTHORS BACKLOG COPYING ChangeLog ChangeLog.OLD \
 	      NEWS README README.OLD THANKS TODO
 }
-
-
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
index 28ba511b1f9f..88e29342c7d1 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9.ebuild,v 1.8 2002/10/19 03:21:24 vapier Exp $
 
 S=${WORKDIR}/${P}.orig
 DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
 SRC_URI=" http://http.us.debian.org/debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
-HOMEPAGE="http://www.debian.org"
+HOMEPAGE="http://www.debian.org/"
 KEYWORDS="sparc sparc64 -x86 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
@@ -17,7 +18,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	CFLAGS="-O3"
 	cd ${S}
 	emake -C elftoaout-2.3 CFLAGS="$CFLAGS" || die
@@ -31,7 +31,6 @@ src_compile() {
 }
 
 src_install() {
-
 	mkdir -p ${D}/usr/bin ${D}/usr/sbin ${D}/etc/init.d ${D}/etc/default
 	dodir /usr/bin
 	install -s elftoaout-2.3/elftoaout ${D}/usr/bin
@@ -44,12 +43,12 @@ src_install() {
 	install -s audioctl-1.3/audioctl ${D}/usr/bin
 	# install /etc/init.d script & /etc/default scripts
 	install -d -m 755 ${D}/etc ${D}/etc/init.d ${D}/etc/default
-    #install -m 755 debian/audioctl ${D}/etc/init.d
-    install -m 755 debian/audioctl.def ${D}/etc/default/audioctl
+	#install -m 755 debian/audioctl ${D}/etc/init.d
+	install -m 755 debian/audioctl.def ${D}/etc/default/audioctl
 
 	# Todo: Somehow set this automatically
-    echo "=============================================================="
-    echo "WARNING - You should make sure /dev/openprom exists. If you're"
+	echo "=============================================================="
+	echo "WARNING - You should make sure /dev/openprom exists. If you're"
 	echo "not using devfs and /dev/openprom does not exist, then issue the"
 	echo "command:"
 	echo "cd /dev; mknod openprom c 10 139"
diff --git a/sys-apps/star/star-1.3_alpha8-r2.ebuild b/sys-apps/star/star-1.3_alpha8-r2.ebuild
index 73d03e1a72fd..3c947303897e 100644
--- a/sys-apps/star/star-1.3_alpha8-r2.ebuild
+++ b/sys-apps/star/star-1.3_alpha8-r2.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.3_alpha8-r2.ebuild,v 1.7 2002/10/04 06:30:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.3_alpha8-r2.ebuild,v 1.8 2002/10/19 03:21:24 vapier Exp $
 
-A=star-1.3a8.tar.gz
+MY_P="${P}a8"
 S=${WORKDIR}/star-1.3
 
 DESCRIPTION="An enhanced (world's fastest) tar, as well as enhanced mt/rmt"
-SRC_URI="ftp://ftp.fokus.gmd.de/pub/unix/star/alpha/${A}"
+SRC_URI="ftp://ftp.fokus.gmd.de/pub/unix/star/alpha/${P}.tar.gz"
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html"
 KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -21,11 +22,11 @@ src_unpack() {
 }
 
 src_compile() {
-	try make COPTX="${CFLAGS}"
+	make COPTX="${CFLAGS}" || die
 }
 
 src_install() {
-	try make install INS_BASE=${D}/usr
+	make install INS_BASE=${D}/usr || die
 	insinto /etc/default
 	newins ${S}/rmt/rmt.dfl rmt
 	#the mt in app-arch/mt-st is better
@@ -41,5 +42,3 @@ src_install() {
 	dosym rmt.star /usr/sbin/rmt
 	dosym rmt.1.gz /usr/share/man/man1/rmt.star.1.gz
 }
-
-
diff --git a/sys-apps/star/star-1.4_alpha15.ebuild b/sys-apps/star/star-1.4_alpha15.ebuild
index 6a4c846471d3..9059ae06afc8 100644
--- a/sys-apps/star/star-1.4_alpha15.ebuild
+++ b/sys-apps/star/star-1.4_alpha15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.4_alpha15.ebuild,v 1.6 2002/10/04 06:30:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.4_alpha15.ebuild,v 1.7 2002/10/19 03:21:24 vapier Exp $
 
 S=${WORKDIR}/star-1.4
 
@@ -11,6 +11,7 @@ KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -20,11 +21,11 @@ src_unpack() {
 }
 
 src_compile() {
-	try make COPTX="${CFLAGS}"
+	make COPTX="${CFLAGS}" || die
 }
 
 src_install() {
-	try make install INS_BASE=${D}/usr
+	make install INS_BASE=${D}/usr || die
 	insinto /etc/default
 	newins ${S}/rmt/rmt.dfl rmt
 	#the mt in app-arch/mt-st is better
diff --git a/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild b/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
index bbcf9d6a0ad9..3e54858418ad 100644
--- a/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
+++ b/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
@@ -1,64 +1,56 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild,v 1.9 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild,v 1.10 2002/10/19 03:21:24 vapier Exp $
 
 IUSE="gtk"
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="strace meets expect"
-
-SRC_URI="mirror://sourceforge/subterfugue/subterfugue-0.2.tgz"
-
-HOMEPAGE="http://www.subterfugue.org"
+SRC_URI="mirror://sourceforge/subterfugue/${P}.tgz"
+HOMEPAGE="http://www.subterfugue.org/"
 KEYWORDS="x86 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=dev-lang/python-2.0
         gtk? ( =x11-libs/gtk+-1.2* )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
+	unpack ${A}
 
-    unpack ${P}.tgz
-    
-    cd ${S}
+	cd ${S}
     
-    cp Makefile Makefile.orig
-    sed "s/python1.5/python2.0/" < Makefile.orig > Makefile
+	cp Makefile Makefile.orig
+	sed "s/python1.5/python2.0/" < Makefile.orig > Makefile
 }
 
 src_compile() {
-
-    # breaks down with emake
-    make || die
-    
-    cp dsf dsf.orig
-    sed -e "s:SUBTERFUGUE_ROOT=.*:SUBTERFUGUE_ROOT=/usr/share/subterfuge/:" \
-    < dsf.orig > sf
+	# breaks down with emake
+	make || die
     
+	cp dsf dsf.orig
+	sed -e "s:SUBTERFUGUE_ROOT=.*:SUBTERFUGUE_ROOT=/usr/share/subterfuge/:" \
+		< dsf.orig > sf
 }
 
-src_install () {
-	
-    into /usr
+src_install() {
+	into /usr
 
-    dobin sf
-    
-    dodoc COPYING CREDITS GNU-entry INSTALL INTERNALS NEWS README TODO
-    
-    doman doc/sf.1
+	dobin sf
 
-    SH=/usr/share/subterfuge
-        
-    exeinto ${SH}
-    doexe *.{py,pyc}
+	dodoc COPYING CREDITS GNU-entry INSTALL INTERNALS NEWS README TODO
 
-    exeinto ${SH}/tricks
-    doexe tricks/*.{py,pyc}
-    
-    exeinto ${SH}/modules
-    doexe modules/*.so
-    
-}
+	doman doc/sf.1
+
+	SH=/usr/share/subterfuge
 
+	exeinto ${SH}
+	doexe *.{py,pyc}
+
+	exeinto ${SH}/tricks
+	doexe tricks/*.{py,pyc}
+
+	exeinto ${SH}/modules
+	doexe modules/*.so
+}
diff --git a/sys-apps/tar/tar-1.13.25-r1.ebuild b/sys-apps/tar/tar-1.13.25-r1.ebuild
index 0530acf1844b..d7b3b0249d61 100644
--- a/sys-apps/tar/tar-1.13.25-r1.ebuild
+++ b/sys-apps/tar/tar-1.13.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r1.ebuild,v 1.6 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.25-r1.ebuild,v 1.7 2002/10/19 03:21:24 vapier Exp $
 
 IUSE="nls static build"
 
@@ -14,14 +14,13 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc nls? ( >=sys-devel/gettext-0.10.35 )"
-
 RDEPEND="virtual/glibc"
 
 src_compile() {
 	local myconf
 	[ -z "`use nls`" ] && myconf="--disable-nls"
 	./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/lib/misc \
-	--infodir=/usr/share/info --host=${CHOST} ${myconf} || die
+		--infodir=/usr/share/info --host=${CHOST} ${myconf} || die
 	if [ -z "`use static`" ]
 	then
 		emake || die
diff --git a/sys-apps/tcb/tcb-0.9.7.4.ebuild b/sys-apps/tcb/tcb-0.9.7.4.ebuild
index 4271ec3e25d1..2db8f03e3e05 100644
--- a/sys-apps/tcb/tcb-0.9.7.4.ebuild
+++ b/sys-apps/tcb/tcb-0.9.7.4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.7.4.ebuild,v 1.3 2002/10/19 03:21:24 vapier Exp $
 
 S=${WORKDIR}/${P}
 
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild
index 1b2d25077ce5..e30faa226595 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild,v 1.5 2002/10/04 06:31:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild,v 1.6 2002/10/19 03:21:25 vapier Exp $
 
 MY_P="tcp_wrappers_${PV}"
 PATCH0="${MY_P}.dif"
@@ -11,32 +11,29 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
 KEYWORDS="x86 sparc sparc64"
 SLOT="0"
-LICENSE="Freeware"
+LICENSE="freedist"
 DEPEND="virtual/glibc"
-
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
-	
+
 	cd ${S}/
 	patch -p0 < ${FILESDIR}/${PATCH0} || die
 	gzip -dc ${FILESDIR}/${PATCH1} | patch -p2 || die
-	
+
 	cp Makefile Makefile.orig
 	sed -e "s/-O2/${CFLAGS}/" \
 		-e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" Makefile.orig > Makefile
 }
 
 src_compile() {
-
 	make ${MAKEOPTS} \
 		REAL_DAEMON_DIR=/usr/sbin \
 		linux || die
 }
 
 src_install() {
-
 	dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
 	doman *.[358]
 	dosym hosts_access.5.gz /usr/share/man/man5/hosts.allow.5.gz
@@ -47,4 +44,3 @@ src_install() {
 
 	dodoc BLURB CHANGES DISCLAIMER README*
 }
-
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
index 1875ad3dae6f..5755217f697a 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild,v 1.7 2002/10/04 06:31:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild,v 1.8 2002/10/19 03:21:25 vapier Exp $
 
 MY_P="tcp_wrappers_${PV}"
 PATCH0="${MY_P}.dif"
@@ -12,12 +12,11 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 SLOT="0"
-LICENSE="Freeware"
+LICENSE="freedist"
 DEPEND="virtual/glibc"
-
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
 	
 	cd ${S}/
@@ -30,20 +29,17 @@ src_unpack() {
 		-e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" Makefile.orig > Makefile
 
 	if [ ${ARCH} == "alpha" ]; then
-        patch -p1 < ${FILESDIR}/tcp_wrappers_7.6-alpha-fpic-fix.patch
-    fi
-
+		patch -p1 < ${FILESDIR}/tcp_wrappers_7.6-alpha-fpic-fix.patch
+	fi
 }
 
 src_compile() {
-
 	make ${MAKEOPTS} \
 		REAL_DAEMON_DIR=/usr/sbin \
 		linux || die
 }
 
 src_install() {
-
 	dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
 	doman *.[358]
 	dosym hosts_access.5.gz /usr/share/man/man5/hosts.allow.5.gz
@@ -54,4 +50,3 @@ src_install() {
 
 	dodoc BLURB CHANGES DISCLAIMER README*
 }
-
diff --git a/sys-apps/time/time-1.7-r1.ebuild b/sys-apps/time/time-1.7-r1.ebuild
index 41f677b3c6f9..de2e5de63e69 100644
--- a/sys-apps/time/time-1.7-r1.ebuild
+++ b/sys-apps/time/time-1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7-r1.ebuild,v 1.6 2002/10/04 06:31:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7-r1.ebuild,v 1.7 2002/10/19 03:21:25 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command that displays info about resources used by a program"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure --prefix=/usr \
@@ -26,9 +27,9 @@ END-INFO-DIR-ENTRY" > temp
 	sed -e '/^trans/r temp' < time.info > time.info.new
 	mv time.info.new time.info
 
-        make prefix=${D}/usr sysconfdir=${D}/etc mandir=${D}/usr/share/man install || die
+	make prefix=${D}/usr sysconfdir=${D}/etc mandir=${D}/usr/share/man install || die
 	gzip -9 ${D}/usr/info/time.info
-        dodoc ChangeLog COPYING README
-        dodoc AUTHORS NEWS
+	dodoc ChangeLog COPYING README
+	dodoc AUTHORS NEWS
 }
 
diff --git a/sys-apps/time/time-1.7.ebuild b/sys-apps/time/time-1.7.ebuild
index b517bcea9352..f682f79d33ba 100644
--- a/sys-apps/time/time-1.7.ebuild
+++ b/sys-apps/time/time-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7.ebuild,v 1.3 2002/10/04 06:31:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7.ebuild,v 1.4 2002/10/19 03:21:25 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command that displays info about resources used by a program"
@@ -11,16 +11,16 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-        ./configure --prefix=/usr \
-                --mandir=/usr/share/man || die
-        emake || die
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man || die
+	emake || die
 }
 
-src_install () {
-        make prefix=${D}/usr sysconfdir=${D}/etc mandir=${D}/usr/share/man install || die
-        dodoc ChangeLog COPYING README
-        dodoc AUTHORS NEWS
+src_install() {
+	make prefix=${D}/usr sysconfdir=${D}/etc mandir=${D}/usr/share/man install || die
+	dodoc ChangeLog COPYING README
+	dodoc AUTHORS NEWS
 }
-
diff --git a/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild b/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild
index f68d8442b986..c811251bfe77 100644
--- a/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild
+++ b/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild,v 1.11 2002/10/04 06:31:31 vapier Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tmpreaper/tmpreaper-1.4.12.ebuild,v 1.12 2002/10/19 03:21:25 vapier Exp $
 
 MYP="tmpreaper_1.4.12"
 S=${WORKDIR}/${P}
@@ -14,20 +13,17 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
-   try make CFLAGS="${CFLAGS}" all
-
+	make CFLAGS="${CFLAGS}" all || die
 }
 
-src_install () {
-
-   dosbin tmpreaper
-   doman tmpreaper.8
-   dodoc ChangeLog 
-   #added debian/* files for people who want cron.daily and related files.
-   cd debian
-   dodoc changelog conffiles copyright cron.daily dirs
-
+src_install() {
+	dosbin tmpreaper
+	doman tmpreaper.8
+	dodoc ChangeLog 
+	#added debian/* files for people who want cron.daily and related files.
+	cd debian
+	dodoc changelog conffiles copyright cron.daily dirs
 }
diff --git a/sys-apps/tpctl/tpctl-3.2.ebuild b/sys-apps/tpctl/tpctl-3.2.ebuild
index 8d67ec9ccfe5..74f364988aeb 100644
--- a/sys-apps/tpctl/tpctl-3.2.ebuild
+++ b/sys-apps/tpctl/tpctl-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpctl/tpctl-3.2.ebuild,v 1.8 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tpctl/tpctl-3.2.ebuild,v 1.9 2002/10/19 03:21:25 vapier Exp $
 
 IUSE="ncurses tpctlir perl"
 
@@ -20,7 +20,6 @@ DEPEND="$DEPEND sys-apps/thinkpad ncurses? ( sys-libs/ncurses )"
 RDEPEND="$RDEPEND sys-apps/thinkpad ncurses? ( sys-libs/ncurses ) perl? ( sys-devel/perl )"
 
 src_compile() {
-
 	emake -C lib || die "lib make failed"
 	emake -C tpctl || die "tpctl make failed"
 	if use ncurses > /dev/null; then
@@ -33,11 +32,9 @@ src_compile() {
 	if use tpctlir > /dev/null; then
 		emake -C tpctlir || die "tpctlir make failed"
 	fi
-
 }
 
-src_install () {
-	
+src_install() {
 	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING \
 		VGA-MODES
 	dolib lib/libsmapidev.so.1.0
@@ -52,8 +49,7 @@ src_install () {
 		mv apmiser/README README.apmiser
 		dodoc README.apmiser
 		dosbin apmiser/apmiser
-        exeinto /etc/init.d
+		exeinto /etc/init.d
 		newexe ${FILESDIR}/apmiser.rc apmiser
 	fi
-	
 }
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild
index 3e90c86f7cd1..de6edd484ed0 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild,v 1.7 2002/10/04 06:31:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild,v 1.8 2002/10/19 03:21:25 vapier Exp $
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/${PN}/"
 KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
-LICENSE="Freeware"
-S=${WORKDIR}/${P}
+LICENSE="freedist"
+S="${WORKDIR}/${P}"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	echo "gcc ${CFLAGS}" > conf-cc
@@ -25,7 +25,6 @@ src_compile() {
 }
 
 src_install() {
-
 	for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
 	do
 		dobin ${i}
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild
index 5b16854a1afd..fba3e55389ce 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild,v 1.4 2002/10/04 06:31:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild,v 1.5 2002/10/19 03:21:25 vapier Exp $
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
-		 http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff11.bz2"
+	http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff11.bz2"
 HOMEPAGE="http://cr.yp.to/${PN}/"
 S=${WORKDIR}/${P}
 DEPEND="virtual/glibc"
@@ -13,28 +13,23 @@ KEYWORDS="x86 sparc sparc64"
 LICENSE="as-is"
 
 src_unpack() {
-
-  unpack ${P}.tar.gz
-  use ipv6 && bzcat ${DISTDIR}/ucspi-tcp-0.88-ipv6.diff11.bz2 | patch -d ${S} -p1
-  cd ${S}
-  echo "gcc ${CFLAGS}" > conf-cc
-  echo "gcc" > conf-ld
-  echo "/usr/" > conf-home
+	unpack ${P}.tar.gz
+	use ipv6 && bzcat ${DISTDIR}/ucspi-tcp-0.88-ipv6.diff11.bz2 | patch -d ${S} -p1
+	cd ${S}
+	echo "gcc ${CFLAGS}" > conf-cc
+	echo "gcc" > conf-ld
+	echo "/usr/" > conf-home
 }
 
 src_compile() {
-  try pmake
+	pmake || die
 }
 
 src_install() {
+	for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+	do
+		dobin $i
+	done
 
-  for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
-  do
-    dobin $i
-  done
-
-  dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 }
-
-
-
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild
index 7c664c150162..845a03da50a4 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild,v 1.5 2002/10/08 13:30:55 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild,v 1.6 2002/10/19 03:21:25 vapier Exp $
 
 IUSE="ssl ipv6"
 
@@ -21,7 +21,6 @@ KEYWORDS="x86 sparc sparc64"
 LICENSE="as-is"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
@@ -32,25 +31,17 @@ src_unpack() {
 	echo "gcc ${CFLAGS}" > conf-cc
 	echo "gcc" > conf-ld
 	echo "/usr/" > conf-home
-
 }
 
 src_compile() {
-
-  try pmake
-
+	pmake || die
 }
 
 src_install() {
+	for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+	do
+		dobin $i
+	done
 
-  for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
-  do
-    dobin $i
-  done
-
-  dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 }
-
-
-
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild
index 0c4e41bf4866..cee1092a507b 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild,v 1.3 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild,v 1.4 2002/10/19 03:21:25 vapier Exp $
 
 IUSE="ssl ipv6"
 
@@ -21,7 +21,6 @@ KEYWORDS="x86 sparc sparc64"
 LICENSE="as-is"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
@@ -32,25 +31,17 @@ src_unpack() {
 	echo "gcc ${CFLAGS}" > conf-cc
 	echo "gcc" > conf-ld
 	echo "/usr/" > conf-home
-
 }
 
 src_compile() {
-
-  try pmake
-
+	pmake || die
 }
 
 src_install() {
+	for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+	do
+		dobin $i
+	done
 
-  for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
-  do
-    dobin $i
-  done
-
-  dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 }
-
-
-
diff --git a/sys-apps/util-linux/util-linux-2.11o-r3.ebuild b/sys-apps/util-linux/util-linux-2.11o-r3.ebuild
index da8eca0e3a90..58ac3f5f2047 100644
--- a/sys-apps/util-linux/util-linux-2.11o-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11o-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11o-r3.ebuild,v 1.8 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11o-r3.ebuild,v 1.9 2002/10/19 03:21:25 vapier Exp $
 
 IUSE="nls"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various useful Linux utilities"
 SRC_URI="http://www.kernel.org/pub/linux/utils/${PN}/${P}.tar.gz
-         http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/${P}.patch.gz"
+	http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/${P}.patch.gz"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 KEYWORDS="x86 ppc sparc sparc64"
 LICENSE="GPL-2"
@@ -15,8 +15,7 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2-r2
 	sys-apps/pam-login"
-
-RDEPEND="$DEPEND sys-devel/perl
+RDEPEND="${DEPEND} sys-devel/perl
 	nls? ( sys-devel/gettext )"
 
 SLOT="0"
@@ -27,18 +26,17 @@ src_unpack() {
 	cd ${S}
 	gunzip -c ${DISTDIR}/${P}.patch.gz | patch -p0
 	cp MCONFIG MCONFIG.orig
-	sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:"	\
-		-e "s:CPU=.*:CPU=${CHOST%%-*}:"	\
-		-e "s:HAVE_PAM=no:HAVE_PAM=yes:"	\
-		-e "s:HAVE_SLN=no:HAVE_SLN=yes:"	\
-		-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:"	\
-		-e "s:usr/man:usr/share/man:"	\
-		-e "s:usr/info:usr/share/info:"	\
+	sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
+		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
+		-e "s:HAVE_PAM=no:HAVE_PAM=yes:" \
+		-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
+		-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
+		-e "s:usr/man:usr/share/man:" \
+		-e "s:usr/info:usr/share/info:" \
 			MCONFIG.orig > MCONFIG
 }
 
 src_compile() {
-
 	./configure || die
 
 	if [ -z "`use nls`" ]
@@ -67,4 +65,3 @@ src_install() {
 	docinto examples
 	dodoc example.files/*
 }
-
diff --git a/sys-apps/util-linux/util-linux-2.11r-r1.ebuild b/sys-apps/util-linux/util-linux-2.11r-r1.ebuild
index bf5252d98363..beedc2569479 100644
--- a/sys-apps/util-linux/util-linux-2.11r-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11r-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11r-r1.ebuild,v 1.9 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11r-r1.ebuild,v 1.10 2002/10/19 03:21:25 vapier Exp $
 
 IUSE="crypt nls"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various useful Linux utilities"
 SRC_URI="http://www.kernel.org/pub/linux/utils/${PN}/${P}.tar.gz
-         http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/${P}.patch.gz"
+	http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/${P}.patch.gz"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 KEYWORDS="x86 ppc sparc sparc64"
 LICENSE="GPL-2"
diff --git a/sys-apps/util-linux/util-linux-2.11r.ebuild b/sys-apps/util-linux/util-linux-2.11r.ebuild
index b935507ce57a..5a5c221272d9 100644
--- a/sys-apps/util-linux/util-linux-2.11r.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11r.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11r.ebuild,v 1.8 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11r.ebuild,v 1.9 2002/10/19 03:21:25 vapier Exp $
 
 IUSE="nls"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various useful Linux utilities"
 SRC_URI="http://www.kernel.org/pub/linux/utils/${PN}/${P}.tar.gz
-         http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/${P}.patch.gz"
+	http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/${P}.patch.gz"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 KEYWORDS="x86 ppc sparc sparc64"
 LICENSE="GPL-2"
diff --git a/sys-apps/vcron/vcron-3.0.1-r1.ebuild b/sys-apps/vcron/vcron-3.0.1-r1.ebuild
index 697dfcb3d790..883044325b9a 100644
--- a/sys-apps/vcron/vcron-3.0.1-r1.ebuild
+++ b/sys-apps/vcron/vcron-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r1.ebuild,v 1.10 2002/10/04 06:32:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0.1-r1.ebuild,v 1.11 2002/10/19 03:21:25 vapier Exp $
 
 MY_P=${P/vcron/vixie-cron}
 S=${WORKDIR}/${MY_P}
@@ -19,7 +19,6 @@ RDEPEND="!virtual/cron
 PROVIDE="virtual/cron"
 
 src_unpack() {
-
 	unpack ${A}
 	
 	cd ${S}
@@ -30,12 +29,10 @@ src_unpack() {
 }
 
 src_compile() {
-
 	emake || die
 }
 
 src_install() {
-
 	#this does not work if the directory exists already
 	diropts -m0750 -o root -g cron
 	dodir /var/spool/cron/crontabs
@@ -55,10 +52,9 @@ src_install() {
 
 	dodoc ${FILESDIR}/crontab
 
-        insinto /usr/sbin
+	insinto /usr/sbin
 	insopts -o root -g root -m 0750 ; doins cron
 	
-        insinto /usr/bin
+	insinto /usr/bin
 	insopts -o root -g cron -m 4750 ; doins crontab
-
 }
diff --git a/sys-apps/watchpid/watchpid-0.1-r1.ebuild b/sys-apps/watchpid/watchpid-0.1-r1.ebuild
index 0a041c51d7dc..e89cefc4d69b 100644
--- a/sys-apps/watchpid/watchpid-0.1-r1.ebuild
+++ b/sys-apps/watchpid/watchpid-0.1-r1.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchpid/watchpid-0.1-r1.ebuild,v 1.6 2002/10/04 06:32:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchpid/watchpid-0.1-r1.ebuild,v 1.7 2002/10/19 03:21:25 vapier Exp $
 
-A=${PN}_${PV}.tar.gz
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 DESCRIPTION="Watches a process for termination"
-SRC_URI="http://www.codepark.org/projects/utils/${A}"
-HOMEPAGE="http://www.codepark.org"
+SRC_URI="http://www.codepark.org/projects/utils/${PN}_${PV}.tar.gz"
+HOMEPAGE="http://www.codepark.org/"
 KEYWORDS="x86 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
-	try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST}
-	try make ${MAKEOPTS}
+	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} || die
+	make ${MAKEOPTS} || die
 }
 
-src_install() {                               
-	try make DESTDIR=${D} install
+src_install() {
+	make DESTDIR=${D} install || die
 	cd ${S}
 	dodoc README AUTHORS COPYING NEWS
 }
-
-
-
diff --git a/sys-apps/which/which-2.12-r2.ebuild b/sys-apps/which/which-2.12-r2.ebuild
index ea7fb4e26d59..73aaec800bd5 100644
--- a/sys-apps/which/which-2.12-r2.ebuild
+++ b/sys-apps/which/which-2.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.12-r2.ebuild,v 1.10 2002/10/04 06:32:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.12-r2.ebuild,v 1.11 2002/10/19 03:21:25 vapier Exp $
 
 DESCRIPTION="Prints out location of specified executables that are in your path"
 HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
@@ -22,13 +22,13 @@ src_unpack() {
 }
 
 src_compile() {
-    try ./configure --prefix=/usr
-    try make
+	./configure --prefix=/usr || die
+	make || die
 }
 
 src_install() {
-    dobin which
-    doman which.1
-    doinfo which.info
-    dodoc AUTHORS COPYING EXAMPLES NEWS README*
+	dobin which
+	doman which.1
+	doinfo which.info
+	dodoc AUTHORS COPYING EXAMPLES NEWS README*
 }
diff --git a/sys-apps/which/which-2.13.ebuild b/sys-apps/which/which-2.13.ebuild
index 4d61b7104b65..08c0be0eabd3 100644
--- a/sys-apps/which/which-2.13.ebuild
+++ b/sys-apps/which/which-2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.13.ebuild,v 1.9 2002/10/04 06:32:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.13.ebuild,v 1.10 2002/10/19 03:21:25 vapier Exp $
 
 DESCRIPTION="Prints out location of specified executables that are in your path"
 HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
@@ -22,13 +22,13 @@ src_unpack() {
 }
 
 src_compile() {
-    try ./configure --prefix=/usr
-    try make
+	./configure --prefix=/usr || die
+	make || die
 }
 
 src_install() {
-    dobin which
-    doman which.1
-    doinfo which.info
-    dodoc AUTHORS COPYING EXAMPLES NEWS README*
+	dobin which
+	doman which.1
+	doinfo which.info
+	dodoc AUTHORS COPYING EXAMPLES NEWS README*
 }
diff --git a/sys-apps/which/which-2.14.ebuild b/sys-apps/which/which-2.14.ebuild
index b62d34facd56..da2cb84b3856 100644
--- a/sys-apps/which/which-2.14.ebuild
+++ b/sys-apps/which/which-2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.14.ebuild,v 1.6 2002/10/04 06:32:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.14.ebuild,v 1.7 2002/10/19 03:21:25 vapier Exp $
 
 DESCRIPTION="Prints out location of specified executables that are in your path"
 HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
@@ -22,13 +22,13 @@ src_unpack() {
 }
 
 src_compile() {
-    try ./configure --prefix=/usr
-    try make
+	./configure --prefix=/usr || die
+	make || die
 }
 
 src_install() {
-    dobin which
-    doman which.1
-    doinfo which.info
-    dodoc AUTHORS COPYING EXAMPLES NEWS README*
+	dobin which
+	doman which.1
+	doinfo which.info
+	dodoc AUTHORS COPYING EXAMPLES NEWS README*
 }