NM: Cleanup superseded EAPI=1 ebuild.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

8 files changed, 10 insertions, 465 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/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"
-}