x86 stable, pruned 0.8.5a-r1

5 files changed, 20 insertions, 145 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 465685f9d6f7..bf63c1a8aec6 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,10 @@
 # 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.34 2004/10/26 03:33:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.35 2004/11/06 13:42:15 eldad Exp $
+
+  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.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 95c8b9df3e99..e84c83130a9d 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,10 +1,18 @@
-MD5 bc251e53d106711ffa000d2d87d2f3b8 ChangeLog 4504
-MD5 759fc5dc4f65edbc8034298a120d1305 cacti-0.8.6b.ebuild 1571
-MD5 3c5429026810fd126265aac06c4cdd93 cacti-0.8.5a-r1.ebuild 4654
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dd75a8b1c05d2d0a701985cbcadd13e5 cacti-0.8.6b.ebuild 1570
+MD5 918de32b2168c8c19ed83a01d37dc701 ChangeLog 4611
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
 MD5 c242b82e37e039d3fa643923e27b45c9 cacti-0.8.5a-r2.ebuild 4216
+MD5 c6ef454f0968bc6e3bdc6819ac9bc5f8 files/postinstall-en.txt 2305
 MD5 5415dc0df13fd1528eb90acce7f44989 files/digest-cacti-0.8.6b 65
 MD5 9921205d0e13d5948104d5de2e58d3ee files/cacti-0.8.5a-sql-injection.patch 625
-MD5 44637d48edf68b76a472c70817449cd6 files/digest-cacti-0.8.5a-r1 64
 MD5 44637d48edf68b76a472c70817449cd6 files/digest-cacti-0.8.5a-r2 64
-MD5 c6ef454f0968bc6e3bdc6819ac9bc5f8 files/postinstall-en.txt 2305
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjNQIT+MN7JbqCpMRAkZ6AJ0ZNfSn+9nM9TQvvLOHK9/pyWtvhQCfYPSL
+utPGVtGhv9O2UcrGLge+V5k=
+=UtKV
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.5a-r1.ebuild b/net-analyzer/cacti/cacti-0.8.5a-r1.ebuild
deleted file mode 100644
index 02809b5c8fdc..000000000000
--- a/net-analyzer/cacti/cacti-0.8.5a-r1.ebuild
+++ /dev/null
@@ -1,136 +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-r1.ebuild,v 1.2 2004/08/17 14:36:48 eldad Exp $
-
-inherit eutils webapp-apache
-
-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"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha ~amd64"
-IUSE="snmp mysql"
-
-DEPEND=""
-RDEPEND="net-www/apache
-	snmp? ( virtual/snmp )
-	net-analyzer/rrdtool
-	mysql? ( dev-db/mysql )
-	dev-php/php
-	dev-php/mod_php"
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/cacti-0.8.5a-sql-injection.patch
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/${PN}
-	dodir ${destdir}
-
-	dohtml docs/{INSTALL,UPGRADE}.htm
-	dodoc docs/{CHANGELOG,CONTRIB}
-	dodoc LICENSE
-
-	#rm docs/{INSTALL,UPGRADE,INSTALL-WIN32}.htm
-	rm docs/{README,CHANGELOG,CONTRIB}
-	rm LICENSE README
-
-	#Don't overwrite old config
-	mv include/config.php include/config-sample.php
-
-	#mv docs/manual .
-	rm -rf docs
-	rm -rf cactid
-
-	edos2unix `find -type f -name '*.php'`
-	#chown -R ${HTTPD_USER}.${HTTPD_GROUP} *
-	cp -r . ${D}/${HTTPD_ROOT}/${PN}
-	cd ${D}/${HTTPD_ROOT}
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${PN}
-}
-
-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 "The cacti has been installed to ${HTTPD_ROOT}${PN}"
-		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 "The cacti has been copied to ${HTTPD_ROOT}${PN}"
-		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
-}
diff --git a/net-analyzer/cacti/cacti-0.8.6b.ebuild b/net-analyzer/cacti/cacti-0.8.6b.ebuild
index 4a181fb9ef3d..e163ba166db2 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
 # 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.2 2004/10/14 05:05:33 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6b.ebuild,v 1.3 2004/11/06 13:42:15 eldad Exp $
 
 inherit eutils webapp
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.cacti.net/"
 SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="snmp"
 
 DEPEND=""
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.5a-r1 b/net-analyzer/cacti/files/digest-cacti-0.8.5a-r1
deleted file mode 100644
index 7a5183477ccd..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.5a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b9ef4194664d65b86cdcc9a0f126609 cacti-0.8.5a.tar.gz 986785