2021-03-21 15:37:56 UTC

35 files changed, 68 insertions, 35 deletions

diff --git a/metadata/md5-cache/net-mail/courier-imap-4.18.2 b/metadata/md5-cache/net-mail/courier-imap-4.18.2
index f16a499f0c68..3dd1914f566c 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.18.2
+++ b/metadata/md5-cache/net-mail/courier-imap-4.18.2
@@ -3,6 +3,7 @@ DEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=An IMAP daemon designed specifically for maildirs
 EAPI=6
 HOMEPAGE=https://www.courier-mta.org/imap/
+INHERIT=autotools libtool readme.gentoo-r1 systemd
 IUSE=berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.18.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=8efd106b0e2c2f9d82c80cac027f8447
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.0.10 b/metadata/md5-cache/net-mail/courier-imap-5.0.10
index 283b0fd617a2..6573964a44ba 100644
--- a/metadata/md5-cache/net-mail/courier-imap-5.0.10
+++ b/metadata/md5-cache/net-mail/courier-imap-5.0.10
@@ -4,6 +4,7 @@ DEPEND=gnutls? ( net-libs/gnutls[tools] ) !gnutls? ( !libressl? ( dev-libs/opens
 DESCRIPTION=An IMAP daemon designed specifically for maildirs
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/imap/
+INHERIT=autotools libtool readme.gentoo-r1 systemd
 IUSE=berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-5.0.10.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=45598f3aaf08b2832922739ebce0a2a7
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.0.11 b/metadata/md5-cache/net-mail/courier-imap-5.0.11
index 9e317399f8b8..5cdd5e895912 100644
--- a/metadata/md5-cache/net-mail/courier-imap-5.0.11
+++ b/metadata/md5-cache/net-mail/courier-imap-5.0.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-5.0.11.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=c9f9ee9d1d199f462d1742ebb63755e4
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.0.14 b/metadata/md5-cache/net-mail/courier-imap-5.0.14
index 5bbfb8ad54ae..95fd416e0086 100644
--- a/metadata/md5-cache/net-mail/courier-imap-5.0.14
+++ b/metadata/md5-cache/net-mail/courier-imap-5.0.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-5.0.14.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=ca498fe03fc15e02a900cddce209cbd7
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.0.7 b/metadata/md5-cache/net-mail/courier-imap-5.0.7
index 73eff35dedbe..0b512028b810 100644
--- a/metadata/md5-cache/net-mail/courier-imap-5.0.7
+++ b/metadata/md5-cache/net-mail/courier-imap-5.0.7
@@ -4,6 +4,7 @@ DEPEND=gnutls? ( net-libs/gnutls[tools] ) !gnutls? ( !libressl? ( dev-libs/opens
 DESCRIPTION=An IMAP daemon designed specifically for maildirs
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/imap/
+INHERIT=autotools libtool readme.gentoo-r1 systemd
 IUSE=berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-5.0.7.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=deda9d85911b2750d1fb02b8b38ca73d
diff --git a/metadata/md5-cache/net-mail/courier-imap-5.0.8 b/metadata/md5-cache/net-mail/courier-imap-5.0.8
index 706489fd31ee..de2cbc600c6d 100644
--- a/metadata/md5-cache/net-mail/courier-imap-5.0.8
+++ b/metadata/md5-cache/net-mail/courier-imap-5.0.8
@@ -4,6 +4,7 @@ DEPEND=gnutls? ( net-libs/gnutls[tools] ) !gnutls? ( !libressl? ( dev-libs/opens
 DESCRIPTION=An IMAP daemon designed specifically for maildirs
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/imap/
+INHERIT=autotools libtool readme.gentoo-r1 systemd
 IUSE=berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( berkdb gdbm )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-5.0.8.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=47d24a42a1108efbd760ff01218973c2
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13
index e3cb69120459..ee97fab5ce6e 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.13
@@ -4,6 +4,7 @@ DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-li
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=7
 HOMEPAGE=https://www.cyrusimap.org/
+INHERIT=autotools flag-o-matic pam ssl-cert
 IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
 KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD-with-attribution GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sql
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.13/cyrus-imapd-3.0.13.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	ssl-cert	8bf95e2477512d096a10bf218de41d5e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2	ssl-cert	8bf95e2477512d096a10bf218de41d5e
 _md5_=8f45e96ad8ba9910cf31aec3dd54b52a
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
index 1d4822b5d134..fbc7974502e0 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
@@ -4,6 +4,7 @@ DEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-li
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=7
 HOMEPAGE=https://www.cyrusimap.org/
+INHERIT=autotools flag-o-matic pam ssl-cert
 IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
 KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=BSD-with-attribution GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sql
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.14/cyrus-imapd-3.0.14.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	ssl-cert	8bf95e2477512d096a10bf218de41d5e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2	ssl-cert	8bf95e2477512d096a10bf218de41d5e
 _md5_=9083e904dadf640a69e378fd75a4bfad
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.13-r1 b/metadata/md5-cache/net-mail/dovecot-2.3.13-r1
index b9a7a9e1970a..72a742e75208 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.13-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.13-r1
@@ -4,11 +4,12 @@ DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=7
 HOMEPAGE=https://www.dovecot.org/
+INHERIT=autotools ssl-cert systemd toolchain-funcs
 IUSE=kerberos ldap lua mysql pam postgres sqlite bzip2 lzma lz4 zlib zstd argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:0= ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) virtual/libiconv dev-libs/icu:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.13.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=2b80642a276f03d6fed6fb562f07ab87
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.13-r100 b/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
index 425a4b9ecf8e..6d02b6489481 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
@@ -4,6 +4,7 @@ DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=7
 HOMEPAGE=https://www.dovecot.org/
+INHERIT=autotools lua-single ssl-cert systemd toolchain-funcs
 IUSE=kerberos ldap lua mysql pam postgres sqlite bzip2 lzma lz4 zlib zstd argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
@@ -11,5 +12,5 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.13.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=84dce4eef012d3cabd4eabd6bc0f3bae
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.14 b/metadata/md5-cache/net-mail/dovecot-2.3.14
index 586302782615..c3c9a30ed4ac 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.14
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.14
@@ -4,6 +4,7 @@ DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=7
 HOMEPAGE=https://www.dovecot.org/
+INHERIT=autotools lua-single ssl-cert systemd toolchain-funcs
 IUSE=kerberos ldap lua mysql pam postgres sqlite bzip2 lzma lz4 zlib zstd argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1 MIT
@@ -11,5 +12,5 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.14.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.14.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.14.tar.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=79c3cc62ec8cfc8d33fe841103bc316c
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.14 b/metadata/md5-cache/net-mail/fetchmail-6.4.14
index 12e0717ed873..2314f8afd481 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.14
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.14
@@ -4,6 +4,7 @@ DEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) libr
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
 HOMEPAGE=https://www.fetchmail.info/
+INHERIT=autotools python-single-r1 systemd tmpfiles toolchain-funcs
 IUSE=ssl nls kerberos tk socks libressl python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
@@ -11,5 +12,5 @@ RDEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) lib
 REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.14.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=c48c0e3a64cac5bc11af2a672fa901ec
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.15 b/metadata/md5-cache/net-mail/fetchmail-6.4.15
index 82a61a2b931e..509b08363f8e 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.15
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.15
@@ -4,6 +4,7 @@ DEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) libr
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
 HOMEPAGE=https://www.fetchmail.info/
+INHERIT=autotools python-single-r1 systemd tmpfiles toolchain-funcs
 IUSE=ssl nls kerberos tk socks libressl python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
@@ -11,5 +12,5 @@ RDEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) lib
 REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.15.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=c48c0e3a64cac5bc11af2a672fa901ec
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.16 b/metadata/md5-cache/net-mail/fetchmail-6.4.16
index 1cec419d8794..93a7a4d4e977 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.16
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.16
@@ -4,6 +4,7 @@ DEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) libr
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
 HOMEPAGE=https://www.fetchmail.info/
+INHERIT=autotools python-single-r1 systemd tmpfiles toolchain-funcs
 IUSE=ssl nls kerberos tk socks libressl python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
@@ -11,5 +12,5 @@ RDEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) lib
 REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.16.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=c48c0e3a64cac5bc11af2a672fa901ec
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.8 b/metadata/md5-cache/net-mail/fetchmail-6.4.8
index 0534f284fc71..089a8e4459b0 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.8
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.8
@@ -4,6 +4,7 @@ DEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) libr
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
 HOMEPAGE=https://www.fetchmail.info/
+INHERIT=python-single-r1 systemd toolchain-funcs autotools tmpfiles
 IUSE=ssl nls kerberos tk socks libressl python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
@@ -11,5 +12,5 @@ RDEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) lib
 REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.8.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=88999a03491a18f95389b4db9d0ad11e
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.17-r2 b/metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
index e5d536d6c77c..650a81a33664 100644
--- a/metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
+++ b/metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
@@ -3,11 +3,12 @@ DEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( d
 DESCRIPTION=A mail notification program
 EAPI=6
 HOMEPAGE=http://gnubiff.sourceforge.net/
+INHERIT=autotools
 IUSE=debug fam nls password
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0= ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf
 SLOT=0
 SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.17.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=ef50615c906cd6ae00bfeb90e7bf0a1d
diff --git a/metadata/md5-cache/net-mail/isync-9999 b/metadata/md5-cache/net-mail/isync-9999
index 596f597ac174..86c67a256c6e 100644
--- a/metadata/md5-cache/net-mail/isync-9999
+++ b/metadata/md5-cache/net-mail/isync-9999
@@ -4,10 +4,11 @@ DEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=d
 DESCRIPTION=MailDir mailbox synchronizer
 EAPI=7
 HOMEPAGE=http://isync.sourceforge.net/
+INHERIT=git-r3 autotools
 IUSE=libressl sasl ssl zlib
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-libs/db-4.2:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib:0= )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=c87ce9c2cea5773dcad7b2e7bc06efc7
diff --git a/metadata/md5-cache/net-mail/mailutils-3.11.1 b/metadata/md5-cache/net-mail/mailutils-3.11.1
index b81a61bf0184..16925f71b220 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.11.1
+++ b/metadata/md5-cache/net-mail/mailutils-3.11.1
@@ -4,6 +4,7 @@ DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/na
 DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
+INHERIT=autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2 LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.11.1.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=ecc0bf15aa9efb1ddae0b6ab8ac40e0c
diff --git a/metadata/md5-cache/net-mail/mailutils-3.12 b/metadata/md5-cache/net-mail/mailutils-3.12
index 32053d637b56..79d6f40a6a03 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.12
+++ b/metadata/md5-cache/net-mail/mailutils-3.12
@@ -4,6 +4,7 @@ DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/na
 DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
+INHERIT=autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2 LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.12.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=374517ab654a73dba8d4cbe03be28f8d
diff --git a/metadata/md5-cache/net-mail/mailutils-3.8 b/metadata/md5-cache/net-mail/mailutils-3.8
index 94f93965843b..e2729cce0afd 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.8
+++ b/metadata/md5-cache/net-mail/mailutils-3.8
@@ -4,6 +4,7 @@ DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/na
 DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
+INHERIT=autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet +python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2 LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.8.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=d7947127418aab9860f0f57b05a840f5
diff --git a/metadata/md5-cache/net-mail/mailutils-3.9 b/metadata/md5-cache/net-mail/mailutils-3.9
index db8558976a2a..140cba0c05de 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.9
+++ b/metadata/md5-cache/net-mail/mailutils-3.9
@@ -4,6 +4,7 @@ DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/na
 DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
+INHERIT=autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2 LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.9.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=e4d9f3fd0d839654af1dd36fdce901ca
diff --git a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2 b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
index 6683b491c268..ceb82198f9b1 100644
--- a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
+++ b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses app-arch/sharutils net-mail/mailbase
 DESCRIPTION=Metamail (with Debian patches) - Generic MIME package
 EAPI=7
 HOMEPAGE=http://ftp.funet.fi/pub/unix/mail/metamail/
+INHERIT=autotools toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
 SLOT=0
 SRC_URI=http://ftp.funet.fi/pub/unix/mail/metamail/mm2.7.tar.Z mirror://debian/pool/main/m/metamail/metamail_2.7-53.diff.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=6578b5a603c56f407607d26e29e99112
diff --git a/metadata/md5-cache/net-mail/mpack-1.6-r4 b/metadata/md5-cache/net-mail/mpack-1.6-r4
index 4b38ad8f4033..2abd3ee960b8 100644
--- a/metadata/md5-cache/net-mail/mpack-1.6-r4
+++ b/metadata/md5-cache/net-mail/mpack-1.6-r4
@@ -3,9 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.
 DESCRIPTION=Command-line MIME encoding and decoding utilities
 EAPI=6
 HOMEPAGE=ftp://ftp.andrew.cmu.edu/pub/mpack/
+INHERIT=autotools
 KEYWORDS=amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=HPND
 SLOT=0
 SRC_URI=ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=3801011711ef983a310e03703981f671
diff --git a/metadata/md5-cache/net-mail/mu-1.4.15 b/metadata/md5-cache/net-mail/mu-1.4.15
index fb8c6d5a5be2..99dca75f1689 100644
--- a/metadata/md5-cache/net-mail/mu-1.4.15
+++ b/metadata/md5-cache/net-mail/mu-1.4.15
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=a
 DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
 EAPI=7
 HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+INHERIT=autotools elisp-common
 IUSE=emacs guile mug
 KEYWORDS=amd64 arm arm64 x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/archive/1.4.15.tar.gz -> mu-1.4.15.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2
 _md5_=da46169ba52b6b19ba49bd72e5a3e82c
diff --git a/metadata/md5-cache/net-mail/pfqueue-0.5.6-r1 b/metadata/md5-cache/net-mail/pfqueue-0.5.6-r1
index 4b7700132f77..5b735a7342e2 100644
--- a/metadata/md5-cache/net-mail/pfqueue-0.5.6-r1
+++ b/metadata/md5-cache/net-mail/pfqueue-0.5.6-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:=
 DESCRIPTION=pfqueue is an ncurses console-based tool for managing Postfix queued messages
 EAPI=7
 HOMEPAGE=http://pfqueue.sourceforge.net/
+INHERIT=autotools
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=mirror://sourceforge/pfqueue/pfqueue-0.5.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=e70cc3e37ad8948b9f446b7630a87592
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
index e229491f5241..7a3ce53aabe9 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
@@ -4,6 +4,7 @@ DEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? (
 DESCRIPTION=A web interface for managing a qmail system with virtual domains
 EAPI=7
 HOMEPAGE=http://www.inter7.com/qmailadmin.html
+INHERIT=qmail webapp autotools
 IUSE=maildrop vhosts
 KEYWORDS=amd64 arm ~hppa ~ia64 ppc s390 sparc x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop?
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fixheadtails	662e80584ee2337b981d7188078e7c74	qmail	d71e87f6dc80bb9af62fd46856dc0a92	webapp	1d03df021d958f89f4cc78e289d0b116	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=ddabd0ab0ef927ccfe64695b91fb81f5
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
index 9b13503f0e46..1af23b0de1be 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.16
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.16
@@ -4,6 +4,7 @@ DEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? (
 DESCRIPTION=A web interface for managing a qmail system with virtual domains
 EAPI=7
 HOMEPAGE=http://www.inter7.com/qmailadmin.html
+INHERIT=qmail webapp autotools
 IUSE=maildrop vhosts
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop?
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fixheadtails	662e80584ee2337b981d7188078e7c74	qmail	d71e87f6dc80bb9af62fd46856dc0a92	webapp	1d03df021d958f89f4cc78e289d0b116	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=261420825cc15d47eb148bfc2ab8eaec
diff --git a/metadata/md5-cache/net-mail/smtptools-0.2.3-r1 b/metadata/md5-cache/net-mail/smtptools-0.2.3-r1
index dc1673c9fbb9..4f898e5d5deb 100644
--- a/metadata/md5-cache/net-mail/smtptools-0.2.3-r1
+++ b/metadata/md5-cache/net-mail/smtptools-0.2.3-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=prepare
 DESCRIPTION=A collection of tools to send or receive mails with SMTP
 EAPI=7
 HOMEPAGE=https://www.ohse.de/uwe/software/smtptools.html
+INHERIT=autotools
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86
 LICENSE=GPL-2
 RDEPEND=!net-mail/qtools
 SLOT=0
 SRC_URI=ftp://ftp.ohse.de/uwe/releases/smtptools-0.2.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=f1e4670abb05e946ae5c2be625b44980
diff --git a/metadata/md5-cache/net-mail/tnef-1.4.18 b/metadata/md5-cache/net-mail/tnef-1.4.18
index 7cceb37432c2..e720415cd7fd 100644
--- a/metadata/md5-cache/net-mail/tnef-1.4.18
+++ b/metadata/md5-cache/net-mail/tnef-1.4.18
@@ -3,9 +3,10 @@ DEFINED_PHASES=prepare test
 DESCRIPTION=Decodes MS-TNEF MIME attachments
 EAPI=7
 HOMEPAGE=https://github.com/verdammelt/tnef/
+INHERIT=autotools
 KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/verdammelt/tnef/archive/1.4.18.tar.gz -> tnef-1.4.18.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=cb2bfe41e4c906ed7e56a88779c39ded
diff --git a/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1 b/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
index f831a55bc9b6..13a4e20c918e 100644
--- a/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
+++ b/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
@@ -4,11 +4,12 @@ DEPEND=sha1? ( >=dev-libs/openssl-0.9.6:0= ) ssl? ( >=dev-libs/openssl-0.9.6:0=
 DESCRIPTION=An extensible POP3 server with vmail-sql/MySQL support
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/tpop3d/
+INHERIT=flag-o-matic autotools
 IUSE=authexternal debug flatfile gdbm ldap maildir mbox mysql offensive pam passwd perl postgres +sha1 shadow ssl tcpd
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=sha1? ( >=dev-libs/openssl-0.9.6:0= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( sys-libs/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=mirror://nongnu/tpop3d/tpop3d-1.5.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=16c73fbce67cd1a214546d3d569935ae
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4
index 9e5ed0aaa39a..0cd77dd96ddc 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.4
+++ b/metadata/md5-cache/net-mail/vchkuser-0.4
@@ -3,10 +3,11 @@ DEPEND=net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[q
 DESCRIPTION=qmail-spp plugin to check recipient existance with vpopmail
 EAPI=6
 HOMEPAGE=https://github.com/hollow/vchkuser
+INHERIT=autotools qmail
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	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	fixheadtails	662e80584ee2337b981d7188078e7c74	qmail	d71e87f6dc80bb9af62fd46856dc0a92
 _md5_=755014e3a95090323c2d540ce2e773d2
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
index 4c644acd7b8f..1d2afe910d6f 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
@@ -4,6 +4,7 @@ DEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-fil
 DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
 EAPI=7
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
+INHERIT=autotools fixheadtails qmail
 IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
 KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-fi
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	fixheadtails	662e80584ee2337b981d7188078e7c74	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	qmail	d71e87f6dc80bb9af62fd46856dc0a92
 _md5_=a209eac77d6a3cdd3fe40ad2ee26b1f2
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
index ec475708bd98..8b6e3e5ab875 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
@@ -4,6 +4,7 @@ DEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-fil
 DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
 EAPI=7
 HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
+INHERIT=autotools fixheadtails qmail
 IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-fi
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	fixheadtails	662e80584ee2337b981d7188078e7c74	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	qmail	d71e87f6dc80bb9af62fd46856dc0a92
 _md5_=3a53efce7d8e91e4afe00461b086aef1
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7 b/metadata/md5-cache/net-mail/vqadmin-2.3.7
index 4d919a662f65..0ee3a0cf03aa 100644
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.7
+++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7
@@ -4,11 +4,12 @@ DEPEND=virtual/qmail >=net-mail/vpopmail-5.3 >=app-admin/webapp-config-1.50.15
 DESCRIPTION=A web based control pannel to manage Virtual Qmail Domains
 EAPI=7
 HOMEPAGE=http://www.inter7.com/index.php?page=vqadmin
+INHERIT=webapp autotools qmail
 IUSE=vhosts
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=webapp	1d03df021d958f89f4cc78e289d0b116	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fixheadtails	662e80584ee2337b981d7188078e7c74	qmail	d71e87f6dc80bb9af62fd46856dc0a92
 _md5_=ed2f0816bf4df9b4ee5d277a2642a685
diff --git a/metadata/md5-cache/net-mail/ytnef-1.9.3 b/metadata/md5-cache/net-mail/ytnef-1.9.3
index 16a140025e94..ca6a711403b4 100644
--- a/metadata/md5-cache/net-mail/ytnef-1.9.3
+++ b/metadata/md5-cache/net-mail/ytnef-1.9.3
@@ -4,11 +4,12 @@ DEPEND=sys-devel/libtool
 DESCRIPTION=Yeraze's TNEF Stream Reader - for winmail.dat files
 EAPI=7
 HOMEPAGE=https://github.com/Yeraze/ytnef
+INHERIT=autotools
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-perl/MIME-tools
 SLOT=0
 SRC_URI=https://github.com/Yeraze/ytnef/archive/v1.9.3.tar.gz -> ytnef-1.9.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=eaa727c502bf5336ee41d2877a7a52ab