Version bump with permission from creffett, bug #522946.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

4 files changed, 104 insertions, 7 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 9d3c9a55eb73..c838509060b8 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.167 2014/11/03 13:26:54 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.168 2014/11/22 21:19:19 mjo Exp $
+
+*nagios-plugins-2.0.3 (22 Nov 2014)
+
+  22 Nov 2014; Michael Orlitzky <mjo@gentoo.org> +nagios-plugins-2.0.3.ebuild,
+  metadata.xml:
+  Version bump with permission from creffett, bug #522946.
 
   03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
   nagios-plugins-1.4.16-r2.ebuild, nagios-plugins-1.4.16-r3.ebuild:
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index a7627761a925..9f2d9fa1a112 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -3,14 +3,28 @@ Hash: SHA256
 
 DIST nagios-plugins-1.4.16-patches-2.tar.xz 8972 SHA256 e553c6a13aa56d826e113008ab87b6eee2d676fb2a09aa5433211ebfea6cd7c9 SHA512 48352873396274b4063bf8e58530df7c8cf6cfefe5e581ad31bd44a54b295bac634688d33de98e4f90723b0e1652192762cfcb6664fc0ce5bee797d6716584f8 WHIRLPOOL 3e397e8a2e1cd98ac646d4b419a38b0eadb7b6ea42a593de86fc8300ff802a9ad560b4ad0c73fed914c326afc48da178884470495e23eacc3521e0a4dd9b6214
 DIST nagios-plugins-1.4.16.tar.gz 2087089 SHA256 b0caf07e0084e9b7f10fdd71cbd3ebabcd85ad78df64da360b51233b0e73b2bd SHA512 7a1401964b881c3db3e1e3f2a49dcf517ff7214724cc05c3ad629651b7e3eeb823b02abe0c6379d29996ac1e8a1208d918fd12e36cca46c7d36d9b1ebacdb2b3 WHIRLPOOL 3cb3b5d5f7f18e7eb5babde6f7bdd82ba167de4b875825c195d3abf7a14926102940616278769a8127a5c3269d475325145799c1414e6cc22eb208319fd2e879
+DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870662e28ae8973d49d439463588aada04a SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 WHIRLPOOL 4b0e4024833373df3f0db44657345a1f4495c4022e56bf6b369cc2846f9127e565520f6b7cdf1b94384592e78327d584da7d939a3ac0586e0ae67fd1258c138b
 EBUILD nagios-plugins-1.4.16-r2.ebuild 3937 SHA256 f9005b55437d97d9d7061c1d9647cc79074fc9125a9fe734570a728eb4d42de7 SHA512 88f1ce60d271c18c9bfdcae50b881cbf07d92263b4254058536a45080d186819f9b4b8508a8f5314d384f7061ba6b27e31c023316d29203f9c22822e1ac3bdc2 WHIRLPOOL 075536701968d745948af7c9f6d100add7b6827f7a35845dc121b4f87fd20ba92c6f208f63a9a885253469c6e37a98bbb675665e830c0c3b99f3b0f309a58625
 EBUILD nagios-plugins-1.4.16-r3.ebuild 3944 SHA256 d97626b747e82da3ce45eae1debe19161ae80ba61b847a5f79a29eb051b721ff SHA512 1b150bb851e92c32f266db346266a9a73c966e960d8202e183b01521de1ee1edd9c7afae24c6f5c44a27b9f004b5c068eafcd669f8370698b855a042c1190792 WHIRLPOOL 0ccb1550c3204fddf2b88f20d06235dc2ceb3d2588ae39c24ec1d3589a5a4aa2dcf59a5056fc0d3e9f9a33b3465c27410cf0b73a684ebd430ee6bd15b653e1b9
-MISC ChangeLog 13850 SHA256 37d8879cd1422b18d6d6eca023c47dabf1ccb8107165a55befd39a56c47624d6 SHA512 0192b341b18d502aa5a7b7e1d74538eeb7c94246b47987a19a49063856be6a0548a09e3397d636a7ecef8144c9ace184e39bc98ea57768f1fd340bece4a0d4f4 WHIRLPOOL 2298962e0a99230ce716ceb5657bc79104dd67a727a1fef577c55ea1ed39dad6e23cdd1e90d94db3400dda60aa63ae058a84d77d98f0b801cb57b50803bc0f58
-MISC metadata.xml 2726 SHA256 d7aeb67fcae932b631703ad90a318ee660027b9375d783e27eb84bc8b0dd315b SHA512 2d8a3f601b316728dcf2646a675408a294b0247f886fd47ae8c37b310e4c53bcf63d8f82a91f3cbe4287a79a3e3d9675facd1c6921f13e86c5912ce59e9b1e6d WHIRLPOOL f71ad41d9c403435053006fc98072f5f66b572e3970244f5c6c9b5d44b0767e81833cdb5c51071c386986bce9f90aa560dcea486e4ef5b14057764e413dbcd8d
+EBUILD nagios-plugins-2.0.3.ebuild 2051 SHA256 30caeaaad86b7d10d69dbe21a238981c462eec234baca4dbc28133d4fabe8f78 SHA512 30ad2d6e1c3d3332d8acc1950407856f3721bb837160b169c968941a533c04edf68823fc4f3d6bd6412a8251e1ec87fe80c48a254a371e791cca0eb24828b27f WHIRLPOOL 912a0b38a98455649ebbd685bd53c1db26a7f4134626d33fb45cf47a0c179e757fe630c78220f855446c96545cf9a580c1a6ecd285c14f32f7ea75f9a5474ca2
+MISC ChangeLog 14035 SHA256 cdeccd71bf8137a57def4a590e6e266bded977c3681bbe36b329bf955a2fd5b4 SHA512 decad2eaad6130c056e23e3c95803ccc689ae80286424093e871b13429962c1dcea40f00ed066bfd54abe38f6b8e56884a45b920e7abff961acb1c4da869140f WHIRLPOOL 353b4f405b16757cdd2bd0a81df375b090da8aa9aff53c2112f87daca6e58fca1c7a7f96a33c3439eb16098f6bcd46b2977f2c72c9626492b4f0b13486f4b848
+MISC metadata.xml 2897 SHA256 685531987bdd9a0cc9d9248550a76428ef316d0316dd8cdfd1788e0bafb2d8ca SHA512 46fffe3335f5a6fcae546337f39d2821b13e5dab260923762daf7f93bf6fd0e2a5d7589877228925b726a8c44365037dfd6ef0b1a165f0be9e607de68cbad383 WHIRLPOOL d6e299583d056d8c905560d5da06134c44a1762a28c167f858f53e2e0489d1fbecae14f5802e7e5f216b6a2cc668b6f849ebb99b7b2daf41f7d589ff76f376cd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlRXgqAACgkQVxOqA9G7/aDatgD/SyfIDGcmALnTiD1CQykFdAq3
-rbh9dwGj/ef8ODVG/EsA+wfgiVqiLX5ZeuocMOeD4GelS2azuetjn93UKMWT9qb1
-=Hhoi
+iQJ8BAEBCABmBQJUcP3cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbdCgQAINyxea1HvIT+/LWmoeilIAr
+PT38Sxi6Q9T4oNZgOUkrU/u1xwMvUomjbu4Z2ltfTUrkeUT4N9xoXQkzzgAZOoX3
+afxbw5EG2tHlnVpUgoov2sY/H/F/ZGRsZzzdCt4vkuac5vOEHaUAtEKoHpltZ0qI
+IpuUEblyn42bVoLXjaMMuDTK6Iov9Ui8kCyiwgK9Rb1VTfiYnaspUP8ZeOgnflUx
+yjrasq+RvWNuqBj05Ei42NIQvDTDELWbO3TCwp7yf7UebnDnl2a6WJAiaDEl+Ikt
+vjey1Ig/Qt6ai6y5niqrKTQ5zE8AQ6gYIVAFgro7GW3ubR2PHXYGxJdzkYtxTVe0
+57nZf26abwl66yNFFapaec8tCN3sMH+AhAzN14byaYv4NBdMc2oLfMspLjjIKO0Y
+rL/3WnXzn0x8zQtcbZb8iiPmpf2rh2tUx/33bzbgk0P4lV4cYqn40h+HKr4JQVHk
+cSe5L4GOmh54a8JPv8tpIXrHxEs1iOV3rV+ta8CtQz6bUBG5k7B2gJcbrtzK+RuR
+DU+r9rDby7/cPE6z5SD5GZCThzZub/zbHgDsd0tOcIQNLwuJOyKLNfbQPBwOGQCX
+7USXxSL0drSv4AodQ/tgAESGrDhXq7Lq2Bq43GWnOsG70Sj7NltfC6K7m9nr7mmp
+MHz6+EF3Ir5rjHYk4Jkb
+=vI8U
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index a6ce3499783c..3f11c9841662 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -35,6 +35,10 @@
       Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
       servers. Disabling the flag does not remove any plugin file.
     </flag>
+    <flag name='ssh'>
+      Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
+      servers. Disabling the flag does not remove any plugin file.
+    </flag>
     <flag name='ups'>
       Install <pkg>sys-power/nut</pkg> required for monitoring
       compatible UPS units. Disabling the flag does not remove any
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3.ebuild
new file mode 100644
index 000000000000..3e249e19a193
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3.ebuild,v 1.1 2014/11/22 21:19:19 mjo Exp $
+
+EAPI=5
+
+inherit eutils multilib user
+
+DESCRIPTION="Official set of plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres samba snmp ssh +ssl"
+
+DEPEND="ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	ssl? ( dev-libs/openssl )"
+
+# tests try to ssh into the box itself
+RESTRICT="test"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	mysql? ( virtual/mysql )
+	nagios-dns? ( net-dns/bind-tools )
+	nagios-ping? ( net-analyzer/fping )
+	nagios-game? ( games-util/qstat )
+	samba? ( net-fs/samba )
+	snmp? ( dev-perl/Net-SNMP )
+	ssh? ( net-misc/openssh )"
+
+src_prepare() {
+	# Fix the path to our perl interpreter
+	sed -i -e '1s:/usr/local/bin/perl:/usr/bin/perl:' \
+		"${S}"/plugins-scripts/*.pl || die
+}
+
+src_configure() {
+	if use ssl; then
+		myconf+="$(use_with ssl openssl /usr)"
+	else
+		myconf+=" --without-openssl --without-gnutls"
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		${myconf} \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--sysconfdir=/etc/nagios
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags which determines what nagios"
+	elog "is able to monitor. Depending on what you want to monitor with"
+	elog "nagios, some or all of these USE flags need to be set for nagios"
+	elog "to function correctly. Plugins are installed into"
+	elog "/usr/$(get_libdir)/nagios/plugins"
+}