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

Package-Manager: portage-2.1.2.9

11 files changed, 35 insertions, 157 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/Manifest b/net-misc/vpnc/Manifest
index afa7a223cd9a..9e2dd5ae1ad5 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -1,60 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX vpnc 353 RMD160 28fd928430e2ac5877d9b163661af43a16099da4 SHA1 8e0435b30fa3cc5a948bcdb81aabb7222a0c4cb6 SHA256 38e2f625ca23166985d581f98396314646518624979ba203e0bd79130b4ebf72
-MD5 ee8864ecb55c0687207adbc8c4728180 files/vpnc 353
-RMD160 28fd928430e2ac5877d9b163661af43a16099da4 files/vpnc 353
-SHA256 38e2f625ca23166985d581f98396314646518624979ba203e0bd79130b4ebf72 files/vpnc 353
-AUX vpnc-iproute-fix-2.diff 331 RMD160 38541f070339a35f04f73c496e65a6dac728144b SHA1 b35dd4a93fb10d0892897f8f0a1e538260fe7496 SHA256 c94e3446a1f45e20c67fd7c0be995b83e49c8ec1638bf0a087b1fa95e29659f4
-MD5 4e1396bc9dfd19b437f5c69af75ca290 files/vpnc-iproute-fix-2.diff 331
-RMD160 38541f070339a35f04f73c496e65a6dac728144b files/vpnc-iproute-fix-2.diff 331
-SHA256 c94e3446a1f45e20c67fd7c0be995b83e49c8ec1638bf0a087b1fa95e29659f4 files/vpnc-iproute-fix-2.diff 331
-AUX vpnc.init 1169 RMD160 f669f779d6f236035345229c73e88dbbdc2217e7 SHA1 be723038221f6af072b645cd950637c55f61359e SHA256 8c592ab555fd63e8dc1abfe3bd070ebefd84e191a7b9f10e54413ccc9084a17d
-MD5 f66e435dd3748ef7a1eb1620e995ddff files/vpnc.init 1169
-RMD160 f669f779d6f236035345229c73e88dbbdc2217e7 files/vpnc.init 1169
-SHA256 8c592ab555fd63e8dc1abfe3bd070ebefd84e191a7b9f10e54413ccc9084a17d files/vpnc.init 1169
-DIST vpnc-0.3.3.tar.gz 59939 RMD160 ffcb229fb8cac18f8d6dea0e67f88cec420f31da SHA1 95559e1c5b1f4bc78dc1a0b9f95e1a2d65a84c0a SHA256 be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7
+AUX vpnc.init 1249 RMD160 3091bcb60524c75c43e6ad1b564708dfe677c956 SHA1 9ddea28c3541b1aa9f74db738da820800c42ba6a SHA256 f057da2e6a94dd5127c188ae204bf1d60092014c8a5643253058d0107c84148f
+MD5 f4549a893a389bb20c2032e2e4f8997d files/vpnc.init 1249
+RMD160 3091bcb60524c75c43e6ad1b564708dfe677c956 files/vpnc.init 1249
+SHA256 f057da2e6a94dd5127c188ae204bf1d60092014c8a5643253058d0107c84148f files/vpnc.init 1249
 DIST vpnc-0.4.0.tar.gz 75491 RMD160 1640481601074d4517746f6e3b147b12f24b06e3 SHA1 e39b63bbebf37758e8fb7eb2ec44dfc9b7afdaab SHA256 f91c6bc2547cb503fde4f244ba82304553fec3954c65521482f8db2491700586
-EBUILD vpnc-0.3.3-r1.ebuild 922 RMD160 726521bba7cfb373fdb96ee0e255ef01423ef51f SHA1 3ae592d0584fa9db3509295d2c13d06a4d6f89f7 SHA256 f1806a06e4c4906c79175bee39b1e984164f4d5b225928648f5a597a8b06a855
-MD5 60b85f6d2d3b27084d4fe4fbd2efae6b vpnc-0.3.3-r1.ebuild 922
-RMD160 726521bba7cfb373fdb96ee0e255ef01423ef51f vpnc-0.3.3-r1.ebuild 922
-SHA256 f1806a06e4c4906c79175bee39b1e984164f4d5b225928648f5a597a8b06a855 vpnc-0.3.3-r1.ebuild 922
-EBUILD vpnc-0.4.0-r1.ebuild 857 RMD160 bb8c814cbf608ab4e9227153701d22913dbe3371 SHA1 9cf5541dfe95f204863c027e697957c00aa301c2 SHA256 9668dfe9458626c3de8b07fc03f2c7b41aca4de8292cd3018a8559140ed7872d
-MD5 7c4586b4019e361baf7df51ac716c7b2 vpnc-0.4.0-r1.ebuild 857
-RMD160 bb8c814cbf608ab4e9227153701d22913dbe3371 vpnc-0.4.0-r1.ebuild 857
-SHA256 9668dfe9458626c3de8b07fc03f2c7b41aca4de8292cd3018a8559140ed7872d vpnc-0.4.0-r1.ebuild 857
-EBUILD vpnc-0.4.0-r2.ebuild 1137 RMD160 21c8fe82cd9df0fb7a2721da72ad5a9094a60ab4 SHA1 3257f3f4ec2e23892d74507303f18236aef72f0c SHA256 14649327d2bf6dbd952a8b107f2b34df6129f66e5504b3e47debc4c037bf088f
-MD5 8e229d1bdfc5949b39e3d27384411553 vpnc-0.4.0-r2.ebuild 1137
-RMD160 21c8fe82cd9df0fb7a2721da72ad5a9094a60ab4 vpnc-0.4.0-r2.ebuild 1137
-SHA256 14649327d2bf6dbd952a8b107f2b34df6129f66e5504b3e47debc4c037bf088f vpnc-0.4.0-r2.ebuild 1137
+EBUILD vpnc-0.4.0-r3.ebuild 1175 RMD160 366d56073d56fd74f6b67f9eefa39d24723e9741 SHA1 cbbbe585b8176f4dcf22bc46f943627cecc64341 SHA256 3abf339cefd45a16c8b651394a7b378dc414126eec23ba8141243ef84dc8d8ae
+MD5 5e440706994fe7948eda36d880659dad vpnc-0.4.0-r3.ebuild 1175
+RMD160 366d56073d56fd74f6b67f9eefa39d24723e9741 vpnc-0.4.0-r3.ebuild 1175
+SHA256 3abf339cefd45a16c8b651394a7b378dc414126eec23ba8141243ef84dc8d8ae vpnc-0.4.0-r3.ebuild 1175
 EBUILD vpnc-0.4.0.ebuild 745 RMD160 e8c4721e366f05f6c5edf818582ecbd5b368e5b3 SHA1 49b4d3e121e93de8766413b3a112ff6730589f6d SHA256 6d6a1ab552b584caf4d70dc7bf8263ccf62bedeca61c89ee3da2f07164e8b36f
 MD5 ea30837254ca7f41d8a0c3d7fd7f2936 vpnc-0.4.0.ebuild 745
 RMD160 e8c4721e366f05f6c5edf818582ecbd5b368e5b3 vpnc-0.4.0.ebuild 745
 SHA256 6d6a1ab552b584caf4d70dc7bf8263ccf62bedeca61c89ee3da2f07164e8b36f vpnc-0.4.0.ebuild 745
-MISC ChangeLog 4815 RMD160 0e2b61ad5527694b791532d9895662ea26931ab3 SHA1 1d17a9ab2ecd77d3eafaf834e0c1f0ff4b2a510f SHA256 a851e19627daffc3a8907d93041600a7e3e04da8dbebde4e94861cc8f8c8b24f
-MD5 89adc3995eea3e0f8b04a72aa236aaf6 ChangeLog 4815
-RMD160 0e2b61ad5527694b791532d9895662ea26931ab3 ChangeLog 4815
-SHA256 a851e19627daffc3a8907d93041600a7e3e04da8dbebde4e94861cc8f8c8b24f ChangeLog 4815
+MISC ChangeLog 5150 RMD160 afb734a848d79f50fce712a5edd932eedda6780c SHA1 4b3c4d10d88264df96948f8076c028fd81cf78ef SHA256 681fd5ed6935af7eb2bae903e32c4987e777b1416b1b898544824787255f60e9
+MD5 2c08bc1d824cb4bb573d97b6ed286a5a ChangeLog 5150
+RMD160 afb734a848d79f50fce712a5edd932eedda6780c ChangeLog 5150
+SHA256 681fd5ed6935af7eb2bae903e32c4987e777b1416b1b898544824787255f60e9 ChangeLog 5150
 MISC metadata.xml 318 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 SHA1 822bfa896902a43039ce449fbe983a9167ca1d28 SHA256 3c6d7c46a52ba3011843331915b2178ad42de643e6ba3b497453123bd151a892
 MD5 d39e3ffd56e4e35cc45d0d2ca177384b metadata.xml 318
 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 metadata.xml 318
 SHA256 3c6d7c46a52ba3011843331915b2178ad42de643e6ba3b497453123bd151a892 metadata.xml 318
-MD5 9cd36e25a31aa320be150f2049cc6a44 files/digest-vpnc-0.3.3-r1 229
-RMD160 d5ecd81ba633bb947aa28019467f3ceb11139112 files/digest-vpnc-0.3.3-r1 229
-SHA256 863fbeabe8d7baaea9ae71a5d59f2bccf55ed9e317a9ae2eab19cead7ee071cf files/digest-vpnc-0.3.3-r1 229
 MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0 229
 RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0 229
 SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0 229
-MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0-r1 229
-RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0-r1 229
-SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0-r1 229
-MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0-r2 229
-RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0-r2 229
-SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0-r2 229
+MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0-r3 229
+RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0-r3 229
+SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0-r3 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGX7mONQqtfCuFneMRAqd2AKCfNo0d3Jn87bXtccGTeAZQD1GsbACeN23l
-Q7oJHCbw6IUhQzTvV9NjxHQ=
-=cwxh
+iD8DBQFGpzX/NQqtfCuFneMRAn10AJ9yY/2bKzKlH0crQ9pjGX081JEo8gCfRRWi
+lOrqa9uiVwS5h01cUK63Vj4=
+=98+y
 -----END PGP SIGNATURE-----
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