5 files changed, 7 insertions, 35 deletions
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 606b4ba3c93c..01263e0c7085 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.10.3 b/metadata/md5-cache/www-apps/icingaweb2-2.10.3
deleted file mode 100644
index 3bf071bbecc6..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.10.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=7
-HOMEPAGE=http://www.icinga.org/
-INHERIT=depend.apache multilib
-IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.10.3 -> icingaweb2-2.10.3.tar.gz
-_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=35e2631ce3cfb69e780281db45f8b0d3
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.11.0 b/metadata/md5-cache/www-apps/icingaweb2-2.11.0
deleted file mode 100644
index ed46e641a663..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=7
-HOMEPAGE=http://www.icinga.org/
-INHERIT=depend.apache multilib
-IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.11.0 -> icingaweb2-2.11.0.tar.gz
-_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=be76ff402e41616e2b974582c1a4f1f8
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3-r1 b/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3-r1
index d4c52e1f026f..fd0f99c5fb63 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3-r1
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20200202.3-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://ikiwiki.info/
 INHERIT=perl-module
 IUSE=extras minimal test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[perl] ) extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20200202.3.orig.tar.xz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=01e7fa8659c2f05bfc3ffe98a14301b2
+_md5_=4b4cd4dba75c009bfb64b72103605e7d
diff --git a/metadata/md5-cache/www-apps/rutorrent-9999 b/metadata/md5-cache/www-apps/rutorrent-9999
index 8b1f72afb7ba..5d487a909481 100644
--- a/metadata/md5-cache/www-apps/rutorrent-9999
+++ b/metadata/md5-cache/www-apps/rutorrent-9999
@@ -1,12 +1,14 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst prepare prerm setup unpack
-DEPEND=|| ( dev-lang/php[xml,gd] dev-lang/php[xml,gd-external] ) app-admin/webapp-config >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-lang/php[xml,gd] app-admin/webapp-config
 DESCRIPTION=ruTorrent is a front-end for the popular Bittorrent client rTorrent
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/Novik/ruTorrent
+INHERIT=webapp git-r3
 IUSE=vhosts
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/httpd-php app-admin/webapp-config
 SLOT=9999
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=2aa3aa7f2ae58b6dcc67261986216186
+_md5_=04e8639b3f42cf3014f276dd87d674e9