uses depend.apache.eclass now. Bug #77781 refers

(Portage version: 2.0.51-r14)

4 files changed, 273 insertions, 19 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 45605957bb9b..1366b55b2ee4 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-core
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.46 2004/11/28 18:21:02 eldad Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.47 2005/01/25 10:04:18 dragonheart Exp $
+
+*nagios-core-1.2-r4 (25 Jan 2005)
+
+  25 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +nagios-core-1.2-r4.ebuild:
+  uses depend.apache.eclass now. Bug #77781 refers
 
   28 Nov 2004; Eldad Zack <eldad@gentoo.org> files/nagios:
   Removed -o option from start-stop-daemon, as it was causing errors to start or
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index c0602f80a673..048060bce2f9 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 552bb19dd05939ee5b32057872c15a54 ChangeLog 8243
+MD5 a1ece421fae3536d1e5dd9b5ecb0215d metadata.xml 928
 MD5 e4ffec908f9991ffd916e63a4bb2c002 nagios-core-1.2-r3.ebuild 7167
 MD5 b2b5a4982c7a888addfc7c5bb2ec173e nagios-core-1.2-r2.ebuild 6619
-MD5 1603e3a45f4e8b462c3c37adf2f1af72 ChangeLog 8073
-MD5 a1ece421fae3536d1e5dd9b5ecb0215d metadata.xml 928
+MD5 4bec3b441f9f9ac436b72bff396e2bb9 nagios-core-1.2-r4.ebuild 7228
 MD5 8e2eaa206717b94fb41508c7ab17a135 nagios-core-1.2-r1.ebuild 6669
-MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
+MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r2 63
 MD5 d062be8c632fbfa88dd1194e0bea2abf files/nagios 1389
-MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
-MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
-MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r1 63
-MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r2 63
+MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r3 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBqhWMT+MN7JbqCpMRAtjsAJ9hv3H4nXfAovu9ZwUhay0B0irvtQCfZzF4
-EMe16dbbWvIjHaKbbABW/ks=
-=MuoG
------END PGP SIGNATURE-----
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r1 63
+MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
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
new file mode 100644
index 000000000000..33ac901db72f
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-1.2-r4
@@ -0,0 +1 @@
+MD5 414d70e5269d5b8d7c21bf3ee129309f nagios-1.2.tar.gz 1625322
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
new file mode 100644
index 000000000000..39f1f0de7e59
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2005 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.1 2005/01/25 10:04:18 dragonheart Exp $
+
+inherit eutils depend.apache 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"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="noweb mysql postgres perl debug apache2"
+
+# place inside !noweb beside the other apache depend
+#		apache2? ( ${APACHE2_DEPEND} )
+DEPEND="virtual/mailx
+	!noweb? (
+		>=media-libs/jpeg-6b-r3
+		>=media-libs/libpng-1.2.5-r4
+		>=media-libs/gd-1.8.3-r5
+		!apache2? ( ${APACHE1_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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/submit_check_result_via_nsca.patch
+
+	epatch ${FILESDIR}/Makefile-distclean.diff.bz2
+	cp ${FILESDIR}/nagios.cfg-sample.gz ./
+	gunzip nagios.cfg-sample.gz
+}
+
+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/pgsql/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/*
+
+	dodoc ${S}/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
+}
+
+pkg_preinst() {
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	keepdir /usr/nagios/share/ssi
+	keepdir /var/nagios/rw
+
+	enewgroup nagios
+
+	if use noweb; then
+		enewuser nagios -1 /bin/bash /dev/null nagios
+		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+	else
+		enewuser nagios -1 /bin/bash /dev/null apache
+		usermod -G apache nagios
+		chown 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"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The example config files are located at /usr/share/doc/${P}/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\""
+			einfo " Edit ${APACHE1_CONFDIR}/apache.conf and add \"Include modules.d/nagios.conf\""
+		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
+}