Version bumped to latest version and updated all ebuilds to use the kernel-mod eclass rather than kmod eclass. This should resolve bugs #68738, #68449, and #69870.

6 files changed, 113 insertions, 16 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index cf876aa674a1..1d66967a6372 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.19 2004/08/25 00:04:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.20 2004/11/04 01:18:27 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.6.00.0045 (03 Nov 2004)
+
+  03 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild,
+  +cisco-vpnclient-3des-4.6.00.0045.ebuild:
+  Version bumped to latest version and updated all ebuilds to use the
+  kernel-mod eclass rather than kmod eclass. This should resolve bugs #68738,
+  #68449, and #69870.
 
   24 Aug 2004; Mike Frysinger <vapier@gentoo.org> files/vpnclient.rc,
   cisco-vpnclient-3des-4.0.5.ebuild:
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
index 7da51985cfce..ab866232be65 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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-r1.ebuild,v 1.7 2004/07/01 20:54:27 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild,v 1.8 2004/11/04 01:18:27 wolf31o2 Exp $
 
-inherit eutils
+inherit eutils kernel-mod
 
 MY_PV=${PV/a/.A-k9}
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -34,7 +34,9 @@ pkg_nofetch() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	[ "${KV:0:3}" == "2.6" ] && epatch ${FILESDIR}/${PV}-linux26-gentoo.patch
+	if kernel-mod_is_2_6_kernel; then
+		epatch ${FILESDIR}/${PV}-linux26-gentoo.patch
+	fi
 
 	# Patch to allow use of alternate CC.  Patch submitted to bug #33488 by
 	# Jesse Becker (jbecker@speakeasy.net)
@@ -43,7 +45,7 @@ src_unpack() {
 }
 
 src_compile () {
-	check_KV
+	unset ARCH
 	sh ./driver_build.sh /lib/modules/${KV}/build
 	[ ! -f ./cisco_ipsec ] && die "Failed to make module 'cisco_ipsec'"
 	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
@@ -74,3 +76,4 @@ src_install() {
 pkg_postinst() {
 	einfo  "You must run \`/etc/init.d/vpnclient start\` before using the client."
 }
+
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
index 574b80511eec..fb6e2c5144cf 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.3b-r4.ebuild,v 1.4 2004/07/01 20:54:27 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild,v 1.5 2004/11/04 01:18:27 wolf31o2 Exp $
 
-inherit eutils
+inherit eutils kernel-mod
 
 MY_PV=${PV/b/.B-k9}
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -48,7 +48,7 @@ src_unpack() {
 }
 
 src_compile () {
-	check_KV
+	unset ARCH
 	sh ./driver_build.sh /lib/modules/${KV}/build
 	[ ! -f ./cisco_ipsec ] && die "Failed to make module 'cisco_ipsec'"
 	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild
index 6f0d1ac3a71e..ffa57f5f8bc9 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.5.ebuild,v 1.3 2004/08/25 00:04:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild,v 1.4 2004/11/04 01:18:27 wolf31o2 Exp $
 
-inherit eutils kmod
+inherit eutils kernel-mod
 
 MY_PV=${PV}.Rel-k9
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -11,7 +11,7 @@ SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE=""
 RESTRICT="fetch"
 
@@ -39,10 +39,7 @@ src_unpack() {
 }
 
 src_compile () {
-	check_KV
-	if is_kernel 2 5 || is_kernel 2 6 ; then
-		unset ARCH
-	fi
+	unset ARCH
 	sh ./driver_build.sh /lib/modules/${KV}/build
 	[ ! -f ./cisco_ipsec -a ! -f ./cisco_ipsec.ko ] \
 		&& die "Failed to make module 'cisco_ipsec'"
@@ -62,7 +59,7 @@ src_install() {
 	dobin ipseclog cisco_cert_mgr
 
 	insinto /lib/modules/${KV}/CiscoVPN
-	if is_kernel 2 5 || is_kernel 2 6 ; then
+	if kernel-mod_is_2_6_kernel ; then
 		doins cisco_ipsec.ko
 	else
 		doins cisco_ipsec
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild
new file mode 100644
index 000000000000..a34a70ebbb55
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2004 Gentoo Foundation
+# 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.6.00.0045.ebuild,v 1.1 2004/11/04 01:18:27 wolf31o2 Exp $
+
+inherit eutils kernel-mod
+
+MY_PV=${PV}-k9
+DESCRIPTION="Cisco VPN Client (3DES)"
+HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
+SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
+
+LICENSE="cisco-vpn-client"
+SLOT="${KV}"
+KEYWORDS="-* ~x86"
+IUSE=""
+RESTRICT="fetch"
+
+DEPEND="virtual/libc
+	virtual/linux-sources
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/vpnclient
+
+VPNDIR="/etc/opt/cisco-vpnclient/"
+
+pkg_nofetch() {
+	einfo "Please visit:"
+	einfo " ${HOMEPAGE}"
+	einfo "and download ${A} to ${DISTDIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch to allow use of alternate CC.  Patch submitted to bug #33488 by
+	# Jesse Becker <jbecker@speakeasy.net>
+	epatch ${FILESDIR}/driver_build_CC.patch
+}
+
+src_compile () {
+	unset ARCH
+	sh ./driver_build.sh /lib/modules/${KV}/build
+	[ ! -f ./cisco_ipsec -a ! -f ./cisco_ipsec.ko ] \
+		&& die "Failed to make module 'cisco_ipsec'"
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient.ini
+}
+
+src_install() {
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/vpnclient.rc vpnclient
+
+	exeinto /opt/cisco-vpnclient/bin
+	exeopts -m0711
+	doexe vpnclient
+	exeopts -m4711
+	doexe cvpnd
+	into /opt/cisco-vpnclient/
+	dobin ipseclog cisco_cert_mgr
+	dolib.so libvpnapi.so
+	doins vpnapi.h
+	dodir /usr/bin
+	dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
+
+
+	insinto /lib/modules/${KV}/CiscoVPN
+	if kernel-mod_is_2_6_kernel; then
+		doins cisco_ipsec.ko
+	else
+		doins cisco_ipsec
+	fi
+
+	insinto ${VPNDIR}
+	doins 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."
+	echo ""
+	ewarn "Configuration directory has moved to ${VPNDIR}!"
+	echo ""
+}
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045
new file mode 100644
index 000000000000..b3c3b9a894b5
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045
@@ -0,0 +1 @@
+MD5 4204c9cc10d57d3e0d8de0fc7548bbf5 vpnclient-linux-4.6.00.0045-k9.tar.gz 1406359