gentoo resync : 15.10.2017

3 files changed, 62 insertions, 2 deletions

diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 484670756762..aebd444c82cc 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -2,9 +2,11 @@ AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db4
 DIST cacti-0.8.8h.tar.gz 2585226 SHA256 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 SHA512 11bb0682a7220af5581f42579cf9c38d94aae202425ce15b824849684b1a6778d6f14e6a62ec94c608b7ba06562a825be7fd6d812d0800daa5eb56e640ac1c5f WHIRLPOOL 250ee38d969c9a7d9a71b15a25e48c2b9b22412c6c2394798d178172d9a1be056b009b328594559524adbd47ad05032992b13cb5a632af1a23f947fb55342402
 DIST cacti-1.1.20.tar.gz 8903728 SHA256 cbad90ef98d656bb10814e1444722dc00ff0c3a922b4591775984e890a81c942 SHA512 2d51c757916b366a188a3ab31771bafb6492aaa6ab2e778255945677bbb3f23f6fbfbb73ea9b05abf2f7cb26c0970bc208f68d5f1c016f8fe3b9da003dcd3b1b WHIRLPOOL a73b661f71e51b3f9be4413f211c735d1addad877020d7abc762043620869215177565a597a67dc40ff460784b00e8a765a9d348b39cdd2b2b15bccb3db70fb3
 DIST cacti-1.1.21.tar.gz 8905650 SHA256 e649fea4e8fc9900620af213218989e229aa25a1e1fb10dcde1844b1a2ae3bc0 SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2 WHIRLPOOL dea91e014e4b64a40bad4ab573a468fae0c6e1f7e380946cec5f5b270fe8abaacd3c73d71ad636e813e443117af0641269cfe2448f8c8487b1b7f7507e2a493e
+DIST cacti-1.1.25.tar.gz 8920466 SHA256 d0b911ff5b46abf858650bcb95bbeb1e482c3815e1a48129fde167ffe2d52389 SHA512 f5574cf0ba9d8fa39a6e547c9fe2a3c007901987abb82ff50d63672009bbf257ee58f47f02cea512dda6809e880e87e8a3ad826c26a9421f195569816d6489e0 WHIRLPOOL e229d13cc133c1e852e248c313ab22e0a1a53a123e6bc98396ea031a8307169a3278a9ef5bb63a69be667bf6d83c1c299cb97116db753a22a318ed061e75f3c5
 EBUILD cacti-0.8.8h.ebuild 1308 SHA256 42fb408c4c187c7733a7741701d94988734649097a6e76842d120fd5272ea1bc SHA512 6d48400c92aa9ef987ac43b5cbb6a4eeb9ad2235ffe1adc40cdadbe54ba0033090e0e4b8a9f48a6b85b0bf4e41c4f4f67da1869218344c59c777ecb173cd8784 WHIRLPOOL 9132c1a334e3426c7817893f212fbac3ffefbf8139e1f0e15b700d97c1cb2019391e420ba36fbc9e61bf992ecf2b567dcb0c838ddd361220435a934ff682f1ba
 EBUILD cacti-1.1.20.ebuild 1258 SHA256 8a90731cd9defdfdefb98d57868e37fc438eb8d16b303c92a33e571340585d5b SHA512 90246b8bbd88ac48ddd24df0dc32a43f8f387f2eb4215ed8280c59e2856f7060027cc4fa590446c2e7c3fce8c663da77ac5d169b9267ed8f04eb9c8207c6f517 WHIRLPOOL 50382cf522323d6c354322ee87c38ff1691049c718cf464a9bf6092cc770ff1a4be2286af3c15ca5773bad34ff25b2ef8ee40b0ab32a54cd8f9da452cdcce742
-EBUILD cacti-1.1.21.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
+EBUILD cacti-1.1.21.ebuild 1259 SHA256 d85789f10a42d9c56f166df0d5f7185bee5829f754bef93fc2200affe2aa95b1 SHA512 e9f48fbc4348eb47d07c0d47272e001d0f815fa6527b2bb48989e818d4984bb042d19f4c0369f29cc7b2537c884b8c1483f1058c95720c8f440aa62bf4903884 WHIRLPOOL a968f18d75cd7ef0b10cc13e71b878650de242fc8136523b0e52b9b15466e19db269c36fb6823b2280b6210e329c02cf988be7c78a33131131c88ec07962c307
+EBUILD cacti-1.1.25.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
 MISC ChangeLog 6068 SHA256 b9a798f16089824899d4534b3047ea47bc4c3f5c961bb75939ede4394c939f09 SHA512 d289b3977cd4e2a6029cc976427dbd7258e5d31074ab63b2f0b26820d347b0b6a0a43d395bdf850851402ec36afc3e36d64f094d1e70d546177671276eba0cf2 WHIRLPOOL 36c0d2056e11d758c86a9b3458677ed1682c80a362949660c7a23ee1e3161f622ae80ba792c10e55aae943c0431fc4c373588b3e57ded9af7e131868b48f8367
 MISC ChangeLog-2015 30467 SHA256 36b345341f9a47ef2d54bd1272e9d54fade878bc9aa0a983f52e9739c58f4a97 SHA512 e0890043839852c1b0e41962ac38e6e881e1d1b9eba6055c969b276e8a3d878a9aa0291c0b01fc8053442ab3d722ded00736b20b59cf8135df7ee617502af542 WHIRLPOOL 8fae89c873c85a58a937879bf554c316096d744a3e86c809fcc02ff8c278f5c56603af8cedf841bce462c52ccfe24c1af9550d81484b6f81c399b7066c51bff5
 MISC metadata.xml 834 SHA256 f5fe19c82f443bc060d5035e3b96d494d79de2a29963090fcca821b4e3d3226e SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616 WHIRLPOOL 7f5ecdbe61e052c3430d54a1b8b8bb6435bf1bfa15f1014db7dc5b3dd74f38f2b18029855f1db387c645211fa5db84d20cee37937ab1e2e9ab25b5e023e6a59b
diff --git a/net-analyzer/cacti/cacti-1.1.21.ebuild b/net-analyzer/cacti/cacti-1.1.21.ebuild
index 08d211285f65..b0f3b50324d5 100644
--- a/net-analyzer/cacti/cacti-1.1.21.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.21.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/cacti/cacti-1.1.25.ebuild b/net-analyzer/cacti/cacti-1.1.25.ebuild
new file mode 100644
index 000000000000..08d211285f65
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.1.25.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://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() {
+	default
+	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() {
+	dodoc docs/{CHANGELOG,txt/manual.txt}
+	dodoc -r docs/html/
+	rm -rf docs
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}