Add a reload command to munin-node init script; make virtual/awk dependency unconditional (used by the init scripts), and only depend on freeipmi at runtime.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

3 files changed, 18 insertions, 7 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 67d0f6c53bdb..202d1353e614 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.97 2012/08/24 22:13:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.98 2012/08/29 18:04:07 flameeyes Exp $
+
+  29 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/munin-node_init.d_2.0.5, munin-2.0.5-r2.ebuild:
+  Add a reload command to munin-node init script; make virtual/awk dependency
+  unconditional (used by the init scripts), and only depend on freeipmi at
+  runtime.
 
   24 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> files/localstart-munin,
   files/munin-node_init.d_2.0.5, munin-2.0.5-r2.ebuild:
diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.5 b/net-analyzer/munin/files/munin-node_init.d_2.0.5
index 657ae6640a3a..26922826bd53 100644
--- a/net-analyzer/munin/files/munin-node_init.d_2.0.5
+++ b/net-analyzer/munin/files/munin-node_init.d_2.0.5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_2.0.5,v 1.2 2012/08/24 22:13:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_2.0.5,v 1.3 2012/08/29 18:04:07 flameeyes Exp $
 
 get_munin_config() {
 	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
@@ -13,6 +13,7 @@ command=/usr/sbin/munin-node
 command_args="--config ${CFGFILE}"
 pidfile=$(get_munin_config pid_file)
 start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0}"
+extra_started_commands="reload"
 
 depend() {
 	config "$CFGFILE"
@@ -28,4 +29,10 @@ start_pre() {
     checkpath -d $(dirname ${pidfile})
 }
 
+reload() {
+    ebegin "Reloading ${SERVICE}"
+    kill -HUP `cat ${pidfile}"`
+    eend $?
+}
+
 # vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-2.0.5-r2.ebuild b/net-analyzer/munin/munin-2.0.5-r2.ebuild
index 537f3b13a18b..56ef5d581da7 100644
--- a/net-analyzer/munin/munin-2.0.5-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.5-r2.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-analyzer/munin/munin-2.0.5-r2.ebuild,v 1.2 2012/08/24 22:13:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.5-r2.ebuild,v 1.3 2012/08/29 18:04:07 flameeyes Exp $
 
 EAPI=4
 
@@ -37,10 +37,6 @@ DEPEND_COM="dev-lang/perl
 			memcached? ( dev-perl/Cache-Memcached )
 			cgi? ( dev-perl/FCGI )
 			syslog? ( virtual/perl-Sys-Syslog )
-			ipmi? (
-				>=sys-libs/freeipmi-1.1.6-r1
-				virtual/awk
-			)
 			http? ( dev-perl/libwww-perl )
 			dev-perl/DBI
 			dev-perl/DateManip
@@ -75,6 +71,8 @@ DEPEND="${DEPEND_COM}
 		dev-perl/IO-Socket-INET6
 	)"
 RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
 		java? (
 			>=virtual/jre-1.5
 			|| ( net-analyzer/netcat6 net-analyzer/netcat )