--- /usr/portage/net-analyzer/munin/munin-2.0.11.ebuild	2013-02-01 17:16:30.000000000 +0100
+++ munin/munin-2.0.11.ebuild	2013-02-05 13:52:17.525689814 +0100
@@ -26,7 +26,7 @@
 # Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
 # We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
 DEPEND_COM="dev-lang/perl[berkdb]
-			sys-process/procps
+			userland_GNU? ( sys-process/procps )
 			doc? ( dev-python/sphinx )
 			asterisk? ( dev-perl/Net-Telnet )
 			irc? ( dev-perl/Net-IRC )
@@ -179,7 +179,7 @@
 	rm -rf "${D}"/run
 
 	# remove the plugins for non-Gentoo package managers
-	rm "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
 
 	insinto /etc/munin/plugin-conf.d/
 	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
@@ -227,7 +227,7 @@
 	if use minimal; then
 		# This requires the presence of munin-update, which is part of
 		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+		rm -f "${D}"/usr/libexec/munin/plugins/munin_stats
 	else
 		dodir /usr/lib/tmpfiles.d
 		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
@@ -235,7 +235,7 @@
 EOF
 
 		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+		rm -f "${D}"/usr/libexec/${PN}/*.ttf || die
 
 		if use cgi; then
 			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die