cleanup

3 files changed, 38 insertions, 50 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 2c440b1a6c3d..d8c73624e94a 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.1 2003/07/05 12:42:36 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.2 2003/07/09 15:47:07 vapier Exp $
 
 *cisco-vpnclient-3des-4.0.1a (05 JUL 2003)
 
+  09 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Cleaned up ebuild, made it use $KV properly.
+
   05 JUL 2003; Bart Lauwers <blauwers@gentoo.org> :
   Initial import.
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index ca90b944e7e2..cfc9478360ea 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,3 +1,3 @@
-MD5 569d31b2583c4deb3b68f51bdd765edf cisco-vpnclient-3des-4.0.1a.ebuild 2085
-MD5 112e971f3d909738d5af19b3e28f9e0d ChangeLog 356
 MD5 e87a2dcccbebe59023e70bb5fa5fbca3 files/digest-cisco-vpnclient-3des-4.0.1a 79
+MD5 050bfd2b317e8ad13bd744689cefaafa ChangeLog 454
+MD5 cbaf90f9aa62ffc37499fdf5e004a6aa cisco-vpnclient-3des-4.0.1a.ebuild 1478
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild
index 4306a0f190f7..a6542221b9b0 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild
@@ -1,77 +1,62 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild,v 1.1 2003/07/05 12:42:36 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild,v 1.2 2003/07/09 15:47:07 vapier Exp $
 
-IUSE=""
-At="vpnclient-linux-4.0.1.A-k9.tar.gz"
-S="${WORKDIR}/vpnclient"
-SRC_URI=""
+MY_PV=${PV/a/.A-k9}
 DESCRIPTION="Cisco VPN Client (3DES)"
 HOMEPAGE="http://www.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
-DEPEND="virtual/glibc
-		virtual/linux-sources"
+SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
+
 LICENSE="cisco-vpn-client"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips -arm"
+SLOT="${KV}"
+KEYWORDS="-* x86"
+RESTRICT="fetch"
+
+DEPEND="virtual/glibc
+	virtual/linux-sources
+	>=sys-apps/sed-4"
 
-VPNDIR="/etc/CiscoSystemsVPNClient"
+S=${WORKDIR}/vpnclient
 
-src_unpack() {
-	if [ ! -f "${DISTDIR}/${At}" ] ; then
-		die "Please download ${At} from ${HOMEPAGE} and move it to ${DISTDIR}."
-	fi
-	einfo "Cisco Systems VPN Client Version 4.0.1 (A) Linux Installer"
-	einfo "Copyright (C) 1998-2001 Cisco Systems, Inc. All Rights Reserved."
-	einfo ""
-	einfo "By installing this product you agree that you have read the"
-	einfo "license.txt file (The VPN Client license) and will comply with" 
-	einfo "its terms. "
-	einfo ""
-	unpack "${At}"
+VPNDIR=/etc/CiscoSystemsVPNClient
+
+pkg_nofetch() {
+	eerror "Please goto:"
+	eerror " ${HOMEPAGE}"
+	eerror "and download"
+	eerror " ${A}"
+	eerror "to ${DISTDIR}"
 }
 
 src_compile () {
 	check_KV
 	sh ./driver_build.sh /lib/modules/${KV}/build
-	if [ ! -f ./cisco_ipsec ]; then
-		eerror "Failed to make module \"cisco_ipsec\"." && die
-	fi
-	sed "s#@VPNBINDIR@#/usr/bin#" < ./vpnclient_init > vpnclient_init.gentoo
-    sed "s#@VPNBINDIR@#/usr/bin#" < ./vpnclient.ini.in > vpnclient.ini
+	[ ! -f ./cisco_ipsec ] && die "Failed to make module 'cisco_ipsec'"
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient.ini.in
 }
 
-src_install () {
-	dodoc license.txt
-
-	if [ -f "/etc/init.d/vpnclient" ]; then
-		sh /etc/init.d/vpnclient stop
-		einfo "Stopped: vpnclient (Cisco VPN service)"
-	fi
+src_install() {
 	exeinto /etc/init.d
-	newexe vpnclient_init.gentoo vpnclient
+	newexe vpnclient_init vpnclient
 
 	exeinto /usr/bin
 	exeopts -m0711
 	doexe vpnclient
 	exeopts -m4711
 	doexe cvpnd
-	dobin ipseclog
-	dobin cisco_cert_mgr
+	dobin ipseclog cisco_cert_mgr
 
-	insinto /lib/modules/preferred/CiscoVPN
+	insinto /lib/modules/${KV}/CiscoVPN
 	doins cisco_ipsec
 
-	dodir ${VPNDIR}
-	dodir "$VPNDIR/Certificates"
-	dodir "$VPNDIR/Profiles"
-
 	insinto ${VPNDIR}
-	doins vpnclient.ini
-
-	insinto "${VPNDIR}/Profiles"
+	newins vpnclient.ini.in vpnclient.ini
+	insinto ${VPNDIR}/Profiles
 	doins *.pcf
+	dodir ${VPNDIR}/Certificates
 }
 
-pkg_postinst () {
-	einfo  "You must run \"/etc/init.d/vpnclient start\" before using the client."
+pkg_postinst() {
+	einfo  "You must run \`/etc/init.d/vpnclient start\` before using the client."
 }