Add ipv6 (depends on net-server-2 with ipv6 USE) and syslog (depends on Sys::Syslog and changes the default configuration) USE flags. Do not create /etc/munin/munin-conf.d if building with USE=minimal.

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

4 files changed, 44 insertions, 20 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 976693ba26bc..50b5bafec2fc 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.78 2012/07/23 17:46:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.79 2012/07/24 15:00:05 flameeyes Exp $
+
+  24 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
+  munin-2.0.2-r2.ebuild:
+  Add ipv6 (depends on net-server-2 with ipv6 USE) and syslog (depends on
+  Sys::Syslog and changes the default configuration) USE flags. Do not create
+  /etc/munin/munin-conf.d if building with USE=minimal.
 
 *munin-2.0.2-r2 (23 Jul 2012)
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index c00a63468652..e2eb1f75ec4c 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -26,17 +26,17 @@ DIST munin-2.0.2.tar.gz 1305391 SHA256 e8a5266a85cde8b89a97fb7463a56a7ac9c038035
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-1.4.7-r1.ebuild 5033 SHA256 0694022f8066edb5dd52b0d77b06416ea6d51937e1866a947aa8e93a330ba704 SHA512 dea8c73d9ed715c7364c685a7a4a9e811e4dae0babb3549941344df84dc7f90cd5ca81f54ec244b67b070d4329db87ebe9b6f5d8d8efc3c82aad006530268c71 WHIRLPOOL 7cef416ae55bc0500ce6024fe61a2aa7b24d55d9d95cb219e83f4487e8ba72adf83bf1592a265086c8b943e4878911586de55c8f222b1fd4d601c97f5fcb373a
 EBUILD munin-1.4.7.ebuild 5036 SHA256 a88ec1523efbf2b2afe5392c746508defc3d01d09879d969bc84abc2997c0944 SHA512 792448bb65ece76f9d1108ad1140a4a1e6d4972904c4c2da1213b84d544b8bcf043c1b0d74e585fa904565d6c9557d91b25a97e1459f0e6284862edfa68845da WHIRLPOOL 5c64f50adbe996bf1ccd4a17d308812addde1e538533524fdfae03f4f84eb69fac83bd9bf65e45b050a7ed9998900b9eab01bed3927cd896aed5cb147c29cda3
-EBUILD munin-2.0.2-r2.ebuild 6316 SHA256 857043abd234cd26dc42fed64ee851ced7b80c2a6f40da5bca2f650df0e13a66 SHA512 9aa8540e8dea66c02fed237fef4cd0a9ce731d94f6875096457e24d23c245aa163ad2999f8b8c221c2687c877af038895aab9359a5b8a7c12621f5a534403403 WHIRLPOOL db78b65728790ca676a163fd848194c265d2c0ae894f1515265f738b560963b2688724c8f3bbcfa47983e12c44f027c3b8167cc5bde8d01f05dbc7d336c3375b
-MISC ChangeLog 16359 SHA256 5779af9c1ea0bf530aeb63d8396961db7bd45e8729721397f1bf09947f977b96 SHA512 419728a60c23ffa2d0ca1d0b212a3027c87fe22d34f143cd201ced0353f239914a787e06af336b52c0e07f46da627374496a9aeb534ee2939b348d2e4e0f798a WHIRLPOOL a819d9f715c62abb5ea69c06148ef16edfe29d44f0f83220411b716cdd74c82e3a14533865a1377e6e4537fd091034c2a86ed32a2e72c33d5244bbe03e5a7b93
-MISC metadata.xml 2385 SHA256 f7a9078a3c72f3fae7d7e1f0f0f69f98d3a42fb5b66a8679fc1b54a29c6e95f2 SHA512 be7be43811ee9c925593312d36d924543d87b01a8a041050ee2bb9a7009aafad2942e864099b7561dd9a00a54e513f6cf29f7ee6c5a14b4f0597a4fe9ee4545e WHIRLPOOL 1a5607096b5fabbc19891a503f1d1a7d427d199b52210ec13139e8ffdd921d83ac669ee9c338f9a19a2b3fd86ed5c87c1f1513327e53fad03ace0413b9b48a3d
+EBUILD munin-2.0.2-r2.ebuild 6440 SHA256 2e6a359e4fafc124d9d05a4e261d3dcf6daf64d9dfee15949b388307a5efd4ac SHA512 cec86e5255e3c574acf5b4abf5e12af9f6f72ee79e9c53d50325356b7500880425fc9e1d0ba9079a6ebeb12728fda10a0b8d81f9f3c9898df4cfc2bfa36fa549 WHIRLPOOL 214ec9ba17c21e5e91ff84af4c3b5dc0cf878deddb723ec64e65e2e2360057bee292d56e9f92503fbcdfb515f9392ca903247a47392adb6f1ad394bbe8ed1e5e
+MISC ChangeLog 16663 SHA256 0d9f61012a35d258bb4977a25d61369ca0e19e2fef09f4e1f04528ad98def33f SHA512 6aff5444dea10f70d0626dde133d12fca6592d361f00f9c4e6af755b68834e33c995b67a8b10adc7c0e46d156c901cf32f7e0d56605ed37c3462ea23d9e9583f WHIRLPOOL 893176929d0ef436eae0f92215c591348da4bd0192b566f5bd63bbe316263fc1292dbb05d1fdc0b799d037388e2803610bf5a5d651cc2cea30fa1f7ab2c0dd07
+MISC metadata.xml 2890 SHA256 2062245000cf6a46090492eb06a02a66199ba297be298777ff17598e0a57619b SHA512 aa66c059ef9a689599c1bc9582849dee6ea47b5620cb26fa033f85b65206a0c913f31312a2c13748b1d0528a0c7fa1b7a25445b832d53965ed142162593d0820 WHIRLPOOL 5d483f04f130bfb2f60b26ad4690bf29533ac87c6e039dee8785dbe0db6c5522553109f0fdf17941c604a762b745e9ac7a4251fc64b6005b597aed104f7c7c25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQDY4AAAoJEBzRPIrUMBNCHMcH/RuhJIT2SoEw0V6SOCTxxfHL
-2cU+KrBx4zjX9g34rdXCcK5U8+jOpKzFqIUGYx6O2lj95sTPD1HuVwRLpuhwsurB
-reKojPZN9Dn6QrDhVLr61yct6wXP32AV5DVPAQYPdabLh1LiwDDDuzgAzjFKnNdZ
-ZpnkeUn8WCvUWpYHE/AqKfvxmUPC/3g6H4v91VjdlQk232IHy5G7cwahCweGZkAm
-QRi9Nk5cmgDuzAqlbm8TXowAJnl9TMnEXXitt4egX8vSy4pfaKqFSf/kh0rq/ME5
-KWHGJBDrAdRHiviyQZlDkklP3Chwv9VSH8BqKARh2BNNt3mYchE+ZzeEJX/6EeE=
-=vPVd
+iQEcBAEBCAAGBQJQDri/AAoJEBzRPIrUMBNCsxQIAJFIXoIeGr6m43dWbOTf8MkC
+LfxBdap7CoQSRSU7z1svzCcbhbRH+p8/lyZ0EXoJkVkS9dGPDBFIxZYPpjd6dlFM
+XUh88z+CpGkQzpF7YFZDjz9qYtAxhQuVXLea/zA8rJ4dBhqcZL/HgP0pGdsToFI/
+TSFdtQSf7GGLOim91Tvs3mBrmAXtAkI7MXrJyBl2LGPCW6lpAXBywpRHOelikqfQ
+XRe8WE7YAe1+DPH9JofW1UzLtviA8fyk/icBKbYePBefTHGMo2FEgCf8aFUmYnmr
+I/DZKmnFBBbwiWE3mQ2CHfDlbFl6ViMuo+UcDmvqJs6XLMEtrXk6qaU5goN/25s=
+=NFF8
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index 60c9803c00df..9b6e783d217c 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -54,5 +54,17 @@
       web pages and graphs. This is only meaningful if the minimal USE
       flag is disabled.
     </flag>
+    <flag name='ipv6'>
+      Add support for IPv6 in munin-node. IPv6 support for the master
+      is always enabled, but the node requires a newer version of
+      <pkg>dev-perl/net-server</pkg>, capable of listening to IPv6
+      sockets.
+    </flag>
+    <flag name='syslog'>
+      Configure the node by default to log on syslog. This requires
+      the presence of <pkg>virtual/perl-Sys-Syslog</pkg>. As of
+      version 2.0.2, the master scripts only log to file, and not to
+      syslog.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/net-analyzer/munin/munin-2.0.2-r2.ebuild b/net-analyzer/munin/munin-2.0.2-r2.ebuild
index 477313db2305..6018a1edeb21 100644
--- a/net-analyzer/munin/munin-2.0.2-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.2-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.2-r2.ebuild,v 1.1 2012/07/23 17:46:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2-r2.ebuild,v 1.2 2012/07/24 15:00:05 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 ~x86"
-IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi ipv6 syslog"
 REQUIRED_USE="cgi? ( !minimal )"
 
 # Upstream's listing of required modules is NOT correct!
@@ -35,6 +35,7 @@ DEPEND_COM="dev-lang/perl
 			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
 			memcached? ( dev-perl/Cache-Memcached )
 			cgi? ( dev-perl/FCGI )
+			syslog? ( virtual/perl-Sys-Syslog )
 			dev-perl/DBI
 			dev-perl/DateManip
 			dev-perl/File-Copy-Recursive
@@ -44,7 +45,7 @@ DEPEND_COM="dev-lang/perl
 			dev-perl/Net-Netmask
 			dev-perl/Net-SNMP
 			dev-perl/libwww-perl
-			dev-perl/net-server
+			dev-perl/net-server[ipv6(-)?]
 			virtual/perl-Digest-MD5
 			virtual/perl-Getopt-Long
 			virtual/perl-MIME-Base64
@@ -111,13 +112,13 @@ src_compile() {
 }
 
 src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
+	local dirs="
+		/var/log/munin/
+		/var/lib/munin/plugin-state/
+		/etc/munin/plugin-conf.d/
+		/etc/munin/plugins/"
 	keepdir ${dirs}
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
 
 	local install_targets="install-common-prime install-node-prime install-plugins-prime"
 	use java && install_targets+=" install-plugins-java"
@@ -140,6 +141,11 @@ src_install() {
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/logrotate.d-munin munin
 
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
 	if ! use minimal; then
 		exeinto /etc/local.d/
 		newexe "${FILESDIR}"/localstart-munin 50munin.start