version bump, clean up old ebuilds

(Portage version: 2.0.54)

6 files changed, 11 insertions, 36 deletions

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"