Cleanup && Version bump

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

6 files changed, 15 insertions, 477 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 8399b1bc73f2..21a7281ff6a9 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.156 2009/06/30 14:10:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.157 2009/08/13 14:49:54 dertobi123 Exp $
+
+*nagios-core-3.2.0 (13 Aug 2009)
+
+  13 Aug 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-core-2.12.ebuild, -nagios-core-3.0.6-r1.ebuild,
+  -nagios-core-3.1.2.ebuild, +nagios-core-3.2.0.ebuild:
+  Cleanup && Version bump
 
   30 Jun 2009; Raúl Porcel <armin76@gentoo.org> nagios-core-2.12-r1.ebuild,
   nagios-core-3.0.6-r2.ebuild:
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index fa812d61dd4d..1c2b71b00808 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -10,11 +10,9 @@ AUX statuswml-bug275288.patch 1401 RMD160 6bb19daa7bf792aac16fc20e77a7b51d5a9f4b
 DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 SHA1 7a27bcf4be959424b688f52e31887862b863ec23 SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12
 DIST nagios-2.12.tar.gz 1742179 RMD160 b44e49166441735473450ba555137c695cc50920 SHA1 d3e8e3419f751c66a29775bb5280cec662d26a29 SHA256 d1bd812793bff2b3bac15ef72ceff788bd6c2ead4952cb1f19c6232fd3c497cd
 DIST nagios-3.0.6.tar.gz 2735504 RMD160 1c2b026b4dc5095f2419d239042b75200db1b95f SHA1 d6bd20cdc22d2b931f9ad7f9cb33ff71d2cb7d71 SHA256 bedeb2c1ffbf7525ec19ac84a66bad60a19d2b0544cbf050a53bfc363c09bb22
-DIST nagios-3.1.2.tar.gz 3172982 RMD160 cb633f316cc6108a9b4fe387b3e8097a2e8546a9 SHA1 91d6e0dc19b4f09d1c0c7d4220bc69df8af07b1b SHA256 216800ea2ad1f8b1adccc2dccfa6bbdf63223ffe5109d18bea71ffb9a126b846
+DIST nagios-3.2.0.tar.gz 3170967 RMD160 2177e5ebc7ca5ccee7ba404728e896d10063b278 SHA1 070aa3cfa9665190048d386f471cd4d377480f99 SHA256 7cbf35ba0319f24fa085982c038437c4515003b27863c4897dc86b197a50a5e7
 EBUILD nagios-core-2.12-r1.ebuild 6856 RMD160 2e5b3820e262a42f673bdc75ad96bf42b85539ad SHA1 f1bf5023a934136ffc61e87ed56389e8b55fa410 SHA256 5b119671ed8f3176b401a1f11179c7d070a25ca10520d747d814ef31f1135e66
-EBUILD nagios-core-2.12.ebuild 6753 RMD160 c6cdebf2afa0a129c4fa901f80fa96a806f95a4f SHA1 d168ca39abb8585ac670b5db80f7acbb56f66a70 SHA256 c89377d46ab5cfbba5557b6f2d45c4c504c2569777a382e97cee8ef2622fbd95
-EBUILD nagios-core-3.0.6-r1.ebuild 6339 RMD160 e5266f378b770b0cf7c3efa5bd41cd7a31519517 SHA1 dd75ae4d7ed359f1365d7beb14416727bc63eb25 SHA256 33567f362869a6f8e07c46aacb08871619a82cf7e8c381348bc33c7ecf8094f8
 EBUILD nagios-core-3.0.6-r2.ebuild 6441 RMD160 c5be973bd4e54beaef196cc19d04a5c6e17c43c1 SHA1 db9320dd21688f1c77078722b75e23d0a6b379cc SHA256 c6d78ac0b537224521a964af9ce39550d59ec9494b7e0e52e2806ccfe72683b4
-EBUILD nagios-core-3.1.2.ebuild 6070 RMD160 5e9ad14f76b564cfd006823025cfb78760c02dc7 SHA1 833009e31634bb131c75eca6efa4c9d43d23600e SHA256 626daea3858966b810e62f2be95f75101e8b5dc41bf6ce3a5ef1e0d8d38b8ad0
-MISC ChangeLog 26515 RMD160 4b3ea414056e3ec5eb708a68becd10e64edba58e SHA1 7bf6f313d79bbc8e5a1204712d5e48d416008dc0 SHA256 40285c2562815ff57140d6eb7a43d9754a243a16d9e01079e4c4f506658060f4
+EBUILD nagios-core-3.2.0.ebuild 6066 RMD160 de623a8fb101c2f1e0f6a4384df9589639d189e6 SHA1 b8cf211836caf00f98e17d1deb8485d7172a2142 SHA256 4d0cea2dfa59061878199d2db527923d589f7dbd3b8b30ecf6b7fd637208a70c
+MISC ChangeLog 26749 RMD160 b6b62ad72e621ca8cb856e8abc3919b29020c9e8 SHA1 d9c7b5d471e19173d23d3ff87f897a0b12f325d9 SHA256 71c49900354949aa36ffa1dd86418982a497a62cba387655432a72c1799facb3
 MISC metadata.xml 1103 RMD160 126745b1627d4be7d8a3868e3670cb332df3d838 SHA1 3f5215646412a2aefde093d14561dd540d7abf01 SHA256 f2b241a3f4277286838954546eca184d08973197ce00e2f6a6ae2698f1eade81
diff --git a/net-analyzer/nagios-core/nagios-core-2.12.ebuild b/net-analyzer/nagios-core/nagios-core-2.12.ebuild
deleted file mode 100644
index 6f437fe6b9e1..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.12.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2009 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.12.ebuild,v 1.8 2009/05/26 17:05:27 arfrever Exp $
-
-EAPI="1"
-
-inherit eutils depend.apache 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
-	mirror://gentoo/nagios-2.0b.cfg-sample.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
-IUSE="debug perl +web vim-syntax"
-DEPEND="virtual/mailx
-	web? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		perl? ( net-analyzer/traceroute )
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-want_apache2
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	# Check if gd has been compiled with jpeg and png support
-	if use web; then
-		if ! built_with_use media-libs/gd jpeg png; then
-			eerror "Your gd has been compiled without jpeg and/or png support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg png" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/2.x-series-nsca.patch
-
-	local strip="$(echo '$(MAKE) strip-post-install')"
-	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
-}
-
-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 apache2 ; then
-		myconf="${myconf} --with-command-group=apache"
-	else
-		myconf="${myconf} --with-command-group=nagios"
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--datadir=/usr/nagios/share \
-		|| die "./configure failed"
-
-	emake CC=$(tc-getCC) nagios || die "make failed"
-
-	if use web ; then
-		# Only compile the CGI's if "web" useflag is set.
-		make CC=$(tc-getCC) DESTDIR="${D}" cgis || die
-	fi
-
-	emake -C contrib all || die "contrib make filed"
-
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL README UPGRADING
-	docinto contrib
-	dodoc contrib/README
-
-	if ! use web; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
-			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web 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
-
-	doinitd "${FILESDIR}"/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 web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			doins "${FILESDIR}"/99_nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache-2.x webserver"
-			ewarn "out-of-the-box. Since you are not using apache, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-
-		if use perl; then
-			into /usr/nagios ; dosbin contrib/traceroute.cgi
-		fi
-	fi
-
-	for dir in etc/nagios var/nagios ; do
-		chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
-	done
-
-	chown -R root:root "${D}"/usr/nagios
-	find "${D}"/usr/nagios -type d -print0 | xargs -0 chmod 755
-	find "${D}"/usr/nagios/*bin -type f -print0 | xargs -0 chmod 755
-	find "${D}"/usr/nagios/share -type f -print0 | xargs -0 chmod 644
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /usr/nagios/share/ssi
-	keepdir /var/nagios/rw
-
-	if use apache2 ; then
-		chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown -R nagios:nagios "${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"
-
-	cat << EOF > "${T}"/55-nagios-core-revdep
-SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec"
-EOF
-
-	insinto /etc/revdep-rebuild
-	doins "${T}"/55-nagios-core-revdep
-}
-
-pkg_postinst() {
-	elog
-	elog "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
-	elog
-	elog "Also, if you want nagios to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add nagios default"
-	elog
-
-	if use web; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "To have ministatus.cgi requires copying of ministatus.c"
-		elog "to cgi directory for compiling."
-
-		elog "Note that the user your webserver is running at needs"
-		elog "read-access to /etc/nagios."
-		elog
-
-		if use apache2 ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog "	usermod -G nagios apache"
-			elog "or"
-			elog "	chown nagios:apache /etc/nagios"
-			elog
-			elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-			elog
-			elog "That will make nagios's web front end visable via"
-			elog "http://localhost/nagios/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the nagios group!"
-		fi
-
-	else
-		elog "Please note that you have installed Nagios without web interface."
-		elog "Please don't file any bugs about having no web interface when you do this."
-		elog "Thank you!"
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-
-	elog
-	ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
-}
-
-pkg_prerm() {
-	[[ "${ROOT}" == "/" ]] && /etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild b/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild
deleted file mode 100644
index 19f7c65d601a..000000000000
--- a/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild,v 1.8 2009/05/26 17:05:27 arfrever Exp $
-
-EAPI="1"
-
-inherit eutils depend.apache 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="alpha amd64 ppc ppc64 sparc x86"
-IUSE="debug lighttpd perl +web vim-syntax"
-DEPEND="virtual/mailx
-	web? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		lighttpd? ( www-servers/lighttpd )
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-want_apache2
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	# Check if gd has been compiled with jpeg and png support
-	if use web; then
-		if ! built_with_use media-libs/gd jpeg png; then
-			eerror "Your gd has been compiled without jpeg and/or png support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg png" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local strip="$(echo '$(MAKE) strip-post-install')"
-	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
-}
-
-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 !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--datadir=/usr/share/nagios/htdocs \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		|| die "./configure failed"
-
-	emake CC=$(tc-getCC) nagios || die "make failed"
-
-	if use web ; then
-		# Only compile the CGI's if "web" useflag is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL README UPGRADING
-
-	if ! use web ; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
-			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
-			Makefile
-	fi
-
-	sed -i -e 's/^contactgroups$//g' Makefile
-
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install-config
-	emake DESTDIR="${D}" install-commandmode
-
-	newinitd "${FILESDIR}"/nagios3 nagios
-	newconfd "${FILESDIR}"/conf.d nagios
-
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			doins "${FILESDIR}"/99_nagios3.conf
-	    elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios3-r1.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-
-	fi
-
-	for dir in etc/nagios var/nagios ; do
-		chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
-	done
-
-	chown -R root:root "${D}"/usr/$(get_libdir)/nagios
-	find "${D}"/usr/$(get_libdir)/nagios -type d -print0 | xargs -0 chmod 755
-	find "${D}"/usr/$(get_libdir)/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /var/nagios/rw
-	keepdir /var/nagios/spool/checkresults
-
-	if use !apache2 && use !lighttpd; then
-		chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
-	else
-		if use apache2 ; then
-			chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
-		elif use lighttpd ; then
-			chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
-		fi
-	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() {
-	elog "If you want nagios to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add nagios default"
-	elog
-
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "To have ministatus.cgi requires copying of ministatus.c"
-		elog "to cgi directory for compiling."
-
-		elog "Note that the user your webserver is running at needs"
-		elog "read-access to /etc/nagios."
-		elog
-
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G nagios apache"
-				elog "or"
-				elog "	chown nagios:apache /etc/nagios"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-			elif use lighttpd ; then
-				elog "  usermod -G nagios lighttpd "
-				elog "or"
-				elog "  chown nagios:lighttpd /etc/nagios"
-			fi
-			elog
-			elog "That will make nagios's web front end visable via"
-			elog "http://localhost/nagios/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the nagios group!"
-		fi
-
-	else
-		elog "Please note that you have installed Nagios without web interface."
-		elog "Please don't file any bugs about having no web interface when you do this."
-		elog "Thank you!"
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}
-
-pkg_postinst() {
-	einfo "Fixing permissions"
-	chown nagios:nagios "${ROOT}"var/nagios
-}
diff --git a/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild b/net-analyzer/nagios-core/nagios-core-3.2.0.ebuild
index c161f4f9be7d..47c1c7ae1a50 100644
--- a/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild,v 1.2 2009/06/27 21:10:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.2.0.ebuild,v 1.1 2009/08/13 14:49:54 dertobi123 Exp $
 
 EAPI="2"
 
@@ -72,7 +72,7 @@ src_configure() {
 		--prefix=/usr \
 		--bindir=/usr/sbin \
 		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--datarootdir=/usr/share/nagios/htdocs \
+		--datadir=/usr/share/nagios/htdocs \
 		--localstatedir=/var/nagios \
 		--sysconfdir=/etc/nagios \
 		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 88671e6de6f7..6b0785ff1c80 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,5 +1,5 @@
 EBUILD nagios-2.12.ebuild 856 RMD160 e9b0bbbff4bad51973abd96cd0aac4bb1a1c2401 SHA1 7248dac905c510915b9ad690c55110a063b2b3c4 SHA256 99e0511b725eac560d0ab6a280b7a0251c1e4e81cffc8fe4d879084c32a14c92
 EBUILD nagios-3.0.6.ebuild 1810 RMD160 1254d655fa3712c0a3b4584ceaec5237eea7a0f9 SHA1 c0aac32c2e88747a51b3187c2bf7dde6798cd2d9 SHA256 bf9cd0c07eabe252588d809235a18fc71de2be191f598e958a3d94b3caf0a9bf
-EBUILD nagios-3.1.2.ebuild 1820 RMD160 4bb234adb7d152e81e9715f4dd65958895916e46 SHA1 05c31c6bf697865e855d720a255a4dceab3921ad SHA256 6891f8426004581639242a4c335a03960b39f40b3f48d7c2794c93e6936ccd71
-MISC ChangeLog 11543 RMD160 0a7e86511c46bc7c06f24e32672535feb8b6aab1 SHA1 f21fcc2d36b5bfa22fd85a4861cc870fdf479034 SHA256 db7c2a14f31a7430be98620c71aae7f3bd9e9282c52306a0ca9cd18f921645ad
+EBUILD nagios-3.2.0.ebuild 1820 RMD160 4480e7b9be7c579e8308f1e9e46f44691ce0da15 SHA1 2a1710dd301881381a470410ff736f013af53423 SHA256 6508bb6e2d0bde49bad7cfab99c61180ae147fa5fd5ac1362c0bf701d71c7617
+MISC ChangeLog 11690 RMD160 4cbb185f6beb81c05ba5a9f1e170f6c7f9cebcbb SHA1 ea9109c89644d5d08a2848d00741dd3eb93bb280 SHA256 135426955145f7bf44eaf3b50bd8eda91482280e5418b1dee885658a3306adc5
 MISC metadata.xml 963 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 SHA1 b63ecd87d1a48ec89bb8d1b571af2990e5c4a46d SHA256 1caad75fb2c860e761a2ef082cae698e6d34499b68af04c6bc214ca019bdab3d