[gentoo-commits] dev/xmw:master commit in: net-misc/iodine/files/, net-misc/iodine/

[Michael Weber]

commit:     d1cc61c4db733fe348d39a1c88650be8fd4a9cdd
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Fri Jul 18 15:36:00 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> 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 <x...@gentoo.org> +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 <x...@gentoo.org>

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
 }