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.

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

4 files changed, 28 insertions, 17 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/Manifest b/net-analyzer/munin/Manifest
index 2157ce602c80..b2e5c88fb093 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -17,24 +17,24 @@ AUX munin-asyncd.init.2 572 SHA256 15b695a760d06dab4b73e1883162291d2e5fb86574f3e
 AUX munin-node_conf.d_1.4.6-r2 316 SHA256 cf250f39eae1ee564f51cd99ec20510accb8a68d59469893c5f6c474263f5b50 SHA512 07289596eb2f28c37210e5ffe68e81ad16ecdb945e1e61461a409e70d8779a6a0774eae1aaf50d3e7e4c38b366de1585bdfe01132836be85f836064db12e715e WHIRLPOOL 27c1c2858f86cc1e8b50977c91cb43bcf4dc67017195419f48daa8e7a4224b6ec0d60e4b4a1d6d88da31f2ba8aacda79331aa77cdca440a99ee54a0ff4e87b31
 AUX munin-node_init.d_1.4.6-r2 957 SHA256 78cbeff21fc98767775f7ff2c75b4b7096d878aaff26d215789ae5b9fa01e818 SHA512 66b5cc7178f4f6d58bf7101b7c53d356987188c3145384d5bb1b4d4726c1b4993f3742161d2f4166012f2d6084995f4ff9316ab46907cff9398b4701d8d87ef8 WHIRLPOOL 0521ecac81ae6cb29f6f12db57549102e069464b922a77077874e0a31796f6effd66456f37ed714e831269fc125127dd0097ddb3b83ffd7f8dac5a2072c28a55
 AUX munin-node_init.d_2.0.2 946 SHA256 56873af410a42f27b8e69230f0b0f6bf55e714e924f133c4cb00919d8827ab29 SHA512 48278f67bd45f196c301d2a60547f4add8ca09bf5ecdea83a97b2805a5476e251265544b197bee65c7972960a8c36aa28d6781794c9c6f734372eb10f61b5264 WHIRLPOOL 3c6a8670038490ab2980468387e683f60727b44bed1eb6087eab2bbb78c37a07a3b8a1580e8935f14bfd7fe75d8dceb46712902de65cf3d60b6aed807e032850
-AUX munin-node_init.d_2.0.5 746 SHA256 eda5e087dda2163bbe4f38e5db626a43ab45db07bc69c64f8d1060f2c22fb9b6 SHA512 20b6fcdb81651fda697f8fc268517f7f82f21398411a13345c143824ce42c30f4bc3c71712220d15c4cfe1de18e734a6881f88234f532febe74e699b8f893f6c WHIRLPOOL 81f97773c26d8df111cc8a66343afbeede95971ab7201664207c672bae22b573e991acd68cc5d6e2951d08579843ead03c53fd1cb0027c8f6996ccc8304a996d
+AUX munin-node_init.d_2.0.5 870 SHA256 e779e60e3c020e3468882470265a408e1291291c83a2b6ca1973d5f7e70176f1 SHA512 f9b2fe597703c2cdc9cea06ac8be3de6ba11970cbda04d64ccb5723b220062fe629ba32a1c9c6024a4bf260569ec25bad3c1425dcbce19a0a72f505de6873e87 WHIRLPOOL 8ae9a04ea59b6f7ca9fb2255a0edfdc2c823e53041df33174396e34241af4d1cbb606ca1c83edb099c0c7eaeae04dc27229260df1e7ba7183914b53005a11e90
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
 DIST munin-2.0.5-patches-2.tar.xz 9448 SHA256 9a58ff84e33cf5c912eb504f176d689fa8531da01b3541396a03f05fde19d079 SHA512 7f75c6f4a7034327a99820bd0c1fd2272f2cd2a5bc037096e6a142a317a068ffb4217b162578da089cb0f83667d35aee413ecaeb58fdb548dfbff78b97d36e07 WHIRLPOOL 0d128cbc9955e174902670c2a66e5e0c66d4262bd20832065ed220a227a9efba25a93e192a4cd08c85819df91d1552870e6dfc2cd1bd0f3870b0154d6c0f294a
 DIST munin-2.0.5-patches-3.tar.xz 11144 SHA256 4a8af6f8e4dcb34476ecfdffb6ba7ef139157d23906cba984b10e3da58651ef6 SHA512 69e95288f43414e8fb12b2251689a0dbebbcd4dc64e27041ad5b9be8f917a3be5bf23e754f5565b67426ff998750b28ea3b2e412ff795cad094b352ecb489746 WHIRLPOOL 3d0102296a2480b5dc163e8d473dc9778988105574fe1f9479328d9a43a4c13b9c5fa6c77fb97b07f651e2925f3fbd9472e6c3ba215c2a20b3d46606008f9811
 DIST munin-2.0.5.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-2.0.5-r1.ebuild 7541 SHA256 513bb564d856e06f3f004e10c584fa79aad0d3f7467000c906e67300635915ee SHA512 395f08ec6493f4240247be2d70a98cb7c0e363caa2b04ab6abdefae5860723b531bea948aba78bc8d01a326035e32066afbcbf6e5707b17ebed0f02b3f1f0308 WHIRLPOOL 6a594ae1005da80593c315bc9a0ea763a4e5b0efb95d0a779f8cf22f9e2ead19850cca1f3d660ae71c4b056171182cef72f3a09be581f7cee6e110ddef3465e3
-EBUILD munin-2.0.5-r2.ebuild 9251 SHA256 4005c63448d8acda9cfc19f03f49e88404bd270ad6e01e491a0d0bd97659ccd9 SHA512 b4845f38bfd53ccbd9c5591a41cb22bcb5096da73aa68f924b8fa06545e57c8a3d7d97479d8f8de5f7931aaf6b693d8fbf5c38e05c5a446e158cde1f9399fdcd WHIRLPOOL b40c5a72e04db4969acd7efcb20328a883cf54eab3c2c0cd589fc271bfb74e32e40ca892c92fdfc4245a067dd31c0c690aca3cecf184519b72332bfb0610da1b
-MISC ChangeLog 21458 SHA256 10d38c38ed5a56729318214a2e080d83a5da036866661645d91da829627902db SHA512 2264c7e2ee3c18dbe45a760cc601e0441eee7b6389f1bf0cd7d00a6535c25af5f7c780a52c61b077159e93c1cbec4431f108d63dc0acc0fce6ff996c298d45c1 WHIRLPOOL a50e7b0a60392acb080e273ca1b04371138f1aa548fac9dea159cd61e1239331f7b56e3a2798972f26a3247202407e07ee8bd7cab81cfa4ebff3a5135d4df14f
+EBUILD munin-2.0.5-r2.ebuild 9241 SHA256 7a41b2bbbb68687b4f10d5218e1393ee1a2e9a36293993df0e83a33a5fe127c9 SHA512 0bb7f0ca420364a0ab1e405be113c64733644a1a294e1a12f858485cc65971531fedab65c7c31f0cba724b4b2503d9429b2ba60be1ed6d30ab9143236d32e7a9 WHIRLPOOL 7ada58d0434cf4d26b4bb64642376fa7c9317b6ae66cb52b1edc88b61cd87874d4b319676e0a4f5287de2ae62d715828d11ef7703fa5764f2a2e3e4aa4ec5c08
+MISC ChangeLog 21735 SHA256 f570f1f7dead87ad652f25f2fcba210611ec8ab4917bca48824b3d9811a5510c SHA512 a7706afc2e6ca3579d8e0860bd086ffe400b189c3ace2a7ee65061a119f9bbb88d1e75adea69d81d42632223710da5313303afb35653666a1cc4cd78bda9bf7d WHIRLPOOL bb0d3f79521fa3b291fbd832b385474ab06c9d34fb1f0db2583a04f824ecbfc64a85e45e601eadd0af6d711cafbaea6cf0b405b3276ed6a9f031af042ae65e85
 MISC metadata.xml 3073 SHA256 0c2f892c440a28bcabdddd63da811dfaf408af447caf9b8b5798c5ffe2a21697 SHA512 cc27dfe513500f6ccece937506db7f7baac751dfb78eff9525dd50fdf9cc90101e43ff98e42dfd4934c06bcc0affa1faa09437159bed3ff0560423294896e5cf WHIRLPOOL 1733d43201a45f660b73423f6950bfb46487f57cfc5ab0d0a03a38e06cfc2b6fc8984aeab12923547946858cfefc8182724a40f3ded6c018e20b6c349e6bfe80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQN/1yAAoJEBzRPIrUMBNC1pEIAIJnALjOr1+KSdzHEkJJUtyV
-c2eQvGKdgh1z/E26p5cmdBJN9D711kOhjMR/1f1IcSerLugUS/udoUmJPB9hkxdt
-/i1oNIDVCyilvSr5Wis+jOLTHPG1ccBfGQwYnsohRzIIrOSswFxXrpGfaJGGxxRi
-WvuTIaVXnmuJkJ3Yxk0uukVNAJ1xv1n6naVZcsuA9NVqYQThH5LilxuhXl/t/UuF
-catEjALDrRj3A1fd/HlHje7g8u2riyZutYV4KfsxGfDTx0SY7Wp4kTbFaBy9EqSO
-2WW8SkyrB3A5jAgAcDSu3KTpHMaxQ4g11FW13M8VBMKvl/4gcRCYhFW3w+vrwHw=
-=LMt1
+iQEcBAEBCAAGBQJQPlmqAAoJEBzRPIrUMBNCuy8H/3fMDMD2cH4I31QLZj9UCp2g
+koEw3EDgrTqokk8Gzk8Alze1GQYL3O622qD7zxrZV8OBfL5G1fnnuC1PCR87IB6l
+xlzdQBcjyD6Y5GmqshoPaqNp8wws64+vSb3tgblKWyS47JHxNwLxNZxzX5Mac0ZQ
+x7EwY1m8qG+zpBRv/h831n14MsxDR6jkFWUHngZt+MrSoGZRTnqlX70I1vI50S+G
+RB+RGh2cDZMNkXBbDhyJRAWQHndQNRckpXhahy6hZTF+xurGjdE3q77vGpfZ9V78
+jA26tQMP199zj8l1Sv0S02gys/YpuLMkSq2SYImyZLFkxABaNXtXNZe89Ud0WkA=
+=TbiU
 -----END PGP SIGNATURE-----
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 )