Backport 2.0.x changes to the ebuild to 1.4.7 (and use a patchset tarball); re-sync a few things lost in 2.0.x; cleanup old ebuilds and files.

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

10 files changed, 77 insertions, 550 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 51b4c4040267..e16c7a510f6f 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,16 @@
 # 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.81 2012/07/25 03:01:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.82 2012/07/25 03:32:29 flameeyes Exp $
+
+*munin-1.4.7-r2 (25 Jul 2012)
+
+  25 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-1.4.7-r2.ebuild,
+  -files/munin-1.4.7-munin-version-identifier.patch,
+  -files/munin-node_conf.d_1.4.5-r3, -files/munin-node_init.d_1.4.5-r3,
+  -files/munin-node_init.d_1.4.7, -munin-1.4.7-r1.ebuild, -munin-1.4.7.ebuild,
+  -munin-2.0.2-r2.ebuild, munin-2.0.3.ebuild:
+  Backport 2.0.x changes to the ebuild to 1.4.7 (and use a patchset tarball);
+  re-sync a few things lost in 2.0.x; cleanup old ebuilds and files.
 
 *munin-2.0.3 (25 Jul 2012)
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index ac38a56287c3..8470a17f5d99 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -12,34 +12,27 @@ 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-1.4.7-munin-version-identifier.patch 1134 SHA256 b58ac1b7ddbd999ceb2163cf140afc28e2c1956ff3e88004eeaf93856f920d1c SHA512 fc27ed31b40db1ed834944c6b182c9df06ebd9a65685189d45fb837ef3fbc51b4096eb560818dafa40b1afdd88d78b3b9479548054258e9a9413c8d3e60429aa WHIRLPOOL f941b503ce78d966b3e10dc39fa4cd6ad8368d02435da2dec3e6d7a500ee537245d46cc3f54ca4532eb52b45714e1edbec15ec051abf956981b4daeac33f28cc
-AUX munin-node_conf.d_1.4.5-r3 398 SHA256 1599bf39d048f8330403d14b43dbc839cb7dfe2e4bc7531f52b4af9d00afd6d0 SHA512 5a0952ef47069e570e1efbfe65bab7f14fc5525ed840607e7df69d6a8bf8ce17a823574048a50b62986e961e1e0bdd34cafc6035fc52afd0b908eb43312052cf WHIRLPOOL aa712455eabd66a5a778fab11424d7ce1d0a1818fe3a50f6e3d59931b281369167ebdf2e3bc1b13060ef019b25a5cf9f3ccdf9606c72d733c5f5baa3919ee894
 AUX munin-node_conf.d_1.4.6-r2 316 SHA256 cf250f39eae1ee564f51cd99ec20510accb8a68d59469893c5f6c474263f5b50 SHA512 07289596eb2f28c37210e5ffe68e81ad16ecdb945e1e61461a409e70d8779a6a0774eae1aaf50d3e7e4c38b366de1585bdfe01132836be85f836064db12e715e WHIRLPOOL 27c1c2858f86cc1e8b50977c91cb43bcf4dc67017195419f48daa8e7a4224b6ec0d60e4b4a1d6d88da31f2ba8aacda79331aa77cdca440a99ee54a0ff4e87b31
-AUX munin-node_init.d_1.4.5-r3 773 SHA256 2352ad981f1356bffe8d8b7a578a621e66493f3d727e7e534aa52ee59bf40b8b SHA512 4f7546d4018f5ec805e5072d3318e97a7548417cb4c5f4066f4a965a8026ba62bdea5976bea02229e58bc6d3715b89c8dc9379b98e4eed0560dafb1b927bcc1f WHIRLPOOL 234403c37611eab36f2e2901876589e95b3cc7b6438251683793c2caa7b28d7aaf9f9479e3a2f42c0e46f604f0f108f86494cac8cec031019123a547be20ff40
 AUX munin-node_init.d_1.4.6-r2 957 SHA256 78cbeff21fc98767775f7ff2c75b4b7096d878aaff26d215789ae5b9fa01e818 SHA512 66b5cc7178f4f6d58bf7101b7c53d356987188c3145384d5bb1b4d4726c1b4993f3742161d2f4166012f2d6084995f4ff9316ab46907cff9398b4701d8d87ef8 WHIRLPOOL 0521ecac81ae6cb29f6f12db57549102e069464b922a77077874e0a31796f6effd66456f37ed714e831269fc125127dd0097ddb3b83ffd7f8dac5a2072c28a55
-AUX munin-node_init.d_1.4.7 1114 SHA256 dc1a02c288d7f55a898baba4c1bd3294fe5775948698abcab1a3d9cfeef3b3bd SHA512 80f8aec27542e9779195b87563844397bdcf73906697696a2c6cd09a1ba01486d83ff42caee860ee8b3b5440f6acbf6b9bd3e14672e5b8f3dad3f34b5a634c55 WHIRLPOOL ba400ec3f20d385475b97519d09c99288d3ef8fe1f110768d32b276a280d8fb63cd9eadf64bc5228eeea0cff2b685ffc602b982179c2c68b9877c8611f1b3718
 AUX munin-node_init.d_2.0.2 946 SHA256 56873af410a42f27b8e69230f0b0f6bf55e714e924f133c4cb00919d8827ab29 SHA512 48278f67bd45f196c301d2a60547f4add8ca09bf5ecdea83a97b2805a5476e251265544b197bee65c7972960a8c36aa28d6781794c9c6f734372eb10f61b5264 WHIRLPOOL 3c6a8670038490ab2980468387e683f60727b44bed1eb6087eab2bbb78c37a07a3b8a1580e8935f14bfd7fe75d8dceb46712902de65cf3d60b6aed807e032850
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
+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.2-patches-11.tar.bz2 7444 SHA256 8139fadd28fd6735147ce337ed026426ca032628b1c66dd2b03bad7383cbcfdd SHA512 4aa20d3d433986dd6a2df712a6ae1c2c5f69c402119224b2d0391266b8d5019c9ed2ad4c6dbf429ca8f2061b8e73a5f8638607a6dd414091385c781f6d780c0b WHIRLPOOL eb02db0ce41f57f9f48f6885c2b14dada48a13cb545cecc078ce71ac72a07bcb54f3bc7d22b58899e9470808b07449715ab01f4db92de4445c7855850501159b
-DIST munin-2.0.2.tar.gz 1305391 SHA256 e8a5266a85cde8b89a97fb7463a56a7ac9c038035b952e36047b7d599bb9181b SHA512 db53591b1b653a5373e40899627b24e4bf12e11f71a5922c833e35ec2625e38ee1f08067317954a37dc2d342de0727182a455b682eea1388f2ddd87baa9d677c WHIRLPOOL 10851e9a2be0052a314d6756dca84da87c93ceb3037a8bffa1829899d94ca602be13b37400777add2e999aa163340d2ba9536e88a13c6ca64b8592fa5ad88b49
 DIST munin-2.0.3-patches-1.tar.xz 2164 SHA256 8a04fcf76d83a2c20e1be5214ada07f624fb30e578831e40b563edeba150c3dd SHA512 938d3caca93cae9b99141a1309b302b67ce9382de96991b1a27b018241f3306d23bee6873e55049d3b8a84ca0eabeca72f66f71916bcd26d0749a2553b45daf6 WHIRLPOOL 95b048cb2b87cb94e74bcbf3734305565908a844f8ded939eea4b2c66b1014aa007f57259bfae4b51a2854b19dc93ee74f55b08e9042e4c47c3926ffea771259
 DIST munin-2.0.3.tar.gz 1318352 SHA256 ed22871f03a3c65b8a0324af686fddaac8cc94a95a959e753ef211752429e7db SHA512 ea182846ff5399c22e625b2bb021507138ce97d460edc499ca4322a132a9ac25dacb5b142766a54eb569f73f77d0ca6b12a088986729d548f89f812ec3c12ab1 WHIRLPOOL 9dbb442b332de495f8876d7f7a4ec81cd55e6cf7bb3e0509904d4c96d5334e0362cc98e4e253633d8e7b29197168cd237578fbd0dbe9f43548c5c1230cf895cc
 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 6440 SHA256 2e6a359e4fafc124d9d05a4e261d3dcf6daf64d9dfee15949b388307a5efd4ac SHA512 cec86e5255e3c574acf5b4abf5e12af9f6f72ee79e9c53d50325356b7500880425fc9e1d0ba9079a6ebeb12728fda10a0b8d81f9f3c9898df4cfc2bfa36fa549 WHIRLPOOL 214ec9ba17c21e5e91ff84af4c3b5dc0cf878deddb723ec64e65e2e2360057bee292d56e9f92503fbcdfb515f9392ca903247a47392adb6f1ad394bbe8ed1e5e
-EBUILD munin-2.0.3.ebuild 6556 SHA256 705fd0a4c4f5e97f6a69d620c45531ee1a4c2a34fe0846aefe234f5e95ca2070 SHA512 e1f7991a62aaccf1a522a6ffdce123dca9950ff250ca6a4c7c865c17aa08cfbd9f035a42329b819bf0460d07889d9b0c813746504b8a44526fd44ba5057fe6dd WHIRLPOOL f1420ad5b3b8734740d2f6944e7df478fbdcfde61aa703a39c320d86676f270e565c93983ba762d2b1114d9d6b34613522c8a41120ba87dbbe5f372e0db84b21
-MISC ChangeLog 16957 SHA256 752231264340c0a7036401588def8d80a2f99058ff0cbf39c1647147922807b5 SHA512 018514df3393958cc2cd976eb1709e0555814573a3ab6471d17603ad91fa6d550cd457c3228e62ad10cf43cf6d86c39f07fd0fc38014e3616a4aa141ae9c9bae WHIRLPOOL 2dcd2bcb10c7d7d2aeb21b4935c9a57cf486ef2d970d9ec4f06ab400d46a3f9fe63097461c82537146fff1c57e6463be36f03defa5047c40789b0a389f13627e
+EBUILD munin-1.4.7-r2.ebuild 5642 SHA256 3a8e691bf3d15341c936f4d0b9a31d35d8448498caaf26e6d05ab82c21aeab52 SHA512 a69633abf9aed81ce6f0854d5288d37e63abf404207e6f51851e73997bff2ceb2711d64158a999006aa398da2a83ee00e80cbc26c1d1063008e4b58e15f70e97 WHIRLPOOL f8e4f77b02b603a962d20ffda56e7364f61fe43858ac4b06d53e349af683dabc400d0e9428cb5eff05e4a127d77737319df3118a4d1d8356abe75c45721c3368
+EBUILD munin-2.0.3.ebuild 6684 SHA256 d2a0080d3561aabf584bd888dd6df32b4c6e3bfa6ea117fd804746655bd036b4 SHA512 9030933c0499c3a4e8962d3dc42834985a8f851f7db38639ff374cbe62fe8fd6e2e180b3b00b2dc49d26bc1b0677df81e98381e8d26ea235d67f701e47e369c0 WHIRLPOOL c400ad46e94f517fd96ef6c4a77160d0fb12ad4f9b0d84828f0e0c06a9b9a3005d2cd135ff5973262cf7082ff1aa361c92bda672fbda2fc57a743460973fa64e
+MISC ChangeLog 17466 SHA256 8fc87f3604ea0e889a24a49e55d04e3de6a54655b179f3d228c357faf8259180 SHA512 46ae4d51bbfe6b9cf17635f7fe6bc67f5f3895110c9a823acbe22c820498b7679408a6c986851dba2a9fc3caf4f129e56c6f3b90790431ed26db99f7e5088dba WHIRLPOOL d2068b4c58914fd09314d95050232737c3b6d0022bdd5754ff3e6abcc5dbd2892c92e80377a8e19eafe10ffa24695cd3a8f38ec5b0c2c8a6540da61e9e915aef
 MISC metadata.xml 2891 SHA256 9b220edfe815c86a35ba10741444c18c55dbfbb1acc8c7a5730d44d96fb7d4f8 SHA512 32a29c774648c03c6ab45649af066d8a3134ef34716134253fb901094593ca0461493a321bfb96569642cca28ed284e9e09f02ae3275c9bb61211e47a38345df WHIRLPOOL 1d29ded3e2cbc85684255127744b9e1f8a5afb5d03110cd9b209bae4d6231eca56218cf4e82864228130c939d6c694b27dd5d3574e0c3a8544112b8a0383fdfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQD2NeAAoJEBzRPIrUMBNCslcH/15dGRVIfRNiZqJ9xedhC2/d
-/G1YDsOzS0VDrhlfz9oUWf0CyxHUeiEqveRubQTjlL5GBpaxiWj/T68KT3skeR/P
-oOk2oHVM7MdkPC3/56EL7PGR2WYTxkvORNJLdvPJL9CQTEwa6CcBtvH+jav6pqKT
-8mwPhxVpjSvRLPnd3EZddbJVxyvvH547gBKtMKkVDotYMEYfl3BOadRQX2BbHYcU
-50TF6v7niTYmzgXq/EqhhZP0ilgqFN2+AI90GCNm9ge3FCQm5ObQstfTco8rafE6
-Rv3Nie6Dr7tVA0nrh/vr6TEeaFr3aelz2ldNOMs1XxI9kP8IrrRVkXeHx5Ilc4E=
-=zitB
+iQEcBAEBCAAGBQJQD2jZAAoJEBzRPIrUMBNCVDgH/iV1XActkprDZnw4Ih/uzi2H
+Dv2sOYZv4wyfwBxHOKPybY0XjwQCfl7r98yKspbT649CNqqdMzHU/RWbHdhXn8tq
+391e9NIS9WOq1FksP3pgfKXzzGoIsQNpVmiwPWAx2X/LnzeVEvO+R6C1C+MBSkVo
+1eIIO8GkmuwyGiIaEAzdKudXgE+2xzJiEFROcDaL66jlX3oqxD4w7sALpj7V48jr
+fhmcSbdfK3wXZdExBvcU0D6JKZJnAXRPP9KnufrXI8MjRdFeixy8/jEICuueet+m
+Y8jVSg/Zk8kUwnWfOuCC5m7BXeKs2uv1RT+jKgg1IWmTgA3aAvinxGMAFYO378E=
+=ReGU
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch b/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch
deleted file mode 100644
index 22c4d730aa28..000000000000
--- a/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 480f78e713b9e9a425ad425342afac70420a4043 Mon Sep 17 00:00:00 2001
-From: Jeremy Olexa <darkside@gentoo.org>
-Date: Wed, 18 Apr 2012 16:30:57 +0000
-Subject: [PATCH] Fix warnings from previous patch
-
-Use of uninitialized value $Munin::Common::Defaults::MUNIN_VERSION in
-sprintf at /etc/munin/plugins/nginx_status line 110.
----
- plugins/node.d/nginx_request.in |    2 ++
- plugins/node.d/nginx_status.in  |    2 ++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/node.d/nginx_request.in b/plugins/node.d/nginx_request.in
-index 402ce54..d3933e1 100644
---- a/plugins/node.d/nginx_request.in
-+++ b/plugins/node.d/nginx_request.in
-@@ -55,6 +55,8 @@ license.  Munin is GPLv2 licensed.
- 
- =cut
- 
-+use Munin::Plugin;
-+
- my $ret = undef;
- 
- if (! eval "require LWP::UserAgent;"){
-diff --git a/plugins/node.d/nginx_status.in b/plugins/node.d/nginx_status.in
-index 0d5d966..a427fc0 100644
---- a/plugins/node.d/nginx_status.in
-+++ b/plugins/node.d/nginx_status.in
-@@ -55,6 +55,8 @@ license.  Munin is GPLv2 licensed.
- 
- =cut
- 
-+use Munin::Plugin;
-+
- my $ret = undef;
- 
- if (! eval "require LWP::UserAgent;"){
--- 
-1.7.3.4
-
diff --git a/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3 b/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3
deleted file mode 100644
index 39df4369441c..000000000000
--- a/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3,v 1.1 2011/03/22 08:37:04 robbat2 Exp $
-
-# Set to the nice level for daemon
-NICE_LEVEL=1
-PIDFILE=$(/usr/bin/awk '/^pid_file/{s=$2}END{print s}' /etc/munin/munin-node.conf)
-
-# vim: filetype=gentoo-conf-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3 b/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3
deleted file mode 100644
index 5853c54c5100..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 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_1.4.5-r3,v 1.2 2011/04/03 22:15:50 flameeyes Exp $
-
-[ -z "${NAME}" ] && NAME="munin-node"
-[ -z "${PIDFILE}" ] && PIDFILE=/var/run/munin/$NAME.pid
-
-depend() {
-	need net
-	before cron
-}
-
-start() {
-	local piddir=$(dirname ${PIDFILE})
-	[ -d ${piddir} ] || mkdir -p ${piddir}
-
-	NICE_LEVEL="${NICE_LEVEL:-0}"
-	ebegin "Starting $NAME"
-	start-stop-daemon --quiet --nicelevel $NICE_LEVEL --start --pidfile $PIDFILE --exec /usr/sbin/$NAME
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $NAME"
-	start-stop-daemon --quiet --stop --pidfile $PIDFILE
-	eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_1.4.7 b/net-analyzer/munin/files/munin-node_init.d_1.4.7
deleted file mode 100644
index 202a940402e7..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_1.4.7
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/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_1.4.7,v 1.1 2012/07/07 07:21:50 jlec Exp $
-
-get_munin_config() {
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-: ${NAME:="munin-node"}
-: ${CFGFILE:=/etc/munin/munin-node.conf}
-: ${PIDFILE:=$(get_munin_config pid_file)}
-: ${NICE_LEVEL:=0}
-
-fix_dirs() {
-	local rundir piddir
-	piddir=$(dirname ${PIDFILE})
-	rundir="/var/run/munin/plugin-state	/var/run/munin/spool"
-	for dir in ${piddir} ${rundir}; do
-		[ -d ${dir} ] || mkdir -p ${dir}
-		chown munin:munin ${dir}
-	done
-}
-
-depend() {
-	config "$CFGFILE"
-
-	need net
-	before cron
-
-	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
-		use logger
-}
-
-start() {
-	fix_dirs
-
-	ebegin "Starting $NAME"
-	start-stop-daemon --nicelevel $NICE_LEVEL --start --pidfile $PIDFILE --exec /usr/sbin/$NAME -- \
-		--config "$CFGFILE"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $NAME"
-	start-stop-daemon --stop --pidfile $PIDFILE
-	eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-1.4.7-r1.ebuild b/net-analyzer/munin/munin-1.4.7-r1.ebuild
deleted file mode 100644
index b73a7cd0bedb..000000000000
--- a/net-analyzer/munin/munin-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,157 +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-1.4.7-r1.ebuild,v 1.1 2012/07/07 07:21:50 jlec Exp $
-
-EAPI=2
-
-inherit eutils user
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="asterisk doc irc java memcached minimal mysql postgres ssl"
-
-# 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.
-DEPEND_COM="dev-lang/perl
-			sys-process/procps
-			asterisk? ( dev-perl/Net-Telnet )
-			irc? ( dev-perl/Net-IRC )
-			java? ( >=virtual/jdk-1.5 )
-			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 )
-			dev-perl/DateManip
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
-			dev-perl/net-server
-			dev-perl/DBI
-			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
-						net-analyzer/rrdtool[perl]
-						dev-perl/Log-Log4perl )"
-			# Sybase isn't supported in Gentoo
-			#munin-sybase? (	 dev-perl/DBD-Sybase )
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_prepare() {
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
-
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-temp.patch
-	epatch "${FILESDIR}"/${PN}-1.4.*-munin-version-identifier.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-fix-asterisk-plugins.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-if_-hardened-v2.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-multi.patch
-
-	# Don't build java plugins if not requested via USE.
-	if ! use java; then
-		# sed is needed so the java plugins aren't automagically built.
-		sed -i -e 's: build-plugins-java : :' \
-			-e 's: install-plugins-java : :' Makefile || die
-	fi
-
-	# Bug 304447, fix for gentoo PS location
-	sed -i -e 's,/usr/bin/ps,/bin/ps,g' \
-		"${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die
-
-	# bug 367785, cleanup make output by disabling HP-UX cruft
-	sed -i -e "/plugins\/\*\.adv/d" Makefile || die
-}
-
-src_compile() {
-	emake -j 1 build build-man || die "build/build-man failed"
-	if use doc; then
-		emake -j 1 build-doc || die "build-doc failed"
-	fi
-
-	#Ensure TLS is disabled if built without SSL
-	if ! use ssl; then
-		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
-			|| die "Fixing munin-node.conf Failed!"
-		echo "tls disabled" >> ${S}/build/master/munin.conf \
-			|| die "Fixing munin.conf Failed!"
-	fi
-
-}
-
-src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/spool/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	if use minimal; then
-		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
-			install-plugins-prime || die "install failed"
-	else
-		emake -j 1 DESTDIR="${D}" install || die "install failed"
-	fi
-	fowners munin:munin ${dirs} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die
-
-	# make sure we've got everything in the correct directory
-	insinto /var/lib/munin
-	newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
-	newinitd "${FILESDIR}"/munin-node_init.d_${PV} munin-node || die
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node || die
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \
-		|| die
-
-	# bug 254968
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/logrotate.d-munin munin || die
-}
-
-pkg_config() {
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-	# dcron is very fussy about syntax
-	# the following is the only form that works in BOTH dcron and vixie-cron
-	crontab - -u munin </var/lib/munin/crontab
-}
-
-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
-}
diff --git a/net-analyzer/munin/munin-2.0.2-r2.ebuild b/net-analyzer/munin/munin-1.4.7-r2.ebuild
index 6018a1edeb21..d60ead3476fb 100644
--- a/net-analyzer/munin/munin-2.0.2-r2.ebuild
+++ b/net-analyzer/munin/munin-1.4.7-r2.ebuild
@@ -1,25 +1,24 @@
 # 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.2 2012/07/24 15:00:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.7-r2.ebuild,v 1.1 2012/07/25 03:32:29 flameeyes Exp $
 
 EAPI=4
 
-PATCHSET=11
+PATCHSET=1
 
-inherit eutils user versionator java-pkg-opt-2
+inherit eutils user
 
 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.bz2"
+	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"
-REQUIRED_USE="cgi? ( !minimal )"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="asterisk doc irc memcached minimal mysql postgres ssl"
 
 # Upstream's listing of required modules is NOT correct!
 # Some of the postgres plugins use DBD::Pg, while others call psql directly.
@@ -34,18 +33,13 @@ DEPEND_COM="dev-lang/perl
 			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 )
-			dev-perl/DBI
 			dev-perl/DateManip
-			dev-perl/File-Copy-Recursive
-			dev-perl/IO-Socket-INET6
-			dev-perl/Log-Log4perl
 			dev-perl/Net-CIDR
 			dev-perl/Net-Netmask
 			dev-perl/Net-SNMP
 			dev-perl/libwww-perl
-			dev-perl/net-server[ipv6(-)?]
+			dev-perl/net-server
+			dev-perl/DBI
 			virtual/perl-Digest-MD5
 			virtual/perl-Getopt-Long
 			virtual/perl-MIME-Base64
@@ -53,110 +47,81 @@ DEPEND_COM="dev-lang/perl
 			virtual/perl-Text-Balanced
 			virtual/perl-Time-HiRes
 			!minimal? ( dev-perl/HTML-Template
-						>=net-analyzer/rrdtool-1.3[perl] )"
+						net-analyzer/rrdtool[perl]
+						dev-perl/Log-Log4perl )"
+			# Sybase isn't supported in Gentoo
+			#munin-sybase? (	 dev-perl/DBD-Sybase )
 
 # 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
-	)"
+	virtual/perl-Module-Build"
 RDEPEND="${DEPEND_COM}
-		java? ( >=virtual/jre-1.5 )
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)"
-
-S="${WORKDIR}/${MY_P}"
+		!minimal? ( virtual/cron )"
 
 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
-LOGDIR=\$(DESTDIR)/var/log/munin
-PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
-JCVALID=$(usex java yes no)
-EOF
+	# Don't build java plugins in this series
+	# sed is needed so the java plugins aren't automagically built.
+	sed -i -e 's: build-plugins-java : :' \
+		-e 's: install-plugins-java : :' Makefile || die
 }
 
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
 src_compile() {
-	emake -j1
+	emake -j 1 build build-man
+	if use doc; then
+		emake -j 1 build-doc
+	fi
+
+	#Ensure TLS is disabled if built without SSL
+	if ! use ssl; then
+		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
+			|| die "Fixing munin-node.conf Failed!"
+		echo "tls disabled" >> ${S}/build/master/munin.conf \
+			|| die "Fixing munin.conf Failed!"
+	fi
+
 }
 
 src_install() {
-	local dirs="
-		/var/log/munin/
-		/var/lib/munin/plugin-state/
-		/etc/munin/plugin-conf.d/
-		/etc/munin/plugins/"
+	local dirs
+	dirs="/var/log/munin/ /var/lib/munin/"
+	dirs="${dirs} /var/lib/munin/plugin-state/"
+	dirs="${dirs} /var/run/munin/plugin-state/"
+	dirs="${dirs} /var/run/munin/spool/"
+	dirs="${dirs} /etc/munin/plugin-conf.d/"
+	dirs="${dirs} /etc/munin/munin-conf.d/"
+	dirs="${dirs} /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"
-	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}
+	if use minimal; then
+		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
+			install-plugins-prime
+	else
+		emake -j 1 DESTDIR="${D}" install
+	fi
 	fowners munin:munin ${dirs}
 
 	insinto /etc/munin/plugin-conf.d/
 	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
 
-	# make sure we've got everything in the correct directory
 	newinitd "${FILESDIR}"/munin-node_init.d_2.0.2 munin-node
 	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-	dodoc README ChangeLog INSTALL build/resources/apache*
+	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
 
 	# bug 254968
 	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
 
-		# 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
-		fi
-
 		dodir /usr/share/${PN}
 		cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
 # Force the shell to bash
@@ -198,6 +163,7 @@ EOF
 	fi
 }
 
+
 pkg_config() {
 	if use minimal; then
 		einfo "Nothing to do."
@@ -205,7 +171,7 @@ pkg_config() {
 	fi
 
 	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
+	einfo "installation from /usr/share/${PN}/f?crontab"
 	einfo "If you have a large site, you may wish to customize it."
 	read
 
@@ -219,7 +185,8 @@ pkg_config() {
 }
 
 pkg_postinst() {
-	elog
+	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:"
diff --git a/net-analyzer/munin/munin-1.4.7.ebuild b/net-analyzer/munin/munin-1.4.7.ebuild
deleted file mode 100644
index 4684ae302d3a..000000000000
--- a/net-analyzer/munin/munin-1.4.7.ebuild
+++ /dev/null
@@ -1,157 +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-1.4.7.ebuild,v 1.2 2012/06/12 02:29:18 zmedico Exp $
-
-EAPI=2
-
-inherit eutils user
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="asterisk doc irc java memcached minimal mysql postgres ssl"
-
-# 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.
-DEPEND_COM="dev-lang/perl
-			sys-process/procps
-			asterisk? ( dev-perl/Net-Telnet )
-			irc? ( dev-perl/Net-IRC )
-			java? ( >=virtual/jdk-1.5 )
-			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 )
-			dev-perl/DateManip
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
-			dev-perl/net-server
-			dev-perl/DBI
-			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
-						net-analyzer/rrdtool[perl]
-						dev-perl/Log-Log4perl )"
-			# Sybase isn't supported in Gentoo
-			#munin-sybase? (	 dev-perl/DBD-Sybase )
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_prepare() {
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
-
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-temp.patch
-	epatch "${FILESDIR}"/${PN}-1.4.*-munin-version-identifier.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-fix-asterisk-plugins.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-if_-hardened-v2.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-multi.patch
-
-	# Don't build java plugins if not requested via USE.
-	if ! use java; then
-		# sed is needed so the java plugins aren't automagically built.
-		sed -i -e 's: build-plugins-java : :' \
-			-e 's: install-plugins-java : :' Makefile || die
-	fi
-
-	# Bug 304447, fix for gentoo PS location
-	sed -i -e 's,/usr/bin/ps,/bin/ps,g' \
-		"${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die
-
-	# bug 367785, cleanup make output by disabling HP-UX cruft
-	sed -i -e "/plugins\/\*\.adv/d" Makefile || die
-}
-
-src_compile() {
-	emake -j 1 build build-man || die "build/build-man failed"
-	if use doc; then
-		emake -j 1 build-doc || die "build-doc failed"
-	fi
-
-	#Ensure TLS is disabled if built without SSL
-	if ! use ssl; then
-		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
-			|| die "Fixing munin-node.conf Failed!"
-		echo "tls disabled" >> ${S}/build/master/munin.conf \
-			|| die "Fixing munin.conf Failed!"
-	fi
-
-}
-
-src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/spool/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	if use minimal; then
-		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
-			install-plugins-prime || die "install failed"
-	else
-		emake -j 1 DESTDIR="${D}" install || die "install failed"
-	fi
-	fowners munin:munin ${dirs} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die
-
-	# make sure we've got everything in the correct directory
-	insinto /var/lib/munin
-	newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
-	newinitd "${FILESDIR}"/munin-node_init.d_1.4.6-r2 munin-node || die
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node || die
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \
-		|| die
-
-	# bug 254968
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/logrotate.d-munin munin || die
-}
-
-pkg_config() {
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-	# dcron is very fussy about syntax
-	# the following is the only form that works in BOTH dcron and vixie-cron
-	crontab - -u munin </var/lib/munin/crontab
-}
-
-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
-}
diff --git a/net-analyzer/munin/munin-2.0.3.ebuild b/net-analyzer/munin/munin-2.0.3.ebuild
index 246197cb930b..6a2f5ec0f53a 100644
--- a/net-analyzer/munin/munin-2.0.3.ebuild
+++ b/net-analyzer/munin/munin-2.0.3.ebuild
@@ -1,12 +1,12 @@
 # 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.3.ebuild,v 1.1 2012/07/25 03:01:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild,v 1.2 2012/07/25 03:32:29 flameeyes Exp $
 
 EAPI=4
 
 PATCHSET=1
 
-inherit eutils user versionator java-pkg-opt-2
+inherit eutils user java-pkg-opt-2
 
 MY_P=${P/_/-}
 
@@ -207,7 +207,7 @@ pkg_config() {
 	fi
 
 	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
+	einfo "installation from /usr/share/${PN}/f?crontab"
 	einfo "If you have a large site, you may wish to customize it."
 	read
 
@@ -221,7 +221,8 @@ pkg_config() {
 }
 
 pkg_postinst() {
-	elog
+	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:"