Work in progress on bug #541128.

diff --git a/net-analyzer/nagios-check_mysql_health/Manifest b/net-analyzer/nagios-check_mysql_health/Manifest
index 4965606a7e71ad6fc0a63d9c94eace0f105d43ec..5b203b984603d30dbbb60a572621eb49fe098525 100644 (file)
--- a/net-analyzer/nagios-check_mysql_health/Manifest
+++ b/net-analyzer/nagios-check_mysql_health/Manifest
@@ -1,16 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST check_mysql_health-2.1.8.2.tar.gz 120052 SHA256 7fe0f1431742c2fe282faa234fc7b756679d81bb8a0aa2e786afef48540e7423 SHA512 57e26f57d37f274126c0e8f1133f91b9ac5b40696811eb0738fa02f246b48ca41ef291293beb31651cdf9db5854e75707c906a19b336a0f31410ff494b4c0f2d WHIRLPOOL da29c94e639ab2ce2bb065608bd8b9dc541e91340a07641c850160ee6aeef372f7d4258a145bee3badd231a904d4158b3074a3403f66dcf015b961fb11d21fb4
-EBUILD nagios-check_mysql_health-2.1.8.2.ebuild 844 SHA256 c78e35af5be27ef84a2f79656fa47f41b714e436c65a0399cb3470ce1963f6bd SHA512 748a0eba24bf7b8d7df98485ead9a4fec296dd22bb1e51ad2b25bd78698554115d47340ed8daef4edfbdb097b75ba64ce8cc28277d69f20721662245fe8e8f8e WHIRLPOOL fc248d166066b29119e2683541d4912f7a70b888079dab48548b2fd81c723ca9c8f93dead3b833e7f36799e4b6f57e09712433b901e8484c6b659aa114ebfbb3
-MISC ChangeLog 1749 SHA256 525bd0ab787df1d5bed148964bc2b07f4edd4f49851988f97879e5439dbbd6ec SHA512 4c9628ecea0a29fe854f6b77f8a3333d6be82b90ec1b291d625c3d874f6104c731e41040f3f777f452b22a5801f95c3215e9dcae4ec0062d7b1b674510594aef WHIRLPOOL 94a7ee63f5f87c1af76eeb485519c2162cdcb072db80074bd5f684b67d95f41518dca4e198fae59f27d6dba2c56034d26d881fb7178178214317e7831bda9ff4
+DIST check_mysql_health-2.1.9.2.tar.gz 139293 SHA256 fc46225372bd29a6bd0256db612c1a050892b99889e67788f3a4242df16e629b SHA512 4a68f5f9c53d9c612e7b7185c1d593f896d4122887088f2c2dd824efa936da42c28ae720e5fbe513654721e8313530bfa3b3b973fe19009d6c7fc561402e66f7 WHIRLPOOL a5454bccb944588190572b2b3146c9cbe38745569baa7c55bcb5e96c09a1b2a908218907b8b6f921c558f38d51925578ab6381eca4f5732c9ffc0a3c1ed41380
+EBUILD nagios-check_mysql_health-2.1.9.2.ebuild 989 SHA256 faccde86095f43c43b2a39bc2c6c69ac6becdf253505cc7f212963b3a66c8956 SHA512 d8a7f533d8425b0658e0b887f237b1ba656e13436c9045e35618db16b495f4509490782360f559233bce15e9b2b68c2c49de9a19642d5a89855d5dacaf2bd701 WHIRLPOOL 80b0d83b9420c5d8bc13e3b34854722d11fa2e15d510a3bfa03592d082b86d5aca65f5992f42b9e2740bb4ed4f15388977d48c9a24f4c2a218f425b09f039de7
 MISC metadata.xml 519 SHA256 5a63c9964c7bc4db81f24a8024cfb1d159c7540b055896a491807a8a2ac9cccb SHA512 00f79c774948fdaea5d389e1c7f2ef1a3dda87c036453d192146d32c78bdfcee7e78203b79e304046368185bb409b78bccfca83e22ee241948ea126af13cf8c1 WHIRLPOOL 084496907729562cc65255c051bd08dd687df68a5324f82e34c44457d9e70888e76c7188fa35e5ef86378843f844a7d38b4aed9917cf479ae28ef85369822f75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iKYEAREIAGYFAlLkefRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1ShvACgj8jp2GxRcJJ3AwmDEUlj9Hz9
-GOEAmwRWK961UR156prJ01H3df4p2AS4
-=hE03
------END PGP SIGNATURE-----

diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.8.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.8.2.ebuild
deleted file mode 100644 (file)
index c47047a..0000000
--- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.8.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.8.2.ebuild,v 1.2 2014/01/26 02:59:42 creffett Exp $
-
-EAPI=5
-
-inherit multilib autotools
-
-DESCRIPTION="A nagios plugin for checking MySQL server health"
-HOMEPAGE="http://labs.consol.de/lang/de/nagios/check_mysql_health/"
-SRC_URI="http://labs.consol.de/download/shinken-nagios-plugins/check_mysql_health-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=net-analyzer/nagios-plugins-1.4.13-r1"
-RDEPEND="${DEPEND}
-       virtual/mysql"
-
-S="${WORKDIR}"/check_mysql_health-${PV}
-
-src_prepare() {
-       eautoreconf
-}
-
-src_install() {
-       exeinto /usr/$(get_libdir)/nagios/plugins
-       doexe plugins-scripts/check_mysql_health
-}

diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild
new file mode 100644 (file)
index 0000000..6dda964
--- /dev/null
+++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit multilib user
+
+MY_PN="${PN#nagios-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A nagios plugin for checking MySQL server health"
+HOMEPAGE="http://labs.consol.de/lang/de/nagios/${MY_PN}/"
+SRC_URI="http://labs.consol.de/download/shinken-nagios-plugins/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Found by grepping for "use " in the built
+# plugins-scripts/check_mysql_health.
+RDEPEND="dev-perl/DBD-mysql
+       dev-perl/DBI
+       virtual/perl-Data-Dumper
+       virtual/perl-File-Temp
+       virtual/perl-Net-Ping
+       virtual/perl-Time-HiRes"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure(){
+       # Should match net-analyzer/{monitoring,nagios}-plugins.
+       econf --libexecdir="/usr/$(get_libdir)/nagios/plugins"
+}
+
+pkg_preinst() {
+       # These should match net-analyzer/{monitoring,nagios}-plugins.
+       enewgroup nagios
+       enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}