From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B2BFE13877A for ; Fri, 18 Jul 2014 15:36:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47268E093D; Fri, 18 Jul 2014 15:36:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF9DEE093D for ; Fri, 18 Jul 2014 15:36:07 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE319340376 for ; Fri, 18 Jul 2014 15:36:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A77BB1807D for ; Fri, 18 Jul 2014 15:36:05 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1405697760.d1cc61c4db733fe348d39a1c88650be8fd4a9cdd.xmw@gentoo> Subject: [gentoo-commits] dev/xmw:master commit in: net-misc/iodine/files/, net-misc/iodine/ X-VCS-Repository: dev/xmw X-VCS-Files: net-misc/iodine/ChangeLog net-misc/iodine/files/iodined-1.init net-misc/iodine/files/iodined.init net-misc/iodine/iodine-0.7.0.ebuild X-VCS-Directories: net-misc/iodine/files/ net-misc/iodine/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: d1cc61c4db733fe348d39a1c88650be8fd4a9cdd X-VCS-Branch: master Date: Fri, 18 Jul 2014 15:36:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 48475d90-e231-4d6a-91d7-a289e9d59206 X-Archives-Hash: 4986a085b25caa4f710a4e3b2b4b3269 commit: d1cc61c4db733fe348d39a1c88650be8fd4a9cdd Author: Michael Weber xmw de> AuthorDate: Fri Jul 18 15:36:00 2014 +0000 Commit: Michael Weber gentoo org> CommitDate: Fri Jul 18 15:36:00 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=d1cc61c4 Move /var/run to /run, and use upstream /usr/sbin Package-Manager: portage-2.2.10 Manifest-Sign-Key: 62EEF090 --- net-misc/iodine/ChangeLog | 4 ++++ net-misc/iodine/files/{iodined.init => iodined-1.init} | 6 +++--- net-misc/iodine/iodine-0.7.0.ebuild | 5 ++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/net-misc/iodine/ChangeLog b/net-misc/iodine/ChangeLog index 1875b3f..a0e7e75 100644 --- a/net-misc/iodine/ChangeLog +++ b/net-misc/iodine/ChangeLog @@ -1,3 +1,7 @@ + 18 Jul 2014; Michael Weber +files/iodined-1.init, + -files/iodined.init, iodine-0.7.0.ebuild: + Move /var/run to /run, and use upstream /usr/sbin + *iodine-0.7.0 (18 Jul 2014) 18 Jul 2014; Michael Weber diff --git a/net-misc/iodine/files/iodined.init b/net-misc/iodine/files/iodined-1.init similarity index 87% rename from net-misc/iodine/files/iodined.init rename to net-misc/iodine/files/iodined-1.init index a0d0e0b..533cc67 100644 --- a/net-misc/iodine/files/iodined.init +++ b/net-misc/iodine/files/iodined-1.init @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/files/iodined.init,v 1.2 2012/06/07 19:53:54 floppym Exp $ -PID_FILE="/var/run/iodined.pid" +PID_FILE="/run/iodined.pid" depend() { need net @@ -51,12 +51,12 @@ start() { eerror "Please set a domain (IODINED_DOMAIN) in /etc/conf.d/iodined!" return 1 fi - start-stop-daemon --start --exec /usr/bin/iodined --pidfile $PID_FILE -- -F $PID_FILE $ARGS + start-stop-daemon --start --exec /usr/sbin/iodined --pidfile $PID_FILE -- -F $PID_FILE $ARGS eend $? } stop() { ebegin "Stopping iodined" - start-stop-daemon --stop --exec /usr/bin/iodined --pidfile $PID_FILE + start-stop-daemon --stop --exec /usr/sbin/iodined --pidfile $PID_FILE eend $? } diff --git a/net-misc/iodine/iodine-0.7.0.ebuild b/net-misc/iodine/iodine-0.7.0.ebuild index 2b40e9f..542de74 100644 --- a/net-misc/iodine/iodine-0.7.0.ebuild +++ b/net-misc/iodine/iodine-0.7.0.ebuild @@ -22,8 +22,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/check )" src_prepare(){ - epatch \ - "${FILESDIR}"/${P}-TestMessage.patch + epatch "${FILESDIR}"/${P}-TestMessage.patch sed -e '/^\s@echo \(CC\|LD\)/d' \ -e 's:^\(\s\)@:\1:' \ @@ -45,7 +44,7 @@ src_install() { dodoc CHANGELOG README TODO - newinitd "${FILESDIR}"/iodined.init iodined + newinitd "${FILESDIR}"/iodined-1.init iodined newconfd "${FILESDIR}"/iodined.conf iodined keepdir /var/empty }