Version bump. Bug #378969. Thanks to Simone Scanzoni <nonno.cicala@libero.it> for the new initd file

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 17 insertions, 66 deletions

diff --git a/net-misc/logmein-hamachi/ChangeLog b/net-misc/logmein-hamachi/ChangeLog
index 7166c799baf8..b4adb3c9641c 100644
--- a/net-misc/logmein-hamachi/ChangeLog
+++ b/net-misc/logmein-hamachi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/logmein-hamachi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.2 2011/06/13 09:00:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.3 2011/08/24 11:07:13 hwoarang Exp $
+
+*logmein-hamachi-2.1.0.17 (24 Aug 2011)
+
+  24 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
+  -logmein-hamachi-2.0.1.13.ebuild, -logmein-hamachi-2.0.1.15.ebuild,
+  +logmein-hamachi-2.1.0.17.ebuild, files/logmein-hamachi.initd:
+  Version bump. Bug #378969. Thanks to Simone Scanzoni <nonno.cicala@libero.it>
+  for the new initd file
 
 *logmein-hamachi-2.0.1.15 (13 Jun 2011)
 
diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.initd b/net-misc/logmein-hamachi/files/logmein-hamachi.initd
index f62674362f26..7fcf11322559 100644
--- a/net-misc/logmein-hamachi/files/logmein-hamachi.initd
+++ b/net-misc/logmein-hamachi/files/logmein-hamachi.initd
@@ -48,9 +48,15 @@ stop()
 
 	ebegin "Stopping hamachi"
 
-	/usr/bin/hamachi logout >> /dev/null
+	/usr/bin/hamachi logout
 	start-stop-daemon --quiet --stop --exec "${DAEMON}" \
 		--pidfile "${PIDFILE}"
 
 	eend $?
 }
+
+status() {
+        service_started "${SVCNAME}" || return 1
+        /usr/bin/hamachi
+        /usr/bin/hamachi list
+}
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.15.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.15.ebuild
deleted file mode 100644
index 315089ff3f65..000000000000
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.15.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.15.ebuild,v 1.1 2011/06/13 09:00:21 hwoarang Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="LogMeIn Hamachi VPN tunneling engine"
-HOMEPAGE="https://secure.logmein.com/products/hamachi2"
-SRC_URI="x86?	( https://secure.logmein.com/labs/${P}-x86.tgz )
-	amd64?	( https://secure.logmein.com/labs/${P}-x64.tgz )"
-
-LICENSE="LogMeIn"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!net-misc/hamachi"
-
-RESTRICT="mirror"
-
-QA_PRESTRIPPED="/opt/${PN}/bin/hamachid"
-
-pkg_setup() {
-	einfo "Checking your kernel configuration for TUN/TAP support."
-	CONFIG_CHECK="~TUN"
-	check_extra_config
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${P}-$(use x86 && echo x86 || echo x64) "${S}" || die
-}
-
-src_install() {
-	into /opt/${PN}
-	dobin hamachid dnsup dnsdown || die
-	dosym /opt/${PN}/bin/hamachid /usr/bin/hamachi || die "Couldn't create hamachi symlink"
-
-	dodir /var/run/${PN} || die
-
-	# Config and log directory
-	dodir /var/lib/${PN} || die
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-
-	dodoc CHANGES README || die
-}
-
-pkg_postinst() {
-	elog "LogMeIn Hamachi2 is installed."
-	elog "Consult the README file on how to configure your client."
-	elog "You can run the client 'hamachi' as root,"
-	elog "or as a user if you add a line:"
-	elog "Ipc.User      <login name>"
-	elog "to the file '/var/lib/${PN}/h2-engine-override.cfg'"
-	elog "and restart the daemon with"
-	elog "/etc/init.d/${PN} restart"
-	elog "To enable auto-login when the service starts set a nickname in"
-	elog "/etc/conf.d/${PN}"
-	elog "Running 'hamachi' without arguments may crash the daemon."
-}
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.13.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild
index a6295beb3a44..cb76205f5802 100644
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.13.ebuild
+++ b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.13.ebuild,v 1.1 2011/01/15 21:13:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild,v 1.1 2011/08/24 11:07:13 hwoarang Exp $
 
 inherit eutils linux-info
 
@@ -58,5 +58,4 @@ pkg_postinst() {
 	elog "/etc/init.d/${PN} restart"
 	elog "To enable auto-login when the service starts set a nickname in"
 	elog "/etc/conf.d/${PN}"
-	elog "Running 'hamachi' without arguments may crash the daemon."
 }