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)

4 files changed, 0 insertions, 130 deletions

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: