lintool fixes for #9258

4 files changed, 48 insertions, 60 deletions

diff --git a/sys-apps/irda-utils/irda-utils-0.9.13.ebuild b/sys-apps/irda-utils/irda-utils-0.9.13.ebuild
index 9e533658fc8d..d42664b45b65 100644
--- a/sys-apps/irda-utils/irda-utils-0.9.13.ebuild
+++ b/sys-apps/irda-utils/irda-utils-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.13.ebuild,v 1.7 2002/10/04 06:26:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.13.ebuild,v 1.8 2002/10/19 02:06:32 vapier Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="IrDA Utilities, tools for IrDA communication"
@@ -11,20 +11,21 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/irdadump
-        cp autogen.sh autogen.sh.orig
-        sed -e "s:1.2:1.4:g" autogen.sh.orig > autogen.sh
-        rm autogen.sh.orig
+	cp autogen.sh autogen.sh.orig
+	sed -e "s:1.2:1.4:g" autogen.sh.orig > autogen.sh
+	rm autogen.sh.orig
 }
 
 src_compile() {
 	make ROOT="${D}" RPM_BUILD_ROOT="${D}" || die "Making failed."
 }
 
-src_install () {
+src_install() {
 	dodir /etc/rc.d/init.d
  	dodir /usr/bin
  	dodir /usr/sbin
@@ -49,4 +50,3 @@ src_install () {
 
 	dodoc README
 }
-
diff --git a/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
index ab7ef559bb78..39d5b6f31df3 100644
--- a/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
@@ -1,45 +1,39 @@
 # 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.23-r1.ebuild,v 1.7 2002/10/04 06:26:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild,v 1.8 2002/10/19 02:06:32 vapier Exp $
 
-A=${P}.tgz
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 DESCRIPTION="Tools for configuring ISA PnP devices"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${A}"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
 KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}/src
-    cp pnpdump_main.c pnpdump_main.c.orig
-    sed -e "s/^static FILE\* o_file.*//" \
-	-e "s/o_file/stdout/g" \
-	-e "s/stdout_name/o_file_name/g" pnpdump_main.c.orig > pnpdump_main.c
-
+	unpack ${A}
+	cd ${S}/src
+	cp pnpdump_main.c pnpdump_main.c.orig
+	sed -e "s/^static FILE\* o_file.*//" \
+	 -e "s/o_file/stdout/g" \
+	 -e "s/stdout_name/o_file_name/g" pnpdump_main.c.orig > pnpdump_main.c
 }
 
 src_compile() {
-
-    ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} || die
-    emake || die
-
+	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} || die
+	emake || die
 }
 
 src_install() {
+	make DESTDIR=${D} install || die
 
-    make DESTDIR=${D} install || die
-
-    dodoc AUTHORS ChangeLog COPYING README NEWS
-    docinto txt
-    dodoc doc/README*  doc/*.txt test/*.txt
-    dodoc etc/isapnp.*
-
-    exeinto /etc/rc.d/init.d
-    newexe ${FILESDIR}/isapnp.rc5 isapnp
+	dodoc AUTHORS ChangeLog COPYING README NEWS
+	docinto txt
+	dodoc doc/README*  doc/*.txt test/*.txt etc/isapnp.*
 
+	exeinto /etc/rc.d/init.d
+	newexe ${FILESDIR}/isapnp.rc5 isapnp
 }
diff --git a/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild b/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
index 6afd18dd411d..c5ebb4f78c7d 100644
--- a/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
@@ -1,45 +1,39 @@
 # 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.23-r6.ebuild,v 1.6 2002/10/04 06:26:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild,v 1.7 2002/10/19 02:06:32 vapier Exp $
 
-A=${P}.tgz
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 DESCRIPTION="Tools for configuring ISA PnP devices"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${A}"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
 KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}/src
-    cp pnpdump_main.c pnpdump_main.c.orig
-    sed -e "s/^static FILE\* o_file.*//" \
-	-e "s/o_file/stdout/g" \
-	-e "s/stdout_name/o_file_name/g" pnpdump_main.c.orig > pnpdump_main.c
-
+	unpack ${A}
+	cd ${S}/src
+	cp pnpdump_main.c pnpdump_main.c.orig
+	sed -e "s/^static FILE\* o_file.*//" \
+	 -e "s/o_file/stdout/g" \
+	 -e "s/stdout_name/o_file_name/g" pnpdump_main.c.orig > pnpdump_main.c
 }
 
 src_compile() {
-
-    ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} || die
-    emake || die
-
+	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} || die
+	emake || die
 }
 
 src_install() {
+	make DESTDIR=${D} install || die
 
-    make DESTDIR=${D} install || die
-
-    dodoc AUTHORS ChangeLog COPYING README NEWS
-    docinto txt
-    dodoc doc/README*  doc/*.txt test/*.txt
-    dodoc etc/isapnp.*
-
-    exeinto /etc/init.d
-    newexe ${FILESDIR}/isapnp.rc6 isapnp
+	dodoc AUTHORS ChangeLog COPYING README NEWS
+	docinto txt
+	dodoc doc/README*  doc/*.txt test/*.txt etc/isapnp.*
 
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/isapnp.rc6 isapnp
 }
diff --git a/sys-apps/kbd/kbd-1.06-r1.ebuild b/sys-apps/kbd/kbd-1.06-r1.ebuild
index f4f644a1f394..6f1336358112 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.10 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.06-r1.ebuild,v 1.11 2002/10/19 02:06:32 vapier Exp $
 
 IUSE="nls"
 
@@ -25,9 +25,9 @@ src_compile() {
 }
 
 src_install() {
-	make  \
-	DESTDIR=${D} \
-	DATADIR=${D}/usr/share \
-	MANDIR=${D}/usr/share/man \
-	install || die
+	make \
+		DESTDIR=${D} \
+		DATADIR=${D}/usr/share \
+		MANDIR=${D}/usr/share/man \
+		install || die
 }