New initd file. Thanks to Simone Scanzoni <nonno.cicala@libero.it>. Fixes bug #438336. Remove old ebuilds

(Portage version: 2.1.11.26/cvs/Linux x86_64)

5 files changed, 24 insertions, 126 deletions

diff --git a/net-misc/logmein-hamachi/ChangeLog b/net-misc/logmein-hamachi/ChangeLog
index b2233e8b39dd..6d9379ba188c 100644
--- a/net-misc/logmein-hamachi/ChangeLog
+++ b/net-misc/logmein-hamachi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/logmein-hamachi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.7 2012/10/03 21:11:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.8 2012/10/15 18:22:42 hwoarang Exp $
+
+*logmein-hamachi-2.1.0.76-r1 (15 Oct 2012)
+
+  15 Oct 2012; Markos Chandras <hwoarang@gentoo.org>
+  +logmein-hamachi-2.1.0.76-r1.ebuild, -logmein-hamachi-2.1.0.17.ebuild,
+  -logmein-hamachi-2.1.0.68-r1.ebuild, -logmein-hamachi-2.1.0.68.ebuild,
+  files/logmein-hamachi.initd:
+  New initd file. Thanks to Simone Scanzoni <nonno.cicala@libero.it>. Fixes bug
+  #438336. Remove old ebuilds
 
 *logmein-hamachi-2.1.0.76 (03 Oct 2012)
 
diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.initd b/net-misc/logmein-hamachi/files/logmein-hamachi.initd
index 7fcf11322559..7b704e19b722 100644
--- a/net-misc/logmein-hamachi/files/logmein-hamachi.initd
+++ b/net-misc/logmein-hamachi/files/logmein-hamachi.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON=/opt/logmein-hamachi/bin/hamachid
@@ -9,6 +9,15 @@ depend() {
 	need net
 }
 
+checktun() {
+	[ $(uname -s) = "Linux" ] || return 0
+        [ -e /dev/net/tun ] && return 0
+        modprobe tun && return 0
+
+	eerror "TUN/TAP support is not available in the running kernel"
+	return 1
+}
+
 start()
 {
 	# returns
@@ -16,6 +25,8 @@ start()
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
 
+	checktun || return 2
+
 	ebegin "Starting hamachi"
 
 	start-stop-daemon --quiet --start --exec "${DAEMON}" \
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild
deleted file mode 100644
index cb76205f5802..000000000000
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild
+++ /dev/null
@@ -1,61 +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.1.0.17.ebuild,v 1.1 2011/08/24 11:07:13 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}"
-}
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68.ebuild
deleted file mode 100644
index 40583675f353..000000000000
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 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.1.0.68.ebuild,v 1.1 2012/06/29 08:06:49 maksbotan 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}"
-}
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68-r1.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.76-r1.ebuild
index 364e95d590fb..5da862f11b51 100644
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68-r1.ebuild
+++ b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.76-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1.0.68-r1.ebuild,v 1.1 2012/08/17 11:54:58 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.76-r1.ebuild,v 1.1 2012/10/15 18:22:42 hwoarang Exp $
 
 inherit eutils linux-info
 
@@ -52,7 +52,7 @@ 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 "or as a user if you add a newline terminated line:"
 	elog "Ipc.User      <login name>"
 	elog "to the file '/var/lib/${PN}/h2-engine-override.cfg'"
 	elog "and restart the daemon with"