stable on amd64, wrt bug #152220.

Package-Manager: portage-2.1.2_pre3-r6

3 files changed, 37 insertions, 18 deletions

diff --git a/app-admin/monit/ChangeLog b/app-admin/monit/ChangeLog
index 3bf33c001cae..2f1e0d0c3fea 100644
--- a/app-admin/monit/ChangeLog
+++ b/app-admin/monit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/monit
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/ChangeLog,v 1.21 2006/06/10 13:39:56 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/ChangeLog,v 1.22 2006/10/21 14:33:18 voxus Exp $
+
+  21 Oct 2006; Konstantin V. Arkhipov <voxus@gentoo.org> monit-4.8.1.ebuild:
+  Applied Jakub's patch wrt bug #152220, goes stable on amd64.
 
 *monit-4.8.1 (10 Jun 2006)
 
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index c8f8161d8a93..6f5be280903d 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX monit.initd 624 RMD160 902498e780f8bea74367931bfc7644d65509032c SHA1 23634bc651614a2820d3bd1382842df770949edd SHA256 e77dfe74a3f939753a64b38ddccc705be8a9fb243c414ee6f76c014e77609585
 MD5 12c8e7df38eb7ec788a1a5d54e144998 files/monit.initd 624
 RMD160 902498e780f8bea74367931bfc7644d65509032c files/monit.initd 624
@@ -22,14 +25,14 @@ EBUILD monit-4.6.ebuild 1030 RMD160 0acef7f012fe80ece6a0b27dfda03b82d5fbd9c3 SHA
 MD5 7329be613052c89747f3366d17001613 monit-4.6.ebuild 1030
 RMD160 0acef7f012fe80ece6a0b27dfda03b82d5fbd9c3 monit-4.6.ebuild 1030
 SHA256 03d8f79e0d2222a2db9cfeb25f54c04d3a07ce28df641c77f471b2e3786db093 monit-4.6.ebuild 1030
-EBUILD monit-4.8.1.ebuild 1037 RMD160 4ee2d34828aaf65f86f50c40b0e54d27512d78a5 SHA1 f58da8d700a4eae426d1ed6d532121d5d1697a31 SHA256 543cd27271f2c9a69742eff18541bd93e9915f3b98320bc600eed09a06e45f37
-MD5 754341ec3ba8996bc30a969350516777 monit-4.8.1.ebuild 1037
-RMD160 4ee2d34828aaf65f86f50c40b0e54d27512d78a5 monit-4.8.1.ebuild 1037
-SHA256 543cd27271f2c9a69742eff18541bd93e9915f3b98320bc600eed09a06e45f37 monit-4.8.1.ebuild 1037
-MISC ChangeLog 2608 RMD160 cb37391c9b4d3733b691a157d947ee6f175d1a69 SHA1 ad38804a43c450979d8982c2cce90149e8bdfd07 SHA256 7394f34ebddad2cde0267653b10536fe5d2fdd559c34836a5f8d4d5f89112678
-MD5 adcbf733c56e5a8b7f0947c7f26a32a4 ChangeLog 2608
-RMD160 cb37391c9b4d3733b691a157d947ee6f175d1a69 ChangeLog 2608
-SHA256 7394f34ebddad2cde0267653b10536fe5d2fdd559c34836a5f8d4d5f89112678 ChangeLog 2608
+EBUILD monit-4.8.1.ebuild 1251 RMD160 4026354920eaf90e70574b1e0cee602aaf3b008f SHA1 38856d585bdb2ab41ec4080da3b0008917e9346d SHA256 d332c1ce3640b0f96fc5ee3f8908cbc2832d7728e084586df385dccbea35677d
+MD5 97d1172a1e57f594a0571df68f2aebba monit-4.8.1.ebuild 1251
+RMD160 4026354920eaf90e70574b1e0cee602aaf3b008f monit-4.8.1.ebuild 1251
+SHA256 d332c1ce3640b0f96fc5ee3f8908cbc2832d7728e084586df385dccbea35677d monit-4.8.1.ebuild 1251
+MISC ChangeLog 2748 RMD160 ec49e27421bcb45b9fce3c3606ca4f749a202b54 SHA1 3974f4723999a8a3b901de02b74b5ffb9a44539a SHA256 7924ca78780e2d425c957d72accdb647a155f82d54768a002a13388fb8ba6dfd
+MD5 18a15459091c46928bcbea36489d3855 ChangeLog 2748
+RMD160 ec49e27421bcb45b9fce3c3606ca4f749a202b54 ChangeLog 2748
+SHA256 7924ca78780e2d425c957d72accdb647a155f82d54768a002a13388fb8ba6dfd ChangeLog 2748
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -46,3 +49,10 @@ SHA256 91cfadaf81835613c651af96b182674acb8774bca74c4970e25e2aad4db743d4 files/di
 MD5 dbfe767fbc2a0a1325b082931e1bebef files/digest-monit-4.8.1 235
 RMD160 9e15568b34f46bdece9bc67e2eb80e667d5f34f8 files/digest-monit-4.8.1 235
 SHA256 485be33ea354436eec6509572fe3cfa7720f5a7b8518a84b004b0d6697c860ac files/digest-monit-4.8.1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOi+5bwxeDFj+ScoRAoxPAJ0f+0CAtEkP3ylpa2z76a1mRrDAIwCgoJKF
+RlSRuQRoGgeZwO2U8yl2H8c=
+=PpW9
+-----END PGP SIGNATURE-----
diff --git a/app-admin/monit/monit-4.8.1.ebuild b/app-admin/monit/monit-4.8.1.ebuild
index cb7b23d7cab2..28c24faed65a 100644
--- a/app-admin/monit/monit-4.8.1.ebuild
+++ b/app-admin/monit/monit-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-4.8.1.ebuild,v 1.1 2006/06/10 13:39:56 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-4.8.1.ebuild,v 1.2 2006/10/21 14:33:18 voxus Exp $
 
 DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
 HOMEPAGE="http://www.tildeslash.com/monit/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.tildeslash.com/monit/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="ssl"
 
 RDEPEND="virtual/libc
@@ -17,22 +17,28 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-devel/bison"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
 src_compile() {
-	econf `use_with ssl` || die
-	emake || die
+	econf $(use_with ssl) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 
 	dodoc CHANGES.txt CONTRIBUTORS FAQ.txt README* STATUS UPGRADE.txt
 	dohtml -r doc/*
 
-	insinto /etc; insopts -m700; doins monitrc || die
-	newinitd "${FILESDIR}"/monit.initd-${PV} monit || die
+	insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
+	newinitd "${FILESDIR}"/monit.initd-${PV} monit || die "newinitd failed"
 }
 
 pkg_postinst() {
-	einfo "Sample configurations are available at"
-	einfo "http://www.tildeslash.com/monit/doc/examples.php"
+	elog "Sample configurations are available at"
+	elog "http://www.tildeslash.com/monit/doc/examples.php"
 }