Fixing DEPEND wrt bug #153243

Package-Manager: portage-2.1.2_rc1-r1

3 files changed, 29 insertions, 15 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 0299bff1877f..750c9b9ff8a9 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.76 2006/10/14 23:59:30 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.77 2006/10/31 23:31:07 jokey Exp $
+
+  01 Nov 2006; Markus Ullmann <jokey@gentoo.org>
+  cacti-0.8.6h_p20060108-r2.ebuild:
+  Fixing DEPEND wrt bug #153243
 
 *cacti-0.8.6i (14 Oct 2006)
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 4a1dae7d28f0..3d378f7a4c69 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 2191 RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 SHA1 0c9fc10166b40ad42d38811dbb744f4accfe1bb8 SHA256 c5a9ead9474eb3ef2b98f210c68f4ad6b24680321d9fbfe6e419c86e891fbe9e
 MD5 472d9c7edf09b6bb78d0eeca60001ad1 files/postinstall-en.txt 2191
 RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 files/postinstall-en.txt 2191
@@ -8,18 +11,18 @@ DIST fix_search_session_clear_issue.patch 1154 RMD160 40f69cb5611aec1a5e5faa91b6
 DIST fix_sql_syntax_related_to_default_rra_id.patch 1058 RMD160 70d67c3b8f32eb4a6bdc4df97d11b63865afc352 SHA256 458e1a64e97dc592b10e354b046079d5ea31101dd4f1f4d0e689c5d2ab363106
 DIST mysql_5x_strict.patch 2593 RMD160 2da88ac06035f889db1538fc0910b475dd1ec768 SHA256 c39beb645f8ae1c375f45a388db5a7939944668e5d079567f2e51e13badb95f1
 DIST nth_percentile_empty_return_set_issue.patch 4792 RMD160 9684f0744c889f3113070f8abdd7e653b1f4679c SHA256 63a9dfb702a50ba73b8d84da6a86588927eb192e022d07dcbe8ea7d5f9389982
-EBUILD cacti-0.8.6h_p20060108-r2.ebuild 2141 RMD160 5d739a92c366459f8295892e5f9ead042e1ba975 SHA1 efb01af766e0f8908cffc0fd59a3adaa408f0ce6 SHA256 26c1a51037eff849bf84e6ade8497d1648765f964a7a3e255674c08193331b3a
-MD5 880d5304233e3eef601ed74240eab1e8 cacti-0.8.6h_p20060108-r2.ebuild 2141
-RMD160 5d739a92c366459f8295892e5f9ead042e1ba975 cacti-0.8.6h_p20060108-r2.ebuild 2141
-SHA256 26c1a51037eff849bf84e6ade8497d1648765f964a7a3e255674c08193331b3a cacti-0.8.6h_p20060108-r2.ebuild 2141
+EBUILD cacti-0.8.6h_p20060108-r2.ebuild 2148 RMD160 ea2decab0e0ff04d3045e3130e8a6eb305c45cca SHA1 03bd69c35ee0e30e3e3da20656c780bf364f8c69 SHA256 d7e93c99452e153c754968daac37c12eeaceeae8f2e499b88cda7163cc7aab3f
+MD5 f240ba202313db1b2140ea021377ae03 cacti-0.8.6h_p20060108-r2.ebuild 2148
+RMD160 ea2decab0e0ff04d3045e3130e8a6eb305c45cca cacti-0.8.6h_p20060108-r2.ebuild 2148
+SHA256 d7e93c99452e153c754968daac37c12eeaceeae8f2e499b88cda7163cc7aab3f cacti-0.8.6h_p20060108-r2.ebuild 2148
 EBUILD cacti-0.8.6i.ebuild 2015 RMD160 73196dfa20e891a09ffe83ddde73c8af28ff7188 SHA1 2edb067c44840435f7d89f719551adc70a4d6f68 SHA256 beae8f0ed2a62b586aba01c69d89d3464722e4af797b1a34a621865553908a85
 MD5 b804e59301628126872ae512dd66422f cacti-0.8.6i.ebuild 2015
 RMD160 73196dfa20e891a09ffe83ddde73c8af28ff7188 cacti-0.8.6i.ebuild 2015
 SHA256 beae8f0ed2a62b586aba01c69d89d3464722e4af797b1a34a621865553908a85 cacti-0.8.6i.ebuild 2015
-MISC ChangeLog 11454 RMD160 8dfa20fe8e6a48d685bf3d3dcb1d1e7debcd6d11 SHA1 2c44ccb4dcb99adac6668533a7e1dd470c5243f1 SHA256 b65a9b7fd1e2c26d62fa5b958bab24f304ecf03bced3b4fd102cb96dc9ba1499
-MD5 a4e54b824f3375be317467b2ce1e3266 ChangeLog 11454
-RMD160 8dfa20fe8e6a48d685bf3d3dcb1d1e7debcd6d11 ChangeLog 11454
-SHA256 b65a9b7fd1e2c26d62fa5b958bab24f304ecf03bced3b4fd102cb96dc9ba1499 ChangeLog 11454
+MISC ChangeLog 11569 RMD160 3ab2c02e1bce62c600b83e7291e015ea9c96aa3c SHA1 8e2a85a632f173d5be66ce7c6fee9b84e2b8f44c SHA256 68a378e7b2448d770f0df6c8bbedbcde48d63666685fd6abf9db1d6106fac82b
+MD5 a016882047d982c5b531af9adc968c81 ChangeLog 11569
+RMD160 3ab2c02e1bce62c600b83e7291e015ea9c96aa3c ChangeLog 11569
+SHA256 68a378e7b2448d770f0df6c8bbedbcde48d63666685fd6abf9db1d6106fac82b ChangeLog 11569
 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743
@@ -30,3 +33,10 @@ SHA256 55e6747633e87e5da14c070454423ed0914ca0acb8c43eb68c89873dd51dd1a2 files/di
 MD5 2871d9c68b9fc9c1b4913ce66a84fbf0 files/digest-cacti-0.8.6i 241
 RMD160 44671e3f132273b94162aacae7739ec6f7f7d072 files/digest-cacti-0.8.6i 241
 SHA256 8921a96c3bb8026e4af5f531ee0f53780de61b190a6159957109a20ecfec9e6b files/digest-cacti-0.8.6i 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFR+r7z974XjDVpbkRAozHAKDEVW1RF5fmJkSA2UYvdBUYgfwHAgCdEYLu
+WWn015ByVNyJOB7RxudtHhU=
+=bhYi
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild b/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild
index 0d391f0f18ca..a267f7557d91 100644
--- a/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.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/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild,v 1.7 2006/05/23 19:58:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild,v 1.8 2006/10/31 23:31:07 jokey Exp $
 
 inherit eutils webapp depend.apache
 
@@ -22,19 +22,19 @@ LICENSE="GPL-2"
 KEYWORDS="alpha ~amd64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="snmp"
 
-DEPEND=""
+DEPEND="virtual/php
+	virtual/httpd-php"
 
 want_apache
 
 # 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="${DEPEND}
+	!alpha? ( !sparc? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) ) )
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
 	dev-db/mysql
-	virtual/cron
-	virtual/php
-	virtual/httpd-php"
+	virtual/cron"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz ; mv ${MY_P} ${P}