version bump, clean up old ebuilds

Package-Manager: portage-2.0.54

12 files changed, 24 insertions, 275 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index c11cc10f483d..88439e784ea6 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.72 2006/02/08 14:28:10 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.73 2006/04/03 02:38:04 ramereth Exp $
+
+*nagios-core-2.1 (03 Apr 2006)
+
+  03 Apr 2006; Lance Albertson <ramereth@gentoo.org>
+  -nagios-core-2.0_rc1.ebuild, -nagios-core-2.0_rc2.ebuild,
+  +nagios-core-2.1.ebuild:
+  * Version bump
+  * Remove older release candidates
 
 *nagios-core-2.0 (08 Feb 2006)
 
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 827c835ab5e5..3be532933a34 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -5,8 +5,7 @@ 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 97842ad243d5d658f8b20b06c92c72a5 files/digest-nagios-core-2.0 131
-MD5 0da9d84dcb3743c589a6329ef836f47e files/digest-nagios-core-2.0_rc1 134
-MD5 ba01ecd27cf87c57867f9308164da92b files/digest-nagios-core-2.0_rc2 134
+MD5 b1bb7bf2bf468173ad54269b86b0c500 files/digest-nagios-core-2.1 131
 MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
@@ -14,5 +13,4 @@ MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 MD5 6e955d838dba98d7ac157ca9e3f4e0af nagios-core-1.2-r4.ebuild 7240
 MD5 cea5a3d589fdd00d45f20544f65759e5 nagios-core-1.3.ebuild 7472
 MD5 50c60e546174daae11e5a52077a98df2 nagios-core-2.0.ebuild 6013
-MD5 6aa27b93182222d1c10fe95f59f3c228 nagios-core-2.0_rc1.ebuild 6207
-MD5 ae40ff231ced3f15df1c6091c20ef40c nagios-core-2.0_rc2.ebuild 6014
+MD5 50c60e546174daae11e5a52077a98df2 nagios-core-2.1.ebuild 6013
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
deleted file mode 100644
index 560420b54b43..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
-MD5 373124639093919dc8858a243d760f84 nagios-2.0rc2.tar.gz 1732073
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc1 b/net-analyzer/nagios-core/files/digest-nagios-core-2.1
index f3ccf902a6b4..b9db976484e6 100644
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.0_rc1
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.1
@@ -1,2 +1,2 @@
 MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
-MD5 5807fc2f1cf5355a2eadc6f4d51f6711 nagios-2.0rc1.tar.gz 1731687
+MD5 ec559a13dbf3a403e9325c90425076df nagios-2.1.tar.gz 1734773
diff --git a/net-analyzer/nagios-core/nagios-core-2.0_rc1.ebuild b/net-analyzer/nagios-core/nagios-core-2.0_rc1.ebuild
deleted file mode 100644
index 318a5bb93e01..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.0_rc1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# 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_rc1.ebuild,v 1.3 2006/01/28 21:42:17 eldad 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
-	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
-}
-
-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
-}
-
-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"
-	einfo
-	einfo "Due to a mixup on how the ebuilds were versioned in portage, this"
-	einfo "upgrade might look like a downgrade. I needed to re-align the version"
-	einfo "numbering to be correct. Sorry for any confusion that may have caused."
-}
-
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-2.0_rc2.ebuild b/net-analyzer/nagios-core/nagios-core-2.1.ebuild
index dd45b7f5167a..49080a11c3a9 100644
--- a/net-analyzer/nagios-core/nagios-core-2.0_rc2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2006/01/28 21:42:17 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.1.ebuild,v 1.1 2006/04/03 02:38:04 ramereth Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog
index 879c4ca2abdf..cf33c9bd83a4 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.32 2006/02/08 14:28:42 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.33 2006/04/03 02:38:25 ramereth Exp $
+
+*nagios-2.1 (03 Apr 2006)
+
+  03 Apr 2006; Lance Albertson <ramereth@gentoo.org> -nagios-2.0_rc1.ebuild,
+  -nagios-2.0_rc2.ebuild, +nagios-2.1.ebuild:
+  * Version bump
+  * Clean up older release candidates
 
 *nagios-2.0 (08 Feb 2006)
 
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index a9a92d18e278..6e08ea2c184a 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -2,11 +2,9 @@ MD5 04d098f571aaf78d492cfd07fb5a8cc8 ChangeLog 4735
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0_rc1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0_rc2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.1 0
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 MD5 9cc5bbb8531bdad0ca97cbdd7fb3764e nagios-1.2.ebuild 855
 MD5 7fc987c941b3dd1740094b901c3f8d2e nagios-1.3.ebuild 853
 MD5 c7eedd96e33e2d67a07d77b529667145 nagios-2.0.ebuild 858
-MD5 3d0964247d218cb691c467805e471391 nagios-2.0_rc1.ebuild 862
-MD5 a3d41439d6b476eeac8be31b789e03aa nagios-2.0_rc2.ebuild 862
+MD5 c7eedd96e33e2d67a07d77b529667145 nagios-2.1.ebuild 858
diff --git a/net-analyzer/nagios/files/digest-nagios-2.0_rc2 b/net-analyzer/nagios/files/digest-nagios-2.0_rc2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-analyzer/nagios/files/digest-nagios-2.0_rc2
+++ /dev/null
diff --git a/net-analyzer/nagios/files/digest-nagios-2.0_rc1 b/net-analyzer/nagios/files/digest-nagios-2.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/net-analyzer/nagios/files/digest-nagios-2.0_rc1
+++ b/net-analyzer/nagios/files/digest-nagios-2.1
diff --git a/net-analyzer/nagios/nagios-2.0_rc1.ebuild b/net-analyzer/nagios/nagios-2.0_rc1.ebuild
deleted file mode 100644
index 62139b4a0e5e..000000000000
--- a/net-analyzer/nagios/nagios-2.0_rc1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-2.0_rc1.ebuild,v 1.1 2005/12/27 22:23:26 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
-}
-
diff --git a/net-analyzer/nagios/nagios-2.0_rc2.ebuild b/net-analyzer/nagios/nagios-2.1.ebuild
index e07537fd5af6..62b217a9cebd 100644
--- a/net-analyzer/nagios/nagios-2.0_rc2.ebuild
+++ b/net-analyzer/nagios/nagios-2.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-2.1.ebuild,v 1.1 2006/04/03 02:38:25 ramereth Exp $
 
 DESCRIPTION="The Nagios metapackage - merge this to pull install all of the
 nagios packages"