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

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

9 files changed, 66 insertions, 532 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 51b4c4040267..e16c7a510f6f 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.81 2012/07/25 03:01:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.82 2012/07/25 03:32:29 flameeyes Exp $
+
+*munin-1.4.7-r2 (25 Jul 2012)
+
+  25 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-1.4.7-r2.ebuild,
+  -files/munin-1.4.7-munin-version-identifier.patch,
+  -files/munin-node_conf.d_1.4.5-r3, -files/munin-node_init.d_1.4.5-r3,
+  -files/munin-node_init.d_1.4.7, -munin-1.4.7-r1.ebuild, -munin-1.4.7.ebuild,
+  -munin-2.0.2-r2.ebuild, munin-2.0.3.ebuild:
+  Backport 2.0.x changes to the ebuild to 1.4.7 (and use a patchset tarball);
+  re-sync a few things lost in 2.0.x; cleanup old ebuilds and files.
 
 *munin-2.0.3 (25 Jul 2012)
 
diff --git a/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch b/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch
deleted file mode 100644
index 22c4d730aa28..000000000000
--- a/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 480f78e713b9e9a425ad425342afac70420a4043 Mon Sep 17 00:00:00 2001
-From: Jeremy Olexa <darkside@gentoo.org>
-Date: Wed, 18 Apr 2012 16:30:57 +0000
-Subject: [PATCH] Fix warnings from previous patch
-
-Use of uninitialized value $Munin::Common::Defaults::MUNIN_VERSION in
-sprintf at /etc/munin/plugins/nginx_status line 110.
----
- plugins/node.d/nginx_request.in |    2 ++
- plugins/node.d/nginx_status.in  |    2 ++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/node.d/nginx_request.in b/plugins/node.d/nginx_request.in
-index 402ce54..d3933e1 100644
---- a/plugins/node.d/nginx_request.in
-+++ b/plugins/node.d/nginx_request.in
-@@ -55,6 +55,8 @@ license.  Munin is GPLv2 licensed.
- 
- =cut
- 
-+use Munin::Plugin;
-+
- my $ret = undef;
- 
- if (! eval "require LWP::UserAgent;"){
-diff --git a/plugins/node.d/nginx_status.in b/plugins/node.d/nginx_status.in
-index 0d5d966..a427fc0 100644
---- a/plugins/node.d/nginx_status.in
-+++ b/plugins/node.d/nginx_status.in
-@@ -55,6 +55,8 @@ license.  Munin is GPLv2 licensed.
- 
- =cut
- 
-+use Munin::Plugin;
-+
- my $ret = undef;
- 
- if (! eval "require LWP::UserAgent;"){
--- 
-1.7.3.4
-
diff --git a/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3 b/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3
deleted file mode 100644
index 39df4369441c..000000000000
--- a/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3,v 1.1 2011/03/22 08:37:04 robbat2 Exp $
-
-# Set to the nice level for daemon
-NICE_LEVEL=1
-PIDFILE=$(/usr/bin/awk '/^pid_file/{s=$2}END{print s}' /etc/munin/munin-node.conf)
-
-# vim: filetype=gentoo-conf-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3 b/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3
deleted file mode 100644
index 5853c54c5100..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3,v 1.2 2011/04/03 22:15:50 flameeyes Exp $
-
-[ -z "${NAME}" ] && NAME="munin-node"
-[ -z "${PIDFILE}" ] && PIDFILE=/var/run/munin/$NAME.pid
-
-depend() {
-	need net
-	before cron
-}
-
-start() {
-	local piddir=$(dirname ${PIDFILE})
-	[ -d ${piddir} ] || mkdir -p ${piddir}
-
-	NICE_LEVEL="${NICE_LEVEL:-0}"
-	ebegin "Starting $NAME"
-	start-stop-daemon --quiet --nicelevel $NICE_LEVEL --start --pidfile $PIDFILE --exec /usr/sbin/$NAME
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $NAME"
-	start-stop-daemon --quiet --stop --pidfile $PIDFILE
-	eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_1.4.7 b/net-analyzer/munin/files/munin-node_init.d_1.4.7
deleted file mode 100644
index 202a940402e7..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_1.4.7
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_1.4.7,v 1.1 2012/07/07 07:21:50 jlec Exp $
-
-get_munin_config() {
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-: ${NAME:="munin-node"}
-: ${CFGFILE:=/etc/munin/munin-node.conf}
-: ${PIDFILE:=$(get_munin_config pid_file)}
-: ${NICE_LEVEL:=0}
-
-fix_dirs() {
-	local rundir piddir
-	piddir=$(dirname ${PIDFILE})
-	rundir="/var/run/munin/plugin-state	/var/run/munin/spool"
-	for dir in ${piddir} ${rundir}; do
-		[ -d ${dir} ] || mkdir -p ${dir}
-		chown munin:munin ${dir}
-	done
-}
-
-depend() {
-	config "$CFGFILE"
-
-	need net
-	before cron
-
-	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
-		use logger
-}
-
-start() {
-	fix_dirs
-
-	ebegin "Starting $NAME"
-	start-stop-daemon --nicelevel $NICE_LEVEL --start --pidfile $PIDFILE --exec /usr/sbin/$NAME -- \
-		--config "$CFGFILE"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $NAME"
-	start-stop-daemon --stop --pidfile $PIDFILE
-	eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-1.4.7-r1.ebuild b/net-analyzer/munin/munin-1.4.7-r1.ebuild
deleted file mode 100644
index b73a7cd0bedb..000000000000
--- a/net-analyzer/munin/munin-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.7-r1.ebuild,v 1.1 2012/07/07 07:21:50 jlec Exp $
-
-EAPI=2
-
-inherit eutils user
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="asterisk doc irc java memcached minimal mysql postgres ssl"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-DEPEND_COM="dev-lang/perl
-			sys-process/procps
-			asterisk? ( dev-perl/Net-Telnet )
-			irc? ( dev-perl/Net-IRC )
-			java? ( >=virtual/jdk-1.5 )
-			mysql? ( virtual/mysql
-					 dev-perl/Cache-Cache
-					 dev-perl/DBD-mysql )
-			ssl? ( dev-perl/Net-SSLeay )
-			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
-			memcached? ( dev-perl/Cache-Memcached )
-			dev-perl/DateManip
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
-			dev-perl/net-server
-			dev-perl/DBI
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-MIME-Base64
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			virtual/perl-Time-HiRes
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool[perl]
-						dev-perl/Log-Log4perl )"
-			# Sybase isn't supported in Gentoo
-			#munin-sybase? (	 dev-perl/DBD-Sybase )
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_prepare() {
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
-
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-temp.patch
-	epatch "${FILESDIR}"/${PN}-1.4.*-munin-version-identifier.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-fix-asterisk-plugins.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-if_-hardened-v2.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-multi.patch
-
-	# Don't build java plugins if not requested via USE.
-	if ! use java; then
-		# sed is needed so the java plugins aren't automagically built.
-		sed -i -e 's: build-plugins-java : :' \
-			-e 's: install-plugins-java : :' Makefile || die
-	fi
-
-	# Bug 304447, fix for gentoo PS location
-	sed -i -e 's,/usr/bin/ps,/bin/ps,g' \
-		"${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die
-
-	# bug 367785, cleanup make output by disabling HP-UX cruft
-	sed -i -e "/plugins\/\*\.adv/d" Makefile || die
-}
-
-src_compile() {
-	emake -j 1 build build-man || die "build/build-man failed"
-	if use doc; then
-		emake -j 1 build-doc || die "build-doc failed"
-	fi
-
-	#Ensure TLS is disabled if built without SSL
-	if ! use ssl; then
-		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
-			|| die "Fixing munin-node.conf Failed!"
-		echo "tls disabled" >> ${S}/build/master/munin.conf \
-			|| die "Fixing munin.conf Failed!"
-	fi
-
-}
-
-src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/spool/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	if use minimal; then
-		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
-			install-plugins-prime || die "install failed"
-	else
-		emake -j 1 DESTDIR="${D}" install || die "install failed"
-	fi
-	fowners munin:munin ${dirs} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die
-
-	# make sure we've got everything in the correct directory
-	insinto /var/lib/munin
-	newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
-	newinitd "${FILESDIR}"/munin-node_init.d_${PV} munin-node || die
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node || die
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \
-		|| die
-
-	# bug 254968
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/logrotate.d-munin munin || die
-}
-
-pkg_config() {
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-	# dcron is very fussy about syntax
-	# the following is the only form that works in BOTH dcron and vixie-cron
-	crontab - -u munin </var/lib/munin/crontab
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
-	if ! use minimal; then
-		elog "To have munin's cronjob automatically configured for you if this is"
-		elog "your munin master installation, please:"
-		elog "emerge --config net-analyzer/munin"
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.2-r2.ebuild b/net-analyzer/munin/munin-1.4.7-r2.ebuild
index 6018a1edeb21..d60ead3476fb 100644
--- a/net-analyzer/munin/munin-2.0.2-r2.ebuild
+++ b/net-analyzer/munin/munin-1.4.7-r2.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2-r2.ebuild,v 1.2 2012/07/24 15:00:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.7-r2.ebuild,v 1.1 2012/07/25 03:32:29 flameeyes Exp $
 
 EAPI=4
 
-PATCHSET=11
+PATCHSET=1
 
-inherit eutils user versionator java-pkg-opt-2
+inherit eutils user
 
 MY_P=${P/_/-}
 
 DESCRIPTION="Munin Server Monitoring Tool"
 HOMEPAGE="http://munin-monitoring.org/"
 SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
-	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.bz2"
+	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi ipv6 syslog"
-REQUIRED_USE="cgi? ( !minimal )"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="asterisk doc irc memcached minimal mysql postgres ssl"
 
 # Upstream's listing of required modules is NOT correct!
 # Some of the postgres plugins use DBD::Pg, while others call psql directly.
@@ -34,18 +33,13 @@ DEPEND_COM="dev-lang/perl
 			ssl? ( dev-perl/Net-SSLeay )
 			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
 			memcached? ( dev-perl/Cache-Memcached )
-			cgi? ( dev-perl/FCGI )
-			syslog? ( virtual/perl-Sys-Syslog )
-			dev-perl/DBI
 			dev-perl/DateManip
-			dev-perl/File-Copy-Recursive
-			dev-perl/IO-Socket-INET6
-			dev-perl/Log-Log4perl
 			dev-perl/Net-CIDR
 			dev-perl/Net-Netmask
 			dev-perl/Net-SNMP
 			dev-perl/libwww-perl
-			dev-perl/net-server[ipv6(-)?]
+			dev-perl/net-server
+			dev-perl/DBI
 			virtual/perl-Digest-MD5
 			virtual/perl-Getopt-Long
 			virtual/perl-MIME-Base64
@@ -53,110 +47,81 @@ DEPEND_COM="dev-lang/perl
 			virtual/perl-Text-Balanced
 			virtual/perl-Time-HiRes
 			!minimal? ( dev-perl/HTML-Template
-						>=net-analyzer/rrdtool-1.3[perl] )"
+						net-analyzer/rrdtool[perl]
+						dev-perl/Log-Log4perl )"
+			# Sybase isn't supported in Gentoo
+			#munin-sybase? (	 dev-perl/DBD-Sybase )
 
 # Keep this seperate, as previous versions have had other deps here
 DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-	)"
+	virtual/perl-Module-Build"
 RDEPEND="${DEPEND_COM}
-		java? ( >=virtual/jre-1.5 )
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)"
-
-S="${WORKDIR}/${MY_P}"
+		!minimal? ( virtual/cron )"
 
 pkg_setup() {
 	enewgroup munin
 	enewuser munin 177 -1 /var/lib/munin munin
-	java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
 	epatch "${WORKDIR}"/patches/*.patch
-	java-pkg-opt-2_src_prepare
-}
 
-src_configure() {
-	local cgidir='$(DESTDIR)/var/www/localhost/cgi-bin'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	cat - >> "${S}"/Makefile.config <<EOF
-PREFIX=\$(DESTDIR)/usr
-CONFDIR=\$(DESTDIR)/etc/munin
-DOCDIR=${T}/useless/doc
-MANDIR=\$(PREFIX)/share/man
-LIBDIR=\$(PREFIX)/libexec/munin
-HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-CGIDIR=${cgidir}
-DBDIR=\$(DESTDIR)/var/lib/munin
-LOGDIR=\$(DESTDIR)/var/log/munin
-PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
-JCVALID=$(usex java yes no)
-EOF
+	# Don't build java plugins in this series
+	# sed is needed so the java plugins aren't automagically built.
+	sed -i -e 's: build-plugins-java : :' \
+		-e 's: install-plugins-java : :' Makefile || die
 }
 
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
 src_compile() {
-	emake -j1
+	emake -j 1 build build-man
+	if use doc; then
+		emake -j 1 build-doc
+	fi
+
+	#Ensure TLS is disabled if built without SSL
+	if ! use ssl; then
+		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
+			|| die "Fixing munin-node.conf Failed!"
+		echo "tls disabled" >> ${S}/build/master/munin.conf \
+			|| die "Fixing munin.conf Failed!"
+	fi
+
 }
 
 src_install() {
-	local dirs="
-		/var/log/munin/
-		/var/lib/munin/plugin-state/
-		/etc/munin/plugin-conf.d/
-		/etc/munin/plugins/"
+	local dirs
+	dirs="/var/log/munin/ /var/lib/munin/"
+	dirs="${dirs} /var/lib/munin/plugin-state/"
+	dirs="${dirs} /var/run/munin/plugin-state/"
+	dirs="${dirs} /var/run/munin/spool/"
+	dirs="${dirs} /etc/munin/plugin-conf.d/"
+	dirs="${dirs} /etc/munin/munin-conf.d/"
+	dirs="${dirs} /etc/munin/plugins/"
 	keepdir ${dirs}
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
 
-	local install_targets="install-common-prime install-node-prime install-plugins-prime"
-	use java && install_targets+=" install-plugins-java"
-	use minimal || install_targets=install
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 DESTDIR="${D}" ${install_targets}
+	if use minimal; then
+		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
+			install-plugins-prime
+	else
+		emake -j 1 DESTDIR="${D}" install
+	fi
 	fowners munin:munin ${dirs}
 
 	insinto /etc/munin/plugin-conf.d/
 	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
 
-	# make sure we've got everything in the correct directory
 	newinitd "${FILESDIR}"/munin-node_init.d_2.0.2 munin-node
 	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-	dodoc README ChangeLog INSTALL build/resources/apache*
+	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
 
 	# bug 254968
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/logrotate.d-munin munin
 
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
 	if ! use minimal; then
 		exeinto /etc/local.d/
 		newexe "${FILESDIR}"/localstart-munin 50munin.start
 
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-		fi
-
 		dodir /usr/share/${PN}
 		cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
 # Force the shell to bash
@@ -198,6 +163,7 @@ EOF
 	fi
 }
 
+
 pkg_config() {
 	if use minimal; then
 		einfo "Nothing to do."
@@ -205,7 +171,7 @@ pkg_config() {
 	fi
 
 	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
+	einfo "installation from /usr/share/${PN}/f?crontab"
 	einfo "If you have a large site, you may wish to customize it."
 	read
 
@@ -219,7 +185,8 @@ pkg_config() {
 }
 
 pkg_postinst() {
-	elog
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
 	if ! use minimal; then
 		elog "To have munin's cronjob automatically configured for you if this is"
 		elog "your munin master installation, please:"
diff --git a/net-analyzer/munin/munin-1.4.7.ebuild b/net-analyzer/munin/munin-1.4.7.ebuild
deleted file mode 100644
index 4684ae302d3a..000000000000
--- a/net-analyzer/munin/munin-1.4.7.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.7.ebuild,v 1.2 2012/06/12 02:29:18 zmedico Exp $
-
-EAPI=2
-
-inherit eutils user
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="asterisk doc irc java memcached minimal mysql postgres ssl"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-DEPEND_COM="dev-lang/perl
-			sys-process/procps
-			asterisk? ( dev-perl/Net-Telnet )
-			irc? ( dev-perl/Net-IRC )
-			java? ( >=virtual/jdk-1.5 )
-			mysql? ( virtual/mysql
-					 dev-perl/Cache-Cache
-					 dev-perl/DBD-mysql )
-			ssl? ( dev-perl/Net-SSLeay )
-			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
-			memcached? ( dev-perl/Cache-Memcached )
-			dev-perl/DateManip
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
-			dev-perl/net-server
-			dev-perl/DBI
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-MIME-Base64
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			virtual/perl-Time-HiRes
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool[perl]
-						dev-perl/Log-Log4perl )"
-			# Sybase isn't supported in Gentoo
-			#munin-sybase? (	 dev-perl/DBD-Sybase )
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_prepare() {
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
-
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-temp.patch
-	epatch "${FILESDIR}"/${PN}-1.4.*-munin-version-identifier.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-fix-asterisk-plugins.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-if_-hardened-v2.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-multi.patch
-
-	# Don't build java plugins if not requested via USE.
-	if ! use java; then
-		# sed is needed so the java plugins aren't automagically built.
-		sed -i -e 's: build-plugins-java : :' \
-			-e 's: install-plugins-java : :' Makefile || die
-	fi
-
-	# Bug 304447, fix for gentoo PS location
-	sed -i -e 's,/usr/bin/ps,/bin/ps,g' \
-		"${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die
-
-	# bug 367785, cleanup make output by disabling HP-UX cruft
-	sed -i -e "/plugins\/\*\.adv/d" Makefile || die
-}
-
-src_compile() {
-	emake -j 1 build build-man || die "build/build-man failed"
-	if use doc; then
-		emake -j 1 build-doc || die "build-doc failed"
-	fi
-
-	#Ensure TLS is disabled if built without SSL
-	if ! use ssl; then
-		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
-			|| die "Fixing munin-node.conf Failed!"
-		echo "tls disabled" >> ${S}/build/master/munin.conf \
-			|| die "Fixing munin.conf Failed!"
-	fi
-
-}
-
-src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/spool/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	if use minimal; then
-		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
-			install-plugins-prime || die "install failed"
-	else
-		emake -j 1 DESTDIR="${D}" install || die "install failed"
-	fi
-	fowners munin:munin ${dirs} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die
-
-	# make sure we've got everything in the correct directory
-	insinto /var/lib/munin
-	newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
-	newinitd "${FILESDIR}"/munin-node_init.d_1.4.6-r2 munin-node || die
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node || die
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \
-		|| die
-
-	# bug 254968
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/logrotate.d-munin munin || die
-}
-
-pkg_config() {
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-	# dcron is very fussy about syntax
-	# the following is the only form that works in BOTH dcron and vixie-cron
-	crontab - -u munin </var/lib/munin/crontab
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
-	if ! use minimal; then
-		elog "To have munin's cronjob automatically configured for you if this is"
-		elog "your munin master installation, please:"
-		elog "emerge --config net-analyzer/munin"
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.3.ebuild b/net-analyzer/munin/munin-2.0.3.ebuild
index 246197cb930b..6a2f5ec0f53a 100644
--- a/net-analyzer/munin/munin-2.0.3.ebuild
+++ b/net-analyzer/munin/munin-2.0.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild,v 1.1 2012/07/25 03:01:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild,v 1.2 2012/07/25 03:32:29 flameeyes Exp $
 
 EAPI=4
 
 PATCHSET=1
 
-inherit eutils user versionator java-pkg-opt-2
+inherit eutils user java-pkg-opt-2
 
 MY_P=${P/_/-}
 
@@ -207,7 +207,7 @@ pkg_config() {
 	fi
 
 	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
+	einfo "installation from /usr/share/${PN}/f?crontab"
 	einfo "If you have a large site, you may wish to customize it."
 	read
 
@@ -221,7 +221,8 @@ pkg_config() {
 }
 
 pkg_postinst() {
-	elog
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
 	if ! use minimal; then
 		elog "To have munin's cronjob automatically configured for you if this is"
 		elog "your munin master installation, please:"