summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2010-10-07 16:24:56 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2010-10-07 16:24:56 +0000
commitdb2ed7fa60a8085555de03545c3655ff616af74f (patch)
treee04d2a230110fbf5acd8b278af98f78057ea9a28 /net-analyzer/nagios
parentia64/s390/sh stable #337270 (diff)
downloadhistorical-db2ed7fa60a8085555de03545c3655ff616af74f.tar.gz
historical-db2ed7fa60a8085555de03545c3655ff616af74f.tar.bz2
historical-db2ed7fa60a8085555de03545c3655ff616af74f.zip
Version bump (#339831), cleanup
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/nagios')
-rw-r--r--net-analyzer/nagios/ChangeLog8
-rw-r--r--net-analyzer/nagios/nagios-3.0.6.ebuild53
-rw-r--r--net-analyzer/nagios/nagios-3.2.3.ebuild (renamed from net-analyzer/nagios/nagios-3.2.2.ebuild)2
3 files changed, 8 insertions, 55 deletions
diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog
index a550dbe51a3b..34e6afaf19ac 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/nagios
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.95 2010/10/01 00:46:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.96 2010/10/07 16:24:56 dertobi123 Exp $
+
+*nagios-3.2.3 (07 Oct 2010)
+
+ 07 Oct 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+ -nagios-3.0.6.ebuild, -nagios-3.2.2.ebuild, +nagios-3.2.3.ebuild:
+ Version bump (#339831), cleanup
01 Oct 2010; Brent Baude <ranger@gentoo.org> nagios-3.2.1.ebuild:
Marking nagios-3.2.1 ppc64 for bug 312843
diff --git a/net-analyzer/nagios/nagios-3.0.6.ebuild b/net-analyzer/nagios/nagios-3.0.6.ebuild
deleted file mode 100644
index c491d5b0deaa..000000000000
--- a/net-analyzer/nagios/nagios-3.0.6.ebuild
+++ /dev/null
@@ -1,53 +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/nagios-3.0.6.ebuild,v 1.9 2009/03/18 22:21:02 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.2.ebuild b/net-analyzer/nagios/nagios-3.2.3.ebuild
index 3a1c481faf42..bd9c93066a27 100644
--- a/net-analyzer/nagios/nagios-3.2.2.ebuild
+++ b/net-analyzer/nagios/nagios-3.2.3.ebuild
@@ -1,6 +1,6 @@
# 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.2.ebuild,v 1.1 2010/09/02 20:48:23 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.2.3.ebuild,v 1.1 2010/10/07 16:24:56 dertobi123 Exp $
inherit multilib