8 files changed, 6 insertions, 59 deletions
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4c0e112ce3da..eceba7dc145a 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/nagios-4.4.10 b/metadata/md5-cache/net-analyzer/nagios-4.4.10
deleted file mode 100644
index ecfe2e55e29a..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-4.4.10
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The Nagios metapackage
-EAPI=8
-HOMEPAGE=https://www.nagios.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
-LICENSE=metapackage
-RDEPEND=~net-analyzer/nagios-core-4.4.10 || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
-SLOT=0
-_md5_=3eec4a0069897a2a542c999c88d49db1
diff --git a/metadata/md5-cache/net-analyzer/nagios-4.4.14 b/metadata/md5-cache/net-analyzer/nagios-4.4.14
index 531e19521f87..758913fd0ea3 100644
--- a/metadata/md5-cache/net-analyzer/nagios-4.4.14
+++ b/metadata/md5-cache/net-analyzer/nagios-4.4.14
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=The Nagios metapackage
 EAPI=8
 HOMEPAGE=https://www.nagios.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
 LICENSE=metapackage
 RDEPEND=~net-analyzer/nagios-core-4.4.14 || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
 SLOT=0
-_md5_=9ecb0181ebbc7a72ed2547e3adaea1c4
+_md5_=04ae527ff97b99955bd1915c3577f0d2
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.10 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.10
deleted file mode 100644
index 9027fdba984e..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=acct-group/nagios acct-user/nagios virtual/mailx dev-lang/perl:= apache2? ( acct-group/apache ) lighttpd? ( acct-group/lighttpd ) web? ( app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst
-DEPEND=dev-libs/libltdl:0
-DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
-EAPI=8
-HOMEPAGE=https://www.nagios.org/
-INHERIT=systemd toolchain-funcs
-IUSE=apache2 classicui lighttpd +web vim-syntax
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/nagios acct-user/nagios virtual/mailx dev-lang/perl:= dev-libs/libltdl:0 web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( www-servers/apache[apache2_modules_alias,apache2_modules_cgi] www-servers/apache[apache2_modules_alias,apache2_modules_cgid] ( www-servers/apache[apache2_modules_alias] www-apache/mod_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.4.10.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6b92006a73880973aa0fca78745b22e0
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.14 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.14
index 98bdfb9838da..87aa1ba483c8 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.14
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.14
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nagios.org/
 INHERIT=systemd toolchain-funcs
 IUSE=apache2 classicui lighttpd +web vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/nagios acct-user/nagios virtual/mailx dev-lang/perl:= dev-libs/libltdl:0 web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( www-servers/apache[apache2_modules_alias,apache2_modules_cgi] www-servers/apache[apache2_modules_alias,apache2_modules_cgid] ( www-servers/apache[apache2_modules_alias] www-apache/mod_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.4.14.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=020c1aca27181e9d0d9c1b1625a00558
+_md5_=c67cc2becc31e4d8cd4d9a90c469c72c
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.0-r3 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.0-r3
deleted file mode 100644
index 070223e94d6a..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl
-DEFINED_PHASES=configure postinst prepare
-DEPEND=ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client )
-DESCRIPTION=Official plugins for Nagios
-EAPI=8
-HOMEPAGE=https://nagios-plugins.org/
-IUSE=ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/nagios-plugins/nagios-plugins/releases/download/release-2.4.0/nagios-plugins-2.4.0.tar.gz
-_md5_=46229ff9e1a892064783e541fb4214a0
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.2-r3 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.2-r3
deleted file mode 100644
index a7a602675335..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl
-DEFINED_PHASES=configure postinst prepare
-DEPEND=ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client )
-DESCRIPTION=Official plugins for Nagios
-EAPI=8
-HOMEPAGE=https://nagios-plugins.org/
-IUSE=ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/nagios-plugins/nagios-plugins/releases/download/release-2.4.2/nagios-plugins-2.4.2.tar.gz
-_md5_=d420af160a618f7d3700a74ccb7cc65c
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.6 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.6
index 16d81fa01680..80939029c910 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.6
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.6
@@ -5,10 +5,10 @@ DESCRIPTION=Official plugins for Nagios
 EAPI=8
 HOMEPAGE=https://nagios-plugins.org/
 IUSE=ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nagios-plugins/nagios-plugins/releases/download/release-2.4.6/nagios-plugins-2.4.6.tar.gz
-_md5_=41571b8ce7780166dc330b18d1122314
+_md5_=a8a2b426a9014a1ae80f528ac8f4ad21