Remove munin 1.4.6 (and related files); add missing dependency on List-Moreutils for the spooled node on 2.0.x.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

18 files changed, 35 insertions, 1447 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index b4381cd7ea4d..492a01919a14 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,19 @@
 # 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.127 2012/12/22 17:25:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.128 2012/12/23 11:40:58 flameeyes Exp $
+
+  23 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> -files/logrotate.d-munin,
+  -files/munin-1.3.3-crontab, -files/munin-1.4.4-Makefile.patch,
+  -files/munin-1.4.6-apc-multi.patch, -files/munin-1.4.6-apc-temp.patch,
+  -files/munin-1.4.6-fix-asterisk-plugins.patch,
+  -files/munin-1.4.6-if_-hardened-v2.patch,
+  -files/munin-1.4.6-if_-hardened.patch,
+  -files/munin-1.4.6-munin-version-identifier.patch, -files/munin-asyncd.init,
+  -files/munin-node_init.d_1.4.6-r2, -files/munin-node_init.d_2.0.2,
+  -files/munin-node_init.d_2.0.5, -munin-1.4.6-r4.ebuild, munin-2.0.8-r2.ebuild,
+  munin-2.0.9.ebuild:
+  Remove munin 1.4.6 (and related files); add missing dependency on List-
+  Moreutils for the spooled node on 2.0.x.
 
   22 Dec 2012; Agostino Sarubbo <ago@gentoo.org> munin-2.0.9.ebuild:
   Add ~ppc, wrt bug #446958
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 22ee864a5bdf..892d460c33f6 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,31 +1,30 @@
+-----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 logrotate.d-munin.2 532 SHA256 3b2597a52a2dc6b49099be6ab9c685be2ea09ed136666c2c1d56af1883fe4378 SHA512 25cd3017c9edcf07ac8e54b75a7b881255a4043cbe6c5f99320aa87cea00118be03010d9b76e5c214eeac82ebc4e4d3807474c5d112bff23d83238e7650d6563 WHIRLPOOL bc956e4454887cc1f102eb4ac0a563b5317acf9cd83a76b1bf379b2cd06e5518878aded99be04e7c03d79bcda02265864d3b83e65afef76a19da81464154937f
 AUX munin-1.3.2-plugins.conf 1764 SHA256 cc562d1839812a32b1c0c1d8574f1f5b3395da56d745a91309f31a29bd9624be SHA512 7c791052c6f7e25a3dc056aa95852fffed9083b7e99eb0f6c1d7fd8bc23d76e56a9e05790742728fcd20ebe001c47c3df55382a1965ccb18d227b18c99977362 WHIRLPOOL 52131ba7b5c268ab16fa5b8d3536a43bb6b322e8e02707e58d4186216e73b9c3c048ec02610351cee9ca4777834e8bcf1d90488466aa0790682edec228c32f02
-AUX munin-1.3.3-crontab 994 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89 SHA512 c06441c4dc1b030d7ae0cfd35a8f8525f1379ee6ea7218d1f2b4464979c0aae479b4a236e1fdebd260656c52729757958986b9897b858683390a7851d11122cd WHIRLPOOL 773e91e550c6f1351e840cb0cd791ab2183f3a70b2e1d28f18df56f9e46facd92727d2e06a717013d28f2ef02d07063371c82560b6b9c0608dd1621b09dc0fa1
-AUX munin-1.4.4-Makefile.patch 2531 SHA256 9f19d908b7097267b82b773d8644a775f76d16921e4efaf41e93835e53613bbc SHA512 87ebd2b90aa40891e4401a9066860da99a3cfdb5bf80cf5301d1301440c5cd9a9b02823c10c0a1b5708ccf4816977a6df27a7358627e3d11fd811911a422916b WHIRLPOOL ba0b9bfb42ce4efb6bc5698058e6f9750ecda5a17423655770ebef120adf540aee5d7b822274d57b72cb0e2d414924025573b4b4b1677dd0c7cbc0b482a7a8bb
-AUX munin-1.4.6-apc-multi.patch 2329 SHA256 128884796d3f5972136526254cfeaf76f40360be3be35ce63a76da2f6f2ab28e SHA512 3ba7b7656d9222eeed94e516e3f2eafbc1a7facd234e10a8abf452783baf63db17b0f437d76f48a7a73a352e1ce53025fd6bcca5280266f1e938b97e3bb7b951 WHIRLPOOL b58c29b60e7d56b8cbe4731fc436a5ca0306257955746dded1149eaf26b16ad87a3e1ee17f4ab6da1932f7ed1fe0959b236e8d7bb4be441b6b4bd4ae1f6da7e7
-AUX munin-1.4.6-apc-temp.patch 1548 SHA256 8b51c301cdd90f11e0d3fa5c16ae7bf4717bac2f6321765b6d37ecae4d9d6e27 SHA512 011ae5a83a2859e7ec2b7f1b40186d9c2280080bf4e505854ab3d256b02c4cc9aeb75864b6edd0d1cd7ccd26079607b5b8c5911ad430f0fa9486cb14a8a33d4f WHIRLPOOL 934f2a6df5b6ec512ec2b1849116dade52f785fe4ee4152a24b4b066c991c6645f5d8e0cccdccbf174c0015ef4bf59ec6c7a0c2ac4d2bad49917376fa061c776
-AUX munin-1.4.6-fix-asterisk-plugins.patch 6639 SHA256 29c8c30b69420453676cc173c232dd3ed1a561e6f0a8fd82ed2b750867ae4ee0 SHA512 fd56bb1a67227f09741ddc3798a938c29c5865b454ed24a6cb3342e7df93293476e0450d138d829cafe60fa098dc93b2c650bbacd0ae0869aa0576051ca4c569 WHIRLPOOL a4ad984918aa6a392d6898f1c11ad00d11f8a3dd2acaa6564a6b67a1584a64da795fd2df67c0ae80b48ab56b0730d3fc35af18c59dff94b8a971237fb6b1f3c3
-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-asyncd.init.2 577 SHA256 9c07804869ab41960d58974bfbfb9b0198137e548a6a05fbf8b59e71dcfe5a52 SHA512 edddd173b0369e6da300c09db790b2aa20c1f51e0de0be6766a6b27a451f225cfac3adb4c47f679542f8a704d4c14e53d7380412f51f13214e89d131e0d5d1f5 WHIRLPOOL 81015d52149a93a4628111cee92d1bf77f3dd4620e21b2abc6b800fc8b08baed270edad4ceddcf7ef64484fdaf62abe77bbcc7488d27063c5ef4e1781af561bf
 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 869 SHA256 9fea23a7d20e8bff50e9ef8dc41e4c9eaff50c5837f7d8e129cd57701c0fb464 SHA512 a890d5f7adc1d2c1577b4e4f868bab046eef25fd22c829cbda093dc20bd1a41df4bb6da0ffce0d71f6d9d8e0b5612e6ab1be691768824dd3793a2cc44dab64be WHIRLPOOL 6823abef0137268c60b755f642286d825205afde12da72ddda7a2044f687d88860ed3701d81a7c209aeaa80b2e1b4e39ec109953172fcb4037dbe23d88beb22e
 AUX munin-node_init.d_2.0.7 859 SHA256 26b490cc4c5023c3797714ead05fc4a3bef06caad96c8b2211ccbeeec1081098 SHA512 09f8da4c1ad07d38bac3b1fe81818c1c29a3a32dc6410104afdbcfb853af2455bf7a2ab9caad21ead3aba937dabb29a9b8c962716dcfa9d491c67bb29e331180 WHIRLPOOL bdbed8b90748cf4f216c38c2dd96b7de5420ae25b11342829047e9484f80e30b7be0d30f2496f0992c6463529d29af05ca29a378d88d794d221b6c5c1d5059f9
 AUX munin.apache.include 604 SHA256 5051ff79220e5ef578e6e5fa66ef8b0a71b72cca6fde93264cf371585f56cb52 SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087 WHIRLPOOL 5adfbcc61a3e5f7b6bec7396ca72bf24fd59406ee2a49ac47dc81dfff2eef98e688b6fa6699a9095f34943dd7df2ee1f392e1f7a9c1572dc0505d2439a836c5c
 AUX munin.apache.include-2.4 577 SHA256 21245e9eb7b759d2d2e65c2d1424da6d8c6fd8f49ec2f30cf72696cfc4227694 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4 WHIRLPOOL 90a166f400e8336792fabcbcb786169dc5ed6b5fe9151ac5aef40f85c8d3f2724a6fffe17e41d90f31948a9462fc619fe45747caf8f62d55f6d494d48a7a2bb1
-DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
 DIST munin-2.0.8-patches-4.tar.xz 16600 SHA256 badd20ae9d7d74667b6a96764c8caaf156e34aa22be5bb08c10535270a99f3d3 SHA512 81084c9b46127f425c89ff76a0c807bbc36859b2fd7ac37734bd202cae92610333f4793aa4630595147d96ad9099da99283c7bcf107351d6ec4931e64451a415 WHIRLPOOL 7e7aed4f0e23f88b0fa2eba548af5573d3e1fab20a910a8568c641ae539c58acc9e020eec01a3323243d6f6ae6f69dd7200818df3a14b5ca3b7100557fc4c8dd
 DIST munin-2.0.8.tar.gz 1328805 SHA256 ae645daee35214c1ba3d771d990fa781df741751b7b79e9d9fe48c583890dca6 SHA512 f767e586aee68c389ce0ae250376bc43d6bfe73df8e193bb7ba8b373d887301e0c1d3574c3fe456be3b93dc86cc8ec8ce27e3c36836a0048b80afb55a3a3cc1e WHIRLPOOL 312f006c21af98f5d9e548a77d43fe7396dcc69072e06faedb3d8262e70599da91bfecdfd06e859d6ff8706506e73308cbcac38e658a28e428fd50399f3f3c3e
 DIST munin-2.0.9-patches-1.tar.xz 10888 SHA256 da45fb8988a0e2640d16bda012a33a42fcf06f719cbfe01c00cad9d786efd1a2 SHA512 d6940f4f02584470382c8dc5b089be42cb438414f02335e677da58a2728c64ee883f60f68a4bc543b31245a9f18666bb3bbb31f96d7f8ab61384a494432f633e WHIRLPOOL 34c7ef8091fbda05367167f53983d2c8a472e2ef9221da3e190e36651389f5cc6012c3c359b25f6efb11745d5d7a06e87610cc7c80cdee2eda99d0fa56577337
 DIST munin-2.0.9.tar.gz 1328972 SHA256 6bb2b42de29a438ad80f1d6c53f4a35e9a74cb5a2103ea7a9530cba2d75c7309 SHA512 3db797283fc8ee8042869ace9c24871a8317fe0f826a4f8a3cebe1152ab621b62e2ddfd44a32a7516dabdaf44e4dde6aeaae014674cb544328665b63990c16d0 WHIRLPOOL 4110992995ac52f7903573b809a776281fe48e0406944b127ee8b2fede3ab12deef98f578070466721c72efc7a6418e9dc872d2fdfe1d4d5690f1648e33e49c1
-EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
-EBUILD munin-2.0.8-r2.ebuild 11285 SHA256 9c110c81118a0ba8cea4fab27a9e265c13349f86ddf8da3fc0b08d106766cbe6 SHA512 cddeee9c4c60532fda1012e22b52013b1219c8745cb868827b981885a907d2a4f29473492b32770545965a3b43d991594b27fc884f86894f27604a6099f8b116 WHIRLPOOL b920bb0c0f5335e9748909565a0ce647ae017261002640fc21f6a2968d275656897c11f33567c684b3d7238337635e69628badc89383c1e843a5d259ddf8220b
-EBUILD munin-2.0.9.ebuild 11396 SHA256 05c8c2008feede56f7e0acde569b642e55dba10df6adf02788cf745924857717 SHA512 43f6e9aed06225537496a201d8cfaa1ee5cb40a04eb10bfa681877a8491fd3806051f3757bf3edf82a28f6edb4f8a14a08d86f6d2db3c804e2ef0f50c377feb9 WHIRLPOOL ef3ed1baaed40c43f17c7934480dacdc67f442d52ff84eabc7370fb909ae03842faeb44ce70c92307368c5f291f3d9bef1953a8ef3915c90ab76a6dcc1e182ef
-MISC ChangeLog 27582 SHA256 cae43dd813c593bf1a9eb2bf741de1b5ba47f27a1e3f1cd3e0c7e9072053d1de SHA512 aced28c834a64a3083e48060331e3b7f670340452188a06ea4bce68ce98739d58001fffb99d868f74e1c734990b20201c8d93c05c2fc7f1552ec1d5f744a8554 WHIRLPOOL a17bac4520adbfa87c1484fa8b84abb570edb077b70a294123d0ca0c9478b9c01f12967de910539d11c4c392cc0eaadb5452deb58681c1ebe0c81608fa82bb5a
+EBUILD munin-2.0.8-r2.ebuild 11318 SHA256 d37a81dbb917c080a95715b94a59323788122134950687007359f01a670e2910 SHA512 e63dc6a07ccb81c03ede5b0a3707c59818e1f5fa1e6a4c81195d48747093666384ad2f2a059d14afeaf2179bc126e01aecfce9d24852be4aa1c24d3fc7421e5f WHIRLPOOL 1d59a9da10590b8cd659d1df4bb81d1e926191450034f867b61e27c47f11fde4c30abfcb7632aa26c205a126b26f75420528ea13c9253f8bbcd7b039aa5c2452
+EBUILD munin-2.0.9.ebuild 11429 SHA256 c33633a5e9c3e2930219dbfbf01e5e425893dbfe5481db9bb1290bed76e52c97 SHA512 06cc2d43cb08d091161d170bde119d81504be1cc110071b34546c42ada9260c6d77ce3d0a0eb5bd351ed27b713f1c23ac424704b3eb90761b6da7ae5c57d5218 WHIRLPOOL 78ccd7b3251e90d42cb4307ebe46b911e06f60e25dd616a8b74187dddc66bf7865843d8d40e8116db92eaae0395413eb1df65ae6e1e81e2f881b87a7a27c56b2
+MISC ChangeLog 28311 SHA256 9bbcd4d8626bd9c26cd6f71e11677ff5ededbb4058380c57c582d3421a7cb637 SHA512 deb899240938be831ab99df23a4aa71ffdd8f5290ca99d0d78d0426e14fedf33a91572bfe9f8c0d8d836ad3283ae943df6eeb4774088ff4a1a38c356e32c7547 WHIRLPOOL 2438dafb1ca8d0ece99935b3df0061d8fead62c769e405f2861617c2bdea3cd0f71b28b14e3b9e719925f4067c5fab51e54bef842da62be8493f9e46b336648c
 MISC metadata.xml 3824 SHA256 5b838f6ccb778750cbcc41052480daaa9ebcbee5ee38ab66b054472b6313d177 SHA512 277f3ab9589982617b60ce8ea63802288dc4ff5368416a942f3670804a8e0a4cd481b2d0ff91302be040d2aba4f66a2e11b0c181164e6285dc33b150b263da60 WHIRLPOOL 7486ffd90f12e32a9feb557b4937397317cfd4325e5ffdf1dbaa749a90f3c47f797baea306585ac4a200e4a23901da1de10a9f0b951a15bd27f8a7c876c504a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ1u3PAAoJEBzRPIrUMBNCaJoIAJglmk9IXTZnzyylWaNgmj2S
+tszR6FE+Y+9SRnBiexAoVV6CpxkTCdde7uqSt2j1b2OzkxOpkWwGVy/HQkA9ODP2
+rBIZVkmy6n8mqqeuKkCG+a7uaviZ6n+frMpD9G7+YC11tG590cqHH1S+cS2GcoWe
+fDSzBKDoT8eUTzlkclqIY7EgxKwbGDzhRpLrNiFr/D3nCaw6X2YDHAybb1H97OAO
+mP7rTU2xOmasitbrJRyKfRDRy05nZbFX1aeUiEowgqAY6MJsyCfwzdaXxbsiEYQg
+HtK+vWRqlN1oidEBcUHy++4AYz3D4ahQajiDfn+Swo3a1SCk4LSYFhxsLu6yHac=
+=/VXT
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/files/logrotate.d-munin b/net-analyzer/munin/files/logrotate.d-munin
deleted file mode 100644
index c1a8816ca25e..000000000000
--- a/net-analyzer/munin/files/logrotate.d-munin
+++ /dev/null
@@ -1,21 +0,0 @@
-/var/log/munin/munin-node.log {
-	daily
-	missingok
-	rotate 7
-	compress
-	copytruncate
-	notifempty
-	create 640 root root
-	postrotate
-		/etc/init.d/munin-node restart 1>/dev/null || true
-	endscript
-}
-
-/var/log/munin/munin-update.log /var/log/munin/munin-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log {
-	daily
-	missingok
-	rotate 7
-	compress
-	notifempty
-	nocreate
-}
diff --git a/net-analyzer/munin/files/munin-1.3.3-crontab b/net-analyzer/munin/files/munin-1.3.3-crontab
deleted file mode 100644
index 37d7a2fca1f8..000000000000
--- a/net-analyzer/munin/files/munin-1.3.3-crontab
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-1.3.3-crontab,v 1.1 2007/02/25 11:00:28 robbat2 Exp $
-
-# 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	* * * *		[ -x /usr/bin/munin-cron ] && /usr/bin/munin-cron
-
-# Alternatively, this route works differently
-# Update once a minute (for busy sites)
-#*/1 * * * *		[ -x /usr/libexec/munin/munin-update ] && /usr/libexec/munin/munin-update
-## Check for limit excess every 2 minutes
-#*/2 * * * *		[ -x /usr/libexec/munin/munin-limits ] && /usr/libexec/munin/munin-limits
-## Update graphs every 5 minutes
-#*/5 * * * *		[ -x /usr/libexec/munin/munin-graph  ] && nice /usr/libexec/munin/munin-graph --cron
-## Update HTML pages every 15 minutes
-#*/15 * * * *		[ -x /usr/libexec/munin/munin-html   ] && nice /usr/libexec/munin/munin-html
diff --git a/net-analyzer/munin/files/munin-1.4.4-Makefile.patch b/net-analyzer/munin/files/munin-1.4.4-Makefile.patch
deleted file mode 100644
index b95efbaac6a0..000000000000
--- a/net-analyzer/munin/files/munin-1.4.4-Makefile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- munin-1.4.3/Makefile.config.org	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/Makefile.config	2010-01-18 19:34:37.000000000 +0100
-@@ -17,10 +17,10 @@
- #
- # the base of the Munin installation.
- # 
--PREFIX     = $(DESTDIR)/opt/munin
-+PREFIX     = $(DESTDIR)/usr
- 
- # Where Munin keeps its configurations (server.conf, client.conf, ++)
--CONFDIR    = $(DESTDIR)/etc/opt/munin
-+CONFDIR    = $(DESTDIR)/etc/munin
- 
- # Server only - where to put munin-cron
- BINDIR     = $(PREFIX)/bin
-@@ -29,37 +29,37 @@
- SBINDIR    = $(PREFIX)/sbin
- 
- # Where to put text and html documentation
--DOCDIR     = $(PREFIX)/doc
-+DOCDIR     = $(PREFIX)/share/doc/munin-$(VERSION)
- 
- # Where to put man pages
--MANDIR     = $(PREFIX)/man
-+MANDIR     = $(PREFIX)/share/man
- 
- # Where to put internal binaries and plugin repository
--LIBDIR     = $(PREFIX)/lib
-+LIBDIR     = $(PREFIX)/libexec/munin
- 
- # Server only - Output directory
--HTMLDIR    = $(PREFIX)/www/docs
--CGIDIR     = $(PREFIX)/www/cgi
-+HTMLDIR    = $(DESTDIR)/var/www/localhost/htdocs/munin
-+CGIDIR     = $(DESTDIR)/var/www/localhost/cgi-bin
- 
- # Server only - spool directory for data gathered from nodes by
- # munin-gather - experimental.  Place on ramdisk to make munin
- # scale better.  On many versions of Linux as well as on Solaris
- # /tmp will be a ramdisk.
- 
--SSPOOLDIR  = $(PREFIX)/spool
-+SSPOOLDIR  = $(DESTDIR)/var/run/munin/spool
- 
- # Suggested directory name for a pulic ramdisk based tmp directory.
- # SSPOOLDIR := /tmp/muninspool
- 
- # Client only - Where to put RRD files and other intenal data
--DBDIR      = $(DESTDIR)/var/opt/munin
-+DBDIR      = $(DESTDIR)/var/lib/munin
- 
- # Client only - Where plugins should put their states. Must be writable by
- # group "munin", and should be preserved between reboots
- PLUGSTATE  = $(DBDIR)/plugin-state
- 
- # Where Munin should place its logs.
--LOGDIR     = $(PREFIX)/log/munin
-+LOGDIR     = $(DESTDIR)/var/log/munin
- 
- # Location of PID files and other statefiles. On the server, must be
- # writable by the user "munin".
-@@ -98,11 +98,11 @@
- BASH       := /bin/bash
- 
- # Server only - Where to install the perl libraries
--PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
-+PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
- PERLLIB    = $(DESTDIR)$(PERLSITELIB)
- 
- # Client only - Install plugins for this architecture
--OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
-+OSTYPE     := $(shell uname | LANG=C tr '[A-Z]' '[a-z]')
- 
- # How to figure out the hostname. (Only used in default configuration
- # files)
diff --git a/net-analyzer/munin/files/munin-1.4.6-apc-multi.patch b/net-analyzer/munin/files/munin-1.4.6-apc-multi.patch
deleted file mode 100644
index 042d79518f75..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-apc-multi.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 1563eb6b72781fecd58495c358b1fc877c904043 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Mon, 22 Aug 2011 15:06:11 +0200
-Subject: [PATCH] apc_nis: support rewriting host and port in configuration
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It is possible for APCUPSD to manage multiple UPSes on the same box, and to
-export its information to external systems as well.
-
-Since each UPS needs its own NIS host/port pair to be accessible, allow the
-user to access non-default hosts and ports. This also allows to monitor
-remote UPSes with Munin.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- plugins/node.d/apc_nis.in |   38 +++++++++++++++++++++++---------------
- 1 files changed, 23 insertions(+), 15 deletions(-)
-
-diff --git a/plugins/node.d/apc_nis.in b/plugins/node.d/apc_nis.in
-index 6c06459..9adf96d 100644
---- a/plugins/node.d/apc_nis.in
-+++ b/plugins/node.d/apc_nis.in
-@@ -5,17 +5,25 @@
- 
- apc_nis - Plugin to monitor APC UPS via the nis port of apcupsd
- 
--=cut
-+=head1 CONFIGURATION
-+
-+The following configuration parameters are used by this plugin
-+
-+ [apc_nis]
-+  env.host     - hostname to connect to
-+  env.port     - port number to connect to
-+
-+=head2 DEFAULT CONFIGURATION
-+
-+ [apc_nis]
-+  env.host 127.0.0.1
-+  env.port 3551
- 
--# 
--#
--# Parameters:
--#
--#   config   (required)
--#
--# Magic markers (optional - used by munin-config and some installation
--# scripts):
--#%# family=contrib
-+=head1 MAGIC MARKERS
-+
-+ #%# family=contrib
-+
-+=cut
- 
- use IO::Socket;
- use strict;
-@@ -25,8 +33,11 @@ if($ARGV[0] and $ARGV[0] eq "autoconfig") {
- 	exit 0;
- }
- 
-+my $host = exists $ENV{'host'} ? $ENV{'host'} : "127.0.0.1";
-+my $port = exists $ENV{'port'} ? $ENV{'port'} : "3551";
-+
- if($ARGV[0] and $ARGV[0] eq "config") {
--	print "graph_title apcupsd\n";
-+	print "graph_title apcupsd $host:$port\n";
- 	print "graph_args -l 0 --base 1000\n";
- 	print "graph_vlabel A bit of all (Volt, time, %)\n";
- 	print "battery_volt.label batt volt (V)\n";
-@@ -50,11 +61,8 @@ if($ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $server = "localhost";
--my $port = "3551";
--
- my $sock = new IO::Socket::INET (
--	PeerAddr => $server,
-+	PeerAddr => $host,
- 	PeerPort => $port,
- 	Proto => 'tcp'
- 	);
--- 
-1.7.6
-
diff --git a/net-analyzer/munin/files/munin-1.4.6-apc-temp.patch b/net-analyzer/munin/files/munin-1.4.6-apc-temp.patch
deleted file mode 100644
index 1eef93ec1ba8..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-apc-temp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e86ab027ab37bfb541e4d20dadcaac64e8ab3a7e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Mon, 4 Apr 2011 16:23:52 +0200
-Subject: [PATCH 1/2] apc_nis plugin: add UPS's internal temperature to the
- graph.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some APC UPS, such as the SmartUPS series, provide the internal
-temperature of the system, which is then exposed by apcupsd.
-
-This is pretty important because overheating UPSs simply shut off without
-warning.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
-Upstream: http://munin-monitoring.org/ticket/1057
----
- plugins/node.d/apc_nis.in |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/node.d/apc_nis.in b/plugins/node.d/apc_nis.in
-index 63ec390..6c06459 100644
---- a/plugins/node.d/apc_nis.in
-+++ b/plugins/node.d/apc_nis.in
-@@ -44,6 +44,9 @@ if($ARGV[0] and $ARGV[0] eq "config") {
- 	print "time_left.label time left (min)\n";
- 	print "time_left.type GAUGE\n";
- 	print "time_left.max 200\n";
-+        print "temperature.label internal temperature (celsius)\n";
-+        print "temperature.type GAUGE\n";
-+        print "temperature.max 100\n";
-     exit 0;
- }
- 
-@@ -81,6 +84,9 @@ do {
- 	} elsif($line =~ /\WTIMELEFT /) {
- 		$line =~ s/.* (\d+.\d+).*/$1/;
- 		print "time_left.value $line\n";
-+	} elsif($line =~ /\WITEMP /) {
-+		$line =~ s/.* (\d+.\d+).*/$1/;
-+		print "temperature.value $line\n";
- 	}
- } while(!($line =~ /END APC/));
- 
--- 
-1.7.5.3
-
diff --git a/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch b/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch
deleted file mode 100644
index 1a503cf40279..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 5a1fdd0cbea24bf6775072866cbd5aa7e9b0458b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Fri, 12 Aug 2011 20:39:52 +0200
-Subject: [PATCH] Fix Asterisk plugins.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some of the commands have been renamed in 1.6 and 1.8 series (which are the
-only versions that are still security-supported and that should be in use),
-so use the new syntax without requiring the admin to set up command
-aliases.
-
-Also make sure to exhaust the read buffer of the socket before terminating
-the plugin's execution, otherwise the asterisk logs will be full of "Broken
-Pipe" error messages, each time a plugin is executed.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
----
- plugins/node.d/asterisk_channels.in      |    5 ++++-
- plugins/node.d/asterisk_channelstypes.in |    5 ++++-
- plugins/node.d/asterisk_codecs.in        |    3 +++
- plugins/node.d/asterisk_meetme.in        |    5 ++++-
- plugins/node.d/asterisk_meetmeusers.in   |    5 ++++-
- plugins/node.d/asterisk_sipchannels.in   |    3 +++
- plugins/node.d/asterisk_sippeers.in      |    3 +++
- plugins/node.d/asterisk_voicemail.in     |    5 ++++-
- 8 files changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/node.d/asterisk_channels.in b/plugins/node.d/asterisk_channels.in
-index b4e9860..35de2a2 100644
---- a/plugins/node.d/asterisk_channels.in
-+++ b/plugins/node.d/asterisk_channels.in
-@@ -104,7 +104,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: show channels");
-+$pop->print("Command: core show channels");
- $pop->print("");
- my $result;
- while (($line = $pop->getline) and ($line !~ /END COMMAND/o))
-@@ -117,6 +117,9 @@ my $nb = (split ' ',$result)[0];
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- print "channels.value $nb\n";
- 
- # vim:syntax=perl
-diff --git a/plugins/node.d/asterisk_channelstypes.in b/plugins/node.d/asterisk_channelstypes.in
-index 06ab280..a23007b 100644
---- a/plugins/node.d/asterisk_channelstypes.in
-+++ b/plugins/node.d/asterisk_channelstypes.in
-@@ -120,7 +120,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: show channels");
-+$pop->print("Command: core show channels");
- $pop->print("");
- 
- #Response: Follows
-@@ -157,6 +157,9 @@ while (($line = $pop->getline) and ($line !~ /active channels/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- $i = 0;
- foreach my $channel (@CHANNELS) {
-     print "$channel.value $results[$i]\n";
-diff --git a/plugins/node.d/asterisk_codecs.in b/plugins/node.d/asterisk_codecs.in
-index 434d4e6..93bd87a 100644
---- a/plugins/node.d/asterisk_codecs.in
-+++ b/plugins/node.d/asterisk_codecs.in
-@@ -217,6 +217,9 @@ while (($line = $pop->getline) and ($line !~ /active IAX channel/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- $i = 0;
- foreach my $codec (@CODECS) {
-     print "$codec.value $results[$i]\n";
-diff --git a/plugins/node.d/asterisk_meetme.in b/plugins/node.d/asterisk_meetme.in
-index 72ce10d..091f384 100644
---- a/plugins/node.d/asterisk_meetme.in
-+++ b/plugins/node.d/asterisk_meetme.in
-@@ -104,7 +104,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: meetme");
-+$pop->print("Command: meetme list");
- $pop->print("");
- 
- 
-@@ -129,6 +129,9 @@ while (($line = $pop->getline) and ($line !~ /Total number|No active MeetMe/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- print "confs.value $confs\n";
- 
- # vim:syntax=perl
-diff --git a/plugins/node.d/asterisk_meetmeusers.in b/plugins/node.d/asterisk_meetmeusers.in
-index 1a0c565..0d6a169 100644
---- a/plugins/node.d/asterisk_meetmeusers.in
-+++ b/plugins/node.d/asterisk_meetmeusers.in
-@@ -106,7 +106,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: meetme");
-+$pop->print("Command: meetme list");
- $pop->print("");
- 
- my $nb = 0;
-@@ -125,6 +125,9 @@ while (($line = $pop->getline) and ($line !~ /END COMMAND/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- print "users.value $nb\n";
- 
- # vim:syntax=perl
-diff --git a/plugins/node.d/asterisk_sipchannels.in b/plugins/node.d/asterisk_sipchannels.in
-index a4750c3..9309575 100644
---- a/plugins/node.d/asterisk_sipchannels.in
-+++ b/plugins/node.d/asterisk_sipchannels.in
-@@ -176,6 +176,9 @@ while (($line = $pop->getline) and ($line !~ /active SIP channel/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- $i = 0;
- foreach my $codec (@CODECS) {
-     print "$codec.value $results[$i]\n";
-diff --git a/plugins/node.d/asterisk_sippeers.in b/plugins/node.d/asterisk_sippeers.in
-index 138ef2c..395881f 100644
---- a/plugins/node.d/asterisk_sippeers.in
-+++ b/plugins/node.d/asterisk_sippeers.in
-@@ -152,6 +152,9 @@ while (($line = $pop->getline) and ($line !~ /END COMMAND/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- #print "peers.value $peers\n";
- print "mon.value $monitor_online\n";
- print "moff.value $monitor_offline\n";
-diff --git a/plugins/node.d/asterisk_voicemail.in b/plugins/node.d/asterisk_voicemail.in
-index 7fa76a0..f8bae21 100644
---- a/plugins/node.d/asterisk_voicemail.in
-+++ b/plugins/node.d/asterisk_voicemail.in
-@@ -109,7 +109,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: show voicemail users");
-+$pop->print("Command: voicemail show users");
- $pop->print("");
- 
- #Context    Mbox  User                      Zone       NewMsg
-@@ -133,5 +133,8 @@ while (($line = $pop->getline)  and ($line !~ /--END/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- print "messages.value $results\n";
- # vim:syntax=perl
--- 
-1.7.6
-
diff --git a/net-analyzer/munin/files/munin-1.4.6-if_-hardened-v2.patch b/net-analyzer/munin/files/munin-1.4.6-if_-hardened-v2.patch
deleted file mode 100644
index bb72afb8bd84..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-if_-hardened-v2.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff --git a/plugins/node.d.linux/if_.in b/plugins/node.d.linux/if_.in
-index da0fc31..63a5dfd 100755
---- a/plugins/node.d.linux/if_.in
-+++ b/plugins/node.d.linux/if_.in
-@@ -43,7 +43,9 @@ monitored with this plugin.
- 
- =head1 AUTHOR
- 
--Unknown author
-+Original author unknown
-+
-+Copyright (C) 2011 Diego Elio Petteno' <flameeyes@flameeyes.eu>
- 
- =head1 LICENSE
- 
-@@ -64,86 +66,71 @@ Unknown license
- 
- INTERFACE=${0##*if_}
- 
--findspeed () {
--
--    # Who whould have thought it's so much work to determine the
--    # maximum speed of a network interface.  Buckle up!
--
--    IWLIST="$(type -p iwlist)"
--
--    WIRELESS=0
-+# Who whould have thought it's so much work to determine the
-+# maximum speed of a network interface.  Buckle up!
-+findspeed_mbps() {
-     # Do not use interface name to guess technology.  Many many
-     # wifi drivers use "eth*" names.
--    case $IWLIST in
--
--	'')
--            # Used to use iwconfig to look for "no wireless
--            # extentions" message - but this seemed un-needed.  If we
--            # don't have iwlist we can't find out if # the interface
--            # is wireless
--            :;;
--	*)  IWO="$($IWLIST $INTERFACE rate 2>&1)"
--            case $IWO in
--                *no*) :;;
--	        *) WIRELESS=1;;
--	    esac
--	    ;;
--    esac
--
--    SPEED=U
--    # Find speed in Mbps. - or not
--    case $WIRELESS:$IWLIST in
--	0:*)
--	    ETHTOOL="$(type -p ethtool)"
--	    if [ -x "$ETHTOOL" ]; then
--		SPEED="$($ETHTOOL $INTERFACE 2>&1 |
--                         awk '/Speed:/ { gsub(/[^0-9]*/,"",$2); print $2; }')"
--		case $SPEED in
--		    [0-9]*) :;; # OK
--		    *)      SPEED=U;; # Could be "unknown"
--		esac
--	    else
--		INSTALL="ethtool"
-+    IWLIST="$(type -p iwlist)"
-+    if [ -x "$IWLIST" ]; then
-+	SPEED=$($IWLIST $INTERFACE rate 2>&1 |
-+	    awk 'BEGIN { RATE=U }
-+                       { if ($2 == "Mb/s") RATE=$1; }
-+                 END   { print RATE; }')
-+
-+        if [ "$SPEED" != "U" ]; then
-+            echo $SPEED
-+            return
-+        fi
-+    fi
-+
-+    # sysfs can report the speed if the driver supports it (but it
-+    # doesn't work as well for wireless cards, thus why we check for
-+    # iwlist first)
-+    if [ -r /sys/class/net/$INTERFACE/speed ]; then
-+	    SPEED="$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)"
-+	    if [ -n "$SPEED" ]; then
-+		echo $SPEED
-+		return
- 	    fi
--	    ;;
--	1:/*)
--	    # Current bit rate is not very interesting, it varies too often
--	    SPEED=$(echo "$IWO" |
--		    awk 'BEGIN { RATE=U }
--                               { if ($2 == "Mb/s") RATE=$1; } 
--                         END   { print RATE; }')
--
--	    ;;
--	*)
--	    # Wireless interface, cannot find iwlist
--	    INSTALL="wireless-tools"
--	    ;;
--    esac
-+    fi
-+
-+    ETHTOOL="$(type -p ethtool)"
-+    if [ -x "$ETHTOOL" ]; then
-+	SPEED="$($ETHTOOL $INTERFACE 2>&1 |
-+                 awk '/Speed:/ { gsub(/[^0-9]*/,"",$2); print $2; }')"
-+
-+        if [ $SPEED = [0-9]* ]; then
-+	    echo $SPEED
-+            return
-+	fi
-+    fi
- 
-     MIITOOL="$(type -p mii-tool)"
--    case $SPEED:$MIITOOL in
--	U:/*)
--	    SPEED="$($MIITOOL $INTERFACE 2>&1)"
--	    case $SPEED in
--		*1000base*) SPEED=1000;; # as if...
--		*100base*)  SPEED=100;;
--		*10base*)   SPEED=10;;
--		*)          SPEED=U;;
--	    esac
--	    ;;
--    esac
--
--    # sysfs can report the speed if the driver supports it
--    SYSFS="$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)"
--    # If it can't, it fails on I/O, so we check cat's return value
--    if [ $? -eq 0 -a "$SPEED" = "U" -a -n "$SYSFS" ]; then
--        SPEED="$SYSFS"
-+    if [ -x $MIITOOL ]; then
-+	case $($MIITOOL $INTERFACE 2>&1) in
-+	    *1000base*) echo 1000; return ;;
-+	    *100base*)  echo 100; return ;;
-+	    *10base*)   echo 10; return ;;
-+	esac
-     fi
- 
--    case $SPEED in
--	U) echo "up.info Traffic of the $INTERFACE interface. Unable to determine interface speed.  Please install ethtool, wireless-tools (or mii-tool), whatever is appropriate for the interface."
--	   return;;
--    esac
-+    echo U
-+}
-+
-+findspeed() {
-+    SPEED=$(findspeed_mbps)
-+
-+    if [ -z $SPEED -o $SPEED = "U" ]; then
-+        printf "up.info Traffic of the %s interface. Unable to determine interface speed." $INTERFACE
-+        if [ $EUID -ne 0 ]; then
-+                echo " Please run the plugin as root."
-+        else
-+                echo " Please install ethtool, wireless-tools, mii-tool or whatever is appropriate for the interface."
-+        fi
-+
-+        return
-+    fi
- 
-     BPS=$(( $SPEED * 1000 * 1000 ))
- 
-@@ -207,11 +194,15 @@ case $1 in
- esac
- 
- # Escape dots in the interface name (eg. vlans) before using it as a regex
--awk -v interface="$INTERFACE" \
--    'BEGIN { gsub(/\./, "\\.", interface) } \
--    $1 ~ "^" interface ":" {
--        split($0, a, /: */); $0 = a[2]; \
--        print "down.value " $1 "\nup.value " $9 \
--    }' \
--    /proc/net/dev
--
-+if [ -r /sys/class/net/$INTERFACE/statistics/rx_bytes ]; then
-+    echo "down.value $(cat /sys/class/net/$INTERFACE/statistics/rx_bytes)"
-+    echo "up.value $(cat /sys/class/net/$INTERFACE/statistics/tx_bytes)"
-+else
-+    awk -v interface="$INTERFACE" \
-+        'BEGIN { gsub(/\./, "\\.", interface) } \
-+        $1 ~ "^" interface ":" {
-+            split($0, a, /: */); $0 = a[2]; \
-+            print "down.value " $1 "\nup.value " $9 \
-+        }' \
-+        /proc/net/dev
-+fi
-diff --git a/plugins/node.d.linux/if_err_.in b/plugins/node.d.linux/if_err_.in
-index 331866d..2e35909 100755
---- a/plugins/node.d.linux/if_err_.in
-+++ b/plugins/node.d.linux/if_err_.in
-@@ -93,10 +93,15 @@ if [ "$1" = "config" ]; then
- fi;
- 
- # Escape dots in the interface name (eg. vlans) before using it as a regex
--awk -v interface="$INTERFACE" \
--    'BEGIN { gsub(/\./, "\\.", interface) } \
--    $1 ~ "^" interface ":" {
--        split($0, a, /: */); $0 = a[2]; \
--        print "rcvd.value " $3 "\ntrans.value " $11 \
--    }' \
--    /proc/net/dev
-+if [ -r /sys/class/net/$INTERFACE/statistics/rx_bytes ]; then
-+    echo "rcvd.value $(cat /sys/class/net/$INTERFACE/statistics/rx_errors)"
-+    echo "trans.value $(cat /sys/class/net/$INTERFACE/statistics/tx_errors)"
-+else
-+    awk -v interface="$INTERFACE" \
-+        'BEGIN { gsub(/\./, "\\.", interface) } \
-+        $1 ~ "^" interface ":" {
-+            split($0, a, /: */); $0 = a[2]; \
-+            print "rcvd.value " $3 "\ntrans.value " $11 \
-+        }' \
-+        /proc/net/dev
-+fi
diff --git a/net-analyzer/munin/files/munin-1.4.6-if_-hardened.patch b/net-analyzer/munin/files/munin-1.4.6-if_-hardened.patch
deleted file mode 100644
index 03c4ece263a2..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-if_-hardened.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff --git a/plugins/node.d.linux/if_.in b/plugins/node.d.linux/if_.in
-index da0fc31..63a5dfd 100755
---- a/plugins/node.d.linux/if_.in
-+++ b/plugins/node.d.linux/if_.in
-@@ -43,7 +43,9 @@ monitored with this plugin.
- 
- =head1 AUTHOR
- 
--Unknown author
-+Original author unknown
-+
-+Copyright (C) 2011 Diego Elio Petteno' <flameeyes@flameeyes.eu>
- 
- =head1 LICENSE
- 
-@@ -64,86 +66,71 @@ Unknown license
- 
- INTERFACE=${0##*if_}
- 
--findspeed () {
--
--    # Who whould have thought it's so much work to determine the
--    # maximum speed of a network interface.  Buckle up!
--
--    IWLIST="$(type -p iwlist)"
--
--    WIRELESS=0
-+# Who whould have thought it's so much work to determine the
-+# maximum speed of a network interface.  Buckle up!
-+findspeed_mbps() {
-     # Do not use interface name to guess technology.  Many many
-     # wifi drivers use "eth*" names.
--    case $IWLIST in
--
--	'')
--            # Used to use iwconfig to look for "no wireless
--            # extentions" message - but this seemed un-needed.  If we
--            # don't have iwlist we can't find out if # the interface
--            # is wireless
--            :;;
--	*)  IWO="$($IWLIST $INTERFACE rate 2>&1)"
--            case $IWO in
--                *no*) :;;
--	        *) WIRELESS=1;;
--	    esac
--	    ;;
--    esac
--
--    SPEED=U
--    # Find speed in Mbps. - or not
--    case $WIRELESS:$IWLIST in
--	0:*)
--	    ETHTOOL="$(type -p ethtool)"
--	    if [ -x "$ETHTOOL" ]; then
--		SPEED="$($ETHTOOL $INTERFACE 2>&1 |
--                         awk '/Speed:/ { gsub(/[^0-9]*/,"",$2); print $2; }')"
--		case $SPEED in
--		    [0-9]*) :;; # OK
--		    *)      SPEED=U;; # Could be "unknown"
--		esac
--	    else
--		INSTALL="ethtool"
-+    IWLIST="$(type -p iwlist)"
-+    if [ -x "$IWLIST" ]; then
-+	SPEED=$($IWLIST $INTERFACE rate 2>&1 |
-+	    awk 'BEGIN { RATE=U }
-+                       { if ($2 == "Mb/s") RATE=$1; }
-+                 END   { print RATE; }')
-+
-+        if [ "$SPEED" != "U" ]; then
-+            echo $SPEED
-+            return
-+        fi
-+    fi
-+
-+    # sysfs can report the speed if the driver supports it (but it
-+    # doesn't work as well for wireless cards, thus why we check for
-+    # iwlist first)
-+    if [ -r /sys/class/net/$INTERFACE/speed ]; then
-+	    SPEED="$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)"
-+	    if [ -n "$SPEED" ]; then
-+		echo $SPEED
-+		return
- 	    fi
--	    ;;
--	1:/*)
--	    # Current bit rate is not very interesting, it varies too often
--	    SPEED=$(echo "$IWO" |
--		    awk 'BEGIN { RATE=U }
--                               { if ($2 == "Mb/s") RATE=$1; } 
--                         END   { print RATE; }')
--
--	    ;;
--	*)
--	    # Wireless interface, cannot find iwlist
--	    INSTALL="wireless-tools"
--	    ;;
--    esac
-+    fi
-+
-+    ETHTOOL="$(type -p ethtool)"
-+    if [ -x "$ETHTOOL" ]; then
-+	SPEED="$($ETHTOOL $INTERFACE 2>&1 |
-+                 awk '/Speed:/ { gsub(/[^0-9]*/,"",$2); print $2; }')"
-+
-+        if [ $SPEED = [0-9]* ]; then
-+	    echo $SPEED
-+            return
-+	fi
-+    fi
- 
-     MIITOOL="$(type -p mii-tool)"
--    case $SPEED:$MIITOOL in
--	U:/*)
--	    SPEED="$($MIITOOL $INTERFACE 2>&1)"
--	    case $SPEED in
--		*1000base*) SPEED=1000;; # as if...
--		*100base*)  SPEED=100;;
--		*10base*)   SPEED=10;;
--		*)          SPEED=U;;
--	    esac
--	    ;;
--    esac
--
--    # sysfs can report the speed if the driver supports it
--    SYSFS="$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)"
--    # If it can't, it fails on I/O, so we check cat's return value
--    if [ $? -eq 0 -a "$SPEED" = "U" -a -n "$SYSFS" ]; then
--        SPEED="$SYSFS"
-+    if [ -x $MIITOOL ]; then
-+	case $($MIITOOL $INTERFACE 2>&1) in
-+	    *1000base*) echo 1000; return ;;
-+	    *100base*)  echo 100; return ;;
-+	    *10base*)   echo 10; return ;;
-+	esac
-     fi
- 
--    case $SPEED in
--	U) echo "up.info Traffic of the $INTERFACE interface. Unable to determine interface speed.  Please install ethtool, wireless-tools (or mii-tool), whatever is appropriate for the interface."
--	   return;;
--    esac
-+    echo U
-+}
-+
-+findspeed() {
-+    SPEED=$(findspeed_mbps)
-+
-+    if [ -z $SPEED -o $SPEED = "U" ]; then
-+        printf "up.info Traffic of the %s interface. Unable to determine interface speed." $INTERFACE
-+        if [ $EUID -ne 0 ]; then
-+                echo " Please run the plugin as root."
-+        else
-+                echo " Please install ethtool, wireless-tools, mii-tool or whatever is appropriate for the interface."
-+        fi
-+
-+        return
-+    fi
- 
-     BPS=$(( $SPEED * 1000 * 1000 ))
- 
-@@ -207,11 +194,15 @@ case $1 in
- esac
- 
- # Escape dots in the interface name (eg. vlans) before using it as a regex
--awk -v interface="$INTERFACE" \
--    'BEGIN { gsub(/\./, "\\.", interface) } \
--    $1 ~ "^" interface ":" {
--        split($0, a, /: */); $0 = a[2]; \
--        print "down.value " $1 "\nup.value " $9 \
--    }' \
--    /proc/net/dev
--
-+if [ -r /sys/class/net/$INTERFACE/statistics/rx_bytes ]; then
-+    echo "down.value $(cat /sys/class/net/$INTERFACE/statistics/rx_bytes)"
-+    echo "up.value $(cat /sys/class/net/$INTERFACE/statistics/tx_bytes)"
-+else
-+    awk -v interface="$INTERFACE" \
-+        'BEGIN { gsub(/\./, "\\.", interface) } \
-+        $1 ~ "^" interface ":" {
-+            split($0, a, /: */); $0 = a[2]; \
-+            print "down.value " $1 "\nup.value " $9 \
-+        }' \
-+        /proc/net/dev
-+fi
-diff --git a/plugins/node.d.linux/if_err_.in b/plugins/node.d.linux/if_err_.in
-index 331866d..2e35909 100755
---- a/plugins/node.d.linux/if_err_.in
-+++ b/plugins/node.d.linux/if_err_.in
-@@ -93,10 +93,15 @@ if [ "$1" = "config" ]; then
- fi;
- 
- # Escape dots in the interface name (eg. vlans) before using it as a regex
--awk -v interface="$INTERFACE" \
--    'BEGIN { gsub(/\./, "\\.", interface) } \
--    $1 ~ "^" interface ":" {
--        split($0, a, /: */); $0 = a[2]; \
--        print "rcvd.value " $3 "\ntrans.value " $11 \
--    }' \
--    /proc/net/dev
-+if [ -r /sys/class/net/$INTERFACE/statistics/rx_bytes ]; then
-+    echo "down.value $(cat /sys/class/net/$INTERFACE/statistics/rx_errors)"
-+    echo "up.value $(cat /sys/class/net/$INTERFACE/statistics/tx_errors)"
-+else
-+    awk -v interface="$INTERFACE" \
-+        'BEGIN { gsub(/\./, "\\.", interface) } \
-+        $1 ~ "^" interface ":" {
-+            split($0, a, /: */); $0 = a[2]; \
-+            print "rcvd.value " $3 "\ntrans.value " $11 \
-+        }' \
-+        /proc/net/dev
-+fi
diff --git a/net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch b/net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch
deleted file mode 100644
index 0a8137ca8e2d..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-From cb3a59fb3249a2f3aa5433b6590f71563e6cba29 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Fri, 1 Apr 2011 17:52:33 +0200
-Subject: [PATCH 2/2] Use "munin/$version (libwww-perl/$version)" instead of
- just "libwww-perl/$version"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
-Upstream: http://munin-monitoring.org/ticket/1109
----
- plugins/node.d/apache_accesses.in  |    6 ++++--
- plugins/node.d/apache_processes.in |    6 ++++--
- plugins/node.d/apache_volume.in    |    6 ++++--
- plugins/node.d/haproxy_.in         |    3 ++-
- plugins/node.d/nginx_request.in    |    6 ++++--
- plugins/node.d/nginx_status.in     |    6 ++++--
- plugins/node.d/tomcat_access.in    |    6 ++++--
- plugins/node.d/tomcat_jvm.in       |    6 ++++--
- plugins/node.d/tomcat_threads.in   |    6 ++++--
- plugins/node.d/tomcat_volume.in    |    6 ++++--
- 10 files changed, 38 insertions(+), 19 deletions(-)
-
-diff --git a/plugins/node.d/apache_accesses.in b/plugins/node.d/apache_accesses.in
-index 233e941..dff2b54 100755
---- a/plugins/node.d/apache_accesses.in
-+++ b/plugins/node.d/apache_accesses.in
-@@ -98,7 +98,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- 		exit 0;
- 	}
- 
--	my $ua = LWP::UserAgent->new(timeout => 30);
-+	my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- 	foreach my $port (@PORTS) {
- 		my $url = sprintf $URL, $port;
-@@ -144,7 +145,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
- 	exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- foreach my $port (@PORTS) {
- 	my $url = sprintf $URL, $port;
-diff --git a/plugins/node.d/apache_processes.in b/plugins/node.d/apache_processes.in
-index 45310e4..00fe2ce 100755
---- a/plugins/node.d/apache_processes.in
-+++ b/plugins/node.d/apache_processes.in
-@@ -103,7 +103,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- 		print "no ($ret)\n";
- 		exit 0;
- 	}
--	my $ua = LWP::UserAgent->new(timeout => 30);
-+	my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
-         foreach my $port (@PORTS) {
-                 my $url = sprintf $URL, $port;
-@@ -170,7 +171,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
- 
- foreach my $port (@PORTS)
- {
--    my $ua = LWP::UserAgent->new(timeout => 30);
-+    my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $url = sprintf $URL, $port;
-     my $response = $ua->request(HTTP::Request->new('GET',$url));
-     if ($response->content =~ /^Busy(?:Servers|Workers):\s+(.+)$/im) {
-diff --git a/plugins/node.d/apache_volume.in b/plugins/node.d/apache_volume.in
-index b81c9bf..f26f574 100755
---- a/plugins/node.d/apache_volume.in
-+++ b/plugins/node.d/apache_volume.in
-@@ -98,7 +98,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- 		exit 0;
- 	}
- 	
--	my $ua = LWP::UserAgent->new(timeout => 30);
-+	my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- 	foreach my $port (@PORTS) {
- 		my $url = sprintf $URL, $port;
-@@ -143,7 +144,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
- 	exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- foreach my $port (@PORTS) {
- 	my $url = sprintf $URL, $port;
-diff --git a/plugins/node.d/haproxy_.in b/plugins/node.d/haproxy_.in
-index 74ec2a0..82847d6 100755
---- a/plugins/node.d/haproxy_.in
-+++ b/plugins/node.d/haproxy_.in
-@@ -60,7 +60,8 @@ if (! eval "require LWP::UserAgent;")
- 
- my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://localhost/haproxy-status;csv;norefresh";
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- my $url = $URL;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
-diff --git a/plugins/node.d/nginx_request.in b/plugins/node.d/nginx_request.in
-index d8bb8ee..f43ee7f 100644
---- a/plugins/node.d/nginx_request.in
-+++ b/plugins/node.d/nginx_request.in
-@@ -73,7 +73,8 @@ if ( exists $ARGV[0] and $ARGV[0] eq "autoconf" )
- 		exit 0;
- 	}
- 	
--	my $ua = LWP::UserAgent->new(timeout => 30);
-+	my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $response = $ua->request(HTTP::Request->new('GET',$URL));
- 
- 	unless ($response->is_success and $response->content =~ /server/im)
-@@ -103,7 +104,8 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" )
- 	exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- my $response = $ua->request(HTTP::Request->new('GET',$URL));
- 
-diff --git a/plugins/node.d/nginx_status.in b/plugins/node.d/nginx_status.in
-index c61eae2..735f815 100644
---- a/plugins/node.d/nginx_status.in
-+++ b/plugins/node.d/nginx_status.in
-@@ -69,7 +69,8 @@ if ( exists $ARGV[0] and $ARGV[0] eq "autoconf" ) {
- 	exit 0;
-     }
- 
--    my $ua = LWP::UserAgent->new(timeout => 30);
-+    my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $response = $ua->request(HTTP::Request->new('GET',$URL));
- 
-     unless ($response->is_success and $response->content =~ /server/im) {
-@@ -106,7 +107,8 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- my $response = $ua->request(HTTP::Request->new('GET',$URL));
- 
-diff --git a/plugins/node.d/tomcat_access.in b/plugins/node.d/tomcat_access.in
-index d226ea7..cf5ad12 100755
---- a/plugins/node.d/tomcat_access.in
-+++ b/plugins/node.d/tomcat_access.in
-@@ -76,7 +76,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "autoconf") {
- 	print "no ($ret)\n";
- 	exit 0;
-     }
--    my $au = LWP::UserAgent->new(timeout => $TIMEOUT);
-+    my $au = LWP::UserAgent->new(timeout => $TIMEOUT,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $repsonse = $au->request(HTTP::Request->new('GET',$url));
-     if($repsonse->is_success and $repsonse->content =~ /<status>.*<\/status>/im) {
- 	print "yes\n";
-@@ -99,7 +100,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => $TIMEOUT);
-+my $ua = LWP::UserAgent->new(timeout => $TIMEOUT,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- my $xs = new XML::Simple;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
- my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 );
-diff --git a/plugins/node.d/tomcat_jvm.in b/plugins/node.d/tomcat_jvm.in
-index 2407603..c8b9a47 100755
---- a/plugins/node.d/tomcat_jvm.in
-+++ b/plugins/node.d/tomcat_jvm.in
-@@ -88,7 +88,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "autoconf") {
- 	print "no ($ret)\n";
- 	exit 0;
-     }
--    my $au = LWP::UserAgent->new(timeout => $TIMEOUT);
-+    my $au = LWP::UserAgent->new(timeout => $TIMEOUT,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $repsonse = $au->request(HTTP::Request->new('GET',$url));
-     if($repsonse->is_success and $repsonse->content =~ /<status>.*<\/status>/im) {
- 	print "yes\n";
-@@ -114,7 +115,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => $TIMEOUT);
-+my $ua = LWP::UserAgent->new(timeout => $TIMEOUT,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- my $xs = new XML::Simple;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
- my $xml = $xs->XMLin($response->content);
-diff --git a/plugins/node.d/tomcat_threads.in b/plugins/node.d/tomcat_threads.in
-index 2aba651..8ae2540 100755
---- a/plugins/node.d/tomcat_threads.in
-+++ b/plugins/node.d/tomcat_threads.in
-@@ -75,7 +75,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "autoconf") {
- 	print "no ($ret)\n";
- 	exit 0;
-     }
--    my $au = LWP::UserAgent->new(timeout => $TIMEOUT);
-+    my $au = LWP::UserAgent->new(timeout => $TIMEOUT,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $repsonse = $au->request(HTTP::Request->new('GET',$url));
-     if($repsonse->is_success and $repsonse->content =~ /<status>.*<\/status>/im) {
- 	print "yes\n";
-@@ -100,7 +101,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => $TIMEOUT);
-+my $ua = LWP::UserAgent->new(timeout => $TIMEOUT,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- my $xs = new XML::Simple;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
- my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 );
-diff --git a/plugins/node.d/tomcat_volume.in b/plugins/node.d/tomcat_volume.in
-index f32b874..33caf74 100755
---- a/plugins/node.d/tomcat_volume.in
-+++ b/plugins/node.d/tomcat_volume.in
-@@ -96,7 +96,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "autoconf") {
- 	print "no ($ret)\n";
- 	exit 0;
-     }
--    my $au = LWP::UserAgent->new(timeout => $TIMEOUT);
-+    my $au = LWP::UserAgent->new(timeout => $TIMEOUT,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $repsonse = $au->request(HTTP::Request->new('GET',$url));
-     if($repsonse->is_success and $repsonse->content =~ /<status>.*<\/status>/im) {
- 	print "yes\n";
-@@ -119,7 +120,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => $TIMEOUT);
-+my $ua = LWP::UserAgent->new(timeout => $TIMEOUT,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- my $xs = new XML::Simple;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
- my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 );
--- 
-1.7.5.3
-
diff --git a/net-analyzer/munin/files/munin-asyncd.init b/net-analyzer/munin/files/munin-asyncd.init
deleted file mode 100644
index e438fd3e0838..000000000000
--- a/net-analyzer/munin/files/munin-asyncd.init
+++ /dev/null
@@ -1,27 +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-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/files/munin-node_init.d_1.4.6-r2 b/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2
deleted file mode 100644
index 409570d441ba..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2
+++ /dev/null
@@ -1,41 +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.6-r2,v 1.1 2011/08/17 15:45:54 darkside 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}
-
-depend() {
-	config "$CFGFILE"
-
-	need net
-	before cron
-
-	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
-		use logger
-}
-
-start() {
-	local piddir=$(dirname ${PIDFILE})
-	[ -d ${piddir} ] || mkdir -p ${piddir}
-
-	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/files/munin-node_init.d_2.0.2 b/net-analyzer/munin/files/munin-node_init.d_2.0.2
deleted file mode 100644
index 035ea31819ee..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_2.0.2
+++ /dev/null
@@ -1,41 +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_2.0.2,v 1.1 2012/07/16 16:15:11 flameeyes Exp $
-
-get_munin_config() {
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-: ${CFGFILE:=/etc/munin/munin-node.conf}
-: ${PIDFILE:=$(get_munin_config pid_file)}
-: ${NICE_LEVEL:=0}
-
-depend() {
-	config "$CFGFILE"
-
-	need net
-	before cron
-
-	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
-		use logger
-}
-
-start() {
-	checkpath -d -o munin:munin -m 0700 $(dirname ${PIDFILE})
-
-	ebegin "Starting Munin node"
-	start-stop-daemon --start \
-	    --nicelevel $NICE_LEVEL \
-	    --pidfile $PIDFILE \
-	    --exec /usr/sbin/munin-node -- --config "$CFGFILE"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Munin node"
-	start-stop-daemon --stop --pidfile $PIDFILE
-	eend $?
-}
-
-# vim: filetype=gentoo-init-d:
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
deleted file mode 100644
index 2dc6c516de01..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_2.0.5
+++ /dev/null
@@ -1,38 +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_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"
-}
-
-: ${CFGFILE:=/etc/munin/munin-node.conf}
-
-command=/usr/sbin/munin-node
-command_args="--config ${CFGFILE}"
-pidfile=$(get_munin_config pid_file)
-start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0}"
-extra_started_commands="reload"
-
-depend() {
-	config "$CFGFILE"
-
-	need net
-	before cron
-
-	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
-		use logger
-}
-
-start_pre() {
-    checkpath -d $(dirname ${pidfile})
-}
-
-reload() {
-    ebegin "Reloading ${SERVICE}"
-    kill -HUP `cat ${pidfile}`
-    eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-1.4.6-r4.ebuild b/net-analyzer/munin/munin-1.4.6-r4.ebuild
deleted file mode 100644
index 8816413e58a9..000000000000
--- a/net-analyzer/munin/munin-1.4.6-r4.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.6-r4.ebuild,v 1.5 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.6-munin-version-identifier.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-fix-asterisk-plugins.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-if_-hardened.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.8-r2.ebuild b/net-analyzer/munin/munin-2.0.8-r2.ebuild
index 8ad2df2564a9..f6feef59efe2 100644
--- a/net-analyzer/munin/munin-2.0.8-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.8-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.8-r2.ebuild,v 1.6 2012/12/22 15:18:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.8-r2.ebuild,v 1.7 2012/12/23 11:40:58 flameeyes Exp $
 
 EAPI=4
 
@@ -51,6 +51,7 @@ DEPEND_COM="dev-lang/perl[berkdb]
 			dev-perl/DBI
 			dev-perl/DateManip
 			dev-perl/File-Copy-Recursive
+			dev-perl/List-MoreUtils
 			dev-perl/Log-Log4perl
 			dev-perl/Net-CIDR
 			dev-perl/Net-Netmask
diff --git a/net-analyzer/munin/munin-2.0.9.ebuild b/net-analyzer/munin/munin-2.0.9.ebuild
index 7b5d4538f556..9000a9b00fb0 100644
--- a/net-analyzer/munin/munin-2.0.9.ebuild
+++ b/net-analyzer/munin/munin-2.0.9.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.9.ebuild,v 1.2 2012/12/22 17:25:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.9.ebuild,v 1.3 2012/12/23 11:40:58 flameeyes Exp $
 
 EAPI=5
 
@@ -48,6 +48,7 @@ DEPEND_COM="dev-lang/perl[berkdb]
 			dev-perl/DBI
 			dev-perl/DateManip
 			dev-perl/File-Copy-Recursive
+			dev-perl/List-MoreUtils
 			dev-perl/Log-Log4perl
 			dev-perl/Net-CIDR
 			dev-perl/Net-Netmask