New versions, need some time to test before version bump.

svn path=/; revision=249

10 files changed, 969 insertions, 0 deletions

diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
new file mode 100644
index 0000000..25ecdfd
--- /dev/null
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -0,0 +1,43 @@
+# ChangeLog for net-analyzer/cacti-spine
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.10 2008/08/20 05:27:03 pva Exp $
+
+  20 Aug 2008; Peter Volkov <pva@gentoo.org> Manifest:
+  Fix digest, bug #235206, thank GES for report.
+
+*cacti-spine-0.8.7a_p4650 (14 Aug 2008)
+
+  14 Aug 2008; Peter Volkov <pva@gentoo.org>
+  +cacti-spine-0.8.7a_p4650.ebuild:
+  Bump to the recent SVN snapshot, should fix bug #234749, thank Chris
+  Gianelloni for report.
+
+  19 May 2008; Peter Volkov <pva@gentoo.org> cacti-spine-0.8.7a.ebuild:
+  Fixed typo in postinstall message, bug #222801, thank Chris Lee for
+  report.
+
+  27 Apr 2008; Markus Meier <maekke@gentoo.org> cacti-spine-0.8.7a.ebuild:
+  amd64 stable, bug #210840
+
+  26 Feb 2008; Raúl Porcel <armin76@gentoo.org> cacti-spine-0.8.7a.ebuild:
+  sparc stable wrt #210840
+
+  24 Feb 2008; Markus Meier <maekke@gentoo.org> cacti-spine-0.8.7a.ebuild:
+  x86 stable, bug #210840
+
+  22 Feb 2008; Brent Baude <ranger@gentoo.org> cacti-spine-0.8.7a.ebuild:
+  Marking cacti-spine-0.8.7a ppc64 for bug 210840
+
+  21 Feb 2008; nixnut <nixnut@gentoo.org> cacti-spine-0.8.7a.ebuild:
+  Stable on ppc wrt bug 210840
+
+  26 Jan 2008; <pva@gentoo.org> cacti-spine-0.8.7a.ebuild:
+  Moved autotools to src_unpack, bug #207461, thank Diego Pettenò <flameeyes
+  AT gentoo.org> for report.
+
+*cacti-spine-0.8.7a (08 Jan 2008)
+
+  08 Jan 2008; <pva@gentoo.org> +metadata.xml, +cacti-spine-0.8.7a.ebuild:
+  Initial import. Thank you Nathan Sullivan <nathan AT nightsys.net> for
+  notification and ebuild, bug #204852.
+
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
new file mode 100644
index 0000000..258d529
--- /dev/null
+++ b/net-analyzer/cacti-spine/Manifest
@@ -0,0 +1,4 @@
+DIST cacti-spine-0.8.7c.tar.gz 368272 RMD160 f9352f52fadd990a3495043c9977813c19f5f8da SHA1 4eb2c40fccc5cdcca517c2e1b352b66fd0ad7e5e SHA256 44fdaf572559f192d6e2dc14e649450879770cace710f17eee6d563e2e5a0ea3
+EBUILD cacti-spine-0.8.7c.ebuild 1741 RMD160 a7ab8ec2f784a547ddd3b4e349d76e643bd4900e SHA1 6647826eb85af399bceadc1162fce6999de35dc5 SHA256 3bfd615df3db4170d437ea8552beffc874687252209bd0c7ff7b426cefdc6254
+MISC ChangeLog 1623 RMD160 9e1274882f24629d3051111c6266e16a1355ff09 SHA1 535141dfbb8d879e8e49fa834e5a5ef41d019b62 SHA256 f4fb9dd20214a0956d7a146540014c6325d48b59d759a6de3b215761a83c618c
+MISC metadata.xml 795 RMD160 6496692432dfda95180e8d7506af90ebd79b2172 SHA1 2e929eeb09763b10b746c6b0384acd4197051c85 SHA256 a1ee2fa5779e21ff428e18a563360a7d81e383345d867cfa27046614fc18e466
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.7c.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.7c.ebuild
new file mode 100644
index 0000000..603a589
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.7c.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.7a_p4650.ebuild,v 1.2 2008/08/15 05:56:11 mr_bones_ Exp $
+
+inherit autotools
+
+if [[ ${PV} =~ (_p)([0-9]+) ]] ; then
+	inherit subversion
+	SRC_URI=""
+	MTSLPT_REV=${BASH_REMATCH[2]}
+	ESVN_REPO_URI="svn://svn.cacti.net/var/svnroot/cacti/spine/branches/0.8.7/@${MTSLPT_REV}"
+else
+	MY_PV=${PV/_p/-}
+	SRC_URI="http://www.cacti.net/downloads/spine/${PN}-${MY_PV}.tar.gz"
+fi
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="net-analyzer/net-snmp
+	dev-libs/openssl
+	virtual/mysql"
+RDEPEND="${DEPEND}
+	>net-analyzer/cacti-0.8.7"
+
+src_unpack() {
+	if [[ "${SRC_URI}" == "" ]] ; then
+		subversion_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	rm configure # configure is not executable, autoconf recreates it...
+	eautoreconf
+}
+
+src_install() {
+	dosbin spine || die
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf.dist spine.conf || die
+	dodoc ChangeLog README || die
+}
+
+pkg_postinst() {
+	ewarn "NOTE: If you upgraded from cactid, do not forgive to setup spine"
+	ewarn "instead of cactid through web interface."
+	ewarn
+	elog "Please see the cacti's site for installation instructions:"
+	elog
+	elog "http://cacti.net/spine_install.php"
+	echo
+	ewarn "/etc/spine.conf should be readable by webserver, thus after you"
+	ewarn "decide on webserver do not forget to run the following command:"
+	ewarn
+	ewarn " # chown root:wwwgroup /etc/spine.conf"
+	echo
+}
diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml
new file mode 100644
index 0000000..1714524
--- /dev/null
+++ b/net-analyzer/cacti-spine/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
+	<longdescription lang="en">
+		Spine (formerly known as Cactid) is a poller for Cacti that primarily
+		strives to be as fast as possible. For this reason it is written in
+		native C, makes use of POSIX threads, and is linked directly against the
+		net-snmp library for minmumal SNMP polling overhead. Spine is a
+		replacement for the default cmd.php poller so you must decide if using
+		Spine makes sense for your installation.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
new file mode 100644
index 0000000..1205d03
--- /dev/null
+++ b/net-analyzer/cacti/ChangeLog
@@ -0,0 +1,635 @@
+# 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.148 2008/11/13 02:40:55 ranger Exp $
+
+  13 Nov 2008; Brent Baude <ranger@gentoo.org> cacti-0.8.7b-r3.ebuild:
+  stable ppc64, bug 244956
+
+  01 Nov 2008; nixnut <nixnut@gentoo.org> cacti-0.8.7b-r3.ebuild:
+  Stable on ppc wrt bug 244956
+
+  01 Nov 2008; Jeremy Olexa <darkside@gentoo.org> cacti-0.8.7b-r3.ebuild:
+  amd64 stable, bug 244956
+
+  31 Oct 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7b-r3.ebuild:
+  alpha/x86 stable wrt #244956
+
+  30 Oct 2008; Ferris McCormick <fmccor@gentoo.org> cacti-0.8.7b-r3.ebuild:
+  Sparc stable, Bug #244956.
+
+  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)
+
+  19 Aug 2008; Peter Volkov <pva@gentoo.org> -cacti-0.8.7b.ebuild,
+  -cacti-0.8.7b-r1.ebuild, +cacti-0.8.7b-r3.ebuild:
+  Added reset_each_patch upstream patch. Removed unused.
+
+  04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
+  Describe local USE flags for GLEP 56.
+
+  27 Apr 2008; Markus Meier <maekke@gentoo.org> cacti-0.8.7b-r2.ebuild:
+  amd64 stable, bug #214862
+
+  12 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  cacti-0.8.7b-r2.ebuild:
+  ppc stable, bug #214862
+
+  27 Mar 2008; Markus Rothe <corsair@gentoo.org> ChangeLog:
+  Stable on ppc64; bug #214862
+
+  27 Mar 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7b-r2.ebuild:
+  alpha/sparc/x86 stable wrt #214862
+
+  26 Mar 2008; Markus Rothe <corsair@gentoo.org> cacti-0.8.7b-r2.ebuild:
+  Stable on ppc64; bug #214862
+
+*cacti-0.8.7b-r2 (07 Mar 2008)
+
+  07 Mar 2008; <pva@gentoo.org> +cacti-0.8.7b-r2.ebuild:
+  Another patch from upstream, finally it applies correctly.
+
+*cacti-0.8.7b-r1 (03 Mar 2008)
+
+  03 Mar 2008; <pva@gentoo.org> -cacti-0.8.6j-r7.ebuild,
+  -cacti-0.8.7a-r2.ebuild, +cacti-0.8.7b-r1.ebuild:
+  Added official upstream patch. Cleaned out php4 stuff. Removed bundled-adodb
+  USE flag, thank Donnie Berkholz for kind review. Removed old and unused
+  ebuilds.
+
+  26 Feb 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7b.ebuild:
+  alpha/sparc stable wrt #210840
+
+  25 Feb 2008; Steve Dibb <beandog@gentoo.org> cacti-0.8.6j-r8.ebuild:
+  amd64 stable, security bug 209918
+
+  25 Feb 2008; Steve Dibb <beandog@gentoo.org> cacti-0.8.7b.ebuild:
+  amd64 stable, security bug 209918
+
+  24 Feb 2008; Markus Meier <maekke@gentoo.org> cacti-0.8.7b.ebuild:
+  x86 stable, bug #210840
+
+  22 Feb 2008; Brent Baude <ranger@gentoo.org> cacti-0.8.7b.ebuild:
+  Marking cacti-0.8.7b ppc64 for bug 210840
+
+  21 Feb 2008; nixnut <nixnut@gentoo.org> cacti-0.8.7b.ebuild:
+  Stable on ppc wrt bug 210840
+
+  19 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  cacti-0.8.6j-r8.ebuild:
+  ppc stable, bug #209918
+
+  15 Feb 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.6j-r8.ebuild:
+  alpha/sparc stable wrt security #209918
+
+  14 Feb 2008; Brent Baude <ranger@gentoo.org> cacti-0.8.6j-r8.ebuild:
+  Marking cacti-0.8.6j-r8 ppc64 for bug 209918
+
+  14 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  cacti-0.8.6j-r8.ebuild:
+  stable x86, security bug 209918
+
+*cacti-0.8.7b (13 Feb 2008)
+*cacti-0.8.7a-r2 (13 Feb 2008)
+*cacti-0.8.6j-r8 (13 Feb 2008)
+
+  13 Feb 2008; <pva@gentoo.org> files/postinstall-en.txt, metadata.xml,
+  +cacti-0.8.6j-r8.ebuild, -cacti-0.8.7a.ebuild, -cacti-0.8.7a-r1.ebuild,
+  +cacti-0.8.7a-r2.ebuild, +cacti-0.8.7b.ebuild:
+  Version bump. Cleaned a bit postinstall. Security fixes for bug 209918.
+  Thank you Pierre-Yves Rofes <py AT gentoo.org> for report! Cleaned unstable
+  vulnerable versions.
+
+  05 Feb 2008; Markus Rothe <corsair@gentoo.org> cacti-0.8.7a.ebuild:
+  Stable on ppc64
+
+  22 Jan 2008; Brent Baude <ranger@gentoo.org> cacti-0.8.6j-r7.ebuild:
+  Marking cacti-0.8.6j-r7 ppc to make a happy tree
+
+*cacti-0.8.7a-r1 (22 Jan 2008)
+
+  22 Jan 2008; <pva@gentoo.org> -cacti-0.8.6j-r6.ebuild,
+  -cacti-0.8.7-r1.ebuild, +cacti-0.8.7a-r1.ebuild:
+  Added upstream fixes. Removed unused ebuilds.
+
+  21 Jan 2008; Jeroen Roovers <jer@gentoo.org> cacti-0.8.7a.ebuild:
+  Stable for HPPA (bug #206921).
+
+  23 Nov 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r7.ebuild:
+  Stable on ppc64; bug #199509
+
+  22 Nov 2007; Raúl Porcel <armin76@gentoo.org> cacti-0.8.6j-r7.ebuild:
+  alpha/sparc stable wrt security #199509
+
+  22 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
+  cacti-0.8.6j-r7.ebuild:
+  stable x86, security bug 199509
+
+  21 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  cacti-0.8.6j-r7.ebuild:
+  Stable on amd64 wrt bug #199509.
+
+*cacti-0.8.7a (18 Nov 2007)
+*cacti-0.8.6j-r7 (18 Nov 2007)
+
+  18 Nov 2007; <pva@gentoo.org> +cacti-0.8.6j-r7.ebuild,
+  -cacti-0.8.7.ebuild, +cacti-0.8.7a.ebuild:
+  New release 0.8.7a and new patch 0.8.6j-r7. Fixes possible Possible SQL
+  injection issue was resolved, bug #199509.
+
+*cacti-0.8.7-r1 (03 Nov 2007)
+
+  03 Nov 2007; <pva@gentoo.org> cacti-0.8.6j-r6.ebuild,
+  +cacti-0.8.7-r1.ebuild:
+  Added patches from upstream, fix bug #194166, small changes in 0.8.6j-r6 to
+  shut up repoman.
+
+*cacti-0.8.7 (29 Oct 2007)
+
+  29 Oct 2007; Markus Ullmann <jokey@gentoo.org> metadata.xml,
+  +cacti-0.8.7.ebuild:
+  Version bump with a bunch of fixes, check upstream changelog for details
+
+  19 Jul 2007; Christoph Mende <angelos@gentoo.org> cacti-0.8.6j-r6.ebuild:
+  Stable on amd64 wrt bug #172378
+
+  03 Jul 2007; <pva@gentoo.org> -cacti-0.8.6i-r1.ebuild,
+  -cacti-0.8.6j-r4.ebuild, -cacti-0.8.6j-r5.ebuild, cacti-0.8.6j-r6.ebuild:
+  Added pcre and session php checks. Fixed bug #184057. Removed vulnerable to
+  bug #181112 versions.
+
+  09 Jun 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r6.ebuild:
+  Stable on ppc64; bug #181112
+
+  09 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  cacti-0.8.6j-r6.ebuild:
+  ppc stable, bug #181112
+
+  08 Jun 2007; Raúl Porcel <armin76@gentoo.org> cacti-0.8.6j-r6.ebuild:
+  alpha stable wrt security #181112
+
+  08 Jun 2007; <pva@gentoo.org> cacti-0.8.6j-r6.ebuild:
+  Call require_php_with_use only once. Thank armin76 for the fix.
+
+  07 Jun 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r5.ebuild:
+  Stable on ppc64; bug #181112
+
+  07 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  cacti-0.8.6j-r6.ebuild:
+  Stable on sparc wrt #181112
+
+  07 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
+  cacti-0.8.6j-r6.ebuild:
+  stable x86, security bug 181112
+
+*cacti-0.8.6j-r6 (07 Jun 2007)
+
+  07 Jun 2007; <pva@gentoo.org> +cacti-0.8.6j-r6.ebuild:
+  New patch from upstream: snmpwalk_fix.
+
+  06 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  cacti-0.8.6j-r5.ebuild:
+  Stable on sparc wrt security #181112
+
+*cacti-0.8.6j-r5 (06 Jun 2007)
+
+  06 Jun 2007; Raphael Marichez <falco@gentoo.org>
+  +files/cacti-0.8.6j-dos-large-values.patch, +cacti-0.8.6j-r5.ebuild:
+  Version bump, security bug 181112
+
+  02 Jun 2007; Lars Weiler <pylon@gentoo.org> cacti-0.8.6j-r4.ebuild:
+  Stable on ppc; bug #174551.
+
+  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:
+  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
+  too. No need in snmp support in php.
+
+  12 May 2007; <pva@gentoo.org> cacti-0.8.6j-r4.ebuild:
+  php should be compiled with snmp for cacti.
+
+  19 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  cacti-0.8.6j-r4.ebuild:
+  Stable on sparc wrt #174551
+
+  16 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  cacti-0.8.6j-r4.ebuild:
+  stable x86, bug 174551
+
+  15 Apr 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r4.ebuild:
+  Stable on ppc64; bug #174551
+
+*cacti-0.8.6j-r4 (27 Mar 2007)
+
+  27 Mar 2007; <pva@gentoo.org> -cacti-0.8.6j-r2.ebuild,
+  -cacti-0.8.6j-r3.ebuild, +cacti-0.8.6j-r4.ebuild:
+  Patch from upstream (Graph Debug Apache Lockup Issue).
+
+  10 Mar 2007; Matti Bickel <mabi@gentoo.org> cacti-0.8.6i-r1.ebuild:
+  ppc stable (bug #155147)
+
+*cacti-0.8.6j-r3 (27 Feb 2007)
+
+  27 Feb 2007; <pva@gentoo.org> +cacti-0.8.6j-r3.ebuild:
+  Use external adodb instead of bundled with package if bundeled-adodb USE
+  flag is off. Thank Francisco Javier <ffelix AT sshinf.com> for report.
+
+*cacti-0.8.6j-r2 (26 Feb 2007)
+
+  26 Feb 2007; <pva@gentoo.org> -cacti-0.8.6j-r1.ebuild,
+  +cacti-0.8.6j-r2.ebuild:
+  Another patch from UPSTREAM.
+
+*cacti-0.8.6j-r1 (28 Jan 2007)
+
+  28 Jan 2007; <pva@gentoo.org> -cacti-0.8.6j.ebuild,
+  +cacti-0.8.6j-r1.ebuild:
+  Upstream released ping_php_version4_snmpgetnext and
+  tree_console_missing_hosts patches. Thank Hans Rakers <hans AT parse.nl> for
+  report about ping problem in bug #159278.
+
+  26 Jan 2007; <pva@gentoo.org> -cacti-0.8.6h_p20060108-r2.ebuild,
+  -cacti-0.8.6i.ebuild:
+  Cleaning out vulnerable (see bug #159278) versions.
+
+*cacti-0.8.6j (21 Jan 2007)
+
+  21 Jan 2007; <pva@gentoo.org> +cacti-0.8.6j.ebuild:
+  Version bump reported by Hans Rakers <hans AT parse.nl> in bug #159278.
+
+  16 Jan 2007; Jason Wever <weeve@gentoo.org> cacti-0.8.6i-r1.ebuild:
+  Stable on SPARC wrt security bug #159278.
+
+  14 Jan 2007; Jose Luis Rivero <yoswink@gentoo.org> cacti-0.8.6i-r1.ebuild:
+  Stable on alpha wrt security bug #159278
+
+  14 Jan 2007; Andrej Kacian <ticho@gentoo.org> cacti-0.8.6i-r1.ebuild:
+  Stable on x86, security bug #159278.
+
+  13 Jan 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6i-r1.ebuild:
+  Stable on ppc64; bug #159278
+
+*cacti-0.8.6i-r1 (07 Jan 2007)
+
+  07 Jan 2007; Peter Volkov <pva@gentoo.org> +cacti-0.8.6i-r1.ebuild:
+  Include patches released by upstream. Should close vulnerabilities reported
+  in bug #159278.
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
+  cacti-0.8.6h_p20060108-r2.ebuild, cacti-0.8.6i.ebuild:
+  dev-db/mysql => virtual/mysql
+
+  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)
+
+  14 Oct 2006; Lance Albertson <ramereth@gentoo.org> +cacti-0.8.6i.ebuild:
+  * Version bump
+  * Fix misc issues in bug #132038
+  * Fixed patching code to be more scalable
+
+  01 Jun 2006; Markus Ullmann <jokey@gentoo.org> files/postinstall-en.txt:
+  Adjusting postinstall instructions wrt bug #135082
+
+  29 May 2006; Daniel Black <dragonheart@gentoo.org> -cacti-0.8.6g.ebuild,
+  -cacti-0.8.6g_p20051023.ebuild, -cacti-0.8.6h.ebuild,
+  -cacti-0.8.6h_p20060108.ebuild, -cacti-0.8.6h_p20060108-r1.ebuild:
+  punt security vulnerable versions
+
+  23 May 2006; Markus Rothe <corsair@gentoo.org>
+  cacti-0.8.6h_p20060108-r2.ebuild:
+  Stable on ppc64
+
+  12 May 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  cacti-0.8.6h_p20060108-r2.ebuild:
+  ppc64 needs www-servers/lighttpd first before being marked stable
+
+  07 May 2006; Markus Rothe <corsair@gentoo.org>
+  cacti-0.8.6h_p20060108-r2.ebuild:
+  Stable on ppc64
+
+  27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-cacti-0.8.6g,
+  files/digest-cacti-0.8.6g_p20051023, files/digest-cacti-0.8.6h,
+  files/digest-cacti-0.8.6h_p20060108,
+  files/digest-cacti-0.8.6h_p20060108-r1,
+  files/digest-cacti-0.8.6h_p20060108-r2, Manifest:
+  Fixing SHA256 digest, pass four
+
+  13 Apr 2006; Jason Wever <weeve@gentoo.org>
+  cacti-0.8.6h_p20060108-r2.ebuild:
+  Stable on SPARC wrt security bug #129284.
+
+  11 Apr 2006; Jose Luis Rivero <yoswink@gentoo.org>
+  cacti-0.8.6h_p20060108-r2.ebuild:
+  Stable on alpha wrt bug #129284
+
+  11 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  cacti-0.8.6h_p20060108-r2.ebuild:
+  Stable on x86 wrt bug #129284.
+
+*cacti-0.8.6h_p20060108-r2 (11 Apr 2006)
+
+  11 Apr 2006; Lance Albertson <ramereth@gentoo.org>
+  +cacti-0.8.6h_p20060108-r2.ebuild:
+  * Rev bump to fix security bug #129284
+
+*cacti-0.8.6h_p20060108-r1 (03 Apr 2006)
+
+  03 Apr 2006; Lance Albertson <ramereth@gentoo.org>
+  +cacti-0.8.6h_p20060108-r1.ebuild:
+  * Fixed log/cacti.log to be server owned per bug #126142
+
+  12 Mar 2006; Lance Albertson <ramereth@gentoo.org>
+  files/postinstall-en.txt, cacti-0.8.6h.ebuild,
+  cacti-0.8.6h_p20060108.ebuild:
+  * Stable on x86
+  * Fixed the rra/ dir to be server owned
+  * Added additional step to postinst doc
+
+*cacti-0.8.6h_p20060108 (16 Jan 2006)
+
+  16 Jan 2006; Lance Albertson <ramereth@gentoo.org>
+  +cacti-0.8.6h_p20060108.ebuild:
+  * Version bump (new patched version)
+
+  16 Jan 2006; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6h.ebuild:
+  * Corrected ebuild to use httpd-like virtual
+
+*cacti-0.8.6h (04 Jan 2006)
+
+  04 Jan 2006; Lance Albertson <ramereth@gentoo.org>
+  -cacti-0.8.6f-r1.ebuild, -cacti-0.8.6f-r2.ebuild,
+  cacti-0.8.6g_p20051023.ebuild, +cacti-0.8.6h.ebuild:
+  * Version bump
+  * Stable on x86
+  * Clean out old ebuilds
+
+  19 Dec 2005; Bryan Østergaard <kloeri@gentoo.org cacti-0.8.6g.ebuild:
+  Stable on alpha.
+
+  17 Dec 2005; Markus Rothe <corsair@gentoo.org>
+  cacti-0.8.6g_p20051023.ebuild:
+  Added ~ppc64
+
+  18 Nov 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6f.ebuild,
+  cacti-0.8.6f-r1.ebuild, cacti-0.8.6g.ebuild,
+  cacti-0.8.6g_p20051023.ebuild:
+  * Removed old ebuild
+  * Added >=dev-db/mysql-5 blocker (bug #112010)
+  * Adjusted httpd dep (now have a choice between apache1, apache2, or
+    lighttpd (only on 0.8.6g_p20051023)) bug #107512
+
+  24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> cacti-0.8.6g.ebuild:
+  Stable on sparc
+
+*cacti-0.8.6g_p20051023 (23 Oct 2005)
+
+  23 Oct 2005; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6g.ebuild,
+  +cacti-0.8.6g_p20051023.ebuild:
+  * Stable on x86
+  * Added new patched version for fixes
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> cacti-0.8.6f-r1.ebuild:
+  Mark 0.8.6f-r1 stable on alpha
+
+*cacti-0.8.6g (10 Sep 2005)
+
+  10 Sep 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6e.ebuild,
+  +cacti-0.8.6g.ebuild:
+  * New version release bump
+  * Remove old version
+
+*cacti-0.8.6f-r2 (09 Sep 2005)
+
+  09 Sep 2005; Lance Albertson <ramereth@gentoo.org>
+  +cacti-0.8.6f-r2.ebuild:
+  * Fixed php DEPEND to use virtuals per bug #102827
+
+  03 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  cacti-0.8.6f-r1.ebuild:
+  Stable on sparc
+
+*cacti-0.8.6f-r1 (03 Aug 2005)
+
+  03 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +cacti-0.8.6f-r1.ebuild:
+  Revision bump with upstream patches.
+
+  03 Jul 2005; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6f.ebuild:
+  * stable on x86 (bug #97475)
+
+  02 Jul 2005; Jason Wever <weeve@gentoo.org> cacti-0.8.6f.ebuild:
+  Stable on SPARC wrt bug #97475.
+
+*cacti-0.8.6f (02 Jul 2005)
+
+  02 Jul 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6b.ebuild,
+  -cacti-0.8.6c.ebuild, -cacti-0.8.6d.ebuild, +cacti-0.8.6f.ebuild:
+  * Added 0.8.6f for a security bump (bug #97475)
+  * Cleaned out old ebuilds
+
+  30 Jun 2005; Lance Albertson <ramereth@gentoo.org>
+  files/digest-cacti-0.8.6e, Manifest:
+  fixed digest and uploaded correct tarball for 0.8.6e
+
+  21 Jun 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
+  cacti-0.8.6e.ebuild:
+  Security Bump per bug #96243
+  (SQL injection / global php var security issues)
+  * x86 & sparc marked stable
+  * alpha, amd64, ppc marked testing
+  * Updated metadata
+
+  17 Jun 2005; Lance Albertson <ramereth@gentoo.org>
+  files/digest-cacti-0.8.6e, Manifest:
+  Updated digest for new tarball from author
+
+*cacti-0.8.6e (15 Jun 2005)
+
+  15 Jun 2005; <solar@gentoo.org> +cacti-0.8.6e.ebuild:
+  - added cacti-0.8.6e masked by request.
+
+  02 May 2005; Eldad Zack <eldad@gentoo.org> files/postinstall-en.txt,
+  cacti-0.8.6b.ebuild, cacti-0.8.6c.ebuild, cacti-0.8.6d.ebuild:
+  Fixed to use the webapp_configfile function for include/config.php. Updated
+  postinstall accordingly. Closes bug #90908. Thanks to Andy Blyler
+  <ajb@blyler.cc>.
+
+*cacti-0.8.6d (29 Apr 2005)
+
+  29 Apr 2005; Martin Holzer <mholzer@gentoo.org> +cacti-0.8.6d.ebuild:
+  Version bumped.
+
+  15 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinstall-en.txt:
+  More updates to postinst-en.txt for bug 83673. Thanks to Jakub Moc for
+  helping me get the upgrade instructions up-to-date (and correct).
+
+  09 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinstall-en.txt,
+  cacti-0.8.6b.ebuild, cacti-0.8.6c.ebuild:
+  Update postinst-en.txt for bug 83673; updated both ebuilds to use
+  built_with_use instead of the homegrown check_with_use() function. Also
+  fixed the dodir ${D}... tidbit which caused obvious unwanted side effects.
+
+  04 Mar 2005; Jason Wever <weeve@gentoo.org> cacti-0.8.6c.ebuild:
+  Stable on sparc.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> cacti-0.8.6c.ebuild:
+  Marked stable on x86.
+
+*cacti-0.8.6c (02 Jan 2005)
+
+  02 Jan 2005; Martin Holzer <mholzer@gentoo.org> files/postinstall-en.txt,
+  +cacti-0.8.6c.ebuild:
+  Version bumped.
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.6b.ebuild:
+  Stable on sparc.
+
+  06 Nov 2004; Eldad Zack <eldad@gentoo.org> -cacti-0.8.5a-r1.ebuild,
+  cacti-0.8.6b.ebuild:
+  x86 stable
+
+  25 Oct 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.5a-r2.ebuild:
+  Stable on sparc.
+
+  24 Oct 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a-r2.ebuild:
+  Marked x86 stable
+
+  14 Oct 2004; Eldad Zack <eldad@gentoo.org> +files/postinstall-en.txt,
+  cacti-0.8.6b.ebuild:
+  Better postinst instructions: using webapp.eclass postinst support
+
+*cacti-0.8.6b (14 Oct 2004)
+
+  14 Oct 2004; Eldad Zack <eldad@gentoo.org> +cacti-0.8.6b.ebuild:
+  Version bump. Updated deps (cron, php). Check useflags of php/mod_php. Got rid
+  of version detection, and corrrected a few postinst instructions.
+
+*cacti-0.8.5a-r2 (23 Aug 2004)
+
+  23 Aug 2004; Eldad Zack <eldad@gentoo.org> +cacti-0.8.5a-r2.ebuild:
+  Migrated ebuild from webapp-apache.eclass to use the webapp.eclass.
+  Closes bug #52596.
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a-r1.ebuild:
+  Moved include/config.php to include/config-sample.php, so we won't overwrite
+  old config.
+
+*cacti-0.8.5a-r1 (17 Aug 2004)
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org>
+  +files/cacti-0.8.5a-sql-injection.patch, +cacti-0.8.5a-r1.ebuild:
+  Security patch (SQL Injection): bumping to -r1 with x86 stable.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> cacti-0.8.5a.ebuild:
+  Typo in DESCRIPTION: frondend -> frontend. Bug 59717.
+
+  07 Jul 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.5a.ebuild:
+  Stable on sparc.
+
+  05 Jul 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a.ebuild:
+  Added additional install instructions (crontab). Closes #53709. Thanks to
+  Lorinc Czegledi <lorinc.czegledi@mail.cpst.hu>. Also fixed previous version
+  detection.
+
+  08 May 2004; Danny van Dyk <kugelfang@gentoo.org> cacti-0.8.5a.ebuild:
+  Marked ~amd64.
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5a.ebuild:
+  x86 stable.
+
+*cacti-0.8.5a (10 Apr 2004)
+
+  10 Apr 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5a.ebuild:
+  Version bumped.
+
+*cacti-0.8.5 (29 Feb 2004)
+
+  29 Feb 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5.ebuild:
+  Version bumped. Closes 43137.
+
+  15 Dec 2003; Stuart Herbert <stuart@gentoo.org> cacti-0.8.3a.ebuild,
+  cacti-0.8.4.ebuild:
+  Fix for bug #32636
+
+  05 Dec 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.4.ebuild:
+  x86 stable.
+
+  05 Dec 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild,
+  cacti-0.8.3a.ebuild, cacti-0.8.4.ebuild:
+  changing chown. closes #35127.
+
+*cacti-0.8.4 (17 Nov 2003)
+
+  17 Nov 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild,
+  cacti-0.8.4.ebuild:
+  Version bumped.
+
+  17 Nov 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild:
+  adding webapps-apache.eclass
+
+  23 Sep 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild,
+  cacti-0.8.3.ebuild, cacti-0.8.3a.ebuild:
+  Changed mysql depend to useflag. Closes #29429.
+
+*cacti-0.8.3a (01 Sep 2003)
+
+  01 Sep 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild:
+  Version bumpe.d
+
+*cacti-0.8.3 (31 Aug 2003)
+
+  31 Aug 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3.ebuild:
+  Version bumped.
+
+*cacti-0.8.2a (30 Jul 2003)
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.2a.ebuild:
+  Version bumped.
+
+*cacti-0.8.1-r1 (30 Jul 2003)
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.1-r1.ebuild:
+  Source is no more installed. Closes #23393.
+
+*cacti-0.8.1 (12 Jun 2003)
+
+  12 Jun 2003; Troy Dack <tad@gentoo.org> cacti-0.8.1.ebuild:
+  Version Bump. Now works with net-snmp (default for virtual/snmp) and ucd-snmp.
+  Updated postinst einfo message.
+
+  13 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Permissions fix, variable fix, dos format fix (#20686)
+
+*cacti-0.6.8a (23 Oct 2002)
+
+  13 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Permissions fix, variable fix, dos format fix (#20686)
+
+  13 May 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild:
+  Added net-analyzer/rrdtool to RDEPEND. Closes #20953
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  05 Apr 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild:
+  Digest fix, marked as stable
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Initial import. Ebuild submitted by me.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
new file mode 100644
index 0000000..7569670
--- /dev/null
+++ b/net-analyzer/cacti/Manifest
@@ -0,0 +1,6 @@
+AUX cacti-0.8.6j-dos-large-values.patch 1127 RMD160 102be3fdad2334c50a5d8ce4a4655c0220842d82 SHA1 79fab202a7473c66b10909a982c2f9fcf70c9b50 SHA256 b677a380634a4db63b0b85aaf54103efefdbb0e0dcd7d15ce61b7e08949f8d55
+AUX postinstall-en.txt 2249 RMD160 2703588d7971022699b58b2e5a113ab970124f4d SHA1 8c34cadfe75d1bca0eaaae66a5981f0ab575ea3f SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d
+DIST cacti-0.8.7d.tar.gz 2221142 RMD160 e9a3056bdfc1ea28a174b0d55c3f148c055bf2ba SHA1 772193f0b2491feedd950aeb52bd43472fd56645 SHA256 a8ae8b9e50658b4e46b9f60c1373e4cc3f4cc9d72266ce09540e14d71ee57e8e
+EBUILD cacti-0.8.7d.ebuild 1845 RMD160 8a1691b2ac8614a6d1af35b450847a5a264805c3 SHA1 8f3a22c3b65d5b0f261227dd4a3a0f7b26792d3a SHA256 a7e6cc905ac1092048e25efdc4cfb553a0e76d1448e96b0e75f3d01ceab8e0b3
+MISC ChangeLog 21487 RMD160 9feebabdca7d58e457f0cc795b56bceab79407af SHA1 52da179052d1501c6b6135b5f43c7f7920fa95f2 SHA256 c8dfa233e6677858184b0e44ede656a02fa6af9f8be04d23b2dff000c349cc5e
+MISC metadata.xml 916 RMD160 04f9ef45ccd484deda4a6333cf8d57b61c1be217 SHA1 cad0945f6d5d5427cfaae181b4c860576d7887b9 SHA256 a6e338947e55cbf427aeb35322f37c5af2e900ef4def9576da82789d804c4a0c
diff --git a/net-analyzer/cacti/cacti-0.8.7d.ebuild b/net-analyzer/cacti/cacti-0.8.7d.ebuild
new file mode 100644
index 0000000..1250002
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.7d.ebuild
@@ -0,0 +1,80 @@
+# 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.7 2008/11/13 02:40:55 ranger Exp $
+
+inherit eutils webapp depend.php
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+HAS_PATCHES=0
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+# patches
+if [ "${HAS_PATCHES}" == "1" ] ; then
+	UPSTREAM_PATCHES=""
+	for i in ${UPSTREAM_PATCHES} ; do
+		SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch"
+	done
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+DEPEND=""
+
+need_php_cli
+need_httpd_cgi
+need_php_httpd
+
+RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 )
+	net-analyzer/rrdtool
+	dev-php/adodb
+	virtual/mysql
+	virtual/cron"
+
+src_unpack() {
+	if [ "${HAS_PATCHES}" == "1" ] ; then
+		unpack ${MY_P}.tar.gz
+		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
+		# patches
+		for i in ${UPSTREAM_PATCHES} ; do
+			EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch
+		done ;
+	else
+		unpack ${MY_P}.tar.gz
+	fi
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	require_php_with_use cli mysql xml session pcre sockets
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README
+	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE,text/manual.txt}
+	use doc && dohtml -r docs/html/
+	rm -rf docs
+	rm -rf lib/adodb
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/cacti/files/cacti-0.8.6j-dos-large-values.patch b/net-analyzer/cacti/files/cacti-0.8.6j-dos-large-values.patch
new file mode 100644
index 0000000..7398e96
--- /dev/null
+++ b/net-analyzer/cacti/files/cacti-0.8.6j-dos-large-values.patch
@@ -0,0 +1,30 @@
+diff -uNr -r cacti-0.8.6j-orig/graph_image.php cacti-0.8.6j/graph_image.php
+--- cacti-0.8.6j-orig/graph_image.php	2007-01-18 01:23:10.000000000 +0100
++++ cacti-0.8.6j/graph_image.php	2007-06-06 21:00:17.278210000 +0200
+@@ -51,22 +51,22 @@
+ $graph_data_array = array();
+ 
+ /* override: graph start time (unix time) */
+-if (!empty($_GET["graph_start"])) {
++if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
+ 	$graph_data_array["graph_start"] = $_GET["graph_start"];
+ }
+ 
+ /* override: graph end time (unix time) */
+-if (!empty($_GET["graph_end"])) {
++if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
+ 	$graph_data_array["graph_end"] = $_GET["graph_end"];
+ }
+ 
+ /* override: graph height (in pixels) */
+-if (!empty($_GET["graph_height"])) {
++if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
+ 	$graph_data_array["graph_height"] = $_GET["graph_height"];
+ }
+ 
+ /* override: graph width (in pixels) */
+-if (!empty($_GET["graph_width"])) {
++if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
+ 	$graph_data_array["graph_width"] = $_GET["graph_width"];
+ }
+ 
diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt
new file mode 100644
index 0000000..732c718
--- /dev/null
+++ b/net-analyzer/cacti/files/postinstall-en.txt
@@ -0,0 +1,62 @@
+
+New Install
+
+1. Create the new cacti database
+   shell> mysqladmin -p --user=root create cacti
+2. Import the default cacti database:
+   shell> mysql -p --user=root cacti < ${MY_INSTALLDIR}/cacti.sql
+3. Create a MySQL username and password for cacti.
+   shell> mysql -p --user=root mysql
+   mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
+   mysql> flush privileges;
+4. Edit ${MY_INSTALLDIR}/include/config.php and modify the MySQL user,
+   password and database for your cacti configuration.
+
+   Example:
+	\$database_default = "cacti";
+	\$database_hostname = "localhost";
+	\$database_username = "cactiuser";
+	\$database_password = "somepassword";
+
+5. Point your web browser to:  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/
+   Make sure to fill in all of the path variables carefully and
+    correctly on the following screen.
+6. After you've gone through the setup wizard, go back to the main cacti page
+   and login as:
+	Username: admin
+	Password: admin
+
+Upgrading
+
+1. Backup DB in the case that something goes wrong.
+   shell> mysqldump -l --add-drop-table cacti > mysql.cacti
+2. Backup your rra/ directory and any custom scripts in your scripts/
+   directory.
+3. Edit ${MY_INSTALLDIR}/include/config.php, and confirm that the MySQL user,
+   password and database is correct for your cacti configuration.
+   
+   Example:
+        \$database_default = "cacti";
+        \$database_hostname = "localhost";
+        \$database_username = "cactiuser";
+        \$database_password = "somepassword";
+4. Point your web browser to: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/
+   Select "Upgrade".
+   Make sure to fill in all of the path variables carefully and
+   correctly on the following screen.
+
+Cronjob
+
+Either new or upgrading, make sure you have a cron job - Add this line to 
+your /etc/crontab file:
+
+   */5 * * * * ${VHOST_SERVER_GID} /usr/bin/php ${MY_INSTALLDIR}/poller.php > /dev/null 2>&1
+
+Note that you should use poller.php as the cronjob instead of cmd.php (as it was with 
+earlier versions) to enable you to switch between cmd.php and cactid.
+
+Also make sure that the user poller.php runs as ( ${VHOST_SERVER_GID} ) has
+permission to create new files in Cacti's 'rra/' directory which is
+${MY_INSTALLDIR}/rra
+
+
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
new file mode 100644
index 0000000..0aa7e5c
--- /dev/null
+++ b/net-analyzer/cacti/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cacti is a complete network graphing solution designed to harness the
+		power of RRDTool's data storage and graphing functionality. Cacti
+		provides a fast poller, advanced graph templating, multiple data
+		acquisition methods, and user management features out of the box. All of
+		this is wrapped in an intuitive, easy to use interface that makes sense
+		for LAN-sized installations up to complex networks with hundreds of
+		devices.
+	</longdescription>
+	<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>