Fixing doc installation for #319669

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

diff --git a/app-admin/monit/ChangeLog b/app-admin/monit/ChangeLog
index 0d6c09486d74e724daaaab6864f4407e347d92c5..9eccbcf4f40dede8196d7a14904f8fa26fd0d1a0 100644 (file)
--- a/app-admin/monit/ChangeLog
+++ b/app-admin/monit/ChangeLog
@@ -1,6 +1,9 @@
 # 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.45 2010/06/02 09:41:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/ChangeLog,v 1.46 2010/06/09 16:35:17 patrick Exp $
+
+  09 Jun 2010; Patrick Lauer <patrick@gentoo.org> monit-5.1.1.ebuild:
+  Fixing doc installation for #319669
 
   02 Jun 2010; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Taking over as maintainer

diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 07e4b13fefaf066e9468bda555f1bd7507a749e2..70ee784a4bcbff15a438b3c404d9f99941a9eb5d 100644 (file)
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -12,6 +12,6 @@ EBUILD monit-4.8.1.ebuild 1215 RMD160 b043b16c46fc0ac5f84b4b4bedf8e0026212538c S
 EBUILD monit-4.8.2.ebuild 1215 RMD160 064b03824e34b13b4f9157b690fd3030aa3bc452 SHA1 1134ea64abcebedcc5e2d40d195eee5d9a291d40 SHA256 0605a62d0241fb5436ff7d45525ac44b96e662fb906746a0f1b50b6da4ece6ff
 EBUILD monit-5.0.3.ebuild 1193 RMD160 4fb6f142c394162885fcc8ed08033ecee6c995ec SHA1 2b74172b4e88142d5b22dd0dc4a9b324cb19553d SHA256 535f67a52b886d87869bd2e329d3c4f59e31feaf998dc0aeb57144d28b255a9d
 EBUILD monit-5.0_beta6.ebuild 1205 RMD160 e4469c5b7fceac62a69cabdafa4bd745ee875d42 SHA1 02e4e3118ff8009ce3ec79e5d652198fc5ce962f SHA256 2903aa6b0a068eba6f87dd9086f7fd155ce16009cb71882e4fb73cefbbab5625
-EBUILD monit-5.1.1.ebuild 1194 RMD160 47239585aaf79260a4a2ca8dc7e4d2a0426e5d1f SHA1 98021aa7dd5a277fb0d6122e0ee33d037bd890b0 SHA256 e1769482b0106e9f5384b91b5b59ee48f8a8f3013322e4c8bc555b8d1aed05e7
-MISC ChangeLog 5796 RMD160 6f17838096d44f57e1a492085428871a817f4c5f SHA1 3b00b1207e2ec649082b8e272a632ca9c9443683 SHA256 527a81a8bb3b841b0808c78ee7fbcfe63b6f6e322082d0b21424a5771f43b8ec
+EBUILD monit-5.1.1.ebuild 1181 RMD160 6799f251c4f26922de1de747641fd955ee15624d SHA1 3fd0e008893105c6814c3776d514503f9723dc88 SHA256 e753e9f7e2bf26a060cdf8046387f953005edb1b29564232110c8c8636b9a702
+MISC ChangeLog 5905 RMD160 88aab81c882c41febd921ec9057feb8803e26e2b SHA1 29d395d3de55983da03b7fa3bb2428d901f425e0 SHA256 be28e87f73d056679045f85afe2489e63efd792e12e270ba068661c32ccc3a96
 MISC metadata.xml 283 RMD160 6e720fc6781f6653a0979215b63fafcb8801a223 SHA1 4714773a5fe2324a1b7ddb185fe710de78f3ac29 SHA256 5499d2de743ec9bb5befea5bdc63e0659eec4e44ecef80d6c7c1713708e05b05

diff --git a/app-admin/monit/monit-5.1.1.ebuild b/app-admin/monit/monit-5.1.1.ebuild
index 5a6f31ac316b79468248b49d1c396bc091ecd1c1..e3e2df3cbb8462fd28760fe602f8f54ebce5914f 100644 (file)
--- a/app-admin/monit/monit-5.1.1.ebuild
+++ b/app-admin/monit/monit-5.1.1.ebuild
@@ -1,6 +1,8 @@
 # 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.1.1.ebuild,v 1.1 2010/04/30 07:41:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.1.1.ebuild,v 1.2 2010/06/09 16:35:17 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/"
@@ -16,21 +18,22 @@ DEPEND="${RDEPEND}
        sys-devel/flex
        sys-devel/bison"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
 }
 
-src_compile() {
+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 CONTRIBUTORS FAQ.txt README*
+       dodoc CHANGES.txt README*
        dohtml -r doc/*
 
        insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"