app-admin/monit: Bump to version 5.16

Cosmetic changes to the init script.

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

3 files changed, 62 insertions, 6 deletions

diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 1a5676afa93b..5553e2fb18bd 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,4 +1,5 @@
 DIST monit-5.12.2.tar.gz 1192066 SHA256 8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c SHA512 086f9af2c6d155c5375e7de5641025707f34577d4f2a4a76d1a104361b5d5793a4f04313cafb5d6884a01aba59f1bbb405b37294ba133d9a93c05e484e5933ff WHIRLPOOL 3d25ab0dc3cfe0e2c881f35e48b64355fe12ce1d3357450d2b1d2aba7344acbe55c031e4fd6b49f7c523b674ff650cbad5bbc91853ec15dd10e64f164504ea70
 DIST monit-5.14.tar.gz 1200131 SHA256 d0424c3ee8ed43d670ba039184a972ac9f3ad6f45b0806ec17c23820996256c6 SHA512 6491434e15fab6f92e29b9f490418332a7700d110c0bd825d65e1aadd68ea082a1d9a7e2b570075b35d6cdb64ae207567bdeb2580e6e5407ba277cc6d1693c78 WHIRLPOOL 8e7ba198f6048d8de06082a269a9f7fa8fbbcd95e14174010bdf54935db53f840d00744e35f4260e9de5d8d9a6ea47aa7c4b037998b035775bbbe212057d75e7
 DIST monit-5.15.tar.gz 1218043 SHA256 deada8153dc7e8755f572bc4d790143a92c7a8668dccb563ae4dbd73af56697c SHA512 7e2b011a89d9b1dc990faf413a38f0c68aea398e25efd5392d6aa1baf50d68ea2db087ea2093c84658a99b7a83d133b23562d5ad11e1197db7a54a2b961177cd WHIRLPOOL e305705583c79b8d861595cae4d000b5832e3288f3d0ec59e69ac811e1f402af489e44c8fe568941781d97c953ff181a8048f0b3dfaeec14a26fd4bbc8cff697
+DIST monit-5.16.tar.gz 1226329 SHA256 5b998e796113ce244c8b575da09d3a62bac1b2765484fe6416f224b4ba8f391f SHA512 09d3fa772c0749e0cb7fd057bcf9d057650601e09b746dd335ee040ba1f9f45693174aead065d50c7f43c2f5dc7f3cace252cf2c94ccdf767a14afdff57f808e WHIRLPOOL 9cbf7dd1f42ebb43f4e3ea1d5880f3229b147576d4ea4f856e38d1fffb20af539d31d52d7bdebcad9354a0ffd3c135760e585a673cb76e2b56f396e34d5dcfc9
 DIST monit-5.8.tar.gz 1237958 SHA256 0c00573ebc0156c534a5952f392c2a7bedde194f8261c05497322055938847f5 SHA512 61f2cb4a6b2da8617adfd16ace4d9b246957385109fee9a3312272ac271003cd89a12872ac3a07b0148ad7bdbe544e447745033d2a9fab19908ef19b7a106dda WHIRLPOOL 0eb1f5b778264d7881281f7139037fa07c225a5c7ece7cae2149460036a58c008e16a3d883e1876a2dc08f092900e05d164e37714ec5fc19960d4127e13c6eeb
diff --git a/app-admin/monit/files/monit.initd-5.0-r1 b/app-admin/monit/files/monit.initd-5.0-r1
index 2a6339f9e6e8..b69241b942cd 100644
--- a/app-admin/monit/files/monit.initd-5.0-r1
+++ b/app-admin/monit/files/monit.initd-5.0-r1
@@ -1,39 +1,41 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Id$
 
 extra_commands="configtest"
 extra_started_commands="reload"
 
+command="/usr/bin/monit"
+
 depend() {
 	use net
 }
 
 configtest() {
-        /usr/bin/monit -t 1>/dev/null 2>&1
+        ${command} -t 1>/dev/null 2>&1
         ret=$?
         if [ $ret -ne 0 ]; then
                 eerror "${SVCNAME} has detected an error in your setup:"
-                /usr/bin/monit -t
+                ${command} -t
         fi
         return $ret
 }
 
 start() {
 	ebegin "Starting monit"
-	start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1
+	start-stop-daemon --start --quiet --exec ${command} >/dev/null 2>&1
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping monit"
-	start-stop-daemon --stop --quiet --exec /usr/bin/monit
+	start-stop-daemon --stop --quiet --exec ${command}
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading monit"
-	/usr/bin/monit -c /etc/monitrc reload >/dev/null 2>&1
+	${command} -c /etc/monitrc reload >/dev/null 2>&1
 	eend $?
 }
diff --git a/app-admin/monit/monit-5.16.ebuild b/app-admin/monit/monit-5.16.ebuild
new file mode 100644
index 000000000000..4789f1c4692e
--- /dev/null
+++ b/app-admin/monit/monit-5.16.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit pam systemd
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+	default
+
+	dodoc README*
+	dohtml -r doc/*
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}