Version bump and cleanup, #376471

(Portage version: 2.1.10.7/cvs/Linux x86_64)

3 files changed, 11 insertions, 58 deletions

diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog
index 492b5cfbdeb8..41edb7e80e2b 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.102 2011/07/25 16:27:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.103 2011/07/27 16:16:39 dertobi123 Exp $
+
+*nagios-3.3.1 (27 Jul 2011)
+
+  27 Jul 2011; Tobias Scherbaum <dertobi123@gentoo.org> -nagios-3.2.0.ebuild,
+  -nagios-3.2.1.ebuild, +nagios-3.3.1.ebuild:
+  Version bump and cleanup, #376471
 
   25 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> nagios-3.2.3.ebuild:
   ppc/ppc64 stable wrt #374553
diff --git a/net-analyzer/nagios/nagios-3.2.1.ebuild b/net-analyzer/nagios/nagios-3.2.1.ebuild
deleted file mode 100644
index d0fb6c378912..000000000000
--- a/net-analyzer/nagios/nagios-3.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.2.1.ebuild,v 1.7 2010/10/15 17:18:11 ranger Exp $
-
-inherit multilib
-
-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="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
-	>=net-analyzer/nagios-plugins-1.4.13-r1
-	>=net-analyzer/nagios-imagepack-1.0-r100"
-
-pkg_setup() {
-	# Avoid upgrading from Nagios <3 as the directory structure has changed
-	if has_version '<net-analyzer/nagios-3.0' ; then
-		if [[ "${FORCE_UPGRADE}" ]] ; then
-			echo
-			ewarn "you are upgrading from an incompatible version and have"
-			ewarn "FORCE_UPGRADE set, will build this package while Nagios is running."
-			echo
-		else
-			echo
-			eerror "You are upgrading from an incompatible version."
-			eerror "Please be advised that installation paths have changed to a more FHS"
-			eerror "compliant structure and you won't be able to easily upgrade to"
-			eerror "Nagios 3 therefore. You will have to change your configuration"
-			eerror "to reflect this change, for example Nagios plugins are now installed"
-			eerror "into /usr/$(get_libdir)/nagios/plugins/ instead of /usr/nagios/libexec."
-			echo
-			eerror "If you want to upgrade now, emerge nagios with:"
-			eerror "    FORCE_UPGRADE=1 emerge nagios"
-			die "Upgrading from an incompatible version!"
-			echo
-		fi
-	fi
-}
-
-pkg_postrm() {
-	elog "Note: this is a META ebuild for ${P}."
-	elog "to remove it completely or before re-emerging"
-	elog "either use 'depclean', or remove/re-emerge these packages:"
-	elog
-	for dep in ${RDEPEND}; do
-		elog "     ${dep}"
-	done
-	echo
-}
diff --git a/net-analyzer/nagios/nagios-3.2.0.ebuild b/net-analyzer/nagios/nagios-3.3.1.ebuild
index 16636a087ccf..04b90d8de7ea 100644
--- a/net-analyzer/nagios/nagios-3.2.0.ebuild
+++ b/net-analyzer/nagios/nagios-3.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.2.0.ebuild,v 1.4 2010/05/09 17:15:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.3.1.ebuild,v 1.1 2011/07/27 16:16:39 dertobi123 Exp $
 
 inherit multilib
 
@@ -9,12 +9,12 @@ HOMEPAGE="http://www.nagios.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="~net-analyzer/nagios-core-${PV}
 	>=net-analyzer/nagios-plugins-1.4.13-r1
-	>=net-analyzer/nagios-imagepack-1.0-r100"
+	!net-analyzer/nagios-imagepack"
 
 pkg_setup() {
 	# Avoid upgrading from Nagios <3 as the directory structure has changed