version bump

Package-Manager: portage-2203-svn

12 files changed, 586 insertions, 12 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 91559f61ad03..8d319e8a553a 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,13 @@
 # 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.75 2006/04/17 00:16:27 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.76 2006/05/03 18:29:13 ramereth Exp $
+
+*nagios-core-2.3 (03 May 2006)
+*nagios-core-1.4 (03 May 2006)
+
+  03 May 2006; Lance Albertson <ramereth@gentoo.org>
+  +nagios-core-1.4.ebuild, +nagios-core-2.3.ebuild:
+  * Version bump
 
   17 Apr 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,
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 8157c99582e2..0a4cc5b63e68 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,28 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2c386a0806392210baa798023ca431a0 ChangeLog 13586
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
 MD5 9ead897e0a8a7edc783916948e023b1f files/digest-nagios-core-1.2-r4 218
 MD5 587bd1eafc5547df269b6f82c7d6cf29 files/digest-nagios-core-1.3 151
+MD5 155842cf933f59e8cd68b61d84280e70 files/digest-nagios-core-1.4 151
 MD5 97842ad243d5d658f8b20b06c92c72a5 files/digest-nagios-core-2.0 131
 MD5 b1bb7bf2bf468173ad54269b86b0c500 files/digest-nagios-core-2.1 131
 MD5 1361a960bf4c649e2199db3afd6a975c files/digest-nagios-core-2.2 131
+MD5 0112e82ce6b3c7360d47e40bdf76a990 files/digest-nagios-core-2.3 131
 MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 MD5 435b6e015b93784d64c097368c80d3b9 nagios-core-1.2-r4.ebuild 7240
 MD5 13f8268203327ee2c466493656cac303 nagios-core-1.3.ebuild 7471
+MD5 6e825193086792dd47a77b7b436f0d6e nagios-core-1.4.ebuild 7473
 MD5 3565838151dfdd3b39bf0cc7f356b7d7 nagios-core-2.0.ebuild 6010
 MD5 d1494bc5cee3ef3651f4e771b05ba1c5 nagios-core-2.1.ebuild 6010
 MD5 77384f9bc7601777e80329b2e5946006 nagios-core-2.2.ebuild 6010
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEQt5tT+MN7JbqCpMRAuPlAJsGSrCJ7gZP8576kYQ7CUd0ajEQSwCfbR56
-SEHQFRLhpAPeAfVkMzemFto=
-=cHpx
------END PGP SIGNATURE-----
+MD5 77384f9bc7601777e80329b2e5946006 nagios-core-2.3.ebuild 6010
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.4 b/net-analyzer/nagios-core/files/digest-nagios-core-1.4
new file mode 100644
index 000000000000..1e3110ca8a74
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-1.4
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000000..5aa4a76945f8
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.3
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000000..10933e84a36a
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-1.4.ebuild
@@ -0,0 +1,270 @@
+# 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.1 2006/05/03 18:29:13 ramereth 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.3.ebuild b/net-analyzer/nagios-core/nagios-core-2.3.ebuild
new file mode 100644
index 000000000000..d2d0b064d06f
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-2.3.ebuild
@@ -0,0 +1,228 @@
+# 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.1 2006/05/03 18:29:13 ramereth 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 e2c21d73977e..ae50b888a186 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2006/04/08 02:56:32 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.35 2006/05/03 18:29:42 ramereth Exp $
+
+*nagios-2.3 (03 May 2006)
+*nagios-1.4 (03 May 2006)
+
+  03 May 2006; Lance Albertson <ramereth@gentoo.org> +nagios-1.4.ebuild,
+  +nagios-2.3.ebuild:
+  * Version bump
 
 *nagios-2.2 (08 Apr 2006)
 
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 0bd3b2521b62..7253a31eca80 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,12 +1,16 @@
 MD5 4ae21944e104fa3dc12d87c24837889e ChangeLog 5059
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.3 0
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 MD5 9cc5bbb8531bdad0ca97cbdd7fb3764e nagios-1.2.ebuild 855
 MD5 7fc987c941b3dd1740094b901c3f8d2e nagios-1.3.ebuild 853
+MD5 fce19e801607f437752730700e39a91a nagios-1.4.ebuild 855
 MD5 c7eedd96e33e2d67a07d77b529667145 nagios-2.0.ebuild 858
 MD5 628b75a51b04aeecb44f6551e998783f nagios-2.1.ebuild 858
 MD5 54f69a905565dcda0c87b330d16bb2a3 nagios-2.2.ebuild 858
+MD5 54f69a905565dcda0c87b330d16bb2a3 nagios-2.3.ebuild 858
diff --git a/net-analyzer/nagios/files/digest-nagios-1.4 b/net-analyzer/nagios/files/digest-nagios-1.4
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-analyzer/nagios/files/digest-nagios-1.4
diff --git a/net-analyzer/nagios/files/digest-nagios-2.3 b/net-analyzer/nagios/files/digest-nagios-2.3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-analyzer/nagios/files/digest-nagios-2.3
diff --git a/net-analyzer/nagios/nagios-1.4.ebuild b/net-analyzer/nagios/nagios-1.4.ebuild
new file mode 100644
index 000000000000..4ca016c15a71
--- /dev/null
+++ b/net-analyzer/nagios/nagios-1.4.ebuild
@@ -0,0 +1,30 @@
+# 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.4.ebuild,v 1.1 2006/05/03 18:29:42 ramereth 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
+
+}
diff --git a/net-analyzer/nagios/nagios-2.3.ebuild b/net-analyzer/nagios/nagios-2.3.ebuild
new file mode 100644
index 000000000000..005ff33db233
--- /dev/null
+++ b/net-analyzer/nagios/nagios-2.3.ebuild
@@ -0,0 +1,30 @@
+# 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-2.3.ebuild,v 1.1 2006/05/03 18:29:42 ramereth 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 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+	>=net-analyzer/nagios-plugins-1.4
+	>=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
+}
+