Revert change to init script; revbump to make sure nobody is using that (will break your /run), and also add proper support for nsca notifications, which is included upstream for 2.0.8.

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

5 files changed, 31 insertions, 322 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index e0c2d16b891e..8d17bcbe80b6 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.106 2012/10/03 02:12:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.107 2012/10/04 17:18:27 flameeyes Exp $
+
+*munin-2.0.7-r1 (04 Oct 2012)
+
+  04 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-2.0.7-r1.ebuild,
+  -munin-2.0.6.ebuild, -munin-2.0.7.ebuild, files/munin-node_init.d_2.0.5:
+  Revert change to init script; revbump to make sure nobody is using that (will
+  break your /run), and also add proper support for nsca notifications, which is
+  included upstream for 2.0.8.
 
   03 Oct 2012; Robin H. Johnson <robbat2@gentoo.org>
   files/munin-node_init.d_2.0.5:
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index cf8bc403bdba..3822f22e2092 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX localstart-munin 94 SHA256 e78cf5a383501a6be56ec4ddbbafa82a715ce76088a3d66e9474b91792ff67dd SHA512 2af51792006acc73aaa39632a76f91938511166db41a28d3fd4353c5c4dee86f2e292d86c04fd6bdbde4c210676e6a2b8d91c7c27b5f1921e362f171d79e6ddf WHIRLPOOL 180594f1860f4a19643ea1136be97b71c1cb0a7d1f19e5c4796f36ddef39fbb3c30053319e49a7f2d272e5c097016eec3de99cf7940f15956ee8a7b663d00a74
 AUX logrotate.d-munin 386 SHA256 42bcc50a21e72d9b68df4fad2f1016587f7b033301de754cf956a4d5789ffbea SHA512 6781be81ab473464647ff8a5961a43892fde2558bbad18c70c9d3c7e8a0ed8521db7faab3a56ae7dfa382a95e8ec64909fc6af9d2f2c200ee981784431400e2e WHIRLPOOL 6efa2e81b655d40555e4150fcb0235b275b7fab3b50f88ac2183b2b9f6e4b14541f872eff7935b29f01a64762d5ee5d0c1c9c71da1f8dd48aab7ae893030cede
 AUX munin-1.3.2-plugins.conf 1764 SHA256 cc562d1839812a32b1c0c1d8574f1f5b3395da56d745a91309f31a29bd9624be SHA512 7c791052c6f7e25a3dc056aa95852fffed9083b7e99eb0f6c1d7fd8bc23d76e56a9e05790742728fcd20ebe001c47c3df55382a1965ccb18d227b18c99977362 WHIRLPOOL 52131ba7b5c268ab16fa5b8d3536a43bb6b322e8e02707e58d4186216e73b9c3c048ec02610351cee9ca4777834e8bcf1d90488466aa0790682edec228c32f02
@@ -14,17 +17,25 @@ 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 882 SHA256 861021ac13faddbfcec737c9c299e8c2fcc541867ce2bf5657208253c86159a4 SHA512 b73f949909e9e4c2768e34b8e9018584d08a95c8aecfd2b1ca4e3fa91df55ab8f2ed1e2faf9951bad038d58380fabaa479c3febfaa5ec2bb5c62a33099b76eb1 WHIRLPOOL 1cd439329f8071bbb5c0fcaf27190f93d6fd4531ebe76336bacf7e70ac06a35072bc6abc55817917c74608fb89edf374e55668b8a8891552460758023ba8cd03
+AUX munin-node_init.d_2.0.5 869 SHA256 9fea23a7d20e8bff50e9ef8dc41e4c9eaff50c5837f7d8e129cd57701c0fb464 SHA512 a890d5f7adc1d2c1577b4e4f868bab046eef25fd22c829cbda093dc20bd1a41df4bb6da0ffce0d71f6d9d8e0b5612e6ab1be691768824dd3793a2cc44dab64be WHIRLPOOL 6823abef0137268c60b755f642286d825205afde12da72ddda7a2044f687d88860ed3701d81a7c209aeaa80b2e1b4e39ec109953172fcb4037dbe23d88beb22e
 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.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
-DIST munin-2.0.6-patches-1.tar.xz 7832 SHA256 02e0447dcae8c234841c89b1d6cec6b28dda00b2370f05c01a37b63c129af5a1 SHA512 c08e16794444e03ac820d2a1857acb85dcbbe6b556a9af454ea9c867f27b84f8b7d9f33b803c33c370a6a9c3db3807d73c7afc5fce6cd847dde4625d1c1db313 WHIRLPOOL de89a1959c2e0de4ab558270329024e93cf153783f152c80adbb7b193ef8595fa3d3fa9d4249b115ef2eedf1b8122109fe141d3f01febfa3d627293d4d5d3415
-DIST munin-2.0.6.tar.gz 1325754 SHA256 ff99a3c36156adb6b867bb684ec508a857728336c0b81a93955bbcc9d5045ea6 SHA512 5b2ee05a2383dc1e636162cdb9102667976c8dfdbc89c956dc686db3f7b28c1cf0ca7d0c67f8e20f6c5dc0c2e69274c19980e8c63ef2f2fca38d3066b7498dff WHIRLPOOL 1316f7a6bc9eba9a4570652e571bff272dc8b0298ce4dfdbd2d959b8462c4a42a0e19332de59a5b2eae7669ae6e420b0e4945c0418dd383c171a142fa4cfdd64
-DIST munin-2.0.7-patches-1.tar.xz 6748 SHA256 287c04be02b07b16528eca12baeffa14b6c478376d21bed67e8d980ab72796de SHA512 c770448e98663aa89ba290517c2a21467588427c1ea7110795fbc850756e83388dc5e62eb4e107d15d0cdcf56083c1a0176e48782673c91eb44928671191e788 WHIRLPOOL 2aa2885889dd4626fe13de5334f4d6ee2695493daaaa8f86dd6a384dd964da122fb2dd9382283fec283296283a031952b12af74f8a515c1033c4c2ad339166cb
+DIST munin-2.0.7-patches-2.tar.xz 2392 SHA256 e439c3e019b64e71624b57c52d5716269829b742ab65b99ad7a573c812c4cf13 SHA512 4964b1ad3414e7f15f0b4931b3a34a1d7475385fa49f994c5a583baab1fe03069dbab0fd00d21bb007437e447b0bcccf60f17d4f98aacbbbe2f7f68effff8773 WHIRLPOOL 3f0fbec29b28ed926fb826b5aa66db328a5906631719e931098ea235eb991ee57ca8780a2aba44850564adba50826b25961b9081fda15c86a69faeff3033f27f
 DIST munin-2.0.7.tar.gz 1326773 SHA256 3daf42722ebd74a6269aa290b9f5821e2206df7b0fd6a39876863ff1a9b50c2e SHA512 51bf57fd5d8bdd92c091548dda540af6b355c8fe821db06ba92eb7402b623afcac570b3e1e0816580e6ec962a791835dd845734207556731636003d01b492c3f WHIRLPOOL bfc9de2ec0421ba66109ca77396a35bdf9c7ef6bd82dad1fe1c05144d79d0d9c923a641feca5d78e566015561172704898c1ec3a57da49d67492e335439ef982
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-2.0.5-r1.ebuild 7562 SHA256 2eed40d2d81907b4d6347ecaa9d20ae4c858c4e7c6f353051e1576afaf6b4b2f SHA512 e7d5339acf39f39e50df7f92541767643e1f76be4564bdfcb5b3bc1ed4170f80a3f153cd5994e6b559761b22cd4015e64c2671aa9b76244df07d3f76aaf0fa08 WHIRLPOOL a40a3688837c018a486af91ca20e6841a3b17afa4991f6e40d784c45c99ed6fbcced7d0bdfac187882f3d147a0be00b1c60a282e05a6b1becd82288a13f6ee63
-EBUILD munin-2.0.6.ebuild 9351 SHA256 16192827a5e0e2116897a1ef3a0546a6880c8c93a5ca98fc02e9cdc0871c66e9 SHA512 694b14c0b8d82ea9cce3fd42ea2a584f3548a7b8a24d9b65b150722276dadffa5f096e5ed2d4bc33ffa5315b80d010b78e12f842580762eae640a61dd93a1f20 WHIRLPOOL ef820af8a07c0e7a1ce1a405c2042182ce65198467008e6fae2710172f15f60ae6babbbef3a12e6208fa15007c6c93977271d6227ae89daef6671c65cc434f8e
-EBUILD munin-2.0.7.ebuild 9327 SHA256 4cd0901b340139a8cb001f835fd6c40d4b9ccc322f3a8dcbcdbb0cca003742eb SHA512 d88a868286af7d90b6e49ec15b7f8b7c45374843fcfae7d148df074ff5bb260f3a28b780a928c9c2f7443b2b68565e669ba51828284785d89d11045b3ec82b13 WHIRLPOOL 4ded09e007606bd6f4cbb95bb5485f4b298683838a9283ebed91b4d9e67a839b5cfc5333de540cd406629d4e83ed16be27811ee590fb2b3b7e32a0832fe8fa4d
-MISC ChangeLog 23024 SHA256 62e454374efa76b648966a3183735853070088cedb9a41c78a9201bc806068a4 SHA512 d3a6e50fdebecbf4a84e0c8697b7ff0bba831042d8cca3c8483d0c07f88b571e39be4ab784a08eb2afa74e33186e504758d3dfe4b837ec1f7066f779282be833 WHIRLPOOL 5e9133978780a722866416f7a94e3ebfe4cb381203b1c71fafa1999f458de4d871dd8886f52b31d08f481f19a006bbef659ac07add26c44cf5e85b92eaeee7da
+EBUILD munin-2.0.7-r1.ebuild 9330 SHA256 7fc8499c29daade3d1c511095393cf88c8d3b44e4377103f8eca680346696e13 SHA512 72d9af85fc318494acfc70c8ac919c650eefd9a65ee05b29984bbf121bd4be5dc4d256cd1ff051a21350a3eed6dfddd07633d38eed1e79f1434549dc996f18ad WHIRLPOOL 05b6db33c41e4c6361f13d19f44761e8c4cee00bbb3c56e011936264fbcb1c07e8903f3c3b908a024e4c26ce07577c686d4b69335190948e8e4d4bf2ca604b87
+MISC ChangeLog 23405 SHA256 f096c013f48c35aa221217c19a619dd12fe6bca958528870ba52585cafd97c8a SHA512 adc46d50fe043825447f230231fdce82195cd03e147e4cdf76082da72841eaf9e637f3626751a8d24011e8436e60110e30dfb9609f03060133c65bb614a8d483 WHIRLPOOL 41df41bd62c361374253bc855a9e2967b83b5626f38c6327c5a2b10f4409d4870538d247173bc74766baa14313511205240fe50c9db9b65271992cd128d40691
 MISC metadata.xml 3414 SHA256 ae5d3fc5489e8fd93e8acd554316d5f135f660799931dbc6b842daf21faa0527 SHA512 5921d816402e7ce6611473ccdadb8ca74997c977e9586ab776a34e5db13666da04c027ceb11abac6b366c0f04443f14d153b5cbd00b16b8d1c7cf034bd1c5813 WHIRLPOOL bc34d81204a6c2cb4b3f13f0ccb3bc200af149cbf0909582769639d1ead619a1157a1b5d4d0dab6060b9d6e5c137112e8faf3ab5e4c49f72f1686e73df856541
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQbcUAAAoJEBzRPIrUMBNCEW8H/RwRzyO9aPW2vniwP9m7EdA/
+SDGX/YooZtC25KPb1OcT5e4cuVzneYS7K9FAEZd1AXwhyFvhD2oTgq+rvLqrJXXk
+HD0R4IDVAziG0VAd3RGbLE2cBqaRVBH4MqZPInEopKpS14Zq7kYg9T/Bj042f/0l
+IbdyaCzOhkqeVOYSRvQqjvTImKA6Lg7KMMwZigIzHyvYEUlceBlDlwpCAcar38uO
+YtUfjQIFWUs0sVyjTLtjQD3buPbphvgqtvtSjY6Pzx2Vs1Oqn3xrbyyGfOIVKU5n
+M/kS4PgySUBBLQT/bNrZtoiYgzQnhSlGGhmw0+mv6Xub6tvGKwEbD6gh+K7sMXo=
+=HFBf
+-----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 26fda2d80878..2dc6c516de01 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.5 2012/10/03 02:12:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_2.0.5,v 1.6 2012/10/04 17:18:27 flameeyes Exp $
 
 get_munin_config() {
 	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
@@ -26,7 +26,7 @@ depend() {
 }
 
 start_pre() {
-    checkpath -o munin:munin -d $(dirname ${pidfile})
+    checkpath -d $(dirname ${pidfile})
 }
 
 reload() {
diff --git a/net-analyzer/munin/munin-2.0.6.ebuild b/net-analyzer/munin/munin-2.0.6.ebuild
deleted file mode 100644
index c3c73bde3086..000000000000
--- a/net-analyzer/munin/munin-2.0.6.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# 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.3 2012/10/02 21:04:14 flameeyes Exp $
-
-EAPI=4
-
-PATCHSET=1
-
-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 ~ppc ~x86"
-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!
-# 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 )
-			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
-			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
-				dev-perl/URI
-				>=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}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat6 net-analyzer/netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/true /var/lib/munin-async
-	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-async
-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
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	local install_targets="install-common-prime install-node-prime install-plugins-prime"
-	use java && install_targets+=" install-plugins-java"
-
-	use minimal || install_targets=install
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	# 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.5 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 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
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/var/run/munin/munin-node.pid:/var/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/lib/munin-async/.ssh /var/spool/munin-async
-	touch "${D}"/var/lib/munin-async/.ssh/authorized_keys
-	fowners munin-async /var/lib/munin-async/.ssh/{,authorized_keys}
-	fperms 0700 /var/lib/munin-async/.ssh /var/spool/munin-async
-	fperms 0600 /var/lib/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		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
-
-		keepdir /var/lib/munin/.ssh
-		cat - >> "${D}"/var/lib/munin/.ssh/config <<EOF
-IdentityFile /var/lib/munin/.ssh/id_ecdsa
-IdentityFile /var/lib/munin/.ssh/id_rsa
-EOF
-
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		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
-
-	ebegin "Setting up cron ..."
-	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
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa -f /var/lib/munin/.ssh/id_rsa -N '' -C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa -f /var/lib/munin/.ssh/id_ecdsa -N '' -C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-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."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	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"
-}
diff --git a/net-analyzer/munin/munin-2.0.7.ebuild b/net-analyzer/munin/munin-2.0.7-r1.ebuild
index 64d94756efdd..3ad446a8cc17 100644
--- a/net-analyzer/munin/munin-2.0.7.ebuild
+++ b/net-analyzer/munin/munin-2.0.7-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.7.ebuild,v 1.1 2012/10/03 01:30:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r1.ebuild,v 1.1 2012/10/04 17:18:27 flameeyes Exp $
 
 EAPI=4
 
-PATCHSET=1
+PATCHSET=2
 
 inherit eutils user java-pkg-opt-2