gentoo resync : 29.12.2022

25 files changed, 72 insertions, 83 deletions

diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 355d90faf999..3425162ec997 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/courier-1.1.5-r3 b/metadata/md5-cache/mail-mta/courier-1.1.5-r3
index 59890f1630bb..c67b46d711bb 100644
--- a/metadata/md5-cache/mail-mta/courier-1.1.5-r3
+++ b/metadata/md5-cache/mail-mta/courier-1.1.5-r3
@@ -3,6 +3,7 @@ DEPEND=>=net-libs/courier-authlib-0.71.3 >=net-libs/courier-unicode-2.2.3:= net-
 DESCRIPTION=An MTA designed specifically for maildirs
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/
+INHERIT=flag-o-matic multilib
 IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3
@@ -10,5 +11,5 @@ PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.71.3 >=net-libs/courier-unicode-2.2.3:= net-dns/libidn:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11:= ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-1.1.5.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4d71ddda9971600fa544740941cc3be0
diff --git a/metadata/md5-cache/mail-mta/courier-1.1.8-r2 b/metadata/md5-cache/mail-mta/courier-1.1.8-r2
index c35497627907..9f640278734c 100644
--- a/metadata/md5-cache/mail-mta/courier-1.1.8-r2
+++ b/metadata/md5-cache/mail-mta/courier-1.1.8-r2
@@ -3,6 +3,7 @@ DEPEND=>=net-libs/courier-authlib-0.71.3 >=net-libs/courier-unicode-2.2.3:= net-
 DESCRIPTION=An MTA designed specifically for maildirs
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/
+INHERIT=flag-o-matic multilib
 IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3
@@ -10,5 +11,5 @@ PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.71.3 >=net-libs/courier-unicode-2.2.3:= net-dns/libidn:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11:= ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-1.1.8.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=32ae4145f7157d3740ab0041fc795dda
diff --git a/metadata/md5-cache/mail-mta/esmtp-1.2-r2 b/metadata/md5-cache/mail-mta/esmtp-1.2-r2
index d10ab4cae814..50e482963e3c 100644
--- a/metadata/md5-cache/mail-mta/esmtp-1.2-r2
+++ b/metadata/md5-cache/mail-mta/esmtp-1.2-r2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/openssl:0= >=net-libs/libesmtp-1.0.6_p20200824:= !mail-mta/couri
 DESCRIPTION=User configurable relay-only Mail Transfer Agent with a sendmail-like syntax
 EAPI=7
 HOMEPAGE=http://esmtp.sourceforge.net/
+INHERIT=autotools
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= >=net-libs/libesmtp-1.0.6_p20200824:= !mail-mta/courier !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd
 SLOT=0
 SRC_URI=mirror://sourceforge/esmtp/esmtp-1.2.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=63bfe5a001cf6b99ca5ea28be8ea0802
diff --git a/metadata/md5-cache/mail-mta/exim-4.94.2-r7 b/metadata/md5-cache/mail-mta/exim-4.94.2-r7
index 329c303ece09..356914114c2e 100644
--- a/metadata/md5-cache/mail-mta/exim-4.94.2-r7
+++ b/metadata/md5-cache/mail-mta/exim-4.94.2-r7
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/li
 DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=7
 HOMEPAGE=https://www.exim.org/
+INHERIT=db-use toolchain-funcs multilib pam systemd
 IUSE=arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +srs-alt srs-native +ssl syslog tcpd +tpda X
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/l
 REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ^^ ( srs-alt srs-native ) )
 SLOT=0
 SRC_URI=https://downloads.exim.org/exim4/exim-4.94.2.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.94.2.tar.xz )
-_eclasses_=db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cf4f3481d03e9f282ba7c0b5481a13af
diff --git a/metadata/md5-cache/mail-mta/exim-4.94.2-r8 b/metadata/md5-cache/mail-mta/exim-4.94.2-r8
index 91ca48a4ec4e..f416f065f19f 100644
--- a/metadata/md5-cache/mail-mta/exim-4.94.2-r8
+++ b/metadata/md5-cache/mail-mta/exim-4.94.2-r8
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre:= tdb? ( sys-libs/tdb:= ) !tdb? ( b
 DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=7
 HOMEPAGE=https://www.exim.org/
+INHERIT=db-use toolchain-funcs multilib pam systemd
 IUSE=arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre:= tdb? ( sys-libs/tdb:= ) !tdb? (
 REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ^^ ( srs-alt srs-native ) ) || ( berkdb gdbm tdb )
 SLOT=0
 SRC_URI=https://downloads.exim.org/exim4/exim-4.94.2.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.94.2.tar.xz )
-_eclasses_=db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9fe112bfe1dc6abb52ed55485e6a98eb
diff --git a/metadata/md5-cache/mail-mta/exim-4.95-r1 b/metadata/md5-cache/mail-mta/exim-4.95-r1
deleted file mode 100644
index 3045d4f262a5..000000000000
--- a/metadata/md5-cache/mail-mta/exim-4.95-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7:= ) elibc_glibc? ( net-libs/libnsl:= nis? ( net-libs/libtirpc:= >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis:= ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv
-DESCRIPTION=A highly configurable, drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=https://www.exim.org/
-IUSE=arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7:= ) elibc_glibc? ( net-libs/libnsl:= nis? ( net-libs/libtirpc:= >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis:= ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
-REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ^^ ( srs-alt srs-native ) ) || ( berkdb gdbm tdb )
-SLOT=0
-SRC_URI=https://downloads.exim.org/exim4/exim-4.95.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.95.tar.xz )
-_eclasses_=db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fecbb3ecf876c959b1bcdbae01b43437
diff --git a/metadata/md5-cache/mail-mta/exim-4.96-r1 b/metadata/md5-cache/mail-mta/exim-4.96-r1
new file mode 100644
index 000000000000..75e7478daf74
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/exim-4.96-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre2:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7:= ) elibc_glibc? ( net-libs/libnsl:= nis? ( net-libs/libtirpc:= >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis:= ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv
+DESCRIPTION=A highly configurable, drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=https://www.exim.org/
+INHERIT=db-use toolchain-funcs multilib pam systemd
+IUSE=arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/sed-4.0.5 dev-libs/libpcre2:= tdb? ( sys-libs/tdb:= ) !tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) ) !tdb? ( !berkdb? ( sys-libs/gdbm:= ) ) idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) !gnutls? ( dev-libs/openssl:0= ) ) ldap? ( >=net-nds/openldap-2.0.7:= ) elibc_glibc? ( net-libs/libnsl:= nis? ( net-libs/libtirpc:= >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis:= ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc:= ) srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libcrypt:= virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ^^ ( srs-alt srs-native ) ) || ( berkdb gdbm tdb )
+SLOT=0
+SRC_URI=https://downloads.exim.org/exim4/exim-4.96.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.96.tar.xz )
+_eclasses_=db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=9616bbed316b9baa29bc778f6f0c532b
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r14 b/metadata/md5-cache/mail-mta/netqmail-1.06-r14
index 93d54a22c24a..e571ea5746ff 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r14
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r14
@@ -3,6 +3,7 @@ DEPEND=acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
 EAPI=7
 HOMEPAGE=http://netqmail.org https://cr.yp.to/qmail.html http://qmail.org
+INHERIT=qmail
 IUSE=authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
@@ -11,5 +12,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmail	194634eb0887105149041efaf9f66be5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmail	64280dc99a248daf87f54f3b72d5bf1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2148edefa50934c36763830fa32cae4c
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r16 b/metadata/md5-cache/mail-mta/netqmail-1.06-r16
index cbc4689fa56e..cbe3da11e7db 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r16
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r16
@@ -3,6 +3,7 @@ DEPEND=acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
 EAPI=8
 HOMEPAGE=http://netqmail.org https://cr.yp.to/qmail.html http://qmail.org
+INHERIT=qmail
 IUSE=authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=public-domain
@@ -12,5 +13,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmail	194634eb0887105149041efaf9f66be5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmail	64280dc99a248daf87f54f3b72d5bf1d	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=06b8baaa95672f9a2f0735bbc997e818
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r5 b/metadata/md5-cache/mail-mta/notqmail-1.08-r5
index 06d6e391d27b..c0e37bad59f7 100644
--- a/metadata/md5-cache/mail-mta/notqmail-1.08-r5
+++ b/metadata/md5-cache/mail-mta/notqmail-1.08-r5
@@ -4,6 +4,7 @@ DEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=
 DESCRIPTION=Collaborative open-source successor to qmail
 EAPI=8
 HOMEPAGE=https://notqmail.org https://cr.yp.to/qmail.html http://qmail.org
+INHERIT=qmail systemd
 IUSE=authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=public-domain
@@ -13,5 +14,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) ge
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmail	194634eb0887105149041efaf9f66be5	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmail	64280dc99a248daf87f54f3b72d5bf1d	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2fe6aaa7b2c2491a8b37e61a48092291
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r6 b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
index f65c97b030ee..733740b07bf4 100644
--- a/metadata/md5-cache/mail-mta/notqmail-1.08-r6
+++ b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
@@ -4,6 +4,7 @@ DEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=
 DESCRIPTION=Collaborative open-source successor to qmail
 EAPI=8
 HOMEPAGE=https://notqmail.org https://cr.yp.to/qmail.html http://qmail.org
+INHERIT=qmail systemd verify-sig
 IUSE=authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=public-domain
@@ -13,5 +14,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) ge
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz verify-sig? ( https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz.sig ) https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmail	194634eb0887105149041efaf9f66be5	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmail	64280dc99a248daf87f54f3b72d5bf1d	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=151a0ebd3bc5cc8c06e32574b3493b78
diff --git a/metadata/md5-cache/mail-mta/notqmail-9999 b/metadata/md5-cache/mail-mta/notqmail-9999
index e38f8b60a853..8c9b5a5469de 100644
--- a/metadata/md5-cache/mail-mta/notqmail-9999
+++ b/metadata/md5-cache/mail-mta/notqmail-9999
@@ -4,6 +4,7 @@ DEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=
 DESCRIPTION=Collaborative open-source successor to qmail
 EAPI=8
 HOMEPAGE=https://notqmail.org https://cr.yp.to/qmail.html http://qmail.org
+INHERIT=qmail systemd git-r3
 IUSE=authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla
 LICENSE=public-domain
 PDEPEND=virtual/daemontools
@@ -13,5 +14,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) ge
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmail	194634eb0887105149041efaf9f66be5	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmail	64280dc99a248daf87f54f3b72d5bf1d	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=83e409859bfda35a09759d514d307fd6
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.2-r2 b/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
index 109587b68166..3fa690ea10e7 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
@@ -12,5 +12,5 @@ RDEPEND=acct-group/nullmail acct-user/nullmail virtual/logger sys-apps/shadow ss
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.2.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ded41f20228fae15eecfcd41b25eb02a
diff --git a/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r1 b/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r1
index 0d372a4f6c9b..ad166ceb2b86 100644
--- a/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r1
+++ b/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r1
@@ -4,11 +4,12 @@ DEPEND=acct-user/smtpd acct-user/smtpq >=dev-libs/openssl-1.1:0= elibc_musl? ( s
 DESCRIPTION=Lightweight but featured SMTP daemon from OpenBSD
 EAPI=7
 HOMEPAGE=https://www.opensmtpd.org
+INHERIT=pam systemd
 IUSE=berkdb +mta pam split-usr
 KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv x86
 LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 RDEPEND=acct-user/smtpd acct-user/smtpq >=dev-libs/openssl-1.1:0= elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( sys-libs/pam ) berkdb? ( sys-libs/db:= ) dev-libs/libevent:= app-misc/ca-certificates net-mail/mailbase net-libs/libasr virtual/libcrypt:= !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/opensmtpd-6.8.0p2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=fcc264f2937f0fda1732969a0f64d799
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6.5-r2 b/metadata/md5-cache/mail-mta/postfix-3.6.5-r2
deleted file mode 100644
index 5e991c096c6b..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.6.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d63f04c1cf18b35d33291fdb1f4ecd55
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6.6 b/metadata/md5-cache/mail-mta/postfix-3.6.6
deleted file mode 100644
index a106796e10cc..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.6.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=470b93a5692c6e3ac475d28bfd3e12b5
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7.1 b/metadata/md5-cache/mail-mta/postfix-3.7.1
deleted file mode 100644
index 6604cf4cd766..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=8
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.7.1.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8895366583505649a67d65c6bde4fdab
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7.2 b/metadata/md5-cache/mail-mta/postfix-3.7.2
index 5c11b61c8d92..2a0ce2c0ddf3 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.7.2
+++ b/metadata/md5-cache/mail-mta/postfix-3.7.2
@@ -4,12 +4,13 @@ DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre
 DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=8
 HOMEPAGE=http://www.postfix.org/
+INHERIT=pam systemd toolchain-funcs
 IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.7.2.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bdafc58cee6e6121ab982822f2b5a93f
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c525fdbefd69290b58f64deec92f60b7
diff --git a/metadata/md5-cache/mail-mta/postfix-3.8_pre20220509 b/metadata/md5-cache/mail-mta/postfix-3.8_pre20220527
index 6b6c5184b437..530a9c00ab86 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.8_pre20220509
+++ b/metadata/md5-cache/mail-mta/postfix-3.8_pre20220527
@@ -11,6 +11,6 @@ LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.8-20220509.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.8-20220527.tar.gz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=0fa3938a3b3aa19f5359393d0225f32e
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-2.1.1-r1 b/metadata/md5-cache/mail-mta/protonmail-bridge-2.1.1-r1
index 21a51d0d398a..aba9ada341f6 100644
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-2.1.1-r1
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-2.1.1-r1
@@ -4,6 +4,7 @@ DEPEND=app-crypt/libsecret
 DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
 EAPI=8
 HOMEPAGE=https://protonmail.com/bridge https://github.com/ProtonMail/proton-bridge/
+INHERIT=go-module systemd xdg-utils
 IUSE=gui
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense
@@ -12,5 +13,5 @@ RDEPEND=app-crypt/libsecret
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v2.1.1.tar.gz -> protonmail-bridge-2.1.1.tar.gz https://dev.gentoo.org/~marecki/dists/mail-mta/protonmail-bridge/protonmail-bridge-2.1.1-vendor.tar.xz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=00fc5dfb8877e4534494b4f4324bd2ac
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-2.2.0 b/metadata/md5-cache/mail-mta/protonmail-bridge-2.2.0
new file mode 100644
index 000000000000..cf1547250883
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-2.2.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare test unpack
+DEPEND=app-crypt/libsecret
+DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
+EAPI=8
+HOMEPAGE=https://proton.me/mail/bridge https://github.com/ProtonMail/proton-bridge/
+INHERIT=go-module systemd xdg-utils
+IUSE=gui
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense
+PROPERTIES=test_network
+RDEPEND=app-crypt/libsecret
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v2.2.0.tar.gz -> protonmail-bridge-2.2.0.tar.gz https://dev.gentoo.org/~marecki/dists/mail-mta/protonmail-bridge/protonmail-bridge-2.2.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2d808b394b98dcf04ff0a59308bca1dc
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.16.1-r2 b/metadata/md5-cache/mail-mta/sendmail-8.16.1-r2
index c45423a5a378..1ad6e802c480 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.16.1-r2
+++ b/metadata/md5-cache/mail-mta/sendmail-8.16.1-r2
@@ -4,6 +4,7 @@ DEPEND=acct-group/smmsp >=acct-user/smmsp-0-r2 net-mail/mailbase >=sys-libs/db-3
 DESCRIPTION=Widely-used Mail Transport Agent (MTA)
 EAPI=7
 HOMEPAGE=https://www.sendmail.org/
+INHERIT=systemd toolchain-funcs
 IUSE=ipv6 ldap mbox nis sasl sockets ssl tcpd
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Sendmail GPL-2
@@ -11,5 +12,5 @@ PDEPEND=!mbox? ( mail-filter/procmail )
 RDEPEND=acct-group/smmsp >=acct-user/smmsp-0-r2 net-mail/mailbase >=sys-libs/db-3.2:= ldap? ( net-nds/openldap:= ) nis? ( net-libs/libnsl:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) >=mail-filter/libmilter-1.0.2_p1-r1 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/vacation
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.16.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2880857a2c225d6aca090b46240ff63c
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.17.1-r2 b/metadata/md5-cache/mail-mta/sendmail-8.17.1-r2
index 10e75f9f6f22..57f602bff793 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.17.1-r2
+++ b/metadata/md5-cache/mail-mta/sendmail-8.17.1-r2
@@ -4,6 +4,7 @@ DEPEND=acct-group/smmsp >=acct-user/smmsp-0-r2 net-mail/mailbase >=sys-libs/db-3
 DESCRIPTION=Widely-used Mail Transport Agent (MTA)
 EAPI=7
 HOMEPAGE=https://www.sendmail.org/
+INHERIT=systemd toolchain-funcs
 IUSE=ipv6 ldap mbox nis sasl sockets ssl tcpd
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Sendmail GPL-2
@@ -11,5 +12,5 @@ PDEPEND=!mbox? ( mail-filter/procmail )
 RDEPEND=acct-group/smmsp >=acct-user/smmsp-0-r2 net-mail/mailbase >=sys-libs/db-3.2:= ldap? ( net-nds/openldap:= ) nis? ( net-libs/libnsl:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) >=mail-filter/libmilter-1.0.2_p2 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/vacation
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.17.1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=24c803066996a715395ec4f6d8b40a00
diff --git a/metadata/md5-cache/mail-mta/ssmtp-2.64-r4 b/metadata/md5-cache/mail-mta/ssmtp-2.64-r4
index ed7d492a5806..6bb58482bfe3 100644
--- a/metadata/md5-cache/mail-mta/ssmtp-2.64-r4
+++ b/metadata/md5-cache/mail-mta/ssmtp-2.64-r4
@@ -4,12 +4,13 @@ DEPEND=!prefix? ( acct-group/ssmtp ) ssl? ( gnutls? ( net-libs/gnutls[openssl] )
 DESCRIPTION=Extremely simple MTA to get mail off the system to a Mailhub
 EAPI=7
 HOMEPAGE=ftp://ftp.debian.org/debian/pool/main/s/ssmtp/
+INHERIT=autotools
 IUSE=ipv6 +ssl gnutls +mta
-KEYWORDS=~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!prefix? ( acct-group/ssmtp ) ssl? ( gnutls? ( net-libs/gnutls[openssl] ) !gnutls? ( dev-libs/openssl:0= ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd )
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2 https://dev.gentoo.org/~pinkbyte/distfiles/patches/ssmtp-2.64-patches-4.tar.xz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=acb71189e89ed54e326150deff493b34
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=893f4e0c138dafb58d278447abac8629