removed versions wrt security #132159

Package-Manager: portage-2203-svn

16 files changed, 12 insertions, 1286 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 0e6794802af7..4a197aa8e33d 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.78 2006/05/05 19:38:38 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.79 2006/05/06 18:09:48 eldad Exp $
+
+  06 May 2006; Eldad Zack <eldad@gentoo.org> -nagios-core-1.2-r4.ebuild,
+  -nagios-core-1.3.ebuild, -nagios-core-2.0.ebuild, -nagios-core-2.1.ebuild,
+  -nagios-core-2.2.ebuild:
+  removed versions wrt security #132159
 
   05 May 2006; Lance Albertson <ramereth@gentoo.org> nagios-core-1.4.ebuild:
   * Marked stable on x86 (bug #132159)
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.2-r4 b/net-analyzer/nagios-core/files/digest-nagios-core-1.2-r4
deleted file mode 100644
index bcfb63ee79d8..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.2-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 414d70e5269d5b8d7c21bf3ee129309f nagios-1.2.tar.gz 1625322
-MD5 565ce2a690d50aeb542e7afe44b8c733 nagios-1.x-Makefile-distclean-gentoo.diff.bz2 1133
-MD5 faad55511f21831997f9150547aa4e7d nagios-1.x.cfg-sample.gz 7224
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.3 b/net-analyzer/nagios-core/files/digest-nagios-core-1.3
deleted file mode 100644
index 952065771ba6..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2011df334cb0206dbb054606c6a2dc84 nagios-1.3.tar.gz 1626430
-MD5 565ce2a690d50aeb542e7afe44b8c733 nagios-1.x-Makefile-distclean-gentoo.diff.bz2 1133
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.0 b/net-analyzer/nagios-core/files/digest-nagios-core-2.0
deleted file mode 100644
index ef3e8a249d87..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2a30ccf68bdbebc9c6f5a06e9c09e757 nagios-2.0.tar.gz 1735569
-MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.1 b/net-analyzer/nagios-core/files/digest-nagios-core-2.1
deleted file mode 100644
index b9db976484e6..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
-MD5 ec559a13dbf3a403e9325c90425076df nagios-2.1.tar.gz 1734773
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.2 b/net-analyzer/nagios-core/files/digest-nagios-core-2.2
deleted file mode 100644
index 88aa14284b15..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
-MD5 38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz 1734695
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
deleted file mode 100644
index 2d996567af1d..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
+++ /dev/null
@@ -1,258 +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-core/nagios-core-1.2-r4.ebuild,v 1.13 2006/04/17 00:16:27 eldad Exp $
-
-inherit eutils apache-module toolchain-funcs
-
-MY_P=${P/-core}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	mirror://gentoo/nagios-1.x-Makefile-distclean-gentoo.diff.bz2
-	mirror://gentoo/nagios-1.x.cfg-sample.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~amd64"
-IUSE="noweb mysql postgres perl debug apache2"
-
-DEPEND="virtual/mailx
-	!noweb? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		${NEED_APACHE_DEPEND}
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )
-	mysql? ( >=dev-db/mysql-3.23.56 )
-	postgres? ( !mysql? ( >=dev-db/postgresql-7.3.2 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# If there's a gd lib on the system, it will try to build with it.
-	# check if gdlib-config is on, and then check its output.
-	if [[ -x /usr/bin/gdlib-config ]]; then
-		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
-			eerror "Your gd has been compiled without jpeg support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-
-	if use noweb; then
-		enewuser nagios -1 /bin/bash /dev/null nagios
-	else
-		enewuser nagios -1 /bin/bash /dev/null apache
-		usermod -G apache nagios
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/submit_check_result_via_nsca.patch
-
-	epatch ${WORKDIR}/nagios-1.x-Makefile-distclean-gentoo.diff
-
-	# libpq-fe.h isnt in psgql/ 
-	cd xdata/
-	sed -i -e "s:pgsql/::" *.c
-}
-
-src_compile() {
-	local myconf
-
-	if use mysql && use postgres; then
-		ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
-		ewarn "Using MySQL as default."
-
-		has_version ">=sys-apps/portage-2.0.50" && (
-			einfo "You can add -"
-			echo
-			einfo "net-analyzer/nagios-core [use flags]"
-			echo
-			einfo "to /etc/portage/package.use to permanently set this package's USE flags"
-			einfo "More info on package.use is available on:"
-			einfo "     man 5 portage"
-		)
-	elif use postgres ; then
-		myconf="${myconf} --with-pgsql-xdata"
-
-		if [ -r /usr/include/postgresql/libpq-fe.h ] ; then
-			myconf="${myconf} --with-pgsql-inc=/usr/include/postgresql"
-		fi
-	fi
-
-	use mysql && myconf="${myconf} --with-mysql-xdata"
-
-	use perl && myconf="${myconf} \
-		--enable-embedded-perl \
-		--with-perlcache"
-
-	if use debug; then
-		myconf="${myconf} --enable-DEBUG0"
-		myconf="${myconf} --enable-DEBUG1"
-		myconf="${myconf} --enable-DEBUG2"
-		myconf="${myconf} --enable-DEBUG3"
-		myconf="${myconf} --enable-DEBUG4"
-		myconf="${myconf} --enable-DEBUG5"
-	fi
-
-	if use noweb; then
-		myconf="${myconf} --with-command-grp=nagios"
-	else
-		myconf="${myconf} --with-command-grp=apache"
-	fi
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-
-	make CC=$(tc-getCC) DESTDIR=${D} nagios contrib || die "make failed"
-
-	if use !noweb ; then
-		# Only compile the CGI's if "noweb" useflag is not set.
-		make CC=$(tc-getCC) DESTDIR=${D} cgis || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-
-	if use noweb; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile
-		sed -i -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile
-	fi
-
-	make DESTDIR=${D} install
-	make DESTDIR=${D} install-config
-	make DESTDIR=${D} install-commandmode
-
-	docinto sample-configs
-	dodoc ${D}/etc/nagios/*
-	rm ${D}/etc/nagios/*
-
-	newdoc ${WORKDIR}/nagios-1.x.cfg-sample nagios.cfg-sample
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
-
-	insinto /usr/nagios/contrib
-	doins contrib/*
-
-	#contribs are not configured by the configure script, we'll configure them overselves...
-	find ${S}/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:;
-						s:/usr/local/nagios/libexec:/usr/nagios/libexec:;
-						s:/usr/local/nagios/etc:/etc/nagios:;
-						s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i
-
-	insinto /usr/nagios/contrib/database
-	doins contrib/database/*
-
-	exeinto /usr/nagios/contrib/eventhandlers
-	doexe contrib/eventhandlers/*
-
-	exeinto /usr/nagios/contrib/eventhandlers/distributed-monitoring
-	doexe contrib/eventhandlers/distributed-monitoring/*
-
-	exeinto /usr/nagios/contrib/eventhandlers/redundancy-scenario1
-	doexe contrib/eventhandlers/redundancy-scenario1/*
-
-	for dir in etc/nagios usr/nagios var/nagios usr/nagios/contrib
-	do
-		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
-	done
-
-	#Apache Module
-	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
-	fi
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /usr/nagios/share/ssi
-	keepdir /var/nagios/rw
-}
-
-pkg_preinst() {
-	if use noweb; then
-		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
-
-	chmod 2750 ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
-	einfo
-	einfo "Also, if you want nagios to start at boot time"
-	einfo "remember to execute:"
-	einfo "  rc-update add nagios default"
-	einfo
-
-	if use !noweb; then
-		einfo "This does not include cgis that are perl-dependent"
-		einfo "Currently traceroute.cgi is perl-dependent"
-		einfo "To have ministatus.cgi requires copying of ministatus.c"
-		einfo "to cgi directory for compiling."
-
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
-
-		einfo
-		einfo "That will make nagios's web front end visable via"
-		einfo "http://localhost/nagios/"
-		einfo
-
-	else
-		einfo "Please note that you have installed Nagios without web interface."
-		einfo "Please don't file any bugs about having no web interface when you do this."
-		einfo "Thank you!"
-	fi
-
-	if use mysql && use postgres; then
-		ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
-		ewarn "as a default, MySQL support was built."
-		ewarn "To build nagios with PostgreSQL you'll have to emerge nagios without the mysql useflag."
-	fi
-
-	einfo
-	einfo "If you are using distributed monitoring, check the contrib scripts."
-	einfo "configure the central nagios server for the nsca in /etc/conf.d/nagios."
-	einfo
-	einfo "If your kernel has /proc protection, nagios"
-	einfo "will not be happy as it relies on accessing the proc"
-	einfo "filesystem. You can fix this by adding nagios into"
-	einfo "the group wheel, but this is not recomended."
-	einfo
-}
-
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-1.3.ebuild b/net-analyzer/nagios-core/nagios-core-1.3.ebuild
deleted file mode 100644
index 3f45878f0bef..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.3.ebuild
+++ /dev/null
@@ -1,270 +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-core/nagios-core-1.3.ebuild,v 1.7 2006/04/17 00:16:27 eldad Exp $
-
-inherit eutils apache-module toolchain-funcs
-
-MY_P=${P/-core}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	mirror://gentoo/nagios-1.x-Makefile-distclean-gentoo.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 sparc x86"
-IUSE="noweb mysql postgres perl debug apache2"
-
-DEPEND="virtual/mailx
-	!noweb? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		${NEED_APACHE_DEPEND}
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )
-	mysql? ( >=dev-db/mysql-3.23.56 )
-	postgres? ( !mysql? ( >=dev-db/postgresql-7.3.2 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# If there's a gd lib on the system, it will try to build with it.
-	# check if gdlib-config is on, and then check its output.
-	if [[ -x /usr/bin/gdlib-config ]]; then
-		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
-			eerror "Your gd has been compiled without jpeg support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-
-	if use noweb; then
-		enewuser nagios -1 /bin/bash /dev/null nagios
-	else
-		enewuser nagios -1 /bin/bash /dev/null apache
-		usermod -G apache nagios
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/nagios-1.x-Makefile-distclean-gentoo.diff
-
-	# libpq-fe.h isnt in psgql/ 
-	cd xdata/
-	sed -i -e "s:pgsql/::" *.c
-}
-
-src_compile() {
-	local myconf
-
-	if use mysql && use postgres; then
-		ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
-		ewarn "Using MySQL as default."
-
-		has_version ">=sys-apps/portage-2.0.50" && (
-			einfo "You can add -"
-			echo
-			einfo "net-analyzer/nagios-core [use flags]"
-			echo
-			einfo "to /etc/portage/package.use to permanently set this package's USE flags"
-			einfo "More info on package.use is available on:"
-			einfo "     man 5 portage"
-		)
-	elif use postgres ; then
-		myconf="${myconf} \
-			--with-pgsql-xdata \
-			--with-pgsql-status \
-			--with-pgsql-comments \
-			--with-pgsql-extinfo \
-			--with-pgsql-retention \
-			--with-pgsql-downtime"
-
-		if [ -r /usr/include/postgresql/libpq-fe.h ] ; then
-			myconf="${myconf} --with-pgsql-inc=/usr/include/postgresql"
-		fi
-	fi
-
-	use mysql && myconf="${myconf} \
-		--with-file-perfdata \
-		--with-template-extinfo \
-		--with-mysql-xdata \
-		--with-mysql-status \
-		--with-mysql-comments \
-		--with-mysql-retention \
-		--with-mysql-downtime"
-
-	use perl && myconf="${myconf} \
-		--enable-embedded-perl \
-		--with-perlcache"
-
-	if use debug; then
-		myconf="${myconf} --enable-DEBUG0"
-		myconf="${myconf} --enable-DEBUG1"
-		myconf="${myconf} --enable-DEBUG2"
-		myconf="${myconf} --enable-DEBUG3"
-		myconf="${myconf} --enable-DEBUG4"
-		myconf="${myconf} --enable-DEBUG5"
-	fi
-
-	if use noweb; then
-		myconf="${myconf} --with-command-grp=nagios"
-	else
-		myconf="${myconf} --with-command-grp=apache"
-	fi
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-
-	make CC=$(tc-getCC) DESTDIR=${D} nagios contrib || die "make failed"
-
-	if use !noweb ; then
-		# Only compile the CGI's if "noweb" useflag is not set.
-		make CC=$(tc-getCC) DESTDIR=${D} cgis || die
-	fi
-
-	emake -C contrib all || "contrib make filed"
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING contrib/htaccess.sample
-	docinto contrib
-	dodoc contrib/README
-
-	if use noweb; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile
-		sed -i -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile
-	fi
-
-	make DESTDIR=${D} install
-	make DESTDIR=${D} install-config
-	make DESTDIR=${D} install-commandmode
-
-	docinto sample-configs
-	dodoc ${D}/etc/nagios/*
-	rm ${D}/etc/nagios/*
-
-	# contribs are not configured by the configure script, we'll configure them overselves...
-	find ${S}/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:;
-						s:/usr/local/nagios/libexec:/usr/nagios/libexec:;
-						s:/usr/local/nagios/etc:/etc/nagios:;
-						s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i
-
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/database contrib/eventhandlers
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
-
-	chmod 644 ${S}/contrib/*.cgi
-	into /usr/nagios
-	for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
-		dobin $bin
-	done
-
-	# Apache Module
-	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
-		if use perl; then
-			into /usr/nagios
-			for cgi in `find contrib/ -name "*.cgi" -maxdepth 1` ; do
-				dosbin $cgi
-			done
-		fi
-	fi
-
-	for dir in etc/nagios usr/nagios var/nagios ; do
-		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
-	done
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /usr/nagios/share/ssi
-	keepdir /var/nagios/rw
-}
-
-pkg_preinst() {
-	if use noweb; then
-		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
-
-	chmod 2750 ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
-	chmod 0750 ${D}/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
-	einfo
-	einfo "Also, if you want nagios to start at boot time"
-	einfo "remember to execute:"
-	einfo "  rc-update add nagios default"
-	einfo
-
-	if use !noweb; then
-		einfo "This does not include cgis that are perl-dependent"
-		einfo "Currently traceroute.cgi is perl-dependent"
-		einfo "To have ministatus.cgi requires copying of ministatus.c"
-		einfo "to cgi directory for compiling."
-
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
-
-		einfo
-		einfo "That will make nagios's web front end visable via"
-		einfo "http://localhost/nagios/"
-		einfo
-
-	else
-		einfo "Please note that you have installed Nagios without web interface."
-		einfo "Please don't file any bugs about having no web interface when you do this."
-		einfo "Thank you!"
-	fi
-
-	if use mysql && use postgres; then
-		ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
-		ewarn "as a default, MySQL support was built."
-		ewarn "To build nagios with PostgreSQL you'll have to emerge nagios without the mysql useflag."
-	fi
-
-	einfo
-	einfo "If you are using distributed monitoring, check the contrib scripts."
-	einfo "configure the central nagios server for the nsca in /etc/conf.d/nagios."
-	einfo
-	einfo "If your kernel has /proc protection, nagios"
-	einfo "will not be happy as it relies on accessing the proc"
-	einfo "filesystem. You can fix this by adding nagios into"
-	einfo "the group wheel, but this is not recomended."
-	einfo
-}
-
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-2.0.ebuild b/net-analyzer/nagios-core/nagios-core-2.0.ebuild
deleted file mode 100644
index 4e9dab0f5c09..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.0.ebuild
+++ /dev/null
@@ -1,228 +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-core/nagios-core-2.0.ebuild,v 1.2 2006/04/17 00:16:27 eldad Exp $
-
-inherit eutils apache-module toolchain-funcs gnuconfig
-
-MY_P=${PN/-core}-${PV/_}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	mirror://gentoo/nagios-2.0b.cfg-sample.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb perl debug apache2"
-# mysql postgres
-DEPEND="virtual/mailx
-	!noweb? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		${NEED_APACHE_DEPEND}
-		perl? ( net-analyzer/traceroute )
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# If there's a gd lib on the system, it will try to build with it.
-	# check if gdlib-config is on, and then check its output.
-	if [[ -x ${ROOT}usr/bin/gdlib-config ]]; then
-		if [[ ! $(${ROOT}usr/bin/gdlib-config --libs | grep -- -ljpeg) ]]; then
-			eerror "Your gd has been compiled without jpeg support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-
-	if use noweb; then
-		enewuser nagios -1 /bin/bash /dev/null nagios
-	else
-		enewuser nagios -1 /bin/bash /dev/null apache
-		usermod -G apache nagios
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.x-series-nsca.patch
-	# ppc64 needs this
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf
-
-	if use perl
-	then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-DEBUG0"
-		myconf="${myconf} --enable-DEBUG1"
-		myconf="${myconf} --enable-DEBUG2"
-		myconf="${myconf} --enable-DEBUG3"
-		myconf="${myconf} --enable-DEBUG4"
-		myconf="${myconf} --enable-DEBUG5"
-	fi
-
-	if use noweb; then
-		myconf="${myconf} --with-command-grp=nagios"
-	else
-		myconf="${myconf} --with-command-grp=apache"
-	fi
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-
-	emake CC=$(tc-getCC) nagios || die "make failed"
-
-	if use !noweb ; then
-		# Only compile the CGI's if "noweb" useflag is not set.
-		make CC=$(tc-getCC) DESTDIR=${D} cgis || die
-	fi
-
-	emake -C contrib all || "contrib make filed"
-
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-	docinto contrib
-	dodoc contrib/README
-
-	if use noweb; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' \
-			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' \
-			Makefile
-	fi
-
-	sed -i -e 's/^contactgroups$//g' Makefile
-
-	make DESTDIR=${D} install
-	make DESTDIR=${D} install-config
-	make DESTDIR=${D} install-commandmode
-
-	docinto sample-configs
-	dodoc ${D}/etc/nagios/*
-	rm ${D}/etc/nagios/*
-
-	newdoc ${WORKDIR}/nagios-2.0b.cfg-sample nagios.cfg-sample
-
-	#contribs are not configured by the configure script, we'll configure them overselves...
-	find ${S}/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:;
-						s:/usr/local/nagios/libexec:/usr/nagios/libexec:;
-						s:/usr/local/nagios/etc:/etc/nagios:;
-						s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i
-
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/eventhandlers
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
-
-	chmod 644 ${S}/contrib/*.cgi
-	into /usr/nagios
-	for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
-		dobin $bin
-	done
-
-	# Apache Module
-	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
-		if use perl; then
-			into /usr/nagios ; dosbin contrib/traceroute.cgi
-		fi
-	fi
-
-	for dir in etc/nagios usr/nagios var/nagios ; do
-		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
-	done
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /usr/nagios/share/ssi
-	keepdir /var/nagios/rw
-}
-
-pkg_preinst() {
-	if use noweb; then
-		chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown -R nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
-
-	chmod ug+s ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
-	chmod 0750 ${D}/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
-	einfo
-	einfo "Also, if you want nagios to start at boot time"
-	einfo "remember to execute:"
-	einfo "  rc-update add nagios default"
-	einfo
-
-	if use !noweb; then
-		einfo "This does not include cgis that are perl-dependent"
-		einfo "Currently traceroute.cgi is perl-dependent"
-		einfo "To have ministatus.cgi requires copying of ministatus.c"
-		einfo "to cgi directory for compiling."
-
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
-
-		einfo
-		einfo "That will make nagios's web front end visable via"
-		einfo "http://localhost/nagios/"
-		einfo
-
-	else
-		einfo "Please note that you have installed Nagios without web interface."
-		einfo "Please don't file any bugs about having no web interface when you do this."
-		einfo "Thank you!"
-	fi
-
-	einfo
-	einfo "If your kernel has /proc protection, nagios"
-	einfo "will not be happy as it relies on accessing the proc"
-	einfo "filesystem. You can fix this by adding nagios into"
-	einfo "the group wheel, but this is not recomended."
-	einfo
-
-	einfo
-	ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
-}
-
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-2.1.ebuild b/net-analyzer/nagios-core/nagios-core-2.1.ebuild
deleted file mode 100644
index d58614b665a5..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.1.ebuild
+++ /dev/null
@@ -1,228 +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-core/nagios-core-2.1.ebuild,v 1.2 2006/04/17 00:16:27 eldad Exp $
-
-inherit eutils apache-module toolchain-funcs gnuconfig
-
-MY_P=${PN/-core}-${PV/_}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	mirror://gentoo/nagios-2.0b.cfg-sample.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb perl debug apache2"
-# mysql postgres
-DEPEND="virtual/mailx
-	!noweb? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		${NEED_APACHE_DEPEND}
-		perl? ( net-analyzer/traceroute )
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# If there's a gd lib on the system, it will try to build with it.
-	# check if gdlib-config is on, and then check its output.
-	if [[ -x ${ROOT}usr/bin/gdlib-config ]]; then
-		if [[ ! $(${ROOT}usr/bin/gdlib-config --libs | grep -- -ljpeg) ]]; then
-			eerror "Your gd has been compiled without jpeg support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-
-	if use noweb; then
-		enewuser nagios -1 /bin/bash /dev/null nagios
-	else
-		enewuser nagios -1 /bin/bash /dev/null apache
-		usermod -G apache nagios
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.x-series-nsca.patch
-	# ppc64 needs this
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf
-
-	if use perl
-	then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-DEBUG0"
-		myconf="${myconf} --enable-DEBUG1"
-		myconf="${myconf} --enable-DEBUG2"
-		myconf="${myconf} --enable-DEBUG3"
-		myconf="${myconf} --enable-DEBUG4"
-		myconf="${myconf} --enable-DEBUG5"
-	fi
-
-	if use noweb; then
-		myconf="${myconf} --with-command-grp=nagios"
-	else
-		myconf="${myconf} --with-command-grp=apache"
-	fi
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-
-	emake CC=$(tc-getCC) nagios || die "make failed"
-
-	if use !noweb ; then
-		# Only compile the CGI's if "noweb" useflag is not set.
-		make CC=$(tc-getCC) DESTDIR=${D} cgis || die
-	fi
-
-	emake -C contrib all || "contrib make filed"
-
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-	docinto contrib
-	dodoc contrib/README
-
-	if use noweb; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' \
-			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' \
-			Makefile
-	fi
-
-	sed -i -e 's/^contactgroups$//g' Makefile
-
-	make DESTDIR=${D} install
-	make DESTDIR=${D} install-config
-	make DESTDIR=${D} install-commandmode
-
-	docinto sample-configs
-	dodoc ${D}/etc/nagios/*
-	rm ${D}/etc/nagios/*
-
-	newdoc ${WORKDIR}/nagios-2.0b.cfg-sample nagios.cfg-sample
-
-	#contribs are not configured by the configure script, we'll configure them overselves...
-	find ${S}/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:;
-						s:/usr/local/nagios/libexec:/usr/nagios/libexec:;
-						s:/usr/local/nagios/etc:/etc/nagios:;
-						s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i
-
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/eventhandlers
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
-
-	chmod 644 ${S}/contrib/*.cgi
-	into /usr/nagios
-	for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
-		dobin $bin
-	done
-
-	# Apache Module
-	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
-		if use perl; then
-			into /usr/nagios ; dosbin contrib/traceroute.cgi
-		fi
-	fi
-
-	for dir in etc/nagios usr/nagios var/nagios ; do
-		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
-	done
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /usr/nagios/share/ssi
-	keepdir /var/nagios/rw
-}
-
-pkg_preinst() {
-	if use noweb; then
-		chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown -R nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
-
-	chmod ug+s ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
-	chmod 0750 ${D}/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
-	einfo
-	einfo "Also, if you want nagios to start at boot time"
-	einfo "remember to execute:"
-	einfo "  rc-update add nagios default"
-	einfo
-
-	if use !noweb; then
-		einfo "This does not include cgis that are perl-dependent"
-		einfo "Currently traceroute.cgi is perl-dependent"
-		einfo "To have ministatus.cgi requires copying of ministatus.c"
-		einfo "to cgi directory for compiling."
-
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
-
-		einfo
-		einfo "That will make nagios's web front end visable via"
-		einfo "http://localhost/nagios/"
-		einfo
-
-	else
-		einfo "Please note that you have installed Nagios without web interface."
-		einfo "Please don't file any bugs about having no web interface when you do this."
-		einfo "Thank you!"
-	fi
-
-	einfo
-	einfo "If your kernel has /proc protection, nagios"
-	einfo "will not be happy as it relies on accessing the proc"
-	einfo "filesystem. You can fix this by adding nagios into"
-	einfo "the group wheel, but this is not recomended."
-	einfo
-
-	einfo
-	ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
-}
-
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-2.2.ebuild b/net-analyzer/nagios-core/nagios-core-2.2.ebuild
deleted file mode 100644
index 158864646f24..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.2.ebuild
+++ /dev/null
@@ -1,228 +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-core/nagios-core-2.2.ebuild,v 1.2 2006/04/17 00:16:27 eldad Exp $
-
-inherit eutils apache-module toolchain-funcs gnuconfig
-
-MY_P=${PN/-core}-${PV/_}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	mirror://gentoo/nagios-2.0b.cfg-sample.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb perl debug apache2"
-# mysql postgres
-DEPEND="virtual/mailx
-	!noweb? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		${NEED_APACHE_DEPEND}
-		perl? ( net-analyzer/traceroute )
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# If there's a gd lib on the system, it will try to build with it.
-	# check if gdlib-config is on, and then check its output.
-	if [[ -x ${ROOT}usr/bin/gdlib-config ]]; then
-		if [[ ! $(${ROOT}usr/bin/gdlib-config --libs | grep -- -ljpeg) ]]; then
-			eerror "Your gd has been compiled without jpeg support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-
-	if use noweb; then
-		enewuser nagios -1 /bin/bash /dev/null nagios
-	else
-		enewuser nagios -1 /bin/bash /dev/null apache
-		usermod -G apache nagios
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.x-series-nsca.patch
-	# ppc64 needs this
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf
-
-	if use perl
-	then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-DEBUG0"
-		myconf="${myconf} --enable-DEBUG1"
-		myconf="${myconf} --enable-DEBUG2"
-		myconf="${myconf} --enable-DEBUG3"
-		myconf="${myconf} --enable-DEBUG4"
-		myconf="${myconf} --enable-DEBUG5"
-	fi
-
-	if use noweb; then
-		myconf="${myconf} --with-command-grp=nagios"
-	else
-		myconf="${myconf} --with-command-grp=apache"
-	fi
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-
-	emake CC=$(tc-getCC) nagios || die "make failed"
-
-	if use !noweb ; then
-		# Only compile the CGI's if "noweb" useflag is not set.
-		make CC=$(tc-getCC) DESTDIR=${D} cgis || die
-	fi
-
-	emake -C contrib all || "contrib make filed"
-
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-	docinto contrib
-	dodoc contrib/README
-
-	if use noweb; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' \
-			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' \
-			Makefile
-	fi
-
-	sed -i -e 's/^contactgroups$//g' Makefile
-
-	make DESTDIR=${D} install
-	make DESTDIR=${D} install-config
-	make DESTDIR=${D} install-commandmode
-
-	docinto sample-configs
-	dodoc ${D}/etc/nagios/*
-	rm ${D}/etc/nagios/*
-
-	newdoc ${WORKDIR}/nagios-2.0b.cfg-sample nagios.cfg-sample
-
-	#contribs are not configured by the configure script, we'll configure them overselves...
-	find ${S}/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:;
-						s:/usr/local/nagios/libexec:/usr/nagios/libexec:;
-						s:/usr/local/nagios/etc:/etc/nagios:;
-						s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i
-
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/eventhandlers
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
-
-	chmod 644 ${S}/contrib/*.cgi
-	into /usr/nagios
-	for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
-		dobin $bin
-	done
-
-	# Apache Module
-	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
-		if use perl; then
-			into /usr/nagios ; dosbin contrib/traceroute.cgi
-		fi
-	fi
-
-	for dir in etc/nagios usr/nagios var/nagios ; do
-		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
-	done
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /usr/nagios/share/ssi
-	keepdir /var/nagios/rw
-}
-
-pkg_preinst() {
-	if use noweb; then
-		chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown -R nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
-
-	chmod ug+s ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
-	chmod 0750 ${D}/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
-	einfo
-	einfo "Also, if you want nagios to start at boot time"
-	einfo "remember to execute:"
-	einfo "  rc-update add nagios default"
-	einfo
-
-	if use !noweb; then
-		einfo "This does not include cgis that are perl-dependent"
-		einfo "Currently traceroute.cgi is perl-dependent"
-		einfo "To have ministatus.cgi requires copying of ministatus.c"
-		einfo "to cgi directory for compiling."
-
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
-
-		einfo
-		einfo "That will make nagios's web front end visable via"
-		einfo "http://localhost/nagios/"
-		einfo
-
-	else
-		einfo "Please note that you have installed Nagios without web interface."
-		einfo "Please don't file any bugs about having no web interface when you do this."
-		einfo "Thank you!"
-	fi
-
-	einfo
-	einfo "If your kernel has /proc protection, nagios"
-	einfo "will not be happy as it relies on accessing the proc"
-	einfo "filesystem. You can fix this by adding nagios into"
-	einfo "the group wheel, but this is not recomended."
-	einfo
-
-	einfo
-	ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
-}
-
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog
index 6ebb0cac71f5..d978db4da99e 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for net-analyzer/nagios
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.38 2006/05/06 18:05:27 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.39 2006/05/06 18:07:16 eldad Exp $
+
+  06 May 2006; Eldad Zack <eldad@gentoo.org> -nagios-1.2.ebuild,
+  -nagios-1.3.ebuild:
+  removed versions wrt security #132159
 
   06 May 2006; Eldad Zack <eldad@gentoo.org> -nagios-2.0.ebuild,
   -nagios-2.1.ebuild, -nagios-2.2.ebuild:
-  removed version wrt security #132159
+  removed versions wrt security #132159
 
   05 May 2006; Lance Albertson <ramereth@gentoo.org> nagios-1.4.ebuild:
   * Fix nagios-core dep
diff --git a/net-analyzer/nagios/files/digest-nagios-1.2 b/net-analyzer/nagios/files/digest-nagios-1.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-analyzer/nagios/files/digest-nagios-1.2
+++ /dev/null
diff --git a/net-analyzer/nagios/files/digest-nagios-1.3 b/net-analyzer/nagios/files/digest-nagios-1.3
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-analyzer/nagios/files/digest-nagios-1.3
+++ /dev/null
diff --git a/net-analyzer/nagios/nagios-1.2.ebuild b/net-analyzer/nagios/nagios-1.2.ebuild
deleted file mode 100644
index 9144b93eec5d..000000000000
--- a/net-analyzer/nagios/nagios-1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.2.ebuild,v 1.9 2005/08/06 19:37:10 chriswhite Exp $
-
-DESCRIPTION="The Nagios metapackage - merge this to pull install all of the nagios packages"
-HOMEPAGE="http://www.nagios.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~amd64"
-IUSE=""
-
-RDEPEND=">=net-analyzer/nagios-core-1.2
-	>=net-analyzer/nagios-plugins-1.3.1
-	>=net-analyzer/nagios-nrpe-1.8
-	>=net-analyzer/nagios-nsca-2.3
-	>=net-analyzer/nagios-imagepack-1.0"
-
-pkg_postrm() {
-
-	einfo "Note: this is a META ebuild for ${P}."
-	einfo "to remove it completely or before re-emerging"
-	einfo "either use 'depclean', or remove/re-emerge these packages:"
-	echo
-	for dep in ${RDEPEND}; do
-		einfo "     ${dep}"
-	done
-	echo
-
-}
diff --git a/net-analyzer/nagios/nagios-1.3.ebuild b/net-analyzer/nagios/nagios-1.3.ebuild
deleted file mode 100644
index 864bc1aa9853..000000000000
--- a/net-analyzer/nagios/nagios-1.3.ebuild
+++ /dev/null
@@ -1,30 +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/nagios-1.3.ebuild,v 1.3 2006/01/11 14:40:17 gustavoz Exp $
-
-DESCRIPTION="The Nagios metapackage - merge this to pull install all of the nagios packages"
-HOMEPAGE="http://www.nagios.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=net-analyzer/nagios-core-1.3
-	>=net-analyzer/nagios-plugins-1.3.1
-	>=net-analyzer/nagios-nrpe-1.8
-	>=net-analyzer/nagios-nsca-2.3
-	>=net-analyzer/nagios-imagepack-1.0"
-
-pkg_postrm() {
-
-	einfo "Note: this is a META ebuild for ${P}."
-	einfo "to remove it completely or before re-emerging"
-	einfo "either use 'depclean', or remove/re-emerge these packages:"
-	echo
-	for dep in ${RDEPEND}; do
-		einfo "     ${dep}"
-	done
-	echo
-
-}