lintool fixes for #9258

46 files changed, 123 insertions, 157 deletions

diff --git a/sys-apps/acpid/acpid-1.0.1-r1.ebuild b/sys-apps/acpid/acpid-1.0.1-r1.ebuild
index 4e5bea45be64..25b41292b66a 100644
--- a/sys-apps/acpid/acpid-1.0.1-r1.ebuild
+++ b/sys-apps/acpid/acpid-1.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/acpid/acpid-1.0.1-r1.ebuild,v 1.2 2002/10/16 15:22:17 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.1-r1.ebuild,v 1.3 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Daemon for Advanced Configuration and Power Interface."
@@ -14,15 +14,14 @@ LICENSE="GPL-2"
 # be broken.  Hopefully it will be merge into release kernel soon.
 DEPEND="virtual/glibc
 	virtual/linux-sources"
-
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	make INSTPREFIX=${D} \
 	CFLAGS="${CFLAGS} -DVERSION=\"\\\"${PV}\\\"\"" || die
 }
 
-src_install () {
-
+src_install() {
 	make INSTPREFIX=${D} install || die
 	
 	dodir /etc/acpi/events
diff --git a/sys-apps/acpid/acpid-1.0.1.ebuild b/sys-apps/acpid/acpid-1.0.1.ebuild
index 24fb54eeb6eb..60db5aa23a24 100644
--- a/sys-apps/acpid/acpid-1.0.1.ebuild
+++ b/sys-apps/acpid/acpid-1.0.1.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/acpid/acpid-1.0.1.ebuild,v 1.7 2002/10/04 06:22:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.1.ebuild,v 1.8 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Daemon for Advanced Configuration and Power Interface."
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 # be broken.  Hopefully it will be merge into release kernel soon.
 DEPEND="virtual/glibc
 	virtual/linux-sources"
-
+RDEPEND="${DEPEND}"
 
 src_compile() {
 
diff --git a/sys-apps/apcupsd/apcupsd-3.8.1.ebuild b/sys-apps/apcupsd/apcupsd-3.8.1.ebuild
index 21c72e782b12..4378128883c8 100644
--- a/sys-apps/apcupsd/apcupsd-3.8.1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.8.1.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/apcupsd/apcupsd-3.8.1.ebuild,v 1.11 2002/10/04 06:22:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.8.1.ebuild,v 1.12 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
@@ -11,13 +11,14 @@ SLOT="0"
 LICENSE="GPL-2"
  
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
  
 src_compile() {
 	./configure || die   
 	make || die
 }
  
-src_install () {
+src_install() {
 	dosbin apcupsd apcaccess apcnetd 
 	cd ${S}/etc
 	dodir etc/apcupsd
diff --git a/sys-apps/apcupsd/apcupsd-3.8.5.ebuild b/sys-apps/apcupsd/apcupsd-3.8.5.ebuild
index ad9db39ffae2..38c943100ae9 100644
--- a/sys-apps/apcupsd/apcupsd-3.8.5.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.8.5.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/apcupsd/apcupsd-3.8.5.ebuild,v 1.3 2002/10/04 06:22:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.8.5.ebuild,v 1.4 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
@@ -11,13 +11,14 @@ SLOT="0"
 LICENSE="GPL-2"
  
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
  
 src_compile() {
 	./configure || die   
 	make || die
 }
  
-src_install () {
+src_install() {
 	dosbin apcupsd apcaccess apcnetd 
 	cd ${S}/etc
 	dodir etc/apcupsd
diff --git a/sys-apps/bash/bash-2.05b-r3.ebuild b/sys-apps/bash/bash-2.05b-r3.ebuild
index fdcb1eff0258..2fd65d569536 100644
--- a/sys-apps/bash/bash-2.05b-r3.ebuild
+++ b/sys-apps/bash/bash-2.05b-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/bash/bash-2.05b-r3.ebuild,v 1.3 2002/10/16 09:35:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bash/bash-2.05b-r3.ebuild,v 1.4 2002/10/19 03:42:44 vapier Exp $
 
 inherit flag-o-matic
 
@@ -20,6 +20,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2 
 	sys-devel/autoconf"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${P}.tar.gz ${P}-gentoo.diff.bz2
@@ -57,7 +58,6 @@ src_compile() {
 }
 
 src_install() {
-
 	einstall || die
 
 	dodir /bin
@@ -72,4 +72,3 @@ src_install() {
 			dodoc doc/FAQ doc/INTRO
 		)
 }
-
diff --git a/sys-apps/busybox/busybox-0.50.ebuild b/sys-apps/busybox/busybox-0.50.ebuild
index 216a8d67a9b0..67b0b37302a7 100644
--- a/sys-apps/busybox/busybox-0.50.ebuild
+++ b/sys-apps/busybox/busybox-0.50.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/busybox/busybox-0.50.ebuild,v 1.10 2002/10/04 06:23:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.50.ebuild,v 1.11 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +26,7 @@ src_compile() {
 	make CFLAGS_EXTRA="${CFLAGS_EXTRA}" OPTIMIZATION=$OPT || die
 }
 
-src_install () {
+src_install() {
 	into /    
 	dobin busybox
 	into /usr
@@ -45,4 +46,3 @@ src_install () {
 	docinto html/images
 	dodoc images/*
 }
-
diff --git a/sys-apps/busybox/busybox-0.60.2.ebuild b/sys-apps/busybox/busybox-0.60.2.ebuild
index b6f73a0ef546..a74ce8120704 100644
--- a/sys-apps/busybox/busybox-0.60.2.ebuild
+++ b/sys-apps/busybox/busybox-0.60.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/busybox/busybox-0.60.2.ebuild,v 1.6 2002/10/04 06:23:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.2.ebuild,v 1.7 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -28,7 +29,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	into /    
 	dobin busybox
 	into /usr
@@ -48,4 +49,3 @@ src_install () {
 	docinto html/images
 	dodoc images/*
 }
-
diff --git a/sys-apps/busybox/busybox-0.60.3.ebuild b/sys-apps/busybox/busybox-0.60.3.ebuild
index bd2823ec24de..bf4aee36bf4f 100644
--- a/sys-apps/busybox/busybox-0.60.3.ebuild
+++ b/sys-apps/busybox/busybox-0.60.3.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/busybox/busybox-0.60.3.ebuild,v 1.8 2002/10/04 06:23:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3.ebuild,v 1.9 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -24,8 +25,8 @@ src_compile() {
 	emake $myconf || die
 }
 
-src_install () {
-	into /    
+src_install() {
+	into /
 	dobin busybox
 	into /usr
 	dodoc AUTHORS Changelog LICENSE README TODO
@@ -46,4 +47,3 @@ src_install () {
 	dodoc inittab
 	dodoc depmod.pl
 }
-
diff --git a/sys-apps/bzip2/bzip2-1.0.2-r1.ebuild b/sys-apps/bzip2/bzip2-1.0.2-r1.ebuild
index af182da6350e..d7301548d2bb 100644
--- a/sys-apps/bzip2/bzip2-1.0.2-r1.ebuild
+++ b/sys-apps/bzip2/bzip2-1.0.2-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/bzip2/bzip2-1.0.2-r1.ebuild,v 1.8 2002/10/04 06:23:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.2-r1.ebuild,v 1.9 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
@@ -12,7 +12,7 @@ SLOT="0"
 LICENSE="BZIP2"
 
 DEPEND="virtual/glibc"
-
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -23,7 +23,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	if [ -z "`use build`" ]
 	then
 		emake -f Makefile-libbz2_so all || die
@@ -32,7 +31,6 @@ src_compile() {
 }
 
 src_install() {
-
 	if [ -z "`use build`" ]
 	then
 		make PREFIX=${D}/usr install || die
@@ -53,5 +51,3 @@ src_install() {
 		ln -s bzip2 bunzip2        
 	fi
 }
-
-
diff --git a/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild b/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild
index 6845aa26c4ca..5225481d171f 100644
--- a/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild
+++ b/sys-apps/bzip2/bzip2-1.0.2-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/bzip2/bzip2-1.0.2-r2.ebuild,v 1.9 2002/10/04 06:23:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild,v 1.10 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
@@ -13,6 +13,7 @@ SLOT="0"
 LICENSE="BZIP2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -64,5 +65,3 @@ src_install() {
 		ln -s bzip2 bunzip2        
 	fi
 }
-
-
diff --git a/sys-apps/dcron/dcron-2.7-r8.ebuild b/sys-apps/dcron/dcron-2.7-r8.ebuild
index 651daef5dfdd..31f8a06180af 100644
--- a/sys-apps/dcron/dcron-2.7-r8.ebuild
+++ b/sys-apps/dcron/dcron-2.7-r8.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/dcron/dcron-2.7-r8.ebuild,v 1.6 2002/10/04 06:23:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r8.ebuild,v 1.7 2002/10/19 03:42:44 vapier Exp $
 
 # to use this, you must be part of the "cron" group
 
@@ -13,6 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/debianutils/debianutils-1.16.3.ebuild b/sys-apps/debianutils/debianutils-1.16.3.ebuild
index 9d62018a6031..4a146591dc77 100644
--- a/sys-apps/debianutils/debianutils-1.16.3.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.3.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/debianutils/debianutils-1.16.3.ebuild,v 1.3 2002/10/04 06:23:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.3.ebuild,v 1.4 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A selection of tools from Debian"
@@ -12,6 +12,7 @@ SLOT="0"
 LICENSE="GPL-2 BSD SMAIL"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -33,7 +34,6 @@ src_compile() {
 	fi
 }
 
-
 src_install() {
 	into /
 	dobin readlink tempfile mktemp
@@ -59,4 +59,3 @@ src_install() {
 		fi
 	fi
 }
-
diff --git a/sys-apps/debianutils/debianutils-1.16.ebuild b/sys-apps/debianutils/debianutils-1.16.ebuild
index dc0a6894df78..8ebd1cc786e2 100644
--- a/sys-apps/debianutils/debianutils-1.16.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.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/debianutils/debianutils-1.16.ebuild,v 1.8 2002/10/04 06:23:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.ebuild,v 1.9 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A selection of tools from Debian"
@@ -11,16 +11,15 @@ SLOT="0"
 LICENSE="GPL-2 BSD SMAIL"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	patch -p0 < ${FILESDIR}/${P}-Makefile-gentoo.diff
 }
 
 src_compile() {
-
 	if [ -z "`use static`" ]
 	then
 		pmake || die
@@ -29,9 +28,7 @@ src_compile() {
 	fi
 }
 
-
 src_install() {
-
 	into /
 	dobin readlink tempfile mktemp
 
@@ -52,4 +49,3 @@ src_install() {
 		fi
 	fi
 }
-
diff --git a/sys-apps/devfsd/devfsd-1.3.24.ebuild b/sys-apps/devfsd/devfsd-1.3.24.ebuild
index c4c60a5f11df..1ea36142e454 100644
--- a/sys-apps/devfsd/devfsd-1.3.24.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.24.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/devfsd/devfsd-1.3.24.ebuild,v 1.5 2002/10/04 06:23:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.24.ebuild,v 1.6 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Daemon for the Linux Device Filesystem"
@@ -11,7 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
-
+RDEPEND="${DEPEND}"
 
 src_unpack() {
   	unpack ${A}
@@ -38,4 +38,3 @@ src_install() {
 		
 	dodoc devfsd.conf COPYING* INSTALL
 }
-
diff --git a/sys-apps/devfsd/devfsd-1.3.25.ebuild b/sys-apps/devfsd/devfsd-1.3.25.ebuild
index 8350d760dbd6..4c38835f3fc8 100644
--- a/sys-apps/devfsd/devfsd-1.3.25.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.25.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/devfsd/devfsd-1.3.25.ebuild,v 1.8 2002/10/04 06:23:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.25.ebuild,v 1.9 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Daemon for the Linux Device Filesystem"
@@ -11,7 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
-
+RDEPEND="${DEPEND}"
 
 src_unpack() {
   	unpack ${A}
@@ -38,4 +38,3 @@ src_install() {
 		
 	dodoc devfsd.conf COPYING* INSTALL
 }
-
diff --git a/sys-apps/eject/eject-2.0.10.ebuild b/sys-apps/eject/eject-2.0.10.ebuild
index 5b00ff68331e..c7d56805ff4b 100644
--- a/sys-apps/eject/eject-2.0.10.ebuild
+++ b/sys-apps/eject/eject-2.0.10.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/eject/eject-2.0.10.ebuild,v 1.8 2002/10/19 01:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.10.ebuild,v 1.9 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure --prefix=/usr \
@@ -18,7 +19,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin /usr/share/man/man1
 
 # Full install breaks sandbox, and I'm too lazy to figure out how, so:
diff --git a/sys-apps/eject/eject-2.0.6.ebuild b/sys-apps/eject/eject-2.0.6.ebuild
index dfe654736242..229e10e27c9f 100644
--- a/sys-apps/eject/eject-2.0.6.ebuild
+++ b/sys-apps/eject/eject-2.0.6.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/eject/eject-2.0.6.ebuild,v 1.8 2002/10/14 10:08:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.6.ebuild,v 1.9 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
@@ -12,6 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure --prefix=/usr \
@@ -19,7 +20,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin /usr/share/man/man1
 	make DESTDIR=${D} install || die
 	dodoc ChangeLog COPYING README PORTING TODO 
diff --git a/sys-apps/epm/epm-0.7.ebuild b/sys-apps/epm/epm-0.7.ebuild
index b2b7f4d4e16a..37dccaf1f239 100644
--- a/sys-apps/epm/epm-0.7.ebuild
+++ b/sys-apps/epm/epm-0.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/epm/epm-0.7.ebuild,v 1.6 2002/10/04 06:24:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epm/epm-0.7.ebuild,v 1.7 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="rpm workalike for Gentoo Linux"
@@ -11,6 +11,6 @@ SLOT="0"
 LICENSE="GPL-2"
 RDEPEND=">=sys-devel/perl-5"
 
-src_install () {
+src_install() {
 	dobin epm
 }
diff --git a/sys-apps/ext2resize/ext2resize-1.1.17.ebuild b/sys-apps/ext2resize/ext2resize-1.1.17.ebuild
index 0c3f7aec547f..1ab8a0335d8a 100644
--- a/sys-apps/ext2resize/ext2resize-1.1.17.ebuild
+++ b/sys-apps/ext2resize/ext2resize-1.1.17.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/ext2resize/ext2resize-1.1.17.ebuild,v 1.7 2002/10/04 06:24:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ext2resize/ext2resize-1.1.17.ebuild,v 1.8 2002/10/19 03:42:44 vapier Exp $
 
 DESCRIPTION="EXT2 and EXT3 filesystem resizing utilities"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -10,6 +10,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 	
 src_compile() {
 	./configure --host=${CHOST} \
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index d785f824f17d..3610434c617a 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.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/fbset/fbset-2.1.ebuild,v 1.10 2002/10/04 06:24:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.11 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A utility to set the framebuffer videomode"
@@ -11,15 +11,15 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	dobin fbset modeline2fb
 	doman *.[58]
 	dodoc etc/fb.modes.*
 	dodoc INSTALL
 }
-
diff --git a/sys-apps/file/file-3.37.ebuild b/sys-apps/file/file-3.37.ebuild
index 0b088c67e70f..bfa0a746a596 100644
--- a/sys-apps/file/file-3.37.ebuild
+++ b/sys-apps/file/file-3.37.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/file/file-3.37.ebuild,v 1.10 2002/10/04 06:24:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.37.ebuild,v 1.11 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
@@ -11,9 +11,9 @@ HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 SLOT="0"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share/misc \
@@ -23,7 +23,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	if [ -z "`use build`" ] ; then
diff --git a/sys-apps/file/file-3.39.ebuild b/sys-apps/file/file-3.39.ebuild
index 4ff8217555fe..1eb92fc4e523 100644
--- a/sys-apps/file/file-3.39.ebuild
+++ b/sys-apps/file/file-3.39.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/file/file-3.39.ebuild,v 1.2 2002/10/04 06:24:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.39.ebuild,v 1.3 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
@@ -13,9 +13,9 @@ SLOT="0"
 LICENSE="as-is"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share/misc \
@@ -25,7 +25,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	if [ -z "`use build`" ] ; then
@@ -34,4 +33,3 @@ src_install() {
 		rm -rf ${D}/usr/share/man
 	fi
 }
-
diff --git a/sys-apps/fxload/fxload-20020411.ebuild b/sys-apps/fxload/fxload-20020411.ebuild
index 11c42a8d295f..61eb902851a2 100644
--- a/sys-apps/fxload/fxload-20020411.ebuild
+++ b/sys-apps/fxload/fxload-20020411.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/fxload/fxload-20020411.ebuild,v 1.6 2002/10/04 06:24:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/fxload-20020411.ebuild,v 1.7 2002/10/19 03:42:44 vapier Exp $
 
 # source maintainers named it fxload-YYYY_MM_DD instead of fxload-YYYYMMDD
 OLDP="$P"
@@ -16,16 +16,13 @@ LICENSE="GPL-2"
 # fxload needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND="virtual/glibc
 	sys-apps/hotplug"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	# compile fxload program
 	make || die
-
 }
 
-src_install () {
-
+src_install() {
 	make install prefix=${D}
-
 }
diff --git a/sys-apps/gawk/gawk-3.1.0-r3.ebuild b/sys-apps/gawk/gawk-3.1.0-r3.ebuild
index 7c42dd543ec2..22131b28acb3 100644
--- a/sys-apps/gawk/gawk-3.1.0-r3.ebuild
+++ b/sys-apps/gawk/gawk-3.1.0-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/gawk/gawk-3.1.0-r3.ebuild,v 1.5 2002/10/19 01:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.0-r3.ebuild,v 1.6 2002/10/19 03:42:44 vapier Exp $
 
 IUSE="nls build"
 
@@ -13,10 +13,10 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
-		nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	local myconf=""
 	use nls || myconf="${myconf} --disable-nls"
 
@@ -31,7 +31,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make prefix=${D}/usr \
 		bindir=${D}/bin \
 		mandir=${D}/usr/share/man \
@@ -68,4 +67,3 @@ src_install() {
 		rm -rf ${D}/usr/share
 	fi
 }
-
diff --git a/sys-apps/gawk/gawk-3.1.1.ebuild b/sys-apps/gawk/gawk-3.1.1.ebuild
index 42f7b6e0b624..513535ef5606 100644
--- a/sys-apps/gawk/gawk-3.1.1.ebuild
+++ b/sys-apps/gawk/gawk-3.1.1.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/gawk/gawk-3.1.1.ebuild,v 1.6 2002/10/19 01:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.1.ebuild,v 1.7 2002/10/19 03:42:44 vapier Exp $
 
 IUSE="nls build"
 
@@ -13,10 +13,10 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
-		nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	local myconf=""
 	use nls || myconf="${myconf} --disable-nls"
 
@@ -31,7 +31,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make prefix=${D}/usr \
 		bindir=${D}/bin \
 		mandir=${D}/usr/share/man \
@@ -68,4 +67,3 @@ src_install() {
 		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 6f32ec970956..74a758e62a30 100644
--- a/sys-apps/groff/groff-1.16.1-r1.ebuild
+++ b/sys-apps/groff/groff-1.16.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/groff/groff-1.16.1-r1.ebuild,v 1.11 2002/10/04 06:25:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.16.1-r1.ebuild,v 1.12 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text formatter used for man pages"
@@ -9,6 +9,7 @@ HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 LICENSE="GPL-2"
 
 src_compile() {
diff --git a/sys-apps/groff/groff-1.17.2-r1.ebuild b/sys-apps/groff/groff-1.17.2-r1.ebuild
index 1da79a8359e3..cc61456b052d 100644
--- a/sys-apps/groff/groff-1.17.2-r1.ebuild
+++ b/sys-apps/groff/groff-1.17.2-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/groff/groff-1.17.2-r1.ebuild,v 1.7 2002/10/04 06:25:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.17.2-r1.ebuild,v 1.8 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text formatter used for man pages"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man || die
diff --git a/sys-apps/groff/groff-1.17.2-r2.ebuild b/sys-apps/groff/groff-1.17.2-r2.ebuild
index 948887944df6..758de4ba531c 100644
--- a/sys-apps/groff/groff-1.17.2-r2.ebuild
+++ b/sys-apps/groff/groff-1.17.2-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/groff/groff-1.17.2-r2.ebuild,v 1.3 2002/09/14 15:51:25 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.17.2-r2.ebuild,v 1.4 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text formatter used for man pages"
@@ -12,11 +12,12 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 
-    # Fix the info pages to have .info extensions,
+	# Fix the info pages to have .info extensions,
 	# else they do not get gzipped.
 	cd ${S}
 	patch -p1 < ${FILESDIR}/${P}-infoext.patch || die
@@ -80,4 +81,3 @@ src_install() {
 	dodoc BUG-REPORT COPYING ChangeLog FDL MORE.STUFF NEWS \
 		PROBLEMS PROJECTS README REVISION TODO VERSION
 }
-
diff --git a/sys-apps/groff/groff-1.18-r1.ebuild b/sys-apps/groff/groff-1.18-r1.ebuild
index cc5e7b7f4c65..b4fcdd6a44f3 100644
--- a/sys-apps/groff/groff-1.18-r1.ebuild
+++ b/sys-apps/groff/groff-1.18-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/groff/groff-1.18-r1.ebuild,v 1.2 2002/08/14 04:40:34 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18-r1.ebuild,v 1.3 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text formatter used for man pages"
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
 	media-libs/netpbm"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -71,4 +72,3 @@ src_install() {
 	dodoc BUG-REPORT COPYING ChangeLog FDL MORE.STUFF NEWS \
 		PROBLEMS PROJECTS README REVISION TODO VERSION
 }
-
diff --git a/sys-apps/groff/groff-1.18.ebuild b/sys-apps/groff/groff-1.18.ebuild
index 68536a795d46..35782aa3f8bd 100644
--- a/sys-apps/groff/groff-1.18.ebuild
+++ b/sys-apps/groff/groff-1.18.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/groff/groff-1.18.ebuild,v 1.3 2002/08/14 04:40:34 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.ebuild,v 1.4 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text formatter used for man pages"
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
 	media-libs/netpbm"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man || die
diff --git a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
index c4d78ff7d748..fd815290d20a 100644
--- a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
+++ b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.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/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild,v 1.10 2002/10/04 06:25:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild,v 1.11 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gtkpbbuttons is a PPC-only program to monitor special Powerbook/iBook keys in Linux"
@@ -11,22 +11,14 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="x11-libs/gtk+ media-libs/audiofile sys-apps/pbbuttonsd"
-
-pkg_setup() {
-	if [ ${ARCH} != "ppc" ] ; then
-		eerror "Sorry, this is a PPC only package."
-		die "Sorry, this as a PPC only pacakge."
-	fi
-}
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	./configure --prefix=/usr || die "sorry, ppc-only package"
 	make || die "sorry, gtkpbbuttons compile failed"
 }
 
 src_install() {
-
 	make \
 		prefix=${D}/usr \
 		mandir={D}/usr/share/man \
@@ -34,5 +26,4 @@ src_install() {
 		install || die "sorry, failed to install gtkpbbuttons"
 
 	dodoc README COPYING
-
 }
diff --git a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
index 3f2d6be969db..511283af39f6 100644
--- a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
+++ b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.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/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild,v 1.1 2002/10/17 08:08:57 kain Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild,v 1.2 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gtkpbbuttons is a PPC-only program to monitor special Powerbook/iBook keys in Linux"
@@ -11,15 +11,14 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="x11-libs/gtk+ media-libs/audiofile >=sys-apps/pbbuttonsd-0.5"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	./configure --prefix=/usr || die "sorry, gtkpbbuttons configure failed"
 	make || die "sorry, gtkpbbuttons compile failed"
 }
 
 src_install() {
-
 	make \
 		prefix=${D}/usr \
 		mandir={D}/usr/share/man \
@@ -27,5 +26,4 @@ src_install() {
 		install || die "sorry, failed to install gtkpbbuttons"
 
 	dodoc README COPYING
-
 }
diff --git a/sys-apps/gzip/gzip-1.3.2.ebuild b/sys-apps/gzip/gzip-1.3.2.ebuild
index a258db538388..3ca794e5a4c5 100644
--- a/sys-apps/gzip/gzip-1.3.2.ebuild
+++ b/sys-apps/gzip/gzip-1.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/gzip/gzip-1.3.2.ebuild,v 1.11 2002/10/19 01:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.3.2.ebuild,v 1.12 2002/10/19 03:42:44 vapier Exp $
 
 IUSE="nls build"
 
@@ -66,4 +66,3 @@ src_install() {
 		rm -rf ${D}/usr
 	fi
 }
-
diff --git a/sys-apps/hotplug/hotplug-20020114.ebuild b/sys-apps/hotplug/hotplug-20020114.ebuild
index ff7caf59e373..7c644d9985e4 100644
--- a/sys-apps/hotplug/hotplug-20020114.ebuild
+++ b/sys-apps/hotplug/hotplug-20020114.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/hotplug/hotplug-20020114.ebuild,v 1.7 2002/10/04 06:25:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020114.ebuild,v 1.8 2002/10/19 03:42:44 vapier Exp $
 
 # source maintainers named it hotplug-YYYY_MM_DD instead of hotplug-YYYYMMDD
 S=${WORKDIR}/${P}
@@ -15,8 +15,9 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
         >=sys-apps/pciutils-2.1.9
         >=sys-apps/usbutils-0.9"
+RDEPEND="${DEPEND}"
 
-src_unpack () {
+src_unpack() {
 	unpack ${A}
 
 	# move it to dir which matches ebuild name
@@ -28,13 +29,11 @@ src_unpack () {
 }
 
 src_compile() {
-
 	# compile fxload program
 	make PREFIX="" all || die
-
 }
 
-src_install () {
+src_install() {
 	into /
 	dosbin sbin/hotplug
 	doman *.8
diff --git a/sys-apps/hotplug/hotplug-20020401.ebuild b/sys-apps/hotplug/hotplug-20020401.ebuild
index 25ad710561df..0fe863dd6592 100644
--- a/sys-apps/hotplug/hotplug-20020401.ebuild
+++ b/sys-apps/hotplug/hotplug-20020401.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/hotplug/hotplug-20020401.ebuild,v 1.5 2002/10/04 06:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20020401.ebuild,v 1.6 2002/10/19 03:42:44 vapier Exp $
 
 # source maintainers named it hotplug-YYYY_MM_DD instead of hotplug-YYYYMMDD
 MY_P=`echo ${P}|sed 's/-\(....\)\(..\)\(..\)/-\1_\2_\3/'`
@@ -16,8 +16,9 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
         >=sys-apps/pciutils-2.1.9
         >=sys-apps/usbutils-0.9"
+RDEPEND="${DEPEND}"
 
-src_unpack () {
+src_unpack() {
 	unpack ${A}
 
 	cd ${S}/etc/hotplug
@@ -25,7 +26,7 @@ src_unpack () {
 	patch -p0 < ${FILESDIR}/${P}-usb.rc-gentoo.diff
 }
 
-src_install () {
+src_install() {
 	into /
 	dosbin sbin/hotplug
 	doman *.8
@@ -45,7 +46,7 @@ src_install () {
 	newins ${FILESDIR}/usb.conf usb
 }
 
-pkg_postinst () {
-	einfo WARNING: The fxload program was spliced off this package.
-	einfo WARNING: emerge fxload if you need it.
+pkg_postinst() {
+	ewarn "WARNING: The fxload program was spliced off this package"
+	ewarn "WARNING: emerge fxload if you need it"
 }
diff --git a/sys-apps/ipchains/ipchains-1.3.10-r1.ebuild b/sys-apps/ipchains/ipchains-1.3.10-r1.ebuild
index d542603ae747..78adbdc88ffe 100644
--- a/sys-apps/ipchains/ipchains-1.3.10-r1.ebuild
+++ b/sys-apps/ipchains/ipchains-1.3.10-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/ipchains/ipchains-1.3.10-r1.ebuild,v 1.9 2002/10/04 06:26:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipchains/ipchains-1.3.10-r1.ebuild,v 1.10 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="legacy Linux firewall/packet mangling tools"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -35,5 +36,3 @@ src_install() {
 	docinto ps
 	dodoc ipchains-quickref.ps
 }
-
-
diff --git a/sys-apps/iproute/iproute-20010824-r1.ebuild b/sys-apps/iproute/iproute-20010824-r1.ebuild
index bf036c30c961..1e110eadd6c1 100644
--- a/sys-apps/iproute/iproute-20010824-r1.ebuild
+++ b/sys-apps/iproute/iproute-20010824-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/iproute/iproute-20010824-r1.ebuild,v 1.5 2002/10/04 23:39:58 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute/iproute-20010824-r1.ebuild,v 1.6 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/iproute2
 DESCRIPTION="Kernel 2.4 routing and traffic control utilities"
@@ -10,6 +10,7 @@ HOMEPAGE="http://www.worldbank.ro/ip-routing/"
 SLOT="0"
 KEYWORDS="x86 ppc sparc sparc64"
 DEPEND="virtual/linux-sources"
+RDEPEND="${DEPEND}"
 
 LICENSE="GPL-2"
 
diff --git a/sys-apps/isapnptools/isapnptools-1.26.ebuild b/sys-apps/isapnptools/isapnptools-1.26.ebuild
index c98259eb83cb..7df0f8fe1aad 100644
--- a/sys-apps/isapnptools/isapnptools-1.26.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.26.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/isapnptools/isapnptools-1.26.ebuild,v 1.7 2002/10/04 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26.ebuild,v 1.8 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools for configuring ISA PnP devices"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -23,7 +24,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--host=${CHOST} || die
@@ -31,7 +31,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS ChangeLog COPYING README NEWS
diff --git a/sys-apps/kbd/kbd-1.06-r1.ebuild b/sys-apps/kbd/kbd-1.06-r1.ebuild
index 6f1336358112..39fb93bb3855 100644
--- a/sys-apps/kbd/kbd-1.06-r1.ebuild
+++ b/sys-apps/kbd/kbd-1.06-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/kbd/kbd-1.06-r1.ebuild,v 1.11 2002/10/19 02:06:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.06-r1.ebuild,v 1.12 2002/10/19 03:42:44 vapier Exp $
 
 IUSE="nls"
 
@@ -12,6 +12,7 @@ KEYWORDS="x86 ppc sparc sparc64 alpha"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 PROVIDE="sys-apps/console-tools"
 
 src_compile() {
@@ -19,8 +20,8 @@ src_compile() {
 	# non-standard configure script; --di to disable NLS, nothing to enable it.	
 	use nls || myopts="--di"
 	./configure --mandir=/usr/share/man \
-	--datadir=/usr/share \
-	${myopts} || die
+		--datadir=/usr/share \
+		${myopts} || die
 	make || die
 }
 
diff --git a/sys-apps/less/less-376.ebuild b/sys-apps/less/less-376.ebuild
index fe2584ea3708..44ff48746686 100644
--- a/sys-apps/less/less-376.ebuild
+++ b/sys-apps/less/less-376.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-376.ebuild,v 1.8 2002/10/04 06:26:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-376.ebuild,v 1.9 2002/10/19 03:42:44 vapier Exp $
 
 DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com"
+HOMEPAGE="http://www.greenwoodsoftware.com/"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 SLOT="0"
 LICENSE="GPL-2"
@@ -11,6 +11,7 @@ S=${WORKDIR}/${P}
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure --host=${CHOST} --prefix=/usr \
diff --git a/sys-apps/less/less-378.ebuild b/sys-apps/less/less-378.ebuild
index eac81e079f62..661b21232312 100644
--- a/sys-apps/less/less-378.ebuild
+++ b/sys-apps/less/less-378.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378.ebuild,v 1.1 2002/10/11 14:58:36 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378.ebuild,v 1.2 2002/10/19 03:42:44 vapier Exp $
 
 DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com"
+HOMEPAGE="http://www.greenwoodsoftware.com/"
 KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
 SLOT="0"
 LICENSE="GPL-2"
@@ -11,6 +11,7 @@ S=${WORKDIR}/${P}
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure --host=${CHOST} --prefix=/usr \
diff --git a/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild b/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild
index 41d03bf3097b..72aae623e03b 100644
--- a/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild
+++ b/sys-apps/sharutils/sharutils-4.2.1-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/sharutils/sharutils-4.2.1-r4.ebuild,v 1.8 2002/10/19 03:21:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r4.ebuild,v 1.9 2002/10/19 03:42:44 vapier Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Tools to deal with shar archives"
@@ -34,7 +34,7 @@ src_install() {
 
 	doman doc/*.[15]
         #Remove some strange locals
-        cd ${D}/usr/share/locale
+	cd ${D}/usr/share/locale
 	for i in *.
 	do
 		rm -rf ${i}
diff --git a/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild b/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
index 3e54858418ad..d14940b8af9c 100644
--- a/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
+++ b/sys-apps/subterfugue/subterfugue-0.2-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/subterfugue/subterfugue-0.2-r1.ebuild,v 1.10 2002/10/19 03:21:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild,v 1.11 2002/10/19 03:42:44 vapier Exp $
 
 IUSE="gtk"
 
@@ -13,7 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=dev-lang/python-2.0
-        gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
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 58ac3f5f2047..f735c15ac758 100644
--- a/sys-apps/util-linux/util-linux-2.11o-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11o-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/util-linux/util-linux-2.11o-r3.ebuild,v 1.9 2002/10/19 03:21:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11o-r3.ebuild,v 1.10 2002/10/19 03:42:44 vapier Exp $
 
 IUSE="nls"
 
@@ -44,11 +44,11 @@ src_compile() {
 		cp defines.h defines.h.orig	
 		cp Makefile Makefile.orig
 		
-		sed -e "s/#define ENABLE_NLS//g" 	\
-			-e "s/#define HAVE_libintl_h//g"	\
+		sed -e "s/#define ENABLE_NLS//g" \
+			-e "s/#define HAVE_libintl_h//g" \
 			defines.h.orig > defines.h
 	
-		sed "s/\(^SUBDIRS=\)po/\1lib/g"	\
+		sed "s/\(^SUBDIRS=\)po/\1lib/g" \
 			Makefile.orig > Makefile
 	fi
 	
diff --git a/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild b/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild
index 52e2d8cdb0b2..9afba1eb9e2c 100644
--- a/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild
+++ b/sys-apps/yaboot/yaboot-1.3.6-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/yaboot/yaboot-1.3.6-r1.ebuild,v 1.7 2002/10/04 06:32:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yaboot/yaboot-1.3.6-r1.ebuild,v 1.8 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PPC Bootloader"
@@ -11,15 +11,7 @@ RDEPEND=""
 KEYWORDS="ppc -x86 -sparc -sparc64"
 MAKEOPTS='PREFIX=/usr MANDIR=share/man'
 SLOT="0"
-LICENSE="GPL"
-
-pkg_setup() {
-	if [ ${ARCH} != "ppc" ] ; then
-		eerror "Sorry, this is a PPC only package."
-		die "Sorry, this as a PPC only pacakge."
-	fi
-}
-
+LICENSE="GPL-2"
 
 src_compile() {
 	export -n CFLAGS
@@ -27,7 +19,7 @@ src_compile() {
 	emake ${MAKEOPTS} || die
 }
 
-src_install () {
+src_install() {
 	cp etc/yaboot.conf etc/yaboot.conf.bak
 	sed -e 's/\/local//' etc/yaboot.conf >| etc/yaboot.conf.edit
 	mv -f etc/yaboot.conf.edit etc/yaboot.conf
diff --git a/sys-apps/yard/yard-2.0-r1.ebuild b/sys-apps/yard/yard-2.0-r1.ebuild
index e605fc7d8f50..7061b115a859 100644
--- a/sys-apps/yard/yard-2.0-r1.ebuild
+++ b/sys-apps/yard/yard-2.0-r1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.12 2002/10/04 06:32:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.13 2002/10/19 03:42:44 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Yard is a suite of Perl scripts for creating rescue disks (also
 called bootdisks) for Linux."
 SRC_URI="http://www.croftj.net/~fawcett/yard/${P}.tar.gz
-        http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${P}-extra.tar.bz2
-        http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/diet-utils.tar.bz2"
+	http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${P}-extra.tar.bz2
+	http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/diet-utils.tar.bz2"
 HOMEPAGE="http://www.linuxlots.com/~fawcett/yard/"
 SLOT="0"
 LICENSE="GPL-2 Artistic"
 KEYWORDS="x86 -ppc"
 DEPEND="sys-devel/perl"
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${P}-extra.tar.bz2
@@ -33,10 +33,9 @@ src_compile() {
 	make || die
 }
 
-src_install () {
-
+src_install() {
 	cd ${S}
-	try make DESTDIR=${D} install
+	make DESTDIR=${D} install || die
 #customize
 	rm -rf ${D}/usr/share/doc/${P}
 	cd doc