Version bump to 2.1.0.119, proxied commit for Tianon; fixes bug #487596.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 21 insertions, 74 deletions

diff --git a/net-misc/logmein-hamachi/ChangeLog b/net-misc/logmein-hamachi/ChangeLog
index 1e4e0300ea52..ca30e0282044 100644
--- a/net-misc/logmein-hamachi/ChangeLog
+++ b/net-misc/logmein-hamachi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/logmein-hamachi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.13 2013/09/03 19:07:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.14 2013/10/12 11:44:39 tomwij Exp $
+
+*logmein-hamachi-2.1.0.119 (12 Oct 2013)
+
+  12 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
+  +logmein-hamachi-2.1.0.119.ebuild, -logmein-hamachi-2.1.0.101-r1.ebuild,
+  -logmein-hamachi-2.1.0.101.ebuild:
+  Version bump to 2.1.0.119, proxied commit for Tianon; fixes bug #487596.
 
 *logmein-hamachi-2.1.0.101-r1 (03 Sep 2013)
 
diff --git a/net-misc/logmein-hamachi/Manifest b/net-misc/logmein-hamachi/Manifest
index 3d0e2ed0b7e1..332e1984cd51 100644
--- a/net-misc/logmein-hamachi/Manifest
+++ b/net-misc/logmein-hamachi/Manifest
@@ -4,16 +4,19 @@ Hash: SHA256
 AUX logmein-hamachi.confd 541 SHA256 661be1f7ca7ce360933ab275a9f0a43961c00940534c1c156a985fe346bcb058 SHA512 8d28891af13b597d9a29dcdc3a92e3c933e6cd3c122d720f6ec140619fbf26e2a2c4d3c729ed0499fc844e7b4480149dae76268bfe024b88f7c2e44b39e5ac14 WHIRLPOOL e1019d4bc29884932691f49f5bd2889c1331a14f63b9b98d30a68b15d366ca236e56bce606f3082c6ee678ffa1621204e706fdfe3f62da3d8d1eb36840ac96f3
 AUX logmein-hamachi.initd 1582 SHA256 30a64d6924e218c681631e1654166e0067f2477478eb788103fa221743efd166 SHA512 e36fecb250681a8f31447420e0b91e1260723e38f4973e3d4da3ea34f2e15ae38a0ff4656995d22934a5e4664aa9a4bc2f05f6495f28fd0b43fb54c3929b61ac WHIRLPOOL 2b9448c64eeecff584bb711075a0d37264c8db0c2c4b968c232e11f8f12f9e69f47f44d8f0d33036b0d79f0cd4e99d0e68c1b6497c4ab9d4cbd2f581152a70f0
 AUX logmein-hamachi.service 185 SHA256 b32e32f2c98519b469a660f7459eeb12f454767bcec0f5edf8ae6bd89eef3dba SHA512 cdd5b2f2f2c7df88322c22eec7c050eb5fb2495b57a47526063f0f529d9cc51fffac7ecd19fa9c20ff3da95741008f4ea583d87b45f4267bb204b0342e8eee90 WHIRLPOOL 108b6737580a2c92916abd67b0efd34786685264c466d565217c09d02a649e18431a86415e341de4929eb42f69eeed85cb025c796b4ef563d1ca207f6d4ebbc3
-DIST logmein-hamachi-2.1.0.101-x64.tgz 1203028 SHA256 e3e97f70187abf6c4f13fcb530ef04badae45f2dccfa5b3e935b141d1d2659d0 SHA512 8fcd6ac8f34d16e4a581a10a674ebed28138add893e3da2b5f5ae3815462247730ac9a5518cbea75dda4bc1df52f63194706bfed9336619d8949251501fffc3a WHIRLPOOL 0b5b081695d50ecaa1d737fe32d695ce3cdf4bab8315f5c75e39b63927bda806bcd996b518845b88dd3ea5cec587bdb9ee0674772bf2b89fe1aff740626812a4
-DIST logmein-hamachi-2.1.0.101-x86.tgz 1141216 SHA256 261db32bfbae4a91a06983fbf53aa88677901e13c6591c221f64fc672f473b19 SHA512 817078ee879246f780826a6715f7571c6a627601f6f310d465863d78266962988e86cb6d42e068a18cf966fd8046e079cb8c4f0b1b2a164993259cf10c422afd WHIRLPOOL 4294ad2af9f2b2ae8bd7519aa30799051655962088160745e59a94d349047af3bff0c6bfaadbbad5daebefaf6ba0ddb1e896fc719c7c2a53059921e89a3ba433
-EBUILD logmein-hamachi-2.1.0.101-r1.ebuild 1839 SHA256 8dbcd6277ebfd8f194999b679515175100b3fdc1b8edfdc4132462803c2b4ec2 SHA512 67ad4e4359e1496e8e9f72120620e24fd5692b52c6a26068047316ce1570435ed94b32ec500fb83f25b2fc7bf64e09bef9a25573e947ecd9a281ab26836b6990 WHIRLPOOL 39cdd32d48eafe290082edef99c2b755e7e70140df0d8771810239ccf20a3e90ad3143ce92bf9c2445c4c4e9af297f9c428206a385c25be0238c3d26f07a6cf3
-EBUILD logmein-hamachi-2.1.0.101.ebuild 1709 SHA256 0eb1a853636aeab94c94e8cb1b46adc93d6d0ebb615e082d62147828e7519dc9 SHA512 7d4b009cc09c19e99eb482ff20f38a1be3d10276bdafabd70d416c25e45e11db5dbee6aef06128e9bfee0a61c16305728b5fb3c61af4585cd07fde125261a177 WHIRLPOOL bca47d0494201c98ebc3f6fa3bac4d6cf6a134b816bd83679afb39b980f645306615ea2fd18eb3d5246a91d225aebbe0e51419cdaeaf7d18c17df6ebd3ccde3c
-MISC ChangeLog 3620 SHA256 2523d62e6c8dc524abda09bbc33f94e8fdab1b8a62af5a01b866f52626052448 SHA512 116bae7158a6b3817d7672c911b7f99c2d01af8ff0f0a349fd839d61a8a8609b9fcf4c0d455d085153653d357a991d4a70e014fbe92e13f335070218be847398 WHIRLPOOL bde2225e539288f77b1104aa43f020d9c861c0f5893422493b13b7a0c6aba81aca0a7d16cd85a293767485ebe0dc2b90652662903cd444afb3b3515e68a25d57
+DIST logmein-hamachi-2.1.0.119-x64.tgz 1211406 SHA256 7682d247038591022e1dfca4c417f973ce5da7751c88d50d058cd08891a65cae SHA512 c25cee2ae92f98a5eca8aa781c7f63e6e0b02c3d7fe0e659180b76ceee018aef0f2b0d90184cae3e596e5c76e2788862d5865eb0fa0c0d4eb7bfb6f8db0e604b WHIRLPOOL 106f05a02d3e9e1e55feeda0d85159790393bc9411b09df382051f69442c72d21c26209eda509c87b4f2114082accadc76613664732d7bac3b522854b23d8841
+DIST logmein-hamachi-2.1.0.119-x86.tgz 1135199 SHA256 3668f2bb6273d3211ab0ba0de65fe21f030d1eadd0a4f215ea15c4e9dc936c18 SHA512 f022c3283b1ea7ebaa9f5c5d07990c11214b70282096c1e09ef29c232a53350c50e8f4ebde02bb62c3059d126abd2aec1dbefe83ada7ec57891a1419f130f4b8 WHIRLPOOL fe3868d6176b02143e6544e3b13a53288319cfa47f34caa2350a08028f6c06071e546994aa0b92ad043954ac1774728edd7f447b65b8f1951012b92da7a2653b
+EBUILD logmein-hamachi-2.1.0.119.ebuild 1837 SHA256 c748267c0f2d1e5a3ffbf8173a780849ac9382c2a9be151efb6857d21f041b2e SHA512 8d617101e7f67c1da6fe7fdb471b2b2953f36fc4919495f2e34e072ec50b5c9f9e36154ae4e215f90df4ffd1cac52be807d398901ffcb8a201ddb760ec647f42 WHIRLPOOL 3905b64021ca3afad0c2be8371cc2aa6d027ede67690b8de4f69d8180b58383e33bc72403f2cf37cbe3f907bd2666dc8196fcf794c5092be0b20c3835481884d
+MISC ChangeLog 3898 SHA256 9e4d8ffcee99a28005fd0f185515e7c5c9fccda81c42d2d13fc8d9028ee7a160 SHA512 762cfa9f7e53da061e4c2e05267b19d0fa830064db508e684e4f321a9c032b66727ad9cf9b1bd76bfbf7ac124bf7e0a91e489813252c7d31db1c77a5f83f69bf WHIRLPOOL c9ef9a65a47af2d0ead91cd3afb66ae8f871b9c9e15355eb155851a938c434930237acdfed428a0b62ccef47e6ef613bbfd26b442c0182541c305017899cb10e
 MISC metadata.xml 271 SHA256 fbb3d4a4ac430596956b69e0435bad93c2a660fa52c7503cefd1d7b615770185 SHA512 8e0d07e4d7817e26452a71f4c35f1becf91c842da68ff67f4f09cb5c6d2d42a60d1cc424118841ce9d891594008de066e823537e69e5d983f056b87ef8a42079 WHIRLPOOL 3c41fce26ea8420680f397d6b68f0b0fd9b4b9c787c2c802535138f73e82db575943ade214f5a29d0447e7e0a532b2451f503b88be1b3499abb9746e1ab4f719
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlImM2gACgkQCaWpQKGI+9RUqgCfSXQ9MVlgoJvnVoeQuRovuZuY
-M/UAn0CKSZeGJTW2+9t9dGFjWSHRBu76
-=60LR
+iQEcBAEBCAAGBQJSWTTaAAoJEJWyH81tNOV9iHkH/3FJbz0jFDM6aH25CNuHrDDu
++m6VX8yWaI6zxRzPBiRYFTsTTBUICyoabtQKHG4F6XaK6OS3/raG6feK3o8L+HCC
+sRJjMhr3URRnGaepNouXlSIl30bzh4OJc2zprNdoc2wkNk2EJTmAH2J8O5x4H2cG
+CdULeZ3Z8+GABev9utHF1AUkBoXx2KdgorhWHE/cxBsdr9HDtEGt3McQr8t2LBmh
+BpPMiNU0FjtoGo9tss+IB64ptq70dNcY5YCyCej2ZyMS4vgfXHPMceLYNyzSKduv
+cEPwLBvLpEHHrgpnUwIEjgGJRai2caaYA8/b4cdha/QcIwPn6vuynooNt3geifQ=
+=QAA3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.101.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.101.ebuild
deleted file mode 100644
index 9bab3de247b6..000000000000
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.101.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 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.101.ebuild,v 1.1 2013/07/06 16:38:53 xmw Exp $
-
-EAPI=5
-
-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_PREBUILT="/opt/${PN}/bin/hamachid"
-QA_PRESTRIPPED="/opt/${PN}/bin/hamachid"
-QA_WX_LOAD="/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
-	dosym /opt/${PN}/bin/hamachid /usr/bin/hamachi
-
-	# Config and log directory
-	dodir /var/lib/${PN}
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc CHANGES README
-}
-
-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 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"
-	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.101-r1.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.119.ebuild
index da959ef74fd1..901baa501e92 100644
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.101-r1.ebuild
+++ b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.119.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.101-r1.ebuild,v 1.1 2013/09/03 19:07:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.119.ebuild,v 1.1 2013/10/12 11:44:39 tomwij Exp $
 
 EAPI=5
 inherit eutils linux-info systemd