Fix bug #178258 (remove apache1 support).

Package-Manager: portage-2.1.2.7

4 files changed, 21 insertions, 17 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 4717fa75bea6..21ce79dee18d 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.96 2007/05/12 18:00:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.97 2007/05/12 23:55:28 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> cacti-0.8.6i-r1.ebuild,
+  cacti-0.8.6j-r4.ebuild:
+  Fix bug #178258 (remove apache1 support).
 
   12 May 2007; <pva@gentoo.org> ChangeLog:
   I was too fast in my previous bump. cacti works with snmp utilities fine
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 947769402f36..d4921f9fdda7 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -12,18 +12,18 @@ DIST ping_php_version4_snmpgetnext.patch 1262 RMD160 94882973199b8e59c40ad43a132
 DIST poller_output_remainder.patch 1891 RMD160 7aab97b71d5915ca8085174f69318cb223eb6c5e SHA1 5e2d8b008c96f2761c12e1d94e225546a0e98e7b SHA256 2d8053d90dd363f4822072e58713b7d5f4b23825de4df2e9d429bfb5e8ec8201
 DIST thumbnail_graphs_not_working.patch 1515 RMD160 6b228cab1bc99b3f20ddb4e1d45b467fc8dadf35 SHA1 3684fe33e37105c719c59bd3ba7e1aaf2795c9a8 SHA256 3b18602aed1aa8b9773a75a4e89413cd12ce2670fd185eae113de1aa2c1186bd
 DIST tree_console_missing_hosts.patch 771 RMD160 d33f3916317e989b379d1188f3ed23b7d61a7a9e SHA1 bccc1293567c9160971537a3cbbf69ab0ca9cf81 SHA256 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180
-EBUILD cacti-0.8.6i-r1.ebuild 2205 RMD160 b2274904a036938517359ddb733c5e795e985224 SHA1 93a9e8bad0d5bd6e707bc0e09f8d498f671c7c51 SHA256 fa600d704c99cf724e39706a6df4200f9cd6babdb3cd69e3019f7f3fcde0713b
-MD5 fcfaa77dec55ec55baeb93834d917504 cacti-0.8.6i-r1.ebuild 2205
-RMD160 b2274904a036938517359ddb733c5e795e985224 cacti-0.8.6i-r1.ebuild 2205
-SHA256 fa600d704c99cf724e39706a6df4200f9cd6babdb3cd69e3019f7f3fcde0713b cacti-0.8.6i-r1.ebuild 2205
-EBUILD cacti-0.8.6j-r4.ebuild 2509 RMD160 0b28300274a6646d718e6e4cfdcb53f568e7e9ca SHA1 c474d1d6f3783b690c3cbb8a8a4e8f64cc79a30a SHA256 381c37c02d404229665a65cec61c4d81ff306534a6089a9646a9867df6ed4d4f
-MD5 4ae9e5cb475e3b1721989a58f408cea0 cacti-0.8.6j-r4.ebuild 2509
-RMD160 0b28300274a6646d718e6e4cfdcb53f568e7e9ca cacti-0.8.6j-r4.ebuild 2509
-SHA256 381c37c02d404229665a65cec61c4d81ff306534a6089a9646a9867df6ed4d4f cacti-0.8.6j-r4.ebuild 2509
-MISC ChangeLog 14220 RMD160 5694097188231fad3b1ce1d466013308a4135783 SHA1 cf3e643019f1351d33ba52cbe63393b8e791e9bb SHA256 f6521450b6c6dcc58b123f35f74c19f81c19575dc2cb2aa695a1799fffa61051
-MD5 ea8fbe3440667c27b40409c9b4bce750 ChangeLog 14220
-RMD160 5694097188231fad3b1ce1d466013308a4135783 ChangeLog 14220
-SHA256 f6521450b6c6dcc58b123f35f74c19f81c19575dc2cb2aa695a1799fffa61051 ChangeLog 14220
+EBUILD cacti-0.8.6i-r1.ebuild 2194 RMD160 fd76cf98cbec25298be315b743fe45a5b9acbe28 SHA1 d46e624180435878c9583ca714fd6ea96210cb38 SHA256 8ff74da3ec72c09b0d30266ecf7a35771068b71712b6aae0c3ee604d783f5018
+MD5 d5e819280d488d751cd21fd8d235a222 cacti-0.8.6i-r1.ebuild 2194
+RMD160 fd76cf98cbec25298be315b743fe45a5b9acbe28 cacti-0.8.6i-r1.ebuild 2194
+SHA256 8ff74da3ec72c09b0d30266ecf7a35771068b71712b6aae0c3ee604d783f5018 cacti-0.8.6i-r1.ebuild 2194
+EBUILD cacti-0.8.6j-r4.ebuild 2504 RMD160 ba0c1cc6a20e1069502a2744ffc1674fcaecc195 SHA1 ca1ffd252cc9454398092dd7da096fae96bcdbb7 SHA256 ee5a74ff05a5c10c5ff212ebfe958d691644001185f937fda1b357b8c43b0c0f
+MD5 4573a216b5d69be58d3a1881742191e8 cacti-0.8.6j-r4.ebuild 2504
+RMD160 ba0c1cc6a20e1069502a2744ffc1674fcaecc195 cacti-0.8.6j-r4.ebuild 2504
+SHA256 ee5a74ff05a5c10c5ff212ebfe958d691644001185f937fda1b357b8c43b0c0f cacti-0.8.6j-r4.ebuild 2504
+MISC ChangeLog 14369 RMD160 a87415f647163b0934c4b6636160317d0b958b74 SHA1 d7d23c2994d2382931b55582b9351824516f69fb SHA256 bfd79e0fecd3c5790a39ae4bcd043bbae7e6f9ae0c200a246d34474e782d73a7
+MD5 2c7aa3c251d23ea0d142dd18a56c502c ChangeLog 14369
+RMD160 a87415f647163b0934c4b6636160317d0b958b74 ChangeLog 14369
+SHA256 bfd79e0fecd3c5790a39ae4bcd043bbae7e6f9ae0c200a246d34474e782d73a7 ChangeLog 14369
 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743
diff --git a/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild b/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild
index 2e77e632c347..392396c6e74c 100644
--- a/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild,v 1.6 2007/03/10 14:14:14 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild,v 1.7 2007/05/12 23:55:28 chtekk Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -36,7 +36,7 @@ need_php_httpd
 
 # alpha doesn't have lighttpd keyworded yet
 # sparc doesn't have a stable keyword for lighttpd yet
-RDEPEND="!alpha? ( !sparc? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) ) )
+RDEPEND="!alpha? ( !sparc? ( !apache2? ( www-servers/lighttpd ) ) )
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
 	virtual/mysql
diff --git a/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild
index 25bf7f4552b8..dcc7ca1a7fba 100644
--- a/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild,v 1.5 2007/05/12 16:44:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild,v 1.6 2007/05/12 23:55:28 chtekk Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -35,7 +35,7 @@ need_php_httpd
 
 # alpha doesn't have lighttpd keyworded yet
 # sparc doesn't have a stable keyword for lighttpd yet
-RDEPEND="!alpha? ( !sparc? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) ) )
+RDEPEND="!alpha? ( !sparc? ( !apache2? ( www-servers/lighttpd ) ) )
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
 	!bundled-adodb? ( dev-php/adodb )