Version bumped.

8 files changed, 94 insertions, 139 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 9ea42e1a8ca7..0d47be48cc66 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/cacti
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.36 2004/11/07 20:13:13 weeve Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.37 2005/01/02 22:48:11 mholzer Exp $
+
+*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.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index d1c58ddce6c3..49636a06788d 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,8 +1,10 @@
-MD5 1ce0758205dac66ea8e9b54a4844188b ChangeLog 4698
-MD5 a75bb53f21b0c22957cecf5e486ebc10 cacti-0.8.6b.ebuild 1569
+MD5 a75bb53f21b0c22957cecf5e486ebc10 cacti-0.8.6c.ebuild 1569
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
+MD5 1ce0758205dac66ea8e9b54a4844188b ChangeLog 4698
 MD5 c242b82e37e039d3fa643923e27b45c9 cacti-0.8.5a-r2.ebuild 4216
-MD5 5415dc0df13fd1528eb90acce7f44989 files/digest-cacti-0.8.6b 65
+MD5 a75bb53f21b0c22957cecf5e486ebc10 cacti-0.8.6b.ebuild 1569
+MD5 92214d64b7a546022d81ca37cb137262 files/digest-cacti-0.8.6c 65
 MD5 9921205d0e13d5948104d5de2e58d3ee files/cacti-0.8.5a-sql-injection.patch 625
 MD5 44637d48edf68b76a472c70817449cd6 files/digest-cacti-0.8.5a-r2 64
-MD5 c6ef454f0968bc6e3bdc6819ac9bc5f8 files/postinstall-en.txt 2305
+MD5 5415dc0df13fd1528eb90acce7f44989 files/digest-cacti-0.8.6b 65
+MD5 d7fa94819e0b14e84ee410d4afa7bb8f files/postinstall-en.txt 2359
diff --git a/net-analyzer/cacti/cacti-0.8.5a-r2.ebuild b/net-analyzer/cacti/cacti-0.8.5a-r2.ebuild
deleted file mode 100644
index 1d80a9164f77..000000000000
--- a/net-analyzer/cacti/cacti-0.8.5a-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.5a-r2.ebuild,v 1.3 2004/10/26 03:33:10 weeve Exp $
-
-inherit eutils webapp
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="http://www.raxnet.net/products/cacti/"
-SRC_URI="http://www.raxnet.net/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha ~amd64"
-IUSE="snmp mysql"
-
-DEPEND=""
-
-# TODO: RDEPEND Not just apache... but there's no virtual/webserver (yet)
-
-RDEPEND="net-www/apache
-	snmp? ( virtual/snmp )
-	net-analyzer/rrdtool
-	mysql? ( dev-db/mysql )
-	dev-php/php
-	dev-php/mod_php"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/cacti-0.8.5a-sql-injection.patch
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc LICENSE
-	rm LICENSE README
-
-	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
-	rm -rf docs
-	rm -rf cactid
-
-	#Don't overwrite old config
-	mv include/config.php include/config-sample.php
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${D}${MY_HTDOCSDIR}
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	# check to see if we have a previous version installed
-	ver_installed="$(ls -d /var/db/pkg/net-analyzer/cacti* | sed 's:.*cacti-::')"
-	if [[ ${ver_installed} != ${PV} ]]
-	then
-		einfo
-		einfo "Before cacti works you must upgrade the cacti database:"
-		einfo "1. Backup the old cacti database:"
-		einfo "  shell> mysqlhotcopy --suffix=_old cacti"
-		einfo "2. Drop the old cacti database:"
-		einfo "  shell> mysqladmin -p drop cacti"
-		einfo "3. Create the new cacti database"
-		einfo "  shell> mysqladmin --user=root create cacti"
-		einfo "4. Import the default cacti database:"
-		einfo "  shell> mysql cacti < ${HTTPD_ROOT}${PN}/cacti.sql"
-		einfo "5. Edit ${HTTPD_ROOT}${PN}/include/config.php."
-		einfo " + Modify the MySQL user, password and database for your"
-		einfo "   cacti configuration."
-		einfo "		\$database_default = \"cacti\";"
-		einfo "		\$database_hostname = \"localhost\";"
-		einfo "		\$database_username = \"cactiuser\";"
-		einfo "		\$database_password = \"cacti\";"
-		einfo "6. Add this line to your /etc/crontab file:"
-		einfo "   */5 * * * * ${HTTPD_USER} php ${HTTPD_ROOT}${PN}/cmd.php > /dev/null 2>&1"
-		einfo "7. Point your web browser to:  http://your-server/cacti/"
-		einfo " Select \"Upgrade\"."
-		einfo " Make sure to fill in all of the path variables carefully and"
-		einfo " correctly on the following screen."
-		einfo
-		einfo "FINALLY, you must have these settings in your php.ini:"
-		einfo " register_globals = On"
-		einfo " register_argc_argv = On"
-		einfo
-		einfo "Test your upgraded installation.  When all is fine you can"
-		einfo "drop the cacti_old database like so:"
-		einfo "  shell> mysqladmin -p drop cacti_old"
-		einfo
-	else
-		einfo
-		einfo "Before cacti works you must:"
-		einfo "1. Create the new cacti database"
-		einfo "  shell> mysqladmin --user=root create cacti"
-		einfo "2. Import the default cacti database:"
-		einfo "  shell> mysql cacti < ${HTTPD_ROOT}${PN}/cacti.sql"
-		einfo "3. Optional: Create a MySQL username and password for cacti."
-		einfo "  shell> mysql --user=root mysql"
-		einfo "  mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';"
-		einfo "  mysql> flush privileges;"
-		einfo "4. Copy ${HTTPD_ROOT}${PN}/include/config-sample.php to config.php."
-		einfo " + Modify the MySQL user, password and database for your"
-		einfo "   cacti configuration."
-		einfo "		\$database_default = \"cacti\";"
-		einfo "		\$database_hostname = \"localhost\";"
-		einfo "		\$database_username = \"cactiuser\";"
-		einfo "		\$database_password = \"cacti\";"
-		einfo "5. Add this line to your /etc/crontab file:"
-		einfo "   */5 * * * * ${HTTPD_USER} php ${HTTPD_ROOT}${PN}/cmd.php > /dev/null 2>&1"
-		einfo "6. Point your web browser to:  http://your-server/cacti/"
-		einfo " Make sure to fill in all of the path variables carefully and"
-		einfo " correctly on the following screen."
-		einfo
-		einfo "FINALLY, you must have these settings in your php.ini:"
-		einfo " register_globals = On"
-		einfo " register_argc_argv = On"
-		einfo
-	fi
-
-	webapp_pkg_postinst
-}
diff --git a/net-analyzer/cacti/cacti-0.8.6b.ebuild b/net-analyzer/cacti/cacti-0.8.6b.ebuild
index feabdfeb44e2..0df33c2e1616 100644
--- a/net-analyzer/cacti/cacti-0.8.6b.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.6b.ebuild,v 1.4 2004/11/07 20:13:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6b.ebuild,v 1.5 2005/01/02 22:48:11 mholzer Exp $
 
 inherit eutils webapp
 
diff --git a/net-analyzer/cacti/cacti-0.8.6c.ebuild b/net-analyzer/cacti/cacti-0.8.6c.ebuild
new file mode 100644
index 000000000000..1d95de4bfbda
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.6c.ebuild
@@ -0,0 +1,74 @@
+# 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.6c.ebuild,v 1.1 2005/01/02 22:48:11 mholzer Exp $
+
+inherit eutils webapp
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="snmp"
+
+DEPEND=""
+
+# TODO: RDEPEND Not just apache... but there's no virtual/webserver (yet)
+
+RDEPEND="net-www/apache
+	snmp? ( virtual/snmp )
+	net-analyzer/rrdtool
+	dev-db/mysql
+	virtual/cron
+	dev-php/php
+	dev-php/mod_php"
+
+check_useflag() {
+	local my_pkg=$(best_version ${1})
+	local my_flag=${2}
+
+	if [[ $(grep -wo ${my_flag} /var/db/pkg/${my_pkg}/USE) ]]
+	then
+		return 0
+	fi
+
+	eerror "${my_pkg} was compiled without ${my_flag}. Please re-emerge it with USE=${my_flag}"
+	die "check_useflag failed"
+
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# Check if php, mod_php was emerged with mysql useflag
+
+	check_useflag dev-php/php mysql
+	check_useflag dev-php/mod_php 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
+	#Don't overwrite old config
+	mv include/config.php include/config-sample.php
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${D}${MY_HTDOCSDIR}
+	cp -r . ${D}${MY_HTDOCSDIR}
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.5a-r2 b/net-analyzer/cacti/files/digest-cacti-0.8.5a-r2
deleted file mode 100644
index 7a5183477ccd..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.5a-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b9ef4194664d65b86cdcc9a0f126609 cacti-0.8.5a.tar.gz 986785
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6c b/net-analyzer/cacti/files/digest-cacti-0.8.6c
new file mode 100644
index 000000000000..a383b6b0200c
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6c
@@ -0,0 +1 @@
+MD5 f48b1cc12ebdf96358563760c812e227 cacti-0.8.6c.tar.gz 1038183
diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt
index 5e46d8af4fd0..fb40cc298b50 100644
--- a/net-analyzer/cacti/files/postinstall-en.txt
+++ b/net-analyzer/cacti/files/postinstall-en.txt
@@ -62,13 +62,8 @@ your /etc/crontab file:
 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.
 
-
-PHP
-
-FINALLY, you must have these settings in your php.ini:
-
-	register_globals = On
-	register_argc_argv = On
-
+Also make sure that the user poller.php runs ( ${VHOST_SERVER_GID} ) as has
+permission to create new files in Cacti's 'rra/' directory which is
+${MY_INSTALLDIR}/rrd