Bump along with nagios-core

Package-Manager: portage-2.2.12-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x28DB029C

3 files changed, 78 insertions, 17 deletions

diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog
index c718bbebadb2..bf3601949fcb 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.113 2014/08/03 16:45:03 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.114 2014/09/02 14:38:22 creffett Exp $
+
+*nagios-3.5.1 (02 Sep 2014)
+
+  02 Sep 2014; Chris Reffett <creffett@gentoo.org> +nagios-3.5.1.ebuild:
+  Bump along with nagios-core
 
   03 Aug 2014;  <tgall@gentoo.org> nagios-3.3.1.ebuild:
   arm64, initial support
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index fd4882d27273..bef2d6581c93 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 EBUILD nagios-3.2.3.ebuild 1820 SHA256 d4f52dff3913cdf1ea59551907601952e89e2e765f931b6f1538f5f53984c10b SHA512 196c6aee91d8b4aa87e97999948fbae5695d5fbc0fc40c39157533e51af2ec0ce78519deea74aa5790db45d027500c4fa4384b9eb5ff594f7d74baad521437ce WHIRLPOOL 8b4c608546398a4c7d2b91b57e84ca7dfa5b1517df7ceb8d80c1fb19e294698b9523595a1210729e8076d9c031f7ca67655facde5c4257a4b28ef3e087c57ee4
 EBUILD nagios-3.3.1.ebuild 1815 SHA256 49ed1894f32ba03453f2c354f8f351c870f6e5d7bc47fc52c5cf6ea691a57c82 SHA512 502c499464b12d4fd3910870d439913570b5311046b5bc1a5eab85bb6e4e38f914a2a76a9bf4136c9c0672a3efd94d41631b7c4a7fd86b855887a43364c198d6 WHIRLPOOL faa3ca7f0b1196e3efb802121098250e1eb25cb54adc60cc1165dc3f0784474fa93e318af0ae82e71b8545df6ae06ec6ef8885f03d89762c8a3ff52951f227b2
-MISC ChangeLog 14922 SHA256 50e962faf0ffc7e4ad235fa8aced4b00f76a19adf503f0e348acc43b659751da SHA512 06a862647990d43d0219778215de1b609dd9c3fb5ad0976292e4f10a6c21fab7eee742326bc41939ac02e7875d3232aa9934f257d196d786406fed5523738437 WHIRLPOOL d3dd0993c05eb6350498f115ef84545d0abc13449179b2f698fb59975a70fdfad3813d63c948c7b62cfcf9c34c833886aad89f1de67bddc45c439fff3fc029f3
+EBUILD nagios-3.5.1.ebuild 1833 SHA256 648274a99f19115885ddc7fdc29c2a554420a4fb3568b16e416b4e9f294d536b SHA512 17ec41a395f0716e33789fef0bedb03c78ac862471be094fa49e9802bd789871916076146231c1e5144a619dbec27d9f35ccf9c1e9d8a371eb771a1ee36c398b WHIRLPOOL 6390b35871859733e85db6e8e671433700263d479dea2b0b36a7ce28e8a2866b331c7a7b75a0e0543fba458c0ead16bd47844c9861961f2516909697b7fd78c4
+MISC ChangeLog 15058 SHA256 ebd760789ee04fec2af4f6743105cb85348a308d8afcac5104f24447fb48ea7f SHA512 bd9b19cb614637650868d65638216f974cfc942d7c0da357c6186ed67360cb279dd89de925a59ee07344cd9ab665ad0c315efd66a655e1bd42916f6bc045c78f WHIRLPOOL cd4d07e25ce11cbf58dccc2b2e2ed2bca892198b74706c9cbabe01ab73acc81b0d494bf79610d6ee59855c09a8cf8e68fd462f12e1bc4d67afc3ad0abe2caa0d
 MISC metadata.xml 1276 SHA256 38926e96a52718568d9cd2c0dd1df8d66ffddbfc8d7722a3f154d4134784bceb SHA512 2c7e3ac36ea4f14d3c30bb4b25f5dc45db5a2082369fdeea8dbc4632c58e9acbdd8c1f30ac292b7d27f9014680faf9cd8c5a7f2480e31d3c4bb38b67c381ce95 WHIRLPOOL 6a9c969a6905437befd3db1e0f94c199a2012405d3dc3bb2c9eabf45b9fffc427587f5322bd68ea2034765e365b220d3696ebd4490d91a64fe6a9ffd1c77bb1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-Comment: GPGTools - https://gpgtools.org
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT3mcoAAoJED/EDWHtqUmqv/oQAIGsR9qgCvSPVBIQWWMcF/cV
-ZQ4igm4rcR/1ynkNZgstkg9aUmKfzCRKWJwN6xOVoKsRiFzF5X4wvX+EnVWvjY7f
-u9nKgaYJcbdNXpyiEq/dJ5ZFXKlkO444eWC9NYtCeOVK+o7H84Om0iqvMZhFQdTb
-dyny+SFyk7Rq8+OGTF/uencqaGb/TWpXQq3jd9Q5VhpiXN6EKbhkduA/WnGr6Xed
-zqk4gvf+/MYgm54JDt6E+JZqz5nbTDhlqUe8URvFTfJbiyF9bufahQ/6O+PgmHVD
-6AYGQSiJ7X8jFG9TqBFna47dwFJBLYZwrx0krrEOwWF4ta+cZAB+/cixOFWeSZo1
-LGuA+yTqWCb2oy374+j8B2vpblbdWYuXrNLmqCBwyxiJTwQa/ro2ubwbSD7Np6Y4
-vZ5WKwygSGNxAT7koIhEPjP8665rkYFfqSw+YQYhOM8SkQoRN/W6cajokn2Eeg91
-hLx0Ib+OIHARW1yms+JACpiwve4HM7ZdY/adA5/DiNo+LB7LxUtKLjq7WU5gMY81
-4wTJig0LwQExPfyF4jBy8PxlnIMN+ocvo7uZXmvHRPdAt5nV0BkTO5RIYLdcUwcP
-CKyF0xQm39YrKsvJWD3M5cA8khnCdjAXS7l8s/1K33T7TeA4eflzJfIEOH47cTu+
-eccvqDa8S2s6XC26oRQJ
-=xgOl
+iQJ8BAEBCABmBQJUBdZfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzgwNDhGMjg4MzhERTE1NTY2NjA4MkZE
+MUJBQjZCNTI4REIwMjlDAAoJENG6trUo2wKcYfQQAIe5+fKZ/juxIrbtiEFqW77Y
+pzAmuExLpgfGCRw5yF/9uqjH4FQCHSPK1ltyi05qNUip7PAW/r5FP/rtLBCt+Wvb
+F55GAntLQtdOgQFVPHYlrJJ8LEOy0z3yo+AxmWLVrSs83j62w/nJUW5gc9AenKLS
+I/u+RuuMibixUO0wPovwtL6BFLED2BotDaD4/vE4SRObY9NRUTAFXie7pawJaFq8
+MjAO4RgtE9nks6UppTplp+ZrYyZKlW9FNiHj/BGdxbAjNAgRxP0hIvEVR9KcKGL9
+iGrRTr96nSNyNX5lU8Y4Qk9tDiC0S47Aj+xzc1ebyE0Do/oiMD8VKykMKvaHhzG8
+LVLFEGZ3nAJ1v+snnpOxCa0Nuzb/mbONA2aFr3gTqlvW7YvkGFm6wlp7ttN1Eqvp
+JbNWi6AKsUBW6zeGDVcA298t83GANdk5HtECtQ35pWIZv9QMuXS75CAH2Jo9BOyb
+H3+NNIc4//3gQS/7ctKhRqVa2IsV6XWM5lcE7IodJg+uIp1fWuKHGr09RaFckDL7
+UJcX/mIgdvy4iZYXpFwBoHA+alouhc5lq9RFCwyrhAaIBEAsrY3Fek1Uq5uVPckD
+NKBLg966DZsZNKaFojYt2be2NiCaccHPG8+oJvvx6uVMQ/GgFXyi6Tl6VwhwHs+J
+HYlIeZPWwTu98Htafmk0
+=Lr99
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios/nagios-3.5.1.ebuild b/net-analyzer/nagios/nagios-3.5.1.ebuild
new file mode 100644
index 000000000000..a8f4d54f88ec
--- /dev/null
+++ b/net-analyzer/nagios/nagios-3.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.5.1.ebuild,v 1.1 2014/09/02 14:38:22 creffett Exp $
+EAPI=5
+
+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 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+	>=net-analyzer/nagios-plugins-1.4.13-r1
+	!net-analyzer/nagios-imagepack"
+
+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
+}