Purged security affected version wrt bug #133487.

(Portage version: 2.1_rc3-r2)
 (Signed Manifest commit)

5 files changed, 62 insertions, 510 deletions

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 2509a4e31777..3f3b731094d8 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,19 +1,72 @@
-MD5 31462a4d8ec68b4a639cefdaf6113f4b ChangeLog 15477
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.x-series-nsca.patch 767 RMD160 69c3916842953666037dcf258906c15a9ce0047a SHA1 5f376bd65bf74eeb3cc00efde4fadf7f8962d06c SHA256 04ecb77abfe7618d036a2b598ea30df6704a82285b2210055eda4dd6414c94d3
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
+RMD160 69c3916842953666037dcf258906c15a9ce0047a files/2.x-series-nsca.patch 767
+SHA256 04ecb77abfe7618d036a2b598ea30df6704a82285b2210055eda4dd6414c94d3 files/2.x-series-nsca.patch 767
+AUX 99_nagios.conf 350 RMD160 d9818e29cd119b2cc185c75dcd374b3851eaa739 SHA1 fa4b438c1d06f2d00cd2bff4fefc448a59d1cdec SHA256 2e8448d5e38969f0eee4306611e9592e9cec93506ad055cd27ef8e211cfe9f71
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
+RMD160 d9818e29cd119b2cc185c75dcd374b3851eaa739 files/99_nagios.conf 350
+SHA256 2e8448d5e38969f0eee4306611e9592e9cec93506ad055cd27ef8e211cfe9f71 files/99_nagios.conf 350
+AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6a3069794ad9623cddd854198520e SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
-MD5 155842cf933f59e8cd68b61d84280e70 files/digest-nagios-core-1.4 151
-MD5 2e5fdbc8e1063290d5589c1091bde0bb files/digest-nagios-core-1.4.1 153
-MD5 0112e82ce6b3c7360d47e40bdf76a990 files/digest-nagios-core-2.3 131
-MD5 801bbf98c4aa4b4d10fc5de369933342 files/digest-nagios-core-2.3.1 133
-MD5 7f02929ded7ed06c70d2b670a264d48f files/digest-nagios-core-2.4 131
+RMD160 8b08c01284fc590a2291164589da42515d1a0586 files/conf.d 409
+SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a files/conf.d 409
+AUX nagios 1416 RMD160 95d94dc2b30478a912b100b06e2b5d3e7510b785 SHA1 ff49fa5c0478aefe66d2a086b9a9613ac62afa71 SHA256 9fb75d2a8edb621f152ce1a676ffab9554fe3aa64e07490adf525f669167bd49
 MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416
+RMD160 95d94dc2b30478a912b100b06e2b5d3e7510b785 files/nagios 1416
+SHA256 9fb75d2a8edb621f152ce1a676ffab9554fe3aa64e07490adf525f669167bd49 files/nagios 1416
+AUX nagios-1.x-Makefile-asneeded.diff 5460 RMD160 589bc81bb2fe0148acb0d9e6c76d63b6ca6ae34c SHA1 ced005ab9d100af6cd84508cddc1d6d4450aa509 SHA256 679482075dfdecd58948ed479adf306ed02bff5cf661f605d01193b2a11ef503
 MD5 354f5aeb0e831ee8e218962eb85d07e4 files/nagios-1.x-Makefile-asneeded.diff 5460
+RMD160 589bc81bb2fe0148acb0d9e6c76d63b6ca6ae34c files/nagios-1.x-Makefile-asneeded.diff 5460
+SHA256 679482075dfdecd58948ed479adf306ed02bff5cf661f605d01193b2a11ef503 files/nagios-1.x-Makefile-asneeded.diff 5460
+AUX nagios.conf 362 RMD160 ea642c44b8450cfc67a1675f3dc558d36eccabcb SHA1 a06e53b6c634171c09bb36f1ef460053f7e542c3 SHA256 8d57d761efd4057e15430462e1233715c1472155ae181a2d5d364948bbcb1848
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
+RMD160 ea642c44b8450cfc67a1675f3dc558d36eccabcb files/nagios.conf 362
+SHA256 8d57d761efd4057e15430462e1233715c1472155ae181a2d5d364948bbcb1848 files/nagios.conf 362
+AUX submit_check_result_via_nsca.patch 585 RMD160 1dc2b0a10b0c824b3e0026c26d17f931703e7a98 SHA1 3c00221ae86402dcae93b71abb92cd88e14acb03 SHA256 2770e3988ce05a63866e4b32c029f3ef13d64d7da3791747014378391d5d8d3e
 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
-MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
+RMD160 1dc2b0a10b0c824b3e0026c26d17f931703e7a98 files/submit_check_result_via_nsca.patch 585
+SHA256 2770e3988ce05a63866e4b32c029f3ef13d64d7da3791747014378391d5d8d3e files/submit_check_result_via_nsca.patch 585
+DIST nagios-1.4.1.tar.gz 1643386
+DIST nagios-1.x-Makefile-distclean-gentoo.diff.bz2 1133
+DIST nagios-2.0b.cfg-sample.gz 8990
+DIST nagios-2.3.1.tar.gz 1734958
+DIST nagios-2.4.tar.gz 1735573
+EBUILD nagios-core-1.4.1.ebuild 7508 RMD160 5a85ba0fb8f531097e4ecf4d7ec96127992d6d97 SHA1 41ef362f27389f95c797e5d8f60326362e7a88b7 SHA256 8e0e9edd1730c57243fef4c97545006e8867876a936e4d6d7adfc3713c8f829e
 MD5 b77809d363ccf9b561c099866e60ad3b nagios-core-1.4.1.ebuild 7508
-MD5 71fc67b930bb60a4b18c2fd2e55febbf nagios-core-1.4.ebuild 7504
+RMD160 5a85ba0fb8f531097e4ecf4d7ec96127992d6d97 nagios-core-1.4.1.ebuild 7508
+SHA256 8e0e9edd1730c57243fef4c97545006e8867876a936e4d6d7adfc3713c8f829e nagios-core-1.4.1.ebuild 7508
+EBUILD nagios-core-2.3.1.ebuild 5995 RMD160 829b6f0dc55942da679593d299466d716bf2dcd2 SHA1 8db672da9b63399e990258fc00a7422d09da40f0 SHA256 28d24cc625ecdfa09a1decc6b9f93f9f074f674e4f03603a4c6a2ef1ee181151
 MD5 0db78682d06f57a5c4af37bad8cea745 nagios-core-2.3.1.ebuild 5995
-MD5 bad76591d737b015d248479440d94a51 nagios-core-2.3.ebuild 5990
+RMD160 829b6f0dc55942da679593d299466d716bf2dcd2 nagios-core-2.3.1.ebuild 5995
+SHA256 28d24cc625ecdfa09a1decc6b9f93f9f074f674e4f03603a4c6a2ef1ee181151 nagios-core-2.3.1.ebuild 5995
+EBUILD nagios-core-2.4.ebuild 5993 RMD160 5e39e99efc7f8090ca5e84c06ab4f29787479660 SHA1 58aa86ce57d67306cf1f48d2e9fd8347d8447f4f SHA256 55e1ab0ef7d49a813ef8c3239540387e7169b60f13d80619cfb5a83c33364f2b
 MD5 3632b2e5d0ab6ff9f5ba1e8bcdec7c87 nagios-core-2.4.ebuild 5993
+RMD160 5e39e99efc7f8090ca5e84c06ab4f29787479660 nagios-core-2.4.ebuild 5993
+SHA256 55e1ab0ef7d49a813ef8c3239540387e7169b60f13d80619cfb5a83c33364f2b nagios-core-2.4.ebuild 5993
+MISC ChangeLog 15624 RMD160 9ecc5742526cabad25cf386b35464f0c5f07c807 SHA1 a4d71953cfa93f11353fd0ccd63517fada0823e2 SHA256 175f09e8a82c2b94d00f1f26d5dc30e0d39c7a6ad3cbeef9cbbdeab151c9a59d
+MD5 67debad5e5ea38299ccb9b74b499d180 ChangeLog 15624
+RMD160 9ecc5742526cabad25cf386b35464f0c5f07c807 ChangeLog 15624
+SHA256 175f09e8a82c2b94d00f1f26d5dc30e0d39c7a6ad3cbeef9cbbdeab151c9a59d ChangeLog 15624
+MISC metadata.xml 1049 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 SHA1 19972fccad8732b7fd85e1b8c0f1077dc254432f SHA256 c2b2985cb9cd326a5eb6523769cdf7e63bde2a0523dc59df5989282d1fbbd2a0
+MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
+RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 metadata.xml 1049
+SHA256 c2b2985cb9cd326a5eb6523769cdf7e63bde2a0523dc59df5989282d1fbbd2a0 metadata.xml 1049
+MD5 2e5fdbc8e1063290d5589c1091bde0bb files/digest-nagios-core-1.4.1 153
+RMD160 2a185fb26605c0f416e59dad7bfb41288e546878 files/digest-nagios-core-1.4.1 153
+SHA256 b7086b2946148b8665aef94fb392a359420a45ef4599a088a321ece4aae08899 files/digest-nagios-core-1.4.1 153
+MD5 801bbf98c4aa4b4d10fc5de369933342 files/digest-nagios-core-2.3.1 133
+RMD160 064da001ae6ee1a3d08d2d1b577bb9bbcb6fc821 files/digest-nagios-core-2.3.1 133
+SHA256 7d0241c5d0da3ab2636bdba2b1ec6bd27b5f121e018f6389cabb966421dd199a files/digest-nagios-core-2.3.1 133
+MD5 7f02929ded7ed06c70d2b670a264d48f files/digest-nagios-core-2.4 131
+RMD160 58c7da8718425833b05e5b36e902bed77436c061 files/digest-nagios-core-2.4 131
+SHA256 07ee78e363245ad44a3621ac7f0cc679671994863ce1537ccbfa2777d28db33d files/digest-nagios-core-2.4 131
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEgDm+T+MN7JbqCpMRAk+qAJ9OuXECPWBFq5kJzzh0vH0c/tueigCggGH3
+s1r4rnwd7AvVoaf9Ky8pFTc=
+=2BZa
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.4 b/net-analyzer/nagios-core/files/digest-nagios-core-1.4
deleted file mode 100644
index 1e3110ca8a74..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4e01ee3031cbbd425d861223550fde85 nagios-1.4.tar.gz 1626711
-MD5 565ce2a690d50aeb542e7afe44b8c733 nagios-1.x-Makefile-distclean-gentoo.diff.bz2 1133
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.3 b/net-analyzer/nagios-core/files/digest-nagios-core-2.3
deleted file mode 100644
index 5aa4a76945f8..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
-MD5 6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz 1734837
diff --git a/net-analyzer/nagios-core/nagios-core-1.4.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.ebuild
deleted file mode 100644
index 541a81924b0a..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.4.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.4.ebuild,v 1.6 2006/05/12 20:31:46 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 nagios,apache
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/nagios-1.x-Makefile-asneeded.diff
-	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.3.ebuild b/net-analyzer/nagios-core/nagios-core-2.3.ebuild
deleted file mode 100644
index b153cc9a7670..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.3.ebuild
+++ /dev/null
@@ -1,227 +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.ebuild,v 1.2 2006/05/12 20:31:46 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
-}
-
-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
-}