Version bump

(Portage version: 2.1.4.4)

7 files changed, 11 insertions, 660 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index d83922779bc7..ddbdf8afcc20 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.111 2008/02/27 20:30:12 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.112 2008/03/14 07:07:34 dertobi123 Exp $
+
+*nagios-core-2.11 (14 Mar 2008)
+
+  14 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/nagios-1.x-Makefile-asneeded.diff, -files/nagios.conf,
+  -files/submit_check_result_via_nsca.patch, -nagios-core-1.4.1.ebuild,
+  -nagios-core-1.4.1-r1.ebuild, -nagios-core-2.10-r2.ebuild,
+  +nagios-core-2.11.ebuild:
+  Version bump
 
 *nagios-core-2.10-r2 (27 Feb 2008)
 
diff --git a/net-analyzer/nagios-core/files/nagios-1.x-Makefile-asneeded.diff b/net-analyzer/nagios-core/files/nagios-1.x-Makefile-asneeded.diff
deleted file mode 100644
index b24c9fc3fc62..000000000000
--- a/net-analyzer/nagios-core/files/nagios-1.x-Makefile-asneeded.diff
+++ /dev/null
@@ -1,110 +0,0 @@
---- nagios-1.3/base/Makefile.in.orig	2006-04-30 00:22:59.000000000 +0300
-+++ nagios-1.3/base/Makefile.in	2006-04-30 00:23:01.000000000 +0300
-@@ -12,7 +12,8 @@
- CC=@CC@
- CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE
- #CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCORE
--LDFLAGS=@LDFLAGS@ @LIBS@
-+LDFLAGS=@LDFLAGS@
-+LDADD=@LIBS@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-@@ -88,7 +89,7 @@
- OBJS=checks.o config.o commands.o flapping.o logging.o notifications.o sehandlers.o utils.o $(RDATALIBS) $(CDATALIBS) $(ODATALIBS) $(SDATALIBS) $(PDATALIBS) $(DDATALIBS) $(BASEEXTRALIBS) $(SNPRINTF_O)
- 
- nagios: nagios.c $(OBJS) nagios.h $(SRC_COMMON)/locations.h
--	$(CC) $(CFLAGS) $(LDFLAGS) nagios.c $(OBJS) $(PERLLIBS) $(MATHLIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) nagios.c $(OBJS) $(PERLLIBS) $(MATHLIBS) $(LDADD) -o $@
- 
- #$(SRC_COMMON)/locations.h: $(SRC_COMMON)/locations.sub
- #	perl -pe 's|\$${prefix}|${prefix}|g;s|\$${exec_prefix}|${exec_prefix}|g;s|\$${htmurl}|$(HTMURL)|g;s|\$${cgiurl}|$(CGIURL)|g;' $(SRC_COMMON)/locations.sub > $(SRC_COMMON)/locations.h
---- nagios-1.3/cgi/Makefile.in.orig	2006-04-30 00:37:36.000000000 +0300
-+++ nagios-1.3/cgi/Makefile.in	2006-04-30 00:38:56.000000000 +0300
-@@ -27,7 +27,8 @@
- CC=@CC@
- CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI
- #CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCGI
--LDFLAGS=@LDFLAGS@ @LIBS@
-+LDFLAGS=@LDFLAGS@
-+LDADD=@LIBS@
- 
- CGIS=avail.cgi cmd.cgi config.cgi extinfo.cgi history.cgi notifications.cgi outages.cgi showlog.cgi status.cgi statuswml.cgi summary.cgi tac.cgi $(CGIEXTRAS)
- 
-@@ -95,58 +96,58 @@
- $(COMMENTLIBS): $(COMMENTHDRS)
- 
- avail.cgi: avail.c $(CGIDEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) avail.c $(CGILIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) avail.c $(CGILIBS) $(LDADD) -o $@
- 
- checksanity.cgi: checksanity.c $(CGIDEPS) $(CDATADEPS) $(EDATADEPS) $(DDATADEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) checksanity.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(DDATALIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) checksanity.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(DDATALIBS) $(LDADD) -o $@
- 
- cmd.cgi: cmd.c $(CGIDEPS) $(CDATADEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) cmd.c  $(CGILIBS) $(CDATALIBS) $(DDATALIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) cmd.c  $(CGILIBS) $(CDATALIBS) $(DDATALIBS) $(LDADD) -o $@
- 
- config.cgi: config.c $(CGIDEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) config.c  $(CGILIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) config.c  $(CGILIBS) $(LDADD) -o $@
- 
- extinfo.cgi: extinfo.c $(CGIDEPS) $(CDATADEPS) $(EDATADEPS) $(DDATADEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) extinfo.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(DDATALIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) extinfo.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(DDATALIBS) $(LDADD) -o $@
- 
- history.cgi: history.c $(CGIDEPS) $(LIFODEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) history.c $(CGILIBS) $(LIFOLIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) history.c $(CGILIBS) $(LIFOLIBS) $(LDADD) -o $@
- 
- ministatus.cgi: ministatus.c $(CGIDEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) ministatus.c $(CGILIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) ministatus.c $(CGILIBS) $(LDADD) -o $@
- 
- notifications.cgi: notifications.c $(CGIDEPS) $(LIFODEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) notifications.c $(CGILIBS) $(LIFOLIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) notifications.c $(CGILIBS) $(LIFOLIBS) $(LDADD) -o $@
- 
- outages.cgi: outages.c $(CGIDEPS) $(CDATADEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) outages.c $(CGILIBS) $(CDATALIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) outages.c $(CGILIBS) $(CDATALIBS) $(LDADD) -o $@
- 
- showlog.cgi: showlog.c $(CGIDEPS) $(LIFODEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) showlog.c $(CGILIBS) $(LIFOLIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) showlog.c $(CGILIBS) $(LIFOLIBS) $(LDADD) -o $@
- 
- status.cgi: status.c $(CGIDEPS) $(CDATADEPS) $(EDATADEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) status.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) status.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(LDADD) -o $@
- 
- statuswml.cgi: statuswml.c $(CGIDEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) statuswml.c $(CGILIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) statuswml.c $(CGILIBS) $(LDADD) -o $@
- 
- statusmap.cgi: statusmap.c $(CGIDEPS) $(EDATADEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) statusmap.c $(CGILIBS) $(GDLIBS) $(EDATALIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) statusmap.c $(CGILIBS) $(GDLIBS) $(EDATALIBS) $(LDADD) -o $@
- 
- statuswrl.cgi: statuswrl.c $(CGIDEPS) $(EDATADEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) statuswrl.c $(CGILIBS) $(MATHLIBS) $(EDATALIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) statuswrl.c $(CGILIBS) $(MATHLIBS) $(EDATALIBS) $(LDADD) -o $@
- 
- summary.cgi: summary.c $(CGIDEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) summary.c $(CGILIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) summary.c $(CGILIBS) $(LDADD) -o $@
- 
- tac.cgi: tac.c $(CGIDEPS) $(CDATADEPS) $(EDATADEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) tac.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) tac.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(LDADD) -o $@
- 
- trends.cgi: trends.c $(CGIDEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) trends.c $(CGILIBS) $(GDLIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) trends.c $(CGILIBS) $(GDLIBS) $(LDADD) -o $@
- 
- histogram.cgi: histogram.c $(CGIDEPS)
--	$(CC) $(CFLAGS) $(LDFLAGS) histogram.c $(CGILIBS) $(GDLIBS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) histogram.c $(CGILIBS) $(GDLIBS) $(LDADD) -o $@
- 
- clean:
- 	rm -f $(CGIS) *.o *.cfg *.sub core
diff --git a/net-analyzer/nagios-core/files/nagios.conf b/net-analyzer/nagios-core/files/nagios.conf
deleted file mode 100644
index 76abed125c24..000000000000
--- a/net-analyzer/nagios-core/files/nagios.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-<IfDefine NAGIOS>
-
-ScriptAlias /nagios/cgi-bin/ /usr/nagios/sbin/
-<Directory "/usr/nagios/sbin/">
-    AllowOverride AuthConfig
-    Options ExecCGI
-    Order allow,deny
-    Allow from all
-</Directory>
-
-
-Alias /nagios /usr/nagios/share/
-<Directory "/usr/nagios/share">
-    AllowOverride AuthConfig
-    Order allow,deny
-    Allow from all
-</Directory>
-
-</IfDefine>
diff --git a/net-analyzer/nagios-core/files/submit_check_result_via_nsca.patch b/net-analyzer/nagios-core/files/submit_check_result_via_nsca.patch
deleted file mode 100644
index 5f819e2ed6d5..000000000000
--- a/net-analyzer/nagios-core/files/submit_check_result_via_nsca.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.orig	2004-08-20 14:57:38.462260008 +0300
-+++ contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2004-08-20 15:06:46.647923120 +0300
-@@ -32,7 +32,10 @@
- 
- NscaBin="/usr/local/nagios/libexec/send_nsca" 
- NscaCfg="/usr/local/nagios/etc/send_nsca.cfg"
--NagiosHost="nagioshost"
-+
-+# Gentoo Linux Users: configure the hostname in /etc/conf.d/nagios
-+source /etc/conf.d/nagios
-+NagiosHost="${NAGIOS_NSCA_HOST}"
-  
- # create the command line to add to the command file
- cmdline="$1;$2;$3;$4"
diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
deleted file mode 100644
index 0f8e22c370cb..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2008 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.1-r1.ebuild,v 1.6 2008/01/31 19:55:36 hollow 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"
-
-DEPEND="virtual/mailx
-	!noweb? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		${APACHE2_DEPEND}
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )
-	mysql? ( virtual/mysql )
-	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
-
-	doinitd ${FILESDIR}/nagios
-	newconfd ${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
-		insinto ${APACHE_MODULES_CONFDIR}
-		doins ${FILESDIR}/99_nagios.conf
-
-		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
-
-	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."
-
-		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-
-		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-1.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
deleted file mode 100644
index 1034d74173cd..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2008 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.1.ebuild,v 1.11 2008/01/31 19:55:36 hollow 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"
-
-DEPEND="virtual/mailx
-	!noweb? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		${APACHE2_DEPEND}
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )
-	mysql? ( virtual/mysql )
-	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
-
-	doinitd ${FILESDIR}/nagios
-	newconfd ${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
-		insinto ${APACHE_MODULES_CONFDIR}
-		doins ${FILESDIR}/99_nagios.conf
-
-		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
-
-	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."
-
-		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-
-		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.10-r2.ebuild b/net-analyzer/nagios-core/nagios-core-2.11.ebuild
index 89341e6e3538..1d394f4e94b2 100644
--- a/net-analyzer/nagios-core/nagios-core-2.10-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.10-r2.ebuild,v 1.2 2008/02/28 00:56:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.11.ebuild,v 1.1 2008/03/14 07:07:34 dertobi123 Exp $
 
 EAPI="1"
 
@@ -130,7 +130,6 @@ src_install() {
 	doins -r contrib/eventhandlers
 
 	doinitd "${FILESDIR}"/nagios
-	newconfd "${FILESDIR}"/conf.d nagios
 
 	chmod 644 "${S}"/contrib/*.cgi
 	into /usr/nagios