Properly create /var/run/... directory in initscript, wrt bug #450872. Drop old versions

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

5 files changed, 28 insertions, 80 deletions

diff --git a/net-misc/logmein-hamachi/ChangeLog b/net-misc/logmein-hamachi/ChangeLog
index cf451fcbea1a..87cb1edfdd09 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.10 2013/01/02 09:23:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.11 2013/01/09 10:47:19 pinkbyte Exp $
+
+*logmein-hamachi-2.1.0.86-r1 (09 Jan 2013)
+
+  09 Jan 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -logmein-hamachi-2.1.0.81.ebuild, -logmein-hamachi-2.1.0.86.ebuild,
+  +logmein-hamachi-2.1.0.86-r1.ebuild, files/logmein-hamachi.initd:
+  Properly create /var/run/... directory in initscript, wrt bug #450872. Drop
+  old versions
 
 *logmein-hamachi-2.1.0.86 (02 Jan 2013)
 
diff --git a/net-misc/logmein-hamachi/Manifest b/net-misc/logmein-hamachi/Manifest
index 70c29b1d523c..271c55279df3 100644
--- a/net-misc/logmein-hamachi/Manifest
+++ b/net-misc/logmein-hamachi/Manifest
@@ -1,10 +1,7 @@
 AUX logmein-hamachi.confd 541 SHA256 661be1f7ca7ce360933ab275a9f0a43961c00940534c1c156a985fe346bcb058 SHA512 8d28891af13b597d9a29dcdc3a92e3c933e6cd3c122d720f6ec140619fbf26e2a2c4d3c729ed0499fc844e7b4480149dae76268bfe024b88f7c2e44b39e5ac14 WHIRLPOOL e1019d4bc29884932691f49f5bd2889c1331a14f63b9b98d30a68b15d366ca236e56bce606f3082c6ee678ffa1621204e706fdfe3f62da3d8d1eb36840ac96f3
-AUX logmein-hamachi.initd 1526 SHA256 49337e88fb6b42bd830b108471ab87335a5890c2250f01f3dfa7069b4406984d SHA512 4f76dff322af85e89627a50feb43d46745057a65cbad27e57449f572ecf725df1407b66a651fcf3a41fd787eb6c95ac0a59afd1e4bf7a4b3542319285fec62e6 WHIRLPOOL ce0e3bac91a071b402f6166a06e8a3e10fa47b9e62fb536fa375769db493e1ec1b31f2667fd610b4ba84c6105fe70acc13e1cae4d4c124ce2dd5ddc293338cc8
-DIST logmein-hamachi-2.1.0.81-x64.tgz 1159857 SHA256 d27b60d0764dcfd16690c4bb567f05c39512a281b020c484fa0ad7773bb045c0 SHA512 d6b3189c72793081abdc9768187e057ffa7e3980111e997c9bc7336773e214a7954055fcfce50f54f7c31704d1a052cc3523fa823906e4cac795e3e4061fbcaf WHIRLPOOL f3a84270c14537cdbac2b80554af93114db252d87b5f8675cf83cea3ac3310221f5ac14cac6bb7d7cbdb6d7abf5a6f8747a253b5a58bdb8b07b6bd709e6ba5bd
-DIST logmein-hamachi-2.1.0.81-x86.tgz 1136676 SHA256 2cfd16f4406a6723f9345be8867022f5d6a0cf3907b09c41b52ae29339b5e4d9 SHA512 92cc4cdec4773adc034479c246379c66511a4409655cd26648a3c440ce3ba1f60c494cfdb467c8f7bb0acd22f1c7eda544dae58d0b509e2ff907d103b1fa5b0d WHIRLPOOL 13e0c6d93f9f6f8bc3547a90caf31d0d1ac681bb69bab4aee9814c4b09780c0f1056f475c055ffb62d17e5ddf4c8cfd887e8dbe8a9728f524386979218a99a94
+AUX logmein-hamachi.initd 1582 SHA256 30a64d6924e218c681631e1654166e0067f2477478eb788103fa221743efd166 SHA512 e36fecb250681a8f31447420e0b91e1260723e38f4973e3d4da3ea34f2e15ae38a0ff4656995d22934a5e4664aa9a4bc2f05f6495f28fd0b43fb54c3929b61ac WHIRLPOOL 2b9448c64eeecff584bb711075a0d37264c8db0c2c4b968c232e11f8f12f9e69f47f44d8f0d33036b0d79f0cd4e99d0e68c1b6497c4ab9d4cbd2f581152a70f0
 DIST logmein-hamachi-2.1.0.86-x64.tgz 1162798 SHA256 3c0f7ffc0ed8638b916c172af74f827b49ba4c19715522c644ce2cafea1505ee SHA512 8c65d01095ecf4ea79d64f9662235d3be404ddfbdf59ec0d3fe58df6345dfbf9eae99fe7e310e5ce712495cee73667b9fb2837131c08af9d3cf20e254a99b663 WHIRLPOOL f4c1e8ef676bb9ab12d57dac6a2a535ff8d5d74b24d9952d9d3d3433aca555520b3957c82c5cbc908903c0bdfe4b7a1d1eb532617b7c344f2f43e992784b4d6e
 DIST logmein-hamachi-2.1.0.86-x86.tgz 1140045 SHA256 495428a9ca2c4bda81261024397eaab4cccd2cd34f44f6f0ac82998b2d251bdc SHA512 56b1b6c5fecc5c18cb66586bc2ac165c0c5fc6320c3dc89f718f99273eac540af70d4a9c78c1418233df8bdd6ae4d760199e0a69801eab32cac09c3064f7f214 WHIRLPOOL dbc9f3e95b42998c38acd836d520c906b3f441142bda8f8c97292bde72838a724cd062f90d1dee320dd0128715fe78485635868d46f4297c562396af9a683b16
-EBUILD logmein-hamachi-2.1.0.81.ebuild 1772 SHA256 9cecb8e7bbf2bec2d68f0581ea93384d5a89632c39553bb889cc3841a737b868 SHA512 a764b1635e3173619c2dda65770d06e945a604c62bff89fe6b9c659c1c245cbe20420539476e2c71c14cc140d7a9f3aa2334ba2fc9d68b36b2599c369480a4b6 WHIRLPOOL a2df1256b5043801844218330c159bb20346aa00467dbcb0051bfe122fc54576fdeaad89518e2047fbba233783e09d1ec343be76762eb033215814df7043797f
-EBUILD logmein-hamachi-2.1.0.86.ebuild 1772 SHA256 9157d910e11cee511de9d8260bc3edaaa162cb82ebe90405527c036d1d797585 SHA512 f39eb4aab904637c4ec3884871e51f146b2a6ea2c62662ab4e53f841fa93f18cfc98dc4e075c5ec224c59a007a1a9d716f901eaba4d9af1920eaf5e529eaf57f WHIRLPOOL 0f8f1048f236de5d71b3dbe983c7f4c2800df824031d14e2a759f899f0dc94a8c5fa0b60432426dd5da4d2efa369d04c866629ad91c95c7d1844bf8cae2c7904
-MISC ChangeLog 2896 SHA256 bdbd9673cfd6f2baf2a749241dbe239581bf2cbb00bff3204f7bf25cacc7eaf8 SHA512 f93e700ffef88d022ee763451e708658e035ce33691b1e4b4bd6ee54d2bf5460373b071b6ed2ada74013d004a8f37d078806492a86d98777a617f3fcf1d9d884 WHIRLPOOL 3628513aba10c7b837b2fb49848d48e433b61159d11dcbb0a2a8e9314c31edde412b540967548b0f0f55864d61cb2e3b183ee5b47c7cc1e8ba3ad5301757d3e0
+EBUILD logmein-hamachi-2.1.0.86-r1.ebuild 1716 SHA256 eb66ecc429896d6c180801471566c5709d455a345b501822801b44c60d357577 SHA512 3b8d3882a295fe2873b7a05bd7a7c43d629e10b589bb231806a89bfafc2b98ccc0f7994180556bff6695b5c22f5da2b01042781369152efcd17a2fa43f094a1f WHIRLPOOL e8ad262c0f7792ac9e2c4d055a71a125234535e80cdd57ad2262d978917c3937088951cce2494e96e481c7847809aba55e8ccd87c9278abb4e5b2e5cc2838638
+MISC ChangeLog 3222 SHA256 1b1a14d84331fb4a012706fc212b3d886def8e78d98fbf82a32045808e9da384 SHA512 2893c4df3af35491f285507cc260981aab1c97e113be9bf185646c814b3499acd096d0786f77784b61ce1cd2aa6cb2d801b758c767c30f16b3088c8afc6afac5 WHIRLPOOL dc823004d543cbe107b38c9596513de783866cba583966e40edc187d0c4dd5e16da12440dcd53bdc6bf3f68e2961315551acb85957c284c425085196b89600f7
 MISC metadata.xml 271 SHA256 fbb3d4a4ac430596956b69e0435bad93c2a660fa52c7503cefd1d7b615770185 SHA512 8e0d07e4d7817e26452a71f4c35f1becf91c842da68ff67f4f09cb5c6d2d42a60d1cc424118841ce9d891594008de066e823537e69e5d983f056b87ef8a42079 WHIRLPOOL 3c41fce26ea8420680f397d6b68f0b0fd9b4b9c787c2c802535138f73e82db575943ade214f5a29d0447e7e0a532b2451f503b88be1b3499abb9746e1ab4f719
diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.initd b/net-misc/logmein-hamachi/files/logmein-hamachi.initd
index 7b704e19b722..25dce7d0947a 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-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON=/opt/logmein-hamachi/bin/hamachid
@@ -18,6 +18,10 @@ checktun() {
 	return 1
 }
 
+start_pre() {
+	checkpath -d /var/run/logmein-hamachi
+}
+
 start()
 {
 	# returns
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.81.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.81.ebuild
deleted file mode 100644
index e901add07b8a..000000000000
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.81.ebuild
+++ /dev/null
@@ -1,62 +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.81.ebuild,v 1.1 2012/11/22 19:29:20 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_PREBUILT="/opt/${PN}/bin/hamachid"
-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 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.86.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86-r1.ebuild
index 9e1c5bafa6a2..1824410a0e9b 100644
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86.ebuild
+++ b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86-r1.ebuild
@@ -1,6 +1,8 @@
 # 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.86.ebuild,v 1.1 2013/01/02 09:23:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86-r1.ebuild,v 1.1 2013/01/09 10:47:19 pinkbyte Exp $
+
+EAPI=5
 
 inherit eutils linux-info
 
@@ -20,6 +22,7 @@ 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."
@@ -29,23 +32,21 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	mv ${P}-$(use x86 && echo x86 || echo x64) "${S}" || die
+	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
+	dobin hamachid dnsup dnsdown
+	dosym /opt/${PN}/bin/hamachid /usr/bin/hamachi
 
 	# Config and log directory
-	dodir /var/lib/${PN} || die
+	dodir /var/lib/${PN}
 
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
-	dodoc CHANGES README || die
+	dodoc CHANGES README
 }
 
 pkg_postinst() {