dyn_fetch() -> pkg_nofetch(); tidy

4 files changed, 40 insertions, 38 deletions

diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index 476492a0926a..2983a82be32f 100644
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/icaclient
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.8 2004/06/07 21:55:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.9 2004/06/07 22:01:01 mr_bones_ Exp $
+
+  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  icaclient-6.30-r1.ebuild, icaclient-7.0.ebuild:
+  dyn_fetch() -> pkg_nofetch(); tidy
 
   07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> icaclient-6.30.ebuild:
   clean older ebuild
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index bf6088c1c416..ac5ed68a5cd2 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,6 +1,6 @@
-MD5 45f8a6ff6be85ac25699e22371d12c1e ChangeLog 914
-MD5 c68889da3a38ec4fff0b7c4959d70d5a icaclient-6.30-r1.ebuild 1884
-MD5 3ff29aaaf961d6b1ad2f087a80d78e77 icaclient-7.0.ebuild 1880
+MD5 637b5704808c6808b06cec7d0805cd0b ChangeLog 1057
+MD5 0457de9f20c040cfd587e9ad8fb92370 icaclient-6.30-r1.ebuild 1809
+MD5 2164073ab4ac7580fc1ca52222e59d4f icaclient-7.0.ebuild 1805
 MD5 f36b804ac235cd4e63bab14001ff5335 files/10ICAClient 44
 MD5 8c3ecc1c3852bbc576833ea8c4cc90c0 files/digest-icaclient-6.30-r1 71
 MD5 6d6282b0502b9927e5d77a1ed6751722 files/digest-icaclient-7.0 71
diff --git a/net-misc/icaclient/icaclient-6.30-r1.ebuild b/net-misc/icaclient/icaclient-6.30-r1.ebuild
index 285a9a517686..5eb06a37120f 100644
--- a/net-misc/icaclient/icaclient-6.30-r1.ebuild
+++ b/net-misc/icaclient/icaclient-6.30-r1.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-6.30-r1.ebuild,v 1.4 2003/09/05 22:01:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-6.30-r1.ebuild,v 1.5 2004/06/07 22:01:01 mr_bones_ Exp $
 
-S=${WORKDIR}/usr
 DESCRIPTION="ICA Client"
-SRC_URI="ICAClient-6.30-1.i386.rpm"
 HOMEPAGE="http://www.citrix.com/download/unix-downloads.asp"
-RDEPEND="virtual/glibc virtual/x11"
-DEPEND="${RDEPEND} >=app-arch/rpm-3.0.6"
+SRC_URI="ICAClient-7.00-1.i386.rpm"
+
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
 RESTRICT="fetch"
-KEYWORDS="x86 sparc "
 
-dyn_fetch() {
-	for y in ${A}
-	do
-		digest_check ${y}
-			if [ $? -ne 0 ]; then
-				einfo "Please download this yourself from www.citrix.com"
-				einfo "and place it in ${DISTDIR}"
-				exit 1
-			fi
-	done
+RDEPEND="virtual/glibc
+	virtual/x11"
+DEPEND="${RDEPEND}
+	>=app-arch/rpm-3.0.6"
+
+S="${WORKDIR}/usr"
+
+pkg_nofetch() {
+	einfo "Please download ${A} yourself from www.citrix.com"
+	einfo "and place it in ${DISTDIR}"
 }
 
 src_unpack() {
diff --git a/net-misc/icaclient/icaclient-7.0.ebuild b/net-misc/icaclient/icaclient-7.0.ebuild
index d3108f35de16..9213b0ed70d0 100644
--- a/net-misc/icaclient/icaclient-7.0.ebuild
+++ b/net-misc/icaclient/icaclient-7.0.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-7.0.ebuild,v 1.1 2003/10/10 18:16:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-7.0.ebuild,v 1.2 2004/06/07 22:01:01 mr_bones_ Exp $
 
-S=${WORKDIR}/usr
 DESCRIPTION="ICA Client"
-SRC_URI="ICAClient-7.00-1.i386.rpm"
 HOMEPAGE="http://www.citrix.com/download/unix-downloads.asp"
-RDEPEND="virtual/glibc virtual/x11"
-DEPEND="${RDEPEND} >=app-arch/rpm-3.0.6"
+SRC_URI="ICAClient-7.00-1.i386.rpm"
+
 LICENSE="as-is"
 SLOT="0"
-RESTRICT="fetch"
 KEYWORDS="~x86 ~sparc"
+IUSE=""
+RESTRICT="fetch"
+
+RDEPEND="virtual/glibc
+	virtual/x11"
+DEPEND="${RDEPEND}
+	>=app-arch/rpm-3.0.6"
+
+S="${WORKDIR}/usr"
 
-dyn_fetch() {
-	for y in ${A}
-	do
-		digest_check ${y}
-			if [ $? -ne 0 ]; then
-				einfo "Please download this yourself from www.citrix.com"
-				einfo "and place it in ${DISTDIR}"
-				exit 1
-			fi
-	done
+pkg_nofetch() {
+	einfo "Please download ${A} yourself from www.citrix.com"
+	einfo "and place it in ${DISTDIR}"
 }
 
 src_unpack() {