gentoo resync : 15.10.2017

6 files changed, 32 insertions, 7 deletions

diff --git a/metadata/md5-cache/net-analyzer/cacti-1.1.21 b/metadata/md5-cache/net-analyzer/cacti-1.1.21
index 2d4e72a7d1e3..f2c40b9a380d 100644
--- a/metadata/md5-cache/net-analyzer/cacti-1.1.21
+++ b/metadata/md5-cache/net-analyzer/cacti-1.1.21
@@ -4,10 +4,10 @@ DESCRIPTION=Cacti is a complete frontend to rrdtool
 EAPI=6
 HOMEPAGE=https://www.cacti.net/
 IUSE=snmp doc vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 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 ) >=app-admin/webapp-config-1.50.15
 SLOT=1.1.21
 SRC_URI=https://www.cacti.net/downloads/cacti-1.1.21.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=0813341b6caff98ff767f528cd56b968
+_md5_=0d19b37db422a9f5905a702500d9d1a1
diff --git a/metadata/md5-cache/net-analyzer/cacti-1.1.25 b/metadata/md5-cache/net-analyzer/cacti-1.1.25
new file mode 100644
index 000000000000..1eb8dcd9b568
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-1.1.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Cacti is a complete frontend to rrdtool
+EAPI=6
+HOMEPAGE=https://www.cacti.net/
+IUSE=snmp doc vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+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 ) >=app-admin/webapp-config-1.50.15
+SLOT=1.1.25
+SRC_URI=https://www.cacti.net/downloads/cacti-1.1.25.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=0813341b6caff98ff767f528cd56b968
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.21 b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.21
index d081778da1db..676f97175eae 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.21
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.21
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql sys-apps/help2man
 DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=6
 HOMEPAGE=https://cacti.net/spine_info.php
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql >net-analyzer/cacti-0.8.8
 SLOT=0
 SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.1.21.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=723a39f05601d9547eed7a36add094f4
+_md5_=ccb2b9ffe6a8f394f624c80e6606f88d
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.25 b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.25
new file mode 100644
index 000000000000..d2c0f6d238b9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.25
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql sys-apps/help2man >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
+EAPI=6
+HOMEPAGE=https://cacti.net/spine_info.php
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql >net-analyzer/cacti-0.8.8
+SLOT=0
+SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.1.25.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=723a39f05601d9547eed7a36add094f4
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.3.3 b/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
index ef163f3e90c1..527b8b6b1837 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
 EAPI=6
 HOMEPAGE=http://www.nagios.org/
 IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.3.3.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=a5eaf7e950252bb51fd7ca1ca3c8a89c
+_md5_=900b834ba01026b4598ac836a0b17589
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.17-r2 b/metadata/md5-cache/net-analyzer/vnstat-1.17-r3
index 720bcb097c0c..e1c2f1cba758 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.17-r2
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.17-r3
@@ -10,4 +10,4 @@ RDEPEND=gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
 SLOT=0
 SRC_URI=http://humdi.net/vnstat/vnstat-1.17.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=b93a411bb70655929897bc961a70e5b0
+_md5_=9c0d2221be1b6d06388b128589176b95