eapi bump for bug #298205

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

3 files changed, 97 insertions, 12 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 33b59b10e037..76981aabc336 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.171 2010/06/01 15:22:56 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.172 2010/07/03 13:25:29 mabi Exp $
+
+*cacti-0.8.7e-r3 (03 Jul 2010)
+
+  03 Jul 2010; Matti Bickel <mabi@gentoo.org> +cacti-0.8.7e-r3.ebuild:
+  eapi bump for php-5.3 (bug #298205)
 
   01 Jun 2010; Joseph Jezak <josejx@gentoo.org> cacti-0.8.7e-r2.ebuild:
   Marked ppc stable for bug #317615.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 0e6a71ccb9db..3c0849a83700 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinstall-en.txt 2249 RMD160 2703588d7971022699b58b2e5a113ab970124f4d SHA1 8c34cadfe75d1bca0eaaae66a5981f0ab575ea3f SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d
 DIST cacti-0.8.7e.tar.gz 2232297 RMD160 b6e4bb937e69337113d014d4a802455a852e7baf SHA1 6ba93e200e0fbbddfbc5a9a98a9cf0f70842d904 SHA256 1983f16cd5cf5e30b33b43b167e324713f0711167f5dcde57f3cbfbeddbaa7ff
 DIST cli_add_graph.patch 556 RMD160 21f5ddca4bc22ed7208d468c07c2feba0873e2b2 SHA1 a3eee5b56c2c99fe8a800904572be2fbaf0f3049 SHA256 504af2148efab2699e4cdc17581e8555d1a5d40dfbd30a316e7637378a6c6f11
@@ -11,12 +8,6 @@ DIST sql_injection_template_export.patch 636 RMD160 b62eb338359ea666aa72b5cff4a8
 DIST template_duplication.patch 9190 RMD160 ba1d35cc207484b17c30044bb9f025ed6281c37b SHA1 27f3ee2eb37bd3c9430933cf00a30e63b2b05829 SHA256 c6ab6d2396f6b6519607f7908df642a575d32a75430e2b74381a6046d57f8ad9
 EBUILD cacti-0.8.7e-r1.ebuild 2083 RMD160 2386b1a6a85ef238a67f52f662c5adca707ec086 SHA1 131f9e080dc47e71f4fb4bf1973a0abcc1457c42 SHA256 263eefc992569fdbdfeb043eb1a58b00032d073f29fbf87634879e8211a670de
 EBUILD cacti-0.8.7e-r2.ebuild 2114 RMD160 83366dce807d276876e98d0cbd5cdc4890a3a8b4 SHA1 1bf6db92d0dfc0742d414079d6b4a5b008886a97 SHA256 ec44680716ef713c0d3ff84ed1a77a885d69791cc38e2657f2f60958738ed556
-MISC ChangeLog 24515 RMD160 89f9cba2f6afabd82c0b31aa4a7b2c2c19ea0387 SHA1 bf567c149824473a854b980b07ad632f04f94b07 SHA256 5cabac2e181e2c4f6766569a045aa319ebc20d176b0bd90fe91df5fb1df05ee7
+EBUILD cacti-0.8.7e-r3.ebuild 2127 RMD160 353217e1349c7085763b656cddc9395e8be0eae8 SHA1 e5d928f16fb14f1576c8f62331d089246b08a722 SHA256 dbc246ad5338c1474210a32ccd2b59e813a65a3209e363d1491352bccaa9eab2
+MISC ChangeLog 24655 RMD160 611c1f3b6b5abe5774c48bce4ffda1204eedf441 SHA1 336c2ad4e8111c9cf43a6ee1b6d184f0f99524ec SHA256 88bf9d6aeb028a015a31a54b01899689992486d227bdd7c6a9223797b4e4b80a
 MISC metadata.xml 803 RMD160 b497804bac33062b7f13330acef0ef28bea19f65 SHA1 031e32c4f5ffe0fc67943674530e880d02f5f2a0 SHA256 db81b920eb3683d9e4fc323bb2399156dfc4a8a0f5d4874505e0c1891dd17819
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwFJZoACgkQcsIHjyDViGRcGwCfXZhbTD3ks4H/lRS0qiBkLfoz
-VUQAnisxDI7Mv5T5ZRXHnd44h6/JrjEK
-=42XB
------END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.7e-r3.ebuild b/net-analyzer/cacti/cacti-0.8.7e-r3.ebuild
new file mode 100644
index 000000000000..1cda1a33fc6d
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.7e-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7e-r3.ebuild,v 1.1 2010/07/03 13:25:29 mabi Exp $
+
+EAPI="2"
+
+inherit eutils webapp depend.php
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+HAS_PATCHES=1
+
+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="cli_add_graph
+		snmp_invalid_response
+		template_duplication
+		fix_icmp_on_windows_iis_servers
+		cross_site_fix
+		sql_injection_template_export"
+	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_cgi
+
+RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 )
+	<net-analyzer/rrdtool-1.4
+	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 [ "${HAS_PATCHES}" == "1" ] ; then
+		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
+	fi
+}
+
+src_prepare() {
+	if [ "${HAS_PATCHES}" == "1" ] ; then
+		# patches
+		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
+
+	rm -rf lib/adodb # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README
+	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
+}