gentoo resync : 16.09.2021

201 files changed, 908 insertions, 393 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 940ccb3bc439..1d0eb5315eb3 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
index 63ea622b8199..12284335c156 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -2,4 +2,4 @@ AUX altermime-0.3.10-MIME_headers-overflow.patch 521 BLAKE2B 9e327a28827aa90d761
 AUX altermime-0.3.11-respect-flags.patch 571 BLAKE2B f740d18fe81026e27636f432f68cd08ec8ed73107cd60a44bf56bce2b21b5a9d6b549666a596e1651c979519df4dc40c9797ecfe28d36b43ecb96b5518451aef SHA512 b4b2d8372b26932cb7148e316fd748fe2e8a515e6725f4db3f87e34ab417a4eaa324bf03ce467dc3dda505b5f4013c004aee05a9903d87a4d310c69d2034ea9e
 DIST altermime-0.3.11.tar.gz 90244 BLAKE2B 5acd29ee3e5927b67de41db4f7cfbe606814ef6476340f26509b1823fcbfa6269c15e1d7e7936e948a7cb0f81b9a17b9a63c2333697707525bc62fd350a55f2a SHA512 561e36398bafcd888e912b6291ec76ead881bac86a7d0b8072753012d4c4557e67f608a9d43c968c6521e5f35bdf7b98e2c73ab811dadaaf13dcefe35c2d9e68
 EBUILD altermime-0.3.11.ebuild 609 BLAKE2B 817ed51449e99653f880a5238d6a8c77525c9c3825bfd115cf2ec870ee862410363803b97ffd787b237ef3452545ab7698282be93e3c95a2bb0b2cee186694ac SHA512 d427111e48689051213ab5018f5cbccc9e4a51227b411956883f42323aa3554dfcdf19d84fe9d4850f820a0e6d7d4d26f3a581bb0cf46cbb4345bde7b500a0e9
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/altermime/metadata.xml b/net-mail/altermime/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/altermime/metadata.xml
+++ b/net-mail/altermime/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index a58ba45327f9..58dc2922cc48 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -13,4 +13,4 @@ DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5
 DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f SHA512 aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f
 EBUILD amavis-logwatch-1.51.03-r5.ebuild 1419 BLAKE2B 473dacf0d49b067d0a6354c7026f54c9d8d320997ef7f2abeb2b4ac6a42f992235b64b213322f2e28995a1f338b97550a617913f8d84e7542488b351fde689a5 SHA512 bc2bf187d2165207c5ac62964444dcbcc994101bce9baa50dfec1798750bfe53ba2b38c5ef1152950ab2ec4529d08a82665c76dccc4a8f1d0c20ec6c02352fcd
 EBUILD amavis-logwatch-1.51.04.ebuild 930 BLAKE2B e382e23df0018aa557838f4dc19eb56af29068012b71bc0277aa4649aa37ee2e55cc2b904e5c9b9bcf3f7e640f19dfcdcfef03fa193c2db56e5c30622c059e29 SHA512 dbcbeedc6410db6bf7ca764a22eebe045cb53b1cd1059601c941ca780074058923a5da6545a5c2c85d0a662864160de52d81e3c73189d52cb1e680e59f922d35
-MISC metadata.xml 218 BLAKE2B b55d5b84a56be6911406973def7dcc385581e50dbcd1c4a7cad56fb8e5e6ec2c7ddc153d0fead807dc1cc8336c32a3ad2e414ebed9c4dd295050acd456a6885d SHA512 e143c766598413b2b305475039473345bf7e007d6cb4934dd205384c0a3df9451e780a4294c56126103a883bb904d9a02e06c082176b19a4e388020438d71bcd
+MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
diff --git a/net-mail/amavis-logwatch/metadata.xml b/net-mail/amavis-logwatch/metadata.xml
index a0128bcd9ef0..c6418674131d 100644
--- a/net-mail/amavis-logwatch/metadata.xml
+++ b/net-mail/amavis-logwatch/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
diff --git a/net-mail/asmail/Manifest b/net-mail/asmail/Manifest
index 9c3e6e017d4f..d622a44cbf0e 100644
--- a/net-mail/asmail/Manifest
+++ b/net-mail/asmail/Manifest
@@ -1,4 +1,4 @@
 AUX asmail-2.1-ldflags.patch 584 BLAKE2B 58b53fadf6209149a74c65333d742f99c549abab08b87e577e7363ff3a2601dd0e78a9d23181676510d6194e9533eb6293c45c089ccb4dcd85955e7aaf0a6c93 SHA512 d3714a3b250b434cd742c6a72afd73c673194375240c2d3ab3f61999be6c36f07dee9ed8cb86220b559613a10a00431757ad95121aba16196ecbc719eb347dc9
 DIST asmail-2.1.tar.gz 271164 BLAKE2B 00972dcdfd74c717a665425cad17c59b01ec631725b79ccc3ed537232e61c5aef231ec4146491335caf2beb451e686359cb196d01f199c33ed16cd66c625e99f SHA512 1251c9f386c01c23673a6798eafd6a518a103da6d2ab78bb4e22c1107939423c44f555e331f79d1b5b509f271582de285481022ef32375b4267b1f3e398f67d8
 EBUILD asmail-2.1-r1.ebuild 968 BLAKE2B 0610035aee36064aa1a2843bde8f5ea6270abcd3453f2213baa1bf42cf6d1994096bf22cd6bf6d865eb8da757912dc5a27174acbfacd7d40c284fe1d8c53a1aa SHA512 b5e1c90be3926446bf99f6c345a7391149afce6594acd165a62a717ac926f4f9a623d60d3c90ef367fd8ede342ab9008ccfe04f7ab603ea0bdbc21613195ce59
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/asmail/metadata.xml b/net-mail/asmail/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/asmail/metadata.xml
+++ b/net-mail/asmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 7682f20897ee..97163393b3de 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -3,4 +3,4 @@ AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab713
 AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
 DIST automx2-2021.4.tar.gz 170903 BLAKE2B 9c8e9bc95eeac9a8a59430248d532d540e70a40c4d61f006d5d2649198e856e4b404ed75df745cfb06887c58049a9a233a597059e2f2971bf9f1c8ce65a34f3d SHA512 f306bfdca10dc884bef404e5ff24181dc9adfb8514fd0e0d984bac84ca4996f0978eda7161be46f1b3d93a9c0e61aaabdfb4b2886012570a51ad0aaf2286dd2c
 EBUILD automx2-2021.4.ebuild 1201 BLAKE2B 757048d7aae1e660219a7ad146e258d6d59138cc71d15ddf63395f305468e3c943e2c9818d3577efa957b163beffdab8f1d16fcfcb267bc53bc83cc6687f60c5 SHA512 2c91a5c291483e62bd7e1e9ce1e67f66aaab37491313cd1f56aff426d7340b280799cbb221df2266125cbdd21685e86724d663542822fe6b659206da46b401e2
-MISC metadata.xml 917 BLAKE2B c1e73cc58a5654304e4bafbae8774adbb0aaab05c581356945a24064acc054b22892255e4d242ee53f4ba6663c448afc28810327cf920cc22653cf6d4f0cd532 SHA512 c8463c93aaae3d3493eae7df21451a291532e2d85dc7c46b4e06cbf60ed2541e44229ab11c804ebb698c987e555b952487dde8a4b98b9c698b0c31e95f74f7bb
+MISC metadata.xml 918 BLAKE2B 8f693feed959a0394e8be4a0f489c4913e142aaec8e71920fc0ace1e3ef1f8b5c79a312139bca612c3d204854f6e222252b25b1343539829f3950d1ae344483c SHA512 77e8f20c9af068189d12ba06ac566d03f8b86435b3c88682c6819975fc0636e4e427ab07b76db9d0e32a5b51b7861715c60209f6ee5ae0d4fb0a19a53c4b98a0
diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml
index d7bf28ee3e70..ee1fa7b24e55 100644
--- a/net-mail/automx2/metadata.xml
+++ b/net-mail/automx2/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index a8ccd6db12a9..e775653133af 100644
--- a/net-mail/autorespond/Manifest
+++ b/net-mail/autorespond/Manifest
@@ -4,4 +4,4 @@ DIST autorespond-2.0.5.tar.gz 9707 BLAKE2B c0e9f85e23d2b3a5168a33695370583c9844a
 DIST autorespond_2.0.4-1.diff.gz 2637 BLAKE2B 6bb2e7567a9376296bd1e0b323e07892099d004ed3e2497d605b001486e1d3d33f7d3378bce48979c7b4dfa9a7a6aef863172ccb4e442ef1e837230f91b96220 SHA512 ef9ffc46c885d644b6f20107c03f0ed68ded577499d8b05ecae217fa43c6053de4a68666cd78a059d19ae1181b101a7de93f1d2ec0956dee7478e43c06b772b6
 EBUILD autorespond-2.0.4.ebuild 651 BLAKE2B a2659ffed5116007a74c5e728c0e015022234b9d15199904b8c71fd03aabf60bca978ce7c1aac633fded526f0391909ce77b32b3f2b944c5c01d67c3ac14c2ca SHA512 aa65d667748562c56839353e149c19cddd09c4fd6f5b373bae6ebc792af31d0fbcc0202bfe98bcd8dbdc9498853057b008884875474701003a4383dd86b6a2c8
 EBUILD autorespond-2.0.5.ebuild 781 BLAKE2B 65782589d2d1daa5a111f9c24df6880b90270e3a7c2fc03730f028956667fbfb74daa6ee4f7e920f53253c4aabce41830b32bc3d11f181e5a0a491753697f955 SHA512 a9d3079fcb362b4b5d0e39baf23f193e2abc021d6c83e5dbca791aec269cc0ee8cf07faabcfaf2c97808d8a8e2047f36ae4beb265c55e191b0170b1977d2492c
-MISC metadata.xml 306 BLAKE2B d2773e404b4ba6a3ca9afaa342780161b8842710a844056970d9d57bfa36b245b8a711f529f5ceb61ee70dc0aa8cec33f8d52ce3b83ce6fc7ab0aabbe21df019 SHA512 c1a07f6fac6f13c3a0c9adacede02bb664a09d8e93e954dcb2cacaa3690ff93783e717019be0cdee715036f7aab179c18384163556ca28798a297efed70ebd5d
+MISC metadata.xml 307 BLAKE2B d0ed670d68e2400348e203e72bc0b1e4be5076cff32d24d0aa15b80357cca8c81c29f06990e28397e7b293449e435dced0636df94330a73b347ec11115162e8b SHA512 c8a69beeea54f94d210263942853625ef2c00792f0f923b731a0fedfd3b1f29bd9981f8d51cd06267c91614746faeac213a3744c4ce6765016b6223d256fccd7
diff --git a/net-mail/autorespond/metadata.xml b/net-mail/autorespond/metadata.xml
index 6e7671295091..69301e2b542f 100644
--- a/net-mail/autorespond/metadata.xml
+++ b/net-mail/autorespond/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index a93b9712c65f..2a52516073e1 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,3 +1,3 @@
 DIST b4-0.7.2.tar.gz 64196 BLAKE2B a947b1feeb7fc0144f282caebdcf44f40a0b13137262ca608f260006bdd0a4db6d7347cc1dfe023336566306bb80bcfbbc7c9b71964a949100365d4daa9d4046 SHA512 0a55302c41fa1b5208fba0fa8631e9fdcf37f340f6513a351ea69915f703db7f441a8a7ebcbb29f657049db691de8ed316a6febdbc7b7e75957c7d328fa948f0
 EBUILD b4-0.7.2.ebuild 465 BLAKE2B de5e4a39cef67e0f8f284544da670957785414fc991993f1fd3993289c09a796ab9103e3c3923adf4e19913b78fb32303659194c5f8ab043a16ac3890a6222d9 SHA512 8e9ee5875bc984662e31ff3aec012e70f6cba5e36b61e7a1c8a2e800b5307ff4f97bbcf566df261d542fcbe7598d01de8889fc652d1fb937cf8459b7c8c8b5e8
-MISC metadata.xml 315 BLAKE2B a201784cceecdb6e5beccc05f33f31bf35b4a8cebcbd439a968ffc58311e759d1622438eebbdb91719e6c25e6336d3dbc0fcc978840467a7ed688993ea694a20 SHA512 82da8cb6c4b38292564285922dff9718640cd2193ca8ceed00b516f3dc1c5cff9bb86b854a207becd2ef88c4128dfb2cd505e51dcc6241495c10cf1dfb6d0bc9
+MISC metadata.xml 316 BLAKE2B 62d44d71ffd93810f657fb1f8928d9b302d59fedef7ab020affa3bfcd329aed59f604755fd309927d03660adc0b9c540607f3c6a7b6438ab2deb752d07f2ac66 SHA512 9e469a24088924955ef3c2b5357bf9cc763269e190b730619a41be916bf36c4ae869186053a3f87cbfb6f6f435774a974c159ed6e374fb6a4a53bbd8d140c4b7
diff --git a/net-mail/b4/metadata.xml b/net-mail/b4/metadata.xml
index 08f618477ce9..ddd173fbe5e8 100644
--- a/net-mail/b4/metadata.xml
+++ b/net-mail/b4/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zx2c4@gentoo.org</email>
diff --git a/net-mail/checkpassword-pam/Manifest b/net-mail/checkpassword-pam/Manifest
index 293512e21a89..7ad1882c905a 100644
--- a/net-mail/checkpassword-pam/Manifest
+++ b/net-mail/checkpassword-pam/Manifest
@@ -1,3 +1,3 @@
 DIST checkpassword-pam-0.99.tar.gz 83751 BLAKE2B 398344f6ae8556a40db2d217fe38d20a6f0159bbc7750c3d4c115ca6a383dbfa9018af1f0f5404b34b349e998093307de333434ea0b9b176a9491a48f4d5c044 SHA512 d7c9cbeec7fb15c07dcc3c6e6b7f38884bdf0fd2fe31d3a38b2f6f58deec57716b5d65387b03cb858c1bf5fbb5dce88e0451bf1b866b88fbc17165100040baec
 EBUILD checkpassword-pam-0.99-r1.ebuild 435 BLAKE2B 124de20612fdf2876feccd8c53342489228d855c221defa8dfcc34be3d2ad11a60e95d155e660600673cb2b4685b535c4ad47c5a5ecf9e0a471b835a3be187fe SHA512 c78892b65682b06d4e91b40903090eaa973533b48e9f1190474e409b498c334233614476ecb7499035c9b6b4a87af1529efe40305d509077f4fbce3f7b80467c
-MISC metadata.xml 252 BLAKE2B dbe9a6c6c10ec16a5261653effdb4d744c1c8e6477eae5ad220f9add922d1321f7c7101596283cd8e68b20b6d9d5ed969518afcaf64e3fc047144bc2731bbb63 SHA512 75e23f3cd2f7515225a9c07df4ed31b0b6519b055bd4d793b83783a32b4b9745f76ae17054a0b6a91ba16975538b92e603e94c4934c25c8cb753c38a72a8edf9
+MISC metadata.xml 253 BLAKE2B b344c7f0acd8e2d4cee9c760e09d877f0aab4cc154cd7f0b7e58aad4b73b1a4590b7db1e01a2ef81f755e188de6737d1134cd5acd22be3879d390df04b32c69d SHA512 474d9d21a4822b0a959822529a28a9b12c7e05b9fcf89be22a373885a1be93d01f1ddff3cf134dcdd1194022c73160675038b066d9970353a0b38ed42f6308cc
diff --git a/net-mail/checkpassword-pam/metadata.xml b/net-mail/checkpassword-pam/metadata.xml
index e121b0ff7d83..146b64295f23 100644
--- a/net-mail/checkpassword-pam/metadata.xml
+++ b/net-mail/checkpassword-pam/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 4c46d734d2a5..f8724f5d0875 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -3,4 +3,4 @@ AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03
 AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
 EBUILD checkpassword-0.90-r5.ebuild 998 BLAKE2B a45f167fb76c4e2d8e5bc77bd43598e31859feedcf3c1bcbdd2809723071581e03452192cd705d96b1ee63719c45ebff149d61922d9db491372a1aadb53a22c2 SHA512 47756ede127e502563d81487d1ef2827e66d1e6f4d756b5965b07b34cb83e68e305d9cbced8f5577b4ce8e097d62972197c688a9e7f335b9b1ea602a4a25c1f9
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
+MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/checkpassword/metadata.xml b/net-mail/checkpassword/metadata.xml
index a4e0d354f696..a551e17802d7 100644
--- a/net-mail/checkpassword/metadata.xml
+++ b/net-mail/checkpassword/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index 4e0073f759bc..8a18b2122585 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -4,4 +4,4 @@ AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce31
 DIST cmd5checkpw-0.30.tar.gz 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
 EBUILD cmd5checkpw-0.30-r2.ebuild 1470 BLAKE2B 38eb508a860474c9705820d7c6a1593c522594d86f9e59e43818ee1cf7e982dafc877174f79d260f83e7124e9b6fb12a1ad5660b870413d018eb76b4ba9dd869 SHA512 3299c9e48209950b774dd86abc8646088885bf0d98f2a50ecb4e3df75726d12c925187afb4810bea0bc6e3bc1108812143714314fa00b12a78f7daff14f979b9
 EBUILD cmd5checkpw-0.30-r3.ebuild 1498 BLAKE2B 361d85015f22038af2d2576da5a3504fd0b5e255900de8ae4e35847b15c2c3315b1dc23cf5a60f284d062771be24886b74553174fc1e2d0de866815b5b32886b SHA512 dbe2aa5ce3e914d178e9bb16c1c0e8fec20439df5825f2da44675a338e2c5774a12d471c6b1b11ad9f93d0ca7df3b2229863f84bcae311ee6c37bdde5794690b
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/cmd5checkpw/metadata.xml b/net-mail/cmd5checkpw/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/net-mail/cmd5checkpw/metadata.xml
+++ b/net-mail/cmd5checkpw/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index f7695cbfde94..b179407c2f8b 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -21,6 +21,8 @@ AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d
 DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca
+DIST courier-imap-5.1.4.tar.bz2 3363196 BLAKE2B 272548fcbc560ebf39e63170702de30970bee1e0026c31e0c8f0a6dcf86271565cda1e83e9fe50174aa2db2f9172cfc78132746ca8eb2e6749f16c7e994d0db9 SHA512 33e54e3b369335f5bc234c638c9bf4f68bc39dc9cb6cc5e3e3ba200f72a7b2fcdca6a4f7e35f32f494406f8757749ccf5204be93ecd2edbfabab4b6316d5957c
 EBUILD courier-imap-5.1.2-r1.ebuild 7080 BLAKE2B 409991b56c6949cd22ad492dac78ebf53fd78aa332b241264c1583caf31066a008ba9f523386706302c6cc8eca768fbd4618536f92b42684a09eb5e660c857e7 SHA512 b8254d057e394a7e675439d28078a8fd56966b0b5901b26784ba68d0464758a6df806c58d7f5a6035478c65a5a40c9e3fd78d701aac6fc375879ba0be21102dd
 EBUILD courier-imap-5.1.3-r1.ebuild 7088 BLAKE2B 5c836de3ea7e5fea7606c2454e0dbe4fb64ab294451747e1ae2041cdb816778946b4de6075ec1cdb1cd7f1dd64525c36e23c1f196e88c514cd30c369e4afb35c SHA512 523eacc6c4d782409fcb925cf7c8d8fa08b48d873c861608ea28b374b5b1f202e1bd6a36c084ff7f48a539262c3559ebf01c2a209f49d8154b4d544402daeb45
-MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
+EBUILD courier-imap-5.1.4.ebuild 7088 BLAKE2B 5c836de3ea7e5fea7606c2454e0dbe4fb64ab294451747e1ae2041cdb816778946b4de6075ec1cdb1cd7f1dd64525c36e23c1f196e88c514cd30c369e4afb35c SHA512 523eacc6c4d782409fcb925cf7c8d8fa08b48d873c861608ea28b374b5b1f202e1bd6a36c084ff7f48a539262c3559ebf01c2a209f49d8154b4d544402daeb45
+MISC metadata.xml 463 BLAKE2B 548ad09a1ed2b0c44cbb80ab66b653185b178873ae88f5a33545b759914fcb9e6491eef7c9e6da0a713f40c92b3b084cb36dec6f411ca8cba6db76767c8ca237 SHA512 d1aaf82b4ce4775d8e8f97f8900e10aaf403b1224744263d76c3eb890e0ec08c8e108b2f631498bd21ae3551c211747374526d73dd9764c01c4e6af5de78b950
diff --git a/net-mail/courier-imap/courier-imap-5.1.4.ebuild b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
new file mode 100644
index 000000000000..2c96931fa935
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool readme.gentoo-r1 systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/imap/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+	gnutls? ( net-libs/gnutls:=[tools] )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=net-libs/courier-authlib-0.71
+	>=net-libs/courier-unicode-2:=
+	>=net-mail/mailbase-0.00-r8
+	net-dns/libidn:=
+	berkdb? ( sys-libs/db:= )
+	fam? ( virtual/fam )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:= )
+"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	!mail-mta/courier
+	userland_GNU? ( sys-process/procps )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-courier )
+"
+
+# get rid of old style virtual - bug 350792
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/cyrus-imapd
+"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+# make check is not supported by this package due to the
+# --enable-workarounds-for-imap-client-bugs option.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
+and remove TLS_DHPARAMS from configuration files or run mkdhparams
+
+For a quick-start howto please refer to
+${PN}-gentoo.readme in /usr/share/doc/${PF}
+
+Please convert maildir to utf8
+and rerun mkdhparams if needed. Location has changed
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
+)
+
+src_prepare() {
+	default
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
+		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	econf \
+		--with-notice=unicode \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--sysconfdir="/etc/${PN}" \
+		--libexecdir="/usr/$(get_libdir)/${PN}" \
+		--localstatedir="/var/lib/${PN}" \
+		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-certsdir="/etc/courier-imap" \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+}
+
+#src_compile() {
+	# spurious failures with parallel compiles, bug #????
+#	emake -j1
+#}
+
+src_install() {
+	dodir "/var/lib/${PN}" /etc/pam.d
+	keepdir /var/lib/courier-imap
+
+	default
+	rm -r "${D}/etc/pam.d" || die
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	for name in imapd pop3d ; do
+		mv "${D}/usr/sbin/"{,courier-}${name} \
+			|| die "failed to rename ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -e 's/Maildir/${MAILDIR}/' \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR}
+	# to them.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv "${D}/etc/${PN}/${service}"{.dist,} \
+			|| die "failed to rename ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for x in "${D}/usr/sbin"/* ; do
+		if [[ -L "${x}" ]] ; then
+			rm "${x}" || die "failed to remove ${x}"
+		fi
+	done
+
+	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
+	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
+
+	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
+
+	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
+			> "${T}/${initd}" \
+			|| die "initd libdir-sed failed"
+		doinitd "${T}/${initd}"
+	done
+
+	cp "${FILESDIR}"/courier-*-r1.service .
+
+	sed -i \
+		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		courier-*-r1.service \
+		|| die
+
+	systemd_newunit courier-authdaemond-r1.service \
+					courier-authdaemond.service
+	systemd_newunit courier-imapd-ssl-r1.service \
+					courier-imapd-ssl.service
+	systemd_newunit courier-imapd-r1.service \
+					courier-imapd.service
+
+	exeinto "/usr/$(get_libdir)/${PN}"
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
+			> "${T}/${exe}" \
+			|| die "exe libdir-sed failed"
+		doexe "${T}/${exe}"
+	done
+
+	# Avoid a collision with mail-mta/netqmail, bug 482098.
+	mv "${D}/usr/sbin/"{,courier-}maildirmake \
+		|| die "failed to rename maildirmake to courier-maildirmake"
+	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
+		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
+
+	dodoc AUTHORS INSTALL NEWS README ChangeLog
+	readme.gentoo_create_doc
+	dodoc "${FILESDIR}/${PN}-gentoo.readme"
+	docinto imap
+	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
+	docinto maildir
+	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
+	docinto rfc2045
+	dodoc libs/rfc2045/*.html
+	docinto tcpd
+	dodoc libs/tcpd/README* libs/tcpd/*.html
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/${PN}.cron ${PN}
+}
+
+pkg_postinst() {
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
+
+	readme.gentoo_print_elog
+
+	elog ""
+	elog "Courier Imap now run as user mail:mail."
+	elog ""
+	elog "This require you to enable read/write access to the caches:"
+	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
+}
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
index 3234ad92f494..91001f68a42e 100644
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tupone@gentoo.org</email>
diff --git a/net-mail/courierpassd/Manifest b/net-mail/courierpassd/Manifest
index 099c6e301313..beb190bc5c48 100644
--- a/net-mail/courierpassd/Manifest
+++ b/net-mail/courierpassd/Manifest
@@ -1,4 +1,4 @@
 AUX courierpassd 232 BLAKE2B b85e16144a2609524e4c4ad8dcf161c763f0bff16af9fca4d326bc8ab1e10cfd676ff85de8ea01d4258a7244bd19ad9aa9fa22a2fd973e84037ad9796bd51623 SHA512 c9251f6137f3fe6f58cad0fb5159359293e1e74dafcdd04d96da05f29b62fb5d5326f21fad358e98757df0808e5452246bcf4f732bb62cdf2214b9d209deb0f4
 DIST courierpassd-1.1.2.tar.gz 286929 BLAKE2B 04fa599f9cc09e288c0474393d3130f59f8502eb607eb6f394caaabf760fd04a936b773392969fa5e57643acfd8774d0b94c823861420d91179e0087691c3ee2 SHA512 0cca32b19f9ebded8e388fbb5571dced4c2b9b9d47ab8e40d6b4351d77e31157bd7b97b58766bf673c38766e833206572526e27fdf6ca2d6a40f0961ef8bc7dd
 EBUILD courierpassd-1.1.2-r1.ebuild 614 BLAKE2B b7b5daf1cdd8a15aaf131825b4389a58ff36ce62ba37d6b81b40c4c7fef8017823f8bebb04ca5e8944ada61f66c652a28d114eeb870d805a2c52a88eb99c3bc8 SHA512 61093737ef69e4f35921c38fe44ab1c95da825c25d04361d59ac2ec1bf938b652439f6d384a992a5ca74abd4c695e4b87672a1c9afe60651db0e975c7a66d4c4
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/courierpassd/metadata.xml b/net-mail/courierpassd/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/courierpassd/metadata.xml
+++ b/net-mail/courierpassd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index f07b1ed567f4..df985188fe51 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -8,9 +8,11 @@ AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb66
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
-DIST cyrus-imapd-3.4.1.tar.gz 12539102 BLAKE2B f791d26f34a9a5e9896231ec812ae623bb3f5fc85a577ea25deea956bda153f941f2a759f77de10d105d0746827243efed773fe67eea4921200cb2cddf81e049 SHA512 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa
-EBUILD cyrus-imapd-3.0.13-r1.ebuild 6071 BLAKE2B 8e88d65790e5a69aed873cc1a5046e4e6ddf3eb7f27cda65c5aec6c36696a1b1a616bfb0d7f5963e392b86cda7e68508b162ccbfe33703962b7385f6f4d1ee6d SHA512 abfe0714a5e181facf6a0bd4a8e478f217920eb5f86d26a06ad43eccfaae320fcb5411f47d0557a3ec7338a924ab6ce5b0beb61dab7eeeb42d446fdf0537bb46
-EBUILD cyrus-imapd-3.0.14-r1.ebuild 6032 BLAKE2B 96915985427fae18071075550b6c45c5f6a9aef97f79a284e1e65578d0823095d88621e2d08850a668da19e172880a73ec12694eb003dfbf01037ade63e42cf7 SHA512 e80d51e697411c1e1e861282a4477e72f14dec93801233c7fa1baa5b9d6345a8b9ba1b24f27c70e17dc76fd85946acf9a18e249d280c105f412082f035efa66e
-EBUILD cyrus-imapd-3.0.15-r1.ebuild 6018 BLAKE2B fef2862da0213b6fa03e752e1f9d8ce16a669d5dc71f9939c998c438c01dfe5925c8228d9f417eb7e91bdd7b82576f6e3f7e255cb820ea9b8ad57b68539fef25 SHA512 210eda7184d8022a68e4a54fb35eaaa393512660744cbd9a098f0bc9ccb8dc65feeadb969d0ba6a8c19bc8141c9f29943ce67d5b27e430d51bd6b407129394d8
-EBUILD cyrus-imapd-3.4.1-r1.ebuild 6111 BLAKE2B a6079dd301b4a5690686415f8c59a7ddf07de860781a5d8cf22aa3d71ce662cc514ca1b91c9a4e6889f994711e81014e051ded03cc3fcab39348cc0584a36ca4 SHA512 3999ddff75b24de82793d9274a843bcfa73a7edbee3afe54c2312b1aa23f2e79c1a8e761422996f51acc567a5ffe3f84b509180bb7ce073ceaf30808731787d2
-MISC metadata.xml 755 BLAKE2B 91a98ad4c523212160a8d64843fbc77a376c13d69c4a0ebf6c2555f546634f6192c40c75f3a0f8c24b23283643e216c33e2d9e3fd52d663b5f90b956d6f6bd9e SHA512 a289dce9ddd43330b438c3096c8b186cfbb1a0e9d0398e76cbcaff28f72b21735d699d3c470164c5dc25cd9a609ba100e794860f03a87286cdbab9e41e2d41bc
+DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
+DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
+EBUILD cyrus-imapd-3.0.13-r2.ebuild 6064 BLAKE2B bf1a1c4c74ffa14c4589b2567113634bf8b095b7277c0e0fb2d8862381c6db7397428344f78c66b4a6397e2f65572537a3ea497330a0a4ebadb7e86cdd5f53ba SHA512 00c690dc8aef5df29986e1aed176a2bf17bdd18353a73bc16f5b880332a1ead1927e5e3b9995cdd4c2c28bc3c533bceb1265dd81dc30c45ec63118f1de1ee184
+EBUILD cyrus-imapd-3.0.14-r2.ebuild 6025 BLAKE2B d471a5946e4cc4d052cd3dc147b3d13e730b7dcf1cd4c2798061a3b7a79d44b7b1c99f78642c431bab576a833ee6dcf155061db2bb0e65cfe58fef94e0299b9d SHA512 11de275e32ebb7d4ed18681fa43b426f140f45d3987c7ba358bd38098cadb264723db1479f9e6ba42b29516f052355ff0fc250271b1e064462e13caf619daeb0
+EBUILD cyrus-imapd-3.0.15-r2.ebuild 6011 BLAKE2B a23c3d69c79476d00ef3a6b60a3ed8d297d9316f4f5b0d83ed5643d8f6a95d057729817ae64b227896c22ed1a0655d00a5269e2765da2a145b62f13b8731d00c SHA512 77aadc470981018cee1ddfc744cf80c38d7a757387196f73cf2386eba39d9b72e998fe8122a6c2654c4908a6cbc57e3ca6d49e9b92e4a12d3374bb2e3edc4e46
+EBUILD cyrus-imapd-3.0.16.ebuild 6014 BLAKE2B 71d75a50701b5010fbe415375a5b4e15573113d1c4fafeeaba7cedb6487de3cd96310f69a0f39d39d5cd2e634905ec03d5eff570ad82ffcecf0c90061914c49b SHA512 74ebf8fd6449e66a05a49ed3741d4dec380417d6c665d2ee17a87ec85ec83382686315c8c82d62c868a1b25b6ebb2d82d5da43bc9e60ef5fabe39c610a30d9ef
+EBUILD cyrus-imapd-3.4.2.ebuild 5951 BLAKE2B 48f7498bbae7fe7a36dd5f561dd2526d6f06a5e923c0541661fa4d42258121f00ab83394c5f306acd0dc7d6b20fe7a4240ea011b13041d4c0d3746d65e42f833 SHA512 b31e04a58d2a07332a0d807aefae710127bc3c7e11714ec964e39b35eaf819aef1868d3ee5e92a81737e9d75c84d923cefad305da011d1194d484b12f1cd9d0a
+MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
index 0b1c4623c1df..b43bc8a9c6be 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r2.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
 	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
index 3affaab2f216..5bbfe2dcd570 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r2.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
 	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
index 0c07e5648b52..c815c216b760 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r2.ebuild
@@ -23,7 +23,7 @@ CDEPEND="
 	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
 	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
new file mode 100644
index 000000000000..7d03ce6b6864
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:0=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson
+	dev-libs/icu:0=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	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 )
+	kerberos? ( virtual/krb5 )
+	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
+		)
+	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
+		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+		)
+	xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="
+	afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+)
+
+src_prepare() {
+	default
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"/etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"/etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
index d3b05eeba469..9f3b5413327e 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.1-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2.ebuild
@@ -23,7 +23,7 @@ CDEPEND="
 	>=dev-libs/cyrus-sasl-2.1.13:2
 	dev-libs/jansson
 	dev-libs/icu:0=
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	afs? ( net-fs/openafs )
 	calalarm? ( dev-libs/libical:0= )
 	caps? ( sys-libs/libcap )
@@ -113,9 +113,6 @@ src_configure() {
 	# TODO:
 	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
 	# - post-emerge message re lmdb removal?
-	# - fix sieve usage upstream to allow it to be conditional again?
-	# (remove package.use.force)
-	# (https://github.com/cyrusimap/cyrus-imapd/pull/3270)
 	econf \
 		--enable-unit-tests \
 		--enable-murder \
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 07719eba8027..5e5c1ac2074a 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index ae313f8e2489..8f31ddae69fb 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -8,4 +8,4 @@ DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fc
 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
-MISC metadata.xml 570 BLAKE2B 5f2c04c5edfeba1166114d6b3d103abf9acd2bf312a359b4d25fc622b482b75b8660d2b3c48239a6cd8f87ed63bc591e9495346af944c8b853c74123ac67fb22 SHA512 b993fc2d7954a9afe0a5c53f84e3791a78c033abd64f3d279a54c34053bbe344ba4d0aa4456c9aca5ef9b2131db08698fecb717f5d7f130c501d659ec8fd59a8
+MISC metadata.xml 571 BLAKE2B 68a2a0a6d1b2cb2837c7589125f4895269d60588760a43d7b275619b5e7a01cd4625f754da41a7a377673d09ae097f53144d62c451a316a5cf1f786ee18ac74e SHA512 b3e72b2de1aa541129542f907b0a3b332402bd7f3d5d1029c36769834eae1e9e5f67fdedc40d024630d93fe766c5f346eb7e6e366b443a82a8a5bc12f1ace7e6
diff --git a/net-mail/dbmail/metadata.xml b/net-mail/dbmail/metadata.xml
index 5cda74b26256..7612b09605a4 100644
--- a/net-mail/dbmail/metadata.xml
+++ b/net-mail/dbmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>lordvan@gentoo.org</email>
diff --git a/net-mail/django-mailman3/Manifest b/net-mail/django-mailman3/Manifest
index 71193e567120..505a72715798 100644
--- a/net-mail/django-mailman3/Manifest
+++ b/net-mail/django-mailman3/Manifest
@@ -1,3 +1,3 @@
 DIST django-mailman3-1.3.4.tar.gz 390310 BLAKE2B 0f28e5191ddfec8196824362ffb6b406f8bbcc64e85f93ded37317502673140693c48c60a34713a90cd6651839edaa788f9f73ec8a1836a1597854316ffd3481 SHA512 0b28636caec452efeda2b1b44f1d5ad44740ab0c3ea7b03d7d2e6bf420b1a788d5858e5c827824ef6baf2a463232ec53f404d3de0c22cf6ee17065236f7fcd91
 EBUILD django-mailman3-1.3.4.ebuild 657 BLAKE2B dcde478a57d048ccd605b6fb17585fb3ff569d5b1b80384335b535eddbf905a66477b115c7adb0c9942b13fb7e6af104e0af62e8d49a19c4bd815b7267c07ac3 SHA512 ad28c00eeca189b37ef7dd7cc219d830c8f07929ccb7b0887886e13faa006f525fcb6aaea9ae8c98741c43cb88cfa2dc76d014d682aa6dcba598ad537ed6d21a
-MISC metadata.xml 294 BLAKE2B db0ad1bae5464f96474c73f66142b247ded80896b8b5c308b6308768103fa7b18b08c8ef6b9617bbd36693c502da76a1fc11799b4596169709e27418141ec606 SHA512 c29c7fd0c77118c68d0ac8b07445b6b84de33864236d1b618c9dd2e67126a44603da4b9c4e7c41d024bce2037cec051180489e0cf75c31971c29215c7599d37d
+MISC metadata.xml 295 BLAKE2B 264e7013eaef2782694248a6aa0f8cd0cc2de9c88d5e9616f7ae1c57cb9e38e7331cb613412ba0b3114bc6755f544c79b4f3b98b9dc73d72457eedc44bb21f5a SHA512 859e3f54e8aa33b028a21296c5442a2b2fd5b1364ae70067f5f46acb55faeaa6bb75de71f6d3ba5ee9456b2b2096329c9d584bd0e287c96363cc0873c71a6eb3
diff --git a/net-mail/django-mailman3/metadata.xml b/net-mail/django-mailman3/metadata.xml
index 78294879d023..dba8d0c4ff14 100644
--- a/net-mail/django-mailman3/metadata.xml
+++ b/net-mail/django-mailman3/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 91a19f11cb59..eb97f4642f25 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1,4 +1,4 @@
 AUX 0.71-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa59dd78d7a5dbd488c599bd18bc15e3e36e4a50ea156c77614eaa4f507b968b6906699fe40f958cd295 SHA512 0576644a2820a42cac44be9ba564b5043245cdb192a50115bafc871e3306945a657440c7e74d6a83796a33b964269f60ab1b3345b65cdc5ff2342e4f2cbaf9ab
 DIST dot-forward-0.71.tar.gz 26352 BLAKE2B 9757d07adc796ad35c6426eed3c53eb87f784a1035ad6569a8130e62a04665bb9ac03c250be0e5cb22f122c7204197f736dfc748d468c980814d23bb7ad0069d SHA512 f37a30eabf3a7e7258bfbe9178218d053a5164a9698fbc34954eb8bd588fe2bbf61ffd85f5b817e3ce65d7c0efac1735b59b11faa4d425e2df4089769af94b8b
 EBUILD dot-forward-0.71-r4.ebuild 876 BLAKE2B a991374281c113d8a71fa1822373c3936556241b82d3af457a914f8fc4a9b1b863910c85f78910776c8e2451693d9d7078901990ceff4f617419fb0b6218803a SHA512 82370cc41070b4933a9cd035742de04d21d28f8236e095b7c0d7ce04841344ddcafe0d209f5916f4e4d5d7c726a0bbc0bf41c8e990b9da7e8d99f8511c655767
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/dot-forward/metadata.xml b/net-mail/dot-forward/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/net-mail/dot-forward/metadata.xml
+++ b/net-mail/dot-forward/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index d9490b44ad9a..1e1fea090eb2 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -11,4 +11,4 @@ DIST dovecot-2.3.16.tar.gz 7650008 BLAKE2B 682067330e94a51a6bc6c82444a5e29a08d63
 EBUILD dovecot-2.3.14.1-r1.ebuild 8699 BLAKE2B 025b31d9339716d42205d8ba732895affc49f3ca967b2f5fe07f908e0af64a06da4da2e2c06f269b4994a784007743c2ff8a0cac4aa73c223bd9b3f1dc6f9635 SHA512 52cecfeb9b0a6c7cf422ad4ee30dba6bee0e6b813ba43514bc62d899763a470c71b50c83e063867e8bd5b4a0010b8a29d5dbeaebcb9b51d8d74864d5483de89c
 EBUILD dovecot-2.3.15-r1.ebuild 8858 BLAKE2B 15b3b8ea8586f1bf5cee1e6ad7b262f7816ef0b251464aeba84b30653f4b8cea91ff121ba620cc93026d9a7b056e6a4519f5b76f4482443d008d88e1c4033b78 SHA512 cb4dce94e90ae5845981a625767a2f5625d85cf57c47ee19c07b46297a8cf1b6d37b3182ee0a804eea25c4520c6902311f322d4ff81f9858ff3bcca080e5cff7
 EBUILD dovecot-2.3.16.ebuild 8882 BLAKE2B 76a6c3bebab81278a54c733e35e33b9b8ddb8cd61c9999ca3f0c59b195d3aadcc84ded551ae30cac1ea0a173b9f240b8a18b97e05898bc9b690f94fee0e16880 SHA512 c89b7b723b14d42d203acc8fe8331b00f0b696792a93a162184e309a034cef5b89765507e0a20d133508b70c8dacc1ec19f3c68c92eea78145c29a8725f1b045
-MISC metadata.xml 1025 BLAKE2B 8b0f7c2bbb9cfd58d34cafaea132e3d52236f91db59e53a91c0816f12813311b9d9e6d19d2341a044a4a2af5ed961eec8417d0df6826a8cbb02dff528f3cb533 SHA512 0175bb9a54384bf69d99ace11ce8a76dcca1426e4a4edc3a3e6404a0dc1bed8f6912add47735d1924410dca2d80fcfa8c9cab4df4dc7ee25f4dcc1ec004f8665
+MISC metadata.xml 1026 BLAKE2B 0759879a843f194dfdf70a3a0f5367ac4dcd0067017ffab38cf489e41fafe76a4d7ed50c295b3004e0c7d8388722712b6ffd4907b0403ea297de59547ea0838c SHA512 b07f7ccd1030c0c97213959d0ed7ddf299b0abc3ac87ced7ffe866970fb38856e5ffbfe0c7e047fde4cc00c8bf62a1a0ab886d7cdf43e2fdc66aba8353cab121
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index ba9b0131ea14..13530f3e6014 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
                 <email>eras@gentoo.org</email>
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
index ab9b3750492c..518094fbf7ca 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,4 +1,4 @@
 AUX email-3.1.3-fno-common.patch 560 BLAKE2B c592ea54a13089e65cb6fd6bdcb80438f8a0f7f8734149b0b8f58649a94eb17f5cb4e87f96131e2d03ad8dc057a5c4f1bab71b64d071ec0ea565622d4d5ca834 SHA512 34bee203fa588e6ba785c331208086448b39c4bb4725b04166a165980e8b5b4c1e5d0bb87a59b540a7df0f0a3b88dd0427e715c736ef443bcb40eb3a3495f6d9
 DIST email-3.1.3.tar.bz2 178396 BLAKE2B 645d1fd3f0585ce6cbe2e0f2354989f07b39c83c8d21789a94d27a9e9820ea02ec1b213080018c560c7c79ef6f8fa2b636df4f40c9bc5390321d438cf64c448e SHA512 3fc1a8aa653a519261614e54b3215b89e41273207aa63f64572c8820093922a820ecad5e939b0eadf8d4c0587be83ffcb239bb31fd959b96dcf566157420f33b
 EBUILD email-3.1.3-r1.ebuild 445 BLAKE2B 66cd52cbdc035c1ec0799101608644a016d7e1cedeb174e2d68a29b703fd217d3d4dc00c39110725069b5d4640ecff9483b44470a9856dad29973f02f86303a1 SHA512 8856483d91623993e302bb1001db1613696f60da16eae49d69f56c1fba13205052e12b54217f6e8f4c2a45fd6e8f1141eadd7612d17c8cdceaa49e4f0a013a90
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-mail/email/metadata.xml b/net-mail/email/metadata.xml
index 1b2becffa26c..bef24d2c2337 100644
--- a/net-mail/email/metadata.xml
+++ b/net-mail/email/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/eps/Manifest b/net-mail/eps/Manifest
index 469102350e9b..d1f8a59ce78f 100644
--- a/net-mail/eps/Manifest
+++ b/net-mail/eps/Manifest
@@ -1,4 +1,4 @@
 AUX eps-1.7-static-libs.patch 346 BLAKE2B 79173cb773a3e6a6b2ce1e299f57e2a3022ac84a5fb6179ab41c1fc47876df57048ce5332917ef8f639917a00e4b284ea56b983fe23f8037287495265b3e3503 SHA512 83704853338dd5f267e18023ef88fc5dda610fca73caa6ef9e7fb67ca1e30200fd923212381ca0b85a2f2b41322612b68d1562afaa19da82ccc9fa38ce77e7dd
 DIST eps-1.7.tar.gz 29913 BLAKE2B 83205ed03cd4d28538c356b3d905437179c961e8a3d60059a59cd32b16548a4cb9bd73382bd4a948fe4a985a5cc39a85ec84126df1a61799a6dcba3a6227ff66 SHA512 be7df0d5bce5798afda0573b5d943da7e69e6b99817f4ed6d87e2858e75d7c2408d7fa9942dfc6277db0bedb73cf1f5ca64542d070075dda544cbc695134b1a0
 EBUILD eps-1.7-r1.ebuild 814 BLAKE2B 0c2de3b48c275b5954da416e5659d9c74c3a68a0a20d8d487a628bf5ef4ec6a128bbc3270c9bf7fe10af118573f6874ecb2753b112d714e33f8895dc35ac6cd7 SHA512 d8e7992cb75e70bf2faaf8c452c7ef7f6662c7dd604352c1a302adb51ef7ed8e61644c428650a0d3b3e4a7d763109eeb120f714236a18267ae4af8c06057317d
-MISC metadata.xml 447 BLAKE2B 30f8317f4095ee7a5ed8a600490bc7301155dd104cef82870a10e39319026366c3f34c3f4db90c86b893dc5606e4f3d76571ebbade82398ef40b6943f2ccd4f1 SHA512 40a941eb593ad63194da271f682313ac5792ab0147f95a3cb9e5f68bde2dfe0bb138aaf941d861f96ee3803ef2d146728600372525002c070b832d393d35b490
+MISC metadata.xml 448 BLAKE2B dd6818604f7879909b842b31889b8575f85851c0055a9b587c2675f8b8b606ecd4b5389ee781ffd53de24743e1f454072cc7986673f3e517fa6f7abe88184692 SHA512 8a434126b44d3a4b19790d50787586bb919a6359044614db8b35994a46d5add0d0b78342eb93043acf00c982786241076dd7ff68be9578f23f56acb5701cf9b1
diff --git a/net-mail/eps/metadata.xml b/net-mail/eps/metadata.xml
index fe4e21b0135b..b040bb84d678 100644
--- a/net-mail/eps/metadata.xml
+++ b/net-mail/eps/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <!-- maintainer-needed -->
  <longdescription>EPS (Email Parsing System) is intended to give people the ability to write their own email processing tools. Whether you want to process incoming and outgoing emails, or just analyze a message, this package is intended to aid in that endeavor.</longdescription>
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 6c11e5c705b3..3e5be53e96e2 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -3,4 +3,4 @@ DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192
 DIST ezmlm-idx-7.2.2.tar.gz 742451 BLAKE2B fd40b1216d34eba253ef00a53366c8a5f2d19edd9ef20ddea3047a6837263589ac8fc4911820836b49bf4c95b99a1c99d3d2808bc90dd8eb58bc262e6acc74d7 SHA512 4fdd30d6dc254fd0353f34675ea8baa91d95860de1fb23ff5517280c75a8d87405bdd7e180e25eb8f5c0b152a35a11a939f4e7364596e83d81053b1e6019245c
 EBUILD ezmlm-idx-7.0.0-r4.ebuild 1480 BLAKE2B 3df36686d435c7b37141497940548b66585579ceaf81f5d9d3e1b4176dd2196a0ed730c72279e82e34c15562a94dfa8ffdb59e2e13bcbc96723bc5846c95a41d SHA512 37b982b59d8dd3583b36817769bf6495774184cf7eff4b69dbf31b6d6ff6bd4ae2b527f8a13242be45c0a67928a93cf114a70321ecf5df3635326e403820388e
 EBUILD ezmlm-idx-7.2.2.ebuild 1505 BLAKE2B da0a1f58d18db96925af3db6f5e968254360ff486650cadd53997b30424224e10aab119df80165a1bcb25ad5234f6681d44cd62ab3641fbeb03e091cfec07513 SHA512 3298e62c2b50dd2b614d82cdb5364069406bf51a636c29202d4b57db0c5194a39d41cde4c69379b20490ed75f686d5e8e2bf2dd87248837f4037c37c69a8fd79
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/ezmlm-idx/metadata.xml b/net-mail/ezmlm-idx/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/ezmlm-idx/metadata.xml
+++ b/net-mail/ezmlm-idx/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index a7fafa4915e1..2b00d687e83e 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,3 +1,3 @@
 DIST fdm-2.0.tar.gz 313596 BLAKE2B 8b323f4a8953a46773a4e5a1214444dc97db4346f50990fcfb4c9d79ae40bbb73b61e3bf41bc95b76e44f6bed7b398cb210d58901823752e92ca7b83189cbc7e SHA512 14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
 EBUILD fdm-2.0-r1.ebuild 903 BLAKE2B 6ce5748e6f8ea135ef5f1988069260d71c0d788594608a3204c58be47cc21e201ddcc1ff1489462fb727832ce05c24a43fd2b3ce8f383134c6f78aeb718ac95c SHA512 806b6b91db64f8e0e3acbac89a7e502b204fe33b948b73273f9ca151a21dca1096a29b165c3d8e097961990d54fa33946e47ba9a43db1cb1e81a5557026410b7
-MISC metadata.xml 295 BLAKE2B 258b3dde768bd93f75108c451644287a850dd28a867429953e65ce650dd9911982f6c47672d6fe75d67f572d28f6d6e3d15393f7e88f9beff7917dea30f53ca4 SHA512 702eb19cdd97836f450877ec4fb366447b32b5eb4c181930c0960b1d5c2638ba1a0c995cb599fa272fd31c80b5ecba93ba4b713d9e913103d5509ba2959f8eb6
+MISC metadata.xml 296 BLAKE2B 340645d0a215d131e992a64b54a2e45091542b92c60c29df762b2e75a7d3e081a83cf529959f2ce0e171f6c1b6412a83ab597c55c094aa9c08c93eaa53365934 SHA512 dc241981c679d9b7a57ebd104f4ebc54daaa8d7eb10e5b558bd7f8ff85512e8104a89cbcd876c13d1e6a1a3919186769ee103fd127e4cfe1afa89c5a1fea86fc
diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
index 61a735f7ec60..f4f8580b129e 100644
--- a/net-mail/fdm/metadata.xml
+++ b/net-mail/fdm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 10f4507138eb..d68818a5bc17 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -5,7 +5,9 @@ AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a4930
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.4.21.tar.xz 1318996 BLAKE2B 4c2befad2b7dfa6957889e029572c259be7a20e4b54b864e2cca827540d745a57ad227f8e1fce1336e8f3a1005c780d8fa7c1b10b9ee05ce68dbcfac75afa179 SHA512 c9300f63c0e4073f199a9a7d9061774a7f88aad496b696cad96c0ee85107cae506461f0cd083903c60104b1e7654461213f3f759c1cdaffaf1c85fb1956faa67
+DIST fetchmail-6.4.22.tar.xz 1330176 BLAKE2B 7086f8a3df263f68ae2034321f63c40fcf4759517f46c67ba4b5d3b33ba07d3bb4f512d749a67a2d76991b46847b6dd9df0795a7a28e8166842454001497cfc9 SHA512 ff6db2705b6e3806e22c326da8a0f6bdc0909965cd283b50f9d55bd3a18a52fc4b2f4b4afece1e81aa25b6f1037450cb2b579c4d2cfe4705d34b31d4c1a47e00
 DIST fetchmail-7.0.0-alpha9.tar.xz 1213244 BLAKE2B 895fe178993cc34500e276bef5ebe9a4fd81fea522d39fd271433320afc46faa9657d8b85b2d28cd5dbc6d3dbbb233d5eb27d3e26205f5406de9f750c50d7f1b SHA512 7ac1c26edfd2a0d69ba3c1e9f47d96aa48f1cdc10060ff928f952e43141651896f5c5190c41064075fb5c5837516f63d6ff3e7fb0cdc7d389c44b6e39db01d8f
-EBUILD fetchmail-6.4.21.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
-EBUILD fetchmail-7.0.0_alpha9.ebuild 2531 BLAKE2B 51172611a85f880f5b31414471182fbbec13207d30c3a1e7101a62ba56e87d3931fb9aa0e1999ef6caaa736126d16c56df0d8e82cab4231f9fdb74fee9dc3892 SHA512 a82d93629559170b406adddfbed04f93f5a856c92fb409254717c86bb284664c240fc69cb07cd5288afa09e41211b129f38be772045877c67fc8e787875207f2
-MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
+EBUILD fetchmail-6.4.21-r1.ebuild 2404 BLAKE2B 0526de2e2c4b499d00c87cf303b69bf92831ef57508c1736f0778b10d95f801e7ed2a53755e481ae5457ca081e3fe8feaa97ecbc7aedcdabf093ea7b9082d19f SHA512 a6311cf3cdf4b349ecced75080bac3f6929efec60d69b17474ca2638c0f9f1ccfaa87d970bcb3058768ef17e5bf96912e2b90be5cd8745c81974c2c49ff5e961
+EBUILD fetchmail-6.4.22.ebuild 2410 BLAKE2B 6cc76486f6785669f7f33b6253f0f6f0806e52b92d620be4937fbc59bbbd2f5089d8df3a5be15fe90190bc93190e72e80ad4014455df2be25f3d74ab1363ca77 SHA512 ec65e9036f5ba09e2b85cafeaefcd5fbdc7bb677d39812629fced391a1216688035acf78ce13af75dc193974662f8f53fa29d9ffb3b353720a725fec902e099d
+EBUILD fetchmail-7.0.0_alpha9-r1.ebuild 2524 BLAKE2B e0860a0bac968a4c329886ea0a87202e4fc456d7e18962226aae9b4f8ad908ae912f0dfa236de6cce96e00d1cbf5d7d49f1f75405c496eb47c5c7f1d32e266bf SHA512 97b684257c686861f8420b2f576f1d9bf55d04ba5f48544fcd36b85b0fa9f5becc6239e78d6237e33002c337a13c644ad216a71a5407138814fedf4a55be8423
+MISC metadata.xml 522 BLAKE2B 34e08c52e9391d8f01d717516857cde4c2c77af269d587a29ce6d6e3c6c2e989898f5afcb1240f6718dbdb18be2700b66980f5a684c253c69ed4123e6bb6905e SHA512 8c6fd6c541834669a9518b31859990c8d6e9946e35bc1aa00bf2e0c1822392508ff712119005b97f5e85ca74e97c0d5cf3ced5798a388c23f9c8fd959feaf8cc
diff --git a/net-mail/fetchmail/fetchmail-6.4.21.ebuild b/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild
index e2ab38dd186c..ee54777b53af 100644
--- a/net-mail/fetchmail/fetchmail-6.4.21.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="acct-user/fetchmail
 		>=dev-libs/openssl-1.0.2:=
 	)
 	nls? ( virtual/libintl )
-	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	!elibc_glibc? ( sys-fs/e2fsprogs )
 	socks? ( net-proxy/dante )
 	tk? (
 		${PYTHON_DEPS}
diff --git a/net-mail/fetchmail/fetchmail-6.4.22.ebuild b/net-mail/fetchmail/fetchmail-6.4.22.ebuild
new file mode 100644
index 000000000000..9d676c85c586
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.22.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="tk"
+
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		>=dev-libs/openssl-1.1.1:=
+	)
+	kerberos? (
+		virtual/krb5
+		>=dev-libs/openssl-1.0.2:=
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-fs/e2fsprogs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha9.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
index 80f96706c304..183128624bae 100644
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha9.ebuild
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="acct-user/fetchmail
 		>=dev-libs/openssl-1.0.2:=
 	)
 	nls? ( virtual/libintl )
-	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	!elibc_glibc? ( sys-fs/e2fsprogs )
 	socks? ( net-proxy/dante )
 	python? (
 		${PYTHON_DEPS}
diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml
index 24a2e8a4d500..4cea185300d9 100644
--- a/net-mail/fetchmail/metadata.xml
+++ b/net-mail/fetchmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>voyageur@gentoo.org</email>
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 7f2d0ce61413..88d131018922 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,3 +1,3 @@
 DIST getmail-6.14.tar.gz 185308 BLAKE2B c74fce627e6a23e0b209dddca690301f80626d9c4489d8cd2391884908e6f1c017602ed23ca4d343e2dd400b911d3f808235231217afd38f96017d8f0d20b3a2 SHA512 b8d2df52cbf145ee7e00ec1dbf589013d3caf8e39a3981e6ae4f1e36fe0b3d3d88df639e03e8697c39e6d00e20ddf1e995ed17f0b1fa1fa2ea52a803c16f062f
 EBUILD getmail-6.14.ebuild 779 BLAKE2B 1edbef38260d9e112287511cc35db1ea18ab43c453b9a5307d39a950f9d24d00233d3cbc08af972d64ce65dfd2f250c5e15e3946db71d08b73a8985920cbc8a0 SHA512 21969af79422b0f53ff9a1dfffcd571fb56f17561e5f08e6500d43bfb046c5f1fa32136544cdbc5b92dd2e0b28af12c08c5e34d83630316f0b86bb5254f78016
-MISC metadata.xml 715 BLAKE2B f138c2b9649a25c871f623437b1c02b0a2289fc15e6af45cdfd8c450d5ac556f9010cb65f0566815576c4e3fe5765fb0596de84c9052c741298a25f00df3f3be SHA512 81f5ff8230d793156376440c6e1f2e3832254b1501f638a1671cd0041e43a7e76275107b817aefe8ebcc6434c9bc167e09a88f3df6128ebeaade8d308a0de155
+MISC metadata.xml 716 BLAKE2B 4e72451457ace0c7335d06a94ad5f01e8d7efcd03520f5c058ab989bd962a8e719c742b23c4628e928197b002578b8f3d92c69d70f55f902b352d159b514eb3a SHA512 f4d28a26166d50307bb2a8d5bb7628725ca8af089043d4f8b40b79f31307b3fea56abdefab4c50af1d486942475b311d1072164f096d0d31b9f9668ffecf0e6e
diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml
index 82367af1c9f1..405e10a7016d 100644
--- a/net-mail/getmail/metadata.xml
+++ b/net-mail/getmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
     <email>r+gentoo@r78.nl</email>
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 25d008ab519f..30c939aeb3f4 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -3,4 +3,4 @@ AUX gnubiff-2.2.15-gold.patch 511 BLAKE2B c0ef1cdecfcc91ead4d1adf5e3fdecee1b4d85
 AUX gnubiff-2.2.15-underlink.patch 337 BLAKE2B ea045a75986fd13e63549b7f187315ac7979ddf71b0be7ad4bd6ab3300af7e74fe4f9ccf8be01753180949648c7018b23eb51f9fe67e34725eeed621658a6c44 SHA512 6d03040784eed725848cde01533304e33c8b0045e0488936a9782ec2edcb8492ebd47fb263ff142510e0e96c06e60c3de84bb074171e54ad2860e6b3c1d4eeb4
 DIST gnubiff-2.2.17.tar.gz 897817 BLAKE2B 5ee58828211eb7b85ab017129feec48c6d2b2df4de862f7791f15f361bda7919cbdc7aa37403130da044a1f9e2068154ddc5ae8629eb9f4d38956d759477fb80 SHA512 2fe715d584fb057255d4922275de152ff5b1167abcbdd27d33124921a4c659c3db301944a73d58622ecd22f62615d44b5bebb83838bbd53c67a2dd8286592d89
 EBUILD gnubiff-2.2.17-r2.ebuild 1105 BLAKE2B 37330335b960ea8423efec07780e5d8df3043fdfcec12ff38332203ac84cd604d244de01c666c51b03b50cbd363c20090dd6e49441a64b9f252b19a81af886b9 SHA512 bc3dcf0548693e0eea74fca7f2e47c752e837f22938b2c1a8952bd3a749d0879411d8d344f508598b6c4ab0c2700989d94c9d9c7e28232ef5e6d9ae4a4b8e03a
-MISC metadata.xml 359 BLAKE2B e503972d7cc44508b3f94842c9b57a15f3fdc4df89a2eed1ea968fb6033c96b56b59ec6bf5839fe7cb832a69b565c29f6b47552acb205fb9a030d5531ba22bfa SHA512 c1654b01e77115f9c8d3852da7f5951024d0f121a5b589197af6843e063df27dcec59457aec68babe6a8e14c81a307a78a0e34860799d5bec076e0c6bd0c18a1
+MISC metadata.xml 360 BLAKE2B cfc6e2635613789656ddcf8b0b7e3401e2b0e6c63b9f7c3b03f30c7ad450177596ced8246b74787c32d3a74027a1e6602df76d762328110127b3880b3eeaf10d SHA512 7d944abc4d771cb98ad569f516804d5c45acdc3a718d8b70fe2e709d51ba483419d0bb222a6b61c73187634922aee339096292da2008c70c1f27181d3134377e
diff --git a/net-mail/gnubiff/metadata.xml b/net-mail/gnubiff/metadata.xml
index 10ff5076a328..6a8ef1d2821c 100644
--- a/net-mail/gnubiff/metadata.xml
+++ b/net-mail/gnubiff/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
   <use>
diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest
index 62bb7e43628c..6d72c4810d89 100644
--- a/net-mail/grepmail/Manifest
+++ b/net-mail/grepmail/Manifest
@@ -2,4 +2,4 @@ AUX 5.30.33-fix_nonexistent_mailbox_test.patch 1138 BLAKE2B ebcc4958fc773f4ee0d1
 AUX 5.30.33-midnight.patch 560 BLAKE2B 4b2d085dc8f334f1ec1a9949ef91524791c841a5bb6b92a69c90d87ec62aaa4280558e8a57112b6d085beb34551a1b42662ae6a5311ffc5f60da6d5b9b8520c3 SHA512 41ce56d0a2371bcc527f997825530e87ad0199c78605ea72567255cb985158fa56e669aeea966a547ccd970231bda1a5da783320fda1568642890e9832c69775
 DIST grepmail-5.3033.tar.gz 536791 BLAKE2B 400cc3c30a291f6075d343522a4f506997e3328c2adda2cfa7d4449052ce5bd6112fc06a44f8359def6358c716422b5c33353c7247dd6b5cf6c5a0502a2c34d6 SHA512 58fb63c42b534ba32d8224753cd11701adc3ab6eeca838753982cd6fdc46c05142eeb34106ae585b48698c299648cc2e0135215900ce28dd7c84921c8ad7831f
 EBUILD grepmail-5.30.33-r2.ebuild 1039 BLAKE2B d906e5707d8704752811797b7964aa63732aaeb369d209e237247c7ad1d66d2667a7ce1df70bbfb959148698e3ab8ffa2ba3a8f51b496049c505f3822c413c31 SHA512 9582058ef44dd1dfea0cf0230a7ad66be28dededcdaa2f2b5590d3168d41c176ad1ddb893596d97fd1cc699320a2e488b1a0555a1be5ea9074d4b02957ae36e0
-MISC metadata.xml 245 BLAKE2B 19ec7bd1e78a5b18685dff3959c1abd4fe2a737141ef33877820a472c5f9e4a2655108429c0f524956f10c4abd50522be56b85115c1af62b3ac67ba6accc0574 SHA512 fbe7cff14777362e70e446a04fa791b26b45fdc4d8416fc8fc4a234120570bf5368b97a56c0c9c7c033b799848475ba71a19d4431241c002141ec10f96c5ca3e
+MISC metadata.xml 246 BLAKE2B e117fa7ba84c2250c8699ba7658f09aeefda0f7977dc851b17ab79b20e9c139e94de32b755136f4a7e901d0a2cecf6e3a8fc88521d1eb2767dcdc07c8f43fd37 SHA512 43283f70e6e72dc2211754908e9bb54668d4f0d569ebff77890b291868a27d08abf9d530de1be10e72cf0ac95c24a7ff491490b90a30104364f1b6fd93147354
diff --git a/net-mail/grepmail/metadata.xml b/net-mail/grepmail/metadata.xml
index 063d7f9282fe..d4b266cabfca 100644
--- a/net-mail/grepmail/metadata.xml
+++ b/net-mail/grepmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/hyperkitty/Manifest b/net-mail/hyperkitty/Manifest
index d2a529b1663e..98f05818be0f 100644
--- a/net-mail/hyperkitty/Manifest
+++ b/net-mail/hyperkitty/Manifest
@@ -1,3 +1,3 @@
 DIST HyperKitty-1.3.3.tar.gz 1936346 BLAKE2B 8014b62a44989faeb0467779fb53a9e5a0c381bae44fae8102b211a6d3c7dfa63cb76b6cc25ae29bb1b260fdc4bafd9d2c61c39103cc29d76a229263fe704c40 SHA512 4be4630bc0344c3e1633772978880fea996fbf2bb49b728c1d05ae13ab1df8c63b6b7b9b735df32eb2ae31798e76be537748e42c830a63aa01eeff0680f1dc76
 EBUILD hyperkitty-1.3.3.ebuild 1325 BLAKE2B 58b2d072283eba93f47fafe7d02817b524c845061ff1f47339b5149db7f3005a116b5d2e069463df83519f96717c9eb4675f57117aca4f9066cbd63bc36fabdf SHA512 7da7ad023b908633836d1094e8612b3985bc47b161be89355b0a8d91c633a62810cbc5c37ca3547be857f1940d1dd421cb76480efe99e7089b069246e4a12db9
-MISC metadata.xml 347 BLAKE2B de7bebc2f3bdb2bdb97fe137d6f2c525fc51bd462dcd74cc784f2b6706cf7cf744886bcf75363be70c53a5ee5f56cbfe2113d08b327186bbe5d598247ff868e4 SHA512 bbc534fdff1046998d11afcc45352b7443d814c15bd9428fbe740b1e2c4a38dcb5d5e426b7eeb23d2c76b786148de069ae093f1588218b258f6a3c60c2a43251
+MISC metadata.xml 348 BLAKE2B b702be0ba1e44a4f8d539db11fd40232a06d8d79d7ffad9e02fe3975fa6ca081859fa0fd21af70b207a86bc97fb650fbcb4d958576808a2ab0b0562e9f0d455d SHA512 61b069b0b0e28b494c0300dc8f1659fdb369692918e030a57e750f729d50b03565d742bcd409d2822395f8ad4e8b343d727e6c56f039d211f6265cc3ec56bcb0
diff --git a/net-mail/hyperkitty/metadata.xml b/net-mail/hyperkitty/metadata.xml
index 37f020d0e277..6686cf0af9a0 100644
--- a/net-mail/hyperkitty/metadata.xml
+++ b/net-mail/hyperkitty/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 3411e6e13cca..32cb5c9d733a 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,3 +1,3 @@
 DIST imapsync-1.977.tar.gz 1814568 BLAKE2B ccbe678f331a59b2ee50150b4e6dd3b2a7fb7750f204f3d67c90beed600b83b38a712bfa723dc0a73d21fb9bc03a5013f287469afa1164962cfb0f2923d93910 SHA512 b9810d53f5dc4e0a350e18dff03563c38cd64cff45ad741e77211a22ab49695de14bc4f09df6cf5fde7f3025f1f54d614f7c79ece1bda9f4c0052e5f38dedfd9
 EBUILD imapsync-1.977.ebuild 1889 BLAKE2B 03229ec748f0dbe2ab20f11a33cb76e8d92e24ddd233f28fa413b6370dd251fda434f1b6b4a38f2c62c8c5c310565ad6421a9068dcd65ba718303e4eae37d283 SHA512 e3e6be608cd773f9e017653517102cc9242fb16e23271963571c2d8f2e1806cfca156319581192fce975ef42fd27a638c92a144841aa7adc81b61403d98d8294
-MISC metadata.xml 249 BLAKE2B 0bccb43703238e66606acc0f395e496ed36dc25e319354565dd990baa7ef595a42aa7f931d50b65e9cd77ee72103b8c0210c68fadd54ff8ff6bfaeff60850a9f SHA512 a5b4caa063a5e6f2d954e30608a5051b567fe1e869e1662282d6d12813105152833fb824043f7501d9fdc628cf2ad88c53c90c48798f27f8240e541956f63dce
+MISC metadata.xml 250 BLAKE2B fff8167dc4ff7cfc2cbafb7d225906ddbf4a10e51aacf0cc5fc4dd444807e132e87a8625294900774c10420f14cf1ff0da18c931fe3c7d4d8acd11ae1bde5fd5 SHA512 f2fa2d1be0decfdc1b2f06e3cd2b385664213fa204af151101055e99e434d2ae0c3ce40681d8531301b44050dc7565861aa36fd4504ec3c23cd5fe97bbfdbcfa
diff --git a/net-mail/imapsync/metadata.xml b/net-mail/imapsync/metadata.xml
index 24d2137c3b42..99c76f31d9a2 100644
--- a/net-mail/imapsync/metadata.xml
+++ b/net-mail/imapsync/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 666193b21d74..55646e479223 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -3,4 +3,4 @@ DIST isync-1.4.2.tar.gz 336940 BLAKE2B d37dea100c5a994ce65812612a9571fe564916856
 EBUILD isync-1.3.6.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
 EBUILD isync-1.4.2.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
 EBUILD isync-9999.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
-MISC metadata.xml 376 BLAKE2B 80ca8b6998c755cf2138227e2a05f8919dd649879df8fd94a040336c7e3d8c30cedcf10bd85ed056876cd785910e49570308978cdd0cc9a58d307d259adb8527 SHA512 137d80b0d9f99344e1d82cf27a3eb7c92b98b97f84a5353035bdd8c80f0627f2fb1cf8ebe65aa7f4775be79198950a37840b4243d60d72a0555412e11944ff51
+MISC metadata.xml 377 BLAKE2B bf6ebe92478a45a3e364cdbf971f339468b87cb07f5206aa0db1e00d03bd1bfb920f1df1be8547d8d668e474de38d29ff9902e0411b816e7c7b190ba66bcb90f SHA512 030ed2e882dcc1b89eb2ecc330964636e9dc6fee7c90e64a34ffc0046f0b11a2df51d74d5869ee4728f0b6d41abe016983ce16aed6928a6a917a88fc9d68a407
diff --git a/net-mail/isync/metadata.xml b/net-mail/isync/metadata.xml
index 68327845c08e..f87016446d46 100644
--- a/net-mail/isync/metadata.xml
+++ b/net-mail/isync/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>dilfridge@gentoo.org</email>
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 450c653ae672..2aaf126459cf 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,3 +1,3 @@
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
 EBUILD lbdb-0.47.ebuild 1483 BLAKE2B befc891f045d6e9006af750ac91cc34b72bcb4f2d43acf5f2649e342a617244e1e9347107870e7bc68449aea3b36a54df6de4ec0258ba55cefa4f7c2c2bfd7ff SHA512 5d31c52eef6ddefd468bbc7bd11d0df522c5c083af325909c89448b4e200c0b8f5d1729e5ea9a7012f44ded3a34d196c7d462d72b47c0edc4bbded70dc99c402
-MISC metadata.xml 452 BLAKE2B fb14006c0ff46ee5b6e9c72682db885497f93a3b48e6852c87128a2b17b91a0459ccdb2d5fe94cf2e26459c9176251f79ac18ec31d3f03cf060c0ea2f8294c5f SHA512 38c22e435ea247d967a8d04092be6f0195436db16fc03d7fd7aa3cd0fe0f3dbfbda3ffe6a58cb7e8a5d1dfb18fb0a048b7d525300bd265a7d0522dc91d991a79
+MISC metadata.xml 453 BLAKE2B cece3039d7fd52aed9a44f07f83b825456d610cdf7f1fb76cbb160cecb822086bfaae6b79bf70d15a95b495bfb97d155cc54a0e0fdd276eb6971ab6bc16a92d4 SHA512 686a9e0ede22eeff8de86b0e2a77c3822dd0d310ba8c55f5c9b517c067b81246f9c4d0750408f55e5be8e8dd022f58b9daed3d9b12f1988c90d40342cd49779b
diff --git a/net-mail/lbdb/metadata.xml b/net-mail/lbdb/metadata.xml
index 19d2a8da2d99..2f9e14564d6e 100644
--- a/net-mail/lbdb/metadata.xml
+++ b/net-mail/lbdb/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
   <use>
diff --git a/net-mail/libdbx/Manifest b/net-mail/libdbx/Manifest
index dad5fad5011c..fc2ca4a5e077 100644
--- a/net-mail/libdbx/Manifest
+++ b/net-mail/libdbx/Manifest
@@ -1,4 +1,4 @@
 AUX bad_c.patch 1027 BLAKE2B 04f58037dda40bc05601fe0e749d0476bde69be14abb14a8e45dc654418f1c57754772c7f48a56a94569ce981bf797d8626f3b5862db392b7f357e77e9fdb929 SHA512 5ab1bac562edbc2fac7e12a7bf111da862c423171e3664065a55d186e340160ba78581a89ba597316f8d6014d962cac7c16fd5a8065853c153596c944ed4671a
 DIST libdbx_1.0.3.tgz 24927 BLAKE2B 01acc0607429ecc8391540b0833b735e00c2a15efb0441d08d9e6352fd0d19dde4315afc0b22f130f943e96aeffa38781086703357952e446070b95b82aefa48 SHA512 619f7cb25d5742066be6f2addbd06e433502c45489f973c628ae5d26758fc9ce1185185ae48da0de30d927eae8cbc610f775e0af182b10e72ecf5619ae79ba80
 EBUILD libdbx-1.0.3.ebuild 674 BLAKE2B 0d604bb914ee0a53a1c40a91c2861f2a4da132fcf6716fb306bdf093fd3489434bb8d07a1804cb79a8b30e6c964473efc5ae1c47978d6fbed823a12e73fe2a0f SHA512 90e0516dc4aff181fa0d58929e5c06f80cf686c4cb01173391f08f4ed087eb9c6791e99fdb6188768fe0be3ecef87f9bd95c800ec9fd0ce847fded002d64b4ec
-MISC metadata.xml 249 BLAKE2B 0af29bd5a41c2fb070987a9abd26d497f0ed752901729eb3f4e752674aa9d7f7f7c895c282b9f51f36430c18590150229a8ec591ad7335d2470416d25df5bb29 SHA512 f518f234871c8565fc5a853ca72108ad7f3e7bd1f46ba91530a4a20898406dd52d6eed8fafc16551f5a040b20ec17d90860e9b3ffc28629b0f6a461166256be7
+MISC metadata.xml 250 BLAKE2B cb4ae2da5756e1010bb5fb1cc61061c0aaa9df3c8e2cc3591f70c8b7aced6b9187889858f848790e49e28e0d8c23a0111faf45e4afd7d95d9cbf0667b1badd2c SHA512 a3bab80f5872d1e5be491d2ee44f0de2ea319dfab018262971bfef4d0076d97829f1691fd593e1b2cf9c9a4a03273a490ceba9af964338abaadc0cc6eed7b4a0
diff --git a/net-mail/libdbx/metadata.xml b/net-mail/libdbx/metadata.xml
index b96bb52b9908..63a947dd7776 100644
--- a/net-mail/libdbx/metadata.xml
+++ b/net-mail/libdbx/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
diff --git a/net-mail/list-remote-forwards/Manifest b/net-mail/list-remote-forwards/Manifest
index 81432ac5f14e..47f8daf228a5 100644
--- a/net-mail/list-remote-forwards/Manifest
+++ b/net-mail/list-remote-forwards/Manifest
@@ -1,4 +1,4 @@
 AUX list-remote-forwards-0.0.1-ghc84.patch 978 BLAKE2B 295f2ca369794739da3ff45bf6a5ca57b102942c93b8dd8c4e99d9a70906a469c761aa0fdbe50311d6e56d5bb0725610dd473c49152f4cdd3462cd2da2a8418d SHA512 4f9addb938b14590d98e4e17e6764987ebe4192d7492de1ce2c917881ec20ecd15898988c223dac695ed8f71d7b2fe74f8b798a52960f215fd4c9c9a02c9a72e
 DIST list-remote-forwards-0.0.1.tar.gz 25869 BLAKE2B decfd8b5d4fcbd5e278f9c58f79687aa33cc91d4d4907ff7a29fe6b745ff49c073e3beaf2876ec071f4ed1099b4575cacb8194049add04c0aa8ebeff3338293e SHA512 b6d8c0e8a72e3dcbc62c00b291da99da6c37c853997c367eb60db128db327c1f862e9dc6d9ad4028aad2e0cec9acc96add28d85d4b22508e1fd00a65bb9b0317
 EBUILD list-remote-forwards-0.0.1-r2.ebuild 1098 BLAKE2B e378f6538393fcd77aa3789734f8ce4eb8d8545cdd246f06b6a7ebad4a9d928616d0cafff2b7fb8abe790d42773218397be7293bcf331fce2d1dbebec0a273fe SHA512 4f580e297e26d3f0f4e984e822d0447d53e5c4c071961165f53b4d47a6f4bc730670c808961329aaaa129c2eb8fd7a4256c9b12777604729998fa7f622793f48
-MISC metadata.xml 4175 BLAKE2B 183538e85d540850e8176fb6c2a6a24dd0dfddeac8bf9b9ee684b11ef8ddb54c58e5a0292f67e72c15264880fcd68d253b48c3ca70bf0b8110b9cc8d58438186 SHA512 a6cb86568d00776106d194639bfbabec5e753e8bcc5c4b1c2f50f25f1202865ea45a946e55de5bc41a79ad7a18c8d9442ec7e964065a1b00fa0c5937177ee9e4
+MISC metadata.xml 4176 BLAKE2B ebc5feaa3fbc0cf1551aa2e80bb4e971918181f16e8b365c99297789d41b6dec7f138d2ccfb7ee69972e026299ad5b2e554ce3e136232af0f5eb4c46790bfb2e SHA512 277cc5c1b55a8890e26adf5762d4cd522dbbe81c9eaa0eb6a8126e2ddbbf3919bbac703e22fab0f924c08fd656d23dda4a74c48db26323552b1cc1595b6062af
diff --git a/net-mail/list-remote-forwards/metadata.xml b/net-mail/list-remote-forwards/metadata.xml
index 1e5f533c5aa6..d81f432bdff8 100644
--- a/net-mail/list-remote-forwards/metadata.xml
+++ b/net-mail/list-remote-forwards/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mjo@gentoo.org</email>
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index aafb2a049458..34778deb5ab2 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,7 +3,9 @@ AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap-r1 997 BLAKE2B 1e5dc595de7deb3ac0a5dd688de86f93dd9f0e954da705ece43911c0224f186351e3406c949747f0630fcc8aa35734af2937aa76eba93ee43d3a81c79bf86997 SHA512 1243571e089f781c7469ff5e36b9be2b57de492909e32acaa6dc31d61a0f8b1045d9ea94a6d719cc675d2b09ce4a2bfd12dadca0b5a61c45cb1509e32e2138e8
-AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
+AUX mailcap-r2 1837 BLAKE2B ad868b4ba6b6cbf8dcc7be7b39d763cb7cdd37bd8453f2debda9ab2241f79074e2ffc4112b120027a07ed8c55e1e761b2ecb36436bf380996ea315cc611371c9 SHA512 4360ef0f1d25b6ffb616a957ee81a2b5e0f559dc2ed8a6e221d1122f4a447c90aca2ee83ca0dd4ce5a73b41493ff8cbbe710824c5b6808269d577904b8ab3e2c
+AUX mailcap.5 8951 BLAKE2B 6bd704c8efe861471343e318734abed30c5f406a06646877286d91bfe3cb9afaf128ddf77675d4a14dd1e19a6979772cf013923cf30b02f62e54eac2a7fe02b7 SHA512 6973397bdd389e8eaf1977d8eeee271beda2ad1bd0b01ed7408156af0e7cf430a45e2b7261213a3278fbc2cbb250b65a3f34c11d3c5603cffffade4f1fba24e5
 EBUILD mailbase-1.5-r2.ebuild 937 BLAKE2B 2553e7a535cd094e18c1ef1ed0c18f4c6b4784c9475bc22e70a2681552802455a7004574bd248ca82a62ce621a9ef5318898b343c728ad661303da32e1f91d50 SHA512 610e9c74fee61aa2e1b3275872c062f5a747344ad1f46fbcbb9b9f34120f3ce73b356821330da085d395b40ad24cf9ce1887d3499c40b45b94359ccf8b0bf3f6
-EBUILD mailbase-1.6-r1.ebuild 1067 BLAKE2B 8b0e1bb0354673371799af1706913328efa0eec527c6687ead3ae9cb3e2a2884680fada30cf2f7d7df2dcac447cfd49b0475e9893b31dc7fb4b92722017ede1a SHA512 a9018ebcccd9209418fbf477393d1188b73b28d2c68a34346f7f52d855a600b0fd263c68a88af153347f444139bf2163613f785cd654414d4c6faa256ee6275a
-MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
+EBUILD mailbase-1.6-r1.ebuild 1059 BLAKE2B 8174de2a008b54e42045ffbabecb283875125f271748bc9e6c160a892cac4f09d421cc849d75a9a342057a52d45a02fcc29d697dfca5c0952a24eeb5b1ddf14e SHA512 0e0dc53abddd1b8b62237c17586a69ecb146b082348a5eca795e8ae70763558526cf4ad471166b725c99d7630629c357fe973b3ea1aab8fd05423a8cc56213f5
+EBUILD mailbase-1.7.ebuild 1059 BLAKE2B c963beb8507184a99f701c99c315071991a9560ce604af77eb147ac93cf399dfff013d6247ee80387016a615174b5bf039f24bd07d34cfdcc37068af225ef5a6 SHA512 a629e0333d6fdba2fc5add0bb690f00eeff8f776ac9f780b82ee05602bc049746472e77355b6939746a09e0c620be790f97021fe3acc80f8e1d0b9f799c3fe46
+MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/net-mail/mailbase/files/mailcap-r2 b/net-mail/mailbase/files/mailcap-r2
new file mode 100644
index 000000000000..5ecd40a4201a
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap-r2
@@ -0,0 +1,36 @@
+# Database binding MIME types to programs that can process them.
+# This file is generally used by mail clients to view attachments.
+#
+# Users should add their own rules to their ~/.mailcap file.  That file will be
+# processed first before falling back to this one.
+#
+# For more information, see the mailcap(5) man page.
+
+# NB: Do not quote %s.  Clients will handle expanding it with proper quoting,
+# so adding quotes ourselves just confuses things.
+
+application/pdf; xdg-open %s; needsterminal
+application/postscript; xdg-open %s; needsterminal
+application/x-info; info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document
+application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
+application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
+application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
+# It'd be nice to limit this to compressed formats (e.g. x-*), but the file
+# format doesn't support that, and less has good fallbacks already.
+application/*; less %s; copiousoutput; needsterminal
+
+audio/*; xdg-open %s; needsterminal
+image/*; xdg-open %s; needsterminal
+
+text/html; lynx -dump -assume_charset=%{charset} %s; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/troff; man -l %s; needsterminal; description=Man page
+text/*; less %s; needsterminal
+text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
+text/*; view %s; edit=vim %s; compose=vim %s; needsterminal
+text/*; more %s; needsterminal
+
+# NB: This is an extension in the hope that it might be useful to some programs.
+# RFC1524 does not support * for the type (the string before the /), only for
+# the subtype (the string after the /).
+*/*; less %s; needsterminal
+*/*; false; print=lpr %s
diff --git a/net-mail/mailbase/files/mailcap.5 b/net-mail/mailbase/files/mailcap.5
index eec92103f886..438c6e2fa6da 100644
--- a/net-mail/mailbase/files/mailcap.5
+++ b/net-mail/mailbase/files/mailcap.5
@@ -1,17 +1,15 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .TH MAILCAP 5 "Release 2" "Bellcore Prototype"
 .SH NAME
-mailcap - metamail capabilities file
+mailcap - mail capabilities file
 .SH DESCRIPTION
 The
 .I mailcap
-file is read by the 
-.I metamail
-program to determine how to display non-text at the local site.
+file is read by e-mail clients to determine how to display non-text at the local site.
 
 The syntax of a mailcap file is quite simple, at least compared to termcap files.  Any line that starts with "#" is a comment.  Blank lines are ignored.  Otherwise, each line defines a single mailcap entry for a single content type.  Long lines may be continued by ending them with a backslash character, \\.
 
-Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry (which is actually a built-in default behavior for metamail) would look like this:
+Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry would look like this:
 
 text/plain; cat %s
 
@@ -21,55 +19,57 @@ text/plain; cat %s; copiousoutput
 
 can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
 
-The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content\-type" header (or the value passed in with \-c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO\-8859\-1") or a wildcard to match all subtypes (e.g. "image/*").
+The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content\-type" header (or the value passed in with \-c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO\-8859\-1") or a wildcard to match all subtypes (e.g. "image/*").  Note that wildcards may only be specified in the subtype (e.g. "*" or "*/*" do not work), and as the entire subtype (e.g. "application/x-*" does not work).
 
-The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t", those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
+The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the
+.BR system (3)
+facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t", those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
 
-If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
+If no "%s" appears in the command field, then instead of placing the message body in a temporary file, clients will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
 
-Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.  
+Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.
 
 The "notes=xxx" field is an uninterpreted string that is used to specify the name of the person who installed this entry in the mailcap file.  (The "xxx" may be replaced by any text string.)
 
 The "test=xxx" field is a command that is executed to determine whether or not the mailcap line actually applies.  That is, if the content-type field matches the content-type on the message, but a "test=" field is present, then the test must succeed before the mailcap line is considered to "match" the message being viewed.  The command may be any UNIX command, using the same syntax and the same %-escapes as for the viewing command, as described above.  A command is considered to succeed if it exits with a zero exit status, and to fail otherwise.
 
-The "print=xxx" field is a command that is executed to print the data instead of display it interactively.  This behavior is usually a consequence of invoking metamail with the "\-h" switch.
+The "print=xxx" field is a command that is executed to print the data instead of display it interactively.
 
-The "textualnewlines" field can be used in the rather obscure case where metamail's default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, metamail will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
+The "textualnewlines" field can be used in the rather obscure case where default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, clients will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
 
-The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing the calling program (e.g. metamail) to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
+The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing the calling program to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
 
 The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data.  The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format.  The "composetyped" field is necessary when the Content-type information must include auxiliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding.   Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
 
 .TP 8
 .B needsterminal
-If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and metamail is not running on a terminal (as determined by isatty(3), the \-x option, and the MM_NOTTTY environment variable) then metamail will try to run the command in a new terminal emulation window.  Currently, metamail knows how to create new windows under the X11, SunTools, and WM window systems.
+If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and the mail client is not running on a terminal (as determined by
+.BR isatty (3),
+the \-x option, and the MM_NOTTTY environment variable) then the client will try to run the command in a new terminal emulation window.
 .TP 8
 .B copiousoutput
-This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "\-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the METAMAIL_PAGER environment variable).
-.SH BUILT-IN CONTENT-TYPE SUPPORT
-The metamail program has built-in support for a few key content-types.  In particular, it supports the text type, the multipart and multipart/alternative type, and the message/rfc822 types.  This support is incomplete for many subtypes -- for example, it only supports US-ASCII text in general.  This kind of built-in support can be OVERRIDDEN by an entry in any mailcap file on the user's search path.  Metamail also has rudimentary built-in support for types that are totally unrecognized -- i.e. for which no mailcap entry or built-in handler exists.  For such unrecognized types, metamail will write a file with a "clean" copy of the data -- i.e. a copy in which all mail headers have been removed, and in which any 7-bit transport encoding has been decoded.
+This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "\-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the PAGER environment variable).
 .SH FILES
 $HOME/.mailcap:/etc/mailcap:/usr/share/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
 .SH SEE ALSO
-.BR run-mailcap "(1)",
-.BR mailcap.order "(5)",
-.BR update-mime "(8)"
+.BR run-mailcap (1),
+.BR mailcap.order (5),
+.BR update-mime (8)
 
-RFC 1524 (<http://tools.ietf.org/html/rfc1524>)
+RFC 1524 (<https://tools.ietf.org/html/rfc1524>)
 
 .SH COPYRIGHT
 Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
 
-Permission to use, copy, modify, and distribute this material 
-for any purpose and without fee is hereby granted, provided 
-that the above copyright notice and this permission notice 
-appear in all copies, and that the name of Bellcore not be 
-used in advertising or publicity pertaining to this 
-material without the specific, prior written permission 
-of an authorized representative of Bellcore.  BELLCORE 
-MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+Permission to use, copy, modify, and distribute this material
+for any purpose and without fee is hereby granted, provided
+that the above copyright notice and this permission notice
+appear in all copies, and that the name of Bellcore not be
+used in advertising or publicity pertaining to this
+material without the specific, prior written permission
+of an authorized representative of Bellcore.  BELLCORE
+MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
+OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
 WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
 .SH AUTHOR
 Nathaniel S. Borenstein
diff --git a/net-mail/mailbase/mailbase-1.6-r1.ebuild b/net-mail/mailbase/mailbase-1.6-r1.ebuild
index 542ba478e0c0..724400f5e450 100644
--- a/net-mail/mailbase/mailbase-1.6-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.6-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 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/mailbase/mailbase-1.7.ebuild b/net-mail/mailbase/mailbase-1.7.ebuild
new file mode 100644
index 000000000000..3dd86a87fa2f
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pam
+
+DESCRIPTION="MTA layout package"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+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"
+IUSE="pam"
+
+RDEPEND="
+	acct-group/mail
+	acct-user/mail
+	acct-user/postmaster
+	pam? ( sys-libs/pam )
+	!<net-mail/metamail-2.7.53.3-r2"
+
+S=${WORKDIR}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	newins "${FILESDIR}"/mailcap-r2 mailcap
+	doman "${FILESDIR}"/mailcap.5
+
+	dosym spool/mail /var/mail
+
+	if use pam ; then
+		newpamd "${FILESDIR}"/common-pamd-include pop
+		newpamd "${FILESDIR}"/common-pamd-include imap
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}
diff --git a/net-mail/mailbase/metadata.xml b/net-mail/mailbase/metadata.xml
index e6f3bf582ab7..38ebffc8efa5 100644
--- a/net-mail/mailbase/metadata.xml
+++ b/net-mail/mailbase/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>eras@gentoo.org</email>
diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest
index 8dd16e4dbd8e..6666a58cc4bd 100644
--- a/net-mail/mailbox-count/Manifest
+++ b/net-mail/mailbox-count/Manifest
@@ -1,3 +1,3 @@
 DIST mailbox-count-0.0.5.tar.gz 21476 BLAKE2B 3ad79233ae1dbb202bc46c60e8a7d13d5d6820f74e090056f37eacb7b37c2f18498f599603d1ee32a7ac43b5f9931f26aba1780ff5160333c66129889ac6812b SHA512 3c63bd9021f64ba745572907eae8bc25e9ddc7d443d5ab84626dd90f95af71267cbffb9d371f0e308988fbdf14f3a126d93a727d55bf9ee3e02037e687267d26
 EBUILD mailbox-count-0.0.5.ebuild 890 BLAKE2B 37b6d4023299f9ae3dd2e23851dab6b4949a6c412709e729f726ecca622a09c2d547eb833e5a5a6b117f9aed674397b827ec5451d5e95d4bf8550c25e417eaeb SHA512 b5f5012af1f1008feafa4daa5a658822387a32f86e3835dc138dea6f7e0f6525acf729573e25809cf5618d5914a4448364205303aa53fe616bb1efb8d10928eb
-MISC metadata.xml 3288 BLAKE2B 15a60ecab50dad246513c9060e9cf73b4a00c4a6264085357c04461e83a262497780c831823fd54a94d2c2a2b10cd836c51632e24683bbc5d0541d657e383a4e SHA512 95bbd72ec2a640fc2f4d9b67ce8388edbf3b7e01e181bc874fd62d11fabc5858506c35e613bb9215e6732ae4c968ad87df3b93b917cded023691452d0368e8d9
+MISC metadata.xml 3289 BLAKE2B 5d1dec2ad9a593e25c496b66ae3c611c66aea004c0a1b235d6ef8cf16f91f2f8c55b5d7e901e8fe3f06b6e2b0b26fe91b51b3abfb5bdfff4766b620e3cd05fcb SHA512 fbd3e2e45ca48318b17b26acd9564d9e562a6c007413d9740226b7ca27152377c54a943f4d2be02fb757744e684f7798a1c6ba04cc00244dafa18aa0f6e09593
diff --git a/net-mail/mailbox-count/metadata.xml b/net-mail/mailbox-count/metadata.xml
index 7660ec6aa1f9..4831484d5891 100644
--- a/net-mail/mailbox-count/metadata.xml
+++ b/net-mail/mailbox-count/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mjo@gentoo.org</email>
diff --git a/net-mail/mailfront/Manifest b/net-mail/mailfront/Manifest
index db336a5959bd..7fbe09074015 100644
--- a/net-mail/mailfront/Manifest
+++ b/net-mail/mailfront/Manifest
@@ -2,4 +2,4 @@ AUX run-pop3front 269 BLAKE2B 6b5489f24331cc059359c07919efad67759854508e8f544ad5
 AUX run-smtpfront 461 BLAKE2B 6b247811ecb101995a3ba6e7b7a15174020a8a16296e7d5ff93f3e7bb6f4d18998b79ed4aca4135ed3f4dea71dcc681d23e30bb35f493735f47da91e666633b3 SHA512 c8c1301d1972d4a415e549f0b9702e3670b44d258ceca606e868592d36f9cdc15ed587c25d24f17577a4d2934d59a3639a6ec66e11f9f00ed54716bdbd6dc4da
 DIST mailfront-2.22.tar.gz 128355 BLAKE2B 593598c353aee9c264690de4af5d472bb4b965cb14aa774a0be6fdece200e078a1e2dbe1feca8135e05a54dad2e0fd3378a4a5903f9a45ccffa260fbbbd2edb6 SHA512 30e1c561f8836bbaf893897b1e864539c44600c4b605d4c8c51c1156c9227967a4ac9e2e9eb0b48bb1827001aff2c6a94e9f44c59bf10e16b5d98595c6a9f2f6
 EBUILD mailfront-2.22.ebuild 1725 BLAKE2B b521a9750b8bdcebc7f33648ddc64c26cfd85c5e30779c525a9f35ac7984686f6f0798132f181dba873b6c28d6daea7a5bf46cd3cd1ebc184636826cf06cfb69 SHA512 b704f3fad85ec43608a142f47d4a1b0396764b7668761c703ad82825cd372a316920a65fa4d2fd79b73076c03bcda6eac08c13f977850eadf9f098c2bedb7956
-MISC metadata.xml 582 BLAKE2B 101e323c7ca07cb676c5bf8c899eebce98346c7b0df2f07deb36b7702125b24398919936850751af0f2216d01259f411a2602e6fed2d565c5c9dc30f86b9d0e5 SHA512 89d79f9ef31d7630d060b913f9bcdbaddfbf3319e2b05abd56d86ea9269a0f78d38809fba4d6df58dec0a5a935b9e52c034a793c420b518540cee797cbd67703
+MISC metadata.xml 583 BLAKE2B 9866b0de164304769cc78d7d518c7ac06b0829103da565930b50c7e0d719ffb3d0b4323199bae0438c8e64171be677c7129eee8364fd18a043196fd163375ce7 SHA512 20c3b90a16d0fb5e1072bdf71ac5a73d14ac6a6899318a6628c12abf935980ee43aab1c588f8262e2cfd70a6bf5a9364689e2c4b68978b4aaea2a9cf5c22cf57
diff --git a/net-mail/mailfront/metadata.xml b/net-mail/mailfront/metadata.xml
index df4f4842e1f0..e817d62432b2 100644
--- a/net-mail/mailfront/metadata.xml
+++ b/net-mail/mailfront/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index f4b103250099..23d06dcdc402 100644
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -4,4 +4,4 @@ AUX mailgraph.initd-new 984 BLAKE2B ea3a6eac4eb9694dc48f33365eb846cfbd3f9f75eeda
 AUX mailgraph.logrotate-new 773 BLAKE2B 392128208bb8209e93d8802f133cb7b8f3ac0a6ae4453469da1cb3152820910de6b1a4b465166da3c2976faaf06c603cdf453ec9c53aba037bfa5eef4169b46a SHA512 a8fde20eb24964a0ab7efbe5e6ce0adc02e0d91daee519f4dd70049ac2f92fb53f63322128ae8716b64fb1aa28b7a2c55a8c647028ac73aff1687ad312d20baa
 DIST mailgraph-1.14.tar.gz 22014 BLAKE2B a4d72a557bc7718576d85aed930a0037cb7d83edcba62397d6e9a51ec7967c6ffdf6d310e6bf9b881839313ed4cf1969e40eae1a923bbae45ac71b9593f1805f SHA512 3df0dae010ad166a157eb34a8b1fcf837ab42445d417855ea58937a75b74ca55c06044eefb6077a6117073c39a087bcdf5f58fe35c0e4d9c7d6b18bded7a0193
 EBUILD mailgraph-1.14-r2.ebuild 2805 BLAKE2B 62f5546a58e381dcf60eb5bfccffb11e777bfdfb8bcd326cd07af866a8dffc066084b9623f8f80eddeaddaac3baacf40ef0bf7da5bf4bc1e8da8fdc2f7ea623a SHA512 16f31d92c8d4e14232724b97cb7870828261ca93168888f74c6a777eb37c8f02390fc5aa1b3ce6df76e48d977f31bde98f410e51913af3387a47d21f47029bbc
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-mail/mailgraph/metadata.xml b/net-mail/mailgraph/metadata.xml
index 1b2becffa26c..bef24d2c2337 100644
--- a/net-mail/mailgraph/metadata.xml
+++ b/net-mail/mailgraph/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mailman-meta/Manifest b/net-mail/mailman-meta/Manifest
index 8f7d5e8a73b9..00b87658731d 100644
--- a/net-mail/mailman-meta/Manifest
+++ b/net-mail/mailman-meta/Manifest
@@ -1,2 +1,2 @@
 EBUILD mailman-meta-3.ebuild 319 BLAKE2B 8ca7b8aa435d3e0b92e7fc47b249950cdb4b78a2ac2cd9e80e701f335f8787a40886c97f692b0d2e56633a6449798fbf82aa2888884251c349fd7ae1656cf39a SHA512 3adb2c0833a65d15a4dd3e972d42c4fa4065db85e8be80869fe171eac36eff60acb1af4d6a9f3840cca689ad094c4540338d9ef27a9a4c2f0dc86fb6b6d18dd6
-MISC metadata.xml 216 BLAKE2B ff21e786382ce75611e7386f0689145fa9b64a7ef8c3c23ff92ef9c0f2bae866fec67838df7ce6608d4f1954f107b8d424103789c62384a04af120eea19053a8 SHA512 6309007f7bf488d882e2769f332c0c76bcc5972bbb60e90f86fc1895b9421494be9b1d962ce7b8a68b484f5bef6e0d6bb67247496b1d5e00e0a6ba55403e1df0
+MISC metadata.xml 217 BLAKE2B 4c798b28d6d7cb91ce9efa46084d222e24f1f62814b89dc32e8ee4c2d2e761392fa46cb368de68fdaf0c020acc5603a124b3a96edaa8e6ee333ba3f71ea59ad5 SHA512 83aaf1cf450d1a0769b0d5bc9533bb17e683dd88d04d3318da131cd1c8c66492451b9518f9f2b08d144ac0a2ba4113ed09ffaff1b7c4779f6c35bd7bdcabb874
diff --git a/net-mail/mailman-meta/metadata.xml b/net-mail/mailman-meta/metadata.xml
index 1d07f2a1081a..4da67a4f4b42 100644
--- a/net-mail/mailman-meta/metadata.xml
+++ b/net-mail/mailman-meta/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index b82cb9dba029..ed025b0db8fc 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,3 +1,3 @@
 DIST mailman-3.3.2.tar.gz 1396750 BLAKE2B f7db82d8cb217d80313ee7a6c28f7b62876a6d176a108b3fafdc744e0a9fcec3d11a0665069a5c27a42d49c22257bfe2ca8f18233d30fc9acb964027fea3bf12 SHA512 af8b300a9fea9e40a9a42f97531cf0fcd36f9b30a88a5b062994ec6480d91a698dbc37f4910045aacf3bedebf7c9ccacdf8d11bb0ee560d11e1eeef266f19b29
 EBUILD mailman-3.3.2.ebuild 1402 BLAKE2B 89a4684901834c58bd6cae588f917f686fecd0500df16ec42c26a324c59ddace83c55d2ef3f674b16f1da0d47b8c0d3459751ff64abe1ff67872b770fce5aaed SHA512 577e48ff8745a2221add6e4228ef7851c0762bbeea6d3e1d7e2e17d9b77a5da4b57a402b4de5d3692c069b572049928cf62f00dc0377cde393d4c0985dd42fd9
-MISC metadata.xml 341 BLAKE2B 0666e6113e8f6a96d07865e8e365281376370fb18c64cb060bf75a3ec049481fed396fc3e08fea433ae7103e913ae362cd0df3e6f6187cfd51fb6fed284be186 SHA512 48aed4040c25a4200f406b21901cc83763d65cfaa3f682639b06e8eca663dcb595179435ebe96f1684c65a8d451c55e028e1492b9e986efd802e30b303d3270d
+MISC metadata.xml 342 BLAKE2B f8593b2132bcc582bea99d611092f1d3654de1fa352200fa84def65c55126e540ab03f475ab4a7338f5ce07a6bd1bd4efcd1cdf7d0da6ce373f30c7b535c8bce SHA512 facf7fec950cdedfe764bfa4d7c46c1c236c90caab5c48561ee724d2c7eeb2b1f9f9b94883ffc23eacb7bf80ebc59757876aa8cb8615f141dd87b4bec4059bc0
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
index 557d50c69a3f..901e3a6f96e7 100644
--- a/net-mail/mailman/metadata.xml
+++ b/net-mail/mailman/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
diff --git a/net-mail/mailmanclient/Manifest b/net-mail/mailmanclient/Manifest
index 3501828ce01a..e8390f0a9d23 100644
--- a/net-mail/mailmanclient/Manifest
+++ b/net-mail/mailmanclient/Manifest
@@ -1,3 +1,3 @@
 DIST mailmanclient-3.3.1.tar.gz 78807 BLAKE2B 04542069b3a7a4b0069363f09c21ce321350fe25e57a86e5ac9ac9ec5329777acfdd1ccf62354d9df86f615f37328a8c9700811e05823ec39a648c4477b9321e SHA512 bb23d47b4c5c9f4881298330f530624c7af243e9e583f8c20cac2de77fc4a789dae729e8daa96b6a6bbe775ac549d0fc118773697b7a156fb74e4365a18683b7
 EBUILD mailmanclient-3.3.1.ebuild 488 BLAKE2B 9c5e9efd6be97e8cc3e9ace25ee35453cc865c50079ec9478eefc482f06df4e9c55ab331e192155ca0bb17b27053779b5d8a8e96b5040deb720c390f841f77d0 SHA512 f05454c071395effff6349ace296c6c93988f818d66e80b30580635959155c01b3b33a656e33d4b5dc2337a857132b5c033ed3d3c1649fed283e97db486dddc0
-MISC metadata.xml 292 BLAKE2B cf9e6f2964cc8e3c9b3ebe027a86601f2a88487a629ba52408ec50c967995f021e8536f9ad213dfd1654e3120173eb6cc759ea05d203191168037efaf4fa6810 SHA512 af725f19a885cb1a859ba86466390bb0621be1692f4a35ae6d7f572880f724006da6b0e5346dc00e5c07aa89a865dcecd17e85f4494fc7bb49c2c5a865aa3219
+MISC metadata.xml 293 BLAKE2B 4c775c74e3547276626175a3c706bced8eff5306aecdebc69d952436feed57201781c0aa859cb875f0f415ef6bf5c5eb6ac163363dd0cc38e2db488130de3fd8 SHA512 9503a74736048b67abc1082133910bd1d7d68883c648153a903568d1cc9d342a16c5c2e30ccc0cf00ddf3caff18c156bf01dedcdbec655fcc4038f81b170d3ea
diff --git a/net-mail/mailmanclient/metadata.xml b/net-mail/mailmanclient/metadata.xml
index dc16487bb15c..9b21a3c6090f 100644
--- a/net-mail/mailmanclient/metadata.xml
+++ b/net-mail/mailmanclient/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
diff --git a/net-mail/mailshears/Manifest b/net-mail/mailshears/Manifest
index 3adb276c4ab7..c9cb0d0dfbcf 100644
--- a/net-mail/mailshears/Manifest
+++ b/net-mail/mailshears/Manifest
@@ -1,3 +1,3 @@
 DIST mailshears-0.0.4.gem 68608 BLAKE2B 8adca0b902145f9ed97f9154db927f0ba9aa4696c37485c6ee9c3001f728f6f0554d0d8330b6173d7b636712f123107aa71cd818dba91aa8abf956df016775e1 SHA512 6c808ae2d1f2393c19fcad2a0c9c437a7a79354f779dfbbe8ec1662c39a534b1318ee30355593db9027d8b9eb418b4f99f4b87d06441668a3c15c0987ea8cf57
 EBUILD mailshears-0.0.4-r1.ebuild 667 BLAKE2B fef1b84942e99b905075c58e4c5d7abd3188df64042c3752460322278e3655384921fce0a1227ed065671e76e2c968814fd767e4cc86ecafdee16f066896f6b3 SHA512 2ed8f82c2b9d700733d0ea5ce89a933ebe0a2b969653e8ea50633640ce568843d11a896815c3ee7db2167eab56df90e6ae69e910c5aa534b1cf080de55016e58
-MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
+MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/net-mail/mailshears/metadata.xml b/net-mail/mailshears/metadata.xml
index 45125b9b6e99..f2908ee10b59 100644
--- a/net-mail/mailshears/metadata.xml
+++ b/net-mail/mailshears/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index e69189e9f1e1..74aba44e7097 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -11,4 +11,4 @@ DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949
 DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a
 EBUILD mailutils-3.12-r3.ebuild 3703 BLAKE2B e017a2c4b8a2cdfa4a9d93ac16f08a7521f0db1682183adec4a40b258e4af48a320227d4a4114b9bca4b3b41105b06969f0d134326f900cc23fcc99fbe15635f SHA512 b74bd2faaff78dddb92669524ff5a322f4e92006aa429c283e47f7ed5617f7226ce438594d6fa2c9c4f7b8bed73b9271ad6181ce9870cdffa4a628d4ea183c60
 EBUILD mailutils-3.13.ebuild 3585 BLAKE2B 15f56ac88d90c4d266b9ebc6158499c26411056379f93eb50a745aee560ad99ea377a3e12e484717f40766db15780c4b5f8483c09540c0e8e07daa824205aa27 SHA512 fc935ce433e9091198824d10f60ff0b8a8760f98400657fd96019ccb9bd547b9ccaa8805f91bb16a96930202b5ce123ca19901de1270c5d16016fc95899c764b
-MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
+MISC metadata.xml 603 BLAKE2B 1283fff637c3bc43fa0df8e17afe62bb83b38aa973337ad7082ef902f5c2d64e4b70db8775cad2a16610e07dea0b677769a810d7c9a730bfcca874b78b50da4e SHA512 a6eefadb824f089b2de3c61b30314fbbc82413c1c40be1cf243e82bc4fcaf9000c43fc00d73f19f2f7696cd06e71d72b0c6803ad329859574a0a6907a302f8c0
diff --git a/net-mail/mailutils/metadata.xml b/net-mail/mailutils/metadata.xml
index f38df515bc65..497f5d2f40d3 100644
--- a/net-mail/mailutils/metadata.xml
+++ b/net-mail/mailutils/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>eras@gentoo.org</email>
diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
index ee28073a80d4..ace74844453f 100644
--- a/net-mail/mairix/Manifest
+++ b/net-mail/mairix/Manifest
@@ -1,3 +1,3 @@
 DIST mairix-0.24.tar.gz 206903 BLAKE2B b18832dbd5d570d428c454ade693ab0746b6e601d94a9b6d5dd4ca81356cbaecaec5c88623fe5bd612e94112dc4b6f16929fc210ce3c5c8e1e5d2a0c62309d79 SHA512 3e0af50c2c5857c5e1661e1be131c9c184377947b2ed884d1d9faa6d8bd88c17a7b7a29e105e65c990d2ede5d9fff679e57e83c4b8eedf2870493395e3ec8cf3
 EBUILD mairix-0.24.ebuild 923 BLAKE2B 592a2f33f9707e83a836dafb25a70f571d86193a3dbd5221203632b354a62ff62ecf18e0a8c4494a99fd5447e4be4bceb4aca4089375667644b29482c13f6afb SHA512 e6116c95ae364ee80baeb27009ff79c2774dd936b4c3614127524c97072f0815d0688d3b2c252d9d91ca7fc7514df01a2a1dd35e2254c3e48ee052e13eac83bb
-MISC metadata.xml 243 BLAKE2B d9d3e2a9c2df5ef86d73ee0d991b7cd768837c3cd73c5e3fc164583b5eba416994bcee999c2bd40e03d3b09504f291df80c5ae93deb545bc8aec3997c49465a8 SHA512 85c72e2ecb2b1328ebccb72908bacfacbb8b062937f13d0d5fe3c2131a91ff2be5cd999417a13f584277a21bae70cd7ff3d5d17c4a3a5f02e0b563a5d8947a54
+MISC metadata.xml 244 BLAKE2B 8c6dc18220f9a688931b77c1193a6bf8e1bdcbe8ef5b5331e5a72cbc5a340d146bb203e82d3798fd5457ae072b74e7035abf38acdff53a28c990fa16664c49fc SHA512 2c148534189832be99dee382f7641ff0eafc0ad11617493a2a11faf146303d74f95b5923f6c97cdf2f77477e640901d4fc586461714f0f04cd6740328070e19f
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
index 59ab1f3d05b1..fdcd33f629c4 100644
--- a/net-mail/mairix/metadata.xml
+++ b/net-mail/mairix/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index dad55b0cf274..8ed856d1bba8 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -3,4 +3,4 @@ AUX mboxgrep-0.7.9-fno-common.patch 301 BLAKE2B f509ad202b6f82afe7d4ef71686198a3
 AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
 DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
 EBUILD mboxgrep-0.7.9-r2.ebuild 768 BLAKE2B 1091cdfd5dd49267c64c267a6bb82e56084251bd598c4b5a56a1e4788c9dc3837dfcd0dd0ef1f083fb05d3068aff61e60c09f396d4b35aa51dc5fbeb87d6b55d SHA512 bdd19dadf470d1173dc7f08db13f57b82b5a30c6a68595d04cfe3b0e0aa626ebb26fb891aa9fbf97eca56cbb9875f416601250eef23ff181f7343728f7ca02f9
-MISC metadata.xml 337 BLAKE2B a35d02ce3dae677445c501db4a3975f1b8a586973aa1b217a94b2a9a24c65ddefc8e6251e4603243cb97ef5e2d91043b1ea060f3b5432996e04567ca8c178c47 SHA512 0477155c421a26504aa6eae9ada7db4dcdb9da3aed13d7ddd9a73f55a1f7f6134000c54694f7d3e48eaa62de9733a082bdefe6c2de1a09017ca2f3917505d16b
+MISC metadata.xml 338 BLAKE2B aa7ebf0c275116269fb03197070bad22f22f3ed75a0b3f549c1992df014ad8e7286dc0a612828c44964953fecbd97ab12778da699fcc8ad02c049f946ebfecea SHA512 aeab3e52eeb9899dbb876faad42143f067a245ad4e50101c72094e817f72e124e39ce0b64a6c08f2d30a2c3bdb28d8490acda3830aeaea672a54fc5249db1dcb
diff --git a/net-mail/mboxgrep/metadata.xml b/net-mail/mboxgrep/metadata.xml
index 7e978d60de16..b89830b37d8f 100644
--- a/net-mail/mboxgrep/metadata.xml
+++ b/net-mail/mboxgrep/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 <use>
diff --git a/net-mail/mess822/Manifest b/net-mail/mess822/Manifest
index 93257f468575..7b9f26a1ebcb 100644
--- a/net-mail/mess822/Manifest
+++ b/net-mail/mess822/Manifest
@@ -1,4 +1,4 @@
 AUX mess822-0.58-implicit.patch 1373 BLAKE2B 39fde0a0ab48958774493aebebac5ca82beb74430cbf94e9634f1b0a74963d08f98a6196d10cf2d774241538b395cdc70c710d6dc6885d93a35c4073564eafdc SHA512 ee2819702b4dfc558eeea8e2885ea16c69c3fc9b48a4713d8eead6ba03a870c583406d6ff37269c11cda11f4a0f70caf45a2cf3569acba31d938ac75379a4b8d
 DIST mess822-0.58.tar.gz 64287 BLAKE2B d24c7c6c4d3cfcd21166ba9ac2ec72c0a0dbd05fb8329ac04668d9febe8632f63304342642f8c1a3543d4edd94ee5bcc7a2688ccc6f4afc12bfbd8d38eaccea5 SHA512 5fb30f06dfa08f60dc8760f9c5d692e59397ff848441bc94313a079bac8fb53b779133b48abae9b487dff6fbb277d5210a9690a138366bf4d34f052d661be65e
 EBUILD mess822-0.58-r2.ebuild 1412 BLAKE2B 1d456ac1d4759b4d263c532cc09bdade9fe5f162f761bc04e524990caea5b13ce38ef695eb10a353bee940850bda99b5e22504d602b62938a63bf3168447eb46 SHA512 fc035effa578da07710514b9dfcb0ab3fcb254ba07204b86529ceab63a36bd2f4c873281d0d84916a89552c1091ed99ee8f90c85b709e60a668db928ec321a6e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/mess822/metadata.xml b/net-mail/mess822/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/mess822/metadata.xml
+++ b/net-mail/mess822/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/metadata.xml b/net-mail/metadata.xml
index 4e4997cf3c23..a62125b78cdd 100644
--- a/net-mail/metadata.xml
+++ b/net-mail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
 		The net-mail category contains various email-related utilities.
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 7ac01da0852d..3bfec064755b 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -3,4 +3,4 @@ AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e863
 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
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/metamail/metadata.xml b/net-mail/metamail/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/metamail/metadata.xml
+++ b/net-mail/metamail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mhonarc-gentoo/Manifest b/net-mail/mhonarc-gentoo/Manifest
index 5410dc26408f..3ef9b2ad26e0 100644
--- a/net-mail/mhonarc-gentoo/Manifest
+++ b/net-mail/mhonarc-gentoo/Manifest
@@ -1,4 +1,4 @@
 AUX mhonarc-gentoo-2.6.18-archives-gentoo.patch 6534 BLAKE2B 32bb00808fd084445442c69c3689cb2d2efbb149e52a6a0f2375a89116eddc239c0d997ab2274e486ff475b0aea9cbbc94b0380c64afb07060dc25edd700b659 SHA512 f4c238e3394df9fccf1cefe697a2f5a53fdda5f02498ed5cd6d9adb301f49b257b8f01bf486a00ebd49b128d8707b8699a6e08cf3e3548709cbd29dca12e3d92
 DIST MHonArc-2.6.18.tar.bz2 1546854 BLAKE2B dd403ef742ee3cf2ce3d4490a489d88fb4ba8814456d0ecfae347c4dfd5fc5a61593b9def93edcafadae5e32e9afd5853ac0bf584b8f0060962d1b6b3fb1f04f SHA512 816acfd5c68db274848859ea60c8fb47a12daadea5d8dc8acd12018b72c8ff22133ef7e366edb005ef309f7a74f2b4dfdb7ad5fe9256eb850bebaeb165be5511
 EBUILD mhonarc-gentoo-2.6.18-r2.ebuild 752 BLAKE2B c2f88a28593eaa69d89fc310a972f30ed01725c0a4d694376767b00e29b389caaba2334c888b51891099630b1c429fb2ded4a19fd5954ed6873ceccc93c46872 SHA512 f5240bed8951ec02cfd0506ec14375c705770f450e7cbf8d8c8dc49460c2f1e87a21c2b29803eb87f9acaf0c23d57b4067ed081657911fb62e478157e0af78d7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/mhonarc-gentoo/metadata.xml b/net-mail/mhonarc-gentoo/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/mhonarc-gentoo/metadata.xml
+++ b/net-mail/mhonarc-gentoo/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mhonarc/Manifest b/net-mail/mhonarc/Manifest
index df96b8b08fef..14be68a01ec0 100644
--- a/net-mail/mhonarc/Manifest
+++ b/net-mail/mhonarc/Manifest
@@ -1,4 +1,4 @@
 AUX mhonarc-fix-perl-defined-bugs.diff 817 BLAKE2B ae5c93dd4368b3ae228ec10797abf9510c4e17870002d35a5c9d21f461521c3087b4b3b84ec1ccc12d2a1b4e8699bf14fcffde856b28168127d1a7622cc4a9ae SHA512 c1946ab6175b8ab1f5121908f7c9e4185fd98a9f817934436230499567fb02f204c1a237e8558dbeda5a0217a64d612674b8ff7083b0a16711fd67a3bc370f0d
 DIST MHonArc-2.6.19.tar.bz2 1577790 BLAKE2B 07c207c9684fd4a4f53a26ea18dc52c3136e7a5dc9623b121a8ef87b22fd19061d3fe91a48c691ba0776d7783dd3b80155e5c64518aa3050c0f0156537aa298b SHA512 17d9db58bf0a312ede435acba11a24ca73538f2031f24913fba28c8232b51b252e64a9bb55321aef26e3a2833a95939bdccaba51cb221fa1bc83d1980e60e7e0
 EBUILD mhonarc-2.6.19.ebuild 1026 BLAKE2B af237902c504c785b1a8cd004b2f4bfbc57f9382f152490dd07bc1c363830990928f2ef1d5c12b5152c8327de34fa067db8f6561134a1f1fa2a819b491043b0c SHA512 f2c6d456f4e22b081d377760e9466adb0a824ed655c80f40c18e946ca2b78fc63fd3f9562cf8f73a2c9989d1164dc2f1acda3d100a53b266cd0dda0431b96ca4
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/mhonarc/metadata.xml b/net-mail/mhonarc/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/net-mail/mhonarc/metadata.xml
+++ b/net-mail/mhonarc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index 518a63097acd..40df4647a8f9 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -2,4 +2,4 @@ AUX mlmmj-1.2.19.0-listcontrol-customheaders.patch 1231 BLAKE2B 8726f9436c7536ae
 AUX mlmmj-1.3.0-gcc-10.patch 636 BLAKE2B 7b34596b4ec6e932f35a8b5135dd2fed611bd8432174544eb850856eb9389b1bc2687a0acceedc9780b0047e3d0ffec24187aad1a6b4158a3906f4886a94e7a0 SHA512 83446b655afe86a48e2d544fbf52cd6c688541d46f1f7b8e0eb59702a10474b4419eec3833e452e674d202782444e80e2bea4feed1c33d6e755eefebbe552bfa
 DIST mlmmj-1.3.0.tar.bz2 292519 BLAKE2B abaf5c7ad53034d2201a2d3ba6d7f99ca83f47ec83df59e12a90a7118fbbde941d5ed2d14864a4af1568f67e74ea082fbc70fc9e44390673b76377bb3679c817 SHA512 c704d89f8a96c0ffc751a744ffdefb5e4304ab74be89292f06ce0c337b8ff1cc5a91737c8b1bd96fe3e993338986fa42bf360cfefc508e1eac74ab88ffda2494
 EBUILD mlmmj-1.3.0-r1.ebuild 1205 BLAKE2B ebaba612458649ab7a65f1e574704747139e1695f06f04f87cc462388cb522d630db06d5db716163fd664725a0c989a5b13b79fa9faa407cb610d98b51cb41f9 SHA512 a8649ed57dd47c71b06c5a105fb4a39f76222b7938f7de16c3fb60b712987f5b2cd258dc9d586e8d1a9305a795a0c529faf60b191744c231621a56c6c4a392c3
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/mlmmj/metadata.xml b/net-mail/mlmmj/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/mlmmj/metadata.xml
+++ b/net-mail/mlmmj/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
index a85409155382..baa708ae528d 100644
--- a/net-mail/mpack/Manifest
+++ b/net-mail/mpack/Manifest
@@ -8,4 +8,4 @@ AUX mpack-1.6-paths.patch 2729 BLAKE2B aa0cf351e69b2b041ea14c84c651275cf6e2cc895
 AUX mpack-1.6-usage.patch 721 BLAKE2B 9631aed898a8f95fb3e70f29c82994d0f1abcb935c106074c014a56f59f39df46fe6aea5b9eef0e58bfb25d5c9d4084126b88eb1117d8ca124746058b334bc52 SHA512 e07f72e6a0d037f788829904050bbee9f1c8c722a6b363b8a95ab012dda99b952e36bd7a9772a63d22ff4da34fdd44ead8d42db510e8c340f3410b3cd0d52b1a
 DIST mpack-1.6.tar.gz 179850 BLAKE2B d6b79e8514633fd0bfd1c04b167ba1d1a030cf5407dae30ba2a45e3d30157b66955808aed40a5163737c0242349d05f53c27ada920676cf3d7b81a00e7bd5059 SHA512 9bff0d2753d78288e428a20c8cbb4596bd9862de4da7f42176731ce5fd459b15883d758f9b1ec7d4e1281cc1aeaaa046cec54aeb0997a7ffed74de07edd84714
 EBUILD mpack-1.6-r4.ebuild 841 BLAKE2B a54ea46f9a497853c2e34036c0771600f0b24697eb1b930f4b361656a3144c8bf12a1307ae581c3e06339a68975d0fe503f1459db25c9b023053449577f01911 SHA512 9b4d358f2e70c43758a831fd1c310d6330792fc674ac3757c4bf503d2905ba0ceacd7575a4b4673143411423711f370fe713d932d409971784f1f8c3147b9dac
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/mpack/metadata.xml b/net-mail/mpack/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/mpack/metadata.xml
+++ b/net-mail/mpack/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index 60ff7d96ad24..89f312c4b22e 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,3 +1,3 @@
 DIST mpop-1.4.7.tar.xz 322488 BLAKE2B ea73e84b5ed3b5aad7ef91ceb510187c3f2d42976329a6a53511329a84713edc056ca6db35b1de2c9bff8b417e2710e598c472e78acbdc499dd73b24c46dfb47 SHA512 ce0ac899fd2af1d50ef221c88282c12263c5862b9ff1f6341a8551c3fe6b69272772599a2040a0f553a776245514c55b8102ca8cf291b411e5127a3f39897832
 EBUILD mpop-1.4.7.ebuild 1069 BLAKE2B 29534405d66afab536f9245c84c827f4b1837fa76aee1376699b5d91e5ac0040ea0ed42909caf6cb8ac63d5a0fdedc5050ea79276af8e50ef21826a89cc92e7f SHA512 86f9a7e8a27ca380a0d51496e1bdefa1cbcb71e2b72a6e547f85e4a13994e31ea1cc4a71fc47f617160b4ffa3c86b3a05854850b0d4b51c5bf388942571bc95a
-MISC metadata.xml 241 BLAKE2B e97922b2760a2f8d0ae16406e640eb60631fc3de36ab2a76953fb0b78b14e9652f317120839b5b4f0decd3dfb4f2931d828eca1f8a60f6eb1e01f3d2e8a59236 SHA512 f43a36b5ac2474c93bd47933995c16936ddd5748811e13716dc1eb2eff2a9e8e2f0fce706fa82386bbda93e7cae791066118b960191e93ca2eab02175f9e020a
+MISC metadata.xml 242 BLAKE2B ccfd1df5ba047ee31ff30c7522c928785f42d24ae1f33bd764477edd41f0f6543b66f5d442cc8306a100a99daa5d4cae59b92670fbb6b4e3b198a1db18995524 SHA512 b3589c59c2827a4944ad49cabb7547832af96bc529cc9e1e44c79887d2bddeb1ec978f3068b98c0dd8c6a3f3bd5bc332583ecc0ae57f0597b30c726e2cd5fa83
diff --git a/net-mail/mpop/metadata.xml b/net-mail/mpop/metadata.xml
index 28d82fd2250a..ac96759e1ab7 100644
--- a/net-mail/mpop/metadata.xml
+++ b/net-mail/mpop/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/mswatch/Manifest b/net-mail/mswatch/Manifest
index e5a0c2e82342..7771a8215e27 100644
--- a/net-mail/mswatch/Manifest
+++ b/net-mail/mswatch/Manifest
@@ -2,4 +2,4 @@ AUX mswatch-1.2.0-gcc47.patch 565 BLAKE2B 67e42b684d1a134cf6dc02050dfda214d4c187
 AUX mswatch-1.2.0-gcc6.patch 317 BLAKE2B d1d5b9a1d97effc54879f74c6da34d21635ef05bedfcd8eea17c936b9b08a21b64d11b379e6c344fa92ed2703949eea840eee4ff242c8d53cf7dc9aba19db309 SHA512 5f73a6251fbc9308a02343c66a1ccf00917bd6af4469cdd0f1559fab89ebace0e24a6371ba21089b659d212f225091bdf2ff6843b4372fc9f2356add5dd555ec
 DIST mswatch-1.2.0.tar.gz 434986 BLAKE2B aa62ee594740546fce32869f86cda33d81ca8e560d418fce918919fa673431457b8c9ddceee7aecf9f410f98aca009f67e310ae25258d0f130a25d2a6a39c053 SHA512 c6774993909cb066514cb0ceb163bfd5e023d357435c6779d2d049cc9d56a278d5502193af1f4f5d6af264ff041b43b6c0fe2c400f775e8c22ed395a183c75f9
 EBUILD mswatch-1.2.0-r1.ebuild 772 BLAKE2B 840040e803dc1f1b49d006dbf21dcdf4b97febec1959d0f3613c3835ff8512274ebc77babe3ef0d78e7688863a287df4ff5bb15071eb1349cd42f5b568bfeafb SHA512 2cdc588f3c594e30027127d0deada5143c2d514498ace008865d8f072d04a7f46706371d3a7eaff5f8abf004e3146bdc932db4ba439749610b4fa9fc76aba502
-MISC metadata.xml 244 BLAKE2B 314db280fdd6fb3a0ca700f569f4771e85587aef5b7800fb9e89680794eeee9e42a61169f5fac7d75d5dae9ab3d0e8cd7786ea3321835cda05deb8341aa644f7 SHA512 39a7436f1722de611975c554c56d0a2f91208bf4a5b92e1e4c3447e194f9c4f9170add7c0809e2d14da5744c060e1a3f4cdcb97badd77c2ceec08d24682adfdd
+MISC metadata.xml 245 BLAKE2B 2194fd3d3fbbe5bae37ca0a1a4dd3e13297b2ec917493ea4fc43e71a87782868b8ad3af55de940880bd924813dfccbf1cddf30173afb2cba30e860379b44c8b8 SHA512 112877e00c29663a8eb01574329e44543510965452b1db0c9b92bfa07295461bd32c81b097e90c4281a524722500a121d86a189de3ea330e6a9ad45219ca9495
diff --git a/net-mail/mswatch/metadata.xml b/net-mail/mswatch/metadata.xml
index 203ecbe8a59a..d04fe5f08a28 100644
--- a/net-mail/mswatch/metadata.xml
+++ b/net-mail/mswatch/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index bc88779941ee..c1095c804c8e 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,6 +1,4 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-AUX mu-1.4.15-guile3-1.patch 5237 BLAKE2B 49fb8d7c75d0dc758b7a0cc4d69fca9a1d776c522037271e985b8667c82e04b5487a9a3f4a0537a1aaf81950f95e06e258abc79a1b9d572f8a9cce4144d883b1 SHA512 ca2a06e604ea86b24f5f11d1901ab27dfd54346c4cc9417ae95ac9d0472e4f0e1bf3aad638cc06d8b354339defbbd5972096b563d362c0d23265ae60e1e0790c
-AUX mu-1.4.15-guile3-2.patch 506 BLAKE2B ff01cdf9d9da6d4a2f2517c9a6df56e13929e4e9795f951c8f0cd3778c6a4f82cec305e2d24e05040b2395796690b9205e22699ce102745e9367e926ef6eaccd SHA512 c1da640ac0d900653b21d64b3078b8c3a02bc38a2745adb76a2c3c27f8829d0678daa18bb58e238d07a2d01d716a4291746840ad5438caa9637454f17ac8ddb4
 DIST mu-1.6.1.tar.xz 866044 BLAKE2B ed6464e2ef63d37c42783235a0537cd20c7442333d4a6b59af0d257db8e3e6d85db7106ae2f89aa5f1536e50afadd40c89a8215a288080130d14e3ceb79b1638 SHA512 d894f302cabef86ff6b1d85eb945b2aca27729eaa6558598076c8f065d584592d5e601fe6a6045cea9b8a1466320c838f995ffdfd564447683538a5e48f8d7b0
 DIST mu-1.6.3.tar.xz 867224 BLAKE2B dffe67df4731028fa5e77d62d32fb787639b25d43a48aaac0c0e446c14cd3c5f79ad5559968446603782f1a7df9c129b2c3e1c3576e01d162a59693a2abd960e SHA512 73bfc85561cbc31d8c8ba6043ad79b7c17ac33edbbfcb3f09d460b291454c7696b282ee98c7738e05a9842963169c3f87eff56c3f6729cb22cdb6136ae8b95e3
 DIST mu-1.6.5.tar.xz 867240 BLAKE2B d3e8ad88b38f1329e4a5716f981c97e62c2042835e81910dab02b1219abfc670fe84a68f992fd08dce282a3288aaa91a465ce881f79e7ece917ba089c2ad0348 SHA512 b25203d281fa43b22abacb442caa56d797489d32bfc1dde874d23035510cbc8fb331b45574ea74d4a01e4af0a706c1a84656d8b8d6e60f518b2ea75fa27361ea
@@ -9,4 +7,4 @@ EBUILD mu-1.6.1.ebuild 1389 BLAKE2B ffaaa365678a15bb5c7bd38e1a0026175af64402ebdd
 EBUILD mu-1.6.3.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
 EBUILD mu-1.6.5.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
 EBUILD mu-1.6.6.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-MISC metadata.xml 925 BLAKE2B e2267c540c5107d64c6fd7ab7c0e20476a473fe704facc4d692f7f90272ed05fdff5af673dcc492a134371ee81ad0c3794e7bd22e7cd10b4cc5e744fb26d25bf SHA512 e7f92466cfd6fb8bdc66c1262bc4b426f73f1cebea24fe4cd2f6a5f256df46ad7a9ad545faeb91bfeb2ea17fad848b2b7f7eeef576ef0e010b5a87d821a0c5e3
+MISC metadata.xml 926 BLAKE2B 14f872d6b63bbb9547b44759bca864546e040ebe1e4a9b8d3bc827e39251a1166cf893aa80926ff33949d9039f755cb9a68075ab1efbca820bbacce5972a8818 SHA512 bd0b0fe8182aefb2a8feb9dde074aa4d8b5a700914e318a9982cf696a72ff38e5ca8d9c8b600f31d3ff618fc5a87cd7a964d0dc55ef5d082bbee23040e69d0af
diff --git a/net-mail/mu/files/mu-1.4.15-guile3-1.patch b/net-mail/mu/files/mu-1.4.15-guile3-1.patch
deleted file mode 100644
index 671a4685a275..000000000000
--- a/net-mail/mu/files/mu-1.4.15-guile3-1.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 623cf787ad009c42b2adf3767be5f01fec56ff5a Mon Sep 17 00:00:00 2001
-From: Danny O'Brien <danny@codetherapy.space>
-Date: Mon, 7 Sep 2020 19:52:17 -0700
-Subject: [PATCH] guile: support version 3.0.
-
-Includes an update to the guile m4 package, and tweaks the build so that
-both 2.2 and 3.0 should work fine.
----
- configure.ac                  | 14 +++++++-------
- guile/Makefile.am             |  2 +-
- guile/mu/Makefile.am          |  4 +---
- m4/Makefile.am                |  2 +-
- m4/{guile-2.2.m4 => guile.m4} | 15 +++++++++------
- 5 files changed, 19 insertions(+), 18 deletions(-)
- rename m4/{guile-2.2.m4 => guile.m4} (97%)
-
-diff --git a/configure.ac b/configure.ac
-index eb5629696..cc43f43db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -212,22 +212,22 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"
- ###############################################################################
- 
- ###############################################################################
--# build with guile2.2 when available and not disabled.
-+# build with guile 3.0/2.2 when available and not disabled.
- AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile]))
- AS_IF([test "x$enable_guile" != "xno"],[
--  PKG_CHECK_MODULES(GUILE22, guile-2.2, [have_guile22=yes],[have_guile22=no])
--  # this is a bit hacky; GUILE_PKG
--  AS_IF([test "x$have_guile22" = "xyes"],[
--    GUILE_PKG([2.2])
-+  PKG_CHECK_MODULES(GUILE, [guile-3.0], [have_guile=yes],[
-+    PKG_CHECK_MODULES(GUILE, [guile-2.2], [have_guile=yes], [have_guile=no])])
-+  AS_IF([test "x$have_guile" = "xyes"],[
-+    GUILE_PKG([3.0 2.2])
-     GUILE_PROGS
-     GUILE_FLAGS
-     AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
-     AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
-     AC_SUBST(GUILE_SNARF, [guile-snarf])
--    guile_version=$($PKG_CONFIG guile-2.2 --modversion)
-+    guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion)
-   ])
- ])
--AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile22" = "xyes"])
-+AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes"])
- ###############################################################################
- 
- ###############################################################################
-diff --git a/guile/Makefile.am b/guile/Makefile.am
-index ed613068b..5c06ccc95 100644
---- a/guile/Makefile.am
-+++ b/guile/Makefile.am
-@@ -69,7 +69,7 @@ SUFFIXES = .x .doc
- 
- # FIXME: GUILE_SITEDIR would be better, but that
- # breaks 'make distcheck'
--scmdir=${prefix}/share/guile/site/2.2/
-+scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION}
- scm_DATA=mu.scm
- 
- EXTRA_DIST=$(scm_DATA)
-diff --git a/guile/mu/Makefile.am b/guile/mu/Makefile.am
-index f531822cd..9339ad973 100644
---- a/guile/mu/Makefile.am
-+++ b/guile/mu/Makefile.am
-@@ -16,9 +16,7 @@
- 
- include $(top_srcdir)/gtest.mk
- 
--# FIXME: GUILE_SITEDIR would be better, but that
--# breaks 'make distcheck'
--scmdir=${prefix}/share/guile/site/2.2/mu/
-+scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION}/mu/
- 
- scm_DATA=		\
- 	stats.scm	\
-diff --git a/m4/Makefile.am b/m4/Makefile.am
-index eeb8a05a4..27a49eebe 100644
---- a/m4/Makefile.am
-+++ b/m4/Makefile.am
-@@ -41,7 +41,7 @@ EXTRA_DIST=				\
- 	ax_lib_readline.m4		\
- 	ax_require_defined.m4		\
- 	ax_valgrind_check.m4		\
--	guile-2.2.m4			\
-+	guile.m4			\
- 	lib-ld.m4			\
- 	lib-link.m4			\
- 	lib-prefix.m4
-diff --git a/m4/guile-2.2.m4 b/m4/guile.m4
-similarity index 97%
-rename from m4/guile-2.2.m4
-rename to m4/guile.m4
-index 89823e9c3..696897364 100644
---- a/m4/guile-2.2.m4
-+++ b/m4/guile.m4
-@@ -47,8 +47,8 @@
- # for an available version of Guile.
- #
- # By default, this macro will search for the latest stable version of
--# Guile (e.g. 2.2), falling back to the previous stable version
--# (e.g. 2.0) if it is available.  If no guile-@var{VERSION}.pc file is
-+# Guile (e.g. 3.0), falling back to the previous stable version
-+# (e.g. 2.2) if it is available.  If no guile-@var{VERSION}.pc file is
- # found, an error is signalled.  The found version is stored in
- # @var{GUILE_EFFECTIVE_VERSION}.
- #
-@@ -60,8 +60,11 @@
- # @code{AC_SUBST}.
- #
- AC_DEFUN([GUILE_PKG],
-- [PKG_PROG_PKG_CONFIG
--  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
-+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+  if test "x$PKG_CONFIG" = x; then
-+    AC_MSG_ERROR([pkg-config is missing, please install it])
-+  fi
-+  _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0])"
-   if test -n "$GUILE_EFFECTIVE_VERSION"; then
-     _guile_tmp=""
-     for v in $_guile_versions_to_search; do
-@@ -221,7 +224,7 @@ AC_DEFUN([GUILE_SITE_DIR],
- # as well.
- #
- # By default, this macro will search for the latest stable version of
--# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older
-+# Guile (e.g. 3.0). x.y or x.y.z versions can be specified. If an older
- # version is found, the macro will signal an error.
- #
- # The effective version of the found @code{guile} is set to
-@@ -237,7 +240,7 @@ AC_DEFUN([GUILE_SITE_DIR],
- AC_DEFUN([GUILE_PROGS],
-  [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
-   if test -z "$_guile_required_version"; then
--    _guile_required_version=2.2
-+    _guile_required_version=3.0
-   fi
- 
-   _guile_candidates=guile
diff --git a/net-mail/mu/files/mu-1.4.15-guile3-2.patch b/net-mail/mu/files/mu-1.4.15-guile3-2.patch
deleted file mode 100644
index 6aa47d252306..000000000000
--- a/net-mail/mu/files/mu-1.4.15-guile3-2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- lib/mu-script.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/mu-script.c b/lib/mu-script.c
-index 1175a60e3..92a63992e 100644
---- a/lib/mu-script.c
-+++ b/lib/mu-script.c
-@@ -318,7 +318,7 @@ mu_script_guile_run (MuScriptInfo *msi, const char *muhome,
- 	g_return_val_if_fail (muhome, FALSE);
- 
- 	argv = g_new0 (char*, 6);
--	argv[0] = g_strdup("guile2.2");
-+	argv[0] = g_strdup(GUILE_BINARY);
- 	argv[1] = g_strdup("-l");
- 
- 	if (access (mu_script_info_path (msi), R_OK) != 0) {
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index dd851289df76..9bbd2af15171 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>matt@offtopica.uk</email>
diff --git a/net-mail/muchsync/Manifest b/net-mail/muchsync/Manifest
index a32ff6b14892..2e29b08c2838 100644
--- a/net-mail/muchsync/Manifest
+++ b/net-mail/muchsync/Manifest
@@ -1,3 +1,3 @@
 DIST muchsync-6.tar.gz 137023 BLAKE2B b2a60a26bd3a2918b52ea50a98223f828a60c1ba172f349cc350ab8cf224e114623bfb5775a9c05347311f21dbeed14744becd11022fbf8310608faf2a0146f9 SHA512 620e398f7e3973d915c32b1c244e2b1d5ed7c65dfc2a51958e62c229f14f8cf7fe794868930aaddc2d95145795a5affc0f50fc012d2d0b4bf2884930da3eec89
 EBUILD muchsync-6.ebuild 471 BLAKE2B 22f53fb490558dcad14818b0438bbdccc79bc4258d6d18b812800beec07ce2da92ba067c8d105f383b098c2f1343d45b3617d8095de9c22732dbacd1a4ac75a8 SHA512 c3da2db1a91dba5ab7c5f2dd54041a6428e9c4d711d0c64e751192bd6d41f23c00f58437838805e71b27fe733fcb799eb9888ea6ff2ba9327e15fdff18f95d74
-MISC metadata.xml 749 BLAKE2B 4a7b8a414c555d1ef8837ad06bd33e24b68ddfe419817095ab911ad4db7ee5c59d83ce10d0483ce663a2aa14c7e1d795f28ab2001a2563b143a3b3bd8e87f47a SHA512 64f5a2b2f9392690a118a2f3fe50a7af0cde94e57389f051b5918233f01e0c7c54790779f6c95c19fa9f13d030d7c2887d42a25b53e5569517e9f2e362115647
+MISC metadata.xml 750 BLAKE2B 8d3c2b879e6dd7f887f0099e68229c7a113cc0e7560d0e6fabc78c6fb405c83552349e02309e7df58fe4e24aae64a3123494dc242f51be924fa5d8a8ad6681c5 SHA512 c23f5afac3a657114d05f510ca82ba536d6ded14c4b12da6042596bd94baac45a5a6e5a2410736d2ba1eecc2bea4750da0d9a820242cbac8ca8c9688283d533c
diff --git a/net-mail/muchsync/metadata.xml b/net-mail/muchsync/metadata.xml
index 90765004e479..b380f07b219f 100644
--- a/net-mail/muchsync/metadata.xml
+++ b/net-mail/muchsync/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>gentoo@seichter.de</email>
diff --git a/net-mail/nmzmail/Manifest b/net-mail/nmzmail/Manifest
index ae4f5e78b6cd..7d30290b8672 100644
--- a/net-mail/nmzmail/Manifest
+++ b/net-mail/nmzmail/Manifest
@@ -1,3 +1,3 @@
 DIST nmzmail-1.1.tar.gz 94326 BLAKE2B 3a3125c21c67411f1608f7137becdac7b908c2f42e215bbed4897aa5815d8cc3825cbf5109f670caf1a9c8a8b4e82e0463a4acd68473b1664367c9c874398f32 SHA512 c5b689c587fc0d0359c59a02a2a1f519753e7c8a10aecd2c519f0e788b95ed1023a18bf0d2ee39292f36aae71eebf43d2463ceef7857d01358e56c8f0bd70249
 EBUILD nmzmail-1.1-r1.ebuild 428 BLAKE2B 9f28aef8719a8ea99287d190d2a54311e4f553570c1d617034e77a6c76eb807385346d0103f55aaf26a8d3eb1755cc70212e749fe4c9ec563361750519bfb29f SHA512 c592e38cd64fe67751b410466ea20cade482eb55f4c5620f5812ba006c731756e7145e6dd46e1ea44d0650e6cb8b347993974419f90bbe0f38692bf400e6b11d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/nmzmail/metadata.xml b/net-mail/nmzmail/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/nmzmail/metadata.xml
+++ b/net-mail/nmzmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 8e54d4652ba1..d9a327b9f66e 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -8,4 +8,4 @@ DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb5
 EBUILD notmuch-0.31.3-r1.ebuild 6674 BLAKE2B b61220991036bded267852e04044eb26d08f558b5b60b4f4a511e7e61b23a911b48576b5d2dd9a0628647f5d9baa230a4392a6e20b0e3c4ef854ca18171beb89 SHA512 edf47ff836d921f1be92e888b29446fbb354da8d3294bbc9bf26db4e74a8ac108b0393dfba51008d4da824e03c853f65a3272f6564fbaafbd12c51b252e815a4
 EBUILD notmuch-0.32.1-r1.ebuild 6721 BLAKE2B 469644b9f9305a64e63d52c5a0bff1700d1bd61b52a3aafd3d67459d974b4a72138a0a2d280154b81005ad45229e48fdfe5705251ff8d318db339d9a2632d4b2 SHA512 2b85da32d4ee30c130840a2ff805fe9795504e1a5beb868e6c37181bcb5d60d27565b67a6ebe648b4a4cbfe95a326655c4eabf5dd92d556eda6b036801ac1c96
 EBUILD notmuch-0.32.2-r1.ebuild 6727 BLAKE2B 51f07469163bbad95fd87ddae50f137920171185fda318fe2fd0b6b7cb09cd67cb43d73a0eaa320b9b1e401d009ee8b17efe0d66edfc56b8cfc0549efc846f3c SHA512 d307f3f52b3041953c5c5f42ff35710ad9089769100525f49acc7c4e51951c7468f67b0a621b0968a3cf5b3572ec4d683545fad5aaf5338003a84156d1b590ff
-MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
+MISC metadata.xml 1303 BLAKE2B 0efb03056bdd6b69e5a34feda715557fa94ae797ece1ac650d7ed3719a439069c9fcaf8308fb893048021dbf9b0691ea01096f7219fa5b9367cbb16c261c3372 SHA512 9eb0041d9336fb9778532e4947f37af4ec4272c5fbd24dd0cf26c8779e2e609a7198f107b2538b2e6c2b20cf29e2c648a59275725c00cad8ef550ab9bcab355b
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index e13edf898c21..3d7f583e4e0c 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest
index 760e0e591464..e0b5be9a2306 100644
--- a/net-mail/onionrouter/Manifest
+++ b/net-mail/onionrouter/Manifest
@@ -2,4 +2,4 @@ AUX onionrouter.service 462 BLAKE2B 83f048d1111167fd99ff2a3bfd791ac8435c01f9a262
 DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15
 EBUILD onionrouter-0.6.1.ebuild 1162 BLAKE2B 14195482f1a67442979a5cc7daa6f513b3a3deb2a3801d6664f464793b28a04f64f991cfde7fe2405fd28e484f81814fb0ed742070028cf61e4a4f3a74287a6e SHA512 01b96089281280ef29c27f0a40d52ccb6f07dc707741e0b041b50533a3f636254bf6ba04e2b62f7404d9c2ab88377b3f428cb587ffd40bb0a783ec8af5534cab
 EBUILD onionrouter-9999.ebuild 1162 BLAKE2B 14195482f1a67442979a5cc7daa6f513b3a3deb2a3801d6664f464793b28a04f64f991cfde7fe2405fd28e484f81814fb0ed742070028cf61e4a4f3a74287a6e SHA512 01b96089281280ef29c27f0a40d52ccb6f07dc707741e0b041b50533a3f636254bf6ba04e2b62f7404d9c2ab88377b3f428cb587ffd40bb0a783ec8af5534cab
-MISC metadata.xml 383 BLAKE2B cc80762b15d262a801d3086e5c9a486e2a0b74fa3a93027a7003b8ac955c8e11cff1936b2c547351a14b7581189d7b1e12c1ab02d7a54e584bf43cc961c78158 SHA512 6b0e60548de9a7aca0ce9207581d567a7cd7c761e75ca16f61288f66031e2b388320da7034af2b985dd585b0b110afbdb98f40b3d149c73bd3906f74cf5489a7
+MISC metadata.xml 384 BLAKE2B cc0cd420628df9badff886104cd30a8a4a249aae3e1bc1de0570fec33f58c799e666b9aa6667245fca89e34142b08165e03df62aedae88c938e4b2aec89ffba7 SHA512 984030a405735e43032ea9205ea5f0eaf6a0ef52d48c6b3b61ba1fa29883cb4b3f6393e18d80b19c999ee171737a42066451e26a65b7b62f4479d2a3c7bd3951
diff --git a/net-mail/onionrouter/metadata.xml b/net-mail/onionrouter/metadata.xml
index 9f241814ad72..c61aa1b129e3 100644
--- a/net-mail/onionrouter/metadata.xml
+++ b/net-mail/onionrouter/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>candrews@gentoo.org</email>
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
index ccee4c4bd5ef..1fb5d5ae5105 100644
--- a/net-mail/pflogsumm/Manifest
+++ b/net-mail/pflogsumm/Manifest
@@ -2,4 +2,4 @@ AUX pflogsumm-bdat.patch 691 BLAKE2B d7d9fef9d668a4f58387ada96505c9174cd1ee01378
 DIST pflogsumm-1.1.5.tar.gz 47130 BLAKE2B ef28092aeee7bdd478c697c58b4e8cc085f47fcd1b59713a3ed1288a646881809177edd5c1711c3dc0e19299dcf2c0d3f7f7eb9623011aa3a1995c8eae4c4f47 SHA512 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
 EBUILD pflogsumm-1.1.5-r1.ebuild 511 BLAKE2B 19ee84aa53d8b9f2d2d596a1741293b84bb9d60fe5b0c650c3b1387f84f2e274fcaeb0cf1e076072a1577dc19fb996e1c34acc32f42b245f310ef5e98c5a15bc SHA512 f6444670556e7594bec12f495d368cb05611c28cac7ebf04e719581e4b99126e647be8e012115c5a2460238ddc14bb424f1b966dc178b1adec57edb52a10a2c8
 EBUILD pflogsumm-1.1.5-r2.ebuild 567 BLAKE2B e539f6d099d30ec81af21f7cab0241dd05b3c45a581d5f0953c82a36e2572230e175fc83b94b756d9e5dfd4dee06f75a5a57653a7882c96d49efecd22432d9c4 SHA512 df0a51b45062c05b067d0215e46002e17483e5c719c7996c9223a637d80cf0044b113ea4443a178e8f587acdb26ea6e07e1a97ee383cafc0d7e2de029bd5ae24
-MISC metadata.xml 409 BLAKE2B afb1dccf077ef8a65f22ca59276ec5f33bd6dc4e2916b80615b508cfd6cc9c55f7a9720ec9dda5fcdaf805600af4d05d2b997a454865e2e22f115f42fcccc5e2 SHA512 fb0dbbe2d864a9a8afc0598ac495d26f8ea2dd29dc0939e6ec4fbcee4ddf1b2bda231a8661f8f2788d3832c51d6415de62957d8d33c8d876f81a35a2b139c4b7
+MISC metadata.xml 410 BLAKE2B f833751f407d57c96e4e2f2dd05520c55037ba7874e753750df8a22d4c18a5edaf0925982b2b04c4e7e541bd691c6d7798bef0079fe980b35a9f71f5e2405793 SHA512 cf4f51a91d42ff06b0d628c44ee66463a1903de18e749d690a722e2fe77d95d83ba709595adc20e27976de502c5a5e232065d394eb41c03f9d39a8291a874841
diff --git a/net-mail/pflogsumm/metadata.xml b/net-mail/pflogsumm/metadata.xml
index 051239844a94..63821063206c 100644
--- a/net-mail/pflogsumm/metadata.xml
+++ b/net-mail/pflogsumm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
     <email>hydrapolic@gmail.com</email>
diff --git a/net-mail/pfqueue/Manifest b/net-mail/pfqueue/Manifest
index 59781c45d6f9..1991fe1102f0 100644
--- a/net-mail/pfqueue/Manifest
+++ b/net-mail/pfqueue/Manifest
@@ -1,4 +1,4 @@
 AUX pfqueue-0.5.6-tinfo.patch 249 BLAKE2B 6228a39564ab9e4ace005b3d5239b2fa54f63c1d5945c302ba11ecdff1d0cb153465125be1ca512cab269e162ff783d61134d4d599df4ea87f9c9803698fe3ee SHA512 ac0f652a16ee74250e92f29280a178bd7794ac7a9f4192b9558482d078cbdc8b4b75d668ac63ff8bd8c0f4bfd191d32e3d9a2af0c3dc420d191c8c79bde4bd2f
 DIST pfqueue-0.5.6.tar.gz 298870 BLAKE2B cee47396f4bad72d8a54716de3fcdc5b41fbef5ddabb88394144d743ba7fba52cc39c5930eec72ece01ceb62a343f0f742ac19eca4ec4e7a11feb8d95f9a3e95 SHA512 1bb622bba6d72ff98ee862d794854debcebabeff24cb6f06cecb06513f453cbb09f0cb8e5fa4c26bfde03aadbc5e803692279427021ccda10749a6c5a326bfb9
 EBUILD pfqueue-0.5.6-r1.ebuild 692 BLAKE2B a1a55ffe676f9507062f8b00a37e5a2e2b3f13b5a4257f1267876e353b2ea81273f041b07a0b12f8da75725acf2cd049828052def8bfde8ee8a5ea48166b85eb SHA512 1cc5be1565f7f7111b32da4d6d8fb4b3cee895495d021a7d90ca649c35ac627bb5e39793228c2d8c91b24e99583f89f3c3ad47995d1b9d7ba509ec6d809163a9
-MISC metadata.xml 244 BLAKE2B d83ecdf559556aedd43daa105a8c83c04d6e44751a9538f9b4a1516545887e7af141a7f7ce54587fddcc97a14a81ee7ce391a5bdeeb258054c7198e6f5e8599b SHA512 eee38e9f5671506c5e9377595bbbd67389cf3fb004feb0d42ee2147062260c90447ed18e03d2547df5587e45a733b2e75ca931cb5fa644c6c109dcb15f5f1a05
+MISC metadata.xml 245 BLAKE2B 2dc7d8a9c4b868186ff4fe1d67196451ef3ae010f89059880b83210362b1bf65399758631d6153fe9ecbc92593c42f85a102b4aa091287243fea724c534949c7 SHA512 e9f298790555653abfd3fdc9f5099acc5d3adcef9a94113956b9bb6c446af1da430f80ece450b68b20377bc4d0f83a5c75968e19eaeed1e0bdc2bf2af4e61c69
diff --git a/net-mail/pfqueue/metadata.xml b/net-mail/pfqueue/metadata.xml
index bf0d9cdf1276..494d33a68cd7 100644
--- a/net-mail/pfqueue/metadata.xml
+++ b/net-mail/pfqueue/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/pop-before-smtp/Manifest b/net-mail/pop-before-smtp/Manifest
index 39ebe6cf6667..7f1d46d89d41 100644
--- a/net-mail/pop-before-smtp/Manifest
+++ b/net-mail/pop-before-smtp/Manifest
@@ -1,4 +1,4 @@
 AUX pop-before-smtp.init 613 BLAKE2B 3afc3d71e3c21b8f9d6d9066883f90b0b0f2bd0a9bf3934e77a86370872a33cd38ecf3eb0c424e6d7aa81ceaa6cea15348537f7f74da36d50bd0e237dbfcac16 SHA512 5018ab8d4acf4bd58c635f029c32ee691462836da37b75afd7e26873b0f0e94969a18cdbd77e69aeb7aa32e5ab08b2c3b644939799e3601367ab0380423516ca
 DIST pop-before-smtp-1.42.tar.gz 40612 BLAKE2B 44e43be5abf9f1b98ae553f3f782747e5b26a54d03fcaef33b60d05fc757439c6b7c7e00fa972a76bfe0fa4dc7e86751b7f3edd946c209b1fd00a8502ceb22b2 SHA512 54556509dcd51025519deb1253e0860c23e2862061992781c79606af00d6db493a5b3b1ca505f609f6a157918b19e959568dc138cc926f8886bec54cf9b404ea
 EBUILD pop-before-smtp-1.42.ebuild 961 BLAKE2B b0133c345804af24231d6b4710d9264d0fa4a32e08e6ea3c99e25d9e7b8b558a2de4891d1b62e0c7502dc99c7df321fa3b446fdcf2ec494ca13f93d83de90478 SHA512 f9d190c89996365d5344c5c8ddda5d8af266db0805b47e261c96d2e4025a5e36093f5babcd87ba576f673f66a09f8d24284a7594833d4f716242794ea4973b60
-MISC metadata.xml 245 BLAKE2B 3d5de245eda58e732472f2263b8c5fc684e0e08a02785faab3a1000330ba68645ba430d94078b6389416f9c68762281cdc13df617f5ad6f0e6a76723d321834c SHA512 c1ef9f4751b9cc88c5a98477014b5ebb726572a0efc21dfd3e03c9c7d7b895adcc10e4f07025d45e92e86122be408de589128248c866fe26bd8b458810aa0d94
+MISC metadata.xml 246 BLAKE2B d46cd9b07c3d950b77fd9bf1b00a97dcdf812db02c7cd39fc7f003e4c47496a656e224b386578097c3688887d6e57f08f473dbfb80acb6a2c3f3b848870f8fd6 SHA512 e0a5d6324171b9ff8045575b62c0315e15e645a2df8a3d4f704c8e06a03d49ee40e213b40138eabeae7def0204e16e5917cd4bafa937c0a857283f08e0c679b2
diff --git a/net-mail/pop-before-smtp/metadata.xml b/net-mail/pop-before-smtp/metadata.xml
index 78b45715fff0..c096a0f8d37b 100644
--- a/net-mail/pop-before-smtp/metadata.xml
+++ b/net-mail/pop-before-smtp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/pop2imap/Manifest b/net-mail/pop2imap/Manifest
index 941663520753..55a92700b08c 100644
--- a/net-mail/pop2imap/Manifest
+++ b/net-mail/pop2imap/Manifest
@@ -1,3 +1,3 @@
 DIST pop2imap-1.21.tgz 10920 BLAKE2B 6f35fc081aa2b27854aaeec191d9d084fbe063e647fc2042ff8a0670dd4420442e1d2da747b6c5ea05481c25751f8f5f774b0afef4d9007e09a15c879585a7e2 SHA512 8f49ce6ee0dbb71699ec83415f3002f752975eaa39c70ccdc0f2e62ab2791a29d483e1159c2ef035c411fe5e351b9c99845ba2451e95fd3331c3bfb03b8a061e
 EBUILD pop2imap-1.21.ebuild 579 BLAKE2B 0234fd9a6480cbc4ae130911afa7ffeb33c9ca89d45e0fa2432b0a4364e4552de45927d008b933ce015d8e3db29f4271c08ee18940c342c05f083465a856432b SHA512 34e9ab2bdeb9db3543dfb650e991d8efd4bd90112308e596a8180a2910e34da05bfe8e7deb4087bffaab118440a40380ba17e758b6c76260c5c8fc2be409015e
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/pop2imap/metadata.xml b/net-mail/pop2imap/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/net-mail/pop2imap/metadata.xml
+++ b/net-mail/pop2imap/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index c2f729657a85..8d7b76cec6a0 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -3,4 +3,4 @@ DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b7
 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
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/popa3d/metadata.xml b/net-mail/popa3d/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/net-mail/popa3d/metadata.xml
+++ b/net-mail/popa3d/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index c0ea84db7b3f..f17c94052b0e 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -3,4 +3,4 @@ DIST poppassd-ceti-1.8.7.tar.xz 71400 BLAKE2B ca26f7298a8f679c595a9cd66622f1e8dd
 DIST poppassd-ceti-1.8.9.tar.gz 15465 BLAKE2B 22f6b521d83c4b7c4a8842cde22710c17dda26f9cbfb39d020de05b14c045a1606fcebf51557c2e38c932e009554c5f0d1f770d5cfbf1666f81eb03a342c25f4 SHA512 cc8953aaed8cd6d2633d1c2040e364770598eb71d563a29fd3f4798730654d002ba720babab0596cc336ea8aff403064e17e8b17c3df657e5c840db2230a2077
 EBUILD poppassd_ceti-1.8.7.ebuild 1678 BLAKE2B bb77369d9c5ed2ec923a00c5813a16d6c55f92e429d16011d20398ee95f6999137ad3e9f4b43f72d927ec85faf3dcb58cef203e9d4cc4f5f63bc1ba6b4ca788a SHA512 93fc50a9205e0a543e2d9d729b6450a3b736079a83061fd912e491c2d5dd1149658ec2d8d4349ccea6f183f40837b143a724649d8e2a861695126895dc96c521
 EBUILD poppassd_ceti-1.8.9.ebuild 1869 BLAKE2B 9e3ef48fac5cd0bac294714476f3b6d404e6a38bad26adf5662a0415eada52e0d2c8674077683697045021a81c4d7128133e559cb815111e8d1d11cbcd733e65 SHA512 ca02d9289a12cdeab650147fdbafdaccaa814489bc488a909230b67a5ea44a60b02fd5389e072d29ea0b95230a2038746271c02bb318e87a7c7b1368dbf88f59
-MISC metadata.xml 944 BLAKE2B e9490a1a30ee8de8efaedd6f92cda9f367ba2c80203293f3bcf34771cf30feda958adcc46af438f67cc53743a51561b3ebdc563a3525f736342fbfd749269451 SHA512 d3f2b2922e7aefbc3f94ee3e90a7bd44ef475bdb1aced93f51c15c331eb0ee3357605a9aa5b65827e92d90d2a14e9ef12961a8c023095b7a8b765e177d72d924
+MISC metadata.xml 945 BLAKE2B 908fc2f18052b0da8ef0e74d40d5886b9d66e6ff8907987a7533337507f36b835fb76580f9fca641bc50cb297629cf4a64553a7f9393e3dc7b4fdbdd9f35adef SHA512 40388f7a33c9879d5666920b38e665ed5a329dca4f7d042aceb8faf9b2ff43cf3b4e6d414f7233c6ca4ecc237cde2e98065325ea11ba55cd7187bacae2233a5d
diff --git a/net-mail/poppassd_ceti/metadata.xml b/net-mail/poppassd_ceti/metadata.xml
index 0659c26f1767..ee8eff2e28e0 100644
--- a/net-mail/poppassd_ceti/metadata.xml
+++ b/net-mail/poppassd_ceti/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
     <email>mmogilvi+gnto@zoho.com</email>
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index ceac90fd5fbe..d953d2b384a4 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -7,4 +7,4 @@ DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564
 DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d SHA512 194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
 EBUILD postfix-logwatch-1.40.03-r4.ebuild 1160 BLAKE2B 9c269a1abd9c561a8f514ac99e991d57344286705b91cbfa53b464a4267e024442ab324b4973c5962e27bec8da601feb6bf550969bae4fb030d05651642a0e6e SHA512 5c9d736880a06bd66c2ea75827d75610b826392e95573c7b75a654cd613afada7aadcc6bcfa8d0cfe365ade3c5ae7e9944c6c7bb304c4bce657a897220336cfe
 EBUILD postfix-logwatch-1.40.04.ebuild 796 BLAKE2B cc8aab5fd6c69efb2c31d14559a48539fcae3cede5659f53f79001d554d55c955b39993fe4dfd69aea7e8c0842e53687a7a285825282a6ae871d05c22cf34b47 SHA512 ea8dbfd64225f7aed6847b46641aff571ed171237845c693b9976d554482043877260f06e8954d7437f6648dbaa0d487ba024f44559536d2fcd17212121816bf
-MISC metadata.xml 218 BLAKE2B b55d5b84a56be6911406973def7dcc385581e50dbcd1c4a7cad56fb8e5e6ec2c7ddc153d0fead807dc1cc8336c32a3ad2e414ebed9c4dd295050acd456a6885d SHA512 e143c766598413b2b305475039473345bf7e007d6cb4934dd205384c0a3df9451e780a4294c56126103a883bb904d9a02e06c082176b19a4e388020438d71bcd
+MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
diff --git a/net-mail/postfix-logwatch/metadata.xml b/net-mail/postfix-logwatch/metadata.xml
index a0128bcd9ef0..c6418674131d 100644
--- a/net-mail/postfix-logwatch/metadata.xml
+++ b/net-mail/postfix-logwatch/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
diff --git a/net-mail/postorius/Manifest b/net-mail/postorius/Manifest
index 5a83c0b00bfb..0406b9f51a67 100644
--- a/net-mail/postorius/Manifest
+++ b/net-mail/postorius/Manifest
@@ -1,3 +1,3 @@
 DIST postorius-1.3.3.tar.gz 2704738 BLAKE2B 0ae5a7b3ace1ad7f64eae53156592d0c76a09e358d08edfe1b506717e87df67c669bfab356c203e28c03006f46461a67b4c7222e0e305100e15511a93e3e6a59 SHA512 31d6d6d0dbbe8a57251c81cf8f7d8b80d17dd4aab9f31be684fef26637a4ba81a196d4ab63e7389bd4173a60778a00c83ee440c24f83a1f60b094ccab8cf345a
 EBUILD postorius-1.3.3.ebuild 806 BLAKE2B 4708e29250342e17c97568fcc7985a6d69afcdbd548c40f57b1752ebc11801865bfe4e39e3670536484426f90c3fc76c05c21059b13b7eb81a2f8f9d95c04503 SHA512 bad6e50fa8546faab701512f0663a48663b635dd5b7e4a35338ed67489402e38aaa05eb6a1de231874dd4ac34014c8724b28825148712f77fed1c3d065d92a51
-MISC metadata.xml 288 BLAKE2B ccd36623ab7e8680c09c1ceb301dff81486fe5518f1876f954fb6a7d1dc2c0895f2cacc9c03dfb8589c30ccf6f72709aa0f6b896f7e25484776d5516826d08cd SHA512 aff84107e735cf6358a9ed57600b2016c605e50f9e83c8af38fcc193bb911e9b89fc281da2ce06a9e1268d1500448c164e24d6aa5991a3b4e165fd393c1cd1f8
+MISC metadata.xml 289 BLAKE2B e6f2593d86670e4f99b9a209d0601ad87f838e1489608e6b99835c8ed2a463597ba6328579d9ed48fc2284988b6d5308ea86d5e80070df406421ca38e91e5bff SHA512 b3a039cd32080f3b2dd26c0702ec3ca6f2dda49ad5abf3fcd8c11ad9a7cc5c8786923cb5f9b25349ff309b08679ed6b5c135804cc1f971c7624a96a6fc367cd9
diff --git a/net-mail/postorius/metadata.xml b/net-mail/postorius/metadata.xml
index 557e7cfbec08..f092b6905348 100644
--- a/net-mail/postorius/metadata.xml
+++ b/net-mail/postorius/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
diff --git a/net-mail/qlogtools/Manifest b/net-mail/qlogtools/Manifest
index 416820beb691..21aed95d5ab8 100644
--- a/net-mail/qlogtools/Manifest
+++ b/net-mail/qlogtools/Manifest
@@ -1,4 +1,4 @@
 AUX qlogtools-3.1-errno.patch 348 BLAKE2B 4a2e1e525a071792f934a7640b0199c7292e08a2c5964f6268c7e5bab945c09d84f09371860311288fb48f7baa24f3d9ad93d57d6e2109a0856e60ef1c0723c3 SHA512 5f9e49aba6e01d5712ceadd8f2a0e3e03bdb2d1cb0c6cc4de7e6b54ef99aff0daa14a93fbeb0557ca9fdb6b75edaf4d0b24ad2b41971fc4f330435ab74ed48f8
 DIST qlogtools-3.1.tar.gz 20868 BLAKE2B bb248aef33e8f8d083956e621437e530c0a7adfe95a8c87503ca7813d756238b54873044777c9d4f362c3c75af24f58c67b8e1fca82724ea8843986fddd4d457 SHA512 aa080114d543d70879b091e3c1d4ddf7a3c1eaf0848c7215fb291e0dac49070833917f66bf02012bcfb1c5df63dadd0ab8c1c1642e5e1c4dd3c34c88bf2751e7
 EBUILD qlogtools-3.1-r1.ebuild 863 BLAKE2B c8a065b30d3fc69b74535a49dc15db05e983d90d891f878edc6ea080cdfaf51d64d34fd8a3c79046c2201da644ae27c4f6da760f611f12e8df9963037fd55620 SHA512 37ff6daf780a265f623ba2beae7b36c7956675e6beaf4321228f61393c8e17c8bbb9ae16abb9a8a05e89d72123fb8b0dec45b35c44ac64a4739e398f55cdbc14
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
+MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/qlogtools/metadata.xml b/net-mail/qlogtools/metadata.xml
index a4e0d354f696..a551e17802d7 100644
--- a/net-mail/qlogtools/metadata.xml
+++ b/net-mail/qlogtools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index 39a7faf73161..412d715febed 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -3,4 +3,4 @@ DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe
 DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
 EBUILD qmail-autoresponder-0.97-r3.ebuild 1407 BLAKE2B 815dde9e572e6307439219800a4f2da49bd8258ae3ba1360866043b3fa0d17efead2c7e6d43d11551b23e2342478634a61173acbccc24ce92f679f6d10710c9f SHA512 915e2bfe77f87b97eb74325f1e3dccbf012bece429dfaed9a83e0285111628e4a80c2a2a2a364d4756b6e7d66b41d69693665191a06f87e7784a32fec754f352
 EBUILD qmail-autoresponder-2.0.ebuild 1017 BLAKE2B 24ae7c5046738aea9bc4064d17fc6afe52c352e6273978d61b9b3950a92a206499c62c68e0744bcf6c98f620532e1a22f7c1a9c05c1270f9ce19870fb0825f2f SHA512 9bf3f1a7d173af62eb4777e33087910ed695088066470fb88e021c6cd808411f35226129ee8984daaa6f155d0ced7c140b8e19b45b5d6bd6bf8dd2ad3544a384
-MISC metadata.xml 415 BLAKE2B ce1cf3c127835055f2555ab5488f2fb9bf9858711fb6e5be022ee924c53876f3baa97c9a71c3f5993ca71ffd9a6caa5c0a5a804a0aa326eaf3293363dfc657c4 SHA512 d0735db9241b2f5c46d4a2f8e1e2d0b2afe8baa94ec633e474a83a61f894146e1727799f9e59d6efb986c207c4cb6893a130424497db132b89ea2ea1a2ebfeef
+MISC metadata.xml 416 BLAKE2B 502d2451318fa2dd457011e29cd1ebc52e9081fc280eb15bba4e2551b82f44ada3c59dcad6963f063c6a6c7dbf997c0e6e5478049e3b5bf7582c8245f355fe1e SHA512 3dfb37a7392b7fd7dff681905fdaeb972b296a75574a27b62aa05e1de0d761013633dcc48f914405dfc45ec0d9d31f5c755ad3181a9e0c82c13340b3c0177543
diff --git a/net-mail/qmail-autoresponder/metadata.xml b/net-mail/qmail-autoresponder/metadata.xml
index 3edb45ea8543..621f567471e8 100644
--- a/net-mail/qmail-autoresponder/metadata.xml
+++ b/net-mail/qmail-autoresponder/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 <longdescription lang="en">
diff --git a/net-mail/qmail-notify/Manifest b/net-mail/qmail-notify/Manifest
index 1cb32b4a29f3..1a3fc6eb9fc7 100644
--- a/net-mail/qmail-notify/Manifest
+++ b/net-mail/qmail-notify/Manifest
@@ -1,4 +1,4 @@
 AUX qmail-notify.cron 80 BLAKE2B a580741c9dbba0a2bc00cf55ab83d432df569bc961ac0d463bd5c5f0008ee7eccc386817750041343c9a2da5b428ad15b059234595feaf31ba199d8e143cc199 SHA512 6242a426a601b9461ca1a79b14d2f850b963604de8291779001a2e18aeead5b7315664808968640de62b5615688a246451ba67f6bf05cc002d694d0c73836c23
 DIST qmail-notify-0.93.tar.gz 37923 BLAKE2B 17cc1c436d47d759593d564e23ccfb4ee1920eed8ba2038a3e68add3a0b64f717569ef9fed25b361e6038581a6a6d269f1cfb869acf593d2fa70159db61bc492 SHA512 b39ba70360fff69c40fa9421e94f6bba8b8f65aa85fa8e86580628de25f3d9cff26484909a71e50fd8ae8cd5198c194a43d00c2776132bfedac9c546a2628e4f
 EBUILD qmail-notify-0.93-r2.ebuild 1018 BLAKE2B 9a1d219cc5667211bd82116c359152d9048c125311dbb5ffdb723ab99904f0f6a98519143d43bb9f56a80d3d53786924ea0e1e13844a6045739ee170c5512bac SHA512 9be2604be01da08790ff36b63da07df39b74d088517dab0f76ed34c952fb08781c87d616e091e9df95442060d4586f4d762ee758e786501a9dce4e8dce39dd35
-MISC metadata.xml 390 BLAKE2B 75bf99860251c4980acf5cc1173b76236f3b55b2115872d6cc6f4fa2ea0c81bc1e98506458c997bdb0026addb654916c8e47e73530aadd14617fb5973711e8bd SHA512 493f0f292d6e1b68d255a6eaa753759b135e4bbe30b21b2b42056597054cf27443e8bd85ecdfa9b72901b5d8ca74268ca067b345cbc6d86f1b93a492267850c0
+MISC metadata.xml 391 BLAKE2B d0c3525b50fc3f2eab53fc201ff11875977781206bb2444319ac7204af159a34a484db33f83f68022bbf4e348baba2b6c4349584d6e439c566d3fd147b192477 SHA512 8a46c573abc2ec2a09d41ecd181c3639ccf21592d7951cc061e09332043b641b663519d50edb11246a06ed0bea60146d207afb48c2d7998bcce60139f7b26883
diff --git a/net-mail/qmail-notify/metadata.xml b/net-mail/qmail-notify/metadata.xml
index dbebda04b192..c74515d20dbe 100644
--- a/net-mail/qmail-notify/metadata.xml
+++ b/net-mail/qmail-notify/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 2bd3c22aab28..221885699d68 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -5,4 +5,4 @@ DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d6
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
 EBUILD qmailadmin-1.2.15-r2.ebuild 2269 BLAKE2B 62cfc635fdb1a4c31c4f6e6ccd5decd086bffaf40b202e08fd53f79c9400bd274349572d676383fddc53dda2257bd9666cd7236c82624f326ced18392343376f SHA512 5143af2fc638d996bd6a01baaaa925eea66eca47d1071887f0a8735be02e72847dff8ace49a4c1e95398073e1059e7cf7359480d841a81f15b9a0460eea887bb
 EBUILD qmailadmin-1.2.16-r1.ebuild 2696 BLAKE2B b0dd1f5fc396d4104c74b28ac929c05c2a7b9eb2258a9ab7e9d9c0237e00c1f3adc6f8a3c75509c6b2f11b20156e24b4b7b150f851a0eb3f362205d90c352d3e SHA512 7250ee0d3107326d121ef9ca33718293395388b468428b97528ed94b832f3fafb849ace5d680b45564c3b35717e75d6d6f7a490568a62e6e6e80d1e30e150b34
-MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
+MISC metadata.xml 384 BLAKE2B 1f42fb1eeff567ee7271eab2292430a5661709900d3e01db3186eb5d0fd4960f1cb7453d24e5d93ddce2fe1d5fe18c3633ff1ce236394c9f3492d21dfee229e3 SHA512 5e1367d6fae06f20d8a113eaf9640494dbbc2aa23d6509e6e6bdde371fc6d5124035412145cc81d34673b9b95a17af979ce2be7441de87cd0980c443f60536e0
diff --git a/net-mail/qmailadmin/metadata.xml b/net-mail/qmailadmin/metadata.xml
index 3afc126e1d40..730c94247bd2 100644
--- a/net-mail/qmailadmin/metadata.xml
+++ b/net-mail/qmailadmin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmailanalog/Manifest b/net-mail/qmailanalog/Manifest
index 1d26f4af6d41..7a949fc9e5ac 100644
--- a/net-mail/qmailanalog/Manifest
+++ b/net-mail/qmailanalog/Manifest
@@ -2,4 +2,4 @@ AUX 0.70-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa5
 AUX tai64nfrac.c 1461 BLAKE2B bf9c933a5916c578dfbf9fa3c9a02de188b40e376f545a9706fecaee14fc4270af90f1d1fa7f6b7035b23fb4cf0abf8cb701f17469c7bd95bd232a81ea1d5d93 SHA512 0febee72c3a0328f651134105e6c9c7db1f2822458fa873694cad9807847a9a1bfb7d91a3f7a7ecbb99564515d001e10f2829f70b9a8e768d26764c0ab408be4
 DIST qmailanalog-0.70.tar.gz 28416 BLAKE2B 771a9d9cad36f770c1b9032808a5252e8cada6ebed311272e5d2cf7a34449ec9e59c9c032a1c165103535a6eeca03331f56d8a484c171308c9fee49f8b4b2f12 SHA512 0a4991a9ac13b64494b15a6ad42df1bee273a7a3c5ead923450d5516d747989e80e3a0f88e29203dce24dc833cc3bb46d5935633f67bed547f27ac22ad866f3d
 EBUILD qmailanalog-0.70-r1.ebuild 1303 BLAKE2B d0dd17109e237dea41303329eb6400c5a50752cbbcf710718d57f9860aecbac5542f3461bd32cb72f6bea808adf92d984137d42619060d61c0f6c5ffc7e45a76 SHA512 2530613d2e8bba33d29f2b681718b089dc16127a7f2f9cf61659c0c3bf5eb0d66a578b73fa23635bf78166f56d35455ddba8716eac1ec70c455250d09aaca893
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
+MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/qmailanalog/metadata.xml b/net-mail/qmailanalog/metadata.xml
index a4e0d354f696..a551e17802d7 100644
--- a/net-mail/qmailanalog/metadata.xml
+++ b/net-mail/qmailanalog/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index 4c8948d320cd..a4e8fb9e7edf 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,3 +1,3 @@
 DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
 EBUILD qmhandle-1.3.2.ebuild 662 BLAKE2B 44ac2ff417b76b80d8f2fbb218677fed2e64c807b43d46f4211e70a7a375dfdbfaab105879e8dd95a61cd9e0ffb89f88c0043b51370daf0f40a969baf0631fca SHA512 400db56aaa24e7c20d0c139da21b3defd0fb212b3e11fa23fe32a5b8fbd93877cd8a164aaec81396d834e97a701f7f10da649b8ca61d56d332050ce7944ee558
-MISC metadata.xml 651 BLAKE2B 9ccf8ab79b762d85da5c18ef6797e024ca9b9d83a4a83a8b2938073e59fa0bf47ec785415eac661c043e0b52de656e6d53107f445789d3d6b029120401180c3b SHA512 0beb930e70f222cbfd47d27c407fb51c1043f84cc5937c3082e55fe512208e3d2ae774255d41e2e43284e574fec994c84cfdafe46c017730a400d0247a50fafb
+MISC metadata.xml 652 BLAKE2B 476d99eff6ae4ff6ed7c0d1939f9ff1139a0d6bde0feaac65a8d65237ceba49ef16a11285ffc791838a4e7afe83bef8719f7f85aa0c662246fc28ef46f545194 SHA512 358179923331687871492057981832aba4063dd85c81de119e53d690c5f6b058c2db81badffd4ab8b3589def5f10d45e8944910274f0a4a119f2b7ace6aff039
diff --git a/net-mail/qmhandle/metadata.xml b/net-mail/qmhandle/metadata.xml
index f9e8bc396a16..0f30eb815be4 100644
--- a/net-mail/qmhandle/metadata.xml
+++ b/net-mail/qmhandle/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmrtg/Manifest b/net-mail/qmrtg/Manifest
index dff7fec54a42..3b91940d4a95 100644
--- a/net-mail/qmrtg/Manifest
+++ b/net-mail/qmrtg/Manifest
@@ -3,4 +3,4 @@ AUX qmrtg-2.1-TAI_STR_LEN.patch 215 BLAKE2B 9400a5219c9b156207aa573ae8e278b36cd1
 AUX qmrtg.conf.sample.patch 544 BLAKE2B 65797ad17d5939f368bc9cb5070a2bbcef9a4197fc64cb3afeb2670082026efdceb46fa29069022ad11110ff75caeeddd41484c83c5651c56a688b4b86d3d015 SHA512 c667fb5be05b2356782f2fe96d8b3eef1a3bdc6a8b74dfe6254f5718400cd6527baf6cee1badd0e96db26d2f5d2f160e1b47cbfb41baffcb8c79d959333d5cd7
 DIST qmrtg-2.1.tar.gz 97255 BLAKE2B f01904f19418a9a008629b743a47513e29243c9e90feb9960be60c3db2b29b6a8f48f745b1e72510f18655f59493d4e3b36c239271632e586e61bd65440a51cb SHA512 22d7ed55d22af74a62f3974f3d55edbdd08aab2db256cb0866dae566ec7f58eb5ae6ffeaa77ba571cf06eb6cf55a62720534408cb80bf95cecdbe587024259fb
 EBUILD qmrtg-2.1-r2.ebuild 824 BLAKE2B 8fc060cf84403398798ee69103983463961bdf83c454b0b28222126ebd1690e625a64e186d252326143a9a97cd19b300f4aed66e4c55c97e7cf0000914d3ae74 SHA512 07de8e1f38827ded29b9bb2315985ec8d69934b40279190854c5034289075bade3e69cb11318ddcf8251bfc418ae1d5896e37ae92320db052437b6934f4ac5bd
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-mail/qmrtg/metadata.xml b/net-mail/qmrtg/metadata.xml
index 74c2baebb4ec..dce3f3be66c0 100644
--- a/net-mail/qmrtg/metadata.xml
+++ b/net-mail/qmrtg/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>netmon@gentoo.org</email>
diff --git a/net-mail/qprint/Manifest b/net-mail/qprint/Manifest
index e1135f625dab..044fb98a6825 100644
--- a/net-mail/qprint/Manifest
+++ b/net-mail/qprint/Manifest
@@ -1,3 +1,3 @@
 DIST qprint-1.1.tar.gz 358575 BLAKE2B 6c2a756b3e245584ed4ff81a072a63f29ee14cca5a61f7d376b8794a91c69e604fb33bbde310e870cc712d7fbeb2758eb5e649a7b153bf29807cbd891e3f4c1a SHA512 4748f52cc8cabf72a2685fba93ee9957a9a36658a8b0c9fc1994e1779aad59a94b942ed3dd2501c6a35636e7c75e24d512a5de5f95b0ba66ae40acee8bbe1cca
 EBUILD qprint-1.1.ebuild 513 BLAKE2B 2941c85ad80b81b12c7f308495842268f84e35c0aee4ad7694576683953b764297f1ffba349541740d86fa11cbcbcb1119bc5f9bee868262d3e346b2d4d0ceca SHA512 985ba623870ffce67b0b521ec9b18be5fd33dd85e797545a3683831e1046c6b151189535cf0c9a40f9ccafb6f95b51083e0dd5636385731c0e12cde4d1a8fcac
-MISC metadata.xml 331 BLAKE2B 697260c308d9dff8697138f4fe14d1bbecee1c15b84f6f67705abc33a7e45d7ea9888853267b7ab5d049e2d2825ac97357dcbdf98ca089d8597053a15068cb5e SHA512 3ea002ab743be23bacd2153c652c8fdb86d75c11c4b79aba100eeb4de8fe5bf2fbea33a52f03651420064a8db6ae7dc2d8f251b9722a080de5c4ed97a2304166
+MISC metadata.xml 332 BLAKE2B f5662fbf1a2b769f5c39f685fd64111f327ad8089e6a80fc172f86dbaa773b4e17efa056ac7a333933f48db55995b3b5cda30e0b1576e4be8e218d331b596055 SHA512 0b27d11ec66c33c8311f67dd53e09d89a60f95fa46350299b1ba7498d5d8900cb63d509a06be4bc87aa88248bef716b0c4b3bda59aa863178e628f4e8f139fd9
diff --git a/net-mail/qprint/metadata.xml b/net-mail/qprint/metadata.xml
index f6c6bf01881a..0cfab1830104 100644
--- a/net-mail/qprint/metadata.xml
+++ b/net-mail/qprint/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 <longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription>
diff --git a/net-mail/qtools/Manifest b/net-mail/qtools/Manifest
index b3ade464f508..a4713fb56fcd 100644
--- a/net-mail/qtools/Manifest
+++ b/net-mail/qtools/Manifest
@@ -2,4 +2,4 @@ AUX qtools-0.56-errno.patch 291 BLAKE2B c204bc9a9c210b849f9a4978a7f19e94ecb9e469
 AUX qtools-0.56-head.patch 2117 BLAKE2B 2d0468547e2d67b65be1a8448c9b89f2e2a4ee307a79c47957f465d20671b947ef322af65ac94185cd39a9d98450d517d715c25f182eaab184286cda3d9685bc SHA512 0701bfa739cb163f4463b5ffb1a0242027400fd38e27e2533915f2698712177421f38d9d5b7a02caf1c23ade31bf02ce9236f18e522b688b6adc71af15b32a87
 DIST qtools-0.56.tar.gz 37748 BLAKE2B f4bb79259d2ceb99f21ec87dcc8dac6dca740a9bb1fb723f0393384996e51cdd0a56b92c066161dbcd75adf6d1e008041b5bfdf4abe7534279f504ed2c318111 SHA512 2016ca4f77fc370f6caac56f447325461018dff1f8a61fad305744578f0c26f0495c26d6cba6a8a9d5c86c6ef86635edd69705e9af88f70477a3f6ed121e6085
 EBUILD qtools-0.56.ebuild 1077 BLAKE2B a4f27058b6af1ca00843edd98eed37c5c4cc50d33d756b05e6d645d88c339cb281fafe911cc2929a291ae564fa3b2512acc301e3515f1b0a67217060d6cf6813 SHA512 d3ff25d6e253acbfdc631baf7b1497f5d4d579b8ff675282bd91c52465847bc8a63ed0aed408a1c4ba21ffe0bdee550e9d8c0f4f80f1b9f61e09fd62e0acf218
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
+MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/qtools/metadata.xml b/net-mail/qtools/metadata.xml
index a4e0d354f696..a551e17802d7 100644
--- a/net-mail/qtools/metadata.xml
+++ b/net-mail/qtools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index 1a44b382fbf4..79c77efbfc0c 100644
--- a/net-mail/queue-fix/Manifest
+++ b/net-mail/queue-fix/Manifest
@@ -3,4 +3,4 @@ AUX queue-fix-1.4-stdlib.patch 926 BLAKE2B 62e8a37e118d4fa523a2b1c8d0752c0f6d1d8
 DIST queue-fix-1.4.tar.gz 18486 BLAKE2B 3999632fb77955782f5bd5da4ee231d68faead75daef293b7cec9da086cb2a69bd8901efba5a3726c9f6047f6ae33060674f110dc479736ba7be8fe8c4253745 SHA512 b7e0ac070a409eff156b3803cc1bb78d1c800ae685d107b872bf5b022a8645d1ca55a5c3380f6bc82e99927df8dbf586b74af587e882938b9a7678b506c600e0
 DIST queue-fix-todo.patch 3056 BLAKE2B 92dae274431dac974e632bec94a1d0b84b652db197d4c80739a3f8da92e9f7f526b59659242456d99060859a35739e4ecfbd4e16d81892acea892de57218eb57 SHA512 78d79f1eaa8492fd9a14dc4a4d2adfaa8c0429a4faec32305f83ea1f16769b8d337fe732adc8cc0c33b909a19617862c9df999f2e938a6b845e15bc49ab5bfbe
 EBUILD queue-fix-1.4-r3.ebuild 981 BLAKE2B 497c46ea9735a8f25153c570a2db22bb7990360a24f493580c73bc7e08b5ce53de069762531ec81538438d06034358e6606889295f48eac7f07673e0c95d2299 SHA512 59b7e897542e68d36f157553889ea3146462e1e636f85fd549e244c57dbab413015aba58de3cb9a7ff567ee15790fff72a2c1161b57e5ede18edfb5e1e2d43d5
-MISC metadata.xml 523 BLAKE2B e5f67ee8e1333e03d8d205a54afa7cefcdf11f7c4f20cac94d68789fb4d1c90a73d2bdbdccb105cbb8b3737b091a6e4a96570ff0e089983375cd13d7e53b99cd SHA512 52c248a6450ebf03064f844d77465303e851444f2eccd2fab0867dc7d97bf003611c97f8a69634366644e2dbcdb2d8bd1396474ce7a5772e4cb3d8de35590685
+MISC metadata.xml 524 BLAKE2B a9862b274b749e41c99079e89fa0b086848669db6ed1aed7b622ad635a27c9ad71577ed9df2e1f59a8b1dd44d95d0c71a545e377e73d2605fbb1bebad5500022 SHA512 492b690da502744f831e77b071a9ca7ea050b021c70362ac5313f7db9cdf6ad7a2aa58a8bf82bd8b8d701ee9b2f16c188451a26b6b74fbfec2136a6252ebd5e0
diff --git a/net-mail/queue-fix/metadata.xml b/net-mail/queue-fix/metadata.xml
index 7442230ff386..7b1f8e1f303f 100644
--- a/net-mail/queue-fix/metadata.xml
+++ b/net-mail/queue-fix/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
   <email>robbat2@gentoo.org</email>
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index 6c68c04921e5..e3193e3f16c4 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
 EBUILD queue-repair-0.9.0-r2.ebuild 824 BLAKE2B 224c1dbdf6bd93f364e573259c3105c33927e379e40f4b2f76efa0c053a14f7abb5a3dd165e0f8535d970995b9ad366e1c819be034c9ba6b23bf941c98c2e3f9 SHA512 7e94dabc52ffd97a9dbb0eef7cd3460605bbe99ae04a45b190d2e6f909833faab9cf0b62012f4a1deb86403e3b4f5b02a9d9719e4f25117eac6585b772935a72
-MISC metadata.xml 490 BLAKE2B 8ec4d8e23a4956f5679a0b5291b03262a4474f3d0d97a5fc3286189f5623c75d859ce8103708dfe3ed1e4e3721165a764b121364f06121289aff047cd60db281 SHA512 bf57215deceddaa74691029e05f52940c0bd1d9262c865980c35786f487d08351e24287c50685ef85514a1e7cc7cb68d527259b369a34d6d06bf8fd4474285b1
+MISC metadata.xml 491 BLAKE2B 300d847c603b0e10d5ef42d4025ec329e3361af3f0bed904f8d5a5c561c44080b7605ef1666cec91a8bce97b0a9302e47a0f87c0bdad2390e2bec9568b08cd64 SHA512 e8ca4ed701628fd1b352e04f6b42432f8a85177603c46625b0b818d7ce378817ee096bb07f0a580420909d95ba7f87e6e383a24738f32346388139bb63cb035b
diff --git a/net-mail/queue-repair/metadata.xml b/net-mail/queue-repair/metadata.xml
index f966cd555df5..631f3eaa504d 100644
--- a/net-mail/queue-repair/metadata.xml
+++ b/net-mail/queue-repair/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
diff --git a/net-mail/randomsig/Manifest b/net-mail/randomsig/Manifest
index 770f59a961d8..4d72cf18737b 100644
--- a/net-mail/randomsig/Manifest
+++ b/net-mail/randomsig/Manifest
@@ -1,3 +1,3 @@
 DIST randomsig-v1.10.0.tar.gz 24910 BLAKE2B 13bfbf39cea7c7d348f5a91dd5700a2e91a93e574e6f1c12afd86d72c7868fd1a89123f52c897d9fff0b765e968980bee69927435a1b24f7f15e81b5f6a025ab SHA512 eb47bd017dee819e7b7151a47f5aca03e688e3aa9a4b9bf4882a4df51c6fcc1880e382b02d68d0c1d3a773b1179d5abb0782ec4d6a7649be226151e9e2579408
 EBUILD randomsig-1.10.0.ebuild 797 BLAKE2B f47fb72877d166aba12d501fdf547159eaa9f381661e0c40e648eab939fbc9a6d25d380982f6a50a55b441b51b9a578d27322c661c3c93b17e73f92159a05c65 SHA512 47c0bacb3be8ad2a5a2c53bf68b49218dc86f30b29773566fc403df23eed3f779c289687be06a1ae5fdcc441a2be0bec04decf6268c3bfd94dc5013509e2966d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/randomsig/metadata.xml b/net-mail/randomsig/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/randomsig/metadata.xml
+++ b/net-mail/randomsig/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/relay-ctrl/Manifest b/net-mail/relay-ctrl/Manifest
index 8da687d6ffb5..8379f558b51d 100644
--- a/net-mail/relay-ctrl/Manifest
+++ b/net-mail/relay-ctrl/Manifest
@@ -5,4 +5,4 @@ DIST relay-ctrl-3.2.tar.gz 23119 BLAKE2B 663a95e7ef075b1b1fa390ab4d144a83c02eec6
 EBUILD relay-ctrl-3.1.1-r2.ebuild 2094 BLAKE2B 30a58a02ba1c68387251dafd38eb942aaea325224ae97f6b50a70c8d4ebdab3f18720c634afcb9fb004ec2ed1453ae672a6fe300a7dd8d654435cbf30ad8be40 SHA512 cfc96e7dabc169c21d7bf64a00e51a8a8565d16f13e4a59cbadc5508243d9d514b4e8d5dffb232fd29392e5132cbed787e2d586eec460dd4359e7ab0da84bb92
 EBUILD relay-ctrl-3.1.1-r3.ebuild 2406 BLAKE2B 25e961bcc5222f55d3ac911b368386acb2f431e4664ef2f146bff25dede2ef06669210f3985e94bbbf6b40da42f9e6b17263ed42071133f843c23373cef5067d SHA512 3352b06bf68173814b66ba8ad147e36d4517d9a5e86d4d1e907eeacfa437cb4d4d9d1541d3aadc5d97d88fef3ec908f428a9b8df3b75ad39eca7f28ea6b20a2a
 EBUILD relay-ctrl-3.2.ebuild 2469 BLAKE2B 5e7e0b212988705c418bdd65b63ba7771a5ba4e04e8603ad437810f0f616e5b04487415877d3601d359569c7f5471226872002fa8ae956c72ad58e2ba99d8ff5 SHA512 0ed0929b47c0ac6f7eb75c94e409579120ee73a1bcb2904d5a45710b91a0ac853cd04b1c48cbc0da4221c7ea9e3de5f11f31a2a38590c2b767e370c26563105f
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
+MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/relay-ctrl/metadata.xml b/net-mail/relay-ctrl/metadata.xml
index a4e0d354f696..a551e17802d7 100644
--- a/net-mail/relay-ctrl/metadata.xml
+++ b/net-mail/relay-ctrl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
diff --git a/net-mail/renattach/Manifest b/net-mail/renattach/Manifest
index 4dd278b377a9..870efe37ecde 100644
--- a/net-mail/renattach/Manifest
+++ b/net-mail/renattach/Manifest
@@ -1,3 +1,3 @@
 DIST renattach-1.2.4.tar.gz 112566 BLAKE2B 566675e22b35857f3e328cc3f70805b5ce74e7c156f3bfd3aec7d1b217818763b3e12ea5c4c575e98962db2a23cfcf3672348aca321dcb754c907f59fca728eb SHA512 f46aa714d794e8b1c7ff98c1a4210ed9cb83cfa6811d1724c782f25c4c250ab22dd9ff98966e821559cd0f6781ecd491bc2c260cd8f4ff64f678ef59b8cb4ad6
 EBUILD renattach-1.2.4-r1.ebuild 496 BLAKE2B 6ef2aab5f893cfc4beacf156885640a79494f285b4adfedc57755ac2ccf80d92203bd78d0d8067e060c7af3de1a7d0e7f907e16a105302d92238b39e636fb8d6 SHA512 6b1137fc444bc8f211128649670ee6154b50fa680dab522e1a218f62b095df443bcc65dae25b028bd2a06c4f9fd612baddb633d9253a7efd81a1dfdcdb1250db
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/renattach/metadata.xml b/net-mail/renattach/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/renattach/metadata.xml
+++ b/net-mail/renattach/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/ripmime/Manifest b/net-mail/ripmime/Manifest
index fec64d23f185..f83d130d33fb 100644
--- a/net-mail/ripmime/Manifest
+++ b/net-mail/ripmime/Manifest
@@ -2,4 +2,4 @@ AUX ripmime-1.4.0.9-buffer-overflow.patch 562 BLAKE2B 31f00e0d4da02eef3bfea294cb
 AUX ripmime-1.4.0.9-makefile.patch 2129 BLAKE2B c492852a9c8e66fc7b33e1a40a9ebd51b74a2e7d400e4bb6f60c2494aec4fc7df8c2a946075d11d0102f5d87583462c7a02a60b3d67092f7468a86aa38652dc3 SHA512 45cf86e952d6e2fc14d729d57a0848e42cc1484af824f94e1b54de5a2dc616522eee2ea20e4aa1e7f79405c5ccd1d36fd574e77288b82e3ce637956f2ca92f97
 DIST ripmime-1.4.0.10.tar.gz 172155 BLAKE2B 83e7500a8cc48d29d31515487968dfd7a2b1768b12f296e11ac5e55420dc765498859608328618dcd0295f3a9901a06a189ad8ae24c6a6c20e604d48a3dd29ea SHA512 1c2d2180d60a56c70046e95a29925e39d3f76da98cc2fa153b6fc3a8eb0fc5ec5f45524e9f5ae8706a955366a752d25a0a2f560f1d75de3f2733ec31befb83d3
 EBUILD ripmime-1.4.0.10-r1.ebuild 883 BLAKE2B ec97e9ea5adfd43159daf5446759d2f46f4056ea390be8bce1de31a37b06f0018f72fc21045ed6775d24b4a58a36d7101c9e1193c5393a37c5ecc929b60f0353 SHA512 ca6d45189e81451160f16921a7916ba9788d1d3a0877c3e615ba8d6fbcc448ec4a6577f60d67eded04a803520e7f937261b0eb54a73c2041a735a50bfb2e68df
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/ripmime/metadata.xml b/net-mail/ripmime/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/ripmime/metadata.xml
+++ b/net-mail/ripmime/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/ripole/Manifest b/net-mail/ripole/Manifest
index a2333b85d9e2..8a61a62e21bc 100644
--- a/net-mail/ripole/Manifest
+++ b/net-mail/ripole/Manifest
@@ -1,4 +1,4 @@
 AUX ripole-0.2.0-ldflags.patch 495 BLAKE2B 28c2a580563fd4de93199d8242b5f3673f9bc81247be65ce4a7136e28a3204dbd48553cdc6de4c7ef7f13c4332120dbb415320616e4b34656b5340d976714ea6 SHA512 749d9a864c1cbc4c28e6a8b8dfd69fddb72e4bd0150a143bd4398e4757edc8326c6c2c7da4d0ce3e17a212636b3894726a6488d8b03618b3d0641faff390d1d3
 DIST ripole-0.2.2.tar.gz 30629 BLAKE2B 63ff7c0d086861d8aa9c1fea7e69086874b90e3181898e36338cb3913e90c6ed7e6f222ff985d92386535a222e44e8a324658f0b4bd51de508f92a82f37f5eb1 SHA512 de3a4fe511e11d4ed8b5589aaf102c60c59c8a3cbbd1d988955b89d597ac7a5992f63a7ac36d8aad3916fa9f6311c5a0260136d534973fdf1b4a5fa5296b6b92
 EBUILD ripole-0.2.2.ebuild 562 BLAKE2B 1a28ef5251bb69e2620e146c997dcfb3fae05426b299a1a1d994ac4f27f8a182cb43730f6c2b9fa52ee0f1c6a14963f70d7adadeecbbde49ebd3ae2f4ae6cdfa SHA512 177f41de49c704c751b49d23c329ae760f16fa454f4980327b260f6369e0a1febd86390546d5e20540ae9f2c83a4b085fe42cb2e5c32141e1727707c494f9d1c
-MISC metadata.xml 325 BLAKE2B edce91179b4c014b34923d673bd254b4e46e04362e7873b61660e69143cfaab7f5894ebf10858dc2028d3b8d866ead42411f90db2b11b5e4f6906a1cc806189a SHA512 fddd77a4694de0ec2c881c393854557ec48e5f6603c795f93467f700750386563c297302fbfaba72d4980b68fa1c5c0f000c292b9e59ac0463dcb079bbd3c035
+MISC metadata.xml 326 BLAKE2B 4b598bae45c12962363cc9c225f2b5d5ad4a876ed6ae96228f970c163eef6e23d361d56b0cb9ad3a36779c0106b6367f9b3a557026b48da2397ba31dc0c5775f SHA512 06c4387722502f0fac191ad6784a31de5c5ce86a84d772b2b6aa0aaf691d4d372d258f9b3b9f7160df813437d671975664a333f3d2e0cccef3041eca122e8ebf
diff --git a/net-mail/ripole/metadata.xml b/net-mail/ripole/metadata.xml
index 5296eb09cd83..750555f8c5fd 100644
--- a/net-mail/ripole/metadata.xml
+++ b/net-mail/ripole/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 292b7285ad66..ca75e9a241de 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -6,4 +6,4 @@ EBUILD rss2email-3.12.2-r1.ebuild 769 BLAKE2B 89df0b5714085967eed8d19ff839f12ee7
 EBUILD rss2email-3.12.3.ebuild 732 BLAKE2B f7e222d4ec1264c9f6d347067f82b8894a44de914949cae3e7f3f67ea21770222fc873892dfad4353fefda33bd5a43f3f0f23580f17f430cf2369ff07312016f SHA512 097694250cebd769d4139d48804558fadbe2da633c22403b03f1b34355b19b75e34e09ed6ad09dac10b7abb7c7443c387a41283864299fd150aeeb80e27edbfb
 EBUILD rss2email-3.13.1.ebuild 876 BLAKE2B 177963d767cd34d9972435b2f30fa0b396709064a5c45ba354a315d08d9538ada18e4e2d1843345b98474135e20149f1fe36bbf546d4922cfd42e99e27b99bc3 SHA512 5ba0bd61956e96c7c52b5dcd4eb3ccac311a381af6827bdc1222c58e5a116251763450f050bab8bd7aea077ce78746a77ada1f3491424cdffc4af4ce93f1dc14
 EBUILD rss2email-3.13.ebuild 876 BLAKE2B 177963d767cd34d9972435b2f30fa0b396709064a5c45ba354a315d08d9538ada18e4e2d1843345b98474135e20149f1fe36bbf546d4922cfd42e99e27b99bc3 SHA512 5ba0bd61956e96c7c52b5dcd4eb3ccac311a381af6827bdc1222c58e5a116251763450f050bab8bd7aea077ce78746a77ada1f3491424cdffc4af4ce93f1dc14
-MISC metadata.xml 459 BLAKE2B d361bd0e82327a97b801bb7c064f0609a67d2fc0cd58b69216e6acb0f304ce0897da7843255f1ce1bbeed76c5fc1e199201b2eb35910fc7b1c5e09d4995bb838 SHA512 4a05845c1148372f0c22bb68bba353aca4fc03e1c418b72f67e85f3cc0a9ee4b029c8bd0271c1d5cbbffe1e5b0105a13dcac544f36b4e3e91fc6c9c0e93d8983
+MISC metadata.xml 460 BLAKE2B d6c729983475469d59109d1975ef8cb0bc7f07a4d3b55e03828682246d0140b31b019b3b614a6104acff8f78049cf86a6474dbd2465808f585ab193456915d61 SHA512 aa01aa301922fe3ad7c526a9cf7cd71edf4f86ee5d699a686549468c09c613afac1935ecb646a7bf55e5994ef04fe0c5d96aa5d384dc020bf401e28e47b1cf9c
diff --git a/net-mail/rss2email/metadata.xml b/net-mail/rss2email/metadata.xml
index 2a596c639daa..2066959551ac 100644
--- a/net-mail/rss2email/metadata.xml
+++ b/net-mail/rss2email/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
diff --git a/net-mail/safecat/Manifest b/net-mail/safecat/Manifest
index 94078645348b..a1ce850034fe 100644
--- a/net-mail/safecat/Manifest
+++ b/net-mail/safecat/Manifest
@@ -3,4 +3,4 @@ AUX safecat-1.13-head-tail-POSIX.patch 1183 BLAKE2B 846a9f99b40417524d62adf0b0fd
 AUX safecat-1.13-makefile.patch 562 BLAKE2B b80bc02df3244a922d831d10417c2e973778ac737d4a52ecfbdfebcfd51c1571c2dc8229bfd4e35faa7c23d2f58c2f788200977a8c2b5fe93f67de79325846fa SHA512 d48a33ce9e68ce8a27d77968040a146b975986b85e3ef534bde6a015b8179fc563f341be1ab7e74afe3e260ad267c99e18aab027d2f63125f76c071e15867050
 DIST safecat-1.13.tar.gz 33953 BLAKE2B d8b4132b530f975fb5629bc591e3b332cd6c8c29684a8848e76b7a660a6ea683adc8b89b92fbe37cf5c1236bca597d9ec6e44bfb5b35076a98d6590f355a40ae SHA512 e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
 EBUILD safecat-1.13.ebuild 1099 BLAKE2B a942608e3ec6a8e0d033cbb594cd0f00d77d021a1af449dfc8a32c4221fe83f2df4b883eeb98d9ac61dd97e229504a38fa8fe9fcf237e20fd4a64c1c0f850829 SHA512 5e8b96db8c2aa068c7406bbf47357086944ac4c57365902663e97afc84f3176f8bb17e2cde11181acbba03ad564c3806195cf4775908de5446d14b96baad67c4
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
+MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/safecat/metadata.xml b/net-mail/safecat/metadata.xml
index a4e0d354f696..a551e17802d7 100644
--- a/net-mail/safecat/metadata.xml
+++ b/net-mail/safecat/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
diff --git a/net-mail/sendEmail/Manifest b/net-mail/sendEmail/Manifest
index 4d024142075b..f26a988071ff 100644
--- a/net-mail/sendEmail/Manifest
+++ b/net-mail/sendEmail/Manifest
@@ -2,4 +2,4 @@ AUX 1.56-overzealous-verify-mode-check.patch 615 BLAKE2B 5913c808221114005129188
 AUX 1.56-overzealous-version-check.patch 596 BLAKE2B 278ca2f062e1b96b72fb29fcb4de616e57c26a5531852ca18d8b95b54ba8982b2748d9a27eac36ca7883d84f2578f406024eb00ce6771b433a13fb96a854ba42 SHA512 7a66db3114d229611b8c4c3e29ce5b30d8252efaac1a03223cd82733fbded4e21ba67d6690feff16b814f9327c672a1b307a77b630fc1d5ad33e8426dc4107fc
 DIST sendEmail-v1.56.tar.gz 29740 BLAKE2B 443e80e0dcc500f8fed843749a504a0064f3cec9845cbb6d40e6c49d5a29dbf1874e2e03bbfaf6d511049addd9b3ed26170143dea966087575ad0ab61874c50b SHA512 0ee208857d6ffa4b9e0eecea0a94decf6d3935041fad23a084fba195f2016a18f3409086eefa8c35fb5dd01697eb29e4af0607754bf1c52bef727b8b670242fd
 EBUILD sendEmail-1.56-r2.ebuild 658 BLAKE2B 8302920f04a684a482295da0d08cf42489704a3b4612f73c807c98378ea952d9b1865b4b37590b648ed17731366fed517fba6a96599e221058bb0863ade96c5c SHA512 39eac56bdbde00e3511b1560fdb482f2f07d469d009361ff627f0b728099ff533afb717a462de11e198cc66fcf40cfeba95419c633f8f9beebb6b662655b4d5a
-MISC metadata.xml 638 BLAKE2B d4f4c240da41222c2930d5ba7740de862a1d6f5d9ae9412df33edd3b927a1c7c471ba0f6a27743342e2d927e8778d9b00dd472dba15ff7804d84ecb48ae5c138 SHA512 73c0bed43ba51b21e49a757cb5720d67b899a3ddd92919d4398640082dbb5f4a45a70d88a135e78c535dcff570ffe4149dd1dd0ec421ccbeccef7412e5190a7a
+MISC metadata.xml 639 BLAKE2B e698c4e9c232a51f977b1be4fac0985c4ecd1f741a3ae51bc4f8d25ed8ba822f56e6b2646d8ecb850834f308c72cc08522b6b77dd06973ea70c0116d5228b204 SHA512 118bbe434083ec22798f5be848d5a1ee43e6c7fb0f90ce5e0076f0811c0eada86817a82a644319091dbf535519995ae2ca135d171e7c32b12d7989ad9a3c7150
diff --git a/net-mail/sendEmail/metadata.xml b/net-mail/sendEmail/metadata.xml
index d07b735579d1..a3fa6d33befe 100644
--- a/net-mail/sendEmail/metadata.xml
+++ b/net-mail/sendEmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 <longdescription> SendEmail is a lightweight, completely command line based, 
diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
index 31c2ede75a29..2c112e2de9da 100644
--- a/net-mail/serialmail/Manifest
+++ b/net-mail/serialmail/Manifest
@@ -3,4 +3,4 @@ AUX serialmail-0.75-respect-AR-RANLIB.patch 560 BLAKE2B 0198b3d97c956dc28645176a
 DIST serialmail-0.75-patch.tar.bz2 7702 BLAKE2B a1593c15dc086d78ee6b605197d616da8a50d67e9a7fe79fe1f4aa5b9664b16bd3eb9dcea79902fbe4fbe7020d74870d72c2dcdd3c1dad18506b54f0f0ea5357 SHA512 da1eb9a9a834fe5a9db4233d1a7e09657f5a2903f3356ebd6922f03c7f4833d96b4b9ecfb3412733dcdd3b384e503b25fd2564d0f93c639a7a9409872dc52c25
 DIST serialmail-0.75.tar.gz 55079 BLAKE2B 9ab05731069819be14d3b7cd56b2ab4bd2e87fec7867f4243d8180fd42eeb7b95b255c48ea8dfe06918b8cba772b228c7594ddef6c56d3bcb80d0ea19da4935e SHA512 f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc
 EBUILD serialmail-0.75-r5.ebuild 1311 BLAKE2B 7cd31971e68f804e83acab6d33f7d32332cfec703f458e5db671ad50a9976b68dc630d50d7a150b4a9ae88dced0bb59695fabfe2288eee170f061ca27f7f946f SHA512 1359bf48278f48d549d876089e83d78c83bb3e36adcd21fbcd158e3b404196000f036a3692610bad75edbd366f20c16946cb2aa2f223f698417c337c67a35743
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/serialmail/metadata.xml b/net-mail/serialmail/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/serialmail/metadata.xml
+++ b/net-mail/serialmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/signify/Manifest b/net-mail/signify/Manifest
index 77921a620287..b2171403a6a6 100644
--- a/net-mail/signify/Manifest
+++ b/net-mail/signify/Manifest
@@ -1,3 +1,3 @@
 DIST signify_1.14-1.tar.gz 13853 BLAKE2B 3bdf1cebfe4f4e88c5db94d2faad42c99f47a2bbc71374b65f5c576f25a26ed999e58cc0e1f8f084adab8e4ccc4bb6ea4cfe79c0c4b9b990d8abdc681f4118c0 SHA512 4b94c6bae6d36b60610318625eca7856f63a578ed22cc1690ea5ffa1d823471c73729f3f404d5d944f3262004ca6a9dd8ece1ae2cfa1dc3fed0152614792f7e2
 EBUILD signify-1.14.ebuild 695 BLAKE2B 9ff73c8ca6b4ec16fcc17a04ab250c1995f4eaa540b83da895ecaaa4f6ce5cc0e1060f7e66b6e54e7ff7853077be157145a47e8c0001a21bbb7c1ec5f7a860d8 SHA512 7811d825d1d1c03e8fb6a5f1e70c765c30fffbd82aa768f1e89e4e15b2b312ed9a066d8f03e8767f0e02f669691c5651fed4391f4509b58542044f66b388b42e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/signify/metadata.xml b/net-mail/signify/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-mail/signify/metadata.xml
+++ b/net-mail/signify/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index e0afa6f1791a..3d7f1b712048 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -3,4 +3,4 @@ AUX smtptools-0.2.3-cleanups.patch 1830 BLAKE2B 7d634aa4e21572cdbc0f4e94e18ad0fe
 AUX smtptools-0.2.3-fno-common.patch 651 BLAKE2B bfdceebddf4b6631d53e94b5e90522412de5dacfbcc006624a53bbc4f1c2f32437f93f928a88440dae4c884b28ef249f2eadbd4dbda2018ff73c07635acf4fcd SHA512 d9cfb1abd62f6dd3f57b3288e1adc18cdbedb6c296c7516535b406ff52393ea177afd5d22480b5be013d18497c670e0569d9ee1476298f58824a33d99f251d42
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
 EBUILD smtptools-0.2.3-r1.ebuild 666 BLAKE2B f5f54d41eb29cd93db6a82a72f730ad66e0e4e9a9b5fac19f5dc9d32e1c70090fd3ba9198289ff75cc8af3a4378de0cb9b52d9986113f3afad447497d4f6e570 SHA512 81afde1a40024db58ffb206a4d65777d8826b9f378c35f213e02c68fc012754a4b5bf3b1d77d1200bbaf2de220f6474dd37bcd2faa3349dca9472f16116a8bf4
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/smtptools/metadata.xml b/net-mail/smtptools/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/net-mail/smtptools/metadata.xml
+++ b/net-mail/smtptools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
index 9a0fa9164513..357571db86db 100644
--- a/net-mail/swaks/Manifest
+++ b/net-mail/swaks/Manifest
@@ -1,3 +1,3 @@
 DIST swaks-20201014.0.tar.gz 110953 BLAKE2B 8dd2c681c6c1e66b76bda71f0bc8b88e658565b28c29ae9f02e5c27500619598e5817a442aa82c48fd90be80cd2dc54eda8390ad3d1cb2e00163cc07a526f463 SHA512 8a4e8dc810a9c5943afdbc4db7130e110c42e211d6927ce1cdbab6f81fa49c31490e6c3668ec3cea79580c07b281ce30901b3b4a71325951167158cc9d70d9cc
 EBUILD swaks-20201014.0.ebuild 1093 BLAKE2B 6cab8f15bd25d724724dc17995402054fc339828506904ddfb530ffb28d133c40fddc8cc0cbc03f01fab81267338a299da4ee1e76685246f505a5d2c5455a749 SHA512 4b3f55db68d265f035ade639e91714ffc43a11f9a9a7c120fb7cba6088fe5730f3c7a9fd024d536e023234c791c741b611a7d4aa8380c13a2d77e83977d6409a
-MISC metadata.xml 570 BLAKE2B b81498ddaba6e8866eabc756743a8df55075c767d0317e732160f48e74bb4b2232e41b55c1fe72803c98d5da67f9eb2622287367f726b5c7271bfe6bf24a5818 SHA512 9c15d5f649e30b4d07ddc5bfecb529b396ef0a5eb1052ec48872846df077b1e395c8a7de74d8440a536ff999c941fed02ded0d689e204c8ac5090f628bade37b
+MISC metadata.xml 571 BLAKE2B b3cba19bab9c116897cc6e81adc9ee43dc6463e9e5517d1de1d0090208d8849b6e1723f9777de2f865dc1cdb514ba6a1de0bbf9a07bc7448c523fe6dc56d67eb SHA512 601e7bfbbcf8c676734ae69dc3a04fd277e62ee6e80307db565583c61949e1c0fbb72ffc968d671289b7e20a021b41a1ef13916ca15d2d34ea98aeeab70b6b1b
diff --git a/net-mail/swaks/metadata.xml b/net-mail/swaks/metadata.xml
index ca014d65147b..1067669574a5 100644
--- a/net-mail/swaks/metadata.xml
+++ b/net-mail/swaks/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>alarig@swordarmor.fr</email>
diff --git a/net-mail/t-prot/Manifest b/net-mail/t-prot/Manifest
index 0adddb3d1dbb..973407d96055 100644
--- a/net-mail/t-prot/Manifest
+++ b/net-mail/t-prot/Manifest
@@ -1,3 +1,3 @@
 DIST t-prot-3.4.tar.gz 46066 BLAKE2B 8f29e0c59ac1529f797cc9970aef40fe09e1b3041e7e1b5405b68623058dec500f1f7a4d51b994e5a764ab92586e053698cd98fe3eec5ef7ceb50f8d05617486 SHA512 6c86c10e5b381b93cbaa9382f8bd2c94eeb9c8ecec092d83cfbda5f0eea5933fb85397b364ea58e08ef93e6a06198447f167f0850959ddf16b8a18d3fe8953f0
 EBUILD t-prot-3.4.ebuild 613 BLAKE2B a447e9a7c978b18449fc8a65570dae0be151c58bc73ca99ded6e93d753aa26179673fd7c86ee8715bfa2b9b8a5648d1277569777ac377ed3f81292494ce1c080 SHA512 fb725d47907233e4a920dc0c1e8bbf8e460056608bf59f959f0dccd592a0880be332bd237c347f20a94a2c058ef5e1286a30904625160977c3eb580ff7db6596
-MISC metadata.xml 733 BLAKE2B 3e9cbe631e2cda0cc169c94114423f155f307b624b6418aac4fcd2e66ddfda6653e1c8c80b19c9cfb1d510878a815a74e91a140f89b65222f9af1ab63ed02490 SHA512 3ba44e3050e4fdf6edb5e45ec423d1d3c11a4580b24676bc94687dd6e0b9ab78e8f2e831a0da42b832acd30bc30583a08474155c3dcfc1b61c655e4b63b286b1
+MISC metadata.xml 734 BLAKE2B 9f22e5543a0b6cb12233186efcb5798cf2859e879119cca2651865b049222578d434df15efc5366c13353434d2be21692d9969642d0746d56f71b66998f8745e SHA512 b446732633d307ad77e343a4d35dfb0cabd29156c7bf2e937b450b08787ce5f49028c49b988167d33188c5ab875cc22d9b7b4324e1c03dc8f16b155546b3db3a
diff --git a/net-mail/t-prot/metadata.xml b/net-mail/t-prot/metadata.xml
index fc8b75a728d4..1198e3a3ce9a 100644
--- a/net-mail/t-prot/metadata.xml
+++ b/net-mail/t-prot/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
 	<longdescription>
diff --git a/net-mail/tnef/Manifest b/net-mail/tnef/Manifest
index c38efec48079..8e7b3604e1e2 100644
--- a/net-mail/tnef/Manifest
+++ b/net-mail/tnef/Manifest
@@ -1,3 +1,3 @@
 DIST tnef-1.4.18.tar.gz 4650361 BLAKE2B e6c02cf06454932d32ac68f569fdbc29979bace8afe1b997a47a1ef0e42d9464426afcdd1641509501604191d1a99d8374a078e53f5531fe3bc887df7bce194b SHA512 bc53daaca9c260a804681c040d01f80bbd8b0d3597678c774975e988cdf83dad6b0d6c66b22e0d40ed2300efddef0bc663236ead4dfe687eb33af7f27dbb6000
 EBUILD tnef-1.4.18.ebuild 451 BLAKE2B 72351062c40b13dc21cf4cb4580e85cf1f017a66ae290be74494f4de543ec1f8d006f63ca9fdb88a09d60865b098eac2878bcd23591e5091586b86e049c3ec9e SHA512 000dcd956b2871bd9866998aca28137429cbe7a22a174b810c4d62a7ab4f42362c893fb312a9d435c43b435a6a1564b12b22be18e0609ffa1ff5b0ed34cc9730
-MISC metadata.xml 241 BLAKE2B a08ca3c0f002883ed451aef0127bba0aab4ba07e13953b4a99a45856ba34168bf69751618abdb4d4fe309a00cd67f70aadc7a42edc8afccc18e2090a956257a2 SHA512 b1ba4fcaf6cb9388c331edd4b8f17f6d7145135c6b3480f78898c004f5f148c93f6b3c80b8bdf19523414c25435640a7ef27cff3c9da586ecdb6430d8a93b14e
+MISC metadata.xml 242 BLAKE2B f321d1f4d91eee7a38a06d7c2f7771b19a414d8d74ae96ab6fedc5b8d98b10630ad97b2cf0b366c4405bc358221747f2b8497bb987ebf053dfafb95e4d4f6482 SHA512 71e1927f05809a73a77a3fcddf96db378cb8824cb620590531e2c86af0f3c66efad0413f33d55b6f405425323c6a707ca54194063113f70235ead5c9301e824b
diff --git a/net-mail/tnef/metadata.xml b/net-mail/tnef/metadata.xml
index 26c0b280a2a9..a451ebaa06dc 100644
--- a/net-mail/tnef/metadata.xml
+++ b/net-mail/tnef/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 9873ec98d448..5953b16c0791 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -2,4 +2,4 @@ AUX tpop3d-1.5.4-gold.patch 730 BLAKE2B e3f30e0aae7ca80c3834dbe63216bff73de20981
 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
-MISC metadata.xml 560 BLAKE2B f0fabe58e865bfe72fc237eca7cba05badd40682b5a03e420a00c96460106743c10d700082522f379828be1000fd1302863ad7f975ace5786c8f312fb5c6053c SHA512 892cc588c2be8dce623ed1844a7680339ce36fdee74e16b99436925b2defec116b164926f3a000db186ca25a079f90352d73795561a6c361e0c65c8c22c92eaf
+MISC metadata.xml 561 BLAKE2B 9c3cdb3234509f5fed875b4810633182b2b17a3a6a4034a9e83cd39ed89da9befe4658d76d2ce27042dcbd56452a9acd98baea3f7f65c65605fe95e37bff070e SHA512 27d747cbbc50936743aa9c09b98185004b59ad11aca5cc58ba6faf664ebe765eafe706d6423f41fb10c96146ee8c42078a57ff144ecdbef4cd9013df44f63321
diff --git a/net-mail/tpop3d/metadata.xml b/net-mail/tpop3d/metadata.xml
index 75eac52ecfc7..b7c4f56479de 100644
--- a/net-mail/tpop3d/metadata.xml
+++ b/net-mail/tpop3d/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
   <use>
diff --git a/net-mail/vchkuser/Manifest b/net-mail/vchkuser/Manifest
index a8f791ddf855..41a960c4c5ac 100644
--- a/net-mail/vchkuser/Manifest
+++ b/net-mail/vchkuser/Manifest
@@ -1,3 +1,3 @@
 DIST vchkuser-0.4.tar.gz 5890 BLAKE2B 2b48f085fdc6acd86cce3c1e12ad2e445ef1059e6f1446719cbfb3649cfe67df36255cc220ef063fbd699d7f26bb1cefde20a0759cc45e0e92ea93c6711f1015 SHA512 3c33a1c26abeaf45ca90ac1f1c9cf7b1ae6eba3f6e5a8d0d8d0d12dce98fbada4209cd916af7af69d7682c174d88741b1140e5c758a08e0d196e73f2b6145699
 EBUILD vchkuser-0.4-r1.ebuild 958 BLAKE2B bc52b3e10e828746462bbf35178655b1b05ad2d4c4ce06b7fe9c9703738f6b5f3aeb6dd26e57d9c98f333a312ed20291094c2eb6d7684c9c414687323e7524d3 SHA512 2a1d11aef90048da5777b36abb3d0beb8ee733fbc0808c69ed4c3159065f5ca9278ca7025533606af127b3bd71fbb507277d5839f62b07598c0ee401ab336912
-MISC metadata.xml 323 BLAKE2B 0147c79382994634fde3cc6fdc43872a95cb5bfecd3290720dd604f48453a1e842edead7ad408b08b59f4393f902c997bbd3db259d34b13ac9ad3a5be9cb4f09 SHA512 9e86c9f10fa850b949b9ca13118399625310655314b607015cf7441c59432b6bbe9f6b3282d090d55de08ec07415b1c5f79b58c40d99f92173d4e59a02920f29
+MISC metadata.xml 324 BLAKE2B 87635b8bbfda42277ecb70ca546061214be901b4e13956b4220ec934ae030cef97badfa58fbff8a7c438d7f78d48e611189ebe5e41fd8653d1cb82e91cbf8c27 SHA512 dc65cbdd04d083e1e1bd577fbd6cb69a28d2100eb8e6b4e9a7f7f02f7b8fdc3d235cbe100278666302b7b1053ae74dde7e3b4a4a9791d1e36a2176bde1f46ab2
diff --git a/net-mail/vchkuser/metadata.xml b/net-mail/vchkuser/metadata.xml
index 4a135a628147..fcc1a7eab8a0 100644
--- a/net-mail/vchkuser/metadata.xml
+++ b/net-mail/vchkuser/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 75bc605b09be..3a848f8e32be 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -16,4 +16,4 @@ AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
 EBUILD vpopmail-5.4.33-r9.ebuild 7739 BLAKE2B ea3aac8a884fe1e8d23c9bef072dc610e1c0328028f82773040aecc2d347de11d0166c4482ed4ee0fb27ff9bdfb2eded758e3e03b389c266c1d9e2397e1f7572 SHA512 9b0a5926580beecb63d43a9ed462a3cf2f1b42464bf7e193b7b9fd74bc6e3939192eead6f33454b99519cd2b9df801a8ebac03a91d765b3b557f96373b8b32eb
-MISC metadata.xml 828 BLAKE2B 4c54578d11e0a74817c10edd0ea3314aad1f53703367a4baa89f0c5b53a1b9df6753452db9e2da7f2fa2771b91713c40b02cf93535890671eaff8fcd12b11718 SHA512 43330581de8b5c94a5240f70a6f78117808c4b6deef386daf68d531cfaf3e29888ed1c3c70f0560d22a7569f0c29dce4eb9f63676528783a9cf6f7b275f2eb4a
+MISC metadata.xml 829 BLAKE2B d3038dec96c930fd0c198a002c721464a0d4eefec9e4a4c5a3ff8378e54ba9b711e828feff2fdf37b2f77919816846de7796e4887e2be17c918a4c7036c49f29 SHA512 7580b8cb9d985908df56be493add629de636f03ea7154872b06ae15599d9a71ca4637862d0331b792e1106ab64f73f212f8491676179b376e0f2c1fd894a1b41
diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
index 77ece56bd3d9..e14b93eae569 100644
--- a/net-mail/vpopmail/metadata.xml
+++ b/net-mail/vpopmail/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>eike@sf-mail.de</email>
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index 6225bff1b8fb..a2f695e3b514 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 291 BLAKE2B 2d02039a95ecf734d6dd284fcd65911c9f38db8a2165d1bd4289a9927a3a3c847a99991c1301a5d6d9d485ccd06794dddf73f57dabee47dcb3ed01ff9a0f7f72 SHA512 27c4b4314b29547e3a485340086186c31d0d5ede249631738227ffdecd64c500baf7c3ee6852b02e18176376f0717c35ad3445b5a2bc684e82772eca27be2786
 DIST vqadmin-2.3.7.tar.gz 153678 BLAKE2B 3906c449d89e2747d10b9a4afdce14da7b41fdaca760d41b0374bfdd6a8dd2f756597b4bbdabb4d03b89806936e1550f069b7675dd2ef7486f235e497191bf94 SHA512 c427dc4b1e30926b0d3774bd0d296bf78a98037c566a82fa790f7a25d1fac64a80172498fd6342e93514108e42fdec0ebf1a76029546e43100ebcae5b845ef88
 EBUILD vqadmin-2.3.7-r1.ebuild 1303 BLAKE2B 5873980c5e12d79dc438e2c6d33b10927a90ac9708c21199e6fd537b2285fe9d41906416130cc3308b6e5a24da2a5da73b63eeb3daf91cca297d90fd533dfb46 SHA512 965c60fbaf4f57d678e11b21635881048942f46845204c8dac10e62585765db74ea6cf71568b055700f855ae2f9638547bb4e1da27e4eb38103bb32906ef225d
-MISC metadata.xml 357 BLAKE2B f681f656d61cbf1c78616f26f8746b29a5f76234344fc9b79e29b5f83c91829385751301bcde12dbb12e16e476ecc69e28ef4144c531829bc4432ca8e41fd667 SHA512 82473567cbefa523ec0fcee697d7b5d30b184dedc7a73fa6e49a7958a3355ba22118d572908c3ceffecf821b234053310e56e5f2b4f6e7fd66c9a23248974791
+MISC metadata.xml 358 BLAKE2B a245cced224214d846908b878ba3db70eb2b8a5cd64fed4a08316922015c4c7bd7af7ead71d16264528051603b2e484b13ad8c53dd4d713e5609dd2b8ed3a8d8 SHA512 e28a7ae98186af72d792c168008db2400a9dfd4887f51e45f6383e3a5227e2827436dc415639933f1c10181f1b7375dc6f257ee47ce65b96c1fdd2894e424af5
diff --git a/net-mail/vqadmin/metadata.xml b/net-mail/vqadmin/metadata.xml
index 8a64dd2e0f4e..337608083b12 100644
--- a/net-mail/vqadmin/metadata.xml
+++ b/net-mail/vqadmin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index 0f83a723c2fd..6193b534bc27 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,3 +1,3 @@
 DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
 EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B 42b30acd8f24496c334f32464cabdd6e1c27e98139a5f099d299949529ee3964fc580de113676461cb7c46dbd3e8faf1bb4194ff42d7c3e3ccc5fc184a7b88e7 SHA512 78888fd6143639cd63b63921d29cef8ab61e48db330c0722ad1f703475238d189560368466d71528991074ee216016b63037371fc47df5e3efb25fa0c08ece5d
-MISC metadata.xml 338 BLAKE2B 788b29610ed73aba390c90c1b6ac4028d5f607e5f5d93dac1ccf945602ba2c0640574ac222761544a47761a40b300ee773aa710a5d2afa0dabe40da9461940cd SHA512 5239663e2ba3a103c1e331b53393658e47d29b2fa4daec1bdea8ff727c39196e6c44a62db613893b4ab7266878c75c0bda21bab9ca25d26fd796ffc44af5703e
+MISC metadata.xml 339 BLAKE2B 79e43f2b239bfac12ef7299f3b3ff7acd72d6b07eb96f3639e47d3ade39b166501d85740a23a3fb022e3b4b3d3854fc5f6262aad893864f94cd8250c07c6243d SHA512 4af83ab6ff0de7bfdb54c14098fd328855c6b0d433e827c6c17e4f49c8a6bb31c0643752844d8988b36fb8b4f500f9c51af573128ecc894d1938c3fe4674f40b
diff --git a/net-mail/ytnef/metadata.xml b/net-mail/ytnef/metadata.xml
index 2c11b238d560..95c76211f82e 100644
--- a/net-mail/ytnef/metadata.xml
+++ b/net-mail/ytnef/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>polynomial-c@gentoo.org</email>