lintool fixes for #9258

4 files changed, 32 insertions, 56 deletions

diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild
index 3e90c86f7cd1..de6edd484ed0 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild,v 1.7 2002/10/04 06:31:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r1.ebuild,v 1.8 2002/10/19 03:21:25 vapier Exp $
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/${PN}/"
 KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
-LICENSE="Freeware"
-S=${WORKDIR}/${P}
+LICENSE="freedist"
+S="${WORKDIR}/${P}"
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	echo "gcc ${CFLAGS}" > conf-cc
@@ -25,7 +25,6 @@ src_compile() {
 }
 
 src_install() {
-
 	for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
 	do
 		dobin ${i}
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild
index 5b16854a1afd..fba3e55389ce 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild,v 1.4 2002/10/04 06:31:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r2.ebuild,v 1.5 2002/10/19 03:21:25 vapier Exp $
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
-		 http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff11.bz2"
+	http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff11.bz2"
 HOMEPAGE="http://cr.yp.to/${PN}/"
 S=${WORKDIR}/${P}
 DEPEND="virtual/glibc"
@@ -13,28 +13,23 @@ KEYWORDS="x86 sparc sparc64"
 LICENSE="as-is"
 
 src_unpack() {
-
-  unpack ${P}.tar.gz
-  use ipv6 && bzcat ${DISTDIR}/ucspi-tcp-0.88-ipv6.diff11.bz2 | patch -d ${S} -p1
-  cd ${S}
-  echo "gcc ${CFLAGS}" > conf-cc
-  echo "gcc" > conf-ld
-  echo "/usr/" > conf-home
+	unpack ${P}.tar.gz
+	use ipv6 && bzcat ${DISTDIR}/ucspi-tcp-0.88-ipv6.diff11.bz2 | patch -d ${S} -p1
+	cd ${S}
+	echo "gcc ${CFLAGS}" > conf-cc
+	echo "gcc" > conf-ld
+	echo "/usr/" > conf-home
 }
 
 src_compile() {
-  try pmake
+	pmake || die
 }
 
 src_install() {
+	for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+	do
+		dobin $i
+	done
 
-  for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
-  do
-    dobin $i
-  done
-
-  dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 }
-
-
-
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild
index 7c664c150162..845a03da50a4 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild,v 1.5 2002/10/08 13:30:55 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r3.ebuild,v 1.6 2002/10/19 03:21:25 vapier Exp $
 
 IUSE="ssl ipv6"
 
@@ -21,7 +21,6 @@ KEYWORDS="x86 sparc sparc64"
 LICENSE="as-is"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
@@ -32,25 +31,17 @@ src_unpack() {
 	echo "gcc ${CFLAGS}" > conf-cc
 	echo "gcc" > conf-ld
 	echo "/usr/" > conf-home
-
 }
 
 src_compile() {
-
-  try pmake
-
+	pmake || die
 }
 
 src_install() {
+	for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+	do
+		dobin $i
+	done
 
-  for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
-  do
-    dobin $i
-  done
-
-  dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 }
-
-
-
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild
index 0c4e41bf4866..cee1092a507b 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild,v 1.3 2002/10/05 05:39:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r4.ebuild,v 1.4 2002/10/19 03:21:25 vapier Exp $
 
 IUSE="ssl ipv6"
 
@@ -21,7 +21,6 @@ KEYWORDS="x86 sparc sparc64"
 LICENSE="as-is"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
@@ -32,25 +31,17 @@ src_unpack() {
 	echo "gcc ${CFLAGS}" > conf-cc
 	echo "gcc" > conf-ld
 	echo "/usr/" > conf-home
-
 }
 
 src_compile() {
-
-  try pmake
-
+	pmake || die
 }
 
 src_install() {
+	for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+	do
+		dobin $i
+	done
 
-  for i in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
-  do
-    dobin $i
-  done
-
-  dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 }
-
-
-