clean-up; make init script work with baselayout 2; add some comments to die commands

(Portage version: 2.1.2.9)

10 files changed, 17 insertions, 116 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index 40985209ee27..de6e1fc4978b 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.37 2007/06/01 06:15:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.38 2007/07/25 11:37:29 opfer Exp $
+
+*vpnc-0.4.0-r3 (25 Jul 2007)
+
+  25 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
+  -files/vpnc-iproute-fix-2.diff, -files/vpnc, files/vpnc.init,
+  -vpnc-0.3.3-r1.ebuild, -vpnc-0.4.0-r1.ebuild, -vpnc-0.4.0-r2.ebuild,
+  +vpnc-0.4.0-r3.ebuild:
+  clean-up; make init script work with baselayout 2; add some comments to die
+  commands
 
   01 Jun 2007; Christian Faulhammer <opfer@gentoo.org> vpnc-0.4.0-r2.ebuild:
   added the path for the new vpnc HowTo
diff --git a/net-misc/vpnc/files/digest-vpnc-0.3.3-r1 b/net-misc/vpnc/files/digest-vpnc-0.3.3-r1
deleted file mode 100644
index 6082eedf725c..000000000000
--- a/net-misc/vpnc/files/digest-vpnc-0.3.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7518cff21326fe7eb9795b60c25ae6a vpnc-0.3.3.tar.gz 59939
-RMD160 ffcb229fb8cac18f8d6dea0e67f88cec420f31da vpnc-0.3.3.tar.gz 59939
-SHA256 be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7 vpnc-0.3.3.tar.gz 59939
diff --git a/net-misc/vpnc/files/digest-vpnc-0.4.0-r2 b/net-misc/vpnc/files/digest-vpnc-0.4.0-r2
deleted file mode 100644
index 7945ee2ab04e..000000000000
--- a/net-misc/vpnc/files/digest-vpnc-0.4.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 604807e7dd90fce00a4e2344ee29c76d vpnc-0.4.0.tar.gz 75491
-RMD160 1640481601074d4517746f6e3b147b12f24b06e3 vpnc-0.4.0.tar.gz 75491
-SHA256 f91c6bc2547cb503fde4f244ba82304553fec3954c65521482f8db2491700586 vpnc-0.4.0.tar.gz 75491
diff --git a/net-misc/vpnc/files/digest-vpnc-0.4.0-r1 b/net-misc/vpnc/files/digest-vpnc-0.4.0-r3
index 7945ee2ab04e..7945ee2ab04e 100644
--- a/net-misc/vpnc/files/digest-vpnc-0.4.0-r1
+++ b/net-misc/vpnc/files/digest-vpnc-0.4.0-r3
diff --git a/net-misc/vpnc/files/vpnc b/net-misc/vpnc/files/vpnc
deleted file mode 100755
index fe1a2f29f935..000000000000
--- a/net-misc/vpnc/files/vpnc
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-start() {
-  ebegin "Starting Virtual Private Network"
-  start-stop-daemon --start --exec /usr/sbin/vpnc \
-    --pidfile /var/run/vpnc/pid
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping Virtual Private Network"
-  start-stop-daemon --stop --exec /usr/sbin/vpnc-disconnect \
-    --pidfile /var/run/vpnc/pid
-  eend $?
-}
diff --git a/net-misc/vpnc/files/vpnc-iproute-fix-2.diff b/net-misc/vpnc/files/vpnc-iproute-fix-2.diff
deleted file mode 100644
index d5cbb2342cc8..000000000000
--- a/net-misc/vpnc/files/vpnc-iproute-fix-2.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- vpnc-0.3.3/vpnc-script	2005-05-05 19:05:18.000000000 +0200
-+++ vpnc-0.3.3-fix/vpnc-script	2005-12-20 13:40:43.991982250 +0100
-@@ -72,7 +72,7 @@
- 
- if [ -n "$IPROUTE" ]; then
- 	fix_ip_get_output () {
--		sed 's/cache//;s/metric[0-9]\+ [0-9]\+//g'
-+		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g'
- 	}
- 
- 	set_vpngateway_route() {
diff --git a/net-misc/vpnc/files/vpnc.init b/net-misc/vpnc/files/vpnc.init
index 23da5b75a56a..e1723c0d8dd0 100644
--- a/net-misc/vpnc/files/vpnc.init
+++ b/net-misc/vpnc/files/vpnc.init
@@ -1,6 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/files/vpnc.init,v 1.3 2007/07/25 11:37:29 opfer Exp $
 
 VPNDIR="/etc/vpnc"
 VPN="${SVCNAME#*.}"
@@ -43,9 +44,9 @@ start() {
 
 	local args=""
 
-	start-stop-daemon --start --exec /usr/sbin/vpnc --pidfile "${VPNPID}" \
-		-- "${VPNCONF}"
-	eend $? "Check your logs to see why startup failed"
+	start-stop-daemon --start --pidfile "${VPNPID}" --exec /usr/sbin/vpnc \
+		-- --pid-file "${VPNPID}" "${VPNCONF}" >/dev/null
+	eend $?
 }
 
 stop() {
@@ -53,5 +54,3 @@ stop() {
 	start-stop-daemon --stop --exec /usr/sbin/vpnc --pidfile "${VPNPID}"
 	eend $?
 }
-
-# vim: ts=4
diff --git a/net-misc/vpnc/vpnc-0.3.3-r1.ebuild b/net-misc/vpnc/vpnc-0.3.3-r1.ebuild
deleted file mode 100644
index 50f8ab0ca9ac..000000000000
--- a/net-misc/vpnc/vpnc-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.3-r1.ebuild,v 1.8 2006/07/19 08:33:45 kugelfang Exp $
-
-inherit eutils
-
-DESCRIPTION="Free client for Cisco VPN routing software"
-HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
-SRC_URI="http://www.unix-ag.uni-kl.de/~massar/vpnc/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libgcrypt-1.1.91
-	sys-apps/iproute2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/vpnc-iproute-fix-2.diff
-	# Workaround for crappy Makefile
-	sed -i -e "s:CFLAGS=-W -Wall -O:CFLAGS=${CFLAGS}:" Makefile
-}
-
-src_install() {
-	dobin vpnc vpnc-disconnect pcf2vpnc
-	dodoc ChangeLog README TODO VERSION
-	doman vpnc.8
-	insinto /etc
-	doins vpnc.conf
-	exeinto /etc/vpnc
-	doexe vpnc-script
-	keepdir /var/run/vpnc
-}
diff --git a/net-misc/vpnc/vpnc-0.4.0-r1.ebuild b/net-misc/vpnc/vpnc-0.4.0-r1.ebuild
deleted file mode 100644
index 86c9d2f593ba..000000000000
--- a/net-misc/vpnc/vpnc-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,35 +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/vpnc/vpnc-0.4.0-r1.ebuild,v 1.2 2007/02/22 08:58:07 opfer Exp $
-
-inherit linux-info
-
-DESCRIPTION="Free client for Cisco VPN routing software"
-HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
-SRC_URI="http://www.unix-ag.uni-kl.de/~massar/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-S=${WORKDIR}/${P}
-
-DEPEND=">=dev-libs/libgcrypt-1.1.91
-	>=sys-apps/iproute2-2.6.19.20061214"
-
-pkg_setup()	 {
-	local CONFIG_CHECK="TUN"
-	check_extra_config
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die
-	dodoc README TODO VERSION
-	keepdir /var/run/vpnc
-	dobin pcf2vpnc
-	newinitd "${FILESDIR}/vpnc.init" vpnc
-}
diff --git a/net-misc/vpnc/vpnc-0.4.0-r2.ebuild b/net-misc/vpnc/vpnc-0.4.0-r3.ebuild
index 14116ba570ce..eb77e3168af8 100644
--- a/net-misc/vpnc/vpnc-0.4.0-r2.ebuild
+++ b/net-misc/vpnc/vpnc-0.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.4.0-r2.ebuild,v 1.4 2007/06/01 06:15:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.4.0-r3.ebuild,v 1.1 2007/07/25 11:37:29 opfer Exp $
 
 inherit linux-info
 
@@ -23,11 +23,11 @@ pkg_setup()	 {
 }
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed"
 	dodoc README TODO VERSION
 	keepdir /var/run/vpnc
 	dobin pcf2vpnc