Fix RDEPEND for bug 304583.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 3390fd3ea224245eeeaba314be5c8b9d22a17870..833354b33a809c175f5141cd0cb852f66ede9af1 100644 (file)
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.163 2010/02/14 10:04:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.164 2010/04/14 20:41:50 gengor Exp $
+
+  14 Apr 2010; Gordon Malm <gengor@gentoo.org> cacti-0.8.7e-r1.ebuild:
+  Fix RDEPEND for bug #304583.
 
   14 Feb 2010; Peter Volkov <pva@gentoo.org> cacti-0.8.7e-r1.ebuild:
   cacti 087 does not work with >rddtool-1.4, bug #304583, thank Emmanuel

diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index c6f24a423b75160f0f2b615b7c1548d9b31ca977..69916eb679215d20ced22938d0a049e583e1259f 100644 (file)
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -5,6 +5,6 @@ DIST cross_site_fix.patch 8705 RMD160 96b72fcc2e17fb0ecd622f4fb627a5ff67f94be2 S
 DIST fix_icmp_on_windows_iis_servers.patch 2997 RMD160 176a28cff430e79433dee4b54aac736548a6cda2 SHA1 466936d06e7a7e4d882b2375ae0cac9dc6434ab1 SHA256 5dd61a9accd5a2872d8efa03bb6b7e49c735568094286a1664f2ae4491ecdeeb
 DIST snmp_invalid_response.patch 921 RMD160 02d1f7fc63473fefbfee9a2edc020f5ec960d103 SHA1 8308f02d69ac3fb1a2ced5ad66c6c5c2078fc75f SHA256 4259979a2d9fdc51a6ef3a88368fe97adace3a7f1c3b895dea61757de9822db8
 DIST template_duplication.patch 9190 RMD160 ba1d35cc207484b17c30044bb9f025ed6281c37b SHA1 27f3ee2eb37bd3c9430933cf00a30e63b2b05829 SHA256 c6ab6d2396f6b6519607f7908df642a575d32a75430e2b74381a6046d57f8ad9
-EBUILD cacti-0.8.7e-r1.ebuild 2102 RMD160 38c50cfe9082884ccc7d10892562ccfa95ace842 SHA1 ff0ccffa937d250f7be804d33c413e739a4e7f3d SHA256 d30587c2cb13e70f4912ad71156b0190f7af2a6d5d5547373cbc8acab021834f
-MISC ChangeLog 23537 RMD160 b671e51ca39fdb5efcbfa6a6c4b67461f4425102 SHA1 8d94b5a71d5cb8ba605dffee1e6a0455305020b0 SHA256 3093218ab94d0217f1806c84e8e6f1c495d108e9428bb972131673b58d0ae8bf
+EBUILD cacti-0.8.7e-r1.ebuild 2083 RMD160 2386b1a6a85ef238a67f52f662c5adca707ec086 SHA1 131f9e080dc47e71f4fb4bf1973a0abcc1457c42 SHA256 263eefc992569fdbdfeb043eb1a58b00032d073f29fbf87634879e8211a670de
+MISC ChangeLog 23643 RMD160 d8e8537843cd1c55c50b3cbbb94f7c3331e1db17 SHA1 c5ccd36500fb54b9c9d4399e39f2c92a81c576b0 SHA256 ad40d5aa077e2465d90b1c3d47479b2ca05a86d8b4c9b4933122d1b841819242
 MISC metadata.xml 803 RMD160 b497804bac33062b7f13330acef0ef28bea19f65 SHA1 031e32c4f5ffe0fc67943674530e880d02f5f2a0 SHA256 db81b920eb3683d9e4fc323bb2399156dfc4a8a0f5d4874505e0c1891dd17819

diff --git a/net-analyzer/cacti/cacti-0.8.7e-r1.ebuild b/net-analyzer/cacti/cacti-0.8.7e-r1.ebuild
index 22415b0796ac538eec3b324e2f0d20e36429c8b9..3af569c9679e79e8e6d7ba4cdb5ef9e4d89fa836 100644 (file)
--- a/net-analyzer/cacti/cacti-0.8.7e-r1.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.7e-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7e-r1.ebuild,v 1.9 2010/02/14 10:04:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7e-r1.ebuild,v 1.10 2010/04/14 20:41:50 gengor Exp $
 
 inherit eutils webapp depend.php
 
@@ -35,8 +35,7 @@ need_httpd_cgi
 need_php_httpd
 
 RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 )
-       net-analyzer/rrdtool
-       <=net-analyzer/rrdtool-1.4
+       <net-analyzer/rrdtool-1.4
        dev-php/adodb
        virtual/mysql
        virtual/cron"