Add a dhcpd USE flag to bring in dhcpd and the required dependencies of the dhcpd3 plugin.

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

4 files changed, 30 insertions, 13 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 2bdf216a811a..b3c02c8b4d9f 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.102 2012/09/16 16:12:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.103 2012/09/20 21:39:38 flameeyes Exp $
+
+  20 Sep 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
+  munin-2.0.6.ebuild:
+  Add a dhcpd USE flag to bring in dhcpd and the required dependencies of the
+  dhcpd3 plugin.
 
   16 Sep 2012; Diego E. Pettenò <flameeyes@gentoo.org> -munin-2.0.5-r2.ebuild,
   files/munin-node_init.d_2.0.5:
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index fc70de31cf1b..19a48307f74a 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -25,17 +25,17 @@ DIST munin-2.0.6-patches-1.tar.xz 7832 SHA256 02e0447dcae8c234841c89b1d6cec6b28d
 DIST munin-2.0.6.tar.gz 1325754 SHA256 ff99a3c36156adb6b867bb684ec508a857728336c0b81a93955bbcc9d5045ea6 SHA512 5b2ee05a2383dc1e636162cdb9102667976c8dfdbc89c956dc686db3f7b28c1cf0ca7d0c67f8e20f6c5dc0c2e69274c19980e8c63ef2f2fca38d3066b7498dff WHIRLPOOL 1316f7a6bc9eba9a4570652e571bff272dc8b0298ce4dfdbd2d959b8462c4a42a0e19332de59a5b2eae7669ae6e420b0e4945c0418dd383c171a142fa4cfdd64
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-2.0.5-r1.ebuild 7546 SHA256 d6b90c99a9e69ae32f97f788cd14545afd48124e9d591de83eeb69b9cffa5e61 SHA512 29e639a08751b5f2eb939c41e92035649f7c7f5f7d45862816ce802ca9a433aebe13d192800f7c7a96f98a3c18bd8b5a8a827e89b6a0ee67e40b5356d85bc26b WHIRLPOOL 2b5975fdf336dff40281661b3e4ccda27f4e4b6bf78c2b9c58214965a96514c5aab7396cc2bbfa650172a0f1d20c2be1d4bdae2ce970ae810a71ee13d9d50851
-EBUILD munin-2.0.6.ebuild 9238 SHA256 086f49c02d478316f815106daac9c43c31f422d4b7560751900445dbda6b67f2 SHA512 9b3e06d8d3fa2fb9975d1b87bdaedba6ddd48ae6c0265e85e0382ddf586c39c2ed1214b96a96d1519c5138584a7889c7040a7aad243e51c5991f4aeae50d21d5 WHIRLPOOL 0cac71c4c13a003b9d689df9f5cf4c2729d4e91457b9049bea49bbeb0dd7bbe035c8500921e62e4bac3272803ada8f7b75b72c1d67020dbd1bad092c3bff1a97
-MISC ChangeLog 22264 SHA256 215cb2d6e534bbb93d30ffb88acfd25d81d1bb3f7eab401f63bacd7efd3dd4df SHA512 e0feced061126d0cb17262db27e69f12cd3164d7f9912ed6c2b7f041bbba0d17fad8890f3a4792d173eef0db31ee5d5f34af0ab8183a98314b9429161a270328 WHIRLPOOL d14fa31e61e44c685e9b2c8bbf7d01941ffec6652112107ee4409b8252293e42857564c5f826acaaf6ffe0d96a0c4d4f063269a694c1167fe111a410fa7955ca
-MISC metadata.xml 3073 SHA256 0c2f892c440a28bcabdddd63da811dfaf408af447caf9b8b5798c5ffe2a21697 SHA512 cc27dfe513500f6ccece937506db7f7baac751dfb78eff9525dd50fdf9cc90101e43ff98e42dfd4934c06bcc0affa1faa09437159bed3ff0560423294896e5cf WHIRLPOOL 1733d43201a45f660b73423f6950bfb46487f57cfc5ab0d0a03a38e06cfc2b6fc8984aeab12923547946858cfefc8182724a40f3ded6c018e20b6c349e6bfe80
+EBUILD munin-2.0.6.ebuild 9334 SHA256 83bac09385a769d71b8abbadabafb5d2f04d68bb9a00db713f7cf0769927ef55 SHA512 a0f74077e048ececa3ad4a50486ab7eb6cc32461e7f6d9a0f23d55699a5ac191fee3c7c52fa88f002d8cc4d1ae7d54b718efdc5fbe19d70ca42f4efdd07d1730 WHIRLPOOL fcf05e9ff633e079581109d579d567c8e1a5d57a2c6b71795a97f9db31398f3738c0fe5db50298f93e5485a714e672c9e0df01d084ae43f5c26a8aac8fb562fe
+MISC ChangeLog 22452 SHA256 1f17a1313bc06707bebd8f161187849b5c57e05c30a72604c9df9e615971464f SHA512 93d83d23551526c5809407d525af79bd03358f7533fb6c1f5978688731d4cc3504fa290994396a3562db9679724746f886f86961c536f99314d467054b5e56b7 WHIRLPOOL e6b6aa8683d46395b5f5521a8851dfc961d24c6c2f4f9a4195bafa1c34a291b7dd37cb2259a4140006e70ac300980f115c08af29f1a125bfd4c724e756f37c4d
+MISC metadata.xml 3414 SHA256 ae5d3fc5489e8fd93e8acd554316d5f135f660799931dbc6b842daf21faa0527 SHA512 5921d816402e7ce6611473ccdadb8ca74997c977e9586ab776a34e5db13666da04c027ceb11abac6b366c0f04443f14d153b5cbd00b16b8d1c7cf034bd1c5813 WHIRLPOOL bc34d81204a6c2cb4b3f13f0ccb3bc200af149cbf0909582769639d1ead619a1157a1b5d4d0dab6060b9d6e5c137112e8faf3ab5e4c49f72f1686e73df856541
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQVfp4AAoJEBzRPIrUMBNCM6EH/iCp6V40EDHMyrlYzKUJ1ExX
-DL5qibba9ztLyZNZCj7d1dP6wCQ0Y/DdqnXwIGNqr2sUn/5TD4vEgkeatBkQTyqd
-rj3MjtrQhs1PtzmbYaykO1dTQ0ZtohUyx14JowkgG1HY4t3RWI7LQ4KW2ScHA/ms
-9ywBIHSX/X3P7GfksD5NePKv8Xp9td/uad2WPWQcFQwGQrEBc9WRvxvx+mIXQmcW
-mSUTEbnYOxdSApTCwTpppeA+0wTu70mqv/KfYmc1AAVwVsGWVJSIaXFmg8Jv3qEe
-eaXqfluF79YQMzpk19peXeeTeRAfgr+FB+2efBRU1O9e3kYIYUc3iyBRF05vkPg=
-=DhQV
+iQEcBAEBCAAGBQJQW415AAoJEBzRPIrUMBNCmBcIAKEU7h6x+oHUEOAFPIRcnfmu
+psZL2psBAdA1Ht8vlfXsPtOtTM3DzUZ9gM29hJ+q9+rmkgYzLWv2tTEptgfW1RJ9
+rN8IhK5F7n0AGYXW5IkLNqWn0lNNeY5twFxRWc7nvTaXr36JiSU24E83OsSIXRt/
+G9wES+hPYOV0nbOlq/VjlICx07ZVxNstx8jTZEjIo1q+OXC5mL4yXvSIb58qmu2v
+TT7mT7Q8sYypmVb7gEq+0HHZFBOTPaqhgV16MnHhkL/p5yebeJsh2mmLiXFfkJY7
+EtPTu56hNl4IBr3rRM41DxUHAzb/YsksvAEWyWL7e4ceNzTM/0ZUdlFWiaTG8JU=
+=GfUO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index b6bfe3ff999b..8c67205a82d1 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -43,6 +43,13 @@
       HTTP-based services such as Apache and nginx. Disabling the flag
       does not remove any plugin file.
     </flag>
+    <flag name="dhcpd">
+      Install <pkg>dev-perl/Net-IP</pkg>,
+      <pkg>dev-perl/HTTP-Date</pkg> and <pkg>net-misc/dhcp</pkg> to
+      monitor DHCP lease usage. This only works if the server is on
+      the same system as the node, so the server is also brought
+      in. Disabling the flag does not remove any plugin file.
+    </flag>
     <flag name="java">
       Build the Java-based plugins to monitor JMX-compatible
       applications. Disabling the flag removes the jmx monitoring
diff --git a/net-analyzer/munin/munin-2.0.6.ebuild b/net-analyzer/munin/munin-2.0.6.ebuild
index 77b058393815..d00988aae4bf 100644
--- a/net-analyzer/munin/munin-2.0.6.ebuild
+++ b/net-analyzer/munin/munin-2.0.6.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.6.ebuild,v 1.1 2012/09/01 15:06:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.6.ebuild,v 1.2 2012/09/20 21:39:38 flameeyes Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd"
 REQUIRED_USE="cgi? ( !minimal )"
 
 # Upstream's listing of required modules is NOT correct!
@@ -38,6 +38,11 @@ DEPEND_COM="dev-lang/perl
 			cgi? ( dev-perl/FCGI )
 			syslog? ( virtual/perl-Sys-Syslog )
 			http? ( dev-perl/libwww-perl )
+			dhcpd? (
+				>=net-misc/dhcp-3[server]
+				dev-perl/Net-IP
+				dev-perl/HTTP-Date
+			)
 			dev-perl/DBI
 			dev-perl/DateManip
 			dev-perl/File-Copy-Recursive