NM: Cleanup superseded EAPI=1 ebuild.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

9 files changed, 11 insertions, 486 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 594eb757d08e..095718006447 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.164 2014/01/26 03:39:11 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.165 2014/06/30 15:48:44 mrueg Exp $
+
+  30 Jun 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/nagios-plugins-1.4.10-contrib.patch,
+  -files/nagios-plugins-1.4.10-noradius.patch,
+  -files/nagios-plugins-1.4.12-pgsqlconfigure.patch,
+  -files/nagios-plugins-1.4.14-implicit-pointer-conversion.patch,
+  -files/nagios-plugins-1.4.14-vserver.patch,
+  -files/nagios-plugins-1.4.15-openldap.patch, -nagios-plugins-1.4.14-r2.ebuild:
+  NM: Cleanup superseded EAPI=1 ebuild.
 
   26 Jan 2014; Chris Reffett <creffett@gentoo.org> metadata.xml:
   Update maintainers (add ahamilto as maintainer, me as proxy, proxy-maint herd
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index ab204b8b6e39..14c23841b51a 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,26 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX nagios-plugins-1.4.10-contrib.patch 1610 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278 SHA512 d414c975f5988c2ba63d63ac19c95ae97298e4f8c3a622edc90a8676c41145efc8ac144cf24c3843a788f7744375022fbfa326bd51f7206a46f18464a6d551e2 WHIRLPOOL 87de54897d10483b3246f5211fae2231611ead7418eacab7bed6cf46c53f0d72d46f42b233b35965e1bc90b67da3d5dde455feb558c82b494fe33c27300be5cd
-AUX nagios-plugins-1.4.10-noradius.patch 1029 SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229 SHA512 fa1e80d3f3258fc722c2cfdb6b03f18d293802a8be94703748f61c305666e094c75b8c7fbbd36210efa10935ee7aeaf534faf583fd207387e145c4fa8f2a4476 WHIRLPOOL d9207b63ba10b6077a724c444c03b195f409d9097868c487030ee1bb2775be6fba3e5cacd9d292ec587b0a1d5d344235db7d9faac91674543e8e578a0f7c494b
-AUX nagios-plugins-1.4.12-pgsqlconfigure.patch 2981 SHA256 8e57962c484363fa790c6920f1f9fe11f273a061fcc59ac2cb9b1d57634a1455 SHA512 8524081c7349f3e91dbb976af9f24e7aab8694c124661539af564f36cb4aedfaa37a3209cfdf5af2f548c0627389d3cbf7537602cf1eb01f21afc3ed748bcc4b WHIRLPOOL be1f7439e343f5cc85138b877f415a1fc8a398c4c48a6eefe48eac98ebfebee48398175263eb5d165b028b477233d335919704717ec2e4ae27f114d185cb69fd
-AUX nagios-plugins-1.4.14-implicit-pointer-conversion.patch 486 SHA256 65c06471f1b5085371dac7edf55004924745d342c08c03abe9d39116b6b0c10c SHA512 fdafc747a539db537689d82d260c5cc4917a36cf9d8d8dd52a999fde1f1c20d293d304c2939caa73227c753b047eee7f77042f1bd4cf61c83d68bb561b66e84d WHIRLPOOL f30397ac4633823e44786b04b2f94f94cbbc5fb59825a1bb22aead931c4fee55ba1211f0e7ecff06a1c62fd9bb51c448ca01f7a5590c214d4e3ac187880b40cf
-AUX nagios-plugins-1.4.14-vserver.patch 3509 SHA256 7302c26729d02b00c5b5ac4857136773f348ea0a2b7fbddb8ef701784020c3c8 SHA512 0b4cda1f6deb3c964327cee7395b10698c68c328db2f8f9c8186683d91f2c744f5dc3b3bbc38c7d0be637e5fcaf331c4ef695e1a860f927407f0399905fa19ab WHIRLPOOL 1be88be3868fbcb916b171fb742e83be99fffac15ea9d9a58f1880ff2249f75db691aff147dd8791670e7fc5ad6c40717f080627d0bbc36394252b8928946210
-AUX nagios-plugins-1.4.15-openldap.patch 2062 SHA256 dafa89ba112f3d6438c66fc2c10ec8cfffbc4965ad5da63eddea14811eabd319 SHA512 5ca2d39e0cf8afa531363ef9f0b2348017ec1d7035ed212e2d94dedc9a042b3991ff25e81e88ed64861599b454fe66553543fa778c915ee62ddafa3b75cdb7db WHIRLPOOL df3e54ee619b539e8b215a3876a2f8938c0602d6b56699c71d9d3abd37af481aa9257b2be5ac5975131d716265dbd2f12c2e22d9459c7c66a54425c2f36f7ab9
-DIST nagios-plugins-1.4.14.tar.gz 1950729 SHA256 b1f0f2c01bab2a320cc7c041106500acfd6a5262ff811a2c31b62608ac6c3352 SHA512 f6eeddce03187e613f840aa453bca33b42153163dfaae78ecadacef1ea61417ce72962f4a4595afa7d5a3b804d439e0362874da826c2876bec1fd0bc0837c42b WHIRLPOOL 1e891edf5479300af9e06742e822809660972430f7166813ec4a17e00512868f478cdd81cf8808159b54bfe160c593b92aa1ca6a1cdbfe8ed5e894120b9e98cd
 DIST nagios-plugins-1.4.16-patches-2.tar.xz 8972 SHA256 e553c6a13aa56d826e113008ab87b6eee2d676fb2a09aa5433211ebfea6cd7c9 SHA512 48352873396274b4063bf8e58530df7c8cf6cfefe5e581ad31bd44a54b295bac634688d33de98e4f90723b0e1652192762cfcb6664fc0ce5bee797d6716584f8 WHIRLPOOL 3e397e8a2e1cd98ac646d4b419a38b0eadb7b6ea42a593de86fc8300ff802a9ad560b4ad0c73fed914c326afc48da178884470495e23eacc3521e0a4dd9b6214
 DIST nagios-plugins-1.4.16.tar.gz 2087089 SHA256 b0caf07e0084e9b7f10fdd71cbd3ebabcd85ad78df64da360b51233b0e73b2bd SHA512 7a1401964b881c3db3e1e3f2a49dcf517ff7214724cc05c3ad629651b7e3eeb823b02abe0c6379d29996ac1e8a1208d918fd12e36cca46c7d36d9b1ebacdb2b3 WHIRLPOOL 3cb3b5d5f7f18e7eb5babde6f7bdd82ba167de4b875825c195d3abf7a14926102940616278769a8127a5c3269d475325145799c1414e6cc22eb208319fd2e879
-EBUILD nagios-plugins-1.4.14-r2.ebuild 4591 SHA256 8a04b25dfc465f055ea4088d6a3a4d9d8b9fdf8197ae08400035160ad685382a SHA512 50dacda94ad549c777d6188ff819cbd8128e9bc6dcd1a310b5bad0786a1c54591d79c88c968cbd0f6bc9c96dce7368fb5ed853621d7c3cb2f5cd3de526659d25 WHIRLPOOL ed7b88b08e48b3c745edf45a25178e911a4ebb74f8709b172886cde565e2f86c3e6ae02e94c73c99656e6c99ec9944b9266d68f2766386fad06239c155c9577a
 EBUILD nagios-plugins-1.4.16-r2.ebuild 3932 SHA256 26168611534851fdc0a2f3a30e74e9b641a7d385814be5f06f12ae48a2c943c4 SHA512 7b6aefe07ad11b5addf52656d2581507c3ae8cd9de68408a5e3c38ae4c3396937869a8231244e0b4988db934dce53f60673b59313e3cd3a2f4f28a748fcbef93 WHIRLPOOL 16314179e0390b718c15162600deefecf3980bdc9bf57faa5fe7ae2cc9c1ff816de7436a260c45867e9077ccc7953868d1713fc360927a56946062f6672eb1fc
 EBUILD nagios-plugins-1.4.16-r3.ebuild 3940 SHA256 19bf7d3efaac9228cf9293513a5ad1997968f584a41832c59ac0f66c5852b7c7 SHA512 043943c75543cb9a1bb52ee03ead154440d4fc54271cc5ed2e3a6d4905b899008b253a5ba95125b15b8d424107499c781a4f93fe0924b15d20c90bf5797c62fa WHIRLPOOL 158a829485b909423501b77196490d6ed7f8c11cfaad9eb8b4f1afe79fa63e057788640a57dce461eb065f3719b3245c5b21bd0a9a5ed026b0619ff4091f7d3f
-MISC ChangeLog 13096 SHA256 a63cf2b4f604df93a4528709007bffe8c09ce526270b09ac767ee130bfb6fb6b SHA512 b757b874c0fa918a14a8befab433b923bfa04aef6a7d5d26e3e1f0db3ac99b7d70d1a8523cb5a6d61de759c8a904c70afe7cf94b2059b614829b4f6653d9f4c7 WHIRLPOOL 3c52cbfd80f3d49ea943338229d0917a84a9cba9cd2010c01225a2c6791684a8f4d45408066e06d8fe7f654f47117b049e6cb0d449c07868cc358be2d69b2f61
+MISC ChangeLog 13521 SHA256 4b4b6e6a7d6cc4f6b439947df22a9860c458854eb8eddc7e3452957d8759f649 SHA512 92176c8dc3e3af10185d02ca9d64f03d252439968ee171522aecf492971a9c631bb86ef3f4f55d69a721d8e24ff18cba3367d85b7da01efa240ec3cc8dce136d WHIRLPOOL b8623100c7c637330ffe69bb2f3d4343d4ab16eb57382ae54727617792642863d758444a5227cab12a3a586cad9aad0b7d36ad45bb1bc88e9f54bec23abd6eae
 MISC metadata.xml 2726 SHA256 d7aeb67fcae932b631703ad90a318ee660027b9375d783e27eb84bc8b0dd315b SHA512 2d8a3f601b316728dcf2646a675408a294b0247f886fd47ae8c37b310e4c53bcf63d8f82a91f3cbe4287a79a3e3d9675facd1c6921f13e86c5912ce59e9b1e6d WHIRLPOOL f71ad41d9c403435053006fc98072f5f66b572e3970244f5c6c9b5d44b0767e81833cdb5c51071c386986bce9f90aa560dcea486e4ef5b14057764e413dbcd8d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iKYEAREIAGYFAlLkgzVfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1RAiQCfYGnoWMw4qGvEFL3ggW3n+Kui
-BdYAn3dlDZFgR6dXaN7oGWZGSp/IPgJ1
-=aH2Z
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-contrib.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-contrib.patch
deleted file mode 100644
index 905f76023d6d..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-contrib.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur nagios-plugins-1.4.10.orig/contrib/check_dns_random.pl nagios-plugins-1.4.10/contrib/check_dns_random.pl
---- nagios-plugins-1.4.10.orig/contrib/check_dns_random.pl	2003-01-29 06:27:20.000000000 +0100
-+++ nagios-plugins-1.4.10/contrib/check_dns_random.pl	2007-09-29 10:57:38.000000000 +0200
-@@ -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 @@
- 
- my $host = shift || &usage;
- 
--my $domainfile = "/usr/local/nagios/etc/domains.list";
-+my $domainfile = "/etc/nagios/domains.list";
- my $wc = `/usr/bin/wc -l $domainfile`;
--my $check = "/usr/local/nagios/libexec/check_dns";
-+my $check = "/usr/nagios/libexec/check_dns";
- my $x = 0;
- my $srv_file = "";
- my $z = "";
-@@ -49,8 +49,7 @@
-                 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 -Naur nagios-plugins-1.4.10.orig/contrib/check_linux_raid.pl nagios-plugins-1.4.10/contrib/check_linux_raid.pl
---- nagios-plugins-1.4.10.orig/contrib/check_linux_raid.pl	2007-08-28 05:19:45.000000000 +0200
-+++ nagios-plugins-1.4.10/contrib/check_linux_raid.pl	2007-09-29 10:57:50.000000000 +0200
-@@ -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/nagios/libexec";
- use utils qw(%ERRORS);
- 
- # die with an error if we're not on Linux
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-noradius.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-noradius.patch
deleted file mode 100644
index 6d51d7fe1ca9..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-noradius.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur nagios-plugins-1.4.10.orig/configure.in nagios-plugins-1.4.10/configure.in
---- nagios-plugins-1.4.10.orig/configure.in	2007-09-29 02:44:36.000000000 +0200
-+++ nagios-plugins-1.4.10/configure.in	2007-09-29 11:20:19.000000000 +0200
-@@ -210,26 +210,6 @@
- LIBS="$_SAVEDLIBS"
- CPPFLAGS="$_SAVEDCPPFLAGS"
- 
--dnl Check for radius libraries
--_SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(radiusclient,rc_read_config)
--if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
--  EXTRAS="$EXTRAS check_radius"
--	RADIUSLIBS="-lradiusclient"
--  AC_SUBST(RADIUSLIBS)
--else
--  AC_CHECK_LIB(radiusclient-ng,rc_read_config)
--  if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
--    EXTRAS="$EXTRAS check_radius"
--  	  RADIUSLIBS="-lradiusclient-ng"
--    AC_SUBST(RADIUSLIBS)
--  else
--    AC_MSG_WARN([Skipping radius plugin])
--    AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
--  fi
--fi
--LIBS="$_SAVEDLIBS"
--
- dnl Check for LDAP libraries
- _SAVEDLIBS="$LIBS"
- AC_CHECK_LIB(ldap,main,,,-llber)
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.12-pgsqlconfigure.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.12-pgsqlconfigure.patch
deleted file mode 100644
index e5e713db2128..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.12-pgsqlconfigure.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur nagios-plugins-1.4.12.orig/configure.in nagios-plugins-1.4.12/configure.in
---- nagios-plugins-1.4.12.orig/configure.in	2008-05-28 00:01:05.000000000 +0200
-+++ nagios-plugins-1.4.12/configure.in	2008-07-20 18:02:42.000000000 +0200
-@@ -182,27 +182,34 @@
- 	PGSQL=$withval,)
- AC_CHECK_LIB(crypt,main)
- if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
--  if test -n "$PGSQL"; then
--    LDFLAGS="$LDFLAGS -L$PGSQL/lib"
--    CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
-+  if test -x $with_pgsql/bin/pg_config ; then
-+    np_pg_config="$with_pgsql/bin/pg_config"
-   fi
--  AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
--  if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
--    AC_CHECK_HEADERS(pgsql/libpq-fe.h)
--    AC_CHECK_HEADERS(postgresql/libpq-fe.h)
--    AC_CHECK_HEADERS(libpq-fe.h)
--    if [[ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]]; then
--      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
--      PGINCLUDE="-I$PGSQL/include"
--    elif test  "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
--      PGLIBS="-lpq -lcrypt"
--      PGINCLUDE="-I/usr/include/pgsql"
--    elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
--      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
--      PGINCLUDE="-I/usr/include/postgresql"
--    elif test  "$ac_cv_header_libpq_fe_h" = "yes"; then
--      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
--      PGINCLUDE="-I$PGSQL/include"
-+  if test -z "$np_pg_config"; then
-+    with_pgsql="no"
-+  else
-+    if test -n "$PGSQL"; then
-+      LDFLAGS="$LDFLAGS -L`$np_pg_config --libdir`"
-+      CPPFLAGS="$CPPFLAGS -I`$np_pg_config --includedir`"
-+    fi
-+    AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
-+    if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
-+      AC_CHECK_HEADERS(pgsql/libpq-fe.h)
-+      AC_CHECK_HEADERS(postgresql/libpq-fe.h)
-+      AC_CHECK_HEADERS(libpq-fe.h)
-+      if [[ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]]; then
-+        PGLIBS="-L`$np_pg_config --libdir` -lpq -lcrypt"
-+        PGINCLUDE="-I`$np_pg_config --includedir`"
-+      elif test  "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
-+        PGLIBS="-lpq -lcrypt"
-+        PGINCLUDE="-I`$np_pg_config --includedir`"
-+      elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
-+        PGLIBS="-L`$np_pg_config --libdir` -lpq -lcrypt"
-+        PGINCLUDE="-I`$np_pg_config --includedir`"
-+      elif test  "$ac_cv_header_libpq_fe_h" = "yes"; then
-+        PGLIBS="-L`$np_pg_config --libdir` -lpq -lcrypt"
-+        PGINCLUDE="-I`$np_pg_config --includedir`"
-+      fi
-     fi
-     if test -z "$PGINCLUDE"; then
-       AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
-@@ -212,10 +219,6 @@
-       AC_SUBST(PGINCLUDE)
-       EXTRAS="$EXTRAS check_pgsql"
-     fi
--  else
--    AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
--    AC_MSG_WARN([LIBS="$LIBS" CPPFLAGS="$CPPFLAGS"])
--    AC_MSG_WARN([install PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
-   fi
- else
-   AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-implicit-pointer-conversion.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-implicit-pointer-conversion.patch
deleted file mode 100644
index ec070fad7564..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-implicit-pointer-conversion.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: nagios-plugins-1.4.14/plugins/check_ldap.c
-===================================================================
---- nagios-plugins-1.4.14.orig/plugins/check_ldap.c
-+++ nagios-plugins-1.4.14/plugins/check_ldap.c
-@@ -38,6 +38,10 @@ const char *email = "nagiosplug-devel@li
- #include <lber.h>
- #include <ldap.h>
- 
-+ldap_init LDAP_P(( /* deprecated, use ldap_create or ldap_initialize */
-+	LDAP_CONST char *host,
-+	int port ));
-+
- enum {
- 	UNDEFINED = 0,
- #ifdef HAVE_LDAP_SET_OPTION
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-vserver.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-vserver.patch
deleted file mode 100644
index 5eb99f31b96c..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.14-vserver.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- configure.in.orig	2009-02-26 14:05:55.000000000 +0000
-+++ configure.in	2009-02-26 14:07:02.000000000 +0000
-@@ -94,6 +94,8 @@
- PKG_ARCH=`uname -p`
- 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)
-@@ -869,14 +871,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"
-@@ -884,52 +886,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"
-@@ -1132,7 +1134,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.15-openldap.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch
deleted file mode 100644
index 403b094ed5b9..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: nagios-plugins-1.4.15/configure.in
-===================================================================
---- nagios-plugins-1.4.15.orig/configure.in
-+++ nagios-plugins-1.4.15/configure.in
-@@ -257,23 +257,6 @@ fi
- LIBS="$_SAVEDLIBS"
- CPPFLAGS="$_SAVEDCPPFLAGS"
- 
--dnl Check for LDAP libraries
--_SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(ldap,main,,,-llber)
--if test "$ac_cv_lib_ldap_main" = "yes"; then
--  LDAPLIBS="-lldap -llber"\
--  LDAPINCLUDE="-I/usr/include/ldap"
--  AC_SUBST(LDAPLIBS)
--  AC_SUBST(LDAPINCLUDE)
--  AC_CHECK_FUNCS(ldap_set_option)
--  EXTRAS="$EXTRAS check_ldap"
--	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
--else
--  AC_MSG_WARN([Skipping LDAP plugin])
--  AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
--fi
--LIBS="$_SAVEDLIBS"
--
- dnl Check for headers used by check_ide_smart
- AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
- if test "$FOUNDINCLUDE" = "yes" ; then
-@@ -305,6 +288,8 @@ fi
- AC_ARG_WITH([ipv6],
- 	[AS_HELP_STRING([--with-ipv6], [support IPv6 @<:@default=check@:>@])],
- 	[], [with_ipv6=check])
-+AC_ARG_WITH([ldap],[AS_HELP_STRING([--with-ldap], [support Openldap @<:@default=check@:>@])],
-+	[], [with_ldap=check])
- 
- dnl Check for AF_INET6 support - unistd.h required for Darwin
- if test "$with_ipv6" != "no"; then
-@@ -333,6 +318,24 @@ if test "$with_ipv6" != "no"; then
- 	with_ipv6="$np_cv_sys_ipv6"
- fi
- 
-+dnl Check for LDAP libraries
-+if test "$with_ldap" != "no"; then
-+
-+	_SAVEDLIBS="$LIBS"
-+	AC_CHECK_LIB(ldap,main,,,-llber)
-+	if test "$ac_cv_lib_ldap_main" = "yes"; then
-+		LDAPLIBS="-lldap -llber"\
-+		LDAPINCLUDE="-I/usr/include/ldap"
-+		AC_SUBST(LDAPLIBS)
-+		AC_SUBST(LDAPINCLUDE)
-+		AC_CHECK_FUNCS(ldap_set_option)
-+		EXTRAS="$EXTRAS check_ldap"
-+		AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
-+	else
-+		AC_MSG_ERROR([Cannot find openldap libraries.])
-+	fi
-+fi
-+LIBS="$_SAVEDLIBS"
- 
- dnl Checks for Kerberos. Must come before openssl checks for Redhat EL 3
- AC_CHECK_HEADERS(krb5.h,FOUNDINCLUDE=yes,FOUNDINCLUDE=no)
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild
deleted file mode 100644
index edabbce9aad3..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild
+++ /dev/null
@@ -1,147 +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-r2.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 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}-implicit-pointer-conversion.patch
-	epatch "${FILESDIR}"/${PN}-1.4.15-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"
-}