Added doc USE flag to install html manual, fixed a bit dependencies to allow installation with any php capable web-server, bug #229523, thank Tiziano Müller for report.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 21 insertions, 14 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 6e2363e29c51..ecc62da5f94a 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.142 2008/08/19 07:23:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.143 2008/10/13 08:43:28 pva Exp $
+
+  13 Oct 2008; Peter Volkov <pva@gentoo.org> metadata.xml,
+  cacti-0.8.7b-r3.ebuild:
+  Added doc USE flag to install html manual, fixed a bit dependencies to
+  allow installation with any php capable web-server, bug #229523, thank
+  Tiziano Müller for report.
 
 *cacti-0.8.7b-r3 (19 Aug 2008)
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 3b6c270de306..1c2c859cfdb2 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -14,6 +14,6 @@ DIST tree_console_missing_hosts.patch 771 RMD160 d33f3916317e989b379d1188f3ed23b
 DIST upgrade_from_086k_fix.patch 847 RMD160 ab5da2f9ae47a6affd4ff0ec1473a5193353df61 SHA1 105309cc259f80e17e550d53384b125782b02b9f SHA256 9385e019c25d5638a39b10a3afd7ee375d8de911d713a6c79443053419af7ec4
 EBUILD cacti-0.8.6j-r8.ebuild 2508 RMD160 18ade21d0f57b202d6f8c60177a770f9f5f5ad13 SHA1 705d85857d3373b47b24c666211e4c5a112fd38e SHA256 1d249406491a8025cf957cab5ac263045d7c951e9d7d41035c80b91d7e95bb4e
 EBUILD cacti-0.8.7b-r2.ebuild 2021 RMD160 58e97db740594c7f8005bf4b7a96fc868b835343 SHA1 2f46a5a5e4c90b94275fc034260368f91620cadf SHA256 bf69e9f8416e056eea2f5b36a0a9e1298ae0bb8ff0acdc51fd9d15da4744aacd
-EBUILD cacti-0.8.7b-r3.ebuild 2046 RMD160 cf4f361faf6318b688e93b86b8082dffc81ad403 SHA1 9d09dfe8384d4186c6dc526abe70c67796131018 SHA256 75f71259c1ca1b4f757170976a282700f53b47892c8da5a54730a9ddc48438f4
-MISC ChangeLog 20712 RMD160 5f4819d1352cb63a8d1fbca038e138dfbc977cb1 SHA1 fa605e8bfc2fc158af8f581dfb2cd7fdf54aec44 SHA256 87a664c88d39b3768c70a95669867b3b796b2c06f28bd3bacb311538a93a4da8
-MISC metadata.xml 848 RMD160 7e5776a7ff87fac6eff9120a963d5f21dcba1ead SHA1 31f04fbc8b130fb989469c95f909f497476decd3 SHA256 0edb183a383463c59b1094701e9ceabf3c614e88b349b062fc4cbb2034e13692
+EBUILD cacti-0.8.7b-r3.ebuild 2026 RMD160 1ad34666bd03f88003704a5ed63322baf273fd53 SHA1 e2bb0dde44ab4fbcea136da62cf0cc50388c9915 SHA256 a19920f41a49cfb122ec5e4a263746e8a113b76878165ad2d13502663d1806d8
+MISC ChangeLog 20974 RMD160 51ba6cd9b37be4e17cfdacfd378f7e47ffdbbc11 SHA1 a2129d73885da8fe09dbee0683053ba2a56b2b13 SHA256 1abd76ee80e3aa34ac4c7ea049419dbee42d89c87e00cee3ab39a45e655e2979
+MISC metadata.xml 916 RMD160 04f9ef45ccd484deda4a6333cf8d57b61c1be217 SHA1 cad0945f6d5d5427cfaae181b4c860576d7887b9 SHA256 a6e338947e55cbf427aeb35322f37c5af2e900ef4def9576da82789d804c4a0c
diff --git a/net-analyzer/cacti/cacti-0.8.7b-r3.ebuild b/net-analyzer/cacti/cacti-0.8.7b-r3.ebuild
index 595a7683e592..83b481285737 100644
--- a/net-analyzer/cacti/cacti-0.8.7b-r3.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.7b-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7b-r3.ebuild,v 1.1 2008/08/19 07:23:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7b-r3.ebuild,v 1.2 2008/10/13 08:43:28 pva Exp $
 
-inherit eutils webapp depend.apache depend.php
+inherit eutils webapp depend.php
 
 # Support for _p* in version.
 MY_P=${P/_p*/}
@@ -24,16 +24,15 @@ fi
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp"
+IUSE="snmp doc"
 
 DEPEND=""
 
-want_apache
 need_php_cli
+need_httpd_cgi
 need_php_httpd
 
-RDEPEND="!apache2? ( www-servers/lighttpd )
-	snmp? ( net-analyzer/net-snmp )
+RDEPEND="snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
 	dev-php/adodb
 	virtual/mysql
@@ -62,15 +61,14 @@ pkg_setup() {
 	require_php_with_use cli mysql xml session pcre sockets
 }
 
-src_compile() {
-	einfo "Nothing to compile."
-}
+src_compile() { :; }
 
 src_install() {
 	webapp_src_preinst
 
 	rm LICENSE README
-	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
+	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE,text/manual.txt}
+	use doc && dohtml -r docs/html/
 	rm -rf docs
 	rm -rf lib/adodb
 
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index 4f8f1fdcc3bd..0aa7e5c70dd6 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -18,4 +18,7 @@
 	<use>
 		<flag name='bundled-adodb'>use adodb bundled with web-application instead of system wide</flag>
 	</use>
+	<use>
+		<flag name='doc'>install html documentation</flag>
+	</use>
 </pkgmetadata>