Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

8 files changed, 164 insertions, 10 deletions

diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
index 648b823621ec..21ae9f6026ec 100644
--- a/net-analyzer/cacti-spine/ChangeLog
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/cacti-spine
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.44 2015/06/16 04:33:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.45 2015/07/14 05:26:17 jer Exp $
+
+*cacti-spine-0.8.8e (14 Jul 2015)
+
+  14 Jul 2015; Jeroen Roovers <jer@gentoo.org> +cacti-spine-0.8.8e.ebuild,
+  +files/cacti-spine-0.8.8e-fix-ac-macro.patch,
+  +files/cacti-spine-0.8.8e-net-snmp.patch:
+  Version bump.
 
   16 Jun 2015; Jeroen Roovers <jer@gentoo.org> -cacti-spine-0.8.7i.ebuild,
   -cacti-spine-0.8.8a.ebuild, -cacti-spine-0.8.8b.ebuild,
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index b76093f22fab..66abd12e1b5f 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -7,14 +7,18 @@ AUX cacti-spine-0.8.8d-net-snmp.patch 772 SHA256 ec5c71001f694c0f4cfcb5776e48aee
 AUX cacti-spine-0.8.8d-ping.patch 235 SHA256 be4b619c9a476759cd06f243641d6043a25345b6a2b3ac5dd16622d1463aff3d SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265 WHIRLPOOL 88b32e2229a5c8b1fd6c2a5c187af9a2372996b87ef4ef6837eee6f06b0de18a909d6d98dd521c2a762e76f8742e9d96f48a71efd3ad759db227e6da222be726
 AUX cacti-spine-0.8.8d-polling_time.patch 8890 SHA256 b8f9630f2a495f378372f624befaa370092c26fa77bcb39d60c334ecca7dea85 SHA512 cdcb353762cc3a67be3f5debdceb09f40e2990201825cfa36b7403bacc69303c85785f5094dca0337ef31dfa4790d5729708f0d6c48896ab633a8dacfc1157c2 WHIRLPOOL c17e733b759138b3b27d45e1ffec9ad88ee23e8666b648db1fe6d1e7d51d9512cc0e3a4a1962ddd5e71150a9c3f62e5fa2474b4f882c6dd01d509655193d0a6b
 AUX cacti-spine-0.8.8d-snmp_spine_close.patch 511 SHA256 47edea95aaa7d6018ae0f64aeb894b42607cccdfe062495afad1b358afcc76d1 SHA512 13e885421658e28ffe94530f0feccfa24020d1a2cef4115ab2d4390fcf557cd5224f89395ddeb24797d9556c4cd8a55a90c8ddf65341eeb642569498478c0ea9 WHIRLPOOL 5fc6cd5503b0b27f2a1d6d957740e5a93ae9cba33bddbaae85e236f3d3749bc3159313149064cab928878797455bd118653e395cd62fd1b54dd7cba0c1bc155c
+AUX cacti-spine-0.8.8e-fix-ac-macro.patch 217 SHA256 1465202e4fb7cb68863da4bd93c9df39b1199d97a39481f3b7a7ef31cf2e010a SHA512 caed6d2fa5f02cc769462cc2b7c0d5918e1912cc4962c4958dcee03c58270afb9ad8aa74204a498b305bbbea9870c0c5e337265a9230d47aa3b9a9424935d0a6 WHIRLPOOL b45d4e0864aebccdc4c4457f4b86f6f4dcb76d66742455262c645b07a36881ede204dcdc2dd271221f6f0764180ae8dac274e0fc49bbd58e8fed3650bff0aea2
+AUX cacti-spine-0.8.8e-net-snmp.patch 572 SHA256 7ed0d70a33e5932c2e0e4ca91cd813e7fc345cdd88d01c82a53fe4490881b6d3 SHA512 c2cd85aae8ec925837f6aeb4b1e29b3b0a9c62aee53554c69a2caf6d964b27897c9dff0aaebfcdd68e64fed3a93315318943636a289e016f34c50b5248843f98 WHIRLPOOL ee593c1c73ac191242902a3e893085f1b8ffc24e4acf23c1c0f3316c24eb03e799ba8249a1b6e1f866ecf3ada0c8e04daf445e211aadaab18cfa6bbffe670ad2
 DIST cacti-spine-0.8.8d.tar.gz 757454 SHA256 f3910d0022f6b70178bde99af683aab29688fe227b15e8200e42fb17eac89154 SHA512 453e9aa74aa6941ec04aca92e36ae50997722a3ac29e86dae9ef5861c65e065185de9254f5b9b8bce393430e1bb18a77018b4879dfad6127a55e3854a35bceb8 WHIRLPOOL 9b3ac77617330085e31e835dd49ddb1e685d36d22b5042da90ff2c73a9aa6e99f754e7bd8d903b0132889c928f16f855a7d7054a39d51fa2787be8a956b982a1
+DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
 EBUILD cacti-spine-0.8.8d-r1.ebuild 1178 SHA256 1d07cc010a5ae411036a3957e85928064fa53043f3485f96c1699cf0ecaed0b2 SHA512 42ce7df628985e6f2aa665e91e1f6be100eb83ee02f66ae384d5dbcab9c1f0342f980d624dd56db7e1ab82457ef7b0caa32aa333a619fe7a92a31c0b3b4d03bc WHIRLPOOL 3c1bd45a692eedac2f8c75e17163319bfa90dff915ac9b9426244bbc6e935ea8a133173250489bea1efea666220cfc868db06419750cfe11cf88bdeb198dacb9
-MISC ChangeLog 6594 SHA256 7a362aa3094f9db6593dd209401e24efbe5af57b794a61c6756709498faed333 SHA512 236080d9c401e5e321cc4be59bf591601691da30251822b775a77ac8cca20adf6c7d8732c8be9ec7f6476b45bfffed98e4a126cd1508ee37e6bf6319d0c3c3f9 WHIRLPOOL 28ddab5d7858824f89dc3c6144d4836ce3d48d43708ff4c1b7ff410a5b574162e87fc83038c54288a9d2c756faddd0b4a5b6e06eeaf068258950acd759cfaefb
+EBUILD cacti-spine-0.8.8e.ebuild 1128 SHA256 db0fed772b81f0e00256fa230d00a6872ca88cb9fd176b661a27cb888b8ff58c SHA512 ed8cb82fcc2f1c8d0f8ed8a19237842b7ff761ce93ee14be289a84cad7a889b7396b2dd06ca8ff95d5f0efe51ae39de3d01f1dbad7ab911973af53a2934c8d48 WHIRLPOOL a2f2619929447877177aeb2725451ad121292dc00bb33cb4edcb3d8ef9c54a752a367a27d430c226565b0f9f9333358ad8ed4ae9a22be79e3cb383d952491d9b
+MISC ChangeLog 6813 SHA256 49278471a4465e247d53f84ff630ef3fb410bebe7a4261c496f4f3bf68106348 SHA512 f7ce0eaf6015028ad5ca08d49053e301e50947abf10a03588680c5e5178a8f3a27b6f430d93a7ca0071b4aed6d31e85b3ce9418a5e0d8422deef1ba6132a3f99 WHIRLPOOL d86425888e95dec4b2f7adc849f2a63f252035b62d0392c73617b84cd7afcea751f51b500df24470a07dd24927a83ec5937e2b7577bf58ceadc543a147332401
 MISC metadata.xml 609 SHA256 6ce745a690546641ddd769949d48fb9b30124f542b7efcd2ab6b4faea0064410 SHA512 9e949dde99ebbc17b1ba2e877e5cbffa4fae0f192d84cdce62992ee9065d4c91e20b4c173bc3a51e4c42695728bca0805c7835f10956f544a8b1a2695ee9e329 WHIRLPOOL 4eb83a74fc24080746118a5f319eeeea6bf5e2f9cfdb4ffacf2f3f485cec953c46f166f216cbd6e234559bcd9e5f9c8b0f0a28d5a80aeb9726b4eb678439cc38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV/pzcACgkQVWmRsqeSphMTKwCfes5qiODbUd7CsPhrsaa2aDoy
-v7cAn0Ru/LF94KHsXxiCYa/8/4lb/JDG
-=pjSq
+iEYEAREIAAYFAlWknXsACgkQVWmRsqeSphNLtACeK0oW5bXk6/UfxVu2nnk7ioYH
+71AAmwaOr0oz9zXU5g5vDf5RpR+FEXw1
+=Am5l
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8e.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8e.ebuild
new file mode 100644
index 000000000000..c7658a786ab4
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8e.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.8e.ebuild,v 1.1 2015/07/14 05:26:17 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+RDEPEND="
+	${DEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.8e-fix-ac-macro.patch \
+		"${FILESDIR}"/${PN}-0.8.8e-net-snmp.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-snmp_spine_close.patch
+
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog README
+}
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8e-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8e-fix-ac-macro.patch
new file mode 100644
index 000000000000..5249cdf9386b
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8e-fix-ac-macro.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@
+ AC_LANG(C)
+ 
+ AM_INIT_AUTOMAKE(spine, 0.8.8e)
+-AM_CONFIG_HEADER(config/config.h)
++AC_CONFIG_HEADERS(config/config.h)
+ 
+ # static libraries
+ AC_ARG_WITH(static,
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8e-net-snmp.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8e-net-snmp.patch
new file mode 100644
index 000000000000..c96bbc9a7322
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8e-net-snmp.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,14 +254,14 @@
+ )
+ 
+ AC_MSG_CHECKING([if Net-SNMP needs crypto support])
+-AC_TRY_COMPILE([#include <net-snmp-config.h>], [exit(USE_OPENSSL != 1);],
++AC_TRY_COMPILE([#include <net-snmp/net-snmp-config.h>], [exit(USE_OPENSSL != 1);],
+   [  AC_MSG_RESULT(yes)
+      SNMP_SSL=yes
+   ],
+   AC_MSG_RESULT(no)
+ )
+ 
+-AC_TRY_COMPILE([ #include <net-snmp-config.h> 
++AC_TRY_COMPILE([ #include <net-snmp/net-snmp-config.h> 
+   #include <net-snmp/utilities.h>
+   #include <net-snmp/net-snmp-includes.h>
+   #include <net-snmp/config_api.h>
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 554f59de1462..6cce059a9308 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.207 2015/06/29 05:56:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.208 2015/07/14 05:25:16 jer Exp $
+
+*cacti-0.8.8e (14 Jul 2015)
+
+  14 Jul 2015; Jeroen Roovers <jer@gentoo.org> +cacti-0.8.8e.ebuild:
+  Version bump.
 
   29 Jun 2015; Jeroen Roovers <jer@gentoo.org> -cacti-0.8.8b-r2.ebuild,
   -files/cacti-0.8.8b_empty_comment.patch, -files/cacti-r7420.patch:
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index c6341674ca8f..c961efec351c 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -3,13 +3,15 @@ Hash: SHA256
 
 AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623 WHIRLPOOL 0739ae29e564e81b4a08a74685efe93ec5248048dd47555befb1e805a9dc3d1606adc9126b5959ccab39f7e30d2ed4d956d78b84efedd54545a1d998986477a2
 DIST cacti-0.8.8d.tar.gz 2470512 SHA256 1e3fb4aa137c0a9cb682fa66956c1f59dfc730040a215c45b7f9a5f9b9714bec SHA512 aaf86bd89b5bba03921d05670badf832c7fe4806696fee7a4fa8b0a4914471b22e0f00eb5b63bf232d56e4f33f1af58f01cb5737232ebb99b8331f814264098a WHIRLPOOL 4cee51d22c6a8dd74bbbfbdcc2d18020d467c403ec0c9db150ccd5ad83f1171c2371ea893665cb93a2c118445e0cac9a92f7c9142b93f9b563894898890fc76c
+DIST cacti-0.8.8e.tar.gz 2594446 SHA256 43b091957faf03a4b0baacc8c327320394c0843476ea34e3beb1416506ad3f55 SHA512 11eeace353b7bacb2e4f065b1557b6978f0315d372f03f25bbdd210aaa494b70661b24502885bb610d8cf042cdcd68c69ea1a6fd1cb7073af29553116500df0c WHIRLPOOL ea5f29a71504f4e1fb4d8981db84b46fb87842921d8f6f422b8a0c2b127e80b785fca60b3b037036396cf9de456240a573cd446118f03a93f25a2406fe22be40
 EBUILD cacti-0.8.8d.ebuild 1433 SHA256 5741b1beba30c9e506bc024026e3d4f70252208e23a21c2c47b663ffc638a1c1 SHA512 1dca6f892c90858cdd18c6b404c0896687c68afaafe3ea57e6e6f27b3af0a9f5405d83c87355e551ecfafcb20ea0efb7b2586c3ffeae2ac5ec449f86c39d8e00 WHIRLPOOL 2a03188fe62fee6b31ec849fc046341d1ace54572907ff270208e99bdf04fb0bf07c944407d5f8803e262edbebb0563855e7147320383138375ed20ea5df13f1
-MISC ChangeLog 29633 SHA256 06a945413d4ea549554d6e455e122a8bdeba7397259362b675ea0af14b964cdb SHA512 c7834b65cc537710d794223a809c258bbbde6486c69ee22ba4d87d820a171315541ae9c6fd3289f1277f309a198e5707f2c6c530099fedc190f2ceed063bd051 WHIRLPOOL 5eab8327c4a270c2549e1ce94a00d79e8c1df08ff160528cf0e64792ff9d8a31d95b81d308c9a885bd0b2c4dd21412a2b6627e04a41bd3eee8f84f427401006b
+EBUILD cacti-0.8.8e.ebuild 1434 SHA256 0b84c848ac3af2214d280cbbc8e63df698a749ab13015f6a63150ce71a400357 SHA512 fd64fbabb325968ce73cb68a05df099f67d1f665dac04f9e8eb44905b365afc6dd593943be05f21451dec27a106eecd4b93eddeeb920ab0ecaddaef0a3265707 WHIRLPOOL 01b4c003575d00a11b617b745e75447ab3bf78c530dd4353d22a41ef682b530df50404a014766521fd22da25f408a06ba4fab60ed6f60819431c1f0213662241
+MISC ChangeLog 29748 SHA256 0fa61ab7fc50b972a6f605eef60b77f1c9b0d6ca207a20de4f72a86ad9f90409 SHA512 3658a958c4771a858574d3d1dc9c2bff58c8f46bc3ed6e338dba8120d7a9fd15509af972128669999fddba80f3fa94f5d9934806a8e68459d8425fcdfd0ab665 WHIRLPOOL ceed23baa2c4e9a2f6aaed6c3b5afb41f4930e77f6b5798c2a2dbf7db2065cba44ff30e447286a95e0bb021f0a471c81b6fe78c891fda7573678b3b2afaf6953
 MISC metadata.xml 714 SHA256 87c3b48a554466e6e0a75944751f2e73326aef52d13d16110aaf6df770aca530 SHA512 6476909d8b29f1a56d7c7e26e8bc4edef5c46aee49ab18175f8727812764d1f1ae89781d09cf8de1ea42edc3f022432e6d52d42b75109e95c07998d7250bb40d WHIRLPOOL 6ce5f9fc982b7da218ea2dba530a5971f3acab63a996828c145bcd3c9ba049183ddd249325728fe6613148438e02dc5eafee18659bd6c977c740b35d82fcb6f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWQ3iUACgkQVWmRsqeSphPItQCfdPkbAQkynctmm7FJj+ZpJcoo
-2dEAnRUoneUjWb16cpSy98j0cv0uNbGU
-=SZb6
+iEYEAREIAAYFAlWknT4ACgkQVWmRsqeSphNFmQCeJ7csULOWl5Le3sken/HmyG8O
+scIAniNkp/5MqloA4SDaFS+G3tvln4d9
+=GweS
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.8e.ebuild b/net-analyzer/cacti/cacti-0.8.8e.ebuild
new file mode 100644
index 000000000000..8d649ea04b57
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.8e.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.8e.ebuild,v 1.1 2015/07/14 05:25:16 jer Exp $
+
+EAPI=5
+
+inherit depend.php eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_prepare() {
+	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}
+	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
+}