gentoo resync : 19.03.2019

3 files changed, 53 insertions, 4 deletions

diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index e381c7230efa..09106afb9fc2 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -3,8 +3,10 @@ DIST cacti-1.1.20.tar.gz 8903728 BLAKE2B 0efc22726540c57d9d6af71f80e9843bfee3d84
 DIST cacti-1.1.21.tar.gz 8905650 BLAKE2B a6e579b7d846388a9b732465eecdb5694c226b5edc98c1a005bbb8c17a307fa4d6ec56342e77e68bc62302c29451527e634fbbe6a9788073f0c5608dac57b76b SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2
 DIST cacti-1.1.28.tar.gz 8953179 BLAKE2B a1a7c3e39cfdb0f47eee86131d2210fb209b351cf91b56b8584d90ef53d216ab85936d66942506415d7e2610bdf2aa5235430cc664edd05ab612815d60d42b18 SHA512 2816a78604d169951519404e4bfbf17377912efd7a8bf1ef2a262fde7414783e65ee4a6bcac7dd3175fd9942aebf475b7dbd1fe6d350f75cf88246d3561ef9e8
 DIST cacti-1.1.38.tar.gz 9081347 BLAKE2B 9f64bc7cd33187c4c744e1473409ea8998cd953c6fd047c66af6ff07d288678cbd944d2e70d0fc3838a42c7f7a9dbf7b094963391791a46bc50c3ed65ed4251f SHA512 1f91156416a9988fa149f9b8fc9fc7df904e4cf6d9a19a62d06c7de1ded99ddaec2f5b5f1a21b0effc4dee7b9c1d1911ca5aaa6113b57edc7e2f42b7969343b5
+DIST cacti-1.2.2.tar.gz 23800723 BLAKE2B 3608edd60d796dcd8c875f2611c268605813d9f4102ecac99dd71d1b7a904f7bb74031d1c5692d0af7964af9e1a13fb46a88d98bbb6961bde0696b339fe84505 SHA512 4a41aff20f06ad56f4723e52084d1a09e3b3eb017e8f1c957f700e4e2f9b12e8f0e599cb56611241c6fcc59bbd6bf957e948631f3beca72e2a7fdadacc473c65
 EBUILD cacti-1.1.20.ebuild 1260 BLAKE2B 108e6629d2899ee824b7780d16767fab184ce3728dd393cd67d71eef0dc80f519403ce36892dd12f0b625ff9497d4d33a886ffe4c8d41b62e5755401b8ed7148 SHA512 eca659c97f78a3d6c07541f9e6704a2f30b7607f4105aef14e9fb3d8f5ebfbe4a597d9caf5b0c61c1ab2077c93022e77c123f6def9dad2acb7378af8f0e0bdf0
 EBUILD cacti-1.1.21.ebuild 1263 BLAKE2B 18d258e8b49dac987da9201380a7688637c0ad4ee97937038063813ef559ffe8eeb4e364acdca2389474664a4b48f41e38e12a8e45d373dd30393d00717fdce3 SHA512 48918c9e3f8619c23e8af4dad9c806fc65dfcc5c2b7478adde44cddcf4fe3201eb4e4a9c114517f1f4f809b98a017fb24096f988fa63b29f7094f44aa85a931a
 EBUILD cacti-1.1.28.ebuild 1054 BLAKE2B 6e526ffd0439381c33d07a8535da5b4d9fff7d1a9afa51a12b119565ec99972f48989ab8e60a4c8321d25efb0336d9f6221f4e4938b9e09148d2dd1dbfccb551 SHA512 77fd43ae932a181431a05e52520a7f8f00c9d29b55367b09f2064e3482165b2339c38caabafacce3cf6252a80ea44309d89a490a25717c1ca01c33a649e365b8
-EBUILD cacti-1.1.38.ebuild 1054 BLAKE2B 6e526ffd0439381c33d07a8535da5b4d9fff7d1a9afa51a12b119565ec99972f48989ab8e60a4c8321d25efb0336d9f6221f4e4938b9e09148d2dd1dbfccb551 SHA512 77fd43ae932a181431a05e52520a7f8f00c9d29b55367b09f2064e3482165b2339c38caabafacce3cf6252a80ea44309d89a490a25717c1ca01c33a649e365b8
+EBUILD cacti-1.1.38-r1.ebuild 1034 BLAKE2B e220c9f2516146da051c316d0ba3a13cd793e13ef4d689855332fe8b771ec7b98ff07e75cf1edf50d28a25f6ad6fbe77463a4928c2abaff06012ef3708adf0b8 SHA512 b475d9cb8c6f6df43e3734ce7346c5e531c3e87d169df550581b655ca57885588f492042d8feb5ae4407ec61521740d14bbd762b6e2aae331106c84cd8fb0186
+EBUILD cacti-1.2.2.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.1.38.ebuild b/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
index 921139358544..920accbea9eb 100644
--- a/net-analyzer/cacti/cacti-1.1.38.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-php/adodb
 	net-analyzer/rrdtool[graph]
 	virtual/cron
-	virtual/mysql
 	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
 "
 
diff --git a/net-analyzer/cacti/cacti-1.2.2.ebuild b/net-analyzer/cacti/cacti-1.2.2.ebuild
new file mode 100644
index 000000000000..c44b77bddbdf
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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,pdo,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_compile() { :; }
+
+src_install() {
+	dodoc CHANGELOG
+	dodoc -r docs
+	mv docs .. || die
+
+	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
+}