Clean out old versions.

(Portage version: 2.1.2.9)

17 files changed, 9 insertions, 957 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 3a63b22248ea..7f824b8a097a 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.63 2007/06/10 16:07:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.64 2007/06/10 16:48:53 dertobi123 Exp $
+
+  10 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-plugins-1.4.ebuild, -nagios-plugins-1.4.1.ebuild,
+  -nagios-plugins-1.4.2-r1.ebuild, -nagios-plugins-1.4.3-r1.ebuild,
+  -nagios-plugins-1.4.6.ebuild, -nagios-plugins-1.4.8.ebuild:
+  Clean out old versions.
 
   10 Jun 2007; Markus Rothe <corsair@gentoo.org>
   nagios-plugins-1.4.8-r1.ebuild:
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4
deleted file mode 100644
index 2c00b65a8836..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9b21b92acc4b2b0dbb2d12bca6b27582 nagios-plugins-1.4.tar.gz 972810
-RMD160 e50c16b07754b146483cdeecb04ab86b03f1c84d nagios-plugins-1.4.tar.gz 972810
-SHA256 ea01cfa18151ac7e23bd6ede54b6ee2438185b35df6bb1130c68ba765df04831 nagios-plugins-1.4.tar.gz 972810
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.1
deleted file mode 100644
index 00530ee5a63c..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5bdd5dd7fca92a2aeb29683866ee42f1 nagios-plugins-1.4.1.tar.gz 967552
-RMD160 fe02a63fe99635552376736ab445957d374fb38b nagios-plugins-1.4.1.tar.gz 967552
-SHA256 e64a4fdad256f5b2a3717390e4195e642f3985fdc8d74998ad231a6a30cfcb9b nagios-plugins-1.4.1.tar.gz 967552
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1
deleted file mode 100644
index ab34bd0c4a74..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1f2bee15ade3d98ec79964a43479e328 nagios-plugins-1.4.2.tar.gz 971447
-RMD160 93d747bb445e4e59cdb72ef210feb052b7855cac nagios-plugins-1.4.2.tar.gz 971447
-SHA256 a329b3e1c7daf79dc002eacc44af9d4706555342b7d20227cc8eb3139767e652 nagios-plugins-1.4.2.tar.gz 971447
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r1
deleted file mode 100644
index 85576d7d879e..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2c40fc69d51cc979e85150870a1daa93 nagios-plugins-1.4.3.tar.gz 1257775
-RMD160 bc1d4f8cddd481775c514758a462fe533e01e846 nagios-plugins-1.4.3.tar.gz 1257775
-SHA256 e1178d639bef1b45a7bddb61899217122840382ee180594f0262fb4a1e6a8c70 nagios-plugins-1.4.3.tar.gz 1257775
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.6 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.6
deleted file mode 100644
index d9c7e5303f01..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea79fa91092d709aa6b2e732b1d55541 nagios-plugins-1.4.6.tar.gz 1349110
-RMD160 9ec598e8de28cb962b87337789ab3f8d41ca3d11 nagios-plugins-1.4.6.tar.gz 1349110
-SHA256 892adc5bde75c711dc63d6bde9caf9c5f93d7a6e6df8df24c160b427bb1d51ca nagios-plugins-1.4.6.tar.gz 1349110
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.8 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.8
deleted file mode 100644
index 73aa45de0e8a..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ab16f99f8bd8a9b2897d003d3ba7024e nagios-plugins-1.4.8.tar.gz 1356563
-RMD160 28754b5e09ef0617530fdc6f54c62f5f94c0bd03 nagios-plugins-1.4.8.tar.gz 1356563
-SHA256 ce59972199049e587f2ee078888beb3824a6612d75a8efc9feaafe64d6ee83ef nagios-plugins-1.4.8.tar.gz 1356563
diff --git a/net-analyzer/nagios-plugins/files/install-opts-fix.diff b/net-analyzer/nagios-plugins/files/install-opts-fix.diff
deleted file mode 100644
index 20a8424e461e..000000000000
--- a/net-analyzer/nagios-plugins/files/install-opts-fix.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -urh nagiosplug-1.3-beta1.new/Makefile.in nagiosplug-1.3-beta1/Makefile.in
---- nagiosplug-1.3-beta1.new/Makefile.in	2002-06-13 07:02:17.000000000 -0700
-+++ nagiosplug-1.3-beta1/Makefile.in	2002-10-30 20:41:54.000000000 -0800
-@@ -68,7 +68,6 @@
- EXTRAS = @EXTRAS@
- HOSTNAME = @HOSTNAME@
- INSTALL = @INSTALL@
--INSTALL_OPTS = @INSTALL_OPTS@
- LDAPINCLUDE = @LDAPINCLUDE@
- LDAPLIBS = @LDAPLIBS@
- MYSQLLIBS = @MYSQLLIBS@
-diff -urh nagiosplug-1.3-beta1.new/configure.in nagiosplug-1.3-beta1/configure.in
---- nagiosplug-1.3-beta1.new/configure.in	2002-06-12 20:03:07.000000000 -0700
-+++ nagiosplug-1.3-beta1/configure.in	2002-10-30 20:42:50.000000000 -0800
-@@ -46,8 +46,6 @@
- AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
- AC_SUBST(nagios_usr)
- AC_SUBST(nagios_grp)
--INSTALL_OPTS="-o $nagios_usr -g $nagios_grp"
--AC_SUBST(INSTALL_OPTS)
- 
- AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
- AC_SUBST(trusted_path)
-@@ -158,7 +156,7 @@
- dnl Check for mysql libraries
- _SAVEDLIBS="$LIBS"
- _SAVEDCPPFLAGS="$CPPFLAGS"
--CPPFLAGS="-I/usr/include"
-+CPPFLAGS="-I/usr/include/mysql"
- AC_ARG_WITH(mysqllibdir,--with-mysqllibdir=<dir> sets path to mysql libraries,[MYSQLLIBDIR=$withval])
- if test -n "$MYSQLLIBS"; then
-   AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR",,-L$MYSQLLIBDIR -lz)
-diff -urh nagiosplug-1.3-beta1.new/plugins/Makefile.am nagiosplug-1.3-beta1/plugins/Makefile.am
---- nagiosplug-1.3-beta1.new/plugins/Makefile.am	2002-02-27 22:42:57.000000000 -0800
-+++ nagiosplug-1.3-beta1/plugins/Makefile.am	2002-10-30 20:41:54.000000000 -0800
-@@ -31,7 +31,6 @@
- test:
- 	perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
- 
--AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
- 
- ##############################################################################
- # the actual targets
-diff -urh nagiosplug-1.3-beta1.new/plugins/Makefile.in nagiosplug-1.3-beta1/plugins/Makefile.in
---- nagiosplug-1.3-beta1.new/plugins/Makefile.in	2002-06-13 07:02:17.000000000 -0700
-+++ nagiosplug-1.3-beta1/plugins/Makefile.in	2002-10-30 20:41:54.000000000 -0800
-@@ -67,7 +67,6 @@
- EXTRAS = @EXTRAS@
- HOSTNAME = @HOSTNAME@
- INSTALL = @INSTALL@
--INSTALL_OPTS = @INSTALL_OPTS@
- LDAPINCLUDE = @LDAPINCLUDE@
- LDAPLIBS = @LDAPLIBS@
- MYSQLLIBS = @MYSQLLIBS@
-@@ -144,8 +143,6 @@
- 
- TESTS = @PLUGIN_TEST@
- 
--AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
--
- ##############################################################################
- # the actual targets
- 
-diff -urh nagiosplug-1.3-beta1.new/plugins-scripts/Makefile.in nagiosplug-1.3-beta1/plugins-scripts/Makefile.in
---- nagiosplug-1.3-beta1.new/plugins-scripts/Makefile.in	2002-06-13 07:02:17.000000000 -0700
-+++ nagiosplug-1.3-beta1/plugins-scripts/Makefile.in	2002-10-30 20:41:54.000000000 -0800
-@@ -67,7 +67,6 @@
- EXTRAS = @EXTRAS@
- HOSTNAME = @HOSTNAME@
- INSTALL = @INSTALL@
--INSTALL_OPTS = @INSTALL_OPTS@
- LDAPINCLUDE = @LDAPINCLUDE@
- LDAPLIBS = @LDAPLIBS@
- MYSQLLIBS = @MYSQLLIBS@
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.3-check_disk-fix.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.3-check_disk-fix.patch
deleted file mode 100644
index 9bdc29a3c379..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.3-check_disk-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Source: <URL:http://nagiosplug.cvs.sourceforge.net/nagiosplug/nagiosplug/plugins/check_disk.c?r1=1.64&r2=1.65&diff_format=u>
-
---- nagiosplug-old/plugins/check_disk.c	2006/03/27 08:19:01	1.64
-+++ nagiosplug-new/plugins/check_disk.c	2006/05/02 08:30:21	1.65
-@@ -462,6 +462,8 @@
-       se->c_df = c_df;
-       se->w_dfp = w_dfp;
-       se->c_dfp = c_dfp;
-+      se->w_idfp = w_idfp;
-+      se->c_idfp = c_idfp;
-       se->found = 0;
-       se->found_len = 0;
-       *pathtail = se;
-@@ -480,6 +482,8 @@
-                         se->c_df = 0;
-                         se->w_dfp = 0;
-                         se->c_dfp = 0;
-+			se->w_idfp = 0;
-+			se->c_idfp = 0;
-       se->found = 0;
-       se->found_len = 0;
-       *dptail = se;
-@@ -497,6 +501,8 @@
-                         se->c_df = 0;
-                         se->w_dfp = 0;
-                         se->c_dfp = 0;
-+			se->w_idfp = 0;
-+			se->c_idfp = 0;
-       se->found = 0;
-       se->found_len = 0;
-       *fstail = se;
-@@ -519,6 +525,8 @@
-       c_df = 0;
-       w_dfp = -1.0;
-       c_dfp = -1.0;
-+      w_idfp = -1.0;
-+      c_idfp = -1.0;
-       break;
-     case 'V':                 /* version */
-       print_revision (progname, revision);
-@@ -547,6 +555,8 @@
-     se->c_df = c_df;
-     se->w_dfp = w_dfp;
-     se->c_dfp = c_dfp;
-+    se->w_idfp = w_idfp;
-+    se->c_idfp = c_idfp;
-     se->found =0;
-     se->found_len = 0;
-     *pathtail = se;
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.6-po.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.6-po.patch
deleted file mode 100644
index 1304e28cb75c..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.6-po.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- Makefile.in.in	2006/05/18 23:09:03	1.1
-+++ Makefile.in.in	2007/02/09 14:35:41	1.2
-@@ -1,5 +1,7 @@
-+# -*- buffer-read-only: t -*- vi: set ro:
-+# DO NOT EDIT! GENERATED AUTOMATICALLY!
- # Makefile for PO directory in any package using GNU gettext.
--# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
- #
- # This file can be copied and used freely without restrictions.  It can
- # be used in projects which are not available under the GNU General Public
-@@ -25,17 +27,26 @@
- exec_prefix = @exec_prefix@
- datarootdir = @datarootdir@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = @localedir@
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-+mkinstalldirs = $(SHELL) @install_sh@ -d
-+mkdir_p = @mkdir_p@
- 
--GMSGFMT = @GMSGFMT@
--MSGFMT = @MSGFMT@
--XGETTEXT = @XGETTEXT@
-+GMSGFMT_ = @GMSGFMT@
-+GMSGFMT_no = @GMSGFMT@
-+GMSGFMT_yes = @GMSGFMT_015@
-+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-+MSGFMT_ = @MSGFMT@
-+MSGFMT_no = @MSGFMT@
-+MSGFMT_yes = @MSGFMT_015@
-+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-+XGETTEXT_ = @XGETTEXT@
-+XGETTEXT_no = @XGETTEXT@
-+XGETTEXT_yes = @XGETTEXT_015@
-+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
- MSGMERGE = msgmerge
- MSGMERGE_UPDATE = @MSGMERGE@ --update
- MSGINIT = msginit
-@@ -159,7 +170,7 @@
- install-exec:
- install-data: install-data-@USE_NLS@
- 	if test "$(PACKAGE)" = "gettext-tools"; then \
--	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- 	  for file in $(DISTFILES.common) Makevars.template; do \
- 	    $(INSTALL_DATA) $(srcdir)/$$file \
- 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-@@ -172,13 +183,13 @@
- 	fi
- install-data-no: all
- install-data-yes: all
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkdir_p) $(DESTDIR)$(datadir)
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
--	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-+	  $(mkdir_p) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
- 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
- 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-@@ -218,19 +229,19 @@
- installdirs-exec:
- installdirs-data: installdirs-data-@USE_NLS@
- 	if test "$(PACKAGE)" = "gettext-tools"; then \
--	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- 	else \
- 	  : ; \
- 	fi
- installdirs-data-no:
- installdirs-data-yes:
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkdir_p) $(DESTDIR)$(datadir)
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
--	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-+	  $(mkdir_p) $(DESTDIR)$$dir; \
- 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
- 	    if test -n "$$lc"; then \
- 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-@@ -375,7 +386,7 @@
- 
- Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
- 	cd $(top_builddir) \
--	  && $(SHELL) ./config.status $(subdir)/$@.in
-+	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
- 
- force:
- 
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index 49f4c77e89e4..4727cead0d4b 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>netmon</herd>
 	<maintainer>
-		<email>ramereth@gentoo.org</email>
-		<name>Lance Albertson</name>
+		<email>dertobi123@gentoo.org</email>
+		<name>Tobias Scherbaum</name>
 	</maintainer>
 	<longdescription lang="en">
 		Nagios plugins - Pack of plugins to make Nagios work properly
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
deleted file mode 100644
index df18791da5ad..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 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.1.ebuild,v 1.11 2006/11/23 19:51:53 vivo Exp $
-
-inherit eutils
-
-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="~amd64 ~ppc ~sparc x86"
-IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
-nagios-ssh nagios-game ups ipv6 radius"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	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
-	)
-	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 /dev/null nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	if ! use radius; then
-		EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch
-	fi
-	if ! use radius; then
-		export WANT_AUTOCONF=2.5
-		export WANT_AUTMAKE=1.8
-		cd ${S}
-		aclocal -I m4 || die "Failed to run aclocal"
-		autoconf || die "Failed to run autoconf"
-		automake || die "Failed to run automake"
-	fi
-}
-
-src_compile() {
-
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with ssl openssl) \
-		$(use_with ipv6) \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--with-nagios-user=nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || 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 '30s/use lib utils.pm;/use utils;/' \
-		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
-		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/nagios/libexec
-		exeinto /usr/nagios/libexec
-		doexe ${S}/contrib/check_nagios_db.pl
-	fi
-
-	dodir /usr/nagios/libexec/
-	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
-
-	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}/usr/nagios/libexec"
-
-	chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}/usr/nagios/libexec"
-}
-
-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/nagios/libexec/contrib"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
deleted file mode 100644
index 7a1c03b9a1f7..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2006 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.2-r1.ebuild,v 1.7 2006/11/29 21:25:16 cedk Exp $
-
-WANT_AUTOCONF=2.58
-WANT_AUTOMAKE=1.8
-
-inherit eutils autotools
-
-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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
-nagios-ssh nagios-game ups ipv6 radius"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	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 /dev/null nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if ! use radius; then
-		EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch \
-			"${FILESDIR}"/nagios-plugins-1.4-autoconf-fix.patch
-	fi
-	if ! use radius; then
-		eaclocal -I m4 || die "eaclocal failed"
-		eautoconf || die "eautoconf failed"
-		automake || die "automake failed"
-	fi
-}
-
-src_compile() {
-
-	local conf
-	if use ssl; then
-		conf="${conf} --with-openssl=/usr"
-	else
-		conf="${conf} --without-openssl"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with ipv6) \
-		${conf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--with-nagios-user=nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || 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 '30s/use lib utils.pm;/use utils;/' \
-		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
-		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/nagios/libexec
-		exeinto /usr/nagios/libexec
-		doexe ${S}/contrib/check_nagios_db.pl
-	fi
-
-	dodir /usr/nagios/libexec/
-	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
-
-	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec"
-
-	chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}usr/nagios/libexec"
-}
-
-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/nagios/libexec/contrib"
-}
-
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
deleted file mode 100644
index f1f3b582d298..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 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.3-r1.ebuild,v 1.6 2007/01/04 15:39:32 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
-nagios-ssh nagios-game ups ipv6 radius"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	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 /dev/null nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if ! use radius; then
-		EPATCH_OPTS="-p0 -d ${S}" epatch \
-			${FILESDIR}/nagios-plugins-1.4-noradius.patch \
-			${FILESDIR}/nagios-plugins-1.4-autoconf-fix.patch
-	fi
-
-	# Remove this after 1.4.3 since its been applied upstream
-	EPATCH_OPTS="-d ${S}" epatch \
-	${FILESDIR}/nagios-plugins-1.4.3-check_disk-fix.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-
-	local conf
-	if use ssl; then
-		conf="${conf} --with-openssl=/usr"
-	else
-		conf="${conf} --without-openssl"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with ipv6) \
-		${conf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--with-nagios-user=nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || 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 '30s/use lib utils.pm;/use utils;/' \
-		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
-		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/nagios/libexec
-		exeinto /usr/nagios/libexec
-		doexe ${S}/contrib/check_nagios_db.pl
-	fi
-
-	dodir /usr/nagios/libexec/
-	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
-
-	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec"
-
-	chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}usr/nagios/libexec"
-}
-
-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/nagios/libexec/contrib"
-}
-
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.6.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.6.ebuild
deleted file mode 100644
index 279f5d17b26d..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2007 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.6.ebuild,v 1.2 2007/05/08 21:38:01 dertobi123 Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
-nagios-ssh nagios-game ups ipv6 radius"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	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="-p0 -d ${S}" epatch \
-			${FILESDIR}/nagios-plugins-1.4-noradius.patch
-	fi
-
-	# Remove this after 1.4.6 since its been applied upstream
-	EPATCH_OPTS="-d ${S}/po" epatch \
-		${FILESDIR}/nagios-plugins-1.4.6-po.patch
-
-	AT_M4DIR="gl/m4" eautoreconf
-}
-
-src_compile() {
-
-	local conf
-	if use ssl; then
-		conf="${conf} --with-openssl=/usr"
-	else
-		conf="${conf} --without-openssl"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with ipv6) \
-		${conf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || 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 '30s/use lib utils.pm;/use utils;/' \
-		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
-		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/nagios/libexec
-		exeinto /usr/nagios/libexec
-		doexe ${S}/contrib/check_nagios_db.pl
-	fi
-
-	dodir /usr/nagios/libexec/
-	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
-
-	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec"
-
-	chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}usr/nagios/libexec"
-}
-
-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/nagios/libexec/contrib"
-}
-
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.8.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.8.ebuild
deleted file mode 100644
index 962615b15d9b..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.8.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2007 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.8.ebuild,v 1.2 2007/05/09 13:56:39 dertobi123 Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
-nagios-ssh nagios-game ups ipv6 radius"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	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="-p0 -d ${S}" epatch \
-			${FILESDIR}/nagios-plugins-1.4-noradius.patch
-	fi
-
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-
-	local conf
-	if use ssl; then
-		conf="${conf} --with-openssl=/usr"
-	else
-		conf="${conf} --without-openssl"
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with ipv6) \
-		${conf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || 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 '30s/use lib utils.pm;/use utils;/' \
-		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
-		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/nagios/libexec
-		exeinto /usr/nagios/libexec
-		doexe ${S}/contrib/check_nagios_db.pl
-	fi
-
-	dodir /usr/nagios/libexec/
-	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
-
-	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec"
-
-	chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}usr/nagios/libexec"
-
-	chown root:nagios ${D}/usr/nagios/libexec/check_icmp || "Failed Chown of ${D}/usr/nagios/libexec/check_icmp"
-	chmod 04710 ${D}/usr/nagios/libexec/check_icmp || "Failed Chmod of ${D}usr/nagios/libexec/check_icmp"
-}
-
-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/nagios/libexec/contrib"
-}
-
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild
deleted file mode 100644
index 047a190683b3..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.12 2006/11/23 19:51:53 vivo Exp $
-
-inherit eutils
-
-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="~amd64 ~ppc sparc x86"
-IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6"
-
-# radius - awaiting keywods
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-# awaiting keywords	radius? ( >=net-dialup/radiusclient-0.3.2 )
-
-# test broken anyway	test? ( >=dev-perl/Cache-Cache-1.03 )"
-
-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
-	)
-	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 /dev/null nagios
-}
-
-src_compile() {
-	# awaiting keywords on radius dependancy
-	#if ! use radius; then
-	#	epatch ${FILESDIR}/nagios-plugins-noradius-1.4.patch
-	#fi
-
-	./configure \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with ssl openssl) \
-		$(use_with ipv6) \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--with-nagios-user=nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	#fix problem with additional -
-	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
-
-	make || die "make 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 '30s/use lib utils.pm;/use utils;/' \
-		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
-
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
-		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use mysql || use postgres; then
-		dodir /usr/nagios/libexec
-		exeinto /usr/nagios/libexec
-		doexe ${S}/contrib/check_nagios_db.pl
-	fi
-
-	dodir /usr/nagios/libexec/
-	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
-
-	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}/usr/nagios/libexec"
-
-	chmod -R o-rwx ${D}/usr/nagios/libexec "Failed Chmod of ${D}/usr/nagios/libexec"
-}
-
-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/nagios/libexec/contrib"
-}
-
-src_test() {
-	einfo "test broken"
-}