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.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

3 files changed, 18 insertions, 11 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/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>