Revision bump with upstream patches.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 94 insertions, 4 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index dea821e8dbb2..f3da8bff4a78 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.50 2005/07/03 02:55:36 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.51 2005/08/03 00:42:44 robbat2 Exp $
+
+*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)
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 0222f94b072b..7084129b90ed 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,7 +1,9 @@
-MD5 af630c3845ecc12de30aa15501eea434 ChangeLog 7143
-MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
-MD5 7b9904b1e9182a6468bbcbf50ff16191 cacti-0.8.6e.ebuild 1335
+MD5 f2a1461c6ef9e156b30311050543f6e7 cacti-0.8.6f-r1.ebuild 1979
 MD5 55a8b1b00a00c05ecd18d44c3565dc42 cacti-0.8.6f.ebuild 1335
+MD5 7b9904b1e9182a6468bbcbf50ff16191 cacti-0.8.6e.ebuild 1335
+MD5 c05ced2b21c2ba0083037c22d3a85f70 ChangeLog 7294
+MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
 MD5 ce21d377ddb344aa5a4ebea091e369d8 files/digest-cacti-0.8.6e 65
 MD5 5a259a769627accb5e3de215ff0f93f5 files/digest-cacti-0.8.6f 65
+MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r1 874
diff --git a/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild b/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild
new file mode 100644
index 000000000000..45fa697b842e
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild,v 1.1 2005/08/03 00:42:44 robbat2 Exp $
+
+inherit eutils webapp
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+# patches as of end of July
+UPSTREAM_PATCHES="html_mouseover_title.patch multi_field_output_script_server.patch old_net_snmp_command_options.patch poller_invalid_data_sources.patch script_server_buffer_size.patch unix_syslog_compatibility.patch graph_view_preview_mode_filter.patch poller_reindex_cache_orphans.patch safari_zoom.patch ldap_copy_user_problem.patch script_server_file_header.patch"
+SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
+for i in $UPSTREAM_PATCHES ; do
+	SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV}/${i}"
+done
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+IUSE="snmp"
+
+DEPEND=""
+
+# TODO: RDEPEND Not just apache... but there's no virtual/webserver (yet)
+
+RDEPEND="net-www/apache
+	snmp? ( net-analyzer/net-snmp )
+	net-analyzer/rrdtool
+	dev-db/mysql
+	virtual/cron
+	dev-php/php
+	dev-php/mod_php"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	for i in ${UPSTREAM_PATCHES} ; do
+		EPATCH_OPTS="-p1 -d ${S} -N" epatch ${DISTDIR}/${i}
+	done ;
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	built_with_use dev-php/php mysql || \
+		die "dev-php/php must be compiled with USE=mysql"
+	built_with_use dev-php/mod_php mysql || \
+		die "dev-php/mod_php must be compiled with USE=mysql"
+}
+
+src_compile() {
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc LICENSE
+	rm LICENSE README
+
+	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
+	rm -rf docs
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . ${D}${MY_HTDOCSDIR}
+
+	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/digest-cacti-0.8.6f-r1 b/net-analyzer/cacti/files/digest-cacti-0.8.6f-r1
new file mode 100644
index 000000000000..6dc2c2df5183
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6f-r1
@@ -0,0 +1,12 @@
+MD5 032b8b22225f137e2a2294e89a2af2ec cacti-0.8.6f.tar.gz 1062562
+MD5 2354e383adff58725077e95ba8584dba html_mouseover_title.patch 2757
+MD5 c1b8c9d36ff5f4b11f27af8240b6ed42 multi_field_output_script_server.patch 2407
+MD5 75f7f8c59591663dd63f91830fcdb1f1 old_net_snmp_command_options.patch 1124
+MD5 5bdd1c9e4ef4479fafe73ce32e1f43b8 poller_invalid_data_sources.patch 4752
+MD5 5711e9d5f90397ac8f26c7af55d49d12 script_server_buffer_size.patch 1541
+MD5 55c1b16ebe40ea017db8d905de763ce8 unix_syslog_compatibility.patch 703
+MD5 88a34475132b77112910738a3139c01d graph_view_preview_mode_filter.patch 448
+MD5 2afd2acbd1e1b0bf4809996976620c0a poller_reindex_cache_orphans.patch 1054
+MD5 fc5579772103ed98557661866b632997 safari_zoom.patch 1274
+MD5 fe7d23776d828941fc56f72797903f3e ldap_copy_user_problem.patch 2213
+MD5 8598d1419ab589704a79986dd184756c script_server_file_header.patch 264