Version bump to 1.4.3, many thanks to all the contributors on bug 300171. Include ping6 fix from bug 294722. Include QA fix for perl site-dir, bug 298528. Remove old versions and unused patches

(Portage version: 2.1.6.13/cvs/Linux x86_64)

14 files changed, 190 insertions, 1003 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 10c8f379e6c0..d22f30d5bf6c 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.31 2010/01/11 07:41:55 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.32 2010/02/03 15:17:53 darkside Exp $
+
+*munin-1.4.3 (03 Feb 2010)
+
+  03 Feb 2010; Jeremy Olexa <darkside@gentoo.org>
+  -files/munin-1.3.2-plugin-cleanup.patch,
+  -files/munin-1.3.2-rrdtool-comments.patch, -munin-1.3.3.ebuild,
+  -munin-1.3.3-r1.ebuild, -munin-1.3.3-r2.ebuild,
+  -files/munin-1.3.3-Makefile.patch, -munin-1.3.4.ebuild,
+  -munin-1.3.4-r1.ebuild, +munin-1.4.3.ebuild,
+  +files/munin-1.4.3-Makefile.patch,
+  +files/munin-1.4.3-fw_conntrack_plugins.patch,
+  +files/munin-1.4.3-ping6_fix.patch,
+  +files/munin-1.4.3-plugin-cleanup.patch, metadata.xml:
+  Version bump to 1.4.3, many thanks to all the contributors on bug 300171.
+  Include ping6 fix from bug 294722. Include QA fix for perl site-dir, bug
+  298528. Remove old versions and unused patches
 
   11 Jan 2010; Benedikt Böhm <hollow@gentoo.org> munin-1.3.4-r2.ebuild:
   add Net-CIDR dependency wrt #287718
diff --git a/net-analyzer/munin/files/munin-1.3.2-plugin-cleanup.patch b/net-analyzer/munin/files/munin-1.3.2-plugin-cleanup.patch
deleted file mode 100644
index c22547adec94..000000000000
--- a/net-analyzer/munin/files/munin-1.3.2-plugin-cleanup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nuar --exclude '*~' munin-1.3.2.orig/node/node.d.linux/iostat_ios.in munin-1.3.2/node/node.d.linux/iostat_ios.in
---- munin-1.3.2.orig/node/node.d.linux/iostat_ios.in	2005-04-15 13:29:18.000000000 -0700
-+++ munin-1.3.2/node/node.d.linux/iostat_ios.in	2006-07-11 02:05:50.618754305 -0700
-@@ -53,12 +53,16 @@
- 
- sub filter {
-     my ($major, $minor, $tmpnam);
--    return 0 if ($major ==   1); # RAM devices
--    return 0 if ($major ==   9); # MD devices
--    return 0 if ($major ==  58); # LVM devices
--    return 0 if ($major == 254); # LVM2 devices
--    return 0 if ($tmpnam =~ /part\d+$/);
--    return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
-+	if(defined($major)) {
-+		return 0 if ($major ==   1); # RAM devices
-+		return 0 if ($major ==   9); # MD devices
-+		return 0 if ($major ==  58); # LVM devices
-+		return 0 if ($major == 254); # LVM2 devices
-+	}
-+	if(defined($tmpnam)) {
-+		return 0 if ($tmpnam =~ /part\d+$/);
-+		return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
-+	}
- 
-     return 1;
- }
diff --git a/net-analyzer/munin/files/munin-1.3.2-rrdtool-comments.patch b/net-analyzer/munin/files/munin-1.3.2-rrdtool-comments.patch
deleted file mode 100644
index 100352b4354e..000000000000
--- a/net-analyzer/munin/files/munin-1.3.2-rrdtool-comments.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -Nuar --exclude '*~' munin-1.3.2.orig/server/munin-graph.in munin-1.3.2/server/munin-graph.in
---- munin-1.3.2.orig/server/munin-graph.in	2005-04-15 13:31:22.000000000 -0700
-+++ munin-1.3.2/server/munin-graph.in	2006-07-10 21:41:42.000000000 -0700
-@@ -649,10 +649,10 @@
- 	    elsif ($global_headers == 1)
- 	    {
- 		push (@rrd, "COMMENT:" . (" " x $max_field_len));
--		push (@rrd, "COMMENT: Cur:");
--		push (@rrd, "COMMENT:Min:");
--		push (@rrd, "COMMENT:Avg:");
--		push (@rrd, "COMMENT:Max:  \\j");
-+		push (@rrd, "COMMENT: Cur\\:");
-+		push (@rrd, "COMMENT:Min\\:");
-+		push (@rrd, "COMMENT:Avg\\:");
-+		push (@rrd, "COMMENT:Max\\:  \\j");
- 		$global_headers++;
- 	    }
- 
-@@ -725,13 +725,13 @@
- 	    }
- 	    else
- 	    {
--		push (@rrd, "COMMENT: Cur:") unless $global_headers;
-+		push (@rrd, "COMMENT: Cur\\:") unless $global_headers;
- 		push (@rrd, "GPRINT:c$rrdname:LAST:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, "yes")?"%s":"") . "");
--		push (@rrd, "COMMENT: Min:") unless $global_headers;
-+		push (@rrd, "COMMENT: Min\\:") unless $global_headers;
- 		push (@rrd, "GPRINT:i$rrdname:MIN:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
--		push (@rrd, "COMMENT: Avg:") unless $global_headers;
-+		push (@rrd, "COMMENT: Avg\\:") unless $global_headers;
- 		push (@rrd, "GPRINT:g$rrdname:AVERAGE:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
--		push (@rrd, "COMMENT: Max:") unless $global_headers;
-+		push (@rrd, "COMMENT: Max\\:") unless $global_headers;
- 		push (@rrd, "GPRINT:a$rrdname:MAX:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "\\j");
- 		push (@{$total_pos{'min'}}, "i$rrdname");
- 		push (@{$total_pos{'avg'}}, "g$rrdname");
-@@ -792,13 +792,13 @@
- 	    
- 	    push (@rrd, "CDEF:dpostotal=ipostotal,UN,ipostotal,UNKN,IF");
- 	    push (@rrd, "LINE1:dpostotal#000000:" . $node->{client}->{$service}->{graph_total} . (" " x ($max_field_len - length ($node->{client}->{$service}->{graph_total}) + 1)));
--	    push (@rrd, "COMMENT: Cur:") unless $global_headers;
-+	    push (@rrd, "COMMENT: Cur\\:") unless $global_headers;
- 	    push (@rrd, "GPRINT:gpostotal:LAST:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
--	    push (@rrd, "COMMENT: Min:") unless $global_headers;
-+	    push (@rrd, "COMMENT: Min\\:") unless $global_headers;
- 	    push (@rrd, "GPRINT:ipostotal:MIN:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
--	    push (@rrd, "COMMENT: Avg:") unless $global_headers;
-+	    push (@rrd, "COMMENT: Avg\\:") unless $global_headers;
- 	    push (@rrd, "GPRINT:gpostotal:AVERAGE:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
--	    push (@rrd, "COMMENT: Max:") unless $global_headers;
-+	    push (@rrd, "COMMENT: Max\\:") unless $global_headers;
- 	    push (@rrd, "GPRINT:apostotal:MAX:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "\\j");
- 	}
- 
-@@ -810,8 +810,10 @@
- 	    # Do the header (title, vtitle, size, etc...)
- 	    push @complete, @{&get_header ($node, $config, $domain, $name, $service, $time)};
- 	    push @complete, @rrd;
--
--	    push (@complete, "COMMENT:Last update: " . localtime($lastupdate) .  "\\r");
-+    
-+	    my $commentstr = "Last update: " . localtime($lastupdate) .  "\\r";
-+	    $commentstr =~ s/:/\\:/g;
-+	    push (@complete, "COMMENT:".$commentstr);
- 	    
- 	    if (time - 300 < $lastupdate)
- 	    {
-@@ -841,7 +843,9 @@
- 			push @rrd_sum, "--end",(int($lastupdate/$resolutions{$time}))*$resolutions{$time};
- 		}
- 		push @rrd_sum, @rrd;
--		push (@rrd_sum, "COMMENT:Last update: " . localtime($lastupdate) .  "\\r");
-+		my $commentstr = ("Last update: " . localtime($lastupdate) .  "\\r");
-+		$commentstr =~ s/:/\\:/g;
-+		push (@rrd_sum, "COMMENT:".$commentstr);
- 
- 		my $labelled = 0;
- 		my @defined = ();
diff --git a/net-analyzer/munin/files/munin-1.3.3-Makefile.patch b/net-analyzer/munin/files/munin-1.3.3-Makefile.patch
deleted file mode 100644
index 80564482a32c..000000000000
--- a/net-analyzer/munin/files/munin-1.3.3-Makefile.patch
+++ /dev/null
@@ -1,391 +0,0 @@
---- munin-1.3.3.orig/Makefile	2006-11-10 04:39:14.000000000 -0800
-+++ munin-1.3.3/Makefile	2007-02-25 02:24:52.000000000 -0800
-@@ -28,72 +28,72 @@
- # This removes the installed config so that the next install-pass installs
- # a new config.  Target suitable for maintainers
- unconfig:
--	rm -f $(HTMLDIR)/.htaccess
--	rm -f $(CONFDIR)/munin.conf
-+	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
-+	rm -f $(DESTDIR)$(CONFDIR)/munin.conf
- 
- install-main: build
- 	$(CHECKUSER)
--	mkdir -p $(CONFDIR)/templates
--	mkdir -p $(LIBDIR)
--	mkdir -p $(BINDIR)
--	mkdir -p $(PERLLIB)
--
--	mkdir -p $(LOGDIR)
--	mkdir -p $(STATEDIR)
--	mkdir -p $(HTMLDIR)
--	mkdir -p $(DBDIR)
--	mkdir -p $(CGIDIR)
-+	mkdir -p $(DESTDIR)$(CONFDIR)/templates
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	mkdir -p $(DESTDIR)$(BINDIR)
-+	mkdir -p $(DESTDIR)$(PERLLIB)
-+
-+	mkdir -p $(DESTDIR)$(LOGDIR)
-+	mkdir -p $(DESTDIR)$(STATEDIR)
-+	mkdir -p $(DESTDIR)$(HTMLDIR)
-+	mkdir -p $(DESTDIR)$(DBDIR)
-+	mkdir -p $(DESTDIR)$(CGIDIR)
- 
--	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
-+	$(CHOWN) $(USER) $(DESTDIR)$(LOGDIR) $(DESTDIR)$(STATEDIR) $(DESTDIR)$(RUNDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR)
- 
- 	for p in build/server/*.tmpl; do    		         \
--		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
-+		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
- 	done
--	$(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/
--	$(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
--	$(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
--	$(INSTALL) -m 0755 server/VeraMono.ttf $(LIBDIR)/
--	$(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/
--	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess
--	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
--	$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
--	$(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
--	$(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/
--	$(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/
--	$(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/
--	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/
--	$(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/
-+	$(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/
-+	$(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/
-+	$(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/
-+	$(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/
-+	test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
-+	test -f "$(DESTDIR)$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/
-+	$(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/
-+	$(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
-+	$(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/
- 
- uninstall-main: build
- 	for p in build/server/*.tmpl; do    	    \
--		rm -f $(CONFDIR)/templates/"$$p"  ; \
-+		rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p"  ; \
- 	done
--	rm -f $(CONFDIR)/templates/logo.png
--	rm -f $(CONFDIR)/templates/style.css
--	rm -f $(CONFDIR)/templates/definitions.html
--	rm -f $(HTMLDIR)/.htaccess
--
--	rm -f $(CONFDIR)/munin.conf 
--
--	rm -f $(BINDIR)/munin-cron 
--
--	rm -f $(LIBDIR)/munin-update
--	rm -f $(LIBDIR)/munin-graph
--	rm -f $(LIBDIR)/munin-html
--	rm -f $(LIBDIR)/munin-limits
--	rm -f $(CGIDIR)/munin-cgi-graph
--
--	rm -f $(PERLLIB)/Munin.pm 
--	-rmdir $(CONFDIR)/templates
--	-rmdir $(CONFDIR)
--	-rmdir $(LIBDIR)
--	-rmdir $(BINDIR)
--
--	-rmdir $(LOGDIR)
--	-rmdir $(STATEDIR)
--	-rmdir $(HTMLDIR)
--	-rmdir $(DBDIR)
--	-rmdir $(CGIDIR)
-+	rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png
-+	rm -f $(DESTDIR)$(CONFDIR)/templates/style.css
-+	rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html
-+	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
-+
-+	rm -f $(DESTDIR)$(CONFDIR)/munin.conf 
-+
-+	rm -f $(DESTDIR)$(BINDIR)/munin-cron 
-+
-+	rm -f $(DESTDIR)$(LIBDIR)/munin-update
-+	rm -f $(DESTDIR)$(LIBDIR)/munin-graph
-+	rm -f $(DESTDIR)$(LIBDIR)/munin-html
-+	rm -f $(DESTDIR)$(LIBDIR)/munin-limits
-+	rm -f $(DESTDIR)$(CGIDIR)/munin-cgi-graph
-+
-+	rm -f $(DESTDIR)$(PERLLIB)/Munin.pm 
-+	-rmdir $(DESTDIR)$(CONFDIR)/templates
-+	-rmdir $(DESTDIR)$(CONFDIR)
-+	-rmdir $(DESTDIR)$(LIBDIR)
-+	-rmdir $(DESTDIR)$(BINDIR)
-+
-+	-rmdir $(DESTDIR)$(LOGDIR)
-+	-rmdir $(DESTDIR)$(STATEDIR)
-+	-rmdir $(DESTDIR)$(HTMLDIR)
-+	-rmdir $(DESTDIR)$(DBDIR)
-+	-rmdir $(DESTDIR)$(CGIDIR)
- 
- install-node: build install-node-non-snmp install-node-snmp
- 	echo Done.
-@@ -102,41 +102,41 @@
- 	echo Undone.
- 
- install-node-snmp: build
--	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/
-+	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/
- 
- uninstall-node-snmp: build
--	rm -f $(SBINDIR)/munin-node-configure-snmp
--	-rmdir $(SBINDIR)
-+	rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp
-+	-rmdir $(DESTDIR)$(SBINDIR)
- 
- install-node-non-snmp: build
- 	$(CHECKGROUP)
--	mkdir -p $(CONFDIR)/plugins
--	mkdir -p $(CONFDIR)/plugin-conf.d
--	mkdir -p $(LIBDIR)/plugins
--	mkdir -p $(SBINDIR)
--	mkdir -p $(PERLLIB)/Munin/Plugin
--
--	mkdir -p $(LOGDIR)
--	mkdir -p $(STATEDIR)
--	mkdir -p $(PLUGSTATE)
--
--	$(CHGRP) $(GROUP) $(PLUGSTATE)
--	$(CHMOD) 775 $(PLUGSTATE)
--	$(CHMOD) 755 $(CONFDIR)/plugin-conf.d
--
--	$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
--	$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
--	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
--	$(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/
-+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
-+	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
-+	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
-+	mkdir -p $(DESTDIR)$(SBINDIR)
-+	mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin
-+
-+	mkdir -p $(DESTDIR)$(LOGDIR)
-+	mkdir -p $(DESTDIR)$(STATEDIR)
-+	mkdir -p $(DESTDIR)$(PLUGSTATE)
-+
-+	$(CHGRP) $(GROUP) $(DESTDIR)$(PLUGSTATE)
-+	$(CHMOD) 775 $(DESTDIR)$(PLUGSTATE)
-+	$(CHMOD) 755 $(DESTDIR)$(CONFDIR)/plugin-conf.d
-+
-+	$(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/
-+	$(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/
-+	test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
-+	$(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/
- 
- uninstall-node-non-snmp: build
--	rm -f $(SBINDIR)/munin-node 
--	rm -f $(SBINDIR)/munin-node-configure
--	rm -f $(CONFDIR)/munin-node.conf 
--	rm -f $(SBINDIR)/munin-run
--	-rmdir $(CONFDIR)/plugin-conf.d
--	-rmdir $(CONFDIR)
--	-rmdir $(SBINDIR)
-+	rm -f $(DESTDIR)$(SBINDIR)/munin-node 
-+	rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure
-+	rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf 
-+	rm -f $(DESTDIR)$(SBINDIR)/munin-run
-+	-rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d
-+	-rmdir $(DESTDIR)$(CONFDIR)
-+	-rmdir $(DESTDIR)$(SBINDIR)
- 
- # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
- # GENERIC ONES
-@@ -148,64 +148,64 @@
- 		if echo $(INSTALL_PLUGINS) |                           \
- 		   grep $$family >/dev/null; then 	               \
- 			echo Installing $$p;                           \
--			$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;     \
-+			$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
- 		fi;                                                    \
- 	    fi                                                         \
- 	done
--	-mkdir -p $(PLUGSTATE)
--	$(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
--	$(CHMOD) 0664 $(PLUGSTATE)
--	$(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/
--	$(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/
--	mkdir -p $(PERLLIB)/Munin
--	$(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/
-+	-mkdir -p $(DESTDIR)$(PLUGSTATE)
-+	$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE)
-+	$(CHMOD) 0664 $(DESTDIR)$(PLUGSTATE)
-+	$(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
-+	$(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
-+	mkdir -p $(DESTDIR)$(PERLLIB)/Munin
-+	$(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/
- 
- uninstall-node-plugins: build $(PLUGINS)
- 	for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \
--	    rm -f $(LIBDIR)/plugins/`basename $$p` \
-+	    rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \
- 	done
--	rm -f $(LIBDIR)/plugins/plugins.history
--	rm -f $(LIBDIR)/plugins/plugin.sh
-+	rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history
-+	rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh
- 
- #TODO:
- #configure plugins.
- 
- install-man: build-man Makefile Makefile.config
--	mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
--	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
--	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/
--	$(INSTALL) -m 0644 build/doc/munin-node.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
-+	mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
-+	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/
-+	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/
-+	$(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/
- 
- uninstall-man: build-man
--	rm -f $(MANDIR)/man5/munin-node.conf.5 
--	rm -f $(MANDIR)/man5/munin.conf.5 
--	rm -f $(MANDIR)/man8/munin-node.8
--	rm -f $(MANDIR)/man8/munin-node-configure.8 
--	rm -f $(MANDIR)/man8/munin-node-configure-snmp.8
--	rm -f $(MANDIR)/man8/munin-run.8
--	rm -f $(MANDIR)/man8/munin-graph.8 
--	rm -f $(MANDIR)/man8/munin-update.8 
--	rm -f $(MANDIR)/man8/munin-limits.8
--	rm -f $(MANDIR)/man8/munin-html.8
--	rm -f $(MANDIR)/man8/munin-cron.8 
--	-rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR)
-+	rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5 
-+	rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5 
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8 
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8 
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8 
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8
-+	rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8 
-+	-rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)
- 
- install-doc: build-doc
--	mkdir -p $(DOCDIR)/resources
--	$(INSTALL) -m 0644 README $(DOCDIR)/
--	$(INSTALL) -m 0644 COPYING $(DOCDIR)/
--	$(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources
-+	mkdir -p $(DESTDIR)$(DOCDIR)/resources
-+	$(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/
-+	$(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
-+	$(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources
- 
- uninstall-doc: build-doc
--	rm -rf $(DOCDIR)
-+	rm -rf $(DESTDIR)$(DOCDIR)
- 
- build: build-stamp
- 
-@@ -349,11 +349,11 @@
- endif
- 
- node-monkeywrench: install-node
--	rm -rf $(CONFDIR)/plugins
--	rm -rf $(LIBDIR)/plugins
--	mkdir -p $(LIBDIR)/plugins
--	mkdir -p $(CONFDIR)/plugins
--	cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
-+	rm -rf $(DESTDIR)$(CONFDIR)/plugins
-+	rm -rf $(DESTDIR)$(LIBDIR)/plugins
-+	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
-+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
-+	cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/
- 	$(SBINDIR)/munin-node-configure --suggest
- 	echo 'Done?'
- 
---- munin-1.3.3.orig/Makefile.config	2006-11-10 04:39:31.000000000 -0800
-+++ munin-1.3.3/Makefile.config	2007-02-25 02:08:46.000000000 -0800
-@@ -9,10 +9,10 @@
- #
- # the base of the Munin installation.
- # 
--PREFIX     = $(DESTDIR)/opt/munin
-+PREFIX     = /usr
- 
- # Where Munin keeps its configurations (server.conf, client.conf, ++)
--CONFDIR    = $(DESTDIR)/etc/opt/munin
-+CONFDIR    = /etc/munin
- 
- # Server only - where to put munin-cron
- BINDIR     = $(PREFIX)/bin
-@@ -21,31 +21,31 @@
- 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)/var/www
--CGIDIR     = $(HTMLDIR)/cgi
-+HTMLDIR    = /var/www/localhost/htdocs/munin
-+CGIDIR     = /var/www/localhost/cgi-bin
- 
- # Client only - Where to put RRD files and other intenal data
--DBDIR      = $(DESTDIR)/var/opt/munin
-+DBDIR      = /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     = $(DESTDIR)/var/log/munin
-+LOGDIR     = /var/log/munin
- 
- # Location of PID files and other statefiles. On the server, must be
- # writable by the user "munin".
--STATEDIR   = $(DESTDIR)/var/run/munin
-+STATEDIR   = /var/run/munin
- 
- # The perl interpreter to use
- PERL       = $(shell which perl)
-@@ -67,10 +67,11 @@
- BASH       = /bin/bash
- 
- # Server only - Where to install the perl libraries
--PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
-+PERLLIB    = $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
- 
- # Client only - Install plugins for this architecture
--OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
-+# LANG=C is because some locales are a bit different in their alphabet (eg ee_EE).
-+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.3-Makefile.patch b/net-analyzer/munin/files/munin-1.4.3-Makefile.patch
new file mode 100644
index 000000000000..7d8cdf0917d6
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.4.3-Makefile.patch
@@ -0,0 +1,75 @@
+--- 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    = $(PREFIX)/var/www/localhost/htdocs/munin
++CGIDIR     = $(PREFIX)/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.3-fw_conntrack_plugins.patch b/net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch
new file mode 100644
index 000000000000..8161cd64174f
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.4.3-fw_conntrack_plugins.patch
@@ -0,0 +1,32 @@
+--- plugins/node.d.linux/fw_forwarded_local.in.bak	2010-01-08 11:23:26.000000000 -0800
++++ plugins/node.d.linux/fw_forwarded_local.in	2010-01-08 11:24:24.000000000 -0800
+@@ -32,7 +32,7 @@
+ =cut
+ 
+ if [ "$1" = "autoconf" ]; then
+-	if [ -r /proc/net/ip_conntrack ]
++	if [ -r /proc/net/ip_conntrack -o -r /proc/net/nf_conntrack ]
+ 	then
+ 		echo yes
+ 	else
+@@ -53,6 +53,13 @@
+ 	exit 0
+ fi
+ 
++if [ -r /proc/net/ip_conntrack ]; then
++	_conntrack_file=/proc/net/ip_conntrack
++else
++	_conntrack_file=/proc/net/nf_conntrack
++fi
++
++
+ perl -ne '
+     BEGIN { $forward=0; $local=0; }
+ 
+@@ -65,5 +72,5 @@
+        }
+     }
+     END { print "forward.value $forward\nlocal.value $local\n" }
+-' </proc/net/ip_conntrack
++' <_conntrack_file
+ 
diff --git a/net-analyzer/munin/files/munin-1.4.3-ping6_fix.patch b/net-analyzer/munin/files/munin-1.4.3-ping6_fix.patch
new file mode 100644
index 000000000000..d0e9f90eba09
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.4.3-ping6_fix.patch
@@ -0,0 +1,11 @@
+Upstream report: http://munin.projects.linpro.no/ticket/854
+Downstream report: https://bugs.gentoo.org/show_bug.cgi?id=294722
+--- munin-1.4.3/plugins/node.d/ping_.in.orig	2009-11-26 15:47:44.283833343 +0100
++++ munin-1.4.3/plugins/node.d/ping_.in	2009-11-26 13:09:28.648828197 +0100
+@@ -71,5 +71,5 @@
+ fi
+ 
+ 
+-${ping:-ping} ${ping_args:-'-c 2'} ${host} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;'
++${PING:-ping} ${ping_args:-'-c 2'} ${host} ${ping_args2} | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;'
+ 
diff --git a/net-analyzer/munin/files/munin-1.4.3-plugin-cleanup.patch b/net-analyzer/munin/files/munin-1.4.3-plugin-cleanup.patch
new file mode 100644
index 000000000000..8fcaaff6ac4a
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.4.3-plugin-cleanup.patch
@@ -0,0 +1,25 @@
+--- munin-1.4.3/plugins/node.d.linux/iostat_ios.in.bak	2008-04-13 15:29:37.000000000 +0100
++++ munin-1.4.3/plugins/node.d.linux/iostat_ios.in	2008-04-13 15:30:59.000000000 +0100
+@@ -59,12 +59,16 @@
+ 
+ sub filter {
+     my ($major, $minor, $tmpnam) = @_;
+-    return 0 if ($major ==   1); # RAM devices
+-    return 0 if ($major ==   9); # MD devices
+-    return 0 if ($major ==  58); # LVM devices
+-    return 0 if ($major == 254); # LVM2 devices
+-    return 0 if ($tmpnam =~ /part\d+$/);
+-    return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
++    if(defined($major)) {
++        return 0 if ($major ==   1); # RAM devices
++        return 0 if ($major ==   9); # MD devices
++        return 0 if ($major ==  58); # LVM devices
++        return 0 if ($major == 254); # LVM2 devices
++    }
++    if(defined($tmpnam)) {
++        return 0 if ($tmpnam =~ /part\d+$/);
++        return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
++    }
+ 
+     return 1;
+ }
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index c577ef7b455b..9c4737e1c122 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -18,10 +18,5 @@
 	</longdescription>
 	<use>
 		<flag name='irc'>installs deps for monitoring IRC</flag>
-		<flag name='munin-apache'>installs deps for monitoring apache</flag>
-		<flag name='munin-dhcp'>installs deps for monitoring DHCP</flag>
-		<flag name='munin-irc'>installs deps for monitoring IRC</flag>
-		<flag name='munin-squid'>installs deps for monitoring squid</flag>
-		<flag name='munin-surfboard'>installs deps for monitoring a Motoro Surfboard Cable modem</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/munin/munin-1.3.3-r1.ebuild b/net-analyzer/munin/munin-1.3.3-r1.ebuild
deleted file mode 100644
index 67c950bdfa19..000000000000
--- a/net-analyzer/munin/munin-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.3-r1.ebuild,v 1.1 2007/05/13 06:07:48 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.sourceforge.net"
-SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc minimal munin-irc munin-dhcp munin-surfboard munin-apache munin-squid ssl"
-
-# Upstream's listing of required modules is NOT correct!
-DEPEND_COM="dev-lang/perl
-			dev-perl/net-server
-			sys-process/procps
-			ssl? ( dev-perl/Net-SSLeay )
-			dev-perl/Net-SNMP
-			dev-perl/DateManip
-			virtual/perl-Time-HiRes
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool )
-			munin-irc? ( dev-perl/Net-IRC )
-			munin-dhcp? ( dev-perl/Net-Netmask dev-perl/libwww-perl )
-			munin-surfboard? ( dev-perl/libwww-perl )
-			munin-apache? ( dev-perl/libwww-perl )
-			munin-squid? ( virtual/perl-MIME-Base64 )"
-			# 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}"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_unpack() {
-	if use !minimal; then
-		if ! built_with_use net-analyzer/rrdtool perl ; then
-			die 'Sorry, munin needs net-analyzer/rrdtool built with USE=perl.'
-		fi
-	fi
-	unpack ${A}
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.3-Makefile.patch
-	# Fix noise in the plugins
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-plugin-cleanup.patch
-}
-
-src_compile() {
-	emake build build-man || die "build/build-man failed"
-	if use doc; then
-		emake 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/server/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} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed"
-	fowners munin:munin ${dirs}
-
-	emake DESTDIR="${D}" install-man || die "install manpages failed"
-
-	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
-	insinto /var/lib/munin
-	newins ${FILESDIR}/${P}-crontab crontab
-	newinitd ${FILESDIR}/munin-node_init.d_1.3.3-r1 munin-node
-	newconfd ${FILESDIR}/munin-node_conf.d_1.3.3-r1 munin-node
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
-}
-
-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
-	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."
-	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"
-	elog ""
-	elog "Please note that the crontab has undergone some modifications"
-	elog "since 1.3.2, and you should update to it!"
-}
diff --git a/net-analyzer/munin/munin-1.3.3-r2.ebuild b/net-analyzer/munin/munin-1.3.3-r2.ebuild
deleted file mode 100644
index c9e44e5e3016..000000000000
--- a/net-analyzer/munin/munin-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.3-r2.ebuild,v 1.2 2007/06/30 01:32:01 kumba Exp $
-
-inherit eutils
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.sourceforge.net"
-SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="doc minimal munin-irc munin-dhcp munin-surfboard munin-apache munin-squid ssl"
-
-# Upstream's listing of required modules is NOT correct!
-DEPEND_COM="dev-lang/perl
-			dev-perl/net-server
-			sys-process/procps
-			ssl? ( dev-perl/Net-SSLeay )
-			dev-perl/Net-SNMP
-			dev-perl/DateManip
-			virtual/perl-Time-HiRes
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool )
-			munin-irc? ( dev-perl/Net-IRC )
-			munin-dhcp? ( dev-perl/Net-Netmask dev-perl/libwww-perl )
-			munin-surfboard? ( dev-perl/libwww-perl )
-			munin-apache? ( dev-perl/libwww-perl )
-			munin-squid? ( virtual/perl-MIME-Base64 )"
-			# 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}"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_unpack() {
-	if use !minimal; then
-		if ! built_with_use net-analyzer/rrdtool perl ; then
-			die 'Sorry, munin needs net-analyzer/rrdtool built with USE=perl.'
-		fi
-	fi
-	unpack ${A}
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.3-Makefile.patch
-	# Fix noise in the plugins
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-plugin-cleanup.patch
-}
-
-src_compile() {
-	emake build build-man || die "build/build-man failed"
-	if use doc; then
-		emake 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/server/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} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed"
-	fowners munin:munin ${dirs}
-
-	emake DESTDIR="${D}" install-man || die "install manpages failed"
-
-	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
-	insinto /var/lib/munin
-	newins ${FILESDIR}/${P}-crontab crontab
-	newinitd ${FILESDIR}/munin-node_init.d_1.3.3-r1 munin-node
-	newconfd ${FILESDIR}/munin-node_conf.d_1.3.3-r1 munin-node
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
-}
-
-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
-	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."
-	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"
-	elog ""
-	elog "Please note that the crontab has undergone some modifications"
-	elog "since 1.3.2, and you should update to it!"
-}
diff --git a/net-analyzer/munin/munin-1.3.3.ebuild b/net-analyzer/munin/munin-1.3.3.ebuild
deleted file mode 100644
index 1604047d7ec4..000000000000
--- a/net-analyzer/munin/munin-1.3.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.3.ebuild,v 1.3 2007/05/13 06:09:08 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.sourceforge.net"
-SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc minimal munin-irc munin-dhcp munin-surfboard munin-apache munin-squid ssl"
-
-# Upstream's listing of required modules is NOT correct!
-DEPEND_COM="dev-lang/perl
-			dev-perl/net-server
-			sys-process/procps
-			ssl? ( dev-perl/Net-SSLeay )
-			dev-perl/Net-SNMP
-			dev-perl/DateManip
-			virtual/perl-Time-HiRes
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool )
-			munin-irc? ( dev-perl/Net-IRC )
-			munin-dhcp? ( dev-perl/Net-Netmask dev-perl/libwww-perl )
-			munin-surfboard? ( dev-perl/libwww-perl )
-			munin-apache? ( dev-perl/libwww-perl )
-			munin-squid? ( virtual/perl-MIME-Base64 )"
-			# 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}"
-RDEPEND="${DEPEND_COM}
-		virtual/cron"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_unpack() {
-	if use !minimal; then
-		if ! built_with_use net-analyzer/rrdtool perl ; then
-			die 'Sorry, munin needs net-analyzer/rrdtool built with USE=perl.'
-		fi
-	fi
-	unpack ${A}
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.3-Makefile.patch
-	# Fix noise in the plugins
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-plugin-cleanup.patch
-
-	# Merged by upstream
-	## Make it work with new versions of Rrdtool where : in COMMENT blocks must
-	## be escaped!
-	##EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.2-rrdtool-comments.patch
-}
-
-src_compile() {
-	emake build build-man || die "build/build-man failed"
-	if use doc; then
-		emake build-doc || die "build-doc 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} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed"
-	fowners munin:munin ${dirs}
-
-	emake DESTDIR="${D}" install-man || die "install manpages failed"
-
-	insinto /etc/munin/plugin-conf.d/
-	newins ${FILESDIR}/${PN}-1.3.2-plugins.conf munin-node
-
-	# ensure TLS is disabled if built without SSL
-	use ssl || echo "tls disabled" >>${D}/etc/munin/munin-node.conf
-
-	# make sure we've got everything in the correct directory
-	insinto /var/lib/munin
-	newins ${FILESDIR}/${P}-crontab crontab
-	newinitd ${FILESDIR}/munin-init.d munin-node
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
-}
-
-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
-	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."
-	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"
-	elog ""
-	elog "Please note that the crontab has undergone some modifications"
-	elog "since 1.3.2, and you should update to it!"
-}
diff --git a/net-analyzer/munin/munin-1.3.4.ebuild b/net-analyzer/munin/munin-1.3.4.ebuild
deleted file mode 100644
index acfec85fc883..000000000000
--- a/net-analyzer/munin/munin-1.3.4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4.ebuild,v 1.2 2008/06/01 20:56:24 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.sourceforge.net"
-SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="doc minimal munin-irc munin-dhcp munin-surfboard munin-apache munin-squid ssl"
-
-# Upstream's listing of required modules is NOT correct!
-DEPEND_COM="dev-lang/perl
-			dev-perl/net-server
-			sys-process/procps
-			ssl? ( dev-perl/Net-SSLeay )
-			dev-perl/Net-SNMP
-			dev-perl/DateManip
-			virtual/perl-Time-HiRes
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool )
-			munin-irc? ( dev-perl/Net-IRC )
-			munin-dhcp? ( dev-perl/Net-Netmask dev-perl/libwww-perl )
-			munin-surfboard? ( dev-perl/libwww-perl )
-			munin-apache? ( dev-perl/libwww-perl )
-			munin-squid? ( virtual/perl-MIME-Base64 )"
-			# 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}"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_unpack() {
-	if use !minimal; then
-		if ! built_with_use net-analyzer/rrdtool perl ; then
-			die 'Sorry, munin needs net-analyzer/rrdtool built with USE=perl.'
-		fi
-	fi
-	unpack ${A}
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-Makefile.patch
-	# Fix noise in the plugins
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-plugin-cleanup.patch
-
-	# Bug #195964, fix up conntrack
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/munin-1.3.3-fw_conntrack_plugins.patch
-}
-
-src_compile() {
-	emake build build-man || die "build/build-man failed"
-	if use doc; then
-		emake 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/server/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} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed"
-	fowners munin:munin ${dirs}
-
-	emake DESTDIR="${D}" install-man || die "install manpages failed"
-
-	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
-	insinto /var/lib/munin
-	newins ${FILESDIR}/${PN}-1.3.3-crontab crontab
-	newinitd ${FILESDIR}/munin-node_init.d_1.3.3-r1 munin-node
-	newconfd ${FILESDIR}/munin-node_conf.d_1.3.3-r1 munin-node
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
-}
-
-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."
-	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"
-	elog ""
-	elog "Please note that the crontab has undergone some modifications"
-	elog "since 1.3.2, and you should update to it!"
-}
diff --git a/net-analyzer/munin/munin-1.3.4-r1.ebuild b/net-analyzer/munin/munin-1.4.3.ebuild
index 8c243047bbc8..84a77633139c 100644
--- a/net-analyzer/munin/munin-1.3.4-r1.ebuild
+++ b/net-analyzer/munin/munin-1.4.3.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4-r1.ebuild,v 1.7 2009/03/08 01:49:52 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.3.ebuild,v 1.1 2010/02/03 15:17:53 darkside Exp $
 
 EAPI="2"
 
 inherit eutils
 
 DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.sourceforge.net"
-SRC_URI="mirror://sourceforge/munin/${PN}_${PV}.tar.gz"
+HOMEPAGE="http://munin.projects.linpro.no/"
+SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc sparc x86"
+KEYWORDS="~amd64 ~mips ~sparc ~x86"
 IUSE="doc minimal irc mysql postgres ssl"
 
 # Upstream's listing of required modules is NOT correct!
@@ -24,6 +25,8 @@ DEPEND_COM="dev-lang/perl
 			postgres? ( dev-perl/DBD-Pg virtual/postgresql-base )
 			irc? ( dev-perl/Net-IRC )
 			dev-perl/DateManip
+			dev-perl/Log-Log4perl
+			dev-perl/Net-CIDR
 			dev-perl/Net-Netmask
 			dev-perl/Net-SNMP
 			dev-perl/libwww-perl
@@ -49,25 +52,24 @@ pkg_setup() {
 	enewuser munin 177 -1 /var/lib/munin munin
 }
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	# upstream needs a lot of DESTDIR loving
 	# and Gentoo location support
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.4.3-Makefile.patch
 	# Fix noise in the plugins
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.3.4-plugin-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-1.4.3-plugin-cleanup.patch
 
 	# Bug #195964, fix up conntrack
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.3-fw_conntrack_plugins.patch
+	# Patch modified as it has only been partially taken up by upstream
+	epatch "${FILESDIR}"/${PN}-1.4.3-fw_conntrack_plugins.patch
 
-	# Bug #225671, cannot produce HTML if RRD and graphs have not yet run.
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-no-html-if-no-input.patch
+	epatch "${FILESDIR}"/${P}-ping6_fix.patch
 }
 
 src_compile() {
-	emake build build-man || die "build/build-man failed"
+	emake -j 1 build build-man || die "build/build-man failed"
 	if use doc; then
-		emake build-doc || die "build-doc failed"
+		emake -j 1 build-doc || die "build-doc failed"
 	fi
 
 	#Ensure TLS is disabled if built without SSL
@@ -85,24 +87,29 @@ src_install() {
 	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}
 
-	emake DESTDIR="${D}" install-main install-man install-node install-node-plugins || die "install failed"
-	fowners munin:munin ${dirs}
-
-	emake DESTDIR="${D}" install-man || die "install manpages failed"
+	emake -j 1 DESTDIR="${D}" install || die "install failed"
+	fowners munin:munin ${dirs} || die
 
 	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+	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
-	newinitd "${FILESDIR}"/munin-node_init.d_1.3.3-r1 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.3.3-r1 munin-node
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
+	newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
+	newinitd "${FILESDIR}"/munin-node_init.d_1.3.3-r1 munin-node || die
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.3.3-r1 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() {