stable on x86, fixed server owned file, updated postinst doc

Package-Manager: portage-2.0.54

5 files changed, 21 insertions, 9 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index cbe6d68a4d10..6e4996ecfad9 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.63 2006/01/16 17:02:28 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.64 2006/03/12 03:24:31 ramereth Exp $
+
+  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)
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 39a8b2198713..a50e944711af 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,11 +1,11 @@
-MD5 cde39387800cbf8142a3f689aea0bb09 ChangeLog 9231
+MD5 02cedddb52686c4701385f192f4320a4 ChangeLog 9469
 MD5 8e19108be4619e53fa7e51c02e1dd872 cacti-0.8.6g.ebuild 1710
 MD5 e8e9790acabe6a42fda45cc8e72a93a3 cacti-0.8.6g_p20051023.ebuild 1859
-MD5 e0e4a72c16fd2c2e3357473c738d4ff5 cacti-0.8.6h.ebuild 1784
-MD5 179309b8648e495405e93d9b01239300 cacti-0.8.6h_p20060108.ebuild 1898
+MD5 9bbfa8d2e7512b33b3e88b61593c639d cacti-0.8.6h.ebuild 1783
+MD5 df24e22f75580fb07149910f3426bb09 cacti-0.8.6h_p20060108.ebuild 1937
 MD5 b9b37ff105d9d50fb2c9a7b0b2a60429 files/digest-cacti-0.8.6g 65
 MD5 80642855127d3174cad394f11f138243 files/digest-cacti-0.8.6g_p20051023 346
 MD5 ede2752b4bd41c56fbb8dd6085875f58 files/digest-cacti-0.8.6h 65
 MD5 0882b2c5bfd2ede2d9fd67eedbf625eb files/digest-cacti-0.8.6h_p20060108 383
-MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
+MD5 c016a8f3ca49916d8c3e61543ed5838b files/postinstall-en.txt 2191
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
diff --git a/net-analyzer/cacti/cacti-0.8.6h.ebuild b/net-analyzer/cacti/cacti-0.8.6h.ebuild
index 7a475c58b37d..46e9d62f50f3 100644
--- a/net-analyzer/cacti/cacti-0.8.6h.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6h.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6h.ebuild,v 1.2 2006/01/16 03:56:37 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6h.ebuild,v 1.3 2006/03/12 03:24:31 ramereth Exp $
 
 inherit eutils webapp depend.apache
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
 #done
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="snmp"
 
 DEPEND=""
diff --git a/net-analyzer/cacti/cacti-0.8.6h_p20060108.ebuild b/net-analyzer/cacti/cacti-0.8.6h_p20060108.ebuild
index 72f8e61220df..33bf3b750039 100644
--- a/net-analyzer/cacti/cacti-0.8.6h_p20060108.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6h_p20060108.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6h_p20060108.ebuild,v 1.1 2006/01/16 17:02:28 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6h_p20060108.ebuild,v 1.2 2006/03/12 03:24:31 ramereth Exp $
 
 inherit eutils webapp depend.apache
 
@@ -19,7 +19,7 @@ for i in $UPSTREAM_PATCHES ; do
 done
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="snmp"
 
 DEPEND=""
@@ -69,6 +69,7 @@ src_install() {
 	dodir ${MY_HTDOCSDIR}
 	cp -r . ${D}${MY_HTDOCSDIR}
 
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
 	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
 
diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt
index ec5b7b7f4dd2..a55bee9e2ee4 100644
--- a/net-analyzer/cacti/files/postinstall-en.txt
+++ b/net-analyzer/cacti/files/postinstall-en.txt
@@ -21,6 +21,10 @@ New Install
 5. Point your web browser to:  http://your-server/cacti/
    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