Cleanup old; revision bump and move patches to git backports instead.

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

8 files changed, 70 insertions, 983 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 3f7f8933cece..235ce715cd7a 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.147 2012/08/15 18:29:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.148 2012/08/18 02:52:01 flameeyes Exp $
+
+*nagios-plugins-1.4.16-r1 (18 Aug 2012)
+
+  18 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +nagios-plugins-1.4.16-r1.ebuild, -files/nagios-plugins-1.4.15-vserver.patch,
+  -files/nagios-plugins-1.4.16-contrib.patch,
+  -files/nagios-plugins-1.4.16-parallelmake.patch,
+  -nagios-plugins-1.4.14.ebuild, -nagios-plugins-1.4.15.ebuild,
+  -nagios-plugins-1.4.16.ebuild, metadata.xml:
+  Cleanup old; revision bump and move patches to git backports instead.
 
   15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/nagios-plugins-1.4.16-parallelmake.patch, nagios-plugins-1.4.16.ebuild:
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch
deleted file mode 100644
index 867fdd3f4325..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- configure.in.orig	2010-07-30 16:22:01.000000000 +0200
-+++ configure.in	2010-07-30 16:24:30.000000000 +0200
-@@ -94,6 +94,8 @@
- REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`
- REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
- 
-+first_ip=`/sbin/ifconfig | egrep "inet addr:" | sed -n '1p' | sed 's/ Bcast.*$//' | sed 's/^\s*inet addr://'`
-+
- AC_SUBST(PKG_ARCH)
- AC_SUBST(REV_DATESTAMP)
- AC_SUBST(REV_TIMESTAMP)
-@@ -950,14 +952,14 @@
- 	fi
- 
- elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
--	$PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
-+	$PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n -U -c %d %s"
- 	ac_cv_ping_packets_first=yes
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
-+elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
-@@ -965,52 +967,52 @@
-   ac_cv_ping_has_timeout=yes
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
-+elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n -U -c %d %s"
- 	ac_cv_ping_packets_first=yes
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
-+elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n -c %d %s"
- 	ac_cv_ping_packets_first=yes
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
-+elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n %s -c %d"
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
-+elif $PATH_TO_PING $first_ip -n 1 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING %s -n %d"
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
-+elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \
-+elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
-+elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
- 	ac_cv_ping_packets_first=yes
- 	AC_MSG_RESULT([$with_ping_command])
- 
--elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
-+elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \
- 	egrep -i "^round-trip|^rtt" >/dev/null
- then
- 	with_ping_command="$PATH_TO_PING -n -c %d %s"
-@@ -1221,7 +1223,7 @@
- 	if test -n "$PATH_TO_NSLOOKUP"
- 	then
- 		AC_MSG_CHECKING(for nslookup syntax)
--		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null
-+		if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 | grep ["Invalid option: sil"] >/dev/null
- 		then
- 			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
- 			AC_MSG_RESULT([$ac_cv_nslookup_command])
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-contrib.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-contrib.patch
deleted file mode 100644
index 37f4fc3032ba..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-contrib.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-From 48c83ab1bc1ef596129fad8634b8ec09f4a1e329 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Tue, 31 Jul 2012 23:47:20 +0200
-Subject: [PATCH] Fix some paths, bug 366403
-
----
- contrib/check_apc_ups.pl                |    2 +-
- contrib/check_appletalk.pl              |    2 +-
- contrib/check_dns_random.pl             |    9 ++++-----
- contrib/check_flexlm.pl                 |    2 +-
- contrib/check_ica_master_browser.pl     |    2 +-
- contrib/check_ica_metaframe_pub_apps.pl |    2 +-
- contrib/check_inodes-freebsd.pl         |    2 +-
- contrib/check_linux_raid.pl             |    2 +-
- contrib/check_lmmon.pl                  |    2 +-
- contrib/check_lotus.pl                  |    2 +-
- contrib/check_ms_spooler.pl             |    2 +-
- contrib/check_nagios_db.pl              |    4 ++--
- contrib/check_nmap.py                   |    2 +-
- contrib/check_oracle_tbs                |    4 ++--
- contrib/check_pfstate                   |    2 +-
- contrib/check_snmp_disk_monitor.pl      |    4 ++--
- contrib/check_snmp_printer.pl           |    2 +-
- contrib/check_snmp_process_monitor.pl   |    6 +++---
- contrib/check_snmp_procs.pl             |    2 +-
- contrib/check_wins.pl                   |    2 +-
- contrib/sched_downtime.pl               |    2 +-
- 21 files changed, 29 insertions(+), 30 deletions(-)
-
-diff --git a/contrib/check_apc_ups.pl b/contrib/check_apc_ups.pl
-index 6bf1766..758da2f 100644
---- a/contrib/check_apc_ups.pl
-+++ b/contrib/check_apc_ups.pl
-@@ -13,7 +13,7 @@ use strict;
- use Getopt::Long;
- use vars qw($opt_V $opt_h $opt_H $opt_T $opt_t $opt_R $opt_r 
-   $opt_L $opt_l $PROGNAME);
--use lib "/usr/local/nagios/libexec";
-+use lib "/usr/lib/nagios/plugins";
- use utils qw(%ERRORS &print_revision &support &usage);
- 
- sub print_help ();
-diff --git a/contrib/check_appletalk.pl b/contrib/check_appletalk.pl
-index 9277686..2b18084 100644
---- a/contrib/check_appletalk.pl
-+++ b/contrib/check_appletalk.pl
-@@ -22,7 +22,7 @@ BEGIN {
- }
- 
- use strict;
--use lib "/usr/local/nagios/libexec";
-+use lib "/usr/lib/nagios/plugins";
- 
- use utils qw($TIMEOUT %ERRORS &print_revision &support);
- use vars qw($PROGNAME);
-diff --git a/contrib/check_dns_random.pl b/contrib/check_dns_random.pl
-index 4bed412..efd5587 100644
---- a/contrib/check_dns_random.pl
-+++ b/contrib/check_dns_random.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/perl -w
- # ------------------------------------------------------------------------------
- # File Name:            check_dns_random.pl
- # Author:               Richard Mayhew - South Africa
-@@ -33,9 +33,9 @@ $|=1;
- 
- my $host = shift || &usage;
- 
--my $domainfile = "/usr/local/nagios/etc/domains.list";
-+my $domainfile = "/etc/domains.list";
- my $wc = `/usr/bin/wc -l $domainfile`;
--my $check = "/usr/local/nagios/libexec/check_dns";
-+my $check = "/usr/lib/nagios/plugins/check_dns";
- my $x = 0;
- my $srv_file = "";
- my $z = "";
-@@ -49,8 +49,7 @@ open(DOMAIN,"<$domainfile") or die "Error Opening $domainfile File!\n";
-                 my @data = split(/\n/,$srv_file);
- 
- chomp $wc;
--$wc =~ s/ //g;
--$wc =~ s/domains//g;
-+$wc =~ s/([[:digit:]]+) .*/$1/g;
- 
- $x = rand $wc;
- ($z,$y) = split(/\./,$x);
-diff --git a/contrib/check_flexlm.pl b/contrib/check_flexlm.pl
-index 8fa0e33..3b9b57d 100644
---- a/contrib/check_flexlm.pl
-+++ b/contrib/check_flexlm.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # usage: 
- #    check_flexlm.pl license_file
-diff --git a/contrib/check_ica_master_browser.pl b/contrib/check_ica_master_browser.pl
-index 922e718..ed8b9db 100755
---- a/contrib/check_ica_master_browser.pl
-+++ b/contrib/check_ica_master_browser.pl
-@@ -12,7 +12,7 @@ use IO::Socket;
- use IO::Select;
- use Getopt::Long ;
- 
--use lib qw(/usr/local/nagios/libexec) ;
-+use lib qw(/usr/lib/nagios/plugins) ;
- use utils qw(%ERRORS &print_revision &support &usage);
- use packet_utils qw(&pdump &tethereal) ;
- 
-diff --git a/contrib/check_ica_metaframe_pub_apps.pl b/contrib/check_ica_metaframe_pub_apps.pl
-index 0edbdca..8110030 100755
---- a/contrib/check_ica_metaframe_pub_apps.pl
-+++ b/contrib/check_ica_metaframe_pub_apps.pl
-@@ -17,7 +17,7 @@ use Getopt::Long ;
- 
- my ($bcast_addr, $timeout, $debug, @citrix_servers, $crit_pub_apps, $warn_pub_apps, $long_list) ;
- 
--use lib qw(/usr/local/nagios/libexec) ;
-+use lib qw(/usr/lib/nagios/plugins) ;
- use utils qw(%ERRORS &print_revision &support &usage) ;
- use packet_utils qw(&pdump &tethereal) ;
- 
-diff --git a/contrib/check_inodes-freebsd.pl b/contrib/check_inodes-freebsd.pl
-index d66e5e3..ebd1f49 100644
---- a/contrib/check_inodes-freebsd.pl
-+++ b/contrib/check_inodes-freebsd.pl
-@@ -15,7 +15,7 @@
- use strict;
- use Getopt::Long;
- use vars qw($opt_V $opt_h $opt_w $opt_c $opt_f $verbose $PROGNAME);
--use lib "/usr/local/libexec/nagios" ;
-+use lib "/usr/lib/nagios/plugins" ;
- use utils qw($TIMEOUT %ERRORS &print_revision &support);
- 
- my $df = "/bin/df";
-diff --git a/contrib/check_linux_raid.pl b/contrib/check_linux_raid.pl
-index 77e75f6..ab982cd 100644
---- a/contrib/check_linux_raid.pl
-+++ b/contrib/check_linux_raid.pl
-@@ -23,7 +23,7 @@
- #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
- 
- use strict;
--use lib "/usr/local/nagios/libexec";
-+use lib "/usr/lib/nagios/plugins";
- use utils qw(%ERRORS);
- 
- # die with an error if we're not on Linux
-diff --git a/contrib/check_lmmon.pl b/contrib/check_lmmon.pl
-index bf4b438..7fb471b 100644
---- a/contrib/check_lmmon.pl
-+++ b/contrib/check_lmmon.pl
-@@ -6,7 +6,7 @@ if ($#ARGV < 1) {
- print "Usage: $0 <critical temp> <warning temp> <normal temp>\n";
- exit; } $crit = shift; $warn = shift; $norm = shift; if ($warn >
- $crit) {    print "Warning level cannot be greater than critical
--level!\n"; exit; } @b = qx{/usr/local/bin/lmmon -s}; foreach(@b) { @c
-+level!\n"; exit; } @b = qx{/usr/bin/lmmon -s}; foreach(@b) { @c
- = split(/ \/ /, $_); $d = $c[1]; } @e = split(/F/, $d); $f = $e[0];
- 
- $status = "$f degrees F\n";
-diff --git a/contrib/check_lotus.pl b/contrib/check_lotus.pl
-index 8bedced..9cda571 100755
---- a/contrib/check_lotus.pl
-+++ b/contrib/check_lotus.pl
-@@ -17,7 +17,7 @@ use Getopt::Long ;
- 
- my ($timeout, $debug, $lotus_host, $server, $indiv_dn, $packet_debug) ;
- 
--use lib qw(/usr/local/nagios/libexec) ;
-+use lib qw(/usr/lib/nagios/plugins) ;
- use utils qw($TIMEOUT %ERRORS &print_revision &support &usage) ;
- use packet_utils qw(pdump &tethereal) ;
- 
-diff --git a/contrib/check_ms_spooler.pl b/contrib/check_ms_spooler.pl
-index 3a80a76..748203c 100755
---- a/contrib/check_ms_spooler.pl
-+++ b/contrib/check_ms_spooler.pl
-@@ -52,7 +52,7 @@ sub version ();
- 
- delete @ENV{'PATH', 'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
- 
--use constant SMBCLIENT_PATH	=> '/usr/local/samba/bin/smbclient' ;
-+use constant SMBCLIENT_PATH	=> '/usr/bin/smbclient' ;
- use constant MAX_QUEUES_TO_CHECK => 20 ;		# So that the check doesn't take longer than $TIMEOUT
- 
- use constant SMBCLIENT_SVC	=> sub { return `${\SMBCLIENT_PATH} -L //$_[0] -U $_[1]%$_[2]` } ;
-diff --git a/contrib/check_nagios_db.pl b/contrib/check_nagios_db.pl
-index 5811d7c..3774ab0 100644
---- a/contrib/check_nagios_db.pl
-+++ b/contrib/check_nagios_db.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- 
- use strict;
- $|++;
-@@ -12,7 +12,7 @@ use DBI;
- 
- my $driver = "mysql";
- 
--my $CFG_DEF = "/opt/nagios/etc/cgi.cfg";
-+my $CFG_DEF = "/etc/nagios/cgi.cfg";
- my $QUERY = "select *, UNIX_TIMESTAMP(last_update) as ut from programstatus;";
- my $EXPIRE_DEF = 5; ## expressed in minutes
- my $PROCCNT = 0;
-diff --git a/contrib/check_nmap.py b/contrib/check_nmap.py
-index 07f6d7f..07e2e54 100644
---- a/contrib/check_nmap.py
-+++ b/contrib/check_nmap.py
-@@ -54,7 +54,7 @@ from getopt import getopt
- import utils
- 
- # Where temp files should be placed
--tempfile.tempdir='/usr/local/nagios/var'
-+tempfile.tempdir='/var/nagios'
- 
- # Base name for tempfile
- tempfile.template='check_nmap_tmp.'
-diff --git a/contrib/check_oracle_tbs b/contrib/check_oracle_tbs
-index 8281a4e..b35a232 100644
---- a/contrib/check_oracle_tbs
-+++ b/contrib/check_oracle_tbs
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- 
- # (c)2004 John Koyle, RFP Depot, LLC.
- # This is free software use it however you would like.
-@@ -6,7 +6,7 @@
- use strict;
- use DBI;
- use Getopt::Long 2.16;
--use lib "/usr/local/nagios/libexec";
-+use lib "/usr/lib/nagios/plugins";
- use utils qw(%ERRORS);
- 
- 
-diff --git a/contrib/check_pfstate b/contrib/check_pfstate
-index 57dde3f..14d15f4 100644
---- a/contrib/check_pfstate
-+++ b/contrib/check_pfstate
-@@ -3,7 +3,7 @@
- use strict;
- use Getopt::Long;
- use vars qw($opt_V $opt_h $opt_P $opt_H $opt_w $opt_c $PROGNAME);
--use lib "/usr/local/nagios/libexec"  ;
-+use lib "/usr/lib/nagios/plugins"  ;
- use utils qw(%ERRORS &print_revision &support &usage);
- 
- my $remote_user = "root";
-diff --git a/contrib/check_snmp_disk_monitor.pl b/contrib/check_snmp_disk_monitor.pl
-index 9a2edaa..f752afb 100644
---- a/contrib/check_snmp_disk_monitor.pl
-+++ b/contrib/check_snmp_disk_monitor.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # author: Al Tobey <albert.tobey@priority-health.com>
- # what:    monitor diskspace using the host-resources mib
- # license: GPL - http://www.fsf.org/licenses/gpl.txt
-@@ -7,7 +7,7 @@
- 
- use strict;
- require 5.6.0;
--use lib qw( /opt/nagios/libexec );
-+use lib qw( /usr/lib/nagios/plugins );
- use utils qw(%ERRORS $TIMEOUT &print_revision &support &usage);
- use SNMP 5.0;
- use Getopt::Long;
-diff --git a/contrib/check_snmp_printer.pl b/contrib/check_snmp_printer.pl
-index cc7943b..83b05af 100755
---- a/contrib/check_snmp_printer.pl
-+++ b/contrib/check_snmp_printer.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- 
- # check_snmp_printer - check for printer status via snmp
- #  Supports both standard PRINT-MIB (RFC-1759) and HP Enterprise print-mib
-diff --git a/contrib/check_snmp_process_monitor.pl b/contrib/check_snmp_process_monitor.pl
-index 0f44597..abfd40a 100644
---- a/contrib/check_snmp_process_monitor.pl
-+++ b/contrib/check_snmp_process_monitor.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # author: Al Tobey <albert.tobey@priority-health.com>
- # what:   monitor a process using the host-resources mib
- # license: GPL - http://www.fsf.org/licenses/gpl.txt
-@@ -15,7 +15,7 @@
- 
- use strict;
- require 5.6.0;
--use lib qw( /opt/nagios/libexec /usr/local/libexec );
-+use lib qw( /usr/lib/nagios/plugins );
- use utils qw(%ERRORS $TIMEOUT &print_revision &support &usage);
- use SNMP 5.0;
- use Getopt::Long;
-@@ -37,7 +37,7 @@ $opt_nocache   = undef;
- $cache_exp     = 600;
- $exit          = $ERRORS{OK};
- $interpreters  = '(perl|/bin/sh|/usr/bin/sh|/bin/bash|/bin/ksh|python)';
--our $cachefile = '/var/opt/nagios/tmp/'; # completed later
-+our $cachefile = '/var/nagios/tmp/'; # completed later
- our %processes = ();
- 
- sub process_options {
-diff --git a/contrib/check_snmp_procs.pl b/contrib/check_snmp_procs.pl
-index 4d19ff1..de5a8fe 100644
---- a/contrib/check_snmp_procs.pl
-+++ b/contrib/check_snmp_procs.pl
-@@ -35,7 +35,7 @@
- #use strict;
- use Getopt::Long;
- use Net::SNMP qw (oid_lex_sort oid_base_match SNMP_VERSION_1);
--use lib "/usr/local/nagios/libexec";
-+use lib "/usr/lib/nagios/plugins";
- use utils qw(%ERRORS &print_revision &support &usage);
- 
- my $PROGNAME="check_snmp_procs";
-diff --git a/contrib/check_wins.pl b/contrib/check_wins.pl
-index f11f864..701fa30 100755
---- a/contrib/check_wins.pl
-+++ b/contrib/check_wins.pl
-@@ -17,7 +17,7 @@ use strict ;
- use Getopt::Long ;
- use vars qw($opt_H $opt_D $opt_W $opt_T $debug @my_dcs);
- 
--use lib '/usr/local/nagios/libexec/' ;
-+use lib '/usr/lib/nagios/plugins/' ;
- use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
- 
- my $PROGNAME = 'check_wins' ;
-diff --git a/contrib/sched_downtime.pl b/contrib/sched_downtime.pl
-index b46b482..1e358f4 100644
---- a/contrib/sched_downtime.pl
-+++ b/contrib/sched_downtime.pl
-@@ -7,7 +7,7 @@
- #
- use POSIX qw(strtol);
- 
--my $command_file = '/usr/local/nagios/var/rw/nagios.cmd';
-+my $command_file = '/var/nagios/rw/nagios.cmd';
- 
- my $hour = (60*60);
- my $next_day = (24*60*60);
--- 
-1.7.8.6
-
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-parallelmake.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-parallelmake.patch
deleted file mode 100644
index da87556fc7fa..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.16-parallelmake.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-Index: nagios-plugins-1.4.16/plugins/Makefile.am
-===================================================================
---- nagios-plugins-1.4.16.orig/plugins/Makefile.am
-+++ nagios-plugins-1.4.16/plugins/Makefile.am
-@@ -39,15 +39,19 @@ EXTRA_PROGRAMS = check_mysql check_radiu
- 	check_nagios check_by_ssh check_dns check_nt check_ide_smart	\
- 	check_procs check_mysql_query check_apt
- 
--EXTRA_DIST = t tests utils.c netutils.c sslutils.c popen.c utils.h netutils.h \
--	popen.h common.h runcmd.c runcmd.h
-+EXTRA_DIST = t tests 
- 
- PLUGINHDRS = common.h
- 
--BASEOBJS = utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
--NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
--SSLOBJS = sslutils.o
-+noinst_LIBRARIES = libnpcommon.a
-+
-+libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c	\
-+	popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h
-+
-+BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a
-+NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS)
- NETLIBS = $(NETOBJS) $(SOCKETLIBS)
-+SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS)
- 
- TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
- 
-@@ -62,18 +66,18 @@ test-debug:
- ##############################################################################
- # the actual targets
- 
--check_apt_LDADD = $(BASEOBJS) runcmd.o
-+check_apt_LDADD = $(BASEOBJS)
- check_cluster_LDADD = $(BASEOBJS)
--check_dig_LDADD = $(NETLIBS) runcmd.o 
--check_disk_LDADD = $(BASEOBJS) popen.o
--check_dns_LDADD = $(NETLIBS) runcmd.o
-+check_dig_LDADD = $(NETLIBS) 
-+check_disk_LDADD = $(BASEOBJS)
-+check_dns_LDADD = $(NETLIBS)
- check_dummy_LDADD = $(BASEOBJS)
--check_fping_LDADD = $(NETLIBS) popen.o
--check_game_LDADD = $(BASEOBJS) runcmd.o
--check_http_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
--check_hpjd_LDADD = $(NETLIBS) popen.o
-+check_fping_LDADD = $(NETLIBS)
-+check_game_LDADD = $(BASEOBJS)
-+check_http_LDADD = $(SSLOBJS)
-+check_hpjd_LDADD = $(NETLIBS)
- check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
--check_load_LDADD = $(BASEOBJS) popen.o
-+check_load_LDADD = $(BASEOBJS)
- check_mrtg_LDADD = $(BASEOBJS)
- check_mrtgtraf_LDADD = $(BASEOBJS)
- check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
-@@ -82,22 +86,22 @@ check_mysql_LDADD = $(NETLIBS) $(MYSQLLI
- check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
- check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE)
- check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
--check_nagios_LDADD = $(BASEOBJS) runcmd.o
-+check_nagios_LDADD = $(BASEOBJS)
- check_nt_LDADD = $(NETLIBS) 
- check_ntp_LDADD = $(NETLIBS) $(MATHLIBS)
- check_ntp_peer_LDADD = $(NETLIBS) $(MATHLIBS)
- check_nwstat_LDADD = $(NETLIBS)
- check_overcr_LDADD = $(NETLIBS)
- check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
--check_ping_LDADD = $(NETLIBS) popen.o
-+check_ping_LDADD = $(NETLIBS)
- check_procs_LDADD = $(BASEOBJS)
- check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
- check_real_LDADD = $(NETLIBS)
- check_snmp_LDADD = $(BASEOBJS)
--check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
-+check_smtp_LDADD = $(SSLOBJS)
- check_ssh_LDADD = $(NETLIBS)
--check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o
--check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
-+check_swap_LDADD = $(MATHLIBS) $(BASEOBJS)
-+check_tcp_LDADD = $(SSLOBJS)
- check_time_LDADD = $(NETLIBS)
- check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS)
- check_ups_LDADD = $(NETLIBS)
-@@ -105,61 +109,11 @@ check_users_LDADD = $(BASEOBJS)
- check_by_ssh_LDADD = $(NETLIBS)
- check_ide_smart_LDADD = $(BASEOBJS)
- negate_LDADD = $(BASEOBJS)
--urlize_LDADD = $(BASEOBJS) popen.o
--
--check_apt_DEPENDENCIES = check_apt.c $(BASEOBJS) runcmd.o $(DEPLIBS)
--check_cluster_DEPENDENCIES = check_cluster.c $(BASEOBJS) $(DEPLIBS)
--check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) runcmd.o $(DEPLIBS)
--check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS) 
--check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) runcmd.o $(DEPLIBS)
--check_dummy_DEPENDENCIES = check_dummy.c $(DEPLIBS)
--check_fping_DEPENDENCIES = check_fping.c $(NETOBJS) popen.o $(DEPLIBS)
--check_game_DEPENDENCIES = check_game.c  $(DEPLIBS) runcmd.o
--check_http_DEPENDENCIES = check_http.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
--check_hpjd_DEPENDENCIES = check_hpjd.c $(NETOBJS) popen.o $(DEPLIBS)
--check_ide_smart_DEPENDENCIES = check_ide_smart.c $(BASEOBJS) $(DEPLIBS)
--check_ldap_DEPENDENCIES = check_ldap.c $(NETOBJS) $(DEPLIBS)
--check_load_DEPENDENCIES = check_load.c $(BASEOBJS) popen.o $(DEPLIBS)
--check_mrtg_DEPENDENCIES = check_mrtg.c $(DEPLIBS)
--check_mrtgtraf_DEPENDENCIES = check_mrtgtraf.c $(DEPLIBS)
--check_mysql_DEPENDENCIES = check_mysql.c $(NETOBJS) $(DEPLIBS)
--check_mysql_query_DEPENDENCIES = check_mysql_query.c $(NETOBJS) $(DEPLIBS)
--check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) runcmd.o $(DEPLIBS)
--check_nt_DEPENDENCIES = check_nt.c $(NETOBJS) $(DEPLIBS)
--check_ntp_DEPENDENCIES = check_ntp.c $(NETOBJS) $(DEPLIBS)
--check_ntp_peer_DEPENDENCIES = check_ntp_peer.c $(NETOBJS) $(DEPLIBS)
--check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
--check_overcr_DEPENDENCIES = check_overcr.c $(NETOBJS) $(DEPLIBS)
--check_pgsql_DEPENDENCIES = check_pgsql.c $(NETOBJS)  $(DEPLIBS)
--check_ping_DEPENDENCIES = check_ping.c $(NETOBJS) popen.o $(DEPLIBS)
--check_procs_DEPENDENCIES = check_procs.c $(BASEOBJS) popen.o $(DEPLIBS)
--check_radius_DEPENDENCIES = check_radius.c $(NETOBJS)  $(DEPLIBS)
--check_real_DEPENDENCIES = check_real.c $(NETOBJS) $(DEPLIBS)
--check_snmp_DEPENDENCIES = check_snmp.c $(BASEOBJS) $(DEPLIBS)
--check_smtp_DEPENDENCIES = check_smtp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
--check_ssh_DEPENDENCIES = check_ssh.c $(NETOBJS) $(DEPLIBS)
--check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) popen.o $(DEPLIBS)
--check_tcp_DEPENDENCIES = check_tcp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
--check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS)
--check_ntp_time_DEPENDENCIES = check_ntp_time.c $(NETOBJS) $(DEPLIBS)
--check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS)
--check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS)
--check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) $(DEPLIBS)
--negate_DEPENDENCIES = negate.c $(BASEOBJS) $(DEPLIBS)
--urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS)
-+urlize_LDADD = $(BASEOBJS)
- 
- ##############################################################################
- # secondary dependencies
- 
--popen.o: popen.c popen.h $(PLUGINHDRS)
--
--runcmd.o: runcmd.c runcmd.h $(PLUGINHDRS)
--
--utils.o: utils.c utils.h $(PLUGINHDRS)
--
--netutils.o: netutils.c netutils.h $(PLUGINHDRS)
--sslutils.o: sslutils.c netutils.h $(PLUGINHDRS)
--
- all-local: $(check_tcp_programs)
- 
- $(check_tcp_programs): check_tcp
-Index: nagios-plugins-1.4.16/plugins/check_dig.c
-===================================================================
---- nagios-plugins-1.4.16.orig/plugins/check_dig.c
-+++ nagios-plugins-1.4.16/plugins/check_dig.c
-@@ -77,7 +77,7 @@ main (int argc, char **argv)
-   textdomain (PACKAGE);
- 
-   /* Set signal handling and alarm */
--  if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
-+  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR)
-     usage_va(_("Cannot catch SIGALRM"));
- 
-   /* Parse extra opts if any */
-Index: nagios-plugins-1.4.16/plugins/check_dns.c
-===================================================================
---- nagios-plugins-1.4.16.orig/plugins/check_dns.c
-+++ nagios-plugins-1.4.16/plugins/check_dns.c
-@@ -91,7 +91,7 @@ main (int argc, char **argv)
-   textdomain (PACKAGE);
- 
-   /* Set signal handling and alarm */
--  if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
-+  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
-     usage_va(_("Cannot catch SIGALRM"));
-   }
- 
-Index: nagios-plugins-1.4.16/plugins/runcmd.c
-===================================================================
---- nagios-plugins-1.4.16.orig/plugins/runcmd.c
-+++ nagios-plugins-1.4.16/plugins/runcmd.c
-@@ -256,7 +256,7 @@ np_runcmd_close(int fd)
- 
- 
- void
--popen_timeout_alarm_handler (int signo)
-+runcmd_timeout_alarm_handler (int signo)
- {
- 	size_t i;
- 
-Index: nagios-plugins-1.4.16/plugins/runcmd.h
-===================================================================
---- nagios-plugins-1.4.16.orig/plugins/runcmd.h
-+++ nagios-plugins-1.4.16/plugins/runcmd.h
-@@ -39,7 +39,7 @@ typedef struct output output;
- 
- /** prototypes **/
- int np_runcmd(const char *, output *, output *, int);
--void popen_timeout_alarm_handler(int)
-+void runcmd_timeout_alarm_handler(int)
- 	__attribute__((__noreturn__));
- 
- /* only multi-threaded plugins need to bother with this */
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index 93e4df69af75..bb42c140d60a 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -1,17 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<longdescription lang="en">
-		Nagios plugins - Pack of plugins to make Nagios work properly
-	</longdescription>
-	<use>
-		<flag name='nagios-dns'>installs deps for dns monitoring</flag>
-		<flag name='nagios-game'>installs deps for monitoring <pkg>games-util/qstat</pkg></flag>
-		<flag name='nagios-ntp'>installs deps for ntp monitoring</flag>
-		<flag name='nagios-ping'>installs deps for fancy ping monitoring</flag>
-		<flag name='nagios-ssh'>installs deps for monitoring ssh</flag>
-		<flag name='ups'>installs deps for monitoring Network-UPS (<pkg>sys-power/nut</pkg>)</flag>
-	</use>
+  <herd>netmon</herd>
+  <use>
+    <flag name='nagios-dns'>
+      Install <pkg>net-dns/bind-tools</pkg> required for monitoring
+      DNS servers. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name='nagios-game'>
+      Install <pkg>games-util/qstat</pkg> required for monitoring FPS
+      servers. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name='nagios-ntp'>
+      Install <pkg>net-misc/ntp</pkg> required for monitoring NTP
+      servers and drifts. Disabling the flag does not remove any
+      plugin file.
+    </flag>
+    <flag name='nagios-ping'>
+      Install <pkg>net-analyzer/fping</pkg> required for fancy ping
+      monitoring. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name='nagios-ssh'>
+      Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
+      servers. Disabling the flag does not remove any plugin file.
+    </flag>
+    <flag name='ups'>
+      Install <pkg>sys-power/nut</pkg> required for monitoring
+      compatible UPS units. Disabling the flag does not remove any
+      plugin file.
+    </flag>
+    <flag name='jabber'>
+      Install the script for sending IM notifications over Jabber with
+      Nagios.
+    </flag>
+  </use>
 </pkgmetadata>
 
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild
deleted file mode 100644
index 75374a88b2c3..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild
+++ /dev/null
@@ -1,139 +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/nagios-plugins/nagios-plugins-1.4.14.ebuild,v 1.12 2012/06/12 02:44:29 zmedico Exp $
-
-EAPI=1
-
-inherit autotools eutils multilib user
-
-DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
-nagios-ssh nagios-game ups ipv6 radius +suid"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	radius? ( >=net-dialup/radiusclient-0.3.2 )"
-
-RESTRICT="test"
-
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.6.1-r7
-	samba? ( >=net-fs/samba-2.2.5-r1 )
-	snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1
-			>=net-analyzer/net-snmp-5.0.6
-			)
-	mysql? ( dev-perl/DBI
-			 dev-perl/DBD-mysql )
-	nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
-	nagios-ntp? ( >=net-misc/ntp-4.1.1a )
-	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
-	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
-	ups? ( >=sys-power/nut-1.4 )
-	!sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use radius; then
-		EPATCH_OPTS="-p1 -d ${S}" epatch \
-		"${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
-	fi
-	epatch "${FILESDIR}"/${P}-implicit-pointer-conversion.patch
-	epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
-	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
-
-	eautoreconf
-}
-
-src_compile() {
-
-	local conf
-	if use ssl; then
-		conf="${conf} --with-openssl=/usr"
-	else
-		conf="${conf} --without-openssl"
-	fi
-
-	if use postgres; then
-		conf="${conf} --with-pgsql=/usr"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		${conf} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--sysconfdir=/etc/nagios || die "econf failed"
-
-	# fix problem with additional -
-	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
-	chmod +x "${S}"/contrib/*.pl
-
-	sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed"
-	sed -i -e s#/usr/nagios/libexec#/usr/$(get_libdir)/nagios/plugins#g "${S}"/contrib/*.pl || die "sed failed"
-	sed -i -e '30s/use lib utils.pm;/use utils;/' \
-		"${S}"/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
-		ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/$(get_libdir)/nagios/plugins
-		exeinto /usr/$(get_libdir)/nagios/plugins
-		doexe "${S}"/contrib/check_nagios_db.pl
-	fi
-
-	if ! use snmp; then
-		rm "${D}"/usr/$(get_libdir)/nagios/plugins/check_if{operstatus,status} \
-			|| die "Failed to remove SNMP check plugins"
-	fi
-
-	mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib
-
-	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \
-		|| die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins"
-
-	chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \
-		|| die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins"
-
-	if use suid ; then
-
-		chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/{check_icmp,check_ide_smart,check_dhcp} \
-			|| die "Failed setting the suid bit for various plugins"
-	fi
-
-	dosym /usr/$(get_libdir)/nagios/plugins/utils.sh /usr/$(get_libdir)/nagios/plugins/contrib/utils.sh
-	dosym /usr/$(get_libdir)/nagios/plugins/utils.pm /usr/$(get_libdir)/nagios/plugins/contrib/utils.pm
-}
-
-pkg_postinst() {
-	einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor."
-	einfo "Depending on what you want to monitor with nagios, some or all of these USE"
-	einfo "flags need to be set for nagios to function correctly."
-	echo
-	einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild
deleted file mode 100644
index bde4b3a31199..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild
+++ /dev/null
@@ -1,146 +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/nagios-plugins/nagios-plugins-1.4.15.ebuild,v 1.4 2012/06/12 02:44:29 zmedico Exp $
-
-EAPI=1
-
-inherit autotools eutils multilib user
-
-DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	radius? ( >=net-dialup/radiusclient-0.3.2 )"
-
-RESTRICT="test"
-
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.6.1-r7
-	samba? ( >=net-fs/samba-2.2.5-r1 )
-	snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1
-			>=net-analyzer/net-snmp-5.0.6
-			)
-	mysql? ( dev-perl/DBI
-			 dev-perl/DBD-mysql )
-	nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
-	nagios-ntp? ( >=net-misc/ntp-4.1.1a )
-	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
-	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
-	ups? ( >=sys-power/nut-1.4 )
-	!sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )
-	jabber? ( >=dev-perl/Net-Jabber-2.0 )"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use radius; then
-		EPATCH_OPTS="-p1 -d ${S}" epatch \
-		"${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
-	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
-	epatch "${FILESDIR}"/${P}-vserver.patch
-	epatch "${FILESDIR}"/${P}-openldap.patch
-	eautoreconf
-}
-
-src_compile() {
-
-	local conf
-	if use ssl; then
-		conf="${conf} --with-openssl=/usr"
-	else
-		conf="${conf} --without-openssl"
-	fi
-
-	if use postgres; then
-		conf="${conf} --with-pgsql=/usr"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		${conf} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--sysconfdir=/etc/nagios || die "econf failed"
-
-	# fix problem with additional -
-	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
-	chmod +x "${S}"/contrib/*.pl
-
-	sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed"
-	sed -i -e s#/usr/nagios/libexec#/usr/$(get_libdir)/nagios/plugins#g "${S}"/contrib/*.pl || die "sed failed"
-	sed -i -e '30s/use lib utils.pm;/use utils;/' \
-		"${S}"/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
-		ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/$(get_libdir)/nagios/plugins
-		exeinto /usr/$(get_libdir)/nagios/plugins
-		doexe "${S}"/contrib/check_nagios_db.pl
-	fi
-
-	if ! use snmp; then
-		rm "${D}"/usr/$(get_libdir)/nagios/plugins/check_if{operstatus,status} \
-			|| die "Failed to remove SNMP check plugins"
-	fi
-
-	mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib
-
-	if ! use jabber; then
-		rm "${D}"usr/$(get_libdir)/nagios/plugins/contrib/nagios_sendim.pl \
-			|| die "Failed to remove XMPP notification addon"
-	fi
-
-	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \
-		|| die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins"
-
-	chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \
-		|| die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins"
-
-	if use suid ; then
-
-		chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/{check_icmp,check_ide_smart,check_dhcp} \
-			|| die "Failed setting the suid bit for various plugins"
-	fi
-
-	dosym /usr/$(get_libdir)/nagios/plugins/utils.sh /usr/$(get_libdir)/nagios/plugins/contrib/utils.sh
-	dosym /usr/$(get_libdir)/nagios/plugins/utils.pm /usr/$(get_libdir)/nagios/plugins/contrib/utils.pm
-}
-
-pkg_postinst() {
-	einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor."
-	einfo "Depending on what you want to monitor with nagios, some or all of these USE"
-	einfo "flags need to be set for nagios to function correctly."
-	echo
-	einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild
index ef011d9a3e90..e97fbf27f930 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild
@@ -1,26 +1,33 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16.ebuild,v 1.3 2012/08/15 18:29:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r1.ebuild,v 1.1 2012/08/18 02:52:01 flameeyes Exp $
 
 EAPI=4
 
+PATCHSET=2
+
 inherit autotools eutils multilib user
 
 DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
 HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber"
+IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber gnutls"
 
 DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.6g )
+		gnutls? ( net-libs/gnutls )
+	)
 	radius? ( >=net-dialup/radiusclient-0.3.2 )"
 
+# tests try to ssh into the box itself
 RESTRICT="test"
 
 RDEPEND="${DEPEND}
@@ -36,7 +43,7 @@ RDEPEND="${DEPEND}
 	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
 	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
 	ups? ( >=sys-power/nut-1.4 )
-	!sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )
+	nagios-game? ( >=games-util/qstat-2.6 )
 	jabber? ( >=dev-perl/Net-Jabber-2.0 )"
 
 pkg_setup() {
@@ -45,46 +52,30 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if ! use radius; then
-		EPATCH_OPTS="-p1 -d ${S}" epatch \
-		"${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
-	fi
-
-	# bug 366403
-	epatch "${FILESDIR}"/${P}-contrib.patch
-
-	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
-	epatch "${FILESDIR}"/${PN}-1.4.15-vserver.patch
-	epatch "${FILESDIR}"/${PN}-1.4.15-openldap.patch
-	epatch "${FILESDIR}"/${P}-parallelmake.patch
+	epatch "${WORKDIR}"/patches/*.patch
 
 	eautoreconf
 }
 
 src_configure() {
-	local conf
+	local myconf
 	if use ssl; then
-		conf="${conf} --with-openssl=/usr"
+		myconf+="
+			$(use_with !gnutls openssl /usr)
+			$(use_with gnutls gnutls /usr)"
 	else
-		conf="${conf} --without-openssl"
-	fi
-
-	if use postgres; then
-		conf="${conf} --with-pgsql=/usr"
+		myconf+=" --without-openssl --without-gnutls"
 	fi
 
 	econf \
 		$(use_with mysql) \
 		$(use_with ipv6) \
 		$(use_with ldap) \
-		${conf} \
-		--host=${CHOST} \
-		--prefix=/usr \
+		$(use_with radius) \
+		$(use_with postgres pgsql /usr) \
+		${myconf} \
 		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--sysconfdir=/etc/nagios || die "econf failed"
-
-	# fix problem with additional -
-	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
+		--sysconfdir=/etc/nagios
 }
 
 src_install() {
@@ -136,9 +127,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor."
-	einfo "Depending on what you want to monitor with nagios, some or all of these USE"
-	einfo "flags need to be set for nagios to function correctly."
-	echo
-	einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
+	elog "This ebuild has a number of USE flags which determines what nagios is able to monitor."
+	elog "Depending on what you want to monitor with nagios, some or all of these USE"
+	elog "flags need to be set for nagios to function correctly."
+	elog "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
 }