Stable on x86, version bump

(Portage version: 2.0.53)

11 files changed, 293 insertions, 17 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 3737b2bc5cfd..a23cf5612948 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagios-core
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.66 2005/12/29 19:26:00 ramereth Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.67 2006/01/11 04:57:04 ramereth Exp $
+
+*nagios-core-2.0_rc2 (11 Jan 2006)
+
+  11 Jan 2006; Lance Albertson <ramereth@gentoo.org> nagios-core-1.3.ebuild,
+  +nagios-core-2.0_rc2.ebuild:
+  * Stable on x86
+  * Version bump
+  * Fix copyright header
 
   29 Dec 2005; Lance Albertson <ramereth@gentoo.org>
   nagios-core-2.0_rc1.ebuild:
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index b0e361edffb3..5e3531543c74 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,4 @@
-MD5 e14085b4e5ab414e978f8e78260014d6 ChangeLog 12097
+MD5 33b67517b9d867fe233cd3ac3f5774fa ChangeLog 12302
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
@@ -6,12 +6,14 @@ MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
 MD5 484d128eff6e79cfcb09e37a92e1926f files/digest-nagios-core-1.3 63
 MD5 88603a32ba66b5b82d9a6c0d2b006032 files/digest-nagios-core-2.0_rc1 66
+MD5 c87498f15749564c673f17b58152fddb files/digest-nagios-core-2.0_rc2 66
 MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416
 MD5 6b679390ce57974a0f69145e0918372f files/nagios-2.0b.cfg-sample.gz 8990
 MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
-MD5 c12094c3e36d990e0d04d86ab5fa0020 nagios-core-1.2-r4.ebuild 7165
-MD5 a6a01280352fc6f8a89fadf9201473a9 nagios-core-1.3.ebuild 7470
+MD5 0fdaeecb98af0938b344abcf65fe8d88 nagios-core-1.2-r4.ebuild 7165
+MD5 94609007c76fb3e7615498c8fa0e1b49 nagios-core-1.3.ebuild 7469
 MD5 15db88d3e6f6745f08c308388e2145ab nagios-core-2.0_rc1.ebuild 6208
+MD5 a941285b3ac5abb4c368b9de66bf53a7 nagios-core-2.0_rc2.ebuild 5967
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc2 b/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc2
new file mode 100644
index 000000000000..cbc0edf859a3
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc2
@@ -0,0 +1 @@
+MD5 373124639093919dc8858a243d760f84 nagios-2.0rc2.tar.gz 1732073
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
index 30ed9ffabbab..cf4fda17dc4a 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.10 2006/01/02 22:23:59 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.11 2006/01/11 04:57:04 ramereth Exp $
 
 inherit eutils apache-module toolchain-funcs
 
diff --git a/net-analyzer/nagios-core/nagios-core-1.3.ebuild b/net-analyzer/nagios-core/nagios-core-1.3.ebuild
index 468b8afb8cba..31a9a1fed164 100644
--- a/net-analyzer/nagios-core/nagios-core-1.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.3 2006/01/02 22:23:59 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.3.ebuild,v 1.4 2006/01/11 04:57:04 ramereth Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="noweb mysql postgres perl debug apache2"
 
 DEPEND="virtual/mailx
diff --git a/net-analyzer/nagios-core/nagios-core-2.0_rc2.ebuild b/net-analyzer/nagios-core/nagios-core-2.0_rc2.ebuild
new file mode 100644
index 000000000000..b2d63435c377
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-2.0_rc2.ebuild
@@ -0,0 +1,226 @@
+# 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_rc2.ebuild,v 1.1 2006/01/11 04:57:04 ramereth Exp $
+
+inherit eutils apache-module toolchain-funcs
+
+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"
+
+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
+	gunzip -c ${FILESDIR}/nagios-2.0b.cfg-sample.gz > ./nagios.cfg-sample
+}
+
+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/*
+
+	dodoc ${S}/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
+}
+
+pkg_preinst() {
+	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/ChangeLog b/net-analyzer/nagios/ChangeLog
index c9b1b660bca5..42eec8fd58ac 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nagios
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.29 2005/12/27 22:23:26 ramereth Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.30 2006/01/11 04:57:45 ramereth Exp $
+
+*nagios-2.0_rc2 (11 Jan 2006)
+
+  11 Jan 2006; Lance Albertson <ramereth@gentoo.org> nagios-1.3.ebuild,
+  +nagios-2.0_rc2.ebuild:
+  * Stable on x86
+  * Version bump
 
 *nagios-2.0_rc1 (27 Dec 2005)
 
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index d7343c43d7ee..2f0d840701ad 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,8 +1,10 @@
-MD5 4b2f9c6501845f93ba11621847653f8c ChangeLog 4360
+MD5 fa17880a10eff0e7fcc28d56427842cc ChangeLog 4525
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0_rc2 0
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 MD5 9cc5bbb8531bdad0ca97cbdd7fb3764e nagios-1.2.ebuild 855
-MD5 af422d124ed9da226220c3d6291f99c5 nagios-1.3.ebuild 855
+MD5 3527335492efe42bdabe1270865a2561 nagios-1.3.ebuild 854
 MD5 3d0964247d218cb691c467805e471391 nagios-2.0_rc1.ebuild 862
+MD5 7f23a3d59f01008175d467f69a98aba2 nagios-2.0_rc2.ebuild 862
diff --git a/net-analyzer/nagios/files/digest-nagios-2.0_rc2 b/net-analyzer/nagios/files/digest-nagios-2.0_rc2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-analyzer/nagios/files/digest-nagios-2.0_rc2
diff --git a/net-analyzer/nagios/nagios-1.3.ebuild b/net-analyzer/nagios/nagios-1.3.ebuild
index c89d2ce661e5..f1cb881df22c 100644
--- a/net-analyzer/nagios/nagios-1.3.ebuild
+++ b/net-analyzer/nagios/nagios-1.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.1 2005/11/19 23:11:41 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.3.ebuild,v 1.2 2006/01/11 04:57:45 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"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=net-analyzer/nagios-core-1.3
diff --git a/net-analyzer/nagios/nagios-2.0_rc2.ebuild b/net-analyzer/nagios/nagios-2.0_rc2.ebuild
new file mode 100644
index 000000000000..e07537fd5af6
--- /dev/null
+++ b/net-analyzer/nagios/nagios-2.0_rc2.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.0_rc2.ebuild,v 1.1 2006/01/11 04:57:45 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
+}
+