Removing older ebuilds and marking 4.7.00.0640-r1 stable for the 4.7 series, since there've been no bug reports and it works fine for me.

(Portage version: 2.1.5.3)

5 files changed, 12 insertions, 285 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 3bf6ec4a8ba9..148d35099f9b 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.59 2008/06/02 21:54:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.60 2008/06/02 22:16:00 wolf31o2 Exp $
+
+  02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  -cisco-vpnclient-3des-4.6.02.0030.ebuild,
+  -cisco-vpnclient-3des-4.7.00.0640.ebuild,
+  cisco-vpnclient-3des-4.7.00.0640-r1.ebuild,
+  -cisco-vpnclient-3des-4.8.00.0490.ebuild:
+  Removing older ebuilds and marking 4.7.00.0640-r1 stable for the 4.7
+  series, since there've been no bug reports and it works fine for me.
 
   02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   cisco-vpnclient-3des-4.8.01.0640.ebuild:
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild
deleted file mode 100644
index 84f98388eeee..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 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.02.0030.ebuild,v 1.13 2007/04/28 16:51:49 swegener Exp $
-
-inherit eutils linux-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="0"
-KEYWORDS="-* x86"
-IUSE=""
-RESTRICT="fetch strip" # stricter"
-
-QA_TEXTRELS="opt/cisco-vpnclient/lib/libvpnapi.so"
-QA_EXECSTACK="opt/cisco-vpnclient/lib/libvpnapi.so
-	opt/cisco-vpnclient/bin/vpnclient
-	opt/cisco-vpnclient/bin/cvpnd
-	opt/cisco-vpnclient/bin/cisco_cert_mgr
-	opt/cisco-vpnclient/bin/ipseclog"
-
-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
-	# Patch submitted to bug #69870 by James Ward <jennyandjamesward@yahoo.com>
-	# fixed to work on 4.6.02.0030 <sfs@steflo.dk>
-	epatch ${FILESDIR}/${PV}-supported_device.patch
-	#Fix problems with the linux >=2.6.14 kernel.
-	if kernel_is 2 6 && [[ ${KV_PATCH} -ge 14 ]]
-	then
-		epatch ${FILESDIR}/${PV}-2.6.14.patch
-	fi
-}
-
-src_compile () {
-	unset ARCH
-	sh ./driver_build.sh ${KV_DIR}
-	[ ! -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() {
-	newinitd ${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
-	insinto /opt/cisco-vpnclient/include
-	doins vpnapi.h
-	dodir /usr/bin
-	dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
-
-	insinto /lib/modules/${KV}/CiscoVPN
-	if kernel_is 2 6; 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() {
-	linux-mod_pkg_postinst
-	einfo "You must run \`/etc/init.d/vpnclient start\` before using the client."
-	echo
-	ewarn "Configuration directory has moved to ${VPNDIR}!"
-	echo
-	ewarn "If you are experiencing problems keeping a connection alive, please"
-	ewarn "check bug #90693 for more information about disabling rp_filter."
-	echo
-}
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640-r1.ebuild
index 270d9bb7a2fa..b6759fa4e842 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640-r1.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.7.00.0640-r1.ebuild,v 1.2 2007/09/07 17:58:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640-r1.ebuild,v 1.3 2008/06/02 22:16:00 wolf31o2 Exp $
 
 inherit eutils linux-mod
 
@@ -11,7 +11,7 @@ SRC_URI="vpnclient-linux-x86_64-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 RESTRICT="fetch strip" # stricter"
 
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild
deleted file mode 100644
index 3591178da9a9..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2007 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.7.00.0640.ebuild,v 1.10 2007/04/28 16:51:49 swegener Exp $
-
-inherit eutils linux-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-x86_64-${MY_PV}.tar.gz"
-
-LICENSE="cisco-vpn-client"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="fetch strip" # stricter"
-
-QA_TEXTRELS="opt/cisco-vpnclient/lib/libvpnapi.so"
-QA_EXECSTACK="opt/cisco-vpnclient/lib/libvpnapi.so
-	opt/cisco-vpnclient/bin/vpnclient
-	opt/cisco-vpnclient/bin/cvpnd
-	opt/cisco-vpnclient/bin/cisco_cert_mgr
-	opt/cisco-vpnclient/bin/ipseclog"
-
-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}
-
-	#Fix problems with the linux >=2.6.14 kernel.
-	if kernel_is 2 6 && [[ ${KV_PATCH} -ge 14 ]]
-	then
-		epatch ${FILESDIR}/${PV}-2.6.14.patch
-	fi
-	epatch ${FILESDIR}/2.6.19.patch
-}
-
-src_compile () {
-	unset ARCH
-	sh ./driver_build.sh ${KV_DIR}
-	[ ! -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() {
-	newinitd ${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
-	insinto /opt/cisco-vpnclient/lib
-	doins libvpnapi.so
-	insinto /opt/cisco-vpnclient/include
-	doins vpnapi.h
-	dodir /usr/bin
-	dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
-
-	insinto /lib/modules/${KV}/CiscoVPN
-	if kernel_is 2 6; 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() {
-	linux-mod_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/cisco-vpnclient-3des-4.8.00.0490.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490.ebuild
deleted file mode 100644
index b193d71d62d6..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 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.8.00.0490.ebuild,v 1.9 2007/08/28 20:58:08 wolf31o2 Exp $
-
-inherit eutils linux-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-x86_64-${MY_PV}.tar.gz"
-
-LICENSE="cisco-vpn-client"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="fetch strip" # stricter"
-
-QA_TEXTRELS="opt/cisco-vpnclient/lib/libvpnapi.so"
-QA_EXECSTACK="opt/cisco-vpnclient/lib/libvpnapi.so
-	opt/cisco-vpnclient/bin/vpnclient
-	opt/cisco-vpnclient/bin/cvpnd
-	opt/cisco-vpnclient/bin/cisco_cert_mgr
-	opt/cisco-vpnclient/bin/ipseclog"
-
-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}"
-
-	epatch ${FILESDIR}/2.6.22.patch
-}
-
-src_compile () {
-	unset ARCH
-	sh ./driver_build.sh ${KV_DIR}
-	[ ! -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() {
-	newinitd ${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
-	insinto /opt/cisco-vpnclient/lib
-	doins libvpnapi.so
-	insinto /opt/cisco-vpnclient/include
-	doins vpnapi.h
-	dodir /usr/bin
-	dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
-
-	insinto /lib/modules/${KV}/CiscoVPN
-	if kernel_is 2 6; 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() {
-	linux-mod_pkg_postinst
-	einfo "You must run \`/etc/init.d/vpnclient start\` before using the client."
-	echo
-	ewarn "Configuration directory has moved to ${VPNDIR}!"
-	echo
-}