lintool fixes for #9258

56 files changed, 146 insertions, 181 deletions

diff --git a/sys-apps/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild b/sys-apps/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild
index ed86bd93c40f..9c4e3d77f7e1 100644
--- a/sys-apps/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild
+++ b/sys-apps/linux-ntfs/linux-ntfs-1.5.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/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild,v 1.7 2002/10/04 06:26:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 # NB: This project actually requires >=gcc.2.96!  This ebuild installs an
 # rpm binary package into /opt.  Eventually we'll compile it ourselves..
@@ -15,9 +15,9 @@ S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-${PR/r/}.i386.rpm
 	mirror://sourceforge/${PN}/${PN}-devel-${PV}-${PR/r/}.i386.rpm"
 DEPEND="virtual/glibc app-arch/rpm2targz"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	local i
 	for i in ${A}
 	do
@@ -28,10 +28,8 @@ src_unpack() {
 }
 
 src_compile() { :; }
- 
 
 src_install() {
-
 	cd ${D}
 	mkdir -p opt/${PN}
 	mv ${WORKDIR}/usr/* opt/${PN}
diff --git a/sys-apps/lm_sensors/lm_sensors-2.6.3-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.6.3-r1.ebuild
index a2bc45bb4193..64bf8ee99a80 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.6.3-r1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.6.3-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/lm_sensors/lm_sensors-2.6.3-r1.ebuild,v 1.3 2002/10/04 06:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.6.3-r1.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
@@ -12,21 +12,19 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="virtual/linux-sources"
+RDEPEND="${DEPEND}"
 
-src_compile ()  {
-
+src_compile() {
 	emake clean all || die "lm_sensors requires the source of a compatible kernel\nversion installed in /usr/src/linux and i2c support built as a modules"
-	
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man install || die
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/rc_lm_sensors lm_sensors
 }
 
 pkg_postinst() {
-
 	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
 
 	einfo
@@ -48,5 +46,4 @@ pkg_postinst() {
 	einfo "kernel, you will need to remerge the lm_sensors package to build"
 	einfo "new kernel modules."
 	einfo
-
 }
diff --git a/sys-apps/lm_sensors/lm_sensors-2.6.3.ebuild b/sys-apps/lm_sensors/lm_sensors-2.6.3.ebuild
index ad0b57a8fd45..ec6fc5f3d15e 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.6.3.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.6.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/lm_sensors/lm_sensors-2.6.3.ebuild,v 1.6 2002/10/04 06:26:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.6.3.ebuild,v 1.7 2002/10/19 04:06:04 vapier Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
@@ -12,19 +12,17 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="virtual/linux-sources"
+RDEPEND="${DEPEND}"
 
-src_compile ()  {
-
+src_compile()  {
 	emake clean all || die "lm_sensors requires the source of a compatible kernel\nversion installed in /usr/src/linux and i2c support built as a modules"
-	
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man install || die
 }
 
 pkg_postinst() {
-
 	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
 
 	einfo
@@ -46,5 +44,4 @@ pkg_postinst() {
 	einfo "kernel, you will need to remerge the lm_sensors package to build"
 	einfo "new kernel modules."
 	einfo
-
 }
diff --git a/sys-apps/lm_sensors/lm_sensors-2.6.4-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.6.4-r1.ebuild
index 4ab927448a19..61f67fbf7575 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.6.4-r1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.6.4-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/lm_sensors/lm_sensors-2.6.4-r1.ebuild,v 1.3 2002/10/04 06:26:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.6.4-r1.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
@@ -12,21 +12,19 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="virtual/linux-sources"
+RDEPEND="${DEPEND}"
 
-src_compile ()  {
-
+src_compile()  {
 	emake clean all || die "lm_sensors requires the source of a compatible kernel\nversion installed in /usr/src/linux and i2c support built as a modules"
-	
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man install || die
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/rc_lm_sensors lm_sensors
 }
 
 pkg_postinst() {
-
 	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
 
 	einfo
@@ -48,5 +46,4 @@ pkg_postinst() {
 	einfo "kernel, you will need to remerge the lm_sensors package to build"
 	einfo "new kernel modules."
 	einfo
-
 }
diff --git a/sys-apps/lm_sensors/lm_sensors-2.6.4.ebuild b/sys-apps/lm_sensors/lm_sensors-2.6.4.ebuild
index 1d897298b291..a421dc078453 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.6.4.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.6.4.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/lm_sensors/lm_sensors-2.6.4.ebuild,v 1.3 2002/10/04 06:26:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.6.4.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
@@ -12,19 +12,17 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="virtual/linux-sources"
+RDEPEND="${DEPEND}"
 
-src_compile ()  {
-
+src_compile()  {
 	emake clean all || die "lm_sensors requires the source of a compatible kernel\nversion installed in /usr/src/linux and i2c support built as a modules"
-	
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man install || die
 }
 
 pkg_postinst() {
-
 	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
 
 	einfo
@@ -46,5 +44,4 @@ pkg_postinst() {
 	einfo "kernel, you will need to remerge the lm_sensors package to build"
 	einfo "new kernel modules."
 	einfo
-
 }
diff --git a/sys-apps/lsof/lsof-4.64.ebuild b/sys-apps/lsof/lsof-4.64.ebuild
index a4486e6ee8f8..92c460b80aa2 100644
--- a/sys-apps/lsof/lsof-4.64.ebuild
+++ b/sys-apps/lsof/lsof-4.64.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/lsof/lsof-4.64.ebuild,v 1.7 2002/10/04 06:27:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.64.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}/${MY_P}_src
@@ -24,7 +24,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	#interactive script: Enable HASSECURITY, WARNINGSTATE, and HASKERNIDCK
 	#is there a way to avoid the "echo to a file + file read"?
 	#Just piping in the results didn't seem to work.
@@ -38,8 +37,7 @@ src_compile() {
 	make all || die
 }
 
-src_install () {
-	
+src_install() {
 	#/usr/sbin is a good location -- drobbins
 	dosbin lsof
 	# .a libs not needed during boot so they go in /usr/lib -- drobbins
@@ -55,4 +53,3 @@ src_install () {
 	cd ${D}/usr/share/doc/${PF}
 	mv .README.FIRST.gz README.FIRST.gz
 }
-
diff --git a/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild b/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild
index 9fbcffafde96..5940e7eb0d8f 100644
--- a/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild
+++ b/sys-apps/mac-fdisk/mac-fdisk-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/mac-fdisk/mac-fdisk-0.1.ebuild,v 1.5 2002/10/04 06:47:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mac-fdisk/mac-fdisk-0.1.ebuild,v 1.6 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DEBRV=8
@@ -12,6 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ppc"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	cd ${WORKDIR}
@@ -28,7 +29,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	mv pdisk.8 pdisk.8.in
 	ln mac-fdisk.8.in mac-fdisk.8 || die
 	ln pmac-fdisk.8.in pmac-fdisk.8 || die
diff --git a/sys-apps/microcode_ctl/microcode_ctl-1.06.ebuild b/sys-apps/microcode_ctl/microcode_ctl-1.06.ebuild
index 5827d20fd202..61d1fa611a9b 100644
--- a/sys-apps/microcode_ctl/microcode_ctl-1.06.ebuild
+++ b/sys-apps/microcode_ctl/microcode_ctl-1.06.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/microcode_ctl/microcode_ctl-1.06.ebuild,v 1.5 2002/10/04 06:27:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode_ctl/microcode_ctl-1.06.ebuild,v 1.6 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Intel IA32 microcode update utility"
@@ -10,6 +10,7 @@ SLOT="0"
 LICENSE="GPL-2"
 SRC_URI="http://www.urbanmyth.org/microcode/${P}.tar.gz"
 DEPEND="virtual/linux-sources"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	make all || die "compile problem"
diff --git a/sys-apps/modutils/modutils-2.4.16-r2.ebuild b/sys-apps/modutils/modutils-2.4.16-r2.ebuild
index d6433f40be73..ba62330ea4f5 100644
--- a/sys-apps/modutils/modutils-2.4.16-r2.ebuild
+++ b/sys-apps/modutils/modutils-2.4.16-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/modutils/modutils-2.4.16-r2.ebuild,v 1.7 2002/10/04 06:27:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r2.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -11,6 +11,7 @@ KEYWORDS="x86 ppc sparc sparc64"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 #	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	myconf=""
@@ -47,4 +48,3 @@ src_install() {
 		
 	dodoc COPYING CREDITS ChangeLog NEWS README TODO
 }
-
diff --git a/sys-apps/modutils/modutils-2.4.16-r3.ebuild b/sys-apps/modutils/modutils-2.4.16-r3.ebuild
index 6ba4c88de49c..f681f7408039 100644
--- a/sys-apps/modutils/modutils-2.4.16-r3.ebuild
+++ b/sys-apps/modutils/modutils-2.4.16-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/modutils/modutils-2.4.16-r3.ebuild,v 1.7 2002/10/04 06:27:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r3.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -11,6 +11,7 @@ KEYWORDS="x86 ppc sparc sparc64"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 #	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	myconf=""
@@ -39,4 +40,3 @@ src_install() {
 
 	dodoc COPYING CREDITS ChangeLog NEWS README TODO
 }
-
diff --git a/sys-apps/modutils/modutils-2.4.19.ebuild b/sys-apps/modutils/modutils-2.4.19.ebuild
index d59d3f9d1769..0818759ff274 100644
--- a/sys-apps/modutils/modutils-2.4.19.ebuild
+++ b/sys-apps/modutils/modutils-2.4.19.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.19.ebuild,v 1.4 2002/10/04 06:27:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.19.ebuild,v 1.5 2002/10/19 04:06:04 vapier Exp $
 
+S=${WORKDIR}/${P}
 SLOT="0"
 DESCRIPTION="Standard kernel module utilities"
 SRC_URI="http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/${P}.tar.bz2"
@@ -9,6 +10,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	myconf=""
@@ -35,4 +37,3 @@ src_install() {
 
 	dodoc COPYING CREDITS ChangeLog NEWS README TODO
 }
-
diff --git a/sys-apps/mondo/mondo-0.6.ebuild b/sys-apps/mondo/mondo-0.6.ebuild
index a561ddf3dbe1..30c27921a8f8 100644
--- a/sys-apps/mondo/mondo-0.6.ebuild
+++ b/sys-apps/mondo/mondo-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/mondo/mondo-0.6.ebuild,v 1.4 2002/10/04 06:27:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/mondo-0.6.ebuild,v 1.5 2002/10/19 04:06:04 vapier Exp $
 
 DESCRIPTION="A System Health Monitor"
 HOMEPAGE="http://mondo-daemon.sourceforge.net/"
@@ -9,11 +9,11 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=sys-apps/lm_sensors-2.6.3"
+RDEPEND="${DEPEND}"
 
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/mondo-daemon/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/mondo-daemon/${P}.tar.gz"
 S=${WORKDIR}/${P}
 
-
 src_compile() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
@@ -22,17 +22,17 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	make prefix=${D}/usr \
 		sysconfdir=${D}/etc \
 		mandir=${D}/usr/share/man \
 		docdir=${D}/usr/share/doc/${PF} \
 		install || die
 
-		dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
 
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/mondo.sh mondo
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mondo.sh mondo
 }
 
 pkg_postinst() {
diff --git a/sys-apps/mosix-user/mosix-user-1.5.7.ebuild b/sys-apps/mosix-user/mosix-user-1.5.7.ebuild
index 2157df1a4fbf..049b5c51dc2a 100644
--- a/sys-apps/mosix-user/mosix-user-1.5.7.ebuild
+++ b/sys-apps/mosix-user/mosix-user-1.5.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/mosix-user/mosix-user-1.5.7.ebuild,v 1.8 2002/10/04 06:27:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mosix-user/mosix-user-1.5.7.ebuild,v 1.9 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/user
 DESCRIPTION="User-land utilities for MOSIX process migration (clustering) software"
@@ -10,6 +10,7 @@ KEYWORDS="x86 -ppc"
 SLOT="0"
 LICENSE="as-is"
 DEPEND=">=sys-libs/ncurses-5.2"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	mkdir ${S}; cd ${S}
@@ -31,7 +32,7 @@ src_compile() {
 	done
 }
 
-src_install () {
+src_install() {
 	cd ${S}
 	make ROOT=${D} PREFIX=${D}/usr install
 	dodir /usr/share	
diff --git a/sys-apps/mosix-user/mosix-user-1.8.0.ebuild b/sys-apps/mosix-user/mosix-user-1.8.0.ebuild
index 21e6421aebc4..9d18702e3d3a 100644
--- a/sys-apps/mosix-user/mosix-user-1.8.0.ebuild
+++ b/sys-apps/mosix-user/mosix-user-1.8.0.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/mosix-user/mosix-user-1.8.0.ebuild,v 1.3 2002/10/19 02:52:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mosix-user/mosix-user-1.8.0.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/user
 DESCRIPTION="User-land utilities for MOSIX process migration (clustering) software"
@@ -10,6 +10,7 @@ KEYWORDS="~x86 -ppc -sparc -spar64 -alpha"
 SLOT="0"
 LICENSE="as-is"
 DEPEND=">=sys-libs/ncurses-5.2"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	if [ -z "`readlink /usr/src/linux|grep mosix`" ]; then
@@ -41,7 +42,7 @@ src_compile() {
 	done
 }
 
-src_install () {
+src_install() {
 	cd ${S}
 	make ROOT=${D} PREFIX=${D}/usr install
 	dodir /usr/share	
diff --git a/sys-apps/most/most-4.9.2.ebuild b/sys-apps/most/most-4.9.2.ebuild
index e6540d4f6b00..b59314154efd 100644
--- a/sys-apps/most/most-4.9.2.ebuild
+++ b/sys-apps/most/most-4.9.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/most/most-4.9.2.ebuild,v 1.8 2002/10/19 02:52:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.2.ebuild,v 1.9 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An extremely excellent text file reader"
@@ -12,6 +12,7 @@ SRC_URI="ftp://space.mit.edu/pub/davis/most/${P}.tar.gz"
 
 DEPEND=">=sys-libs/slang-1.4.2
         >=sys-libs/ncurses-5.2-r2"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure \
diff --git a/sys-apps/nbd/nbd-14.ebuild b/sys-apps/nbd/nbd-14.ebuild
index 0cd4dadf97a8..a9283a33d09f 100644
--- a/sys-apps/nbd/nbd-14.ebuild
+++ b/sys-apps/nbd/nbd-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/nbd/nbd-14.ebuild,v 1.7 2002/10/04 06:27:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-14.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 MY_P=${P//-/.}
 S=${WORKDIR}/${PN}
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 
 DEPEND=">=sys-devel/gcc-2.95.3
 	>=sys-devel/make-3.79.1"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure \
diff --git a/sys-apps/net-tools/net-tools-1.60-r3.ebuild b/sys-apps/net-tools/net-tools-1.60-r3.ebuild
index b8e62ae9a303..6244ff1bbb39 100644
--- a/sys-apps/net-tools/net-tools-1.60-r3.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-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/net-tools/net-tools-1.60-r3.ebuild,v 1.7 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r3.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls build"
 
@@ -13,7 +13,8 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
-		nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -35,7 +36,6 @@ src_unpack() {
 		mv config.make config.make.orig
 		sed 's:I18N=1:I18N=0:' config.make.orig > config.make
 	fi
-	
 }
 
 src_compile() {
diff --git a/sys-apps/net-tools/net-tools-1.60-r4.ebuild b/sys-apps/net-tools/net-tools-1.60-r4.ebuild
index 3a3e00cfdcab..860a3065c2f8 100644
--- a/sys-apps/net-tools/net-tools-1.60-r4.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-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/net-tools/net-tools-1.60-r4.ebuild,v 1.8 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r4.ebuild,v 1.9 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls build"
 
@@ -13,7 +13,8 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
-		nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -35,7 +36,6 @@ src_unpack() {
 		mv config.make config.make.orig
 		sed 's:I18N=1:I18N=0:' config.make.orig > config.make
 	fi
-	
 }
 
 src_compile() {
@@ -71,4 +71,3 @@ src_install() {
 		rm -f ${D}/bin/{ypdomainname,nisdomainname}
 	fi
 }
-
diff --git a/sys-apps/net-tools/net-tools-1.60-r5.ebuild b/sys-apps/net-tools/net-tools-1.60-r5.ebuild
index 805363af93d4..390c406fc2d3 100644
--- a/sys-apps/net-tools/net-tools-1.60-r5.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-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/net-tools/net-tools-1.60-r5.ebuild,v 1.4 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r5.ebuild,v 1.5 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls build"
 
@@ -13,7 +13,8 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
-		nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -40,7 +41,6 @@ src_unpack() {
 		mv config.make config.make.orig
 		sed 's:I18N=1:I18N=0:' config.make.orig > config.make
 	fi
-	
 }
 
 src_compile() {
@@ -79,4 +79,3 @@ src_install() {
 		rm -f ${D}/bin/{ypdomainname,nisdomainname}
 	fi
 }
-
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r5.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r5.ebuild
index 0a6b841ae468..41789767b163 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r5.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-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/netkit-base/netkit-base-0.17-r5.ebuild,v 1.6 2002/10/04 06:28:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r5.ebuild,v 1.7 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard linux net thingees -- inetd, ping"
@@ -10,6 +10,7 @@ KEYWORDS="x86"
 SLOT="0"
 LICENSE="BSD"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	./configure || die
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
index aa424269eafa..ebfd08ec131b 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r6.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/netkit-base/netkit-base-0.17-r6.ebuild,v 1.10 2002/10/19 02:52:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild,v 1.11 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard linux net thingees -- inetd, ping"
@@ -10,7 +10,7 @@ KEYWORDS="x86 ppc sparc sparc64 alpha"
 SLOT="0"
 LICENSE="BSD"
 DEPEND="virtual/glibc"
-
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/pam-login/pam-login-3.6-r1.ebuild b/sys-apps/pam-login/pam-login-3.6-r1.ebuild
index 8e384770d9bd..72a98e11aa84 100644
--- a/sys-apps/pam-login/pam-login-3.6-r1.ebuild
+++ b/sys-apps/pam-login/pam-login-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/pam-login/pam-login-3.6-r1.ebuild,v 1.5 2002/10/04 06:28:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.6-r1.ebuild,v 1.6 2002/10/19 04:06:04 vapier Exp $
 
 MY_PN="${PN/pam-/pam_}"
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -13,11 +13,11 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
 	sys-libs/pam
 	>=sys-apps/shadow-4.0.2-r5"
+RDEPEND="${DEPEND}"
 	
 SLOT="0"
 
 src_compile() {
-        
 	local myconf=""
 	use nls || {
 		myconf="--disable-nls"
@@ -34,7 +34,6 @@ src_compile() {
 }
 
 src_install() {
-	
 	make prefix=${D}/usr \
 		rootexecbindir=${D}/bin \
 		mandir=${D}/usr/share/man \
@@ -49,12 +48,10 @@ src_install() {
 }
 
 pkg_preinst() {
-
 	rm -f ${ROOT}/etc/login.defs.new
 }
 
 pkg_postinst() {
-
 	echo
 	echo "************************************************************"
 	echo "   Due to a compatibility issue, ${ROOT}etc/login.defs "
@@ -76,4 +73,3 @@ pkg_postinst() {
 		rm -f ${ROOT}/etc/login.defs.new
 	fi
 }
-
diff --git a/sys-apps/pam-login/pam-login-3.6-r2.ebuild b/sys-apps/pam-login/pam-login-3.6-r2.ebuild
index 654f1efcddae..89aca026e366 100644
--- a/sys-apps/pam-login/pam-login-3.6-r2.ebuild
+++ b/sys-apps/pam-login/pam-login-3.6-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/pam-login/pam-login-3.6-r2.ebuild,v 1.7 2002/10/04 06:28:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.6-r2.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 MY_PN="${PN/pam-/pam_}"
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -13,11 +13,11 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
 	sys-libs/pam
 	>=sys-apps/shadow-4.0.2-r5"
+RDEPEND="${DEPEND}"
 	
 SLOT="0"
 
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -25,7 +25,6 @@ src_unpack() {
 }
 
 src_compile() {
-        
 	local myconf=""
 	use nls || {
 		myconf="--disable-nls"
@@ -42,7 +41,6 @@ src_compile() {
 }
 
 src_install() {
-	
 	make prefix=${D}/usr \
 		rootexecbindir=${D}/bin \
 		mandir=${D}/usr/share/man \
@@ -57,12 +55,10 @@ src_install() {
 }
 
 pkg_preinst() {
-
 	rm -f ${ROOT}/etc/login.defs.new
 }
 
 pkg_postinst() {
-
 	echo
 	echo "************************************************************"
 	echo "   Due to a compatibility issue, ${ROOT}etc/login.defs "
@@ -84,4 +80,3 @@ pkg_postinst() {
 		rm -f ${ROOT}/etc/login.defs.new
 	fi
 }
-
diff --git a/sys-apps/pam-login/pam-login-3.7.ebuild b/sys-apps/pam-login/pam-login-3.7.ebuild
index 79b207714ec3..efadcf0a5f63 100644
--- a/sys-apps/pam-login/pam-login-3.7.ebuild
+++ b/sys-apps/pam-login/pam-login-3.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/pam-login/pam-login-3.7.ebuild,v 1.3 2002/10/04 06:28:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.7.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 # Do we want to backup an old login.defs, and forcefully
 # install a new version?
@@ -19,10 +19,9 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
 	sys-libs/pam
 	>=sys-apps/shadow-4.0.2-r5"
-	
+RDEPEND="${DEPEND}"
 
 src_compile() {
-        
 	local myconf=""
 	use nls ||myconf="--disable-nls"
 
@@ -32,7 +31,6 @@ src_compile() {
 }
 
 src_install() {
-	
 	einstall rootexecbindir=${D}/bin || die 
 
 	insinto /etc
@@ -46,12 +44,10 @@ src_install() {
 }
 
 pkg_preinst() {
-
 	rm -f ${ROOT}/etc/login.defs.new
 }
 
 pkg_postinst() {
-
 	[ "${FORCE_LOGIN_DEFS}" != "yes" ] && return 0
 
 	ewarn
@@ -75,4 +71,3 @@ pkg_postinst() {
 		rm -f ${ROOT}/etc/login.defs.new
 	fi
 }
-
diff --git a/sys-apps/pciutils/pciutils-2.1.9-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.9-r1.ebuild
index eb15eb5be10b..6f287da6508d 100644
--- a/sys-apps/pciutils/pciutils-2.1.9-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.9-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/pciutils/pciutils-2.1.9-r1.ebuild,v 1.3 2002/10/04 06:28:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.9-r1.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various utilities dealing with the PCI bus"
@@ -12,6 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -36,7 +37,7 @@ src_compile() {
 	make PREFIX=/usr || die
 }
 
-src_install () {
+src_install() {
 	into /
 	dosbin setpci lspci pcimodules
 	doman *.8
diff --git a/sys-apps/pciutils/pciutils-2.1.9-r2.ebuild b/sys-apps/pciutils/pciutils-2.1.9-r2.ebuild
index d8f5ba7fa05a..bc721d9b259f 100644
--- a/sys-apps/pciutils/pciutils-2.1.9-r2.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.9-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/pciutils/pciutils-2.1.9-r2.ebuild,v 1.5 2002/10/04 06:28:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.9-r2.ebuild,v 1.6 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various utilities dealing with the PCI bus"
@@ -12,6 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -36,7 +37,7 @@ src_compile() {
 	make PREFIX=/usr || die
 }
 
-src_install () {
+src_install() {
 	into /
 	dosbin setpci lspci pcimodules
 	doman *.8
diff --git a/sys-apps/powerprefs/powerprefs-0.2.ebuild b/sys-apps/powerprefs/powerprefs-0.2.ebuild
index d0f71364b7b3..9ad607a4279c 100644
--- a/sys-apps/powerprefs/powerprefs-0.2.ebuild
+++ b/sys-apps/powerprefs/powerprefs-0.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/powerprefs/powerprefs-0.2.ebuild,v 1.7 2002/10/04 06:29:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.2.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="powerprefs is a PPC-only program to interface with special Powerbook/iBook keys in Linux"
@@ -11,15 +11,14 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="x11-libs/gtk+ sys-apps/pbbuttonsd"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	./configure --prefix=/usr || die "sorry, ppc-only package"
 	make || die "sorry, powerprefs 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 powerprefs"
 
 	dodoc README COPYING
-
 }
diff --git a/sys-apps/powerprefs/powerprefs-0.3.1.ebuild b/sys-apps/powerprefs/powerprefs-0.3.1.ebuild
index c7ec71c208ed..c09b3e7d70df 100644
--- a/sys-apps/powerprefs/powerprefs-0.3.1.ebuild
+++ b/sys-apps/powerprefs/powerprefs-0.3.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/powerprefs/powerprefs-0.3.1.ebuild,v 1.1 2002/10/17 08:09:22 kain Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerprefs/powerprefs-0.3.1.ebuild,v 1.2 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="powerprefs is a program to interface with pbbuttonsd (Powerbook/iBook) keys in Linux"
@@ -11,15 +11,14 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="x11-libs/gtk+ >=sys-apps/pbbuttonsd-0.5" 
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	./configure --prefix=/usr || die "sorry, powerprefs configure failed"
 	make || die "sorry, powerprefs 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 powerprefs"
 
 	dodoc README COPYING
-
 }
diff --git a/sys-apps/psmisc/psmisc-19-r2.ebuild b/sys-apps/psmisc/psmisc-19-r2.ebuild
index a196b2957a5d..96f34f740616 100644
--- a/sys-apps/psmisc/psmisc-19-r2.ebuild
+++ b/sys-apps/psmisc/psmisc-19-r2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r2.ebuild,v 1.7 2002/10/19 02:52:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r2.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/psmisc
 DESCRIPTION="Handy process-related utilities from Debian"
 SRC_URI="ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/${P}.tar.gz"
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
+RDEPEND="${DEPEND}"
 HOMEPAGE="http://psmisc.sourceforge.net/"
 KEYWORDS="x86"
 SLOT="0"
diff --git a/sys-apps/psmisc/psmisc-19-r3.ebuild b/sys-apps/psmisc/psmisc-19-r3.ebuild
index 95064d7be608..d2f98991fc3e 100644
--- a/sys-apps/psmisc/psmisc-19-r3.ebuild
+++ b/sys-apps/psmisc/psmisc-19-r3.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r3.ebuild,v 1.8 2002/10/04 06:29:28 vapier Exp $
-
-#from Debian ;)
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r3.ebuild,v 1.9 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/psmisc
 DESCRIPTION="Handy process-related utilities from Debian"
 SRC_URI="ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/${P}.tar.gz"
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
+RDEPEND="${DEPEND}"
 HOMEPAGE="http://psmisc.sourceforge.net/"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 SLOT="0"
diff --git a/sys-apps/quota/quota-3.03.ebuild b/sys-apps/quota/quota-3.03.ebuild
index b55a023bec4a..0029a07bbacf 100644
--- a/sys-apps/quota/quota-3.03.ebuild
+++ b/sys-apps/quota/quota-3.03.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/quota/quota-3.03.ebuild,v 1.8 2002/10/04 06:29:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.03.ebuild,v 1.9 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
@@ -12,13 +12,14 @@ KEYWORDS="x86"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf || die "./configure failed"
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,2,3,8}}
 	make ROOTDIR=${D} install || die
 	install -m 644 warnquota.conf ${D}/etc
diff --git a/sys-apps/quota/quota-3.04.ebuild b/sys-apps/quota/quota-3.04.ebuild
index 84f651faefa8..1da1850d74ab 100644
--- a/sys-apps/quota/quota-3.04.ebuild
+++ b/sys-apps/quota/quota-3.04.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/quota/quota-3.04.ebuild,v 1.10 2002/10/04 06:29:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.04.ebuild,v 1.11 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
@@ -12,13 +12,14 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf || die "./configure failed"
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,2,3,8}}
 	make ROOTDIR=${D} install || die
 	install -m 644 warnquota.conf ${D}/etc
diff --git a/sys-apps/quota/quota-3.06.ebuild b/sys-apps/quota/quota-3.06.ebuild
index 74f17beca222..7201a58c92b6 100644
--- a/sys-apps/quota/quota-3.06.ebuild
+++ b/sys-apps/quota/quota-3.06.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/quota/quota-3.06.ebuild,v 1.3 2002/10/04 06:29:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/quota/quota-3.06.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/quota-tools
 DESCRIPTION="Linux quota tools"
@@ -12,13 +12,14 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf || die "./configure failed"
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dodir {sbin,etc,usr/sbin,usr/bin,usr/share/man/man{1,2,3,8}}
 	make ROOTDIR=${D} install || die
 #	install -m 644 warnquota.conf ${D}/etc
diff --git a/sys-apps/setserial/setserial-2.17-r2.ebuild b/sys-apps/setserial/setserial-2.17-r2.ebuild
index 2809e1a9b916..72c7dded6feb 100644
--- a/sys-apps/setserial/setserial-2.17-r2.ebuild
+++ b/sys-apps/setserial/setserial-2.17-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/setserial/setserial-2.17-r2.ebuild,v 1.9 2002/10/04 06:29:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r2.ebuild,v 1.10 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Configure your serial ports with it"
@@ -12,16 +12,14 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {						   
-
 	econf || die
 	pmake setserial || die
-
 }
 
 src_install() {	  
-						 
 	doman setserial.8
 	into /
 	dobin setserial
diff --git a/sys-apps/sh-utils/sh-utils-2.0.15.ebuild b/sys-apps/sh-utils/sh-utils-2.0.15.ebuild
index 66ac449a4cd3..43a3f96d3f99 100644
--- a/sys-apps/sh-utils/sh-utils-2.0.15.ebuild
+++ b/sys-apps/sh-utils/sh-utils-2.0.15.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.15.ebuild,v 1.5 2002/10/16 19:10:17 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.15.ebuild,v 1.6 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls static build"
 
@@ -10,6 +10,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/shellutils/shellutils.html"
 
 DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -49,7 +50,6 @@ src_compile() {
 }
 
 src_install() {
-
 	einstall || die
 		
 	rm -rf ${D}/usr/lib
@@ -83,4 +83,3 @@ pkg_postinst() {
 		rm -f ${ROOT}/usr/bin/hostname
 	fi
 }
-
diff --git a/sys-apps/silo/silo-1.2.5.ebuild b/sys-apps/silo/silo-1.2.5.ebuild
index eb7d040ee2c6..95cb6d0218d0 100644
--- a/sys-apps/silo/silo-1.2.5.ebuild
+++ b/sys-apps/silo/silo-1.2.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/silo/silo-1.2.5.ebuild,v 1.7 2002/10/15 08:57:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/silo/silo-1.2.5.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
@@ -12,6 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 DEPEND="sys-apps/e2fsprogs
 	sys-apps/sparc-utils"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	 make ${MAKEOPTS} || die
diff --git a/sys-apps/silo/silo-1.2.6.ebuild b/sys-apps/silo/silo-1.2.6.ebuild
index 8f6c28ba496d..9a765ea0a4ef 100644
--- a/sys-apps/silo/silo-1.2.6.ebuild
+++ b/sys-apps/silo/silo-1.2.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/silo/silo-1.2.6.ebuild,v 1.3 2002/10/15 08:57:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/silo/silo-1.2.6.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
@@ -13,6 +13,7 @@ KEYWORDS="~sparc ~sparc64 -x86 -ppc -alpha"
 
 DEPEND="sys-apps/e2fsprogs
 	sys-apps/sparc-utils"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	make ${MAKEOPTS} || die
diff --git a/sys-apps/slocate/slocate-2.6.ebuild b/sys-apps/slocate/slocate-2.6.ebuild
index 22b744cec26c..01d1a725ef6f 100644
--- a/sys-apps/slocate/slocate-2.6.ebuild
+++ b/sys-apps/slocate/slocate-2.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/slocate/slocate-2.6.ebuild,v 1.6 2002/10/04 06:30:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.6.ebuild,v 1.7 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Secure locate provides a secure way to index and quickly search for files on your system (drop-in replacement for 'locate')"
@@ -9,6 +9,7 @@ HOMEPAGE="http://www.geekreview.org/slocate/"
 KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 LICENSE="GPL-2"
 
 src_compile() {
@@ -18,7 +19,6 @@ src_compile() {
 
 
 src_install() {
-
 	# make install for this package is blocked by sandbox
 	dobin slocate
 	dosym /usr/bin/slocate /usr/bin/locate
diff --git a/sys-apps/star/star-1.4_alpha21.ebuild b/sys-apps/star/star-1.4_alpha21.ebuild
index 182eeda232ab..96c95a99f2d4 100644
--- a/sys-apps/star/star-1.4_alpha21.ebuild
+++ b/sys-apps/star/star-1.4_alpha21.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_alpha21.ebuild,v 1.7 2002/10/04 06:30:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.4_alpha21.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/star-1.4
 
@@ -11,6 +11,7 @@ KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/star/star-1.5_alpha06.ebuild b/sys-apps/star/star-1.5_alpha06.ebuild
index 0d5b41257df3..131c3920c664 100644
--- a/sys-apps/star/star-1.5_alpha06.ebuild
+++ b/sys-apps/star/star-1.5_alpha06.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.5_alpha06.ebuild,v 1.3 2002/10/04 06:30:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/star/star-1.5_alpha06.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/star-1.5
 
@@ -11,6 +11,7 @@ KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/stat/stat-2.5.ebuild b/sys-apps/stat/stat-2.5.ebuild
index 9784c1bd2cc7..fe8625eeefe6 100644
--- a/sys-apps/stat/stat-2.5.ebuild
+++ b/sys-apps/stat/stat-2.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/stat/stat-2.5.ebuild,v 1.4 2002/10/04 06:30:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/stat/stat-2.5.ebuild,v 1.5 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command-line stat() wrapper."
@@ -10,6 +10,7 @@ KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -22,7 +23,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dobin stat
 	doman stat.1
 	dodoc COPYRIGHT GPL README Changelog
diff --git a/sys-apps/supersed/supersed-3.58-r1.ebuild b/sys-apps/supersed/supersed-3.58-r1.ebuild
index 97298471d260..efd3b3fe5678 100644
--- a/sys-apps/supersed/supersed-3.58-r1.ebuild
+++ b/sys-apps/supersed/supersed-3.58-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/supersed/supersed-3.58-r1.ebuild,v 1.3 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/supersed/supersed-3.58-r1.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls static build"
 
@@ -16,6 +16,7 @@ KEYWORDS="x86 ppc sparc sparc64"
 
 DEPEND="dev-libs/libpcre
 	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	local myconf
diff --git a/sys-apps/supersed/supersed-3.58-r2.ebuild b/sys-apps/supersed/supersed-3.58-r2.ebuild
index 09e103935820..54dc2b8cc6c4 100644
--- a/sys-apps/supersed/supersed-3.58-r2.ebuild
+++ b/sys-apps/supersed/supersed-3.58-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/supersed/supersed-3.58-r2.ebuild,v 1.4 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/supersed/supersed-3.58-r2.ebuild,v 1.5 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls static build"
 
@@ -16,9 +16,9 @@ KEYWORDS="x86 ppc sparc sparc64 alpha"
 
 DEPEND="dev-libs/libpcre
 	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}/doc
 	mv sed-in.texi sed-in.texi.orig
diff --git a/sys-apps/textutils/textutils-2.0.21.ebuild b/sys-apps/textutils/textutils-2.0.21.ebuild
index 844a22672d04..713f356cba47 100644
--- a/sys-apps/textutils/textutils-2.0.21.ebuild
+++ b/sys-apps/textutils/textutils-2.0.21.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/textutils/textutils-2.0.21.ebuild,v 1.4 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.21.ebuild,v 1.5 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls static build"
 
@@ -14,7 +14,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="nls?  ( sys-devel/gettext )"
-
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -25,7 +25,6 @@ src_unpack() {
 	rm doc/coreutils.info
 }
 
-
 src_compile() {
 	local myconf=""
 	use nls || myconf="--disable-nls"
diff --git a/sys-apps/textutils/textutils-2.1.ebuild b/sys-apps/textutils/textutils-2.1.ebuild
index 0bd9d909d126..9c6182c6a54b 100644
--- a/sys-apps/textutils/textutils-2.1.ebuild
+++ b/sys-apps/textutils/textutils-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/textutils/textutils-2.1.ebuild,v 1.3 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.1.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls static build"
 
@@ -14,7 +14,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="nls? ( sys-devel/gettext )"
-
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	local myconf=""
@@ -52,4 +52,3 @@ src_install() {
 		rm -rf ${D}/usr/share
 	fi
 }
-
diff --git a/sys-apps/thinkpad/thinkpad-3.2.ebuild b/sys-apps/thinkpad/thinkpad-3.2.ebuild
index ab762aa83ed9..0dfe2e73e87f 100644
--- a/sys-apps/thinkpad/thinkpad-3.2.ebuild
+++ b/sys-apps/thinkpad/thinkpad-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/thinkpad/thinkpad-3.2.ebuild,v 1.7 2002/10/04 06:31:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-3.2.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 
 #virtual/glibc should depend on specific kernel headers
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	#thinkpad will compile modules for the kernel pointed to by /usr/src/linux
@@ -29,14 +30,11 @@ pkg_setup() {
 	fi
 }
 
-src_compile () {
-
+src_compile() {
 	emake || die "Make failed"
-
 }
 
-src_install () {
-	
+src_install() {
 	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TECHNOTES
 	dodir /lib/modules/${KV}/thinkpad
 	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
@@ -48,10 +46,10 @@ src_install () {
 		> ${D}/etc/devfsd.conf
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	/usr/sbin/update-modules || return 0
 }
 
-pkg_prerm () {
+pkg_prerm() {
 	/sbin/modprobe -r smapi superion rtcmosram thinkpadpm thinkpad
 }
diff --git a/sys-apps/time/time-1.7-r1.ebuild b/sys-apps/time/time-1.7-r1.ebuild
index de2e5de63e69..e74e589b6c74 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.7 2002/10/19 03:21:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/time/time-1.7-r1.ebuild,v 1.8 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A command that displays info about resources used by a program"
@@ -19,7 +19,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	cd ${S}
 	echo "START-INFO-DIR-ENTRY
 * time: (time).            summarize system resources used
@@ -32,4 +32,3 @@ END-INFO-DIR-ENTRY" > temp
 	dodoc ChangeLog COPYING README
 	dodoc AUTHORS NEWS
 }
-
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 fba3e55389ce..acc52219e0b6 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-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/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild,v 1.5 2002/10/19 03:21:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild,v 1.6 2002/10/19 04:06:04 vapier Exp $
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
@@ -8,6 +8,7 @@ SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
 HOMEPAGE="http://cr.yp.to/${PN}/"
 S=${WORKDIR}/${P}
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 SLOT="0"
 KEYWORDS="x86 sparc sparc64"
 LICENSE="as-is"
diff --git a/sys-apps/usbutils/usbutils-0.9.ebuild b/sys-apps/usbutils/usbutils-0.9.ebuild
index 81d3d9851052..99ad23e569a4 100644
--- a/sys-apps/usbutils/usbutils-0.9.ebuild
+++ b/sys-apps/usbutils/usbutils-0.9.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/usbutils/usbutils-0.9.ebuild,v 1.5 2002/10/04 06:31:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.9.ebuild,v 1.6 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="USB enumeration utilities"
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	# put usb.ids in same place as pci.ids (/usr/share/misc)
@@ -24,6 +25,6 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 }
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20020415.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20020415.ebuild
index 4b06e3971d8f..723eacd0d142 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20020415.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20020415.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/usermode-utilities/usermode-utilities-20020415.ebuild,v 1.2 2002/10/11 17:33:55 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20020415.ebuild,v 1.3 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -12,14 +12,13 @@ LICENSE="GPL-2"
 KEYWORDS="x86 -ppc sparc sparc64 -alpha"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	emake CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE -g -Wall" all
 }
 
 src_install () {
-
 	make DESTDIR=${D} install
 
 	dodoc COPYING 	
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20020718.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20020718.ebuild
index bf38f4f4e55a..b314929d3f63 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20020718.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20020718.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/usermode-utilities/usermode-utilities-20020718.ebuild,v 1.2 2002/10/11 17:33:55 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20020718.ebuild,v 1.3 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -12,14 +12,13 @@ LICENSE="GPL-2"
 KEYWORDS="x86 -ppc sparc sparc64 -alpha"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	emake CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE -g -Wall" all
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install
 
 	dodoc COPYING 	
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20020729.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20020729.ebuild
index e8c03a28f3e2..db6984a97214 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20020729.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20020729.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/usermode-utilities/usermode-utilities-20020729.ebuild,v 1.2 2002/10/11 17:33:55 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20020729.ebuild,v 1.3 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -12,14 +12,13 @@ LICENSE="GPL-2"
 KEYWORDS="x86 -ppc sparc sparc64 -alpha"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	emake CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE -g -Wall" all
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install
 
 	dodoc COPYING 	
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20020821.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20020821.ebuild
index 8c6dbc7d3179..ee6aa67b3bc9 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20020821.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20020821.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/usermode-utilities/usermode-utilities-20020821.ebuild,v 1.2 2002/10/11 17:33:55 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20020821.ebuild,v 1.3 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -12,14 +12,13 @@ LICENSE="GPL-2"
 KEYWORDS="x86 -ppc sparc sparc64 -alpha"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	emake CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE -g -Wall" all
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install
 
 	dodoc COPYING 	
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild
index 36bdd508d328..01785d233066 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20020906.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/usermode-utilities/usermode-utilities-20020906.ebuild,v 1.3 2002/10/16 14:33:24 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20020906.ebuild,v 1.4 2002/10/19 04:06:04 vapier Exp $
 
 S=${WORKDIR}/tools
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
@@ -12,14 +12,13 @@ LICENSE="GPL-2"
 KEYWORDS="x86 -ppc sparc sparc64 -alpha"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-
 	emake CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE -g -Wall" all
 }
 
 src_install () {
-
 	make DESTDIR=${D} install
 
 	dodoc COPYING 	
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 beedc2569479..91342c7be1a4 100644
--- a/sys-apps/util-linux/util-linux-2.11r-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11r-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/util-linux/util-linux-2.11r-r1.ebuild,v 1.10 2002/10/19 03:21:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11r-r1.ebuild,v 1.11 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="crypt nls"
 
@@ -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"
@@ -41,7 +40,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	./configure || die
 
 	if [ -z "`use nls`" ]
@@ -71,4 +69,3 @@ src_install() {
 	docinto examples
 	dodoc example.files/*
 }
-
diff --git a/sys-apps/util-linux/util-linux-2.11r.ebuild b/sys-apps/util-linux/util-linux-2.11r.ebuild
index 5a5c221272d9..fd52b3a91302 100644
--- a/sys-apps/util-linux/util-linux-2.11r.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11r.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.11r.ebuild,v 1.9 2002/10/19 03:21:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11r.ebuild,v 1.10 2002/10/19 04:06:04 vapier Exp $
 
 IUSE="nls"
 
@@ -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"
@@ -38,7 +37,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	./configure || die
 
 	if [ -z "`use nls`" ]
@@ -68,4 +66,3 @@ src_install() {
 	docinto examples
 	dodoc example.files/*
 }
-