gentoo resync : 16.09.2021

30 files changed, 486 insertions, 30 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index a8858d7b1dc3..212cd3f511c0 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 2b2bda0d6051..9c8238eb22af 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -14,4 +14,4 @@ EBUILD courier-1.0.17-r1.ebuild 9230 BLAKE2B 703d33dff91f0a0d296eaee8e8698978d39
 EBUILD courier-1.0.5-r1.ebuild 9447 BLAKE2B 53ba4507d5f9e664cdf1b3fb0ab6628ff0dd7726d4c59fc623d400457ec7b3a7c6ee554ebe33a9f6f0d1e06cb06be16324c3fc2fa488e9a886fec05e752d22a8 SHA512 057d8141801296e5fcad4798167683eac9e9c79cb9ea217f34063bdc538536bf43b94c5170f0c735f399c101bf487d1cbcc0510a635ee34e63d29e684518d419
 EBUILD courier-1.1.2-r1.ebuild 9237 BLAKE2B 0fe69e31e88fe46342544dee1af0b9d67bad261429907076a21e88b896a25b54c6fe9762dda4af25b88575de4686bed3db324eae0726d8ced84163e63547d042 SHA512 a3e955183c1084173aa2d3b2202d7ca91204bda65cbfec5078936e86decbad274df4824e78cfb2ba1ac7207acdd2f3699b7395987ef4a21e82cf187c2af77324
 EBUILD courier-1.1.5-r1.ebuild 9231 BLAKE2B d5a6bc8aeac399d82955a02fd47195bb59f67da071ed9c310cbcb339bfb9d25ba08c65e573f6bed37e759b3588699725739b66451e12fede34b79223ec81b1f6 SHA512 e07df08b2ad30bf7a786050cf4bd3a1d996e09d1bbbf1e45c79789ac3bf3c4e15935dc92c36374f53634c459f4956d6cc4937c47bd553d607d0628feb2c0696a
-MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
+MISC metadata.xml 756 BLAKE2B e3d128790b1620d9005c9a14cef1c452488fc8e465b235791cc196f431cb2ea8348aba342b0867282878d0c73392694be0db0686dc048d9345b286c3bccf1cab SHA512 c3fcd1ba4b22f91b1acf49faeee41562a7963b51d37e1593156086b79a1eb4172a12e7226b71a9aa55b5a4ef7d734351752451a2300375d061ae20481778b273
diff --git a/mail-mta/courier/metadata.xml b/mail-mta/courier/metadata.xml
index 75242c9ef05d..678bc6a477cc 100644
--- a/mail-mta/courier/metadata.xml
+++ b/mail-mta/courier/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/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index 99f2f0f446e9..d1071fb5a017 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -2,4 +2,4 @@ AUX esmtp-1.2-pkgconfig.patch 761 BLAKE2B f3e041ad29b73b456f88771f67f0614dffe5da
 DIST esmtp-1.2.tar.bz2 127921 BLAKE2B 09823dace39d3fa7d525b85e33e6e64497ef81a6e2b4b1f3682e0576511b845c7cdf50602d6b1acd6d777ca34581d3727a337ff8cb7e737f278983c06fc8773c SHA512 a1e7b56743ba32b1778bf02d0abcbdb5e6e3cb7d592c3a23a575789de60dfd62a307d4aef06860c9553cc492cdde0fff0a42de53e9d4e972587a10f609be4821
 EBUILD esmtp-1.2-r1.ebuild 874 BLAKE2B 6565a83320191a7cdfe39cdbd3d30b6c8c5ecfb080b0e9f72bf632839b95545e09e79291c197a08f1ddb6375187b3a37d07abee7e2d8ec1ea5360ca64f19ed56 SHA512 af92d551548080c93030bf362d2b25b08f065f6d7baba4abffce8768be7e72ff79a227aa64970deba939b986ecc099501541a1c9eb5f29de2b03885453466297
 EBUILD esmtp-1.2-r2.ebuild 991 BLAKE2B b32f5f6508cf64d88b11f1e7ae1cf266e9bd17144c4dec819703d6a44bb8ec9f6d4a2d473b5672df7fd743024a107e697240a4ac00f126929f8ef63562546ecd SHA512 c267c2ea447b30bd88653a3c49909526e7d1f51535b988094d4191dcaa4c9fd81dc7780e7377113cdc7895e8a68ba0b0e1b5a1c2dac7d50e76537c9f4db5c556
-MISC metadata.xml 242 BLAKE2B 041399005c131e6e66967025968669f0ddb0972aa213f52e81852518a0005b7c478debfb6bc182443bb6a35066ebd6d3049c99d7b8e4a6272fd95960504e4d74 SHA512 8d906d3c3f37a584908f69913417a2c54ef0cde2709d7f2f88d25b932bfa18f98014a34f83d9ebd73f0508e324747ee48f412d909a0423892069fa9f03b78f37
+MISC metadata.xml 243 BLAKE2B b4d3fc83f223044c621353404bfb57305884991c7f5bb5a14662238cefdb0f049d281510fe5835397693371f0b74dfb9c83818ba1bd3ae1cec003386c6fe75c4 SHA512 4c753fb052a07bd2e8f1c048da9c07924654b7c07c169d66163e62e7fd7fa08966e30e7808693f877264f47ae919dcaf59dfbd61bd40544e51316ab2bfa09876
diff --git a/mail-mta/esmtp/metadata.xml b/mail-mta/esmtp/metadata.xml
index 77af2ad8a6fa..711a6bc574bd 100644
--- a/mail-mta/esmtp/metadata.xml
+++ b/mail-mta/esmtp/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/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 8112aff76a87..41520afc9689 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -23,4 +23,4 @@ DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b21
 EBUILD exim-4.94.2-r4.ebuild 14997 BLAKE2B 3310c70b714502a63fdd9661bfd41964502ad797d24a772923aee706bedce01914506671de09dc892b49efeaa1273125932215ab474fef09ba7eaba5fdbc1117 SHA512 8de6e22d61f302056032a9b9069429086e157898d26fceea59a3384f0f2d204a5719fd8e6ffa36e2e9b60231683d42d40fb2497164d990b5e2adac68d8e4b038
 EBUILD exim-4.94.2-r5.ebuild 16187 BLAKE2B 7c94a9819769508a34d432020c781a127ff5967abf58d9ee6308461148583066b11a6beba4835d0297f6d96a896639e6fbe0edb0ff98ff6b4da1f326b589a824 SHA512 d6f39e1f2725f315bbe2885e6cb16c0058adb82beeb941439e6f63e2b13a3c5ebeedcdc7071bb058cb084c88caf69579a2a68ce725bd6b1a21a9ecb0a373e641
 EBUILD exim-4.94.2-r6.ebuild 16264 BLAKE2B 8741216d5b88321cfce21823f40bed7d5dc4018548ab6f65a0df24ed19333d6647094c8bd61b55863860e3a9d570cfbe2c6fd6cc279723dc4325cc18541e5e9d SHA512 df1ca34e2a2eab3e6b139037463d1303da0d4890e4f684901b3763718d66ad71b68278f5d5ae55a8644a6e8b01b7b947d2b729d32c662edcebf1df08cef9fba9
-MISC metadata.xml 2758 BLAKE2B d45d9ddafe5943e5a9aab7deb3814cf33090ee8b48347ffc188cb2ec6aadb30897f4d10cb0ab5040808f818a5b0dd98252455b49aa6492449b5b55ea3dc0974d SHA512 d2800e4c35f24adfbd04982d390a056d0c9f48d21cd2ecd544fc8163f3d1c16be1f02f19652ba071b22fbaad50fe96d13757ba8320cf945dc8e28dd1cd716d17
+MISC metadata.xml 2759 BLAKE2B 4f5d0d9fbd244b0836de4bd0d3b84f45376628a12e019c89e49e6dbd7128c19f16281fdfb401d852f57f27f547184351000382cc7333a524f7be280e0799d8d8 SHA512 85a2eaef07eb68d51a1307c6d76bef6620e7311ffda593750ebee5fe84affac2e026c971818500004c0ab9722a8e84c8eb0394fb66bb2ba6cd3465cf7e1f1a73
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index de42f5fe5af2..d74398a75cc0 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/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>grobian@gentoo.org</email>
diff --git a/mail-mta/metadata.xml b/mail-mta/metadata.xml
index 85fb13a2c47f..69f6b62549a7 100644
--- a/mail-mta/metadata.xml
+++ b/mail-mta/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 mail-mta category contains mail transport agent packages.
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index eabcbb5895b5..e838481b2918 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,9 +1,9 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.8.12.tar.xz 364712 BLAKE2B 94707d18d9be71e8e51413cdcc55887fc15bd7d0f059d54cfcf4e07b5589febbb9ed4025206e3b82d1b12edad45086d3ad8a47fb3d37488a49e46984d7b7bc32 SHA512 8620e5e9a88a49769cfdbf2aa83842b230b3fd1584641d17129cb404e3c9696edd5a28237ef46a115ca82d2a846c0f653eaa837ba6f8512f8b57493d64451df8
-DIST msmtp-1.8.14.tar.xz 363988 BLAKE2B 46953512002365f8e80e1bdf80f8513845bae62bcfcbe8334642b7a51f2d7da7719e3c1812d43e2a887162d45a1b29893744f452f6ac7dc205fd72a578eec39f SHA512 fa274849082553b14aef922c43b84fa6226a26638747ed3ef6baae9d97ff753b24f5eca055426c2e0355df81b2458f524d940faf2a7db771d80fb027e9f45e8b
 DIST msmtp-1.8.15.tar.xz 370736 BLAKE2B 08673535603a7e768b11dea9d1b6a6e00ef9e6948c891572d39b0a8ba1eb1413d1ab71ff877cba1427ee58c25c87b817b4f20f3aad207a8f0a785306fcecbd8e SHA512 66c722f65590785f005631f0edb46f427cc4d9028c71ffbb1fb4eaa8d8fdacaadbcf24f81edc41e464e156b2beb65ecd1166b3d4aad4630ccd9fcaaa2e72e2a6
+DIST msmtp-1.8.16.tar.xz 375372 BLAKE2B 4567c323bf2f53fa878ed315dc4a2c524918de22305d2034be476373409bc61a9c841f0b9c6075e06e47eceb816ea24e9d6cb71c2bd94d9ba6738ae36ccb09b7 SHA512 5e7e39927007fe8e1763b13a83f44f6456e8e9efade8e1c3148f34d5c2b5aff51b1e4519337628776e6bce91066de9f145c7c2957927cadb0962a25452a47247
 EBUILD msmtp-1.8.12.ebuild 3297 BLAKE2B bf4ab8187207ab3b758b3cab1042c69d8f75cd64425f1300e7944f35278bfb2b3e37e52a474b6efd9711f736b49839be859fed8eba929d381c658615592eedaf SHA512 9a2668b03d3085c43ca58cae3483846064f15d065e2c00b36563272c4910491b31265ed735950a7809f2823b0e02d28589bf524e8b8d8a8466cbbad6fb0739bb
-EBUILD msmtp-1.8.14.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
 EBUILD msmtp-1.8.15.ebuild 3302 BLAKE2B 2faa958f3468bf73ae0845d6031765aea2b4650e42efe5fd53d9c54299330ae74ed10879798eb8b3908620cca309799580adfdb7d421c68b76463f5ad72aed09 SHA512 73e06a491e0749b6df372e2aa4e7d990d1d7a37bd9e4aebe2a8dd1b44d10e767cdb8857dd309ab83f4360c9f423ca639e30a600b6d12903f626a862011302c5a
-MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
+EBUILD msmtp-1.8.16.ebuild 3302 BLAKE2B b6b3b0095e5f15b3c19dc82b899fd91a8dc58f9072f9be88a3fed687ab9002814310b838db3a8876042ac066f6b8d87c7a72a57490cdc66d490d7bcb6fff3d11 SHA512 981a8d74198896fedbe72d9e473c5084463ec253e3956fc4e020da885cd5ea8905c0cbc8da454eb8dd3a0fbea3adc93c628735b3e38b6d49342b04582523b455
+MISC metadata.xml 471 BLAKE2B 2f73e5ba3eb891844f14bcd4792a4a1df6f2bc90839819a4489fca29128d4268962e6f4cc781b99942e0f54b85a99554293e50f8be4680c58df38fb90f199916 SHA512 22bf1461c446daf3c854cccce644cf6647881878c346f2bd6390f69eb397dfa608d15cfca75bdc3a58fa4c86b2f69e1224bab181c336e883726d9564a358db7a
diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml
index c45a974ebdfb..cfcbc3267d7b 100644
--- a/mail-mta/msmtp/metadata.xml
+++ b/mail-mta/msmtp/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>
diff --git a/mail-mta/msmtp/msmtp-1.8.14.ebuild b/mail-mta/msmtp/msmtp-1.8.16.ebuild
index b886b703970d..779561821781 100644
--- a/mail-mta/msmtp/msmtp-1.8.14.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.16.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit fcaps multilib
 
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 14613e3b7d67..bbd1bd701b5b 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -19,4 +19,4 @@ DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 EBUILD netqmail-1.06-r14.ebuild 4304 BLAKE2B 3f76458c2a06a2cc8a8d65403a68a0e765e8cabc922f7809f8c70fcd09bd59e7a43410df96948fcc4d0b4926613e396d43be376386685a6a114c6a1f5207bd6d SHA512 89a0da991e4e28c6ef9b21e0ee5c61167a21e42edb080377a9b55fa7ffe5f7ac7a58dc45f7f71de81a6b873dc5a2d29f7e993546967893ea9e448f0d7134ec00
 EBUILD netqmail-1.06-r15.ebuild 4322 BLAKE2B 05ac92d9d5beff0486051f2bde046339800fde8346ce4c7d23c439b05e5bb7677b258c1f4dbc1f1b4c4f05c228595fad06ca09cb0bda0d3f41147e3867a2674e SHA512 2f34040c546583157744b4b67b101c77ff38e35096a74cad98db5353b2993757bdbb3d526481111524b60bdb4321051e8175fd13318695a5ad608295e64ae29a
-MISC metadata.xml 750 BLAKE2B 57f6e3a507f543a4491fc7b0340050a35bb86efcf987d1bed48b9937fed56a225ff3e5e577a97038b2c21257e321f2fbf1c65f69ccb009c67891f9fcecaf357a SHA512 e973a7170cb17b6b322dd2c63e4bf56a90b6331cbcc7183a647b862e7d0392882773f9171b840f0dbdeb9a411fb72fdf4c000481fcf5d670003c3136327a1fac
+MISC metadata.xml 751 BLAKE2B 7c0193a46c76729399440e8f40b9779fa78ac271df7d10320fdfe3ae626b16e764621eda348df7f83a8e4aff937e860cd84147c267061beb53313c18f1c2472b SHA512 6d6d1130e64a8b7ece04841047a80287bfe2c60b9ffc3517435bb5750961ee254877b7563fa4ddb939a66d3a8559ebf3ffe3f856c02de0f1397c66d62a0c3183
diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 4b2019520312..820d3ed01222 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/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/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 44274bafc550..30f0d9192398 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -8,4 +8,4 @@ DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079fa
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
 EBUILD notqmail-1.08-r4.ebuild 4357 BLAKE2B 0703b5f20431a97a71394e840a1d6e73266efe0e575af5bc8001587f6ba9fe9b555dbcd24294aeb593ae7ff0f7ae4ee7439b6e7933c098ee1443951fa056ef8c SHA512 8fc5b44175d807f7f69b9cf868204a87c62e1dc2e744009c120f77b73eb07911fa41054f7abbe9976835f7fc0bcc5db98409c4379e82b52a5eae3755a51b9f69
 EBUILD notqmail-9999.ebuild 4212 BLAKE2B 912e80676f3d90c6ee04e176246eacd4fff76d99b5edcb29f2332925ad22885ceb71b7ebc5627abd590b707746d9fee42f3240ea8d222990c6683474956a1bff SHA512 b98f08f3ff2f5b006d6f02142eedd57744074a295da580d920533bd69182cfca2060536bc76c3e71ad7ee35b6d92889b5d0df0ffd69f68355bebe02f80f01c08
-MISC metadata.xml 807 BLAKE2B 3bbc2374094c3bcfab161787b20321ab8dac7e861c758f4803507d6063b3441c382ce8dd3447c6e939181d32d06547bf91c47d4928a1e5ce8a76eca6c7db496c SHA512 e0619acfcebadc9b2d1ff7c47767426528c74d157072a489b61f8cc61c549671544744c6fd74c4531c2bed04974157fd12010c5ef6b28380d11723446549084b
+MISC metadata.xml 808 BLAKE2B cc8d44eab1a8ceb2d0c46fee94d29b3fa631497d833c2404951a47c01898d33484db1f2c05571b66ef40d0293fbe396d8eb95b3249e85fa5c1fb0e0b320157bb SHA512 33bad8403da1c2fc99bc3fb73f4209fa297645b6abbe323bd3aabfc8b8b5fa809281ebd325742344a9b2d252a1f6c68dd518f9cbe63086ecf6d0e340ba6a7ea8
diff --git a/mail-mta/notqmail/metadata.xml b/mail-mta/notqmail/metadata.xml
index 820271ff4d05..b0dda7e29117 100644
--- a/mail-mta/notqmail/metadata.xml
+++ b/mail-mta/notqmail/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/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 73bfdf949bf9..d984bb3833a4 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -6,4 +6,4 @@ AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
 EBUILD nullmailer-2.2-r2.ebuild 4286 BLAKE2B cf611cb6d863235cce976cece7f89b06a6f0b97e104387d0355e0f506892bd4f5b7fc4bd8efc40f7fcb7a57d60b624f579401a9834ac4e9cb84c0aca0fdfad48 SHA512 361b2aa95cdb159094f3e3ed8cdae3a60b9283c9ee8048cf7e548dc465c2fef04ead6a183641690a089b03a0fd07a6d87b3127ffb712095809625a1d7cf7050b
-MISC metadata.xml 342 BLAKE2B ac05adbff1c06a41efb8b6c01995d7061302e3e829fa07008538aef00de9ef00e8e665a2d45e51e0886d092a9f492ac1cb194f9ab614b944147f9a8235608c71 SHA512 bde55b4d0d452321cab14b1f38dcf2f27caa6586acc1748b9be1cb6981c0e4e90e909129d3700f49a7405f8baba80c3182d6ce84c75260a87019e8be593bc091
+MISC metadata.xml 343 BLAKE2B 875614e5e584c0c08adda33673e9606fa5bd02261cce775e9e01ef537926fd9a078af23418f917add1b7ecaf2ecfd09f28b0f37e2421228bd80a1005ea677afd SHA512 bbd2a53c352c2197b75ee2286af771c2ff56ebd9a7ae9927e0edca9e1a3ba6e530ca3d3cf888746b500d4adfb36524aa045a9073746392b7ec075ad252836e20
diff --git a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml
index ead06a9996fe..a3778abff424 100644
--- a/mail-mta/nullmailer/metadata.xml
+++ b/mail-mta/nullmailer/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/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index ed10e854dabe..46030cc4e306 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -4,4 +4,4 @@ AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.8.0p2.tar.gz 860189 BLAKE2B 603e8516860eddefb1694ea4cb5631cec2df2a19fa3193b25388caf73c41e82d44e57847fc95b5187488cae629542e72ff2d5a17badc15cef1647bdb173d7827 SHA512 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290
 EBUILD opensmtpd-6.8.0_p2-r1.ebuild 1937 BLAKE2B dd60263e3caa42fb1311dae93a2327b98463cb3e2639b5fd02fb8e9133711c3e261556fced08cef07ca6a068398e95ba16c844e95678c39ed891ae7264c124c3 SHA512 870b990798fb50704cd7d3eb987f9a6423666315e065e928ef96fae31ce2ddf7110f8860ab6768ce6d9c46a5b52f7903eae6d07802defe795f3121ecd2c3487e
-MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
+MISC metadata.xml 596 BLAKE2B c9980fb92d6629b9b27d19c546a847cd5f3d94f2b09d1e7f7a6afe1db40a3ba4caff818ff22b2b4f2512abfd79809e364e54099f57c29b470437b12f6938a7e5 SHA512 e8cc5a798674d3fb92ad6c2aa00e48c1460eafddcf10326b7476f42834b6e9e4f4e159d17d3e3f92f055a396e4be41a9e5d47da36d61aa98b0300f4ff68b0449
diff --git a/mail-mta/opensmtpd/metadata.xml b/mail-mta/opensmtpd/metadata.xml
index 4a9db506441f..bd9351ccc908 100644
--- a/mail-mta/opensmtpd/metadata.xml
+++ b/mail-mta/opensmtpd/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>
 <longdescription lang="en">
 OpenSMTPD is an implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions. It allows ordinary machines to exchange e-mails with other systems speaking the SMTP protocol.
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d6d837f81426..a3ad051e4cec 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -10,4 +10,4 @@ EBUILD postfix-3.6.1-r1.ebuild 7982 BLAKE2B a2e700693bdabe624f503be1b09010518b6f
 EBUILD postfix-3.6.2-r3.ebuild 7921 BLAKE2B c4a41f841ffb79b1d9e6c4fc858d70a34bb6b261e6150366bd152691785a8df1da11c599ef31f27f7a07f1d581ea72538664309739b55177d4531214052510d0 SHA512 3eb3d37002ea634adf28d54c67912af98631e6ef7443a59be0fd990050f35fc941637a9fb2ca4202c1ee62e359b2a992ac1d7c99b6a8551e07e286f31b14cc0e
 EBUILD postfix-3.6.2-r4.ebuild 7972 BLAKE2B eb18cab2c20f1684395abae6afa06e4cea8db7543a1dedce106c6bc1b1b17996c842c76a68a4913a2d256e9e3c1e151dd1a3ddc535541d7b39a425f63413610b SHA512 1df2d5dfbd7c065a82386ce2a7d2b63891436951ef02ec250241bf17c2e2d95867c14d15cc5a211235da0dc40ab89737f4db6c8505da8395c8cb993ae81e4e8c
 EBUILD postfix-3.7_pre20210815-r1.ebuild 7929 BLAKE2B 164ff69129c6d4a246dc15a4c27340c6500df5d701da2a0f0d451f9fbc013afb848103c640f873cca58f5cc8aa8696d2b31cc5a0bba69581557349136c067731 SHA512 4c6fe1b2625c343f838313ae08128e81629c6ec76714481a165838d6a9aab56287318391fa7f93e5891120c11f4b0a3dcdd0d49a0d75f604f39625c2f06ce72f
-MISC metadata.xml 866 BLAKE2B 341527ecb22f2ec1bb1125c0c9bc9191935ef6f64a7dcf5c3320f7a245b8480eadca539359cb62af1f89ea9091074d621e88c1b2ba2437d1e367cff3c7856b8f SHA512 3f1dd670329e7752770de72e4df9e984e17346a3ff6ff01a9f16fd251f4dde67f59a4178b253ba1fb76c16c2bcd9ae390e15db97de1d3f550581408710a85a84
+MISC metadata.xml 867 BLAKE2B 1839d35c91007bb07e1a722b6b4751e9f7754e00109859efe5850df16486bafbaeb019326d006438471678553aca9474462fa32eaba445362113ced6927bf4ab SHA512 ff898bdce2b60bc52a0d326f8f8221bd474cc4fa31def2ccc5526ba59ad396b0b26f22cc98ca4e1181e3c38e5476615e53bde2db1e643ae5b9209ac581ecc1fd
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index 27d992438320..c08e86d06fea 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/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/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index 366f5a8c6c9c..638bbc28543d 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -404,6 +404,8 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
 DIST protonmail-bridge-1.8.3.tar.gz 2728631 BLAKE2B f42d6b09dcef7777ae4605e81698e579d284dd6dd88da31ae1817d679f2b94baac6ee3b73ce172c4dbf1d5a07c4e17f52f59dc95e8b28e3b532be04531d06be9 SHA512 135fb12c6832ecb2476e801d00bca1d46fb3d5931b66c66d30da4f7e52a9d4437103a083fa3f72570d5035652adfcc9e0aafa5011f6eb212878db91c5bbcc53d
 DIST protonmail-bridge-1.8.7.tar.gz 2735961 BLAKE2B f3b95dc62ec88f6010e562e1acfe776703ffbcb0f64554683d253157ce886f10dbdabd7ce33f4e8c8f291fe5c89a9ee3c41e7ab4049d2f673c6d13ec391ab7cd SHA512 021856b4337cf467164d6a6369f8b303f127f52059f3291683151775d92828cced7b9dec38fc85c53e656d56dac81b06fdee0b5cc92ac0b588ba62c76c0c667e
+DIST protonmail-bridge-1.8.9.tar.gz 2735995 BLAKE2B e33f4dc5bec6f0e930d1ff87cdab56bb14a90178feb494d32176a2d87e7daf60db995e9347d0a9a0c453cf1e3f540368ed9552cb54a044b317297118839418c2 SHA512 267518b5d5499616ab6913d81999d144f005ab90ffa58d8e3fe3a46c404a050fe4e583f7eea6cb60bab1fe93c6bc5ac2989aba4877f713874f01deb4e4807bc8
 EBUILD protonmail-bridge-1.8.3.ebuild 22606 BLAKE2B ff0e8d79f12d449678d8050a39801278fd9a4d08c38f37ecf3081417fae7f74fb71f79e173ffbbf81dfc4f3deed55664917cff4a2fdc1beaaf52b402fd90618c SHA512 bee10c3a9376f83409cef80135600b5b6f78c185b61543e8d4497b0d904c582c506f88f994b3340c0338ad73076e988aeb64246ccf49488ed8ccb18507509ffe
 EBUILD protonmail-bridge-1.8.7.ebuild 22679 BLAKE2B 3e1fa2eeaec891c86a3f681fbcd54f96ec825aab39dd30a86c79f7872129fa9fab257e4abf1eb70c028af4ab1189138024e0497727f744ea60aa6201c9a6e71d SHA512 b66dc949d47177cdae382bfb531d5c1e3f25506689008d84c3ff741772c2f2407b0ead23525007082e87d74f634ec7244fbd804aa8574c7221f3ded5f6fe9f23
-MISC metadata.xml 618 BLAKE2B a392fa79076ac6eed79581e425edc46eeaa42e4ff3193fe23845062f4de9e8e9edc067473724707ce07025973f0942bdebc94b10c7f02f1e477835ce969ab556 SHA512 813f43dcdec361b1fd0f354245e7572ef2061500bea09fcf2712c1d44883cfadbd0c37dcf960d5dc34c848530a3dd80abaeb6b5da26fbb81363116ec737a1c84
+EBUILD protonmail-bridge-1.8.9.ebuild 22679 BLAKE2B 7428999aa91e4b61a2e058a41592884b1f2e327f445717ddfeed5fcd381a4b0953afcd912175000ea98fc327a65cd4dd9c69c128a8a3779c9d0d5871e2670d01 SHA512 c37e14bd8a5678a7857bbe5e74ce5ed001ae1740a4feb1cdd4d367b35ce5a8460888c1be2cd2ec5740d16a59decd07b83b3868f0182be62fe17db556e97b800e
+MISC metadata.xml 619 BLAKE2B 3350b5193ecc34b4511694c91a0990dbfed6204fc1e2db2acd869da46249bb73acc690cd186771eff77968f6d4009991a23f3e3055b6e4f3092d0da6aac026ac SHA512 7f21301b2375c7173750bf67e4df84aede219a5a7dc4b4b55776a6486eda1f7e3693677a10cf7b6971335b2df3b275bf7e4f27e0b22e3cf23420a8db858eaef0
diff --git a/mail-mta/protonmail-bridge/metadata.xml b/mail-mta/protonmail-bridge/metadata.xml
index d95a88ac3710..8795413ea236 100644
--- a/mail-mta/protonmail-bridge/metadata.xml
+++ b/mail-mta/protonmail-bridge/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>slashbeast@gentoo.org</email>
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.8.9.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.8.9.ebuild
new file mode 100644
index 000000000000..13121c77d019
--- /dev/null
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.8.9.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd xdg-utils
+
+EGO_SUM=(
+	"github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1"
+	"github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1/go.mod"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod"
+	"github.com/CloudyKit/jet/v3 v3.0.0/go.mod"
+	"github.com/Joker/hpp v1.0.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.0"
+	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+	"github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57"
+	"github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57/go.mod"
+	"github.com/ProtonMail/docker-credential-helpers v1.1.0"
+	"github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod"
+	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a"
+	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod"
+	"github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac"
+	"github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac/go.mod"
+	"github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde"
+	"github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod"
+	"github.com/ProtonMail/go-message v0.0.0-20210611055058-fabeff2ec753"
+	"github.com/ProtonMail/go-message v0.0.0-20210611055058-fabeff2ec753/go.mod"
+	"github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a"
+	"github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod"
+	"github.com/ProtonMail/go-rfc5322 v0.8.0"
+	"github.com/ProtonMail/go-rfc5322 v0.8.0/go.mod"
+	"github.com/ProtonMail/go-srp v0.0.0-20210514134713-bd9454f3fa01"
+	"github.com/ProtonMail/go-srp v0.0.0-20210514134713-bd9454f3fa01/go.mod"
+	"github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5"
+	"github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5/go.mod"
+	"github.com/ProtonMail/gopenpgp/v2 v2.1.10"
+	"github.com/ProtonMail/gopenpgp/v2 v2.1.10/go.mod"
+	"github.com/PuerkitoBio/goquery v1.5.1"
+	"github.com/PuerkitoBio/goquery v1.5.1/go.mod"
+	"github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod"
+	"github.com/abiosoft/ishell v2.0.0+incompatible"
+	"github.com/abiosoft/ishell v2.0.0+incompatible/go.mod"
+	"github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db"
+	"github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db/go.mod"
+	"github.com/ajg/form v1.5.1/go.mod"
+	"github.com/allan-simon/go-singleinstance v0.0.0-20160830203053-79edcfdc2dfc"
+	"github.com/allan-simon/go-singleinstance v0.0.0-20160830203053-79edcfdc2dfc/go.mod"
+	"github.com/andybalholm/cascadia v1.1.0"
+	"github.com/andybalholm/cascadia v1.1.0/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c"
+	"github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/cucumber/godog v0.8.1"
+	"github.com/cucumber/godog v0.8.1/go.mod"
+	"github.com/danieljoos/wincred v1.1.0"
+	"github.com/danieljoos/wincred v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgraph-io/badger v1.6.0/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod"
+	"github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a"
+	"github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a/go.mod"
+	"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342"
+	"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342/go.mod"
+	"github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c"
+	"github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c/go.mod"
+	"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26"
+	"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26/go.mod"
+	"github.com/emersion/go-mbox v1.0.2"
+	"github.com/emersion/go-mbox v1.0.2/go.mod"
+	"github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod"
+	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21"
+	"github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod"
+	"github.com/emersion/go-smtp v0.14.0"
+	"github.com/emersion/go-smtp v0.14.0/go.mod"
+	"github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594"
+	"github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod"
+	"github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5"
+	"github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5/go.mod"
+	"github.com/etcd-io/bbolt v1.3.3/go.mod"
+	"github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fatih/structs v1.1.0/go.mod"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/gavv/httpexpect v2.0.0+incompatible/go.mod"
+	"github.com/getsentry/sentry-go v0.8.0"
+	"github.com/getsentry/sentry-go v0.8.0/go.mod"
+	"github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod"
+	"github.com/gin-gonic/gin v1.4.0/go.mod"
+	"github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod"
+	"github.com/go-errors/errors v1.0.1"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+	"github.com/go-resty/resty/v2 v2.6.0"
+	"github.com/go-resty/resty/v2 v2.6.0/go.mod"
+	"github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod"
+	"github.com/gobwas/pool v0.2.0/go.mod"
+	"github.com/gobwas/ws v1.0.2/go.mod"
+	"github.com/golang/mock v1.4.4"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.5.1"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c"
+	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imkira/go-interpol v1.1.0/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod"
+	"github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod"
+	"github.com/iris-contrib/jade v1.1.3/go.mod"
+	"github.com/iris-contrib/pongo2 v0.0.1/go.mod"
+	"github.com/iris-contrib/schema v0.0.1/go.mod"
+	"github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7"
+	"github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod"
+	"github.com/kataras/golog v0.0.10/go.mod"
+	"github.com/kataras/iris/v12 v12.1.8/go.mod"
+	"github.com/kataras/neffos v0.0.14/go.mod"
+	"github.com/kataras/pio v0.0.2/go.mod"
+	"github.com/kataras/sitemap v0.0.5/go.mod"
+	"github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d"
+	"github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d/go.mod"
+	"github.com/keybase/go.dbus v0.0.0-20200324223359-a94be52c0b03/go.mod"
+	"github.com/klauspost/compress v1.8.2/go.mod"
+	"github.com/klauspost/compress v1.9.7/go.mod"
+	"github.com/klauspost/cpuid v1.2.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/labstack/echo/v4 v4.1.11/go.mod"
+	"github.com/labstack/gommon v0.3.0/go.mod"
+	"github.com/logrusorgru/aurora v2.0.3+incompatible"
+	"github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/goveralls v0.0.2/go.mod"
+	"github.com/mediocregopher/radix/v3 v3.4.2/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+	"github.com/miekg/dns v1.1.41"
+	"github.com/miekg/dns v1.1.41/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/moul/http2curl v1.0.0/go.mod"
+	"github.com/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce"
+	"github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.3/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pingcap/errors v0.11.4"
+	"github.com/pingcap/errors v0.11.4/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/schollz/closestmatch v2.1.0+incompatible/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.7.0"
+	"github.com/sirupsen/logrus v1.7.0/go.mod"
+	"github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966"
+	"github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf"
+	"github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e"
+	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod"
+	"github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d"
+	"github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d/go.mod"
+	"github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d"
+	"github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go v1.1.7/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ugorji/go/codec v1.1.7/go.mod"
+	"github.com/urfave/cli/v2 v2.2.0"
+	"github.com/urfave/cli/v2 v2.2.0/go.mod"
+	"github.com/urfave/negroni v1.0.0/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasthttp v1.6.0/go.mod"
+	"github.com/valyala/fasttemplate v1.0.1/go.mod"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
+	"github.com/vmihailenco/msgpack/v5 v5.1.3"
+	"github.com/vmihailenco/msgpack/v5 v5.1.3/go.mod"
+	"github.com/vmihailenco/tagparser v0.1.2"
+	"github.com/vmihailenco/tagparser v0.1.2/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.2.0/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod"
+	"github.com/yudai/gojsondiff v1.0.0/go.mod"
+	"github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod"
+	"github.com/yudai/pp v2.0.1+incompatible/go.mod"
+	"go.etcd.io/bbolt v1.3.5"
+	"go.etcd.io/bbolt v1.3.5/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod"
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+	"golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190910184405-b558ed863381/go.mod"
+	"golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod"
+	"golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec"
+	"golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190909214602-067311248421/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69"
+	"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/go-playground/assert.v1 v1.2.1/go.mod"
+	"gopkg.in/go-playground/validator.v8 v8.18.2/go.mod"
+	"gopkg.in/ini.v1 v1.51.1/go.mod"
+	"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+)
+
+go-module_set_globals
+
+MY_PN="proton-bridge"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/ https://github.com/ProtonMail/proton-bridge/"
+SRC_URI="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Some of the tests fail without access to a keyring service
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+}
+
+src_compile() {
+	if use gui; then
+		emake \
+			QT_DOC_DIR="/usr/share/qt5-doc" \
+			QT_PKG_CONFIG=true \
+			build
+	else
+		emake build-nogui
+	fi
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe proton-bridge ${PN}
+
+	systemd_douserunit "${FILESDIR}"/${PN}.service
+
+	# FIXME: USE=gui will probably need more files
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use gui && xdg_icon_cache_update
+
+	# Don't bother checking for USE=-gui here, it has never worked yet
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn "Please note that following the removal of ${CATEGORY}/${PN}-bin, the executable and the systemd unit file installed by ${PN} are now called simply '${PN}' rather than '${PN}-cli'"
+	fi
+}
+
+pkg_postrm() {
+	use gui && xdg_icon_cache_update
+}
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index f37fc8717baa..f5a0b1bf5573 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -6,4 +6,4 @@ AUX qpsmtpd.xinetd 526 BLAKE2B 1adea2cc681c9902e1c99479ac8d8d2a750de7241273e0fa4
 DIST qpsmtpd-0.95.tar.gz 367400 BLAKE2B bd77d8f203f1adf5ad6671fcd958bd97c5321317b51ceb9b9320cd2bc2fb82687b0d367618ad74905b3c4d44f0e83291d6330abbf4f8d01cd1d29ba7588f2df5 SHA512 4265606ecde68eda92091e2c3c27645baa131db4197f3d135932dc2ad8d76c1fb6c25ce267ab421cab3a4a9902aa682e4be87a1228e41b226705a64e440ffe87
 EBUILD qpsmtpd-0.95-r1.ebuild 2028 BLAKE2B cb2e90ac9fe423c265d0f7ff69ad3d43882bc42c1f775b98d324d214c44d1bf861c96ca1c44f2d0db39b3b9707386a8402add58c2cc5e6f40ccc46cfff77128d SHA512 1e7e9d1ab0c42a3f7eb3a1dc560f2f4a7411cad6119f35fb3e38d8a315af382cadcebd4f535a5db381a130a42db9129ee111036eee80fb4f09992407011f58b6
 EBUILD qpsmtpd-9999.ebuild 2028 BLAKE2B cb2e90ac9fe423c265d0f7ff69ad3d43882bc42c1f775b98d324d214c44d1bf861c96ca1c44f2d0db39b3b9707386a8402add58c2cc5e6f40ccc46cfff77128d SHA512 1e7e9d1ab0c42a3f7eb3a1dc560f2f4a7411cad6119f35fb3e38d8a315af382cadcebd4f535a5db381a130a42db9129ee111036eee80fb4f09992407011f58b6
-MISC metadata.xml 377 BLAKE2B 8bbb87961e42890dfbe28cfcaf4dec032314a0eaefbcabc063706606ef8cedbf95cad32958f2789da6aeee564c7fa0d690ef15f491cd8cd220d03ec5943140e0 SHA512 14a288d1baefa7a16d7977bb91c341a7a70b6f29c3617e2fb3b24bbe5f6c378b428664138ee630cf6d94a0613a687d385adacc4e73f6c1531c82c9e63d0db95b
+MISC metadata.xml 378 BLAKE2B 07bafec56b33e2387a689633de59f46373a38399a1eae69fe575b0c5e72ff0ce1359c6cf5d566c15b79e2d7d2b7634e09abac243338d3d907a26a531ec9db13f SHA512 fb7f5c4190e1d8687584d5a97bb83790f2bde9324586d97016e2002d81266a5d25de43125d9dd4472a9f8466a3492572a373776a1677bd28634abc12d9199576
diff --git a/mail-mta/qpsmtpd/metadata.xml b/mail-mta/qpsmtpd/metadata.xml
index c2cf860bc2ad..36b1f2735add 100644
--- a/mail-mta/qpsmtpd/metadata.xml
+++ b/mail-mta/qpsmtpd/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/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index a9095225c5e3..1753b40e6f98 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -10,4 +10,4 @@ DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638c
 DIST sendmail.8.17.1.tar.gz 2284027 BLAKE2B 4cbbc2bb536a48ea27994721e9dfefff7739ef1c825bbc0397202e600d8dad8f9a2572a777204693cf9630f767865d50566f0827be6b52be41c1e25532cb394c SHA512 ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15
 EBUILD sendmail-8.16.1-r1.ebuild 6145 BLAKE2B 2658a8af147a832ad5c557b014211a75acff24c13b6053490435e5694284feedd6850bf8072eb381b69e042967ae09349e1d96cb08cbecbcabf9b5102d4e4c7a SHA512 5d6dd7fd32b0d5b3959d6e0addae86e7c06095b01af83ddebb09b93e28fc23f514697efc9056cc940bd0b62876b48ce64fe4d025f1911f878c1e6c90d3f157c9
 EBUILD sendmail-8.17.1-r1.ebuild 6197 BLAKE2B 289e70d6c1b3a04a931429afd085c22565e5f021330d7394ac85d74c09a7f3632dc4e77dab20e65f5f06e6b6aa71e57a8a0646cbe7c1a6411ab23ab39967d8db SHA512 beb595a1019c2628094d49189a306e255213083e7c917cf2a3e7669d4e74d4d2ade5bb2d7364c3b0184d35efd79d5588dac3c57caf292c040fb01a326a3f3d5b
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/mail-mta/sendmail/metadata.xml b/mail-mta/sendmail/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/mail-mta/sendmail/metadata.xml
+++ b/mail-mta/sendmail/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/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index ff04f8e022f0..b961f37348b0 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,4 +1,4 @@
 DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e296031580f63ed489a9d2559cd8846761e78c6fdfc1a385e645f990bc739ce3cf3ad0d1c1a3006dd3bd60e4a38c4f4 SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a
 DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72
 EBUILD ssmtp-2.64-r4.ebuild 3544 BLAKE2B d6ed897d1434460c858a1d3035592d3a408f2f7a3e377c213b86676102885286a61774c2fda6f30515621eb7df384058e0c67a3445a52071b972b0eb4a91aed2 SHA512 64b1db8169ea706d57f92dd11593a40ba0d79d038b2dd0646659bda529c46bd0f8de37633abbf023fe2967abd6ec7e3d1a137e88ed14e0bf488ac0ab56c5fefa
-MISC metadata.xml 259 BLAKE2B eb59516b105b0fdc4b755c3852b714707dba4f5b414eb0eea763db68aa0c5d1971b55866972ef14f1e3e5bc81ccb66975a24b9292aa796edf02877d649a661f2 SHA512 3e7a5afefe4f2095be4347e56af64eef343bbb4920ef80a7d93c88111864e8993f899328af33e736324960d26f30939e29e001e90381548a353ee0089f96a766
+MISC metadata.xml 260 BLAKE2B f96b11c227920f879747b300fc6477b855b8e8be2124d6ef0e92dc736dc26c4dc76e771566ffeeda9040796048e87a56982650dbbdec58b16bb585a251222f53 SHA512 9048e40f4fe34b95b6e528d34d2911f4dbd772d055d29bf1b8ecf6b7a4e0862e2f8f2cada011be9be7eb0e691d57380ec063023016856d4faae009e741991054
diff --git a/mail-mta/ssmtp/metadata.xml b/mail-mta/ssmtp/metadata.xml
index f7077a6abf8d..a045ef1fbdf0 100644
--- a/mail-mta/ssmtp/metadata.xml
+++ b/mail-mta/ssmtp/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>