Version bump.

Package-Manager: portage-2.1.1-r2

4 files changed, 110 insertions, 5 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 51339cc5ac07..58f508ff4bbe 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.83 2007/01/16 00:36:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.84 2007/01/21 18:03:06 pva Exp $
+
+*cacti-0.8.6j (21 Jan 2007)
+
+  21 Jan 2007; <pva@gentoo.org> +cacti-0.8.6j.ebuild:
+  Version bump.
 
   16 Jan 2007; Jason Wever <weeve@gentoo.org> cacti-0.8.6i-r1.ebuild:
   Stable on SPARC wrt security bug #159278.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 8e8872c2457f..4f2732bbe91c 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -4,6 +4,7 @@ RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 files/postinstall-en.txt 2191
 SHA256 c5a9ead9474eb3ef2b98f210c68f4ad6b24680321d9fbfe6e419c86e891fbe9e files/postinstall-en.txt 2191
 DIST cacti-0.8.6h.tar.gz 1096877 RMD160 3c09869e5b7b6a4fbb449efff25db12814b39288 SHA1 0d31e5f7dc11d8cc6d61b3c4ca17a27c476759fc SHA256 69b6ad51ee21c5367dc67a752a3745804531280356eb261d81f9636a647ca17e
 DIST cacti-0.8.6i.tar.gz 1122700 RMD160 2c5ea7dc594c455c710f8c253a25805883395a2f SHA1 bd8032fe7e1e792c38ed8f8774a692fbc17e295c SHA256 3998dae625314309c58cea0fc1e48fb08cf4c2973013413f2726cdc5cf1ac6ac
+DIST cacti-0.8.6j.tar.gz 1126337 RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe SHA1 4ed5b7ada8710c5474e7fc4aad4ad9339caf0188 SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46
 DIST dec06-vulnerability-poller-0.8.6i.patch 5994 RMD160 cf60d715e6ae9285c6a0bd562fcd65290dcd1bdb SHA1 3f0eef9611837b7e30c785e11171e744545bce94 SHA256 4bb02a9022be25a1340e328f3c911a5386a8fb0c23a95285fcc8d8912dacc605
 DIST dec06-vulnerability-scripts-0.8.6i.patch 4358 RMD160 8daaaf3d7d743206551502c3945c81fc689999c1 SHA1 e175a14fbb9915cce2ea40943337bfac47e9d640 SHA256 89d48d5758ef0517f8d34a95dee02662af80efc8f988b87cfbc68c6e169c9f36
 DIST fix_search_session_clear_issue.patch 1154 RMD160 40f69cb5611aec1a5e5faa91b6bb50f97c00608a SHA1 85155b6f6f7763913d54de18d47850f2cd332449 SHA256 e789254e185b258293fcb31053bbb59d0c243c25582987858539a80ec9b4e9bc
@@ -24,10 +25,14 @@ EBUILD cacti-0.8.6i.ebuild 2012 RMD160 a26fc6e886b7fc4ae6f90089554ba1022993dd45
 MD5 71bbba16f9371a43f48c701d3c7fb9e8 cacti-0.8.6i.ebuild 2012
 RMD160 a26fc6e886b7fc4ae6f90089554ba1022993dd45 cacti-0.8.6i.ebuild 2012
 SHA256 3a58b3bedc7269f5206ee98aeda93c1b216674ffb9acfcc6a187f8c195e764e5 cacti-0.8.6i.ebuild 2012
-MISC ChangeLog 12360 RMD160 9435edd67a5404b065dd01707d836f894f2a80cd SHA1 5a6a3f4de842f9e5f2d2b79015b3bf220f884453 SHA256 4bef83413fa6602f018f9ec7c6480419d582cfc829177ef2714ae0d7b0948685
-MD5 d12e1f8c44a04534894a5782880feeea ChangeLog 12360
-RMD160 9435edd67a5404b065dd01707d836f894f2a80cd ChangeLog 12360
-SHA256 4bef83413fa6602f018f9ec7c6480419d582cfc829177ef2714ae0d7b0948685 ChangeLog 12360
+EBUILD cacti-0.8.6j.ebuild 2051 RMD160 15113396df6981594bd4f2846e6c4ba64be7195c SHA1 734499dd4e2dd9575c1f505e3de93113de9b658e SHA256 e929cb9c1251df8ccc8157530f7913c3c6623e33b4a6ec4a51c081f771be227b
+MD5 ed073402782b988601269b86676e5fbe cacti-0.8.6j.ebuild 2051
+RMD160 15113396df6981594bd4f2846e6c4ba64be7195c cacti-0.8.6j.ebuild 2051
+SHA256 e929cb9c1251df8ccc8157530f7913c3c6623e33b4a6ec4a51c081f771be227b cacti-0.8.6j.ebuild 2051
+MISC ChangeLog 12458 RMD160 a8a4524190204ce925abd37b0f2e62167a175dd3 SHA1 6bd53a6b00bfbf8ef1d26d4783ac25768529cf45 SHA256 9b5dee5200011e4458a058002d597610a52d5b3ddea257dddc693cb350e578aa
+MD5 5381ed26a1d55f0decd302a191342b73 ChangeLog 12458
+RMD160 a8a4524190204ce925abd37b0f2e62167a175dd3 ChangeLog 12458
+SHA256 9b5dee5200011e4458a058002d597610a52d5b3ddea257dddc693cb350e578aa ChangeLog 12458
 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743
@@ -41,3 +46,6 @@ SHA256 8921a96c3bb8026e4af5f531ee0f53780de61b190a6159957109a20ecfec9e6b files/di
 MD5 2b7a8cbe3c24b2359cb5d26537b808e0 files/digest-cacti-0.8.6i-r1 1394
 RMD160 9d15af37d721c2d83f56a6403ad9abc5c4bc34e5 files/digest-cacti-0.8.6i-r1 1394
 SHA256 db0b3cfd6c831c8368801968daf70e8868b73802b120af351e2ea0741ab61a2d files/digest-cacti-0.8.6i-r1 1394
+MD5 1d09524174e98f91b74c872f309450f1 files/digest-cacti-0.8.6j 241
+RMD160 244f3480833eabd522facab1a694ff5f2d84f261 files/digest-cacti-0.8.6j 241
+SHA256 2a2ecd498a35eee69cdbccc8cdd6499aae1afcf7a158294826b89871309bdf4b files/digest-cacti-0.8.6j 241
diff --git a/net-analyzer/cacti/cacti-0.8.6j.ebuild b/net-analyzer/cacti/cacti-0.8.6j.ebuild
new file mode 100644
index 000000000000..2edae940e89c
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.6j.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j.ebuild,v 1.1 2007/01/21 18:03:06 pva Exp $
+
+inherit eutils webapp depend.apache 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"
+
+DEPEND=""
+
+want_apache
+need_php_cli
+need_php_httpd
+
+# alpha doesn't have lighttpd keyworded yet
+# sparc doesn't have a stable keyword for lighttpd yet
+RDEPEND="!alpha? ( !sparc? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) ) )
+	snmp? ( net-analyzer/net-snmp )
+	net-analyzer/rrdtool
+	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
+	if [ $PHP_VERSION = 5 ] ; then
+		require_php_with_use cli mysql xml
+	elif [ $PHP_VERSION = 4 ] ; then
+		require_php_with_use cli mysql xml expat
+	fi
+}
+
+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_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/digest-cacti-0.8.6j b/net-analyzer/cacti/files/digest-cacti-0.8.6j
new file mode 100644
index 000000000000..1ebe752b6910
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6j
@@ -0,0 +1,3 @@
+MD5 29436be46b289d13dfce48e7618129e2 cacti-0.8.6j.tar.gz 1126337
+RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe cacti-0.8.6j.tar.gz 1126337
+SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46 cacti-0.8.6j.tar.gz 1126337