Remove old versions after init script update

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

7 files changed, 4 insertions, 718 deletions

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index bf12c86d643d..44d401348ce5 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -44,30 +44,18 @@ EBUILD nagios-core-2.3.1-r1.ebuild 5979 RMD160 ad0aa5d39480ddf855f653c3fa65cc7d3
 MD5 c61f4362ed05d9c48a13f7abe4341555 nagios-core-2.3.1-r1.ebuild 5979
 RMD160 ad0aa5d39480ddf855f653c3fa65cc7d387f77b3 nagios-core-2.3.1-r1.ebuild 5979
 SHA256 a13a547e486da57742edd69d347d5539958fb86e9a56513e64bf2205218b7b5f nagios-core-2.3.1-r1.ebuild 5979
-EBUILD nagios-core-2.3.1.ebuild 5974 RMD160 94c8e55281bd9ee8dd89ad80be1610b862266c49 SHA1 a35fbbf24e23b8bfe92c4134b4f267616e5540d0 SHA256 8078e9d4115a9e6f1c30adab52a66f6224dac99c32149a6fd98b81d69ba3a27c
-MD5 b8c1230459250088d42b945af4ae90ab nagios-core-2.3.1.ebuild 5974
-RMD160 94c8e55281bd9ee8dd89ad80be1610b862266c49 nagios-core-2.3.1.ebuild 5974
-SHA256 8078e9d4115a9e6f1c30adab52a66f6224dac99c32149a6fd98b81d69ba3a27c nagios-core-2.3.1.ebuild 5974
 EBUILD nagios-core-2.4-r1.ebuild 5977 RMD160 d57c92bd3078e96c44abd94f1b47d297ab427550 SHA1 730cf973963464ac79ed869bc80ecf24d46a597a SHA256 8970140dbc4b0ca0707c217de05440b340d68356fecdf05541b27e6373dafcef
 MD5 ca74c9e6d69fdf8121a28a16fa233008 nagios-core-2.4-r1.ebuild 5977
 RMD160 d57c92bd3078e96c44abd94f1b47d297ab427550 nagios-core-2.4-r1.ebuild 5977
 SHA256 8970140dbc4b0ca0707c217de05440b340d68356fecdf05541b27e6373dafcef nagios-core-2.4-r1.ebuild 5977
-EBUILD nagios-core-2.4.ebuild 5972 RMD160 202ff3a724ee625ffc6eae465a4488978e6fdb6b SHA1 8561ff400d55ed3ac65bfde52576cff98bcf2b11 SHA256 524a5d0cb0031bb5f809c5d9e03691b3f64a6a4d232fc18c8eafb296f610b44a
-MD5 04f71325c36e02448937ca7e94d351a3 nagios-core-2.4.ebuild 5972
-RMD160 202ff3a724ee625ffc6eae465a4488978e6fdb6b nagios-core-2.4.ebuild 5972
-SHA256 524a5d0cb0031bb5f809c5d9e03691b3f64a6a4d232fc18c8eafb296f610b44a nagios-core-2.4.ebuild 5972
 EBUILD nagios-core-2.5-r1.ebuild 5984 RMD160 8d57c4a938d3f3e981811cc7564943365ba300bb SHA1 668a219b5a98064f890618ab92269be370d975f2 SHA256 6da767b289912b80a90a8b6f386af3836a62cac62ad298b62998024f76f32b44
 MD5 318c062e048fdc885a749f07a1c28340 nagios-core-2.5-r1.ebuild 5984
 RMD160 8d57c4a938d3f3e981811cc7564943365ba300bb nagios-core-2.5-r1.ebuild 5984
 SHA256 6da767b289912b80a90a8b6f386af3836a62cac62ad298b62998024f76f32b44 nagios-core-2.5-r1.ebuild 5984
-EBUILD nagios-core-2.5.ebuild 5979 RMD160 18460f40efe48bd85aab73f205907ef63bc03d39 SHA1 0fc12d18b11214038941827725db1866bc94a91d SHA256 38be128fbde8bab2fa8f6da0053336fce98f36d43d660b88f011750950097783
-MD5 b6f3aaa5ddcac235d172ed9314a7be86 nagios-core-2.5.ebuild 5979
-RMD160 18460f40efe48bd85aab73f205907ef63bc03d39 nagios-core-2.5.ebuild 5979
-SHA256 38be128fbde8bab2fa8f6da0053336fce98f36d43d660b88f011750950097783 nagios-core-2.5.ebuild 5979
-MISC ChangeLog 16588 RMD160 25031f92ee25822e092904708d4dc60e151085a5 SHA1 92065e8af73127cb270b9ed172083bb2ef6beb5a SHA256 25559fceb9e0813fadff0934d56b9b7cf0ee7c9dde71085c47112d233fbe1066
-MD5 ae35060025bf7efe5e6a395c716130b2 ChangeLog 16588
-RMD160 25031f92ee25822e092904708d4dc60e151085a5 ChangeLog 16588
-SHA256 25559fceb9e0813fadff0934d56b9b7cf0ee7c9dde71085c47112d233fbe1066 ChangeLog 16588
+MISC ChangeLog 16744 RMD160 4c14ca784f8938b9f2e8dfddaf40ae6317420906 SHA1 93305482b994a7e2f73d28afa138237e0613f7a5 SHA256 39b91d820aaeff461dde61d39f2c864b7875dc71b57de09b57194af1b81817a8
+MD5 4f70e5ed15afae46a2593efb91c97339 ChangeLog 16744
+RMD160 4c14ca784f8938b9f2e8dfddaf40ae6317420906 ChangeLog 16744
+SHA256 39b91d820aaeff461dde61d39f2c864b7875dc71b57de09b57194af1b81817a8 ChangeLog 16744
 MISC metadata.xml 1049 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 SHA1 19972fccad8732b7fd85e1b8c0f1077dc254432f SHA256 c2b2985cb9cd326a5eb6523769cdf7e63bde2a0523dc59df5989282d1fbbd2a0
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 metadata.xml 1049
@@ -78,21 +66,12 @@ SHA256 7e25c77577e6d3484161cabb5e76212de02538d6011b570be3b1c18742d97f18 files/di
 MD5 2ff64ef7844e2d8435b395e2a77645c0 files/digest-nagios-core-1.4.1-r1 551
 RMD160 b1f7ffc038e3d8705fe5bc94fa792480f890bd57 files/digest-nagios-core-1.4.1-r1 551
 SHA256 7e25c77577e6d3484161cabb5e76212de02538d6011b570be3b1c18742d97f18 files/digest-nagios-core-1.4.1-r1 551
-MD5 d39c41dd2383eab4bb237c90fe1dbdf4 files/digest-nagios-core-2.3.1 491
-RMD160 e72e63e55e9e806b203937bf3cde16f3915df5eb files/digest-nagios-core-2.3.1 491
-SHA256 c1f767c1883d59ea7e22c89d606c4879a43d7259e55045853552df5b9057737c files/digest-nagios-core-2.3.1 491
 MD5 d39c41dd2383eab4bb237c90fe1dbdf4 files/digest-nagios-core-2.3.1-r1 491
 RMD160 e72e63e55e9e806b203937bf3cde16f3915df5eb files/digest-nagios-core-2.3.1-r1 491
 SHA256 c1f767c1883d59ea7e22c89d606c4879a43d7259e55045853552df5b9057737c files/digest-nagios-core-2.3.1-r1 491
-MD5 3f05e1da810ec9ed9bef1029aff133c2 files/digest-nagios-core-2.4 485
-RMD160 614ad7c8f4f7604677be3dede9dbe2da2cb75e01 files/digest-nagios-core-2.4 485
-SHA256 87e3e628b03992d5b8038a9b80ab168c036c28879b9e357f71539227d512fa49 files/digest-nagios-core-2.4 485
 MD5 3f05e1da810ec9ed9bef1029aff133c2 files/digest-nagios-core-2.4-r1 485
 RMD160 614ad7c8f4f7604677be3dede9dbe2da2cb75e01 files/digest-nagios-core-2.4-r1 485
 SHA256 87e3e628b03992d5b8038a9b80ab168c036c28879b9e357f71539227d512fa49 files/digest-nagios-core-2.4-r1 485
-MD5 b6b85fb28fc2279eb3be17377152d4d3 files/digest-nagios-core-2.5 485
-RMD160 114fba97e51b68fa3f07c60ee4a24be0bfacfa11 files/digest-nagios-core-2.5 485
-SHA256 d26b0a8fcb534c5593d50a59e3169ea24c292f13e8c519f97818bd3855001132 files/digest-nagios-core-2.5 485
 MD5 b6b85fb28fc2279eb3be17377152d4d3 files/digest-nagios-core-2.5-r1 485
 RMD160 114fba97e51b68fa3f07c60ee4a24be0bfacfa11 files/digest-nagios-core-2.5-r1 485
 SHA256 d26b0a8fcb534c5593d50a59e3169ea24c292f13e8c519f97818bd3855001132 files/digest-nagios-core-2.5-r1 485
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1 b/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1
deleted file mode 100644
index b533041132d3..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
-RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 nagios-2.0b.cfg-sample.gz 8990
-SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12 nagios-2.0b.cfg-sample.gz 8990
-MD5 22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz 1734958
-RMD160 fb1d1e66682ce4261535281de04067c3ad33b5ee nagios-2.3.1.tar.gz 1734958
-SHA256 40cd86756eb859cfd00c47c8a6670aac74c841393c49fc24bd5ed43099e3cdcc nagios-2.3.1.tar.gz 1734958
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.4 b/net-analyzer/nagios-core/files/digest-nagios-core-2.4
deleted file mode 100644
index 4811c04f0a0b..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
-RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 nagios-2.0b.cfg-sample.gz 8990
-SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12 nagios-2.0b.cfg-sample.gz 8990
-MD5 bb8f0106dc7f282c239f54db1f308445 nagios-2.4.tar.gz 1735573
-RMD160 7f05352b0f46f14e5ce7fc19278216b9862e7735 nagios-2.4.tar.gz 1735573
-SHA256 e62346de93df5f4387377faac9ad1fd2fbfd5628f0482646144dc2b8d266fcd8 nagios-2.4.tar.gz 1735573
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.5 b/net-analyzer/nagios-core/files/digest-nagios-core-2.5
deleted file mode 100644
index d6f6113d34a1..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
-RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 nagios-2.0b.cfg-sample.gz 8990
-SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12 nagios-2.0b.cfg-sample.gz 8990
-MD5 1a77528f6797bd3c0320da5e4fae2b1a nagios-2.5.tar.gz 1736167
-RMD160 a0f1890ed546ce026cf784ae3ca83119275bd529 nagios-2.5.tar.gz 1736167
-SHA256 de9eb06609299cc231d0c2104a7f65367446cb86cb6aa3f6787fb25003fd452e nagios-2.5.tar.gz 1736167
diff --git a/net-analyzer/nagios-core/nagios-core-2.3.1.ebuild b/net-analyzer/nagios-core/nagios-core-2.3.1.ebuild
deleted file mode 100644
index 121897d8a643..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.3.1.ebuild
+++ /dev/null
@@ -1,225 +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.3.1.ebuild,v 1.2 2006/06/02 13:56:51 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 nagios,apache
-	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
-
-	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.4.ebuild b/net-analyzer/nagios-core/nagios-core-2.4.ebuild
deleted file mode 100644
index d13fe748a747..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.4.ebuild
+++ /dev/null
@@ -1,225 +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.4.ebuild,v 1.2 2006/06/02 13:56:51 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 nagios,apache
-	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
-
-	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.5.ebuild b/net-analyzer/nagios-core/nagios-core-2.5.ebuild
deleted file mode 100644
index 7608adebb388..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.5.ebuild
+++ /dev/null
@@ -1,225 +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.5.ebuild,v 1.2 2006/10/21 22:07:13 tcort 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="~alpha ~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 nagios,apache
-	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
-
-	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
-}