2021-03-25 13:50:45 UTC

69 files changed, 149 insertions, 68 deletions

diff --git a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5 b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
index c68374987b46..4a3743086c2d 100644
--- a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
+++ b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd =www-servers/ap
 DESCRIPTION=High-performance backups to a server's disk
 EAPI=5
 HOMEPAGE=http://backuppc.sourceforge.net/
+INHERIT=depend.apache eutils user systemd
 IUSE=rss samba
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/CGI dev-perl/libwww-perl app-arch/tar app-arch/par2cmdline app-arch/gzip app-arch/bzip2 virtual/mta >=www-apache/mod_perl-2.0.9 www-apache/mpm_itk || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_fcgid] ) net-misc/rsync dev-perl/File-RsyncP rss? ( dev-perl/XML-RSS ) samba? ( net-fs/samba ) =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=mirror://sourceforge/backuppc/BackupPC-3.3.1.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=d8f94c6786f934899e2da3a3a53d97fa
diff --git a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1 b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
index d78df14707f8..5617fd37dde2 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
+++ b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcached dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://open-ils.org/downloads/opensrf-2.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	45b49db67094fdafbb6a16a2299e894b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	45b49db67094fdafbb6a16a2299e894b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=f29c715f169d764192478edad4970351
diff --git a/metadata/md5-cache/dev-perl/Apache-Test-1.420.0 b/metadata/md5-cache/dev-perl/Apache-Test-1.420.0
index 7becc48bd23c..a3c55564afb5 100644
--- a/metadata/md5-cache/dev-perl/Apache-Test-1.420.0
+++ b/metadata/md5-cache/dev-perl/Apache-Test-1.420.0
@@ -3,6 +3,7 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker =www-servers/apache-2* dev-lang/perl
 DESCRIPTION=Test.pm wrapper with helpers for testing Apache
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Apache-Test
+INHERIT=depend.apache perl-module
 IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND==www-servers/apache-2* dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.42.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=f460a99a8e9d1b6cd1f4e5c853aa73bf
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
index cb4e62bec044..ed56b75d722a 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -3,6 +3,7 @@ DEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=ww
 DESCRIPTION=A HTML development and delivery Perl Module
 EAPI=5
 HOMEPAGE=http://www.masonhq.com/ https://metacpan.org/release/HTML-Mason
+INHERIT=depend.apache perl-module
 IUSE=modperl test modperl
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
@@ -10,5 +11,5 @@ RDEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=w
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	45b49db67094fdafbb6a16a2299e894b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=a696a1d0d7b8e524bf7a7830208232a4
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1 b/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
index 90eea18c60a8..94b38d2683d1 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	db-use	5b886219e6035ca01d8b1c58eba91679	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	e6530f43a549f120f9396ccb852288f5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	db-use	5b886219e6035ca01d8b1c58eba91679	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	e6530f43a549f120f9396ccb852288f5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ef8cf5ea2764cfff260cab44ead594c
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.1 b/metadata/md5-cache/dev-vcs/subversion-1.14.1
index e59ea7581628..0868cdb2b35e 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	db-use	5b886219e6035ca01d8b1c58eba91679	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	e6530f43a549f120f9396ccb852288f5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	db-use	5b886219e6035ca01d8b1c58eba91679	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	e6530f43a549f120f9396ccb852288f5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ee0cbf59e33157c843a213c676cc5c8
diff --git a/metadata/md5-cache/net-wireless/unifi-6.1.71 b/metadata/md5-cache/net-wireless/unifi-6.1.71
new file mode 100644
index 000000000000..3d575c41447a
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.1.71
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=7
+HOMEPAGE=https://www.ubnt.com
+INHERIT=systemd
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.1
+SRC_URI=https://dl.ui.com/unifi/6.1.71-de70ef60fe/UniFi.unix.zip -> unifi-6.1.71.zip
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741
+_md5_=205a0265ed60f04cb32f6c0db1acaf7a
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.6.2-r1 b/metadata/md5-cache/sci-geosciences/mapserver-7.6.2-r1
index f781b38d2f6f..267396210cd5 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-7.6.2-r1
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.6.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.6.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	depend.apache	94458fe4e9466f4803360408e60e11fd	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	webapp	1d03df021d958f89f4cc78e289d0b116
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	webapp	1d03df021d958f89f4cc78e289d0b116
 _md5_=d9d9e91a3aa2e888c7bd0c9cab32d4f1
diff --git a/metadata/md5-cache/www-apache/libapreq2-2.13-r1 b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
index 8196e6036756..2691532f7e6d 100644
--- a/metadata/md5-cache/www-apache/libapreq2-2.13-r1
+++ b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
@@ -3,11 +3,12 @@ DEPEND=perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apa
 DESCRIPTION=A library for manipulating client request data via the Apache API
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/apreq/
+INHERIT=apache-module perl-module multilib
 IUSE=perl
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
 SLOT=2
 SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.13.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	45b49db67094fdafbb6a16a2299e894b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=30bf1d6ae5e8d435290aafc0b7cffaaf
diff --git a/metadata/md5-cache/www-apache/libapreq2-2.15-r1 b/metadata/md5-cache/www-apache/libapreq2-2.15-r1
index 1aa78c94ba7a..9f3620146804 100644
--- a/metadata/md5-cache/www-apache/libapreq2-2.15-r1
+++ b/metadata/md5-cache/www-apache/libapreq2-2.15-r1
@@ -3,6 +3,7 @@ DEPEND=|| ( dev-libs/apr-util[openssl] dev-libs/apr-util[libressl] dev-libs/apr-
 DESCRIPTION=A library for manipulating client request data via the Apache API
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/apreq/
+INHERIT=apache-module perl-module
 IUSE=perl test
 KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=|| ( dev-libs/apr-util[openssl] dev-libs/apr-util[libressl] dev-libs/apr
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.15.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=7e8020c147239f50049396c51b0b8690
diff --git a/metadata/md5-cache/www-apache/libapreq2-2.16 b/metadata/md5-cache/www-apache/libapreq2-2.16
new file mode 100644
index 000000000000..dad58e561241
--- /dev/null
+++ b/metadata/md5-cache/www-apache/libapreq2-2.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=|| ( dev-libs/apr-util[openssl] dev-libs/apr-util[libressl] dev-libs/apr-util[nss] ) perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) sys-apps/file test? ( dev-perl/Apache-Test ) =www-servers/apache-2* dev-lang/perl
+DESCRIPTION=A library for manipulating client request data via the Apache API
+EAPI=6
+HOMEPAGE=https://httpd.apache.org/apreq/
+INHERIT=apache-module perl-module
+IUSE=perl test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=|| ( dev-libs/apr-util[openssl] dev-libs/apr-util[libressl] dev-libs/apr-util[nss] ) perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) =www-servers/apache-2* dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.16.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=370ff8fc533a42c1cecae9a4888f803e
diff --git a/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2 b/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
index 52c11af8faa9..1d2f61f0a504 100644
--- a/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
+++ b/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
@@ -3,10 +3,11 @@ DEPEND=virtual/krb5 =www-servers/apache-2*
 DESCRIPTION=An Apache authentication module using Kerberos
 EAPI=5
 HOMEPAGE=http://modauthkerb.sourceforge.net/
+INHERIT=apache-module eutils tmpfiles
 KEYWORDS=amd64 x86
 LICENSE=BSD openafs-krb5-a HPND
 RDEPEND=virtual/krb5 =www-servers/apache-2* virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/modauthkerb/mod_auth_kerb-5.4.tar.gz https://dev.gentoo.org/~mgorny/dist/mod_auth_kerb-5.4-gentoo-patchset.tar.bz2
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=4d73953c47a3bfc31612d4182719c06b
diff --git a/metadata/md5-cache/www-apache/mod_auth_radius-1.5.8 b/metadata/md5-cache/www-apache/mod_auth_radius-1.5.8
index d58f61a938cd..4c3bccb352f6 100644
--- a/metadata/md5-cache/www-apache/mod_auth_radius-1.5.8
+++ b/metadata/md5-cache/www-apache/mod_auth_radius-1.5.8
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=Radius authentication for Apache
 EAPI=5
 HOMEPAGE=http://freeradius.org/mod_auth_radius/
+INHERIT=apache-module eutils
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/mod_auth_radius-1.5.8.tar
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=71692ea18eb6b11f69cdb62ca19d8a5e
diff --git a/metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r1 b/metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r1
index 5d2ec7859ae9..061a949d1c48 100644
--- a/metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r1
+++ b/metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r1
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl =www-servers/apache-2*
 DESCRIPTION=Apache module for cookie based authentication
 EAPI=5
 HOMEPAGE=http://www.openfusion.com.au/labs/mod_auth_tkt/
+INHERIT=apache-module eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.openfusion.com.au/labs/dist/mod_auth_tkt/mod_auth_tkt-2.1.0.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=f35dd85a4b7faea75fad4112d25575fe
diff --git a/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2 b/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
index 5ca3805459b7..2e74d9679f0d 100644
--- a/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
+++ b/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2.4*
 DESCRIPTION=An Apache2 authentication DSO using external programs
 EAPI=5
 HOMEPAGE=https://github.com/phokz/mod-auth-external
+INHERIT=eutils apache-module
 KEYWORDS=amd64 x86
 LICENSE=Apache-1.1
 RDEPEND==www-servers/apache-2.4*
 SLOT=2
 SRC_URI=https://mod-auth-external.googlecode.com/files/mod_authnz_external-3.3.2.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=529d4d824c4224a00a1a8c9ced88aa84
diff --git a/metadata/md5-cache/www-apache/mod_authnz_external-3.3.3 b/metadata/md5-cache/www-apache/mod_authnz_external-3.3.3
index 50f03920c9fa..39415e9bcf05 100644
--- a/metadata/md5-cache/www-apache/mod_authnz_external-3.3.3
+++ b/metadata/md5-cache/www-apache/mod_authnz_external-3.3.3
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2.4*
 DESCRIPTION=An Apache2 authentication DSO using external programs
 EAPI=6
 HOMEPAGE=https://github.com/phokz/mod-auth-external
+INHERIT=apache-module
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-1.1
 RDEPEND==www-servers/apache-2.4*
 SLOT=2
 SRC_URI=https://github.com/phokz/mod-auth-external/archive/mod_authnz_external-3.3.3.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=f246b9d782fe9d8332439f99afceef89
diff --git a/metadata/md5-cache/www-apache/mod_authnz_external-9999 b/metadata/md5-cache/www-apache/mod_authnz_external-9999
index 93cb785baa5e..b5dd37dd6de4 100644
--- a/metadata/md5-cache/www-apache/mod_authnz_external-9999
+++ b/metadata/md5-cache/www-apache/mod_authnz_external-9999
@@ -3,9 +3,10 @@ DEPEND==www-servers/apache-2.4* >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=An Apache2 authentication DSO using external programs
 EAPI=6
 HOMEPAGE=https://github.com/phokz/mod-auth-external
+INHERIT=apache-module git-r3
 LICENSE=Apache-1.1
 PROPERTIES=live
 RDEPEND==www-servers/apache-2.4*
 SLOT=2
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=f246b9d782fe9d8332439f99afceef89
diff --git a/metadata/md5-cache/www-apache/mod_authz_unixgroup-1.1.0 b/metadata/md5-cache/www-apache/mod_authz_unixgroup-1.1.0
index 4ee4cb7fed56..8b5404896331 100644
--- a/metadata/md5-cache/www-apache/mod_authz_unixgroup-1.1.0
+++ b/metadata/md5-cache/www-apache/mod_authz_unixgroup-1.1.0
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2.4*
 DESCRIPTION=An Apache2 authorization DSO using unix groups
 EAPI=6
 HOMEPAGE=https://github.com/phokz/mod-auth-external
+INHERIT=apache-module
 KEYWORDS=amd64
 LICENSE=Apache-1.1
 RDEPEND==www-servers/apache-2.4*
 SLOT=0
 SRC_URI=https://github.com/phokz/mod-auth-external/archive/mod_authz_unixgroup-1.1.0.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=0ff9a756bc6e2b18a3e2dd6816535cb7
diff --git a/metadata/md5-cache/www-apache/mod_authz_unixgroup-9999 b/metadata/md5-cache/www-apache/mod_authz_unixgroup-9999
index 20f8d698eddd..3d2704473723 100644
--- a/metadata/md5-cache/www-apache/mod_authz_unixgroup-9999
+++ b/metadata/md5-cache/www-apache/mod_authz_unixgroup-9999
@@ -3,9 +3,10 @@ DEPEND==www-servers/apache-2.4* >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=An Apache2 authorization DSO using unix groups
 EAPI=6
 HOMEPAGE=https://github.com/phokz/mod-auth-external
+INHERIT=apache-module git-r3
 LICENSE=Apache-1.1
 PROPERTIES=live
 RDEPEND==www-servers/apache-2.4*
 SLOT=0
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=bde13880107a0121cb91006bcdb2b01c
diff --git a/metadata/md5-cache/www-apache/mod_backtrace-2.01 b/metadata/md5-cache/www-apache/mod_backtrace-2.01
index f0096620f043..3993d9ee8cb6 100644
--- a/metadata/md5-cache/www-apache/mod_backtrace-2.01
+++ b/metadata/md5-cache/www-apache/mod_backtrace-2.01
@@ -3,11 +3,12 @@ DEPEND==www-servers/apache-2*[debug] unwind? ( sys-libs/libunwind ) app-arch/unz
 DESCRIPTION=Debug segmentation faults in Apache threads
 EAPI=5
 HOMEPAGE=https://emptyhammock.com/projects/httpd/diag/
+INHERIT=apache-module depend.apache
 IUSE=unwind
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2*[debug] unwind? ( sys-libs/libunwind ) =www-servers/apache-2*
 SLOT=0
 SRC_URI=https://emptyhammock.com/downloads/wku_bt-2.01.zip
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=037f9117045f18f25a2b6435045a171f
diff --git a/metadata/md5-cache/www-apache/mod_bw-0.9.2-r1 b/metadata/md5-cache/www-apache/mod_bw-0.9.2-r1
index 158a41953f64..202485cc8130 100644
--- a/metadata/md5-cache/www-apache/mod_bw-0.9.2-r1
+++ b/metadata/md5-cache/www-apache/mod_bw-0.9.2-r1
@@ -3,10 +3,11 @@ DEPEND=sys-devel/libtool =www-servers/apache-2*
 DESCRIPTION=Bandwidth Management Module for Apache2
 EAPI=5
 HOMEPAGE=http://www.ivn.cl/apache/
+INHERIT=apache-module eutils
 KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=http://ivn.cl/files/source/mod_bw-0.92.tgz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=668d0df7928033f687b7e468120f42c8
diff --git a/metadata/md5-cache/www-apache/mod_caucho-4.0.47 b/metadata/md5-cache/www-apache/mod_caucho-4.0.47
index 9d02a05df9d1..fc323d41746f 100644
--- a/metadata/md5-cache/www-apache/mod_caucho-4.0.47
+++ b/metadata/md5-cache/www-apache/mod_caucho-4.0.47
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2.4*
 DESCRIPTION=mod_caucho connects Resin and Apache2
 EAPI=5
 HOMEPAGE=http://www.caucho.com/
+INHERIT=eutils apache-module
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND==www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.47-src.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=0bbed836d8017b6ea1cf46bb215adf2f
diff --git a/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1 b/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1
index 967c152b6ce5..1b82cdee4f53 100644
--- a/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1
+++ b/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=mod_common_redirect implements common redirects without mod_rewrite overhead
 EAPI=6
 HOMEPAGE=https://github.com/hollow/mod_common_redirect
+INHERIT=apache-module
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=https://nodeload.github.com/hollow/mod_common_redirect/tarball/v0.1.1 -> mod_common_redirect-0.1.1.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=5f8b388dbf51dbc63fc0d1ca27599f97
diff --git a/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1 b/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
index cfdc838bdd87..59252192d26d 100644
--- a/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
+++ b/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
@@ -3,10 +3,11 @@ DEPEND=net-dns/avahi[dbus] =www-servers/apache-2*
 DESCRIPTION=mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi
 EAPI=5
 HOMEPAGE=http://0pointer.de/lennart/projects/mod_dnssd/
+INHERIT=apache-module eutils
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=net-dns/avahi[dbus] =www-servers/apache-2*
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-0.6.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=34b5d2146d417cd099d28ae6862201eb
diff --git a/metadata/md5-cache/www-apache/mod_evasive-1.10.1-r1 b/metadata/md5-cache/www-apache/mod_evasive-1.10.1-r1
index 96e3a81f3410..ffe75a6d8cbc 100644
--- a/metadata/md5-cache/www-apache/mod_evasive-1.10.1-r1
+++ b/metadata/md5-cache/www-apache/mod_evasive-1.10.1-r1
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2.4*
 DESCRIPTION=Evasive maneuvers module for the event of an HTTP DoS
 EAPI=5
 HOMEPAGE=https://github.com/jzdziarski/mod_evasive
+INHERIT=apache-module eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND==www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://www.zdziarski.com/projects/mod_evasive/mod_evasive_1.10.1.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=e5d500bd23e21c7bf04e2baf87454f31
diff --git a/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015 b/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015
index 4279a9db181c..9e624ea86cee 100644
--- a/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015
+++ b/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015
@@ -3,11 +3,12 @@ DEPEND==www-servers/apache-2.4*
 DESCRIPTION=Rewrites X-Forwarded-For to REMOTE_ADDR for reverse proxy configurations
 EAPI=5
 HOMEPAGE=http://www.openinfo.co.uk/apache/index.html
+INHERIT=apache-module
 IUSE=mod-proxy
 KEYWORDS=amd64 x86
 LICENSE=Apache-1.1
 RDEPEND=mod-proxy? ( www-servers/apache[apache2_modules_proxy_connect] ) =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/maintainer-needed/mod_extract_forwarded-2.0.3_pre2015052015.tar.xz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=ebc7aa093148591fee5f816b7b7eac70
diff --git a/metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r2 b/metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r2
index 44d7e926ee79..8b40714caa5f 100644
--- a/metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r2
+++ b/metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r2
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=A simple FastCGI handler module
 EAPI=7
 HOMEPAGE=https://github.com/hollow/mod_fastcgi_handler
+INHERIT=apache-module
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=https://github.com/hollow/mod_fastcgi_handler/archive/v0.6.tar.gz -> mod_fastcgi_handler-0.6.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=62b5ce37546e24b64d7b2831af100094
diff --git a/metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1 b/metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1
index 8fdf558b78aa..f45c5076839e 100644
--- a/metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1
+++ b/metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=Binary-compatible alternative to mod_fastcgi with better process management
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/mod_fcgid/
+INHERIT=apache-module eutils multilib
 KEYWORDS=amd64 ~hppa ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://apache/httpd/mod_fcgid/mod_fcgid-2.3.9.tar.bz2
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=8bf290e957a16a796fb6e1a485da8857
diff --git a/metadata/md5-cache/www-apache/mod_gnutls-0.11.0 b/metadata/md5-cache/www-apache/mod_gnutls-0.11.0
index cb8db8657556..3bd9e15fca42 100644
--- a/metadata/md5-cache/www-apache/mod_gnutls-0.11.0
+++ b/metadata/md5-cache/www-apache/mod_gnutls-0.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/gnutls-3.3.0:=[pkcs11] =www-servers/apache-2.4*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mod.gnutls.org/downloads/mod_gnutls-0.11.0.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=ab32abd7e70fedc950e3f069df2b2306
diff --git a/metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r2 b/metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r2
index 706e1425220e..fbc28e44c821 100644
--- a/metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r2
+++ b/metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/gnutls-3.3.0:=[pkcs11] =www-servers/apache-2.4*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mod.gnutls.org/downloads/mod_gnutls-0.8.2.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=a4d0227851187e7cfdb5ded1039d8c5b
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.15.16 b/metadata/md5-cache/www-apache/mod_h2-1.15.16
index b2ee8ceae244..db5c46fea38c 100644
--- a/metadata/md5-cache/www-apache/mod_h2-1.15.16
+++ b/metadata/md5-cache/www-apache/mod_h2-1.15.16
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=https://github.com/icing/mod_h2/archive/v1.15.16.tar.gz -> mod_h2-1.15.16.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=aa19076ea90409c8366c7e5f87f72075
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.15.17 b/metadata/md5-cache/www-apache/mod_h2-1.15.17
index 71cc46b50e96..07d5c033b209 100644
--- a/metadata/md5-cache/www-apache/mod_h2-1.15.17
+++ b/metadata/md5-cache/www-apache/mod_h2-1.15.17
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=https://github.com/icing/mod_h2/archive/v1.15.17.tar.gz -> mod_h2-1.15.17.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=0e8d90210d24cc1a4b8a33c9dfc30881
diff --git a/metadata/md5-cache/www-apache/mod_h2-9999 b/metadata/md5-cache/www-apache/mod_h2-9999
index 994dac72647d..4366c4024b56 100644
--- a/metadata/md5-cache/www-apache/mod_h2-9999
+++ b/metadata/md5-cache/www-apache/mod_h2-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=aa19076ea90409c8366c7e5f87f72075
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.42 b/metadata/md5-cache/www-apache/mod_jk-1.2.42
index f9593fc7ea9c..d6f299671250 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.42
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.42
@@ -3,11 +3,12 @@ DEPEND=java? ( >=virtual/jdk-1.4 ) =www-servers/apache-2* java? ( >=dev-java/jav
 DESCRIPTION=JK module for connecting Tomcat and Apache using the ajp13 protocol
 EAPI=5
 HOMEPAGE=https://tomcat.apache.org/connectors-doc/
+INHERIT=apache-module java-pkg-opt-2 readme.gentoo-r1
 IUSE=java elibc_FreeBSD java
 KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=2172363acfc09e49266a84195e4758c7
diff --git a/metadata/md5-cache/www-apache/mod_ldap_userdir-1.1.19 b/metadata/md5-cache/www-apache/mod_ldap_userdir-1.1.19
index b3dac1c34892..df8c09f6b9ca 100644
--- a/metadata/md5-cache/www-apache/mod_ldap_userdir-1.1.19
+++ b/metadata/md5-cache/www-apache/mod_ldap_userdir-1.1.19
@@ -3,11 +3,12 @@ DEPEND=net-nds/openldap ssl? ( dev-libs/openssl ) =www-servers/apache-2*
 DESCRIPTION=Look up Apache ~user directories in an LDAP directory
 EAPI=5
 HOMEPAGE=https://www.horde.net/~jwm/software/mod_ldap_userdir/
+INHERIT=apache-module depend.apache
 IUSE=ssl
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-1
 RDEPEND=net-nds/openldap ssl? ( dev-libs/openssl ) =www-servers/apache-2*[ldap] =www-servers/apache-2*
 SLOT=0
 SRC_URI=https://horde.net/~jwm/software/mod_ldap_userdir/mod_ldap_userdir-1.1.19.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=15f068a2fe98e26904a377cbd166424f
diff --git a/metadata/md5-cache/www-apache/mod_limitipconn-0.24-r3 b/metadata/md5-cache/www-apache/mod_limitipconn-0.24-r3
index 1fa42937e2bf..0acd41423a86 100644
--- a/metadata/md5-cache/www-apache/mod_limitipconn-0.24-r3
+++ b/metadata/md5-cache/www-apache/mod_limitipconn-0.24-r3
@@ -3,11 +3,12 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=Limit the number of simultaneous apache connections
 EAPI=5
 HOMEPAGE=https://dominia.org/djao/limitipconn2.html
+INHERIT=apache-module
 KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=www-servers/apache[apache2_modules_status] =www-servers/apache-2*
 RESTRICT=test
 SLOT=2
 SRC_URI=https://dominia.org/djao/limit/mod_limitipconn-0.24.tar.bz2
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=591564117b2dfe195aea6947a09c59ef
diff --git a/metadata/md5-cache/www-apache/mod_log_rotate-1.01 b/metadata/md5-cache/www-apache/mod_log_rotate-1.01
index df1d3de55fc2..14624046ca63 100644
--- a/metadata/md5-cache/www-apache/mod_log_rotate-1.01
+++ b/metadata/md5-cache/www-apache/mod_log_rotate-1.01
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=Log rotation support for mod_log_config based on strftime(3)
 EAPI=5
 HOMEPAGE=https://github.com/JBlond/mod_log_rotate
+INHERIT=apache-module
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=https://github.com/JBlond/mod_log_rotate/archive/1.01.tar.gz -> mod_log_rotate-1.01.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=7d459621374740fafd92778f891fcb96
diff --git a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2 b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
index 4385416f32b9..c0ba18f2531a 100644
--- a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
+++ b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
@@ -3,11 +3,12 @@ DEPEND=virtual/mysql dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl:0 ) =www-ser
 DESCRIPTION=An Apache module for logging to an SQL (MySQL) database
 EAPI=5
 HOMEPAGE=http://www.outoforder.cc/projects/apache/mod_log_sql/
+INHERIT=apache-module eutils
 IUSE=dbi ssl
 KEYWORDS=amd64 ~ppc x86
 LICENSE=Artistic
 RDEPEND=virtual/mysql dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl:0 ) =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://www.outoforder.cc/downloads/mod_log_sql/mod_log_sql-1.101.tar.bz2
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=7200b19b3c4f3cf6bd2c55bbde6ecbb7
diff --git a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r3 b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r3
index 679b702f2627..57a0b3b9c75a 100644
--- a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r3
+++ b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r3
@@ -3,11 +3,12 @@ DEPEND=dev-db/mysql-connector-c:0= dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openss
 DESCRIPTION=An Apache module for logging to an SQL (MySQL) database
 EAPI=6
 HOMEPAGE=http://www.outoforder.cc/projects/apache/mod_log_sql/
+INHERIT=apache-module
 IUSE=dbi ssl
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Artistic
 RDEPEND=dev-db/mysql-connector-c:0= dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl:0= ) =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://www.outoforder.cc/downloads/mod_log_sql/mod_log_sql-1.101.tar.bz2
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=552744328c9c679fbb6b3f956ff61074
diff --git a/metadata/md5-cache/www-apache/mod_maxminddb-1.2.0 b/metadata/md5-cache/www-apache/mod_maxminddb-1.2.0
index da9388f0b490..964d45e1a826 100644
--- a/metadata/md5-cache/www-apache/mod_maxminddb-1.2.0
+++ b/metadata/md5-cache/www-apache/mod_maxminddb-1.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/libmaxminddb:= =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=https://github.com/maxmind/mod_maxminddb/releases/download/1.2.0/mod_maxminddb-1.2.0.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=9833380b70c6d184e0b158face4c75fa
diff --git a/metadata/md5-cache/www-apache/mod_musicindex-1.4.1-r1 b/metadata/md5-cache/www-apache/mod_musicindex-1.4.1-r1
index 42cac5d0820c..e4f3ad1bab39 100644
--- a/metadata/md5-cache/www-apache/mod_musicindex-1.4.1-r1
+++ b/metadata/md5-cache/www-apache/mod_musicindex-1.4.1-r1
@@ -3,11 +3,12 @@ DEPEND=mp3? ( media-libs/libmad media-libs/libid3tag ) mp4? ( media-libs/libmp4v
 DESCRIPTION=mod_musicindex allows nice displaying of directories containing music files
 EAPI=6
 HOMEPAGE=http://www.parisc-linux.org/~varenet/musicindex/
+INHERIT=apache-module
 IUSE=+mp3 +mp4 +flac +vorbis +cache mysql archive
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=mp3? ( media-libs/libmad media-libs/libid3tag ) mp4? ( media-libs/libmp4v2:0 ) flac? ( media-libs/flac ) vorbis? ( media-libs/libvorbis ) archive? ( app-arch/libarchive ) mysql? ( dev-db/mysql-connector-c:0= ) sys-devel/libtool =www-servers/apache-2*
 SLOT=0
 SRC_URI=http://hacks.slashdirt.org/musicindex/mod_musicindex-1.4.1.tar.gz http://validator.w3.org/feed/images/valid-rss.png -> mod_musicindex-1.4.1_valid-rss.png http://jigsaw.w3.org/css-validator/images/vcss -> mod_musicindex-1.4.1_vcss http://www.w3.org/Icons/valid-xhtml11 -> mod_musicindex-1.4.1_valid-xhtml11
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=864f354419fb73357bf186a707456e88
diff --git a/metadata/md5-cache/www-apache/mod_nss-1.0.18 b/metadata/md5-cache/www-apache/mod_nss-1.0.18
index 9360ae140a23..84c5455b7142 100644
--- a/metadata/md5-cache/www-apache/mod_nss-1.0.18
+++ b/metadata/md5-cache/www-apache/mod_nss-1.0.18
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/nspr dev-libs/nss net-dns/bind-tools =www-servers/apache-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.pagure.org/mod_nss/mod_nss-1.0.18.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=9c030f0f950aee557c45414ef634487d
diff --git a/metadata/md5-cache/www-apache/mod_perl-2.0.11 b/metadata/md5-cache/www-apache/mod_perl-2.0.11
index 1046eb616d8d..49e950b42f22 100644
--- a/metadata/md5-cache/www-apache/mod_perl-2.0.11
+++ b/metadata/md5-cache/www-apache/mod_perl-2.0.11
@@ -3,6 +3,7 @@ DEPEND=dev-lang/perl[ithreads=] >=dev-perl/Apache-Test-1.420.0 >=www-servers/apa
 DESCRIPTION=An embedded Perl interpreter for Apache2
 EAPI=5
 HOMEPAGE=https://perl.apache.org/ https://projects.apache.org/project.html?perl-mod_perl
+INHERIT=depend.apache apache-module perl-module eutils
 IUSE=debug ithreads test
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=dev-lang/perl[ithreads=] >=dev-perl/Apache-Test-1.420.0 >=www-servers/ap
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/perl/mod_perl-2.0.11.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	45b49db67094fdafbb6a16a2299e894b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=22bc3c0d639cee6e6aa2f765069ef098
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.61 b/metadata/md5-cache/www-apache/mod_qos-11.61
index 89e8c80e12a9..f1c4418c74ed 100644
--- a/metadata/md5-cache/www-apache/mod_qos-11.61
+++ b/metadata/md5-cache/www-apache/mod_qos-11.61
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.61.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=92418ea9644a530a3ac886e799bb770f
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.65 b/metadata/md5-cache/www-apache/mod_qos-11.65
index 34026de1c6ae..db7f97e465d0 100644
--- a/metadata/md5-cache/www-apache/mod_qos-11.65
+++ b/metadata/md5-cache/www-apache/mod_qos-11.65
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.65.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=95be113db6ed7e561aff3f34f8ac548b
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.66 b/metadata/md5-cache/www-apache/mod_qos-11.66
index 75ddb06e0714..47bb2dd41bc0 100644
--- a/metadata/md5-cache/www-apache/mod_qos-11.66
+++ b/metadata/md5-cache/www-apache/mod_qos-11.66
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre:3 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.66.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=c224e1e7162a99b0a0c1cb0c189996c5
diff --git a/metadata/md5-cache/www-apache/mod_rpaf-0.6-r1 b/metadata/md5-cache/www-apache/mod_rpaf-0.6-r1
index e153145c9413..b8242232f2d8 100644
--- a/metadata/md5-cache/www-apache/mod_rpaf-0.6-r1
+++ b/metadata/md5-cache/www-apache/mod_rpaf-0.6-r1
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2.4*
 DESCRIPTION=Reverse proxy add forward module
 EAPI=5
 HOMEPAGE=http://stderr.net/apache/rpaf/
+INHERIT=apache-module eutils
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://stderr.net/apache/rpaf/download/mod_rpaf-0.6.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=cde13531836cc63cc52a2cd4732818e6
diff --git a/metadata/md5-cache/www-apache/mod_security-2.9.3-r100 b/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
index d9dd89b2e71a..36f5ab2eeb2f 100644
--- a/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
+++ b/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
@@ -14,5 +14,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	94458fe4e9466f4803360408e60e11fd	apache-module	b40f49b22e6e55c4a17f7ecded4f0425	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
 _md5_=208d4db6e8b0e0f159a33c19977dabd8
diff --git a/metadata/md5-cache/www-apache/mod_vdbh-1.0.3-r2 b/metadata/md5-cache/www-apache/mod_vdbh-1.0.3-r2
index bee890c20c0a..8dd7a8c0358e 100644
--- a/metadata/md5-cache/www-apache/mod_vdbh-1.0.3-r2
+++ b/metadata/md5-cache/www-apache/mod_vdbh-1.0.3-r2
@@ -3,10 +3,11 @@ DEPEND=dev-db/mysql-connector-c:= >=sys-libs/zlib-1.1.4 =www-servers/apache-2*
 DESCRIPTION=An Apache2 module for mass virtual hosting using a MySQL database
 EAPI=6
 HOMEPAGE=http://www.synthemesc.com/mod_vdbh/
+INHERIT=apache-module
 KEYWORDS=ppc x86
 LICENSE=Apache-1.1
 RDEPEND=dev-db/mysql-connector-c:= >=sys-libs/zlib-1.1.4 =www-servers/apache-2*
 SLOT=0
 SRC_URI=http://www.synthemesc.com/downloads/mod_vdbh/mod_vdbh-1.0.3.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=71895d8a4ea30aebabf5ed07de448f15
diff --git a/metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1 b/metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
index 1c5f07b7bcdf..652fd18e0d31 100644
--- a/metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
+++ b/metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/apr-util[ldap] =www-servers/apache-2.4*
 DESCRIPTION=Store and configure Apache virtual hosts using LDAP
 EAPI=5
 HOMEPAGE=https://github.com/oerdnj/mod-vhost-ldap
+INHERIT=apache-module
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2.4*[ldap] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/mod_vhost_ldap-2.4.0.tar.xz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=2615019b564ea3d223ee7b9001e1c44e
diff --git a/metadata/md5-cache/www-apache/mod_whatkilledus-2.01 b/metadata/md5-cache/www-apache/mod_whatkilledus-2.01
index 68adc4491f23..838b17e83830 100644
--- a/metadata/md5-cache/www-apache/mod_whatkilledus-2.01
+++ b/metadata/md5-cache/www-apache/mod_whatkilledus-2.01
@@ -3,10 +3,11 @@ DEPEND=>=www-apache/mod_backtrace-2.01 =www-servers/apache-2*[debug] app-arch/un
 DESCRIPTION=Debug segmentation faults in Apache threads
 EAPI=5
 HOMEPAGE=https://emptyhammock.com/projects/httpd/diag/
+INHERIT=apache-module depend.apache
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=www-apache/mod_backtrace-2.01 =www-servers/apache-2*[debug] =www-servers/apache-2*
 SLOT=0
 SRC_URI=https://emptyhammock.com/downloads/wku_bt-2.01.zip
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=c97741559b7b8eb911b575cf5cac5205
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.7.0 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
index a0e955522252..0320f4204fb2 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
@@ -3,6 +3,7 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=5
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
+INHERIT=apache-module eutils python-single-r1
 IUSE=+python_single_target_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.0.tar.gz -> mod_wsgi-4.7.0.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=d4c13d57f3102ca9de2c5bd029ec1f5e
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
index 4140ab0cbbeb..0fe336ca467a 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
@@ -3,6 +3,7 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=6
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
+INHERIT=apache-module eutils python-single-r1
 IUSE=python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.1.tar.gz -> mod_wsgi-4.7.1.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=c3c451f35fd84a103f858062aafb5de2
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
index 8e70d3e1c8d6..fa5e718e1b2e 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
@@ -3,6 +3,7 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=6
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
+INHERIT=apache-module eutils python-single-r1
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.1.tar.gz -> mod_wsgi-4.7.1.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=ad4db5f79f9274080db68d2d4e4fea6a
diff --git a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r1 b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r1
index 758664751eab..800bb98ebebc 100644
--- a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r1
+++ b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r1
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=Apache module that processes X-SENDFILE headers registered by the output handler
 EAPI=6
 HOMEPAGE=https://tn123.org/mod_xsendfile/
+INHERIT=apache-module
 KEYWORDS=amd64 sparc x86 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=https://tn123.org/mod_xsendfile/beta/mod_xsendfile-1.0b1.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=b544bb64accc34657c5ab2454e052b30
diff --git a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r2 b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r2
index f4a247e7cb15..55b2062fca64 100644
--- a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r2
+++ b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r2
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=Apache module that processes X-SENDFILE headers registered by the output handler
 EAPI=7
 HOMEPAGE=https://tn123.org/mod_xsendfile/
+INHERIT=apache-module
 KEYWORDS=~amd64 ~sparc ~x86 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=https://tn123.org/mod_xsendfile/beta/mod_xsendfile-1.0b1.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f
 _md5_=05e6b439393d5e33398f195121f9aa7f
diff --git a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1 b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
index 49ab52ea25a4..fd41ffcaf54e 100644
--- a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
+++ b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
@@ -3,11 +3,12 @@ DEPEND=sys-libs/libcap >=www-servers/apache-2.4.7[-threads] =www-servers/apache-
 DESCRIPTION=Run virtual hosts under separate users/groups
 EAPI=5
 HOMEPAGE=http://mpm-itk.sesse.net/
+INHERIT=apache-module linux-info
 IUSE=kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=sys-libs/libcap >=www-servers/apache-2.4.7[-threads] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://mpm-itk.sesse.net/mpm-itk-2.4.7-04.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955
 _md5_=e2302fb4dc670544053645a47efc57a2
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.4 b/metadata/md5-cache/www-apache/passenger-6.0.4
index 8b59b1fd9250..ff0108293493 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.4
+++ b/metadata/md5-cache/www-apache/passenger-6.0.4
@@ -3,6 +3,7 @@ DEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targe
 DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
+INHERIT=apache-module flag-o-matic multilib ruby-ng toolchain-funcs
 IUSE=apache2 debug test apache2 ruby_targets_ruby25 ruby_targets_ruby26
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.4.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	676004cfb6cdf3dedf1c778d56346624
 _md5_=5d313558f910db8c0bc191f385b8c200
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.5 b/metadata/md5-cache/www-apache/passenger-6.0.5
index d8f764edb76b..942707c3eab3 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.5
+++ b/metadata/md5-cache/www-apache/passenger-6.0.5
@@ -3,6 +3,7 @@ DEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targe
 DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
+INHERIT=apache-module flag-o-matic multilib ruby-ng toolchain-funcs
 IUSE=apache2 debug test apache2 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.5.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	676004cfb6cdf3dedf1c778d56346624
 _md5_=33e56c306ef92d3094a4216f5567c976
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.6 b/metadata/md5-cache/www-apache/passenger-6.0.6
index 77036a6987d7..5b84e697616b 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.6
+++ b/metadata/md5-cache/www-apache/passenger-6.0.6
@@ -3,6 +3,7 @@ DEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targe
 DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
+INHERIT=apache-module flag-o-matic multilib ruby-ng toolchain-funcs
 IUSE=apache2 debug test apache2 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.6.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	676004cfb6cdf3dedf1c778d56346624
 _md5_=7750c5e4334fc42ca59f5972e92c1e54
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.7 b/metadata/md5-cache/www-apache/passenger-6.0.7
index 9a954a48fb88..3c65b93cc8de 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.7
+++ b/metadata/md5-cache/www-apache/passenger-6.0.7
@@ -3,6 +3,7 @@ DEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targe
 DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
+INHERIT=apache-module flag-o-matic multilib ruby-ng toolchain-funcs
 IUSE=apache2 debug test apache2 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.7.tar.gz
-_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	676004cfb6cdf3dedf1c778d56346624
 _md5_=ee3d2dadafa67fbd1c19688c7bb08c02
diff --git a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1 b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
index 4880175f942a..b65404a2151b 100644
--- a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
+++ b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
@@ -3,11 +3,12 @@ DEPEND==dev-lang/perl-5* =www-apache/libapreq2-2*[perl] >=media-libs/imlib2-1.0.
 DESCRIPTION=Apache gallery for mod_perl
 EAPI=5
 HOMEPAGE=http://apachegallery.dk/
+INHERIT=depend.apache perl-module webapp
 IUSE=vhosts
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND==www-servers/apache-2* dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://apachegallery.dk/download/Apache-Gallery-1.0RC3.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	45b49db67094fdafbb6a16a2299e894b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	webapp	1d03df021d958f89f4cc78e289d0b116
 _md5_=515d15d87102abe27871d4f16b37f452
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.8.2 b/metadata/md5-cache/www-apps/icingaweb2-2.8.2
index 0117005f9992..b1473701dcfc 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.8.2
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.8.2
@@ -3,6 +3,7 @@ DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagem
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
+INHERIT=depend.apache eutils multilib
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/image
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.8.2 -> icingaweb2-2.8.2.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=a7cbeeb009d6131dfa270fd951967d81
diff --git a/metadata/md5-cache/www-apps/icingaweb2-9999 b/metadata/md5-cache/www-apps/icingaweb2-9999
index fa8c3ea03b0f..ae12dca79e4c 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-9999
+++ b/metadata/md5-cache/www-apps/icingaweb2-9999
@@ -3,11 +3,12 @@ DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagem
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
+INHERIT=depend.apache eutils multilib user git-r3
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 LICENSE=GPL-2
 PROPERTIES=live
 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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=d8281571b0cc310e442a29b8687bdd9a
diff --git a/metadata/md5-cache/www-apps/redmine-4.1.1-r1 b/metadata/md5-cache/www-apps/redmine-4.1.1-r1
index 6236984e7278..3b7a99148786 100644
--- a/metadata/md5-cache/www-apps/redmine-4.1.1-r1
+++ b/metadata/md5-cache/www-apps/redmine-4.1.1-r1
@@ -3,6 +3,7 @@ DEPEND=ruby_targets_ruby25? ( fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby25(-)] )
 DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
 EAPI=6
 HOMEPAGE=https://www.redmine.org/
+INHERIT=depend.apache ruby-ng
 IUSE=imagemagick fastcgi ldap markdown mysql passenger postgres sqlite ruby_targets_ruby25 ruby_targets_ruby26
 KEYWORDS=~amd64
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=acct-group/redmine acct-user/redmine ruby_targets_ruby25? ( dev-lang/rub
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://www.redmine.org/releases/redmine-4.1.1.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	676004cfb6cdf3dedf1c778d56346624
 _md5_=60b5737f516bb65bf8c1cb6f3fff21b1
diff --git a/metadata/md5-cache/www-apps/rt-4.4.4 b/metadata/md5-cache/www-apps/rt-4.4.4
index 806ab0a2b814..6beccea7cbf0 100644
--- a/metadata/md5-cache/www-apps/rt-4.4.4
+++ b/metadata/md5-cache/www-apps/rt-4.4.4
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=
 DESCRIPTION=RT is an enterprise-grade ticketing system
 EAPI=6
 HOMEPAGE=https://www.bestpractical.com/rt/
+INHERIT=webapp eutils depend.apache user
 IUSE=mysql +postgres fastcgi lighttpd vhosts
 KEYWORDS=~amd64
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ REQUIRED_USE=^^ ( mysql postgres )
 RESTRICT=test
 SLOT=4.4.4
 SRC_URI=https://download.bestpractical.com/pub/rt/release/rt-4.4.4.tar.gz
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=webapp	1d03df021d958f89f4cc78e289d0b116	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8
 _md5_=98036bf9ee1ec2041daa9741afabd546
diff --git a/metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1 b/metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
index 3fd7538c3979..d9b46a635acc 100644
--- a/metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
+++ b/metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
@@ -3,10 +3,11 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=set of tools to manipulate and maintain webserver logfiles
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/log-toolkit/
+INHERIT=depend.apache
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/log-toolkit/log-toolkit-0.9.6.tar.bz2
-_eclasses_=depend.apache	94458fe4e9466f4803360408e60e11fd
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332
 _md5_=ca230131ca3e047726b2bcafca3c0ec5
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index a598b734f987..3cc52cf685b9 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -15782,7 +15782,7 @@ net-wireless/suwidgets 0.1.0-r1: graphical library containing all SigDigger's cu
 net-wireless/tempestsdr 0.0_p20200221 9999: Remote video eavesdropping using a software-defined radio platform
 net-wireless/ubertooth 2018.12.1 2020.12.1 9999: open source wireless development platform suitable for Bluetooth experimentation
 net-wireless/uhd 3.15.0.0-r100 4.0.0.0: Universal Software Radio Peripheral (USRP) Hardware Driver
-net-wireless/unifi 6.0.45 6.1.61 6.1.67 6.1.69 6.1.70: A Management Controller for Ubiquiti Networks UniFi APs
+net-wireless/unifi 6.0.45 6.1.61 6.1.67 6.1.69 6.1.70 6.1.71: A Management Controller for Ubiquiti Networks UniFi APs
 net-wireless/urh 2.9.1 9999: Universal Radio Hacker: investigate wireless protocols like a boss
 net-wireless/wavemon 0.9.3: Ncurses based monitor for IEEE 802.11 wireless LAN cards
 net-wireless/wepattack 0.1.3-r5: WLAN tool for breaking 802.11 WEP keys
@@ -18048,7 +18048,7 @@ virtual/w3m 0: Virtual for the w3m web browser
 virtual/wine 0-r7: Virtual for Wine that supports multiple variants and slotting
 virtual/yacc 0: virtual for yacc (yet another compiler compiler)
 www-apache/anyterm 1.1.29-r1: A terminal anywhere
-www-apache/libapreq2 2.13-r1 2.15-r1: A library for manipulating client request data via the Apache API
+www-apache/libapreq2 2.13-r1 2.15-r1 2.16: A library for manipulating client request data via the Apache API
 www-apache/mod_auth_kerb 5.4-r2: An Apache authentication module using Kerberos
 www-apache/mod_auth_radius 1.5.8: Radius authentication for Apache
 www-apache/mod_auth_tkt 2.1.0-r1: Apache module for cookie based authentication
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index aed7f4f3878c..b165bfacf890 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 25 Mar 2021 13:35:46 +0000
+Thu, 25 Mar 2021 13:50:45 +0000