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

Also version bump to 5.1, and fix quoting
(Portage version: 2.1.4.4)

4 files changed, 69 insertions, 6 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/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"
+}