Upstream released ping_php_version4_snmpgetnext and tree_console_missing_hosts patches. Thank Hans Rakers <hans AT parse.nl> for report about ping problem in bug #159278.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

3 files changed, 13 insertions, 103 deletions

diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 3b93f0e66755..9053c7530588 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -7,19 +7,21 @@ DIST cacti-0.8.6j.tar.gz 1126337 RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe
 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 import_template_argument_space_removal.patch 634 RMD160 c0f8a1c135a58cd45a87549d2a170814f6f36337 SHA1 d9c27c69957c1755cda9095e938aacbe93fe127a SHA256 d0a64ebd1fba7a2dcd6e7b6bb08f4dbc39f238b6c492f4874451736344a6e460
+DIST ping_php_version4_snmpgetnext.patch 1262 RMD160 94882973199b8e59c40ad43a132548862654f312 SHA1 41be27e18e136d79c5e3b2f99438a192fffdc383 SHA256 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170
 DIST poller_output_remainder.patch 1891 RMD160 7aab97b71d5915ca8085174f69318cb223eb6c5e SHA1 5e2d8b008c96f2761c12e1d94e225546a0e98e7b SHA256 2d8053d90dd363f4822072e58713b7d5f4b23825de4df2e9d429bfb5e8ec8201
+DIST tree_console_missing_hosts.patch 771 RMD160 d33f3916317e989b379d1188f3ed23b7d61a7a9e SHA1 bccc1293567c9160971537a3cbbf69ab0ca9cf81 SHA256 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180
 EBUILD cacti-0.8.6i-r1.ebuild 2207 RMD160 b433dea9401bfafdf5b439b9a4ebcff9a6037da2 SHA1 c444a1fb47b16d1ba64dedf2973b1023c0f0c276 SHA256 db37167ca966c21e85d5c6927b80f4606882ed5433a4a5faf58db54902b43468
 MD5 5ee79f5433fe5e00c41d76ebc24cddad cacti-0.8.6i-r1.ebuild 2207
 RMD160 b433dea9401bfafdf5b439b9a4ebcff9a6037da2 cacti-0.8.6i-r1.ebuild 2207
 SHA256 db37167ca966c21e85d5c6927b80f4606882ed5433a4a5faf58db54902b43468 cacti-0.8.6i-r1.ebuild 2207
-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 12662 RMD160 c7479aa0798012bf14681efe612a41d0ec815a19 SHA1 9bf2847d7ebddf2ae75664dedb31a033a596a680 SHA256 a9b5771e3014b24776baf66ef65917602e120d27dd3c21b1d5db86bfe29d91eb
-MD5 5ef8df92f0c92bbb993ed29ea5a27c6e ChangeLog 12662
-RMD160 c7479aa0798012bf14681efe612a41d0ec815a19 ChangeLog 12662
-SHA256 a9b5771e3014b24776baf66ef65917602e120d27dd3c21b1d5db86bfe29d91eb ChangeLog 12662
+EBUILD cacti-0.8.6j-r1.ebuild 2117 RMD160 88bcc4bff63257ca3162a2a5c693152846e9cf02 SHA1 2133b7918e3c7ced0be5cda51fde70395e54ec95 SHA256 0321312ca4cb5f9f28c7306e14e215cc0f52cace913e7eb61b04154398ecf316
+MD5 2743b4f8b732b0b774abeadf31ffc09b cacti-0.8.6j-r1.ebuild 2117
+RMD160 88bcc4bff63257ca3162a2a5c693152846e9cf02 cacti-0.8.6j-r1.ebuild 2117
+SHA256 0321312ca4cb5f9f28c7306e14e215cc0f52cace913e7eb61b04154398ecf316 cacti-0.8.6j-r1.ebuild 2117
+MISC ChangeLog 12953 RMD160 ff16ffed20e30b9a2b43f1e4e10ac7c750b5b70b SHA1 e5a06e5d409c73f65ba41ff6ba4cc1011ab43cc6 SHA256 cd57678fd4c8608b59400f8f71bb4a675f549da353c94eac90e17c76dd5ea347
+MD5 d47ee80040418685767c3531c6c22da4 ChangeLog 12953
+RMD160 ff16ffed20e30b9a2b43f1e4e10ac7c750b5b70b ChangeLog 12953
+SHA256 cd57678fd4c8608b59400f8f71bb4a675f549da353c94eac90e17c76dd5ea347 ChangeLog 12953
 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743
@@ -27,6 +29,6 @@ SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94 metadata
 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
+MD5 ec617cd321855e116ab094492e78777d files/digest-cacti-0.8.6j-r1 789
+RMD160 5347f61cfcc225347878afdc8c8a0c824da9d470 files/digest-cacti-0.8.6j-r1 789
+SHA256 69bb30fcd9167388024f511f0e89a1f111307cf56f66b7ade7f0d893ef46d90e files/digest-cacti-0.8.6j-r1 789
diff --git a/net-analyzer/cacti/cacti-0.8.6j.ebuild b/net-analyzer/cacti/cacti-0.8.6j.ebuild
deleted file mode 100644
index 2edae940e89c..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6j.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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
deleted file mode 100644
index 1ebe752b6910..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6j
+++ /dev/null
@@ -1,3 +0,0 @@
-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