Copy some fixes from the in-tree version of this ebuild and perform some general clean-up.

svn path=/; revision=195

2 files changed, 16 insertions, 15 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
new file mode 100644
index 0000000..1c70559
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for net-misc/cisco-vpnclient-3des
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.8.01.0640.ebuild:
+  Copy some fixes from the in-tree version of this ebuild and perform some
+  general clean-up.
+
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild
index 6804934..16514b6 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild
@@ -1,4 +1,4 @@
-# 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.8.00.0490.ebuild,v 1.9 2007/08/28 20:58:08 wolf31o2 Exp $
 
@@ -9,7 +9,6 @@ TARBALL="vpnclient-linux-x86_64-${MY_PV}.tar.gz"
 
 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"
 SRC_URI="http://tuxx-home.at/vpn/Linux/${TARBALL}
 	http://longren.org/files/${TARBALL}"
 
@@ -35,12 +34,6 @@ QA_EXECSTACK="${VPNDIR:1}/lib/libvpnapi.so
 MODULE_NAMES="cisco_ipsec(CiscoVPN)"
 BUILD_TARGETS="clean default"
 
-#pkg_nofetch() {
-#	einfo "Please visit:"
-#	einfo " ${HOMEPAGE}"
-#	einfo "and download ${A} to ${DISTDIR}"
-#}
-
 src_unpack () {
 	unpack ${A}
 	cd "${S}"
@@ -50,11 +43,10 @@ src_unpack () {
 }
 
 src_install() {
+	local binaries="vpnclient ipseclog cisco_cert_mgr"
 	linux-mod_src_install
-#	newinitd ${FILESDIR}/vpnclient.rc vpnclient
 
 	# Binaries
-	binaries="vpnclient ipseclog cisco_cert_mgr"
 	exeinto /opt/cisco-vpnclient/bin
 	exeopts -m0111
 	doexe ${binaries}
@@ -74,16 +66,16 @@ src_install() {
 	doins *.pcf
 	dodir ${CFGDIR}/Certificates
 
-	# Make sure we keep these, even if they're empty.
-	keepdir ${CFGDIR}/Certificates
-	keepdir ${CFGDIR}/Profiles
-
 	# Create some symlinks
 	dodir /usr/bin
 	for filename in ${binaries}
 	do
 		dosym ${VPNDIR}/bin/${filename} /usr/bin/${filename}
 	done
+
+	# Make sure we keep these, even if they're empty.
+	keepdir ${CFGDIR}/Certificates
+	keepdir ${CFGDIR}/Profiles
 }
 
 pkg_postinst() {
@@ -92,7 +84,7 @@ pkg_postinst() {
 	then
 		elog "Found an old ${OLDCFG} configuration directory."
 		elog "Moving ${OLDCFG} files to ${CFGDIR}."
-		cp -pPR ${OLDCFG}/* ${CFGDIR} && rm -f ${OLDCFG}
+		cp -pPR ${OLDCFG}/* ${CFGDIR} && rm -rf ${OLDCFG}
 	fi
 	if [ -e "/etc/init.d/vpnclient" ]
 	then