Make initscript depend on bootmisc, as the daemon writes in /tmp.

Also version bump to 5.1, and fix quoting
Package-Manager: portage-2.1.4.4

5 files changed, 74 insertions, 9 deletions

diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
index 5c18dd0a2f7c..d584eeaee3a8 100644
--- a/net-misc/freenet6/ChangeLog
+++ b/net-misc/freenet6/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/freenet6
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.25 2007/06/16 03:13:45 angelos Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.26 2008/02/26 19:40:43 voyageur Exp $
+
+*freenet6-5.1 (26 Feb 2008)
+
+  26 Feb 2008; Bernard Cafarelli <voyageur@gentoo.org> files/gw6c.rc,
+  freenet6-5.0.ebuild, +freenet6-5.1.ebuild:
+  Make initscript depend on bootmisc, as the daemon writes in /tmp.
+  Thanks jakub in bug #211358
+  Also version bump to 5.1, and fix quoting
 
   16 Jun 2007; Christoph Mende <angelos@gentoo.org> freenet6-4.2.2.ebuild:
   Stable on amd64 wrt bug 180450
diff --git a/net-misc/freenet6/Manifest b/net-misc/freenet6/Manifest
index c1eed29859cd..1a3e32cd5140 100644
--- a/net-misc/freenet6/Manifest
+++ b/net-misc/freenet6/Manifest
@@ -1,9 +1,11 @@
 AUX freenet6-4.2.2-noretry.patch 1273 RMD160 42dc48455d43ae02cf0f59bdf8c05fd85f5e09f7 SHA1 f8d9a3bb5812353312bf451b6ae97f6a58eda7b0 SHA256 8e9ce8e4fbaf92339c15c56085e3d8c41677f08645f1fa869882038721b12e2f
 AUX gw6c.conf 8536 RMD160 633eb8d49378459d93931415be401babf88ef42c SHA1 dde098066da1014bb1374d2d5b18de200105f35e SHA256 8da6f62ed5164d54d272ae9d380f1b2387f2ad819ffcd8f52349beeca44c7b1c
-AUX gw6c.rc 366 RMD160 f95adc8058b8d3b74c214fa925730f7fea05fbea SHA1 7509d64a4f4b27533ef1ee6f8d7e3465ba6376a2 SHA256 a4b5a3f66272719108c59aacb18f51c1bc0a328defdb94cec0080d7742899dbf
+AUX gw6c.rc 393 RMD160 aaa6441d5305b503e55c453a08c307596901b4a4 SHA1 b6619ba85973182bad19feca87e61482bceabe52 SHA256 db485deb03d414defb93e4dcacc1900efaebb100c2eb1f4d207be73f3355d5f8
 DIST gw6c-5_0-RELEASE-src.tar.gz 2441593 RMD160 737e4d0cc74d78df9543715f8a5f0e3c9a11c699 SHA1 aad5d89ac87ef50fb930d854c7f97277f83167b4 SHA256 431e59a6590f0826f1cb34a6319bd69d024ca89e36f8578a2befe039a489e894
+DIST gw6c-5_1-RELEASE-src.tar.gz 1055230 RMD160 bb507ce6e56e9fd71363d2fdd27ba61c04ab125f SHA1 1ffab56a93d2271001f257d4dcaea82c38aa81f9 SHA256 960a6eceebc685c0b36d75a28d3ac576424837e34ddb7d6ee43334c5c3e15b1f
 DIST gw6c4_2_2src.tar.gz 113738 RMD160 d918e08bf1670a2e875880bdef582ad2a971ed38 SHA1 9837e29d5ca4236f244d1507716c815728623026 SHA256 938021f16f88f984c33f714b3f7a75c54927e0d63f1a0bdfc723a03758e9ee73
 EBUILD freenet6-4.2.2.ebuild 1551 RMD160 14fb9719e10d249cec396d4622c01766817e6e23 SHA1 a8dbccbdddb94cac3801c3b3ad786adef98bf090 SHA256 bdcf6ee0b2e33220a361378cf86017b9d131754f5a99f61ce552fa88356cd67b
-EBUILD freenet6-5.0.ebuild 1567 RMD160 8cb7b0c851a9a0577f15236fc2070eb517ab3ce7 SHA1 0adf90cdafebd2815e61d4c3b7fc7fbab8c90d46 SHA256 061bc9440af2047096c0024e776c62bea832573b8072c3e76bfb0a704d57b362
-MISC ChangeLog 3274 RMD160 ec047a05d52dad505b2bbe782008a53d505d3115 SHA1 10119f4d68692519b4a81e472747bdd08faf03fd SHA256 f18ef85069691029560e06e47e8ee6c4e5a0e58489edb00e6749836bf03b9dc4
+EBUILD freenet6-5.0.ebuild 1569 RMD160 da66da26ec5ce61feea443482a4537aabb0f0c15 SHA1 41216c98a9603f8c754e933725d0be6250bf13a7 SHA256 4aa07737a5858bd9c517091e55eb1303a8f024bb8b58b62b99d24c757188cc17
+EBUILD freenet6-5.1.ebuild 1569 RMD160 6d1685a3adac9548465dd4c6fc7141abb5cc5d62 SHA1 c0f598a35428b0e592f46f7d4bd56f51de344972 SHA256 8261e1f7575747104fcd8fbb4bfd7b6f17355c8c5ee75ef8efdf9dc9d8fb8a83
+MISC ChangeLog 3562 RMD160 423e2e2925c20c21093eb6a54cd9bd52ff352225 SHA1 9ed0b0712a90de708cb0628b10cebbdec052b0b4 SHA256 d59653c6c8bda9be3d31492588fc53df18b5632b523f870ad020efbf6c5e91ba
 MISC metadata.xml 348 RMD160 831527825fdc6b58538bb671987c0a562e1559df SHA1 2517554158e3a9d0cd11e7a8ecbe4fa1843a170f SHA256 9a455a8b1ebafab91dcd8d5a1c0d3cc61fc75abc59ad2988d7118032f8309730
diff --git a/net-misc/freenet6/files/gw6c.rc b/net-misc/freenet6/files/gw6c.rc
index e7bdb5e01ce2..1f5b0c79b744 100644
--- a/net-misc/freenet6/files/gw6c.rc
+++ b/net-misc/freenet6/files/gw6c.rc
@@ -3,7 +3,8 @@
 FREENET6_CLIENT="/usr/sbin/gw6c"
 
 depend() {
-	need net
+	need net localmount
+	after bootmisc
 	use dns logger
 }
 
diff --git a/net-misc/freenet6/freenet6-5.0.ebuild b/net-misc/freenet6/freenet6-5.0.ebuild
index 71d9050f394d..5f11f54aced2 100644
--- a/net-misc/freenet6/freenet6-5.0.ebuild
+++ b/net-misc/freenet6/freenet6-5.0.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/freenet6/freenet6-5.0.ebuild,v 1.1 2007/05/31 13:30:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.0.ebuild,v 1.2 2008/02/26 19:40:43 voyageur Exp $
 
 inherit eutils versionator
 
@@ -33,7 +33,7 @@ src_install() {
 	exeinto /etc/freenet6/template
 	doexe template/{linux,checktunnel}.sh
 
-	newinitd ${FILESDIR}/gw6c.rc gw6c
+	newinitd "${FILESDIR}"/gw6c.rc gw6c
 
 	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
 }
diff --git a/net-misc/freenet6/freenet6-5.1.ebuild b/net-misc/freenet6/freenet6-5.1.ebuild
new file mode 100644
index 000000000000..f15834c7a390
--- /dev/null
+++ b/net-misc/freenet6/freenet6-5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.1.ebuild,v 1.1 2008/02/26 19:40:43 voyageur Exp $
+
+inherit eutils versionator
+
+MY_PV=$(replace_all_version_separators "_")
+DESCRIPTION="Client to configure an IPv6 tunnel to freenet6"
+HOMEPAGE="http://www.freenet6.net/"
+SRC_URI="mirror://gentoo/gw6c-${MY_PV}-RELEASE-src.tar.gz"
+
+LICENSE="VPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/tspc-advanced"
+
+src_compile() {
+	emake all configdir=/etc/freenet6 target=linux || die "Build Failed"
+	sed -i "s#tsp-#/tmp/tsp-#" bin/gw6c.conf.sample
+}
+
+src_install() {
+	dosbin bin/gw6c
+
+	insopts -m 600
+	insinto /etc/freenet6
+	newins bin/gw6c.conf.sample gw6c.conf
+	exeinto /etc/freenet6/template
+	doexe template/{linux,checktunnel}.sh
+
+	newinitd "${FILESDIR}"/gw6c.rc gw6c
+
+	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
+}
+
+pkg_postinst() {
+	if has_version '=net-misc/freenet6-1*' ; then
+		ewarn "Warning: you are upgrading from an older version"
+		ewarn "The configuration file has been renamed to gw6c.conf"
+		ewarn "Remember to port your personal settings from tspc.conf to it"
+		ewarn "The init script has been renamed to 'gw6c',"
+	else
+		elog "The freenet6 ebuild installs an init script named 'gw6c'"
+	fi
+	elog "to coincide with the name of the client binary installed"
+	elog "To add support for a freenet6 connection at startup, do"
+	elog ""
+	elog "# rc-update add gw6c default"
+}