New patchset, fixes bug #430154 and (hopefully) bug #427906 for good. Improve the ipmi_ plugin to properly support threshold output and foreign host monitoring. Add an init script for munin-asyncd (needs more work to be well-integrated).

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

4 files changed, 303 insertions, 9 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 7e17ff89fa9f..cf8cbb0b8d61 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,15 @@
 # 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.87 2012/07/30 15:16:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.88 2012/08/06 14:53:31 flameeyes Exp $
+
+*munin-2.0.4-r1 (06 Aug 2012)
+
+  06 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/munin-asyncd.init,
+  +munin-2.0.4-r1.ebuild:
+  New patchset, fixes bug #430154 and (hopefully) bug #427906 for good. Improve
+  the ipmi_ plugin to properly support threshold output and foreign host
+  monitoring. Add an init script for munin-asyncd (needs more work to be well-
+  integrated).
 
 *munin-2.0.4 (30 Jul 2012)
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 4a41e2da1e71..21dd3832b7f2 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -12,6 +12,7 @@ AUX munin-1.4.6-fix-asterisk-plugins.patch 6639 SHA256 29c8c30b69420453676cc173c
 AUX munin-1.4.6-if_-hardened-v2.patch 6406 SHA256 01155070beda70d78d309d0896d7d5a4425ed09bfbc3051bff3b7b0acc4a567f SHA512 feec4afad3681263972d29fc7acda7331e4543bd93359c270796f269f35bd03bf55d57a86a14231bc34a8e35950755a463e75b563d8d2ac0701b4b12f4c4cdb3 WHIRLPOOL e1b452289e760bb2dec66d7d31a69d75a117856e6b571dffa18375cc3d73cd3cfea40b58879ebf86440d5a6bcd5f86ecdf943530de67c12c94bfa8de10d8db4c
 AUX munin-1.4.6-if_-hardened.patch 6403 SHA256 5a06d68df8a976869009a63a9f1a5aa1c6dba481cd8595b3d0e33aca507cc10d SHA512 4b97de8fd87829e33338092a8250eaa4e488be7b6de3d6924160c920a24ada2dbff4affc2215e428b094da4693717edd38be6e7ff4ea634add99720fc01c75e1 WHIRLPOOL 91d30306d554a8d87b71e94a890af5006e8b895f1c7b3fd47c28b442c57a333066f3c26904faf517246e1ec45b52622103a4a4e356e27297137aec7802d1aac6
 AUX munin-1.4.6-munin-version-identifier.patch 10903 SHA256 a403e5f1ade8b8b3c917fd4a1b72eb1857d6d67c6c955c63a72f5876c5eb4dd4 SHA512 85e00cea5e0e82e2b3599a5261920364b109949a84ef77e29d0b68ed2ecb1e40d28b40a665e51e57ad2cddf7776e06b820b7b38c23c6ea022233f5b4910f5736 WHIRLPOOL a547fe1744f348d0148e392359292e12073a95b464aab4c7f64059446637fcf06a21c3a53a5ac45e47b389cf3d04b8866e1b77406d9f6ea185641fd2c496d831
+AUX munin-asyncd.init 685 SHA256 d43b77958fbfecf167e6ec4251620e681f9fa128612d4fa370da0ee2546ffbca SHA512 013dca17a0a3c510ef992fe81aaefe029ff46a100e2b4e1f094bae15acb918502f6e988afb3a58140d8c8213f6f471666a943208489f07a4f1518fb2e4b733f9 WHIRLPOOL fcbeb4ac8f4e5a06f67cd2ba57377e8a07362bfbf4cf967dd807ae7cdc4f50037d0741f5fb163165ee1e85cb85c29fbd63792578f3589d069c65b3053fa8d630
 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
@@ -19,20 +20,22 @@ DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f9
 DIST munin-1.4.7-patches-1.tar.xz 10208 SHA256 7429c949ebfe3fbeaf50f54401a3119915cf4f3c520e7925d5118fbf576f8d61 SHA512 7588df8eb4528f56e34bdf925a534d8b46f1fee09a2a7ec5ccb411b2a15353f8a769664347019a2fe490611aee52f6b878518662a6965b840f667a7d460da185 WHIRLPOOL 3b14f5ba9c5c86539b1dfcd363df655e3bd7b6be8e873c1243d527aad58d68a83dff4f53ff58b0177e7c94b64f900a556a67e0dda8a82bbb83d13f9a403daccf
 DIST munin-1.4.7.tar.gz 1236273 SHA256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af SHA512 5a01c04a291f53e750b170e715c9f0d5e2cca5fa2a11f725ba6a81bbe7b34c34ef6459ea60177d13d1c38e9e91d374c1e227b2d4d7ba8c094353320a51f40b30 WHIRLPOOL f16ad8331b48136ec9cdd21fdab0efd2bca7800954f0160e7a09192c22f2d7f88cbba1df81a5750f5e4577ca1a93e41643e9ad1445b645f76becfa5db28a8088
 DIST munin-2.0.4-patches-3.tar.xz 6816 SHA256 272658e9155f1973c6baa840bcb2345bb862d47eee4b222bf5fd221cd35c7034 SHA512 ed238b541a251b5f4775bf04360f70792ae4dc0f32511a1ae2261f2e214b3eff9ede9de53312d69f5b7e9531c7ddb256964b7082fdc08a31f63e2d9e6e5ff4e8 WHIRLPOOL 450e12734565102b136b6fe43c9de4629527f42cae2aefed0d996c5fb08c9f8133c23d1f5a336bb56f0de390aee5d492a702c7f2dfe8e10a3f24caf1b8821311
+DIST munin-2.0.4-patches-4.tar.xz 8784 SHA256 ea0699df42e03b5e666d3042d562ac98e72adb61bfa1830f8a18be10f970737f SHA512 1d8f0661b72a8654ba2f8872d92ac8e04b8fcd2bf8e37e4e26f56d060719752e7a6883400a5e63195acb07c5ebbbc32d719053c9d457551e252aee72db091f3a WHIRLPOOL 065f3d470cbf52bd42f708c9f73c7e683e03c1f4d24d98605e0b3f64ec4b287f3930b9f745c0bfaa8fcfe587de028502fd398332389c70b0a9dde0d263a887d2
 DIST munin-2.0.4.tar.gz 1318808 SHA256 309388e3528b41d727cea01233f0d4f60714e2de443576e1c472e8a1dc81722c SHA512 4f20eaa6b427439135ee6b8203044a055b37b6fadcdd05b57b2e0198764ca0487d3fa79e5cdc6c663e3809879efd4bc4a13df705f096b72eec3188051dd84a35 WHIRLPOOL 84afa3ae217625161a4e3ebc7dd8213f55fd97d515a904c35dc9f1f06c143c4921907a019bff2d79f9df0ae305dee84075445aa7be610f78eaa7977dbdaf8a06
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-1.4.7-r2.ebuild 5641 SHA256 95617a67832cb43f739112e95656476ff3d6822ceffd6ba15315237e7355fe20 SHA512 3c943a4d2dc46f69b4cd78919ab3285619d6ea16270e1a053b1f47551f8a0a175693e53a6877d74926715ac7a627a1572e7e0c12dc7bb59feec944f1edaf16e7 WHIRLPOOL 68599e60247d47310a7a1dacd7d474d241f31d8bc80a8c35f4383d3a19df48cc68938cf702a9033131516e2382df1c697f3a92f0794d2f3806463cbf26d576ef
+EBUILD munin-2.0.4-r1.ebuild 7336 SHA256 8366c3fdbed99a005708c12a8fbd301dde35262a990ce562f1cec0caf6a7028f SHA512 4186ef90b02416029648527f224f1c1c811f289d7269e8f266a735823a36381b988fae6a22f39ccb74db83f9d509f2d4db67df234da11707a890244b998acb0e WHIRLPOOL 6d3bd4954d0cf8ad4a13425ded3f9990b414167b677ba485f04e2a0d21f42a177af6cea70327181e0f64fce92ee31a7108b11a528d6aaba5a26b149d103789f1
 EBUILD munin-2.0.4.ebuild 7278 SHA256 3b505ec464378e583aa04d9b9def4f257e9597015c6c01ec0215275af298489e SHA512 f2b8624d3254ef9d82fabc70f2280ba74963d8bdaa76282a18a453b39daf80b611a6e7f93ad44857239e9f660297a4ed0343f8fe00803f682c8d8eafe8b2d9ef WHIRLPOOL 14825a122825c706ce9db74e2a302b43e60e69e9aaecf570ffdaf3773a6d6fe7106788f4894516fd10ca319b92cd529ef027532ded9d2b07aae1911dc49339bb
-MISC ChangeLog 18760 SHA256 03f8fa10c3b461824dd661d2f57a211d30ad164a80d57d79b96eb68cb8ba1d88 SHA512 49edb0ee9eeef01d5cea7185264fd7cd5a22a6fab3f69c914c91049ee356a9b1df0d4b28db7f7107de3ed2978dfd0e47285c5a52955f786f9dc7beb690df4428 WHIRLPOOL 9918d2102ae8b9af75d48ac86df6698cea5c353e98d49d112ddaaf5726547fbc9b961f31bd7e31c2d5c7cb3706000a3ea7b727a856e07653672528e50ef0e12c
+MISC ChangeLog 19147 SHA256 af474f2a700e662045e303788b7995b8e680ee0ecf7b4136554324f4250e70f9 SHA512 e4f29ed51fca2c9dd73c19d560508cb688ae180ef22096d45ae8fa442605ff5347a75c9f4d724bd4dfdafb6cc4af93bfbe80f97bd3f6ee53b0156e96e6597710 WHIRLPOOL fc33f9958f96374cb6e76f194ef46dcb653234e333c9ad0989a371548d9c8e27ba9366b2d16e3102bef7a39d3ce3d417ede3f85b0560acffcc8b936d5c341328
 MISC metadata.xml 3286 SHA256 42296aea0f20a9d1e4736941c8cab0d5ea30a8a6b63485714483056d3f5d670c SHA512 ed8881e77486d5c50ae2577aecf6ebeac3cfab09d75ca284f67436ac35337bbaa00374af4f2829ca9d65e283d506460fcbb3e58bf8751cbf1bd2f1432db21cab WHIRLPOOL eba5c5ead917e8983d15dcb13745067f786d5a933426553702309850285ac380a3c88a7a60625d6bcd16f8ae692f9bcc1638f4c8610aa20c8d3e1ecff12dfff1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQFqVmAAoJEBzRPIrUMBNCqQQH/icZHIMH84e++ExXsMQXWUiO
-1ESq+2gyPdyCQTYENBmXBKoRmvckR5rZXA10cAyi/ThFbSxZIWwFf6X4KDoicLdC
-Opd0rwL/Y4xyrCWxLFxe3CYL6rvv3ZCRQylgs27ByPn6naaV6xS4jrrdVA2yQPEm
-XPq6e3Z696Gf9/TXxyz1kURBCDONDH8ycBZVkrG6/TBnTkg+e4zh+KGwK39CXH3V
-L6VIlr7opfvZlOvcgmrF8FmbErmEsm0arSlja0e+OsNvXo6c3EViROEhjVbgX1AI
-FhGWvBtgcTY0HJBO1VL5YGdf1CpqU6UNqvbGqG+gMud0IJDIaFD6p93LghL9Wcc=
-=6Oxq
+iQEcBAEBCAAGBQJQH9p5AAoJEBzRPIrUMBNCS/AH/1MvRP3WyIs068tHgYEGaEgn
+Ru6YOwaN1SC8uMAs0vTR9ETbJEoVlhNNXGw0Z1KTlPsXL0JO7GtaaT6NNbdRLHBb
+4XIWxYo1UsLDPisbX3lHsb5SPzlsuhhWLxDVGAYMkhGSAHTyDtBcRCxNE62IoP5X
+RKXLKG4do43Eaxa32oicm/6aSz1WUkJW5eWBKD+k6Liebr8bnzxjgQqv39M2kGeI
+e+xbRulHwq54zXsl68kCcdhN/Mf+PAJxgicaCDAYsf/BvWNV9ods4kjjY9aDYJ31
+erLCJX3hqIfE7P5Lor0P5LN/aFHJBknumtrMHZYoOCjRFYtjsIn1zppIPCf9M58=
+=BsUO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/files/munin-asyncd.init b/net-analyzer/munin/files/munin-asyncd.init
new file mode 100644
index 000000000000..e438fd3e0838
--- /dev/null
+++ b/net-analyzer/munin/files/munin-asyncd.init
@@ -0,0 +1,27 @@
+#!/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-asyncd.init,v 1.1 2012/08/06 14:53:31 flameeyes Exp $
+
+depend() {
+	need munin-node
+	before cron
+}
+
+start() {
+	checkpath -d -o munin:munin -m 0700 /var/spool/munin
+
+	ebegin "Starting Munin node"
+	start-stop-daemon --start --background \
+	    --pidfile /var/run/munin-asyncd.pid --make-pidfile \
+	    --exec /usr/libexec/munin/munin-asyncd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Munin node"
+	start-stop-daemon --stop --pidfile /var/run/munin-asyncd.pid
+	eend $?
+}
+
+# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-2.0.4-r1.ebuild b/net-analyzer/munin/munin-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..cc1225dcc99b
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.4-r1.ebuild
@@ -0,0 +1,255 @@
+# 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.4-r1.ebuild,v 1.1 2012/08/06 14:53:31 flameeyes Exp $
+
+EAPI=4
+
+PATCHSET=4
+
+inherit eutils user java-pkg-opt-2
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi ipv6 syslog ipmi http"
+REQUIRED_USE="cgi? ( !minimal )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="dev-lang/perl
+			sys-process/procps
+			asterisk? ( dev-perl/Net-Telnet )
+			irc? ( dev-perl/Net-IRC )
+			mysql? ( virtual/mysql
+					 dev-perl/Cache-Cache
+					 dev-perl/DBD-mysql )
+			ssl? ( dev-perl/Net-SSLeay )
+			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
+			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
+			dev-perl/File-Copy-Recursive
+			dev-perl/Log-Log4perl
+			dev-perl/Net-CIDR
+			dev-perl/Net-Netmask
+			dev-perl/Net-SNMP
+			dev-perl/net-server[ipv6(-)?]
+			virtual/perl-Digest-MD5
+			virtual/perl-Getopt-Long
+			virtual/perl-MIME-Base64
+			virtual/perl-Storable
+			virtual/perl-Text-Balanced
+			virtual/perl-Time-HiRes
+			!minimal? (
+				dev-perl/HTML-Template
+				dev-perl/IO-Socket-INET6
+				>=net-analyzer/rrdtool-1.3[perl]
+			)"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	virtual/perl-Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		java? ( >=virtual/jre-1.5 )
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/patches/*.patch
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/var/www/localhost/cgi-bin'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	cat - >> "${S}"/Makefile.config <<EOF
+PREFIX=\$(DESTDIR)/usr
+CONFDIR=\$(DESTDIR)/etc/munin
+DOCDIR=${T}/useless/doc
+MANDIR=\$(PREFIX)/share/man
+LIBDIR=\$(PREFIX)/libexec/munin
+HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+CGIDIR=${cgidir}
+DBDIR=\$(DESTDIR)/var/lib/munin
+SPOOLDIR=\$(DESTDIR)/var/spool/munin
+LOGDIR=\$(DESTDIR)/var/log/munin
+PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+JCVALID=$(usex java yes no)
+EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin/
+		/var/lib/munin/plugin-state/
+		/var/spool/munin/
+		/etc/munin/plugin-conf.d/
+		/etc/munin/plugins/"
+	keepdir ${dirs}
+	fowners munin:munin ${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"
+	use minimal || install_targets=install
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 DESTDIR="${D}" ${install_targets}
+
+	# remove the plugins for non-Gentoo package managers
+	rm "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.2 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init munin-asyncd
+
+	dodoc README ChangeLog INSTALL build/resources/apache*
+
+	# bug 254968
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/logrotate.d-munin munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	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
+
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+		else
+			sed -i -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' "${D}"/etc/munin/munin.conf || die
+		fi
+
+		dodir /usr/share/${PN}
+		cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
+# Force the shell to bash
+SHELL=/bin/bash
+# Mail reports to root@, not munin@
+MAILTO=root
+
+# This runs the munin task every 5 minutes.
+*/5	* * * *		/usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#*/1 * * * *		/usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#*/2 * * * *		/usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+## Update HTML pages every 15 minutes
+#*/15 * * * *		nice /usr/libexec/munin/munin-html
+EOF
+
+		cat - >> "${D}"/usr/share/${PN}/fcrontab <<EOF
+# Mail reports to root@, not munin@, only execute one at a time
+!mailto(root),serial(true)
+
+# This runs the munin task every 5 minutes.
+@ 5		/usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#@ 1	/usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#@ 2	/usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#@ 5	nice /usr/libexec/munin/munin-graph
+## Update HTML pages every 15 minutes
+#@ 15	nice /usr/libexec/munin/munin-html
+EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
+	if ! use minimal; then
+		elog "To have munin's cronjob automatically configured for you if this is"
+		elog "your munin master installation, please:"
+		elog "emerge --config net-analyzer/munin"
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+}