From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 7 Jun 2006 11:19:57 +0000 (+0000)
Subject: cleanups
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=05f29af97dff6672952424a053971ba69db8d8e9;p=gentoo.git

cleanups
Package-Manager: portage-2.1_rc2-r3
---

diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 43df043681e8..f96ef2b012d1 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.88-bigendian.patch 478 RMD160 65025a0a97e83bf920353c874ae0c484660c7d4b SHA1 91739a44c1993d5d1c66a57c759cb656d1ef96a8 SHA256 843738c0888c3072605dea0c536f5dc0f3ed2779a1cd7e0e959ccd2e4e705b6c
 MD5 fb41d7c55db5124d7488a923e4223576 files/0.88-bigendian.patch 478
 RMD160 65025a0a97e83bf920353c874ae0c484660c7d4b files/0.88-bigendian.patch 478
@@ -42,10 +45,10 @@ EBUILD ucspi-tcp-0.88-r14.ebuild 2742 RMD160 8dedbeedaa1f0ac6b656c1e62905bad40f2
 MD5 1cf86c2ba29bfed9cca0a9ebf50c3073 ucspi-tcp-0.88-r14.ebuild 2742
 RMD160 8dedbeedaa1f0ac6b656c1e62905bad40f29e4bd ucspi-tcp-0.88-r14.ebuild 2742
 SHA256 43967b7eacfd5a38093927dfe305625d9417ea706e7d209712b06c59f3bbdae0 ucspi-tcp-0.88-r14.ebuild 2742
-EBUILD ucspi-tcp-0.88-r15.ebuild 3044 RMD160 b9af98e89d416d0be9790f1efbb64c0082b19ecd SHA1 554789194158cd16bbd99c0b389a720d20eebdf6 SHA256 20276b356b51f99e8d939feb9ab6df2ab0c3f112806ef9f266a8d14c6a7c0a7e
-MD5 a35b3d1a8f1959cac147b1eab935bd28 ucspi-tcp-0.88-r15.ebuild 3044
-RMD160 b9af98e89d416d0be9790f1efbb64c0082b19ecd ucspi-tcp-0.88-r15.ebuild 3044
-SHA256 20276b356b51f99e8d939feb9ab6df2ab0c3f112806ef9f266a8d14c6a7c0a7e ucspi-tcp-0.88-r15.ebuild 3044
+EBUILD ucspi-tcp-0.88-r15.ebuild 3068 RMD160 5a0b7fa34bbb94deb68a999640ed4680782c5473 SHA1 d2856d3d6b0f3c4655a7920c8c1efaa73c5957c2 SHA256 f086428a72c87d5b76ea0b281d633264fc687e4c4f631e25eb9ccc13a3775a00
+MD5 a97e1020348cd48c651d7de86f276994 ucspi-tcp-0.88-r15.ebuild 3068
+RMD160 5a0b7fa34bbb94deb68a999640ed4680782c5473 ucspi-tcp-0.88-r15.ebuild 3068
+SHA256 f086428a72c87d5b76ea0b281d633264fc687e4c4f631e25eb9ccc13a3775a00 ucspi-tcp-0.88-r15.ebuild 3068
 MISC ChangeLog 7220 RMD160 53e6275818106c4ab2c177b3a84e860d08f206b3 SHA1 374c663a1142e5ed963ba60d98546a26088e155e SHA256 c7f17e68c331f83d6faa080ec424a0b246691203fa566a6e66c359369e2733e8
 MD5 baac9fc3d30136e4e44c587d509fcdd6 ChangeLog 7220
 RMD160 53e6275818106c4ab2c177b3a84e860d08f206b3 ChangeLog 7220
@@ -63,3 +66,10 @@ SHA256 082c9111937c7712373c4fcd27332a6213753c97c363a8835659d628f1016f70 files/di
 MD5 71e4142fc5f0ff226abf84b1d720ff0d files/digest-ucspi-tcp-0.88-r15 1289
 RMD160 76246806e54aa7b4664226289b8ebc25e3de9fed files/digest-ucspi-tcp-0.88-r15 1289
 SHA256 082c9111937c7712373c4fcd27332a6213753c97c363a8835659d628f1016f70 files/digest-ucspi-tcp-0.88-r15 1289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEhrdW2+ySkm8kpY0RAnKTAKCcLBU+DcfS5r68QCpN5r4RmuqhkwCdHLeA
+PzIuJMvpQclirS1BrD7QHZQ=
+=qks4
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r15.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r15.ebuild
index 26a0ac7b07cb..ed56bce41ba0 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r15.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r15.ebuild,v 1.1 2006/05/31 03:02:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r15.ebuild,v 1.2 2006/06/07 11:19:57 vapier Exp $
 
 inherit eutils toolchain-funcs fixheadtails flag-o-matic
 
@@ -15,8 +15,7 @@ SRC_URI="
 	ssl? (
 		!ipv6? ( http://www.nrg4u.com/qmail/ucspi-tcp-ssl-20050405.patch.gz )
 		ipv6? ( mirror://gentoo/ucspi-tcp-0.88-ipv6-ssl-20050405.patch )
-	)
-"
+	)"
 
 LICENSE="as-is"
 SLOT="0"
@@ -25,24 +24,24 @@ IUSE="ssl ipv6 selinux doc"
 RESTRICT="test"
 
 DEPEND="virtual/libc
-		ssl? ( >=dev-libs/openssl-0.9.6g )"
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
 RDEPEND="${DEPEND}
-		doc? ( app-doc/ucspi-tcp-man )
-		selinux? ( sec-policy/selinux-ucspi-tcp )"
+	doc? ( app-doc/ucspi-tcp-man )
+	selinux? ( sec-policy/selinux-ucspi-tcp )"
 PROVIDE="virtual/inetd"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	cd ${S}
+	cd "${S}"
 
-	if use ipv6; then
-		epatch ${DISTDIR}/ucspi-tcp-0.88-ipv6.${IPV6_PATCH}.bz2
+	if use ipv6 ; then
+		epatch "${DISTDIR}"/ucspi-tcp-0.88-ipv6.${IPV6_PATCH}.bz2
 		# Fixes bug 18892
-		epatch ${FILESDIR}/${PV}-bigendian.patch
-		epatch ${FILESDIR}/${PV}-tcprules.patch
+		epatch "${FILESDIR}"/${PV}-bigendian.patch
+		epatch "${FILESDIR}"/${PV}-tcprules.patch
 	fi
 
-	if use ssl; then
+	if use ssl ; then
 		if use ipv6 ; then
 			# Rediffed patch by hansmi@g.o
 			# -> broken, hansmi on 2006-03-14
@@ -53,20 +52,20 @@ src_unpack() {
 			ebeep
 			echo
 		else
-			epatch ${DISTDIR}/ucspi-tcp-ssl-20050405.patch.gz
+			epatch "${DISTDIR}"/ucspi-tcp-ssl-20050405.patch.gz
 		fi
 	fi
 
-	if use !ssl && use !ipv6; then
-		epatch ${FILESDIR}/${PV}-errno.patch
+	if use !ssl && use !ipv6 ; then
+		epatch "${FILESDIR}"/${PV}-errno.patch
 	fi
 
-	epatch ${DISTDIR}/ucspi-rss.diff
-	epatch ${FILESDIR}/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
+	epatch "${DISTDIR}"/ucspi-rss.diff
+	epatch "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
 
 	# Bug 98726
-	#epatch ${FILESDIR}/${PV}-limits.patch
-	#use ipv6 && epatch ${FILESDIR}/${PV}-limits-ipv6.patch
+	#epatch "${FILESDIR}"/${PV}-limits.patch
+	#use ipv6 && epatch "${FILESDIR}"/${PV}-limits-ipv6.patch
 
 	ht_fix_file Makefile
 
@@ -88,12 +87,13 @@ src_compile() {
 }
 
 src_install() {
-	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd || die
+	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ \
+		tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd || die
 	doman *.[15]
 	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 	dodoc README.tcpserver-limits-patch
 	insinto /etc/tcprules.d/
-	newins ${FILESDIR}/tcprules-Makefile Makefile
+	newins "${FILESDIR}"/tcprules-Makefile Makefile
 }
 
 pkg_postinst() {