Bump, fixes #339982 #339685

Package-Manager: portage-2.2_rc90/cvs/Linux x86_64

4 files changed, 56 insertions, 31 deletions

diff --git a/app-admin/monit/ChangeLog b/app-admin/monit/ChangeLog
index 6a3a171a8f86..0a0ca657b2d5 100644
--- a/app-admin/monit/ChangeLog
+++ b/app-admin/monit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/monit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/ChangeLog,v 1.50 2010/07/18 13:49:17 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/ChangeLog,v 1.51 2010/10/08 09:44:53 patrick Exp $
+
+*monit-5.2.1 (08 Oct 2010)
+
+  08 Oct 2010; Patrick Lauer <patrick@gentoo.org> -files/monit.initd-4.8.1,
+  +monit-5.2.1.ebuild:
+  Bump, fixes #339982 #339685
 
   18 Jul 2010; <nixnut@gentoo.org> monit-5.1.1.ebuild:
   ppc stable #324565
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index dddb9ad65975..b48e23319b4b 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,9 +1,10 @@
 AUX monit.initd-4.10.1 621 RMD160 0f70764ab590ced7dc86699a20973db2b291e5c8 SHA1 15545615e23c234561e691709def4722dbe31567 SHA256 7f6564cb738e6430e8d1dca9be7a63db1baf4b421f5445767e235658f0b1c024
-AUX monit.initd-4.8.1 621 RMD160 61f37cc1d7cac73e107c4d7c3b98339e83dac0ae SHA1 bb808a6fd853b74985688a9cb383b8e352f5b60f SHA256 a4f0c8d928686a498ab156dfca55567078d60090378c79e7611f10809a885798
 AUX monit.initd-5.0 618 RMD160 d8e488aeed8fe34d8aa69456c6f6d3f0ff162230 SHA1 e26532abcd3b3e02403c03c9fe501825e0a472c5 SHA256 9715991dfc26021689e878f74fa9c5c02a7a7504ba527c9ed0ed8f165bedaa04
 DIST monit-4.10.1.tar.gz 606273 RMD160 6c517b19bc43f4023dfca4de1df09272b41af02d SHA1 c87aa0c6e0b1d13f46b7e9d84937191e25a907a6 SHA256 f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193
 DIST monit-5.1.1.tar.gz 615924 RMD160 1b4fed4e039adfd626f3c49436702c0272948327 SHA1 cad2ff02a2f6dbfb5773d13e42506adb2165d15c SHA256 bf789e0660410e8c63f4b3dc2eeab9889347e6494a6dc1c0e764343cae0dc1ba
+DIST monit-5.2.1.tar.gz 619180 RMD160 9bb4fdb25b2cb1769b95574ee41a463c876518e1 SHA1 15bc783014b1ee8886e5d8f0c28f953b581d05ec SHA256 31b37dd4a6f6b48e6d6926d97bfe5ad998a2a0611af0586525a5dd1b5847e41e
 EBUILD monit-4.10.1.ebuild 1213 RMD160 7738cbf8f8c3efd8a0cbd6c3cd6d3ccdb2452217 SHA1 f26cddbe92ea07defc01e1f434826ac3a1b69ee4 SHA256 a5699d5432dacee66a9843942c3dcdbf4be6ff0b967e418bb13d514e85f1813f
 EBUILD monit-5.1.1.ebuild 1177 RMD160 b600454d9fc4d07eeccfb8c8acf41ad7c3654776 SHA1 4d66e0505c58e10b27f26f1a5fc79f46171f09a1 SHA256 6258a6f94c911d2959e21ec29b9c10c08f194fd84e45b53fb8a93c5875581dce
-MISC ChangeLog 6327 RMD160 66bb90537645175db5d1e06a3eee771bf52b44d9 SHA1 90cda785298e70ffd59bae7f7e6364ed98bc97ad SHA256 452924c8f4288781893f4eeef53b2c45ced275bafdd2c9336ab874ec2cae41a5
+EBUILD monit-5.2.1.ebuild 1181 RMD160 81adbf850ddb986f499fa66e86c8d27edfb2cde4 SHA1 ebb48fe573732339f09d63b4a6072c010c3b60bb SHA256 b306d9351a86f3e6e149eab541f79bc5704b5b694f21baef34399b360af74db1
+MISC ChangeLog 6486 RMD160 eb4f9ccd12bfbe29311870e7c916e45c030699b4 SHA1 0ea47a7b4a26790bf81af41c27cc2dd1e188be3e SHA256 301b9783afe21d825110c318c929c3fa3b0739892408f419772e3ee626beb6ef
 MISC metadata.xml 283 RMD160 6e720fc6781f6653a0979215b63fafcb8801a223 SHA1 4714773a5fe2324a1b7ddb185fe710de78f3ac29 SHA256 5499d2de743ec9bb5befea5bdc63e0659eec4e44ecef80d6c7c1713708e05b05
diff --git a/app-admin/monit/files/monit.initd-4.8.1 b/app-admin/monit/files/monit.initd-4.8.1
deleted file mode 100644
index 58a2fb820ce9..000000000000
--- a/app-admin/monit/files/monit.initd-4.8.1
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-4.8.1,v 1.1 2006/06/10 13:39:56 matsuu Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting monit"
-	start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping monit"
-	start-stop-daemon --stop --quiet --exec /usr/bin/monit
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading monit"
-	/usr/bin/monit -c /etc/monitrc reload >/dev/null 2>&1
-	eend $?
-}
diff --git a/app-admin/monit/monit-5.2.1.ebuild b/app-admin/monit/monit-5.2.1.ebuild
new file mode 100644
index 000000000000..91c7833b2970
--- /dev/null
+++ b/app-admin/monit/monit-5.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.1.ebuild,v 1.1 2010/10/08 09:44:53 patrick Exp $
+
+EAPI="2"
+
+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="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+src_prepare() {
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc CHANGES.txt README*
+	dohtml -r doc/*
+
+	insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
+	newinitd "${FILESDIR}"/monit.initd-5.0 monit || die "newinitd failed"
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}