gentoo resync : 25.03.2022

28 files changed, 86 insertions, 82 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d05f7f5a797f..d7fc46db6440 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 93d2b19b9948..bba1923a71d3 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -12,11 +12,11 @@ DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea
 DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
 DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
-EBUILD cyrus-imapd-3.0.13-r3.ebuild 6067 BLAKE2B 422166e4f12070388cdb1b78c31bc0b56c219bac745e5a2895aa263d5bd41ccc8d54d264bf52b64607dc5328aa90f01800828e3769cb39e0ad75113eea2fc3c1 SHA512 3bfa669a36b4a579b3a490f2e3ad7925b25156faba1c3bbe0aa5b1c7ec03bb166984bb0db46c0f06df749094371a32e380f1ea150f19b97fd1f4381193d8739a
-EBUILD cyrus-imapd-3.0.14-r3.ebuild 6028 BLAKE2B 463e683e17b24a77e1b43c74acbe9acc82a1a26778864af494e20a9b87974669f16755e0e73551d084052291d511ae8b37accedea4367f23700e5e0bfdb2260b SHA512 a93e938f32adfe3343fc8f48de88fdf7d56fa7143ad7e72a6cd53cf57f51ac4ea944bf111ac23c88b9c3e82308f73e838687dc85bfd502f580abd343cb7b901c
-EBUILD cyrus-imapd-3.0.15-r3.ebuild 6014 BLAKE2B e54aaec2fdd799dff18f88abb21f68249d83f7e8caa3e043088f4ee3e3438b1edf12ea7a47c4e3df59d87739924310720ffbb6dc59d37b73de84d1b48eeec6bd SHA512 807335015a798ee0a25176c028ff4f2d865a48114d953ddfe6fcb4db6f87770b3a36be8f610b65edcb7c36e396892291de5bed5ee6c799715e5b022d7cc16a05
-EBUILD cyrus-imapd-3.0.16-r1.ebuild 6014 BLAKE2B e54aaec2fdd799dff18f88abb21f68249d83f7e8caa3e043088f4ee3e3438b1edf12ea7a47c4e3df59d87739924310720ffbb6dc59d37b73de84d1b48eeec6bd SHA512 807335015a798ee0a25176c028ff4f2d865a48114d953ddfe6fcb4db6f87770b3a36be8f610b65edcb7c36e396892291de5bed5ee6c799715e5b022d7cc16a05
-EBUILD cyrus-imapd-3.0.17.ebuild 6018 BLAKE2B 141a77733d98f59c1481f23b587d1eca06cc825a852cc7f1b7c28b587c2bdab36e0496847cc4a159bede2039b039ef5a54525b0bfad3245369f4c912f3ae31fa SHA512 2a5bd91ce16be19835c1941a15fd984b9d44afba3d9812f52508dad75011dc433d50c5ae409c9aa4abf750bee3c1284383ca28f44c6e51b8710d65cbb79abd5e
-EBUILD cyrus-imapd-3.4.2-r1.ebuild 5961 BLAKE2B f4fdb124979c42684c6b5d9bf3298ec1a98f5506c0d04aabd077f5c15bc4b639507f1a90316b2e482c095a99df4c6e8898bd2ac0f91409d26add6ecefabfa617 SHA512 1d466afee36da3c68f56bb021b16cfb7db75dfa184309c2ac882e62f68c0c10857780ed49437dc350e7a1282937b304d2f57229f1dd8684f6779ffa130cac227
-EBUILD cyrus-imapd-3.4.3-r1.ebuild 6310 BLAKE2B c5749ceb67fd013ab473ea984d5b8491a5edbee1426f9d465a4ecb84f76adb91e5a536ab52537f6c652105940679532b9ff5a4ae3beaaab4f9e0c7144d4087a8 SHA512 418dd8647e1eb88792ee776d3ebed3955ceb776b2c67c5302a5c9e97ed4f58520b0d78aa1c1e9245f8ff31de8067b2d8a346a0b6323cd7e8a9d02eee5d49b237
+EBUILD cyrus-imapd-3.0.13-r4.ebuild 6069 BLAKE2B 19ee429653bbfba433ef2f44c275061dd7ce112f603277906224aa2634476788fc35d48160140d79969d0c1689c5b85cce570d3f856b065d67a5162a74e7547b SHA512 5578de86ab1a1b0ef1ce7d013f24f36fd8478ec604219a2284b4f3091ce42eef4df8a2d3f248908a7d7df9acb43e7e44bc63e03395f7eba7617608d3c3ed4cb7
+EBUILD cyrus-imapd-3.0.14-r4.ebuild 6030 BLAKE2B cd96fe62aedbefb2e6e2f4c69940556d1785978903442fbc3c95074e523f57dbb633e9566dde8a63d5b3c02a37980c4a6c2ea77b30d5163e7649510211efaeb7 SHA512 c632a0174fd7ca3c72eaf89886104d54eaa848f3d65f098779ac4a975962a0641791494fc712f5dd4cd91165589d18fbf4e57d81c54b323f75e958299acafc76
+EBUILD cyrus-imapd-3.0.15-r4.ebuild 6016 BLAKE2B e85d06a61f6c6573624cbbc92a118712dde2e095174fd7726ee09d4e765d435613e0534d7a76d0df4c94118207b799507d18d27670607c852c12c2b74cb127cb SHA512 35ac8660c0d6812b162083004559dd71ddaef2ea7d34320901b2639a4d6033bbe0d7b448292df2117a5cd03f3469e172cdc6b9645281979a6befe85ab56edcbe
+EBUILD cyrus-imapd-3.0.16-r2.ebuild 6016 BLAKE2B e85d06a61f6c6573624cbbc92a118712dde2e095174fd7726ee09d4e765d435613e0534d7a76d0df4c94118207b799507d18d27670607c852c12c2b74cb127cb SHA512 35ac8660c0d6812b162083004559dd71ddaef2ea7d34320901b2639a4d6033bbe0d7b448292df2117a5cd03f3469e172cdc6b9645281979a6befe85ab56edcbe
+EBUILD cyrus-imapd-3.0.17-r1.ebuild 6022 BLAKE2B 619618570289290e0a697e9280a18f249ef8898d1324f77f43b8ae0b275694f7b4f94b34ad822e4c90a923ed86b5d542d8b232e3a762aa093f353c0aad721f74 SHA512 17bc28ca592afc4c6a29fc765738c41c753e1f58996c40017d24c81584bf58493bc9e619ed36b4a6b6c90003cc9c4cd6e392f89a7b252bde16ed07af30240dbc
+EBUILD cyrus-imapd-3.4.2-r2.ebuild 5964 BLAKE2B d3b7b21d6da88a922562ab86a32995c89c4e18b550b20eef3e1f7c7b152262b01c0b57839b12acbe7afff20be07908557a43669eb853c1cf44ad2899a3cdba30 SHA512 c7645c12b7506b83f7db973eea2719f9fb4ce902ac312338df9c5a2faca0e22520c8af04c9e0e65348b672d61796789952b910a8e60b8476c876360e05d85d63
+EBUILD cyrus-imapd-3.4.3-r2.ebuild 6312 BLAKE2B e9bf941312e9e622202abadc96e292449eb546c8dc8c432175ec15c723ddb18a5d46a66f86e4a93bbe5235c65458b14b6894d401b69879835a7598acf5fbaf7a SHA512 97056231855cdce65e008aa8b4bb56bd79c2c617606df61e0e662c7c818521567b04f7677b67684f06d87d813d4053d98b5d9b0ba61a1a68c08b9fba64a71527
 MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild
index ef409df0114d..824794bbbc35 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r4.ebuild
@@ -27,24 +27,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild
index b64e165b3a8e..471ab7129ca9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r4.ebuild
@@ -27,24 +27,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild
index 661c6333d774..06d4168cf795 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r4.ebuild
@@ -28,24 +28,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
index 661c6333d774..06d4168cf795 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
@@ -28,24 +28,25 @@ CDEPEND="
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 )
+	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:0= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
-			>=net-mail/mailbase-1
-		)
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
 	perl? ( dev-lang/perl:= )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
 	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
 	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
 		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-		)
+	)
 	xapian? ( >=dev-libs/xapian-1.4.0:0= )
 "
 DEPEND="${CDEPEND}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
index fb391be37dcf..9346b47b1dab 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
@@ -31,10 +31,10 @@ CDEPEND="
 	http? (
 		dev-libs/libxml2:2
 		dev-libs/libical:=
-		net-libs/nghttp2
+		net-libs/nghttp2:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lmdb? ( dev-db/lmdb:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	nntp? ( !net-nntp/leafnode )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
index 5df5b8a089db..9d13260102be 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
@@ -30,11 +30,11 @@ CDEPEND="
 	clamav? ( app-antivirus/clamav )
 	http? (
 		dev-libs/libxml2:2
-		dev-libs/libical:0=
-		net-libs/nghttp2
+		dev-libs/libical:=
+		net-libs/nghttp2:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
index 6f4377b85644..fd888906a05d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="dev-libs/libpcre:3
 		sci-libs/shapelib:=
 	)
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 8f31ddae69fb..bbf249b72cf0 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -6,6 +6,6 @@ AUX dbmail-pop3d.initd 867 BLAKE2B 2d24bbe482c28fab0884377bbd47fe7a859313d8c8b20
 AUX dbmail-timsieved.initd 930 BLAKE2B 4eb24e608540d994d75c8aea44aa8128e603fd9c64c4a8205c9581cc521e4a0ca75391796d4a9b369cdcbe74636cdaf55c00408c14b7cc9ec4ad4db307445909 SHA512 7f66fa4b77a638e803f1763809da66bd26f54b435f8e4cff3304d4b4e62d1510485c1af943046489a8c37b3b93a8b6cf4901feefa9f1f38dcdaa313211f19fa0
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
-EBUILD dbmail-3.2.3-r4.ebuild 3961 BLAKE2B 7d2de1e5199d39fdafa496a032ba1ab77f82f0450bd405b9af2463414c658a482c8e343a030bd78db42cdb257e2fc812ddfcd87cedf160a0c32bcbb1f098bf05 SHA512 e5bbcb2e140cd93c3ec4ff34ffb4b3a3263f83075f1b7f966b20da3b284b91225bc1cdd4b1b6ba920ae849d7b2a4aeb0c4a41adc6750673dc3b391bc87366861
-EBUILD dbmail-3.2.5-r1.ebuild 2393 BLAKE2B 157dcd4e53ba3fc54ee20b2acee586c23944e38aa59bb70362e96a5404ee84be58236357668e51e3881e0724a69349b0483d788a5fcb3ed0ed9229c3ffe66766 SHA512 d0e58dda7855d6e48e3f3a748f25075d5229eeb6b9993e2dbdad923c262a2e9ca4177bd71c464b819dddc26cb174f2dfacc3983767c66cf798ff0ebd9994e896
+EBUILD dbmail-3.2.3-r5.ebuild 3962 BLAKE2B fadb891d448426025b7f49248f3cd110c48aeba946181f2d113a92e344f3cf0dfac3b1026db42037bfb296e62a552fb3004f63ea4beca7e04f09d2d68e5caa62 SHA512 4dba4024c5407ea654ae25eef87dabdaa571e149b2dc3b9fc77804cf85ce058fbcd655334bcaad5507e6f01200a61b1239bfd61735cca1cd8c5d23f2b68db924
+EBUILD dbmail-3.2.5-r2.ebuild 2396 BLAKE2B 59abc9fed5451bdbdd8565f37b7601347140a183229084cc4c96a7f0f149fb7740fecf4fb1645dce3452d0ac948ef151413036bf41f3e02b241b6377bca8a542 SHA512 043b8ed0108326c07a169a4f10715d4a6b9b7e904bfc73be784d7bf46dbc80eaf242838dff26ba0daa3247bdbbb8e6d8f93d70b10ba03f66fb9cca6e359789a4
 MISC metadata.xml 571 BLAKE2B 68a2a0a6d1b2cb2837c7589125f4895269d60588760a43d7b275619b5e7a01cd4625f754da41a7a377673d09ae097f53144d62c451a316a5cf1f786ee18ac74e SHA512 b3e72b2de1aa541129542f907b0a3b332402bd7f3d5d1029c36769834eae1e9e5f67fdedc40d024630d93fe766c5f346eb7e6e366b443a82a8a5bc12f1ace7e6
diff --git a/net-mail/dbmail/dbmail-3.2.3-r4.ebuild b/net-mail/dbmail/dbmail-3.2.3-r5.ebuild
index 4bc7382ac4c6..edabceb37645 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r4.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,10 +26,10 @@ RDEPEND="
 	dev-libs/libevent:=
 	sys-libs/zlib
 	virtual/libcrypt:=
-	ldap? ( >=net-nds/openldap-2.3.33 )
+	ldap? ( >=net-nds/openldap-2.3.33:= )
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ssl? (
-		dev-libs/openssl:0=
+		dev-libs/openssl:=
 	)"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/net-mail/dbmail/dbmail-3.2.5-r1.ebuild b/net-mail/dbmail/dbmail-3.2.5-r2.ebuild
index f4d3ee2d7c21..17e33e79a6f2 100644
--- a/net-mail/dbmail/dbmail-3.2.5-r1.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,8 @@ IUSE="+doc jemalloc ldap sieve ssl static systemd"
 
 DEPEND="dev-db/libzdb
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	jemalloc? ( dev-libs/jemalloc )
+	ldap? ( >=net-nds/openldap-2.3.33:= )
+	jemalloc? ( dev-libs/jemalloc:= )
 	app-text/asciidoc
 	app-text/xmlto
 	app-crypt/mhash
@@ -27,7 +27,7 @@ DEPEND="dev-db/libzdb
 	dev-libs/libevent:=
 	virtual/libcrypt:=
 	ssl? (
-		dev-libs/openssl:0=
+		dev-libs/openssl:=
 	)"
 RDEPEND="${DEPEND}
 	acct-group/dbmail
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index bd9bfde15790..5d4fccf0119d 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,7 +8,7 @@ DIST dovecot-2.3-pigeonhole-0.5.18.tar.gz 1953892 BLAKE2B 478da07a2f507a3322c6b6
 DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35
 DIST dovecot-2.3.17.1.tar.gz 7700848 BLAKE2B adf12c84def899795d8446766b5c88fd5c68a5969a1807b4dd9c2e4894ddc0693a771ce4d4c0c72b0b03501903c39c650eace97b6708114b7fe038b62ea2ecce SHA512 976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79
 DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
-EBUILD dovecot-2.3.14.1-r1.ebuild 8699 BLAKE2B 025b31d9339716d42205d8ba732895affc49f3ca967b2f5fe07f908e0af64a06da4da2e2c06f269b4994a784007743c2ff8a0cac4aa73c223bd9b3f1dc6f9635 SHA512 52cecfeb9b0a6c7cf422ad4ee30dba6bee0e6b813ba43514bc62d899763a470c71b50c83e063867e8bd5b4a0010b8a29d5dbeaebcb9b51d8d74864d5483de89c
-EBUILD dovecot-2.3.17.1.ebuild 8864 BLAKE2B 5b0ff4c44eed53cefb3fed6b359780591642f08899cd60282c857d43ecfaaba6e24c99bb325634c71571ea6ac79dbc2f5a78b036f6de3c77b8d650ccb1986ec6 SHA512 ae19bc3a26950d52add8786efdb36594e240d75914d0df275690255015781ccd34179b0ddddd7dbd564995240744a966f17394511692b0689fe60f6068ea1d2d
-EBUILD dovecot-2.3.18.ebuild 8860 BLAKE2B d651e83be22077f5db95bebd907350d982cfaa238443b19444a9d43465df74893906014fba00acbb82e403bfbd64d0cf83739a1c158b3a1a59844589064b84de SHA512 0fa6caafa3b0791fd6edcaa5dd67bd9e369b042cf16aec3174fcf1aee9a25fe2ae8cbeb6c54e93b70c6f661cd735e157d687193f6465a768cfc76a68b79c76dc
+EBUILD dovecot-2.3.14.1-r2.ebuild 8701 BLAKE2B 6358279ab6e561cef151cd5bd57d383342588ef8af60b74da03282480ef44fa6e7941b30804e38376575eb6e51e24308b7070dbfcc671cfbcc72f94dff700daa SHA512 c7fb4f436942bcc65482fe4e93aa8c7a8215b835fc17de7cb772e6cf8dc95a54bc495c9f5e42edd84adeebb0ea4f91d786589213d8bd1b8888e03b35244b371c
+EBUILD dovecot-2.3.17.1-r1.ebuild 8866 BLAKE2B a34542d194d6479653b264a1e1c8918dac51e9580dcf5a37eb6fddbf0843575e28b254da3878853d6efd7a56f8cd810d9335940b8373388f5df17fe531a8583d SHA512 e9029be65421a0e913edac76fa4c2cc66750124be05992e8adaa5c684958e9187c2dbf0875e2bd2ab67cb7170a50cfaaa64989a99c9821f651e62ac73ad2f86f
+EBUILD dovecot-2.3.18-r1.ebuild 8861 BLAKE2B b7b3b639c3e3b4319dcf084e3fc990aa74f23f1e269dded778f912732d49b518a1f4630a2372deb38f5f9a0e501ae013aea577b07ceae37c4ff0b192d5f4da50 SHA512 494c95684de75a706f997e9785034807125ee6a49f91cc1c5b2eab4327595da71f59d9d9a9bbf11d5053e3a5669e0bedaaebe97f5369bfa9abfecd229137590c
 MISC metadata.xml 1091 BLAKE2B 5852eefa5b3be607a1e7d1bd5e8aa8ce2317db6ccc8c915438ab1aef54d59d2bd6953b1015c429a391c4b7cf69bdb562da80bfd66451dc40f21cc5d6adc28c10 SHA512 9eb91f5290af634e94abd0d1542c88c69da77f892bb15cc5a90d461cd456df5c68f4c9b783a63705297e88291c7d9d917a9adcfb55a32fbc04da82ae0528dad3
diff --git a/net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild b/net-mail/dovecot/dovecot-2.3.14.1-r2.ebuild
index 8c8d1142c3ba..4d1f997aae09 100644
--- a/net-mail/dovecot/dovecot-2.3.14.1-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.14.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ DEPEND="argon2? ( dev-libs/libsodium:= )
 	bzip2? ( app-arch/bzip2 )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lua? ( ${LUA_DEPS} )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
diff --git a/net-mail/dovecot/dovecot-2.3.17.1.ebuild b/net-mail/dovecot/dovecot-2.3.17.1-r1.ebuild
index 9eb939c223cb..6b967f8f9444 100644
--- a/net-mail/dovecot/dovecot-2.3.17.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.17.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,7 +50,7 @@ DEPEND="
 	argon2? ( dev-libs/libsodium:= )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lua? ( ${LUA_DEPS} )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/dovecot/dovecot-2.3.18.ebuild b/net-mail/dovecot/dovecot-2.3.18-r1.ebuild
index 8754894a3018..d2935719fee0 100644
--- a/net-mail/dovecot/dovecot-2.3.18.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.18-r1.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="lz4 zstd"
@@ -50,7 +50,7 @@ DEPEND="
 	argon2? ( dev-libs/libsodium:= )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	lua? ( ${LUA_DEPS} )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lz4? ( app-arch/lz4 )
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index bc5180b3266f..4ab087c5e983 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -7,5 +7,5 @@ AUX mailcap-r3 1584 BLAKE2B eac2e35ea578079c4a67f71a690443d616f99d666dad12553ae2
 AUX mailcap.5 8951 BLAKE2B 6bd704c8efe861471343e318734abed30c5f406a06646877286d91bfe3cb9afaf128ddf77675d4a14dd1e19a6979772cf013923cf30b02f62e54eac2a7fe02b7 SHA512 6973397bdd389e8eaf1977d8eeee271beda2ad1bd0b01ed7408156af0e7cf430a45e2b7261213a3278fbc2cbb250b65a3f34c11d3c5603cffffade4f1fba24e5
 EBUILD mailbase-1.6-r1.ebuild 1045 BLAKE2B 9363d11476b65fc5dc97420c0046d309756e52fc60cfe7a6c959a0fc40bcc262b666d2389fe1be81d75d721c61046aa5aeefb3784c0715c6a09bcaeb7650880f SHA512 fb737ebc602ad122c66b16f8b3f599d5378f08c7434f0cbb6dde31e16e45129a224c70d9d73e7825a59637c4e3ffcbadc54e925c1e57be7fe876f8c50cbe74d6
 EBUILD mailbase-1.7.ebuild 1042 BLAKE2B 35898d2c02870979a51a278d2725868ace638027427df3b0b3ba3dc4a93aee80ebb22ec28a955ec64e876c0e124ab41b766f057409dcc4b3622d5f5ac958ed4e SHA512 7431582eb7f98a01ad7c37725895e396bfde0ae594195e5640a0ca082850b78f4b81916e2c68db5a67fe41d212a60f9a0a6e3bd768a9d9472dcf482a30999468
-EBUILD mailbase-1.8.ebuild 1009 BLAKE2B 609b7c3d541d2c9076cba2ffd3cdac1462108e7c1283fed428c1d3693a1220dc9460507443d50989a9974e22abbc731ea14f4bc7a4bfa79ce38321ebc632c347 SHA512 440b579b8325136f69c7c0149ce8fb67915f2dcf4e5d5dd1d1a1192c59de8315253b65b63d6bfd6032ccc1d62131513188f54fefc511697ca3bc3f550dde8447
+EBUILD mailbase-1.8.ebuild 1003 BLAKE2B 8cbc2c71b486435134f2d5fcbe610c23435bf5403c11f0e9f3744f1484af8f8ed2c5c78b7f9a080c8ee5e1e673150a543c79b330f85f8874859cf2e9de7fa2d2 SHA512 8b553562a70f71f84c6e70ae8fdabecb4b4a0acd564e374d43d2011607e7ddd44c6f95ffd49b5278eb74e58517afa40c6a0a6a23900f7a95997373af00c01be5
 MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/net-mail/mailbase/mailbase-1.8.ebuild b/net-mail/mailbase/mailbase-1.8.ebuild
index cda3bb10477b..a3f549417eb4 100644
--- a/net-mail/mailbase/mailbase-1.8.ebuild
+++ b/net-mail/mailbase/mailbase-1.8.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 93eccdcc227b..a38fa899ca3a 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -10,7 +10,7 @@ AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655
 DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
 DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a
 DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd538492995f808dab731d02acbe7d63161f3bfb1528a0ca71e30c32ba12edc7e4f68642f2e5154b66d3bb48c479cae95c754 SHA512 9797deb8901d03a231c3503d75a758fbfb1220d1e064dd8be74735e6c88aa04c94533e802a60fdfbe12f1bd7daec4a39249cd957b103f09b89df364bd9a8869d
-EBUILD mailutils-3.12-r3.ebuild 3703 BLAKE2B e017a2c4b8a2cdfa4a9d93ac16f08a7521f0db1682183adec4a40b258e4af48a320227d4a4114b9bca4b3b41105b06969f0d134326f900cc23fcc99fbe15635f SHA512 b74bd2faaff78dddb92669524ff5a322f4e92006aa429c283e47f7ed5617f7226ce438594d6fa2c9c4f7b8bed73b9271ad6181ce9870cdffa4a628d4ea183c60
-EBUILD mailutils-3.13.ebuild 3585 BLAKE2B 15f56ac88d90c4d266b9ebc6158499c26411056379f93eb50a745aee560ad99ea377a3e12e484717f40766db15780c4b5f8483c09540c0e8e07daa824205aa27 SHA512 fc935ce433e9091198824d10f60ff0b8a8760f98400657fd96019ccb9bd547b9ccaa8805f91bb16a96930202b5ce123ca19901de1270c5d16016fc95899c764b
-EBUILD mailutils-3.14.ebuild 3575 BLAKE2B d82c5226a1384f4f4b8cbd7ba1530ebc21f4546d8477acbd4fd69d31334669261545d1a21e61ee55fcf878b1f27c628e945b585a1a10d2ae7b6a636bf1bcf95c SHA512 6f76f26485593882808358acfbd1a4859e2465fb76ef60ae81d0aadc0fdded7e42cbd51ab66f0a226740549f46bc214a322372954433058fec62fbeef3a9b986
+EBUILD mailutils-3.12-r4.ebuild 3707 BLAKE2B e4427c611c1e14ac75bd100e212546a77086dd908699a4a63c58f824906fbfd0166c5546892ad5dd25ae30d339848efbb620509a8e40e8e48f671431b537cb9b SHA512 3bd0d885e6abd126ebb1cd987b238509853a04366e7c6ec84224f98649f4f20c6ba7b9c731d7a972e580ece1d71652f1c84c49c6220416d2718636194380efdc
+EBUILD mailutils-3.13-r1.ebuild 3589 BLAKE2B 34888aa7a2fadb732a39637ad3d4db29b17aa69803f658b0995a9c32e849ad103f1ed75619704c54ddbb8c1f4864f011d1008cdde5ab14e246eb5168bee0591f SHA512 c5fb2e09ad2284563a95af4e0596aef656068b3eb49cc7c781109acb5f6d3f69a6d30a65a2c92f70c401700ea6e7a9c0801659eb57f9de5e6de4c1c918229e5e
+EBUILD mailutils-3.14-r1.ebuild 3574 BLAKE2B 73fbdbb3c1fd745243893379119bdbb25da31291da8c28934cd556ee81379c82e3dbf62378bda9265eaa9cf8076b48865f411bd35118f370a156a0cfcdbf90d9 SHA512 82907f7264f5b8d03716922069144360a1c757e18db54305c1259d549d500bbe46aafd7acd9cfd2d1356e2375278463983710b927b8df4d8d1923708e9eb1daf
 MISC metadata.xml 603 BLAKE2B 1283fff637c3bc43fa0df8e17afe62bb83b38aa973337ad7082ef902f5c2d64e4b70db8775cad2a16610e07dea0b677769a810d7c9a730bfcca874b78b50da4e SHA512 a6eefadb824f089b2de3c61b30314fbbc82413c1c40be1cf243e82bc4fcaf9000c43fc00d73f19f2f7696cd06e71d72b0c6803ad329859574a0a6907a302f8c0
diff --git a/net-mail/mailutils/mailutils-3.12-r3.ebuild b/net-mail/mailutils/mailutils-3.12-r4.ebuild
index 2f5b062735ba..c4e8479b9649 100644
--- a/net-mail/mailutils/mailutils-3.12-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,8 @@ RDEPEND="
 	guile? ( dev-scheme/guile:12/2.2-1 )
 	kerberos? ( virtual/krb5 )
 	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
 	nls? ( sys-devel/gettext )
 	pam? ( sys-libs/pam:= )
 	postgres? ( dev-db/postgresql:= )
diff --git a/net-mail/mailutils/mailutils-3.13.ebuild b/net-mail/mailutils/mailutils-3.13-r1.ebuild
index 823273c3589a..d2d6db7cf078 100644
--- a/net-mail/mailutils/mailutils-3.13.ebuild
+++ b/net-mail/mailutils/mailutils-3.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,8 @@ RDEPEND="
 	guile? ( dev-scheme/guile:12/2.2-1 )
 	kerberos? ( virtual/krb5 )
 	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
 	nls? ( sys-devel/gettext )
 	pam? ( sys-libs/pam:= )
 	postgres? ( dev-db/postgresql:= )
diff --git a/net-mail/mailutils/mailutils-3.14.ebuild b/net-mail/mailutils/mailutils-3.14-r1.ebuild
index 7ae1a24c20ad..a0ff7c93b164 100644
--- a/net-mail/mailutils/mailutils-3.14.ebuild
+++ b/net-mail/mailutils/mailutils-3.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 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"
@@ -32,8 +32,8 @@ RDEPEND="
 	guile? ( dev-scheme/guile:12/2.2-1 )
 	kerberos? ( virtual/krb5 )
 	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
 	nls? ( sys-devel/gettext )
 	pam? ( sys-libs/pam:= )
 	postgres? ( dev-db/postgresql:= )
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 3bfec064755b..f24995ef6ed6 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -2,5 +2,5 @@ AUX metamail-2.7.45.3-CVE-2006-0709.patch 1900 BLAKE2B 8261d06b58fd84d2e35b7a2e4
 AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e8631e2447b77758155431355c804543afa509fba81627cb6e2d93af5e9e6e0d7853a82afb12a657c8afc970c1f6b768dd10394 SHA512 077ad34f5d7664ef9824b623c17d9828b64aa63045f854b4b65567a35bf6fd1d5753d6d3186e3a7d6b63c2854f23cb566911c6bc4dc0904ad7d035229b2543e4
 DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
 DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
-EBUILD metamail-2.7.53.3-r3.ebuild 1721 BLAKE2B ecd826dade7cd778bcb0d2c10ce89587a11f8775f9ff47e22d4332b3d2d7d318be9c30e5e1f6b4177e11205d6e010c593a629a4421b425be15becd94a76241fd SHA512 2bc42ffcbe2964b706438fedb9074937bb9f817abbbad56d8a304acbbc0106d3fe8499cacd1c2cea486a60e47ed91f11f64887852b1860813f77f04a06b98626
+EBUILD metamail-2.7.53.3-r3.ebuild 1723 BLAKE2B 4af9b69d45878bfd750f054c34535a25cfdb2de8c8465894202fdcb4cd0db79a5841984920287fa870b1f804a3d3200a22616a33614653258a330dcab2043152 SHA512 3ae29c12b9635fc9f1cd721b8155b700a2fb025cf9f4bc56381ef27d21530270774c49c8d8cfbf243674b85e6972da4543f61a14ee9b59b8e595bcfa843eef10
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/metamail/metamail-2.7.53.3-r3.ebuild b/net-mail/metamail/metamail-2.7.53.3-r3.ebuild
index 089bfeab2e43..1d4ff4fdfb68 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r3.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -58,7 +58,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index 8d7b76cec6a0..ba1be9041a15 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -2,5 +2,5 @@ AUX popa3d-initrc 368 BLAKE2B ff43e20de31313409b7e9930c397cc4585a500ea6d2372206b
 DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b701231fdff0f18f9cfec4c732e2c2b1b857a01c12671afc510e24860554157bd990be917662ab5dadb9512683da831b4c6 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3
 DIST popa3d-0.6.3-vname-2.diff.gz 947 BLAKE2B 1a64b8de2cbda4757a670aee61e4665bd394f4128763119feacacbdc4921c7a0c128050b3f15f369c4fdea68cc4c595ab1eb48e729a119e1078d4cfd6f874092 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a
 DIST popa3d-1.0.2.tar.gz 32848 BLAKE2B 1f0af2f1f12ec255f3f42eb54087f7c4859beee49d55cae60f32b4f5a58a0062c7cd5eae3690d778f3d7f7bea6678fe937b4864a2a7586c12837edf19df57fdf SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906
-EBUILD popa3d-1.0.2-r2.ebuild 4943 BLAKE2B 19802ac3c4fc3b3f877a4e84260801e823dda144ef0c48a8f914314e63312d8d8983ae7b018f510b145fb20a37c5675c274f45e4f83a6158fb4d5c54a190024e SHA512 add1fe6d090cc35f58ad202092f9a7cc28979938f750b661a13fd212b9233b946cefcd0961c3ca2558164b60d2109ee900e087364dbbb9d492e36523ecb5c013
+EBUILD popa3d-1.0.2-r2.ebuild 4945 BLAKE2B d4284c39eb3d120cbff219a730fb72ccb58da5114a909674c5b6a6c775b267d5240222440c934dce736e88077d79450bf3708e0182bc977c6904b26ecbee5118 SHA512 0fee6e633660cb1c6f94adf47effaa396f4c063ad76e282ddfc63f2b3b2ab743506d16ab4d23743803d1c2ff29fef47ada7c28eab19c7a8eb6507607f93aab6a
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/popa3d/popa3d-1.0.2-r2.ebuild b/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
index 47383afa0c2f..4cb433f446ee 100644
--- a/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
+++ b/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -156,7 +156,7 @@ src_compile() {
 	emake LIBS="${LIBS} -lcrypt" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		CC=$(tc-getCC)
+		CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 5953b16c0791..6baa54dac2f3 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -1,5 +1,5 @@
 AUX tpop3d-1.5.4-gold.patch 730 BLAKE2B e3f30e0aae7ca80c3834dbe63216bff73de20981ad7b02b062b3f13d61c83e4183d0228a065139d2be5b2792f2bf5001b1bede35b7382a57ff895e7fc9437955 SHA512 cf4b2ab8b6f51bf749e32a8204e850ef97426a6de14f3d5d5128725791838717b5b8cbcc4fb80a5534d6820200ebef50dde8d2e20e44133f029be3a2d72a57c6
 AUX tpop3d-1.5.4.init 607 BLAKE2B 8cc947bb35566f09236a5a6c06f6b1b8938d51f9dfe0ef3230507a5a6885bdee8eac11a3e90cdee52b24219cade824c45b15e5777a154a28b78167eaef6decce SHA512 004d2e5ca802ad7681c3f6392728602f54c13c6072d38b147be469e5f9ef09916f7c6c57af944c845e4b504f46fe4893323d5a125b7dc4bdfc2d479a5ee696e9
 DIST tpop3d-1.5.5.tar.gz 285027 BLAKE2B e8cc76040757a5c8931ee34b27a57c52889f3533b71a53c7a2fe589823129ce5972f2ddfa9ecdb46d7a04ac77e8d735c02b07cf7e8192135e4ebea6c392b38ab SHA512 918a057c62d7518613daa6335d8fd5a2553d278dc4d6adbcf5ba3caa3ba561587f1d9e18f564690383e91f3ee2e5120af919d2799b69e93bfe3a3b8ea4f5d7e6
-EBUILD tpop3d-1.5.5-r3.ebuild 2974 BLAKE2B 96b9d2cb8c37029c3de7287a58c04679552923db35d80978f17fcc6e5eb57d4c20bf7f93d53b81d648a373357f9f37f34d95d0725b1d5bc1a88f93a8ee0f8012 SHA512 7153caa3731a8f8d39ec2968d382644f15eb39824200cd6d90595208695f09d173be1e4ade8e5566d968430eacb3b87797cbeb78f361d2c8b4c8dabf6818cad1
+EBUILD tpop3d-1.5.5-r4.ebuild 2976 BLAKE2B c420d44344b87310db584793044bd78c31dcf2008e41d8b639cc4031d90170a9f0de80f66ab6a1e0461d7f23f85486d64449ab08a586cf8b712a8b11c4cd5770 SHA512 2e3d4442cd2b3c21d47d7312b7e35ff08a230a6a5e28c2b93bf8d9e54915c74dfdac0b6dd06185b880a1187c6379b1208db668457e4d2ff97bc0b22278a17340
 MISC metadata.xml 561 BLAKE2B 9c3cdb3234509f5fed875b4810633182b2b17a3a6a4034a9e83cd39ed89da9befe4658d76d2ce27042dcbd56452a9acd98baea3f7f65c65605fe95e37bff070e SHA512 27d747cbbc50936743aa9c09b98185004b59ad11aca5cc58ba6faf664ebe765eafe706d6423f41fb10c96146ee8c42078a57ff144ecdbef4cd9013df44f63321
diff --git a/net-mail/tpop3d/tpop3d-1.5.5-r3.ebuild b/net-mail/tpop3d/tpop3d-1.5.5-r4.ebuild
index ef6ade499c19..9e0bca9a61fc 100644
--- a/net-mail/tpop3d/tpop3d-1.5.5-r3.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RDEPEND="virtual/libcrypt:=
 	gdbm? ( sys-libs/gdbm:= )
 	sha1? ( >=dev-libs/openssl-0.9.6:0= )
 	ssl? ( >=dev-libs/openssl-0.9.6:0= )
-	ldap? ( >=net-nds/openldap-2.0.7 )
+	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:= )