lighttpd is stable on alpha and sparc so removing !archs from RDEPEND. Actually remove snmp from php check, bug #178263.

Package-Manager: portage-2.1.2.7

4 files changed, 24 insertions, 23 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 21ce79dee18d..b3d5883cb0fb 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,11 @@
 # 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.97 2007/05/12 23:55:28 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.98 2007/05/13 08:56:53 pva Exp $
+
+  13 May 2007; <pva@gentoo.org> cacti-0.8.6i-r1.ebuild,
+  cacti-0.8.6j-r4.ebuild:
+  lighttpd is stable on alpha and sparc so removing !archs from RDEPEND.
+  Actually remove snmp from php check, bug #178263.
 
   12 May 2007; Luca Longinotti <chtekk@gentoo.org> cacti-0.8.6i-r1.ebuild,
   cacti-0.8.6j-r4.ebuild:
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index d4921f9fdda7..4d2c223545b0 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 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
+EBUILD cacti-0.8.6i-r1.ebuild 2068 RMD160 a49dceece2cf1f8e772456c5459a38b2b3960fe9 SHA1 e00f784388ed5d9a20cd28503f6feccc74f369bf SHA256 d76745fbcbe7fe4ebd20bd6a5ef9a22b7439e7dbf9690191a84fa86d15d0b918
+MD5 53a30868bcb78167f216ec024c2a5c0a cacti-0.8.6i-r1.ebuild 2068
+RMD160 a49dceece2cf1f8e772456c5459a38b2b3960fe9 cacti-0.8.6i-r1.ebuild 2068
+SHA256 d76745fbcbe7fe4ebd20bd6a5ef9a22b7439e7dbf9690191a84fa86d15d0b918 cacti-0.8.6i-r1.ebuild 2068
+EBUILD cacti-0.8.6j-r4.ebuild 2368 RMD160 137eaf5468e3e6b511c84a719876fa95d5cf7dc3 SHA1 5f1f9034717a7105fd3f470fcb29133bfa8b633f SHA256 fdbf244cdab03cc2bf401e45903ac2201490d236d5af01816a8b6c587f6f7f46
+MD5 cc3cc99ce439b0ea54458c131a176113 cacti-0.8.6j-r4.ebuild 2368
+RMD160 137eaf5468e3e6b511c84a719876fa95d5cf7dc3 cacti-0.8.6j-r4.ebuild 2368
+SHA256 fdbf244cdab03cc2bf401e45903ac2201490d236d5af01816a8b6c587f6f7f46 cacti-0.8.6j-r4.ebuild 2368
+MISC ChangeLog 14574 RMD160 57a53c82323f668388e5cc16cd3d3c95c69774f2 SHA1 bb6ae1965549d74fa87cbaa13115228b14f33d61 SHA256 cbb6a664ec3f665060cfcdf3b94704021300c9155c646c623ab1e363a782f815
+MD5 57d1023e78d40b3e919d12d1d121f6b9 ChangeLog 14574
+RMD160 57a53c82323f668388e5cc16cd3d3c95c69774f2 ChangeLog 14574
+SHA256 cbb6a664ec3f665060cfcdf3b94704021300c9155c646c623ab1e363a782f815 ChangeLog 14574
 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 392396c6e74c..367cd3be372a 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.7 2007/05/12 23:55:28 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild,v 1.8 2007/05/13 08:56:53 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -34,9 +34,7 @@ want_apache
 need_php_cli
 need_php_httpd
 
-# alpha doesn't have lighttpd keyworded yet
-# sparc doesn't have a stable keyword for lighttpd yet
-RDEPEND="!alpha? ( !sparc? ( !apache2? ( www-servers/lighttpd ) ) )
+RDEPEND="!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 dcc7ca1a7fba..4d6a724154cf 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.6 2007/05/12 23:55:28 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild,v 1.7 2007/05/13 08:56:53 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -33,9 +33,7 @@ want_apache
 need_php_cli
 need_php_httpd
 
-# alpha doesn't have lighttpd keyworded yet
-# sparc doesn't have a stable keyword for lighttpd yet
-RDEPEND="!alpha? ( !sparc? ( !apache2? ( www-servers/lighttpd ) ) )
+RDEPEND="!apache2? ( www-servers/lighttpd )
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
 	!bundled-adodb? ( dev-php/adodb )
@@ -63,9 +61,9 @@ pkg_setup() {
 	webapp_pkg_setup
 	has_php
 	if [ $PHP_VERSION = 5 ] ; then
-		require_php_with_use cli mysql xml snmp
+		require_php_with_use cli mysql xml
 	elif [ $PHP_VERSION = 4 ] ; then
-		require_php_with_use cli mysql xml snmp expat
+		require_php_with_use cli mysql xml expat
 	fi
 	use bundled-adodb || require_php_with_use sockets
 }