Version bump, bug #384627 thank Martin Samek for report.

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

3 files changed, 91 insertions, 2 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index f4262bdaf8e8..4140c38d6001 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.179 2011/04/01 16:06:30 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.180 2011/10/02 11:44:35 pva Exp $
+
+*cacti-0.8.7h (02 Oct 2011)
+
+  02 Oct 2011; Peter Volkov <pva@gentoo.org> +cacti-0.8.7h.ebuild:
+  Version bump, bug #384627 thank Martin Samek for report.
 
   01 Apr 2011; Peter Volkov <pva@gentoo.org> -cacti-0.8.7e-r2.ebuild,
   -cacti-0.8.7e-r3.ebuild:
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 087d0e1414f3..51603eb83897 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,5 +1,6 @@
 AUX postinstall-en.txt 2249 RMD160 2703588d7971022699b58b2e5a113ab970124f4d SHA1 8c34cadfe75d1bca0eaaae66a5981f0ab575ea3f SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d
 DIST cacti-0.8.7g.tar.gz 2236916 RMD160 4972f1fe2787925da6a1f0f71990ff4f5e74df7f SHA1 a5a710653e158b1bc950de0a1e2c60ee364bf782 SHA256 d09b3bf54f51bd42b2db0a62521cf6e408716978f75d6509ec56027c49c44585
+DIST cacti-0.8.7h.tar.gz 2249323 RMD160 923492a3f36e5d320570ebfad9b4136acf7b9eb7 SHA1 4311cff2ec8883c013efd0225c73d145bcc1cf00 SHA256 2e3dc330b5b3ee374b2e553650d032441c25831b39ddcf123ef102492f20603c
 DIST data_source_deactivate.patch 510 RMD160 92c634ba94e0e268a6cbfe299de62e4205ddba17 SHA1 27bb624280ad74cbede70da8984fb28b342b5c2b SHA256 52155c5ca38a8df1adcc8a5b4d0bc1b4befa7ede4c56d10dba64cbde2c54042e
 DIST graph_list_view.patch 7636 RMD160 24df29f9e1c6bff6b7dfc6617770eccfa0ec60ba SHA1 80dbfc9fdb206845726102cee529b221592b91d3 SHA256 e43b2cf3c53029880ac16a9b86036d5136ab2de116bfba868fac2abd2ed14778
 DIST html_output.patch 7317 RMD160 2f4e418ae9dd0fea0471fbdb5f899d6308599554 SHA1 f4c98092fbdf894f667be419dd114da47a6abf67 SHA256 276811704d6f4353542461c04a2561721bcc784326feefff460fae45c3849278
@@ -8,5 +9,6 @@ DIST ping.patch 1033 RMD160 32946f8a0fa169fd711a2ff1c292e5022e772211 SHA1 23e584
 DIST poller_interval.patch 5852 RMD160 06a6edbb80c4c05ec00cf17340a68252e8b26b27 SHA1 2764aad8ab9335c105e5aa8e3fb9f80b9a2bcb9d SHA256 64a6748573395956565c9886cc999a92655ad7f5ba62c53b3299d047912d3aaf
 DIST script_server_command_line_parse.patch 3038 RMD160 b87ecd44d0d31ceead87e67447990407d84fbeb5 SHA1 72b35e1b7388062301ed8c8bed99b98dec62bd22 SHA256 40c8ad2dcc6664360ee9941849d7fff1c136e1d942f7ba2a2ea602da20a39e56
 EBUILD cacti-0.8.7g.ebuild 2112 RMD160 698aea63163d9466fc5fa0700fdb70fe359a64be SHA1 6ee618bf59ae3a9f5e33bedf0b2a23418ef501b4 SHA256 46c31fdae7c68d06d7f411a9c46c5655a4046d94ed40e7f94fe9cf9370e29364
-MISC ChangeLog 25694 RMD160 79dd26f74f026cdad3ffe1b98df7bfe82a701af1 SHA1 f70c8dc8fc59f70b8c86c6250585b2ae0326e1ca SHA256 1976b61419653099464313c3386e49c427e4e36aeef90dc27169e7b675b61c38
+EBUILD cacti-0.8.7h.ebuild 1964 RMD160 4b21387740488765b41ef14f791712b654ff8ed1 SHA1 2f6df282cbc84a5af3e07d7d8b63f0e85753faaa SHA256 011f7fc16c3737ed4cfab2bab425f66946af9ab8158e58bf87504ea587856b80
+MISC ChangeLog 25850 RMD160 4c5cfae9dcb9ef0e625bc268fab19de6ce5d3760 SHA1 d26709aad6236cf91cb5bc9f26da7c7990d664bc SHA256 aef3677d1a017dc0aefd31d52c5d5cb4ae4d17962e8595aa4fff01f7c59c8dda
 MISC metadata.xml 803 RMD160 b497804bac33062b7f13330acef0ef28bea19f65 SHA1 031e32c4f5ffe0fc67943674530e880d02f5f2a0 SHA256 db81b920eb3683d9e4fc323bb2399156dfc4a8a0f5d4874505e0c1891dd17819
diff --git a/net-analyzer/cacti/cacti-0.8.7h.ebuild b/net-analyzer/cacti/cacti-0.8.7h.ebuild
new file mode 100644
index 000000000000..2fc8e492cf41
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.7h.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7h.ebuild,v 1.1 2011/10/02 11:44:35 pva Exp $
+
+EAPI="2"
+
+inherit eutils webapp depend.php
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+UPSTREAM_PATCHES=""
+
+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 [[ -n ${UPSTREAM_PATCHES} ]]; then
+	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 doc"
+
+DEPEND=""
+
+need_httpd
+
+RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 )
+	net-analyzer/rrdtool
+	dev-php/adodb
+	virtual/mysql
+	virtual/cron
+	dev-lang/php[cli,mysql,xml,session,sockets]
+	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	if [[ -n ${UPSTREAM_PATCHES} ]]; then
+		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
+	fi
+}
+
+src_prepare() {
+	if [[ -n ${UPSTREAM_PATCHES} ]]; then
+		for i in ${UPSTREAM_PATCHES} ; do
+			EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch
+		done ;
+	fi
+
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README || die
+	dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die
+	use doc && dohtml -r docs/html/
+	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
+}