Merge branch 'edge' into next

49 files changed, 441 insertions, 794 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 0247604ec00d..2d6d64dc8f1d 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 8f695796c1e4..486bb4f35e19 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -4,5 +4,5 @@ AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae6
 DIST automx2-2019.0.tar.bz2 46670 BLAKE2B 6f62b4429be8046fce18ccba6827879a99627d8fbe9cf7973d8059e87b4968a280b62d5d005aaed3b0e1074053f4a6355c34f2cdce2f06a9afb14c52b4504fb7 SHA512 e494a48ffd3e6d133a89db5afd1dc75116a8efcc41f0571a24271bcbe6074c86d62184ce00bae9ced888a70be7d20f2a3614f28007d4481537d42c680dca4daa
 DIST automx2-2020.1.tar.bz2 49405 BLAKE2B 2c9b26300e32e613f622e0b3a39b7f408d22e22638d61da3c93f5d448fe3ebb325e9a0004e3351abed2c9e427373c42637e3539831c04cda8e65a4d1bba1773e SHA512 823e569eacedcf49d53f8ed623a75455e715e3d49186179927a0e10d3efe9823c336912789bbf3d7d2f9aba3053b601352c99bda4ffcc9a7b78e412c938cd91f
 EBUILD automx2-2019.0.ebuild 1020 BLAKE2B a485a862178572b4d6f795c098c2e973491e5024d3bf12d68c50eff2f502f3a848a85e0b4fd50dac7601aa953f5ddc30c4e5038a53defc2f12beea8e3e69de54 SHA512 bbe51e2f4fbd3b13ee3f30e6e7d95bb20021ceeadd3daffee5d1c538395a40539f0f4cd65c14f5d0288d230fbb3dd61f06b79cac4026090683e829dcced22c01
-EBUILD automx2-2020.1-r1.ebuild 1052 BLAKE2B 39e5e374d276e49ebe68707154dc0f59ae652f5bfb4ae4151dadecdf687d088c722765df83b2b987666ae7af2cef1613472f4d5c57446b38adb9c7059eb5063b SHA512 d19477ea031e6cf3d3dd87afb1e3794df333d5621d90e6b2ec61c038815f05def92b5fa92cf376948038d835c877bb38b5720060cf70622465d6e738bb11b3a7
+EBUILD automx2-2020.1-r1.ebuild 1051 BLAKE2B 2e2568827ebdeeacb4b498b8957194717a79ea42dfeff122ce147fb9265e5b3e8d1b3f59e48f6d57a18aac46926fa2a7f749694bc052bb530bcb51aac7935119 SHA512 fe8c8bed829328968351bf490542331dfba4438eac36b1788beb5a8cea57bbbec9d94c087ccdd81e5f9abd122448285fb2f75d0fefb2c97fe40eb5e7a517070b
 MISC metadata.xml 887 BLAKE2B 7ce022391bdee85ab1ef45f2ea94fa1b17731879d883a582bc775efe1f75d67fd6fd178aa6a3406b57caa20ca646773dbae3b43bbc636a99ef414d03f9bbf6ff SHA512 dedc41f6f1e6a3ce8cf1041841d3e981e7cac0ee00815e580a15013bdb09415df65136ce169899dc719a705ef61e02c5f17e8d7736c6a74ed9ae2b2748c82fd8
diff --git a/net-mail/automx2/automx2-2020.1-r1.ebuild b/net-mail/automx2/automx2-2020.1-r1.ebuild
index 27bbeeef2a14..9f1cb15d65fa 100644
--- a/net-mail/automx2/automx2-2020.1-r1.ebuild
+++ b/net-mail/automx2/automx2-2020.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 BDEPEND="acct-user/automx2
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 39a05cdc0dd1..a5f2d3d8b30c 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -13,6 +13,7 @@ AUX courier-imap-4.17-aclocal-fix.patch 299 BLAKE2B 605f76516a72269720d07e1e8fc8
 AUX courier-imap-4.17-db4-bdbobj_configure.ac.patch 1499 BLAKE2B d619e493b066e0d60d083339ea2c7d09902a6aaa7a49996d47f895cf4e72ff5adc6a06e79c0173c548db10c66c31cae7b9aa69d5516c5acb487517ece328ed0a SHA512 2d1db6d13194b5e0866fadab40453264a07df8bf26b241af9f130b79dd800a4bb888a28151c7833b375315f43c9c42946312bc36220232a372179b23e5107b30
 AUX courier-imap-4.17-db4-configure.ac.patch 1464 BLAKE2B 7f3aa5c86c7d12d369844757dbb3038afe9d12a034ec5d63860df76dba86ce18724fefc2c12f5596a27620ae05849ec9595ba1e410cadb0853dc4c322f965dd9 SHA512 55433b330d1039cd177af058cbc4a2bf7a65e53b8ecf29955c499dd6a68d634d7582449f54d1c70675ed759586e4d9dc7f43ce3703113e76df81b2a8703085bd
 AUX courier-imap-4.17-disable-fam-configure.ac.patch 807 BLAKE2B 69e7a2f30944191129daef4632e65d74d529f595101f6af804a4c9d9c4e5bf8026aa759963d27ad0a40cf3e25ad9c6cb2083ae8ad69107953b6a988b4d650667 SHA512 c1933ab15843a7009f7d7408eb5085452b5575e01727980e3df2a2b79256fc7f8d0d62403ad6906f250249cbbbc516d442b29d5fc70537fa7aa67837366be164
+AUX courier-imap-5.0.8-ar-fix.patch 263 BLAKE2B d21499a4bda24e7434cc41a29a9eadfeab41e52fd4b6a2d58569789aa76f8c73578d1a3c412021cfcbf56d8e33138c545d6d921e1030120dee8309e37679ec14 SHA512 a25d0e40a43a3539c7f5bb0e694a410fbdb3a5538ee8c5c82bd0c361023f4d5d8f40002fe2b79f517366cbe004d42238d6190642d003660ffd132142a959c840
 AUX courier-imap-gentoo.readme 2827 BLAKE2B fc45b7180165b5ed69a1722c268d5a6f742a16effe3f883b7ed268ee8b76527675d7b792712bfdb2b68d5bfe49fbc9d2e6af61ba2bd5b3dbed28f9be6ba397b8 SHA512 a677218ed39483dbe07358382f557a877486d5028b890ce25822663a6fff58a4744d245537a5395c7a403a566522753c91f9c0c511b9a7229ac1ea2ba4a9c54c
 AUX courier-imap.cron 32 BLAKE2B ccdf922262a94899370df48f49654e57c77758abb7843e112bf3232752ae25e9fc19337a425bd30914e1207a5bdcc1ca258ab8780a3516790c31eaff51a77039 SHA512 a4d3c648e83d3e067321cb28e613eddd1f689532e67811ae612089c43b1d8b163459d138fdd695cc11a0aef399028c880f7a97b33745e1fcd84ffd9b61e6ee93
 AUX courier-imapd-r1.service 299 BLAKE2B 7b1fb3acc3b75cac873967f1eca099e9f65951feecb2fe6cded69ac437f47387bca493071012c1f98b579c184cdbbf0f1e464eed44d441a308f370fe112f4365 SHA512 5b44983d067b447bc60bd5365340c7ffd0c7102eba93fd87dda6cafb95c8625efe5badfaa4607c13a21ce37a7e781f5b81a47b9b18666403263e3d8789310d44
@@ -22,5 +23,5 @@ AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d1911
 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
 DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c
 EBUILD courier-imap-5.0.7.ebuild 7192 BLAKE2B b837f5e1fa3bc6bff54dfa3d2138ddc6ce951dcfcd5fbae2181a02eb1436dc25ce3f902eb05a80f29412a45dd593adc7f1618a4dd733727d0c1e793f2268654e SHA512 269e8c6810978ddfd59c768b591ae88d4ab31af6aa2e0e8a0a05913bd8afcbf754e279d090d8facbe6cc8cb4c81f5b17f76704c972e4694ca0042111732a9438
-EBUILD courier-imap-5.0.8.ebuild 7201 BLAKE2B 46c82223b33b151946b01ede4b2e2fbc0ec46b312127f7c5c639937d3b72c5e6cf8b4d5a07b5212acc51d1d1a1fbb75ee2417de5d59a6ca21a58b6b137696cf0 SHA512 20e3f77b3c7c961c4210dc53f4ce586e97361ca233fa5592ddff36b411179cb0c6ce2c8182bdc3ff505ea7963675ab731f115809b3af1a515f345292e19333c9
+EBUILD courier-imap-5.0.8.ebuild 7234 BLAKE2B 85d1b623155d06c51cb34c07d39b056688b591b7c496c0793112c477bc1051585386ba6783a761e76cb6fe2f71383ab3e2251b43823e2d8cc98b827646eaa3b3 SHA512 79d89096d502a8491cc5add10a108000a19a282fb746e12314d11ed5a29bd3623bdf208b0cbf4ccf741db2db47d170ff19cae069ec4b224011095f7580b28e7d
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-5.0.8.ebuild b/net-mail/courier-imap/courier-imap-5.0.8.ebuild
index f12cb6999da6..2241aa00f31a 100644
--- a/net-mail/courier-imap/courier-imap-5.0.8.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.8.ebuild
@@ -68,6 +68,7 @@ and rerun mkdhparams if needed. Location has changed
 PATCHES=(
 	"${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
 	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+	"${FILESDIR}/${P}-ar-fix.patch"
 )
 
 src_prepare() {
diff --git a/net-mail/courier-imap/files/courier-imap-5.0.8-ar-fix.patch b/net-mail/courier-imap/files/courier-imap-5.0.8-ar-fix.patch
new file mode 100644
index 000000000000..b21de6d904ca
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-5.0.8-ar-fix.patch
@@ -0,0 +1,11 @@
+--- a/libs/soxwrap/configure.ac	2020-05-08 08:23:11.243813555 +0200
++++ b/libs/soxwrap/configure.ac	2020-05-08 08:23:26.255575196 +0200
+@@ -18,7 +18,7 @@
+ dnl Checks for programs.
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
++LT_INIT
+ AC_PROG_LN_S
+ AC_PROG_CC
+ 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index a26b41cb0d5f..0b45ddbcd484 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -10,5 +10,5 @@ DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfd
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 EBUILD cyrus-imapd-3.0.10-r1.ebuild 5982 BLAKE2B bf66be0f1d2d3ecec9f8f8becfe3f30e670a578dd2134d5286c94cfaea66e4d6dc3401ded3d62de117930f8cf82495bf720532f72335ed697187b01fc68c2a2f SHA512 176f44ce62781cd4390a22c800f64b4eb09cab36c707ada066c52a623b508b28bb5797c9fbc6cced5424ae0846edfa5991453fa162676115b1ec5da9d5773dfb
 EBUILD cyrus-imapd-3.0.11.ebuild 5986 BLAKE2B 88c0ee292037ad25157cb3a3cfcfeace9057aa945cfc57c121dfc6e068c072061a0ca8f94b439fac8dca84ebe2728a9f67b0fa8849b4ba284afa19cac00dc30a SHA512 286cb4d0d755b3ade98ce722ba4c684c7f4424a015f9d2f162fb0dfd6a31c8f2d98dff65306b449ad47730791e76b45dcb86edc44e7df9f7ca5b9525d31a4b83
-EBUILD cyrus-imapd-3.0.13.ebuild 6072 BLAKE2B 8a2e1b938dcbaf992d9b22b8d8df0c8e2cfd9fd450d74cbe0e34265fa84f80d5c6aa4abf8811fcfd85e485da69e2ab6c132ff20942aa3a92f097e69863d0478e SHA512 41efc2a8c714e14c5ceb492adc483c6841ce9536c779ba0071e6959e3fc6dc05f90dfbaf3b1a969772a129f7329de4e123b7e05d9d009481e566581996715964
+EBUILD cyrus-imapd-3.0.13.ebuild 6069 BLAKE2B 462ed74a7efd3bf986dc3f06a55034b003dc079e073aee00e7ba918952cab179c6f6e14f436b11c7ab11b0c47757dbaeef5ae232608d057704e6d13b22d5488d SHA512 9d166468ffd343788761c57ec55b1b78a923ae85949c81292532c40305e57b3a5904a03434dfd0138ed9ce2cfc3e93168455ed8dd884e5d9f78f0618a2191d16
 MISC metadata.xml 688 BLAKE2B 123d6658cc5bd6f9ac3c20dcc7a06cf6300dcb83129d59e8b275d82b64c1c3ff2c315891c0ee432e6cfb445f74c78f49195e89a20616a51d70ef8bf25aeb9092 SHA512 77075e3673b25f4b4c31815f0bfa8f112e6609a36b9c57a843be5bcf9d5d1ad743e05010fbb4809960b0b74498763bc69b6abbe16e8eced683268398a7be077b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
index 73ea9e3ef7b3..349c1c1f07a3 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
@@ -10,7 +10,7 @@ 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"
+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"
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 1609c51afb4e..91daad209f6f 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -7,8 +7,10 @@ AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3
 DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
 DIST fetchmail-6.4.2.tar.xz 1261472 BLAKE2B 11d00eeef39ceda6374a66909e2f8815c2f22ac7321ccd47eff8387e71056a8094c616f903ac0502a0a0a18929c11d4102d116229f6f875f413e026735040190 SHA512 8ec62a5df81b9b8c5e5479d35a10aded22aca74f671cded339dc7ae1c78d8a8638dfe4f04be35334184b5b27f3fb857402dc5b587cca8ede3f5b9b268b37edc1
 DIST fetchmail-6.4.3.tar.xz 1261452 BLAKE2B a52adb55153e8b9765cde8fe232a34cdea005d69105337336282e5d16fdd87eb44dde166f3c0a3ac869bce5e53eff2b49db38e80be66bc8bddad9d50ea456df6 SHA512 090647f4c6102048a882ce48d4fd57fe2a02f43ab2cbef9ef6a8874c3e075295f0dc01493deab37e2d47d98f337560c465a37397fd6d9002fa280d88d57564a7
+DIST fetchmail-6.4.4.tar.xz 1259576 BLAKE2B 8943e3f8d8d2ca853c1e5540c12894d8b932aa1d8866898093f7ad1c5605b8a695c54d6626c91f312d24729c9477f21907dc18ffcc527159a0fac62e5f5edccf SHA512 ea2492ec86974c3d4c7c5f8707e0e12becaa3fe906b618620f129df96e403b8312390e55db8fd8b8a942708154fb90bf936e8d47e6c4d08e3e0dc95c80e8c1ff
 EBUILD fetchmail-6.4.1-r3.ebuild 2425 BLAKE2B 0b0d286df00bb756ac71f78c33cdc056445e5da44709bf79a90baf619365b43ff144a138b702dc26a1bcd839c568ebbb2f4d330d0338b11e0808eeccf8d2ac7f SHA512 f223da1769e3793e96f6856a2b5664dd4cc2b5454375728cde27d2be38435ca85ec119d2283a8c8af072bd61dd172b7a4be7c08cf45e943ec895baaaf73e79b0
 EBUILD fetchmail-6.4.1.ebuild 2603 BLAKE2B 68ba1e7d628a167658315341dddb67812d89640d454c674f49089894b34c1a217259201c61a8cf095e1b97ca4c0a2fd490b6be3bf8d9bcb27a40fa37741009de SHA512 811ad64d8a0f27da0b71bf086c8674191b68e7bdbf0f0c4154dc0d077dede58bc99b9f6c1ec5fd9cae887f97ee4b8fd4f3b560f419d3289715618d33b963636a
-EBUILD fetchmail-6.4.2.ebuild 2517 BLAKE2B fe582971ecd0459eb30d1205910f0b53bbcafdbbaf494dc3c150aaea257ef8c72be924c978d8880cbdd5b453cabe240783b53ee3d276556aab92720c7a11cc21 SHA512 e701abd5919fe7338797079846ce32b9eb28c22869d00f2dd4593f2e2be157032e6ff7a5e885a84fcf87c5dbc0557a4fd1170c005f772ffe95b202b3a0f528d5
-EBUILD fetchmail-6.4.3.ebuild 2517 BLAKE2B a00ecee666e6aa19782d672b7ab30f7cddc6404b9102bf0c6dd476dd8bef2a0ebf9321e24337a75866015e044d49588085403db29198abe7d0d2323265caa31e SHA512 a98419feba4ec8438a67315619649c27e400e6a6de243cdf864bd6a8bec9b3b7a76b78e5d5f99f6f8db4094440e18681ba889715f7e794e8db629db7a3723439
+EBUILD fetchmail-6.4.2.ebuild 2511 BLAKE2B 0ac6b63c6b16c14e541f13eb4da994016621e1206e24501ebf2d2247f3d26760df120be8cf232488a6c7717f6be49e90a2c5de3247dc486903ad849a03acde1e SHA512 13e5284a7ce64be413df9217bde47e8273af53e5c197d9de7fe83819fa41bb3bcd63b18c65b6662c8ea85f62b5bd2d3ffcb08079d11b0b3bc206a4e113eeb263
+EBUILD fetchmail-6.4.3.ebuild 2511 BLAKE2B 405af4d6378351ee89dcaab7737bf86d55601941849d8935f8d9b4277db614f0fe1b257d24103d4ef0f1b1c75ab7b1c98407e4888bed444d4bf9ad6459d79315 SHA512 10c089f1d4978ef08a52611f40074f8c203e3570e4c4f6f759041725c7b7431ef4b7194cadb3982e26d96137cb9884409d03b464ee4a886fd52219d4f9072037
+EBUILD fetchmail-6.4.4.ebuild 2511 BLAKE2B 405af4d6378351ee89dcaab7737bf86d55601941849d8935f8d9b4277db614f0fe1b257d24103d4ef0f1b1c75ab7b1c98407e4888bed444d4bf9ad6459d79315 SHA512 10c089f1d4978ef08a52611f40074f8c203e3570e4c4f6f759041725c7b7431ef4b7194cadb3982e26d96137cb9884409d03b464ee4a886fd52219d4f9072037
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.2.ebuild b/net-mail/fetchmail/fetchmail-6.4.2.ebuild
index 68cdd9ef3deb..fc325721ef27 100644
--- a/net-mail/fetchmail/fetchmail-6.4.2.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="tk"
 
 inherit python-single-r1 systemd toolchain-funcs autotools
diff --git a/net-mail/fetchmail/fetchmail-6.4.3.ebuild b/net-mail/fetchmail/fetchmail-6.4.3.ebuild
index 93531029a5b4..0688fb62856d 100644
--- a/net-mail/fetchmail/fetchmail-6.4.3.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="tk"
 
 inherit python-single-r1 systemd toolchain-funcs autotools
diff --git a/net-mail/fetchmail/fetchmail-6.4.4.ebuild b/net-mail/fetchmail/fetchmail-6.4.4.ebuild
new file mode 100644
index 000000000000..0688fb62856d
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1 systemd toolchain-funcs autotools
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.1:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	kerberos? (
+		virtual/krb5
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_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"
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	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/mailman/Manifest b/net-mail/mailman/Manifest
index d68f36efab83..323e3ae15b1f 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -6,13 +6,11 @@ AUX mailman-2.1.9-icons.patch 555 BLAKE2B c000931d44321f0eb9fabdf1a49cfcd05b2c68
 AUX mailman.rc 488 BLAKE2B 76f35e4e1a5257b6aa058b0cea29cf53640322d436a195140cd71b7bc749d4205fc4555b611b1713663604c08ca929b3aa57d60355d8e9e5e9b7056b9dc1c5f1 SHA512 bb97f6fec48cf474be66c1aa73adc874ceaeee894acc3fad76f4b3f5e6f82dcd4238a6915de941fe87f815668dfb6c5ffe90926c5aaaddedf7dc06dfa4c1a126
 AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3ea55ef27d11daea102a1ecae30ddda095c1bbf1b175def17b9ad2db5a3e0b8e694ab02ed94a557e87 SHA512 c4a5532666afbebc5aa69463ec9b9eaa2dcb03fdd8fd62307920a4572d0c795c1d93478236240746018be617c0eec0fcfcc1c711e8810140fb8ffbc0a9b71009
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
-DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb1c6fadb5d602c4e34e373ee7a0df0801e6b68b0816ee819f77caef33bbc4b8490df1c8f01fd2fb35664fd3757 SHA512 b09962ec99ca1ce1eafd40409a00f976dc47d82adb707313f4516400db6439af8597a1c4e30262fb228c102508ede688912480dbb1dcca9721bb0333693f1d85
-DIST mailman-3.2.1.tar.gz 781654 BLAKE2B ee9a9bf5505ba638417c363a885153dbaa795213a77ca9dd5abb7212ac0fe35d08c5e0e87da2d54aeb50d21c30df72a750bd25ffa0877d377a3871bded03c7de SHA512 b17fa878ffe539504ce7f28351f5bf3c7aafe29fe98957880a571e5b798ad4f9f56748fb69df699b8bf9889aebb6cef075c5d075d653fa5e9b6feb0322eab9e6
 DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f
 DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8
+DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc
 EBUILD mailman-2.1.29-r3.ebuild 5863 BLAKE2B ce55af2241c9ace4519e33da2fcfcdea4bd5fe04f17a4e075519e73f7153ebe1f385a4663a7042f720a28e96068bcfcbe28aedcd3d88e28a670a942dedf5a2ee SHA512 b221b40ad1dbece603eb7efd175cc52a66a5e298ae4b2e78dcef387f13a82b9597a0e0cf23bb4b052d5f63e911a307c0984a5e96098328743e3fb68a3971ba6a
 EBUILD mailman-2.1.29-r4.ebuild 6036 BLAKE2B 5c600f87ab4772e05800077ef0a320ad0f725ede719e93b8a0cf444f9bf80a7bd5f22b5331976584eb5e33c163d9db00ce9aa5c58a4ce99a2388b1786bf7e3a1 SHA512 06184706205800d5b48e888d2e98f86e9bc736288421625f13b90ebdf7cfc4c7ecbe35c0796576404c822ccf321ab248d5f0da040a5723fcd123ebfbdfef1b4c
-EBUILD mailman-3.1.1.ebuild 1165 BLAKE2B 0f23ed03b36809a7ec4c42ea629127a9c68d6fa75372477fb184d811baba80695178b2712f9cbce043d38bf2f102cd6cdab3398a61079602f3100ef40098589b SHA512 156febe4b2c60b71beda0c2afda90c2ad807e488b657677dce58e3f3ffa1e56388017c7fd4e8e9e6e0ced949a6038b7e74d514bafe759b57c39f7bf6446bb3af
-EBUILD mailman-3.2.1.ebuild 1414 BLAKE2B d6743ff352481fb1aa702e9df744ce1fc247adfd836d3277b553106a526b6de0fad82172574e2f41492d7267154e6044e5920f56e1ae66c046252f00ba09109f SHA512 5479caf3c63863c9c46b79fdea27f16e5a33223912a6bed5baf2d2e6fd765e0f62046d5c12726e7243fdbdc6e51ae0c9fc6f69303bf36bdbeca7c920396df310
 EBUILD mailman-3.3.0.ebuild 1742 BLAKE2B b528851e4d73acdcf459b0eae5224d3ef0ba14a7c13c3f9b92ab53e089dcc0ea2d23ce87fafd6aa1c4d5149d581e751010f0ace2ec1037d567027da13a18c416 SHA512 495fe29c164075fd7a4b85cba712115ea3e9193212a6e048febaf2b5ce1a719a765e99efeb17984659a03c3a93dc7c20a48df5c10a1e6a01667aaa6bb623c64a
+EBUILD mailman-3.3.1.ebuild 1474 BLAKE2B ff1f4e9c30bb04449413f387c37d0e3dabf62895ce8bdba42208ca2f85d0071e4320df2cae180ca1f62d880a6a3f67f5fa846de4534704369cedfa5b5adc89fe SHA512 afe16caa2ec32a4ded2acc05063393884c0409071a82505bc2efaff15941c8cbd03bb43a81a572a2cc7fc15ddd92cc1a86ac9bbdb2101a449dd1830c694871b7
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-3.1.1.ebuild b/net-mail/mailman/mailman-3.1.1.ebuild
deleted file mode 100644
index ebd8275e9c59..000000000000
--- a/net-mail/mailman/mailman-3.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="http://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-#KEYWORDS="~amd64 ~ppc ~x86"
-KEYWORDS=""  # nothing til this is finished
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	~dev-python/aiosmtpd-1.0[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-1.0.0[${PYTHON_USEDEP}]
-	dev-python/flufl-bounce[${PYTHON_USEDEP}]
-	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	dev-python/lazr-config[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-configuration[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
diff --git a/net-mail/mailman/mailman-3.2.1.ebuild b/net-mail/mailman/mailman-3.3.1.ebuild
index 108bd97f853c..f995b8d5bf69 100644
--- a/net-mail/mailman/mailman-3.2.1.ebuild
+++ b/net-mail/mailman/mailman-3.3.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="http://www.list.org"
+HOMEPAGE="https://www.list.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
@@ -22,15 +22,16 @@ RDEPEND="
 	>=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
 	dev-python/alembic[${PYTHON_USEDEP}]
 	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/authheaders-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
 	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
 	dev-python/flufl-bounce[${PYTHON_USEDEP}]
 	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	dev-python/importlib_resources[${PYTHON_USEDEP}]
+	>=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
 	dev-python/lazr-config[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
 	dev-python/passlib[${PYTHON_USEDEP}]
@@ -39,5 +40,5 @@ RDEPEND="
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-configuration[${PYTHON_USEDEP}]
 	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
 "
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 29bb55b6821d..ae341bc115d1 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,10 +1,6 @@
 AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c54105e9d9f4493e95d3494cfce6082f289358021e02bbaac580a1b4d78ca8b2cc713af57197e532431 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f
-AUX hdr.at 1400 BLAKE2B f7b3c5a2bf5ca268adefaac2898ce9a2823357ed77b4ab0f73a67cb878ef7f9265214a0ddcceacfbdf2e64a8d7dee3f0572ec044fdba7007b80bf2b4c9dea0a3 SHA512 f9b16a7726068b646dbde37e9c5293a0cfaa6baaa40908df3b36e125c5a06b52d946a8a0568db424009964965e90ac0d568e83345bcc9b1bce3b6f9157584b48
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
-AUX mailutils-3.4-MH-testsuite.patch 2077 BLAKE2B d9a85a3fe025fb9e3fa240abd901f8567803f94e9cba58055b62a2bcfbd9e60db7cfd332c3c16faf5ac09ab3d9b7a43eb2b2b791ecf006e6d731ad555aa2da67 SHA512 2f10b61c47ec4981f912f180619627959338d7cf73e277bb25d6021044ae4752317773e6f7a13e7cba1dbf6782b3e32e92e77e1c265184bff89e8a79ce813954
-AUX mailutils-3.4-fix-endianness.patch 2871 BLAKE2B e868b624d10ff62fc7508ce66309d9aeec5f66582c9090771d5a132e0f2541943cadd63c37f91f2191145161d336e6e62ede42922f14c4219f3ee768bc6fdfdb SHA512 e219a11c060505d61a7ae14e24c4edeee2f0fbf5a824571c5a497b4702374a1776a2307f3702921a42551c7a229c1739a54d1f2f14b37d896a965712d8ebb2ef
-AUX mailutils-3.4-fno-common.patch 336 BLAKE2B d488e13f63eb41344b1838c2832319625e44d70a226845070e3edf78043349b9b7631706e94749e45be910399adab8cc761adb7412b17230df66ac3c6c07020f SHA512 c4655129cf97b43583402a1f0619f91e38d3482ded2b7f93f1f282d3a572722fd92f0423499922bbe8f6c5382e82ed68126e659e412892ada9d53b2c632bdf32
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
 AUX mailutils-3.6-underlinking.patch 368 BLAKE2B d578b46b45bba39fe8b776abfa4394e3adc10c2f811ed4d20fe7a8cf7b2442ebd040dd8a8c5c9023e1f9b635e252cade01ecb08b898bf8e4e2da97e5349497ba SHA512 a958be77edbd01af80f824c70b5f85fde526eadfd58db2476317d44b1d48fb2c2a90c84e49204a84f9efee91c51c33275f6c8254eecd84fa2681c84230b42173
 AUX mailutils-3.8-fix-tests.patch 1254 BLAKE2B 68fc23fc1a6cc98fd5cc6f50afec22373cba028a8b5c81472a843b00d390cb93b7e3194cb8ecd6274552d0610137286bbbac2d33c548b93f2c8c18cc39cf2775 SHA512 2de6971a0811e2501c55a45bf72c80010c81f347178219fa75725cdfc3263f77cc42fd2d8a9209055e889ea8d6eb918a8fc5d86c3fd7f1ac6d5c387bd6f4dbe5
@@ -12,16 +8,9 @@ AUX mailutils-3.8-fno-common.patch 652 BLAKE2B 696761bb11c568fee6c809896702db9fc
 AUX mailutils-3.9-python-config.patch 905 BLAKE2B c7f5553b89a93d025cca13b4a882d02e4dadf7ff55a2a7f1ac9b66586905f59b6516f581d5033c3cda2e3df325d69b5c4c0944221798ac37b7ceaa0a86ab8875 SHA512 42a4e45d1d35f92287d2c1075fcea0aa61c422a4f722f857d7b93b19c2cd41678d98b36b28e78209cef8dab33a0f473b1e3ba0610c6c66b9675480d4066d3a78
 AUX mailutils-3.9-underlinking.patch 404 BLAKE2B d162f818580bcdbba54f0aa56fff49461c8efe1e06e3dee213f9910253e014a8e44a3ae34006c2b8bc56dad687d0522eb86e6bd040c08bc714717c49fe2885ad SHA512 8782f59323ea426ecac65ad5b5e22e37f1150bab8782889b0c16f7d28c10030a78f77210141d1f74edcdaf47db70154616003df4143f664cb01b875e2fee1348
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
-AUX nohdr.at 1032 BLAKE2B 3c18d35edc0b6a8481fa7fd8ef110734da5d79ad3ac4a1e251dd020585832b0e5704a9f6928d150aaaa28abf77eaa1120752eb9b2de6d97b52f3110531be6ab9 SHA512 d244044d0ccc00b23cf01235904b880e3d1e74ab2741dc41c4ab82217b019cb32d3dadae69c73c635bceabb80bccc3db5f3176a1039ee40f365277a102739eb1
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
-AUX twomsg.at 2216 BLAKE2B 8a0ac15f6c2a8824406d9a74e14f3143e48b9fd7636732bfae9189a318c13c273a47ceabcc8ee26de5e04604ae198895a51b175e0b2e430eb7c6a08d7f89edc8 SHA512 dc84c7b0c3ce6fb919eabaf574b63943e9e318432ea11d6b65d13caa7f978b2dab6c70413e565b49e3b7e59aa791975dcd95e9a8e24024154f7c2f4dfd4d91aa
-AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780e71224605d735722cb50ba078aa9747b286291d560d9b5e28393239995c1648407070db97 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821
-DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
-DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
-EBUILD mailutils-3.4-r3.ebuild 3712 BLAKE2B 12a6315b5804e7abfff890b0b08fb1636249bb1c714c5a8588aafbc1310912447fdbe9efdfa8153965ac40c236ae809f090249ce563aa10d708ac134fdfe1e9d SHA512 8be1c0092abf75b4c4f1211e4bf4177479e409d8925218d19cf958a7c4ea5fe23acb46ee84561485ac40816fc73f42c119b4a38e2c286168e69fb1b639497999
-EBUILD mailutils-3.7.ebuild 3704 BLAKE2B 7bcfa3e918b18352dda1e232c06ae304f7ec773927e45cd54b4606cbe96c969277077f659a7d7b3082604067d1c300662535db99e881f3399353d9d030a71dd4 SHA512 6a2d9ffa39b13ce2dc4e3933256e525e27c19984a5d85eb1372df5b14f507a093ad64b5b5c0151f1878c8966c7623824984d729143cdfe8eddc22fb4d8735620
-EBUILD mailutils-3.8.ebuild 3739 BLAKE2B 1c840153f7b02ec605dec553b18ea16939037fadc6dcb5fe10870ae7b61d1bac920caf46d0a6723e26afa5fa5231a2325f00035d25fadd76d3d340eca178a273 SHA512 1d9dbe4b7555cfef6885a71e85852a707d3b7faf4a3ec7134cf4834ea0afedb4e93e1f5c76647399216ae7376b9722c34f449f4507c78ba43814f160d1ee149c
+EBUILD mailutils-3.8.ebuild 3728 BLAKE2B d09f95b50dab9521553121380f839d30babf0c00c607051c73f8c0a6db58f04dbc17219536ac1d8d445df5185869b4fa8d315b939006b5fad8d786d599be447c SHA512 4add163fc3f0d120fcb75405858f993f36ed1e44bbb5fa3f40221e18653aea750bb0a9ac35026755a3bf160ce046d95ad98bf0f7b13ec0488461b1f0c8c7f4c6
 EBUILD mailutils-3.9.ebuild 3741 BLAKE2B 29e29b6c2d8004b5fc068d3eb8cef0535a82ec852f4ec9f9b4ac54381a640c834765184b903563e52428ce757ab9dac4be53f4e2e5015f97e351a773152631bf SHA512 8cda64711c04bd89ea8355ec5c333eceab3db2510894940b53a8967294afc2dc8cc39b258ab51eeee76c1942646262300dc8814c48f40f4984ad3caf7e680f09
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/hdr.at b/net-mail/mailutils/files/hdr.at
deleted file mode 100644
index 7c9d5e85c693..000000000000
--- a/net-mail/mailutils/files/hdr.at
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
-#
-# GNU Mailutils is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3, or (at
-# your option) any later version.
-#
-# GNU Mailutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-
-READMSGTEST([readmsg -h],[hdr],
-[readmsg -h SOMETHING],
-[0],
-[From bar@dontmailme.org  Fri Dec 28 23:28:09 2001
-Received: (from bar@dontmailme.org) 
-	by dontmailme.org id fERKR9N16790
-	for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200
-Date: Fri, 28 Dec 2001 23:28:08 +0200
-From: Bar <bar@dontmailme.org>
-To: Foo Bar <foobar@nonexistent.net>
-Message-Id: <200112232808.fERKR9N16790@dontmailme.org>
-Subject: Re: Jabberwocky
-
-It seems very pretty, but it's *rather* hard to understand!'
-Somehow it seems to fill my head with ideas -- only I don't
-exactly know what they are!  However, SOMEBODY killed SOMETHING:
-that's clear, at any rate...
-
-
-])
diff --git a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
deleted file mode 100644
index 919b6619e5f1..000000000000
--- a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 696754b9332922a00e977903d6df3def6ddb3fb6 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Fri, 10 Nov 2017 21:28:17 +0200
-Subject: Minor fix in MH testsuite
-
-Running fmtcheck without .mh_profile triggers mh_install, which
-surprises the testsuite with unexpected output "I'm going to
-create the standard MH path for you." Defining the MH envar to
-an existing file name suppresses it.
-
-* mh/tests/fmtcnd00.at: Always define MH prior to starting fmtcheck.
-* mh/tests/fmtcomp.at: Likewise.
-* mh/tests/fmtfunc.at: Likewise.
----
- mh/tests/fmtcnd00.at | 2 +-
- mh/tests/fmtcomp.at  | 4 ++--
- mh/tests/fmtfunc.at  | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mh/tests/fmtcnd00.at b/mh/tests/fmtcnd00.at
-index 507e8e5..f674d41 100644
---- a/mh/tests/fmtcnd00.at
-+++ b/mh/tests/fmtcnd00.at
-@@ -28,7 +28,7 @@ m4_pushdef([FMTCOND],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtcond fmtcnd00])
- AT_DATA([msg],[$2])
--AT_CHECK([fmtcheck -format 'FORMAT' msg
-+AT_CHECK([MH=/dev/null fmtcheck -format 'FORMAT' msg
- ],
- [0],
- [$3])
-diff --git a/mh/tests/fmtcomp.at b/mh/tests/fmtcomp.at
-index 72cd823..615470a 100644
---- a/mh/tests/fmtcomp.at
-+++ b/mh/tests/fmtcomp.at
-@@ -22,7 +22,7 @@ dnl
- m4_pushdef([FMTCOMP],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtcomp])
--AT_CHECK([fmtcheck -disass -dump -format '$2'
-+AT_CHECK([MH=/dev/null fmtcheck -disass -dump -format '$2'
- ],
- [m4_if([$4],[],[0],[1])],
- [$3],[$4])
-@@ -296,7 +296,7 @@ m4_pushdef([FMTCOMP],[
- AT_SETUP([$1])
- AT_KEYWORDS([format fmtdiag])
- AT_DATA([input.fmt],[$2])
--AT_CHECK([fmtcheck -form input.fmt
-+AT_CHECK([MH=/dev/null fmtcheck -form input.fmt
- ],
- [1],
- [],
-diff --git a/mh/tests/fmtfunc.at b/mh/tests/fmtfunc.at
-index 844a777..0829d45 100644
---- a/mh/tests/fmtfunc.at
-+++ b/mh/tests/fmtfunc.at
-@@ -212,7 +212,7 @@ AT_DATA([input.fmt],[%(getenv MH_TEST)
- AT_DATA([message],[
- 
- ])
--AT_CHECK([MH_TEST=defined fmtcheck -form input.fmt -width 80 message
-+AT_CHECK([MH=/dev/null MH_TEST=defined fmtcheck -form input.fmt -width 80 message
- ],
- [0],
- [defined
--- 
-cgit v1.0-41-gc330
-
diff --git a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
deleted file mode 100644
index 0e52fae20c1b..000000000000
--- a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From feecde8c46cdb597a76df5e6ef02b854843a8a5c Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Thu, 21 Jun 2018 09:46:43 +0300
-Subject: Fix endianness bug in string to IP conversion
-
-* libmailutils/cidr/fromsa.c (_mu_inaddr_to_bytes)
-(_mu_sockaddr_to_bytes): Fix improper endianness conversion.
-* libmailutils/cidr/tosa.c (mu_cidr_to_sockaddr): Simplify conversion.
----
- libmailutils/cidr/fromsa.c | 45 ++++++++++++++++++++-------------------------
- libmailutils/cidr/tosa.c   |  9 ++-------
- 2 files changed, 22 insertions(+), 32 deletions(-)
-
-diff --git a/libmailutils/cidr/fromsa.c b/libmailutils/cidr/fromsa.c
-index f57aadc..39d24fd 100644
---- a/libmailutils/cidr/fromsa.c
-+++ b/libmailutils/cidr/fromsa.c
-@@ -29,55 +29,50 @@
- #include <mailutils/cidr.h>
- #include <mailutils/errno.h>
- 
--static void
--uint32_to_bytes (unsigned char *bytes, uint32_t u)
--{
--  int i;
--  
--  for (i = 0; i < 4; i++)
--    {
--      bytes[i] = u & 0xff;
--      u >>= 8;
--    }
--}
--
- int
- _mu_inaddr_to_bytes (int af, void *buf, unsigned char *bytes)
- {
--  uint32_t u;
-+  size_t len;
-   
-   switch (af)
-     {
-     case AF_INET:
--      memcpy (&u, buf, sizeof u);
--      uint32_to_bytes (bytes, u);
--      return 4;
--
-+      len = 4;
-+      break;
-+      
- #ifdef MAILUTILS_IPV6
-     case AF_INET6:
--      memcpy (bytes, buf, 16);
--      return 16;
-+      len = 16;
-+      break;
- #endif
-+
-+    default:
-+      len = 0;
-     }
--  return 0;
-+  memcpy (bytes, buf, len);
-+  return len;
- }
- 
- int
- _mu_sockaddr_to_bytes (unsigned char *bytes, struct sockaddr const *sa)
- {
-+  void *buf;
-   switch (sa->sa_family)
-     {
-     case AF_INET:
--      uint32_to_bytes (bytes, ((struct sockaddr_in*)sa)->sin_addr.s_addr);
--      return 4;
-+      buf = &(((struct sockaddr_in*)sa)->sin_addr.s_addr);
-+      break;
- 
- #ifdef MAILUTILS_IPV6
-     case AF_INET6:
--      memcpy (bytes, &((struct sockaddr_in6*)sa)->sin6_addr, 16);
--      return 16;
-+      buf = &(((struct sockaddr_in6*)sa)->sin6_addr);
-+      break;
- #endif
-+      
-+    default:
-+      return 0;
-     }
--  return 0;
-+  return _mu_inaddr_to_bytes (sa->sa_family, buf, bytes);
- }
- 
- int
-diff --git a/libmailutils/cidr/tosa.c b/libmailutils/cidr/tosa.c
-index 33715e1..2b372b1 100644
---- a/libmailutils/cidr/tosa.c
-+++ b/libmailutils/cidr/tosa.c
-@@ -42,19 +42,14 @@ mu_cidr_to_sockaddr (struct mu_cidr *cidr, struct sockaddr **psa)
-   } addr;
-   struct sockaddr *sa;
-   int socklen;
--  int i;
--  
-+
-   memset (&addr, 0, sizeof (addr));
-   addr.sa.sa_family = cidr->family;
-   switch (cidr->family)
-     {
-     case AF_INET:
-       socklen = sizeof (addr.s_in);
--      for (i = 0; i < cidr->len; i++)
--	{
--	  addr.s_in.sin_addr.s_addr <<= 8;
--	  addr.s_in.sin_addr.s_addr |= cidr->address[i];
--	}
-+      memcpy (&addr.s_in.sin_addr.s_addr, cidr->address, 4);
-       break;
- 
- #ifdef MAILUTILS_IPV6
--- 
-cgit v1.0-41-gc330
-
diff --git a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch b/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
deleted file mode 100644
index d981ae6891a8..000000000000
--- a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/tcpwrap.h
-+++ b/lib/tcpwrap.h
-@@ -18,7 +18,7 @@
- #include <mailutils/types.h>
- 
- extern int mu_tcp_wrapper_enable;
--const char *mu_tcp_wrapper_daemon;
-+extern const char *mu_tcp_wrapper_daemon;
- extern int mu_tcpwrapper_access (int fd);
- extern void mu_tcpwrapper_cfg_init (void);
- extern int mu_tcp_wrapper_prefork (int fd, 
diff --git a/net-mail/mailutils/files/nohdr.at b/net-mail/mailutils/files/nohdr.at
deleted file mode 100644
index 4caf85570f1e..000000000000
--- a/net-mail/mailutils/files/nohdr.at
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
-#
-# GNU Mailutils is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3, or (at
-# your option) any later version.
-#
-# GNU Mailutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-
-READMSGTEST([readmsg -n],[nohdr],
-[readmsg -n SOMETHING],
-[0],
-[It seems very pretty, but it's *rather* hard to understand!'
-Somehow it seems to fill my head with ideas -- only I don't
-exactly know what they are!  However, SOMEBODY killed SOMETHING:
-that's clear, at any rate...
-
-
-])
diff --git a/net-mail/mailutils/files/twomsg.at b/net-mail/mailutils/files/twomsg.at
deleted file mode 100644
index 20af66173d6a..000000000000
--- a/net-mail/mailutils/files/twomsg.at
+++ /dev/null
@@ -1,73 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
-#
-# GNU Mailutils is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3, or (at
-# your option) any later version.
-#
-# GNU Mailutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-
-READMSGTEST([readmsg 1 2],[twomsg],
-[1 2],
-[0],
-[Date: Fri, 28 Dec 2001 22:18:08 +0200
-From: Foo Bar <foobar@nonexistent.net>
-To: Bar <bar@dontmailme.org>
-Subject: Jabberwocky
-
-`Twas brillig, and the slithy toves
-Did gyre and gimble in the wabe;
-All mimsy were the borogoves,
-And the mome raths outgrabe.
-
-`Beware the Jabberwock, my son!
-The jaws that bite, the claws that catch!
-Beware the Jujub bird, and shun
-The frumious Bandersnatch!'
-
-He took his vorpal sword in hand:
-Long time the manxome foe he sought --
-So rested he by the Tumtum gree,
-And stood awhile in thought.
-
-And as in uffish thought he stood,
-The Jabberwock, with eyes of flame,
-Came whiffling through the tulgey wook,
-And burbled as it came!
-
-One, two!  One, two!  And through and through
-The vorpal blade went snicker-snack!
-He left it dead, and with its head
-He went galumphing back.
-
-`And has thou slain the Jabberwock?
-Come to my arms, my beamish boy!
-O frabjous day!  Calloh!  Callay!
-He chortled in his joy.
-
-`Twas brillig, and the slithy toves
-Did gyre and gimble in the wabe;
-All mimsy were the borogoves,
-And the mome raths outgrabe.
-
-
-Date: Fri, 28 Dec 2001 23:28:08 +0200
-From: Bar <bar@dontmailme.org>
-To: Foo Bar <foobar@nonexistent.net>
-Subject: Re: Jabberwocky
-
-It seems very pretty, but it's *rather* hard to understand!'
-Somehow it seems to fill my head with ideas -- only I don't
-exactly know what they are!  However, SOMEBODY killed SOMETHING:
-that's clear, at any rate...
-
-
-])
-
diff --git a/net-mail/mailutils/files/weed.at b/net-mail/mailutils/files/weed.at
deleted file mode 100644
index ec82c6ce23b5..000000000000
--- a/net-mail/mailutils/files/weed.at
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
-#
-# GNU Mailutils is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3, or (at
-# your option) any later version.
-#
-# GNU Mailutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-
-READMSGTEST([readmsg -w],[weed],
-[-w date,subject SOMETHING],
-[0],
-[Date: Fri, 28 Dec 2001 23:28:08 +0200
-Subject: Re: Jabberwocky
-
-It seems very pretty, but it's *rather* hard to understand!'
-Somehow it seems to fill my head with ideas -- only I don't
-exactly know what they are!  However, SOMEBODY killed SOMETHING:
-that's clear, at any rate...
-
-
-])
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
deleted file mode 100644
index 67cffc2dc93e..000000000000
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="!mail-client/nmh
-	!mail-filter/libsieve
-	!mail-client/mailx
-	!mail-client/nail
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	virtual/mta
-	berkdb? ( sys-libs/db:= )
-	bidi? ( dev-libs/fribidi )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm )
-	guile? ( dev-scheme/guile:12/22 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable bytecompilation of Python modules.
-	echo "#!/bin/sh" > build-aux/py-compile
-	eapply \
-		"${FILESDIR}"/${P}-MH-testsuite.patch \
-		"${FILESDIR}"/${P}-fix-endianness.patch \
-		"${FILESDIR}"/${PN}-3.4-fno-common.patch
-	# add missing tests so that make check doesn't fail
-	cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# maildir is the Gentoo default
-	econf MU_DEFAULT_SCHEME=maildir \
-		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		$(use_with berkdb berkeley-db) \
-		$(use_with bidi fribidi) \
-		$(use_enable ipv6) \
-		$(use_with gdbm) \
-		$(use_with sasl gsasl) \
-		$(use_with guile) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_with postgres) \
-		$(use_enable python) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with tokyocabinet) \
-		$(use_with kyotocabinet) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable servers build-servers) \
-		$(use_enable clients build-clients) \
-		EMACS=$(usex emacs emacs no) \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-mail-spool=/var/spool/mail \
-		--with-readline \
-		--enable-sendmail \
-		--disable-debug \
-		--disable-rpath
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	# bug 613112
-	newins "${FILESDIR}/mailutils.rc" mailutils.conf
-	keepdir /etc/mailutils.d/
-	insinto /etc/mailutils.d
-	doins "${FILESDIR}/mail"
-
-	if use python; then
-		python_optimize
-		if use static-libs; then
-			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
-		fi
-	fi
-
-	if use servers; then
-		newinitd "${FILESDIR}"/imap4d.initd imap4d
-		newinitd "${FILESDIR}"/pop3d.initd pop3d
-		newinitd "${FILESDIR}"/comsatd.initd comsatd
-	fi
-
-	# compatibility link
-	if use clients && use split-usr; then
-		dosym ../usr/bin/mail /bin/mail
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-mail/mailutils/mailutils-3.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild
deleted file mode 100644
index 344b83bfb471..000000000000
--- a/net-mail/mailutils/mailutils-3.7.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="!mail-client/nmh
-	!mail-filter/libsieve
-	!mail-client/mailx
-	!mail-client/nail
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	virtual/mta
-	berkdb? ( sys-libs/db:= )
-	bidi? ( dev-libs/fribidi )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm )
-	guile? ( dev-scheme/guile:12/2.2-1 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-add-include.patch
-	"${FILESDIR}"/${PN}-3.6-underlinking.patch
-	"${FILESDIR}"/${PN}-3.8-fno-common.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# maildir is the Gentoo default
-	econf MU_DEFAULT_SCHEME=maildir \
-		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		$(use_with berkdb berkeley-db) \
-		$(use_with bidi fribidi) \
-		$(use_enable ipv6) \
-		$(use_with gdbm) \
-		$(use_with sasl gsasl) \
-		$(use_with guile) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_with postgres) \
-		$(use_enable python) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with tokyocabinet) \
-		$(use_with kyotocabinet) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable servers build-servers) \
-		$(use_with servers unistring ) \
-		$(use_enable clients build-clients) \
-		EMACS=$(usex emacs emacs no) \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-mail-spool=/var/spool/mail \
-		--with-readline \
-		--enable-sendmail \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	# bug 613112
-	newins "${FILESDIR}/mailutils.rc" mailutils.conf
-	keepdir /etc/mailutils.d/
-	insinto /etc/mailutils.d
-	doins "${FILESDIR}/mail"
-
-	if use python; then
-		python_optimize
-		if use static-libs; then
-			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
-		fi
-	fi
-
-	if use servers; then
-		newinitd "${FILESDIR}"/imap4d.initd imap4d
-		newinitd "${FILESDIR}"/pop3d.initd pop3d
-		newinitd "${FILESDIR}"/comsatd.initd comsatd
-	fi
-
-	# compatibility link
-	if use clients && use split-usr; then
-		dosym ../usr/bin/mail /bin/mail
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index abce1e8cec39..338c88ced77f 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mhonarc/Manifest b/net-mail/mhonarc/Manifest
index 0d45a00b99d9..09d0cfe4a885 100644
--- a/net-mail/mhonarc/Manifest
+++ b/net-mail/mhonarc/Manifest
@@ -2,5 +2,5 @@ AUX mhonarc-fix-perl-defined-bugs.diff 817 BLAKE2B ae5c93dd4368b3ae228ec10797abf
 DIST MHonArc-2.6.18.tar.bz2 1546854 BLAKE2B dd403ef742ee3cf2ce3d4490a489d88fb4ba8814456d0ecfae347c4dfd5fc5a61593b9def93edcafadae5e32e9afd5853ac0bf584b8f0060962d1b6b3fb1f04f SHA512 816acfd5c68db274848859ea60c8fb47a12daadea5d8dc8acd12018b72c8ff22133ef7e366edb005ef309f7a74f2b4dfdb7ad5fe9256eb850bebaeb165be5511
 DIST MHonArc-2.6.19.tar.bz2 1577790 BLAKE2B 07c207c9684fd4a4f53a26ea18dc52c3136e7a5dc9623b121a8ef87b22fd19061d3fe91a48c691ba0776d7783dd3b80155e5c64518aa3050c0f0156537aa298b SHA512 17d9db58bf0a312ede435acba11a24ca73538f2031f24913fba28c8232b51b252e64a9bb55321aef26e3a2833a95939bdccaba51cb221fa1bc83d1980e60e7e0
 EBUILD mhonarc-2.6.18-r2.ebuild 918 BLAKE2B 0922076a4ad11dea1c4be3641871df17781424206fb416fb761a48393b2c172c3508ab4fb02119e4ac066b5aca65d75f4b5f36277ad42bc63b355a6b4c21bd97 SHA512 cbc1343f4ee336847aa0db5084d0b81a9dac92ed54efce5b53da0e8efdb33f7fff473593bf1cc60474bc618d669669916185f0bae82aa53ff5fced349d38e046
-EBUILD mhonarc-2.6.19.ebuild 1028 BLAKE2B 9da32fd6385f91cc3b553f8296cf9331b4876a17c53db1ab8413d5809795a5ae7e474000a62b942275f3d404fc2c85cf385712b4ef1c14b72c093e73315ab864 SHA512 3e96b335ae3c7633fad2625b2d259cc57d73b350395e47cdfca7c393e3497cc34cd6da048d563d331a7e4cc32df697bd5c8340b1c8577c610bf50ac809cd5688
+EBUILD mhonarc-2.6.19.ebuild 1026 BLAKE2B af237902c504c785b1a8cd004b2f4bfbc57f9382f152490dd07bc1c363830990928f2ef1d5c12b5152c8327de34fa067db8f6561134a1f1fa2a819b491043b0c SHA512 f2c6d456f4e22b081d377760e9466adb0a824ed655c80f40c18e946ca2b78fc63fd3f9562cf8f73a2c9989d1164dc2f1acda3d100a53b266cd0dda0431b96ca4
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/mhonarc/mhonarc-2.6.19.ebuild b/net-mail/mhonarc/mhonarc-2.6.19.ebuild
index 927fad6c59b0..8190b2aa425e 100644
--- a/net-mail/mhonarc/mhonarc-2.6.19.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 # Warrants IUSE examples, and here it is + ? IUSE doc; see also extras folder with html docs
 IUSE="examples"
 
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index d95d6a9604ae..82dc4b653dfa 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -5,10 +5,12 @@ DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31
 DIST mu-1.3.5.tar.gz 2305222 BLAKE2B ff6025cf053d7c2880855ec32953a2881ce8bc7d468082f13e45e7684dd41bd7906cbc9a619fd27bd4860bb953e4a547c3d22ea9a7fb4c645825c755ee33b5f9 SHA512 5d7eccec296affbe6e2e31d2204672f8ecac43f1a0c93673f983378fcf7ad8a050662097ec58603251eed31b499054d6c453a2a4e2c70dfdd896c430559b95c0
 DIST mu-1.3.6.tar.gz 2305653 BLAKE2B b9a556c1b374e0b72b6b0c40beba581dc3fe0e0a654a881db3a47582481ef00831e18bcd771e24b231ef843e97f14f7401ad8d041c077617b865f1fa971d1a0f SHA512 c889dc3fc1b7f1333f2adc3891f23ea8977c77ac6af532fec37c6570b4fbb2ce8dda0776568d61dedfa34f0519bb5bba89b90002503c3191a0d633ecfb9d5c87
 DIST mu-1.4.1.tar.gz 2311134 BLAKE2B 4d44032874217167d46a68b1c837fb443dc860f1eb1f698c08d3731c131e196483028b0eee8bec13bbec71eeab6df1146013beb00b31824630154e14af914c09 SHA512 9a6d20a814f0cdf7c0a04e0e4a22210a12d539d9be713be8f689f2ed3ba39eaf9da7d1969a10f47af1a201cc23e91696e379cfcbd5d6586aea5e83997ba3e043
+DIST mu-1.4.4.tar.gz 2311600 BLAKE2B 1953dc9e63fe013af2821a58fde0222d3d7b61266807bb95345aff7c6e3f988fa6589bcca79612bd64296f50e2b4feda62cc3f4aa4d731f3f4cebe4e3a21cceb SHA512 db317706956304df9e0c6d53ce9b2bf444f5fc66903deb8ac13c8d771ada016d009e3b10d8bf76cfeda1d712fa3e23bed70362334231cccfc072bc181c6660e5
 EBUILD mu-0.9.18-r3.ebuild 1775 BLAKE2B 87146e9495664d360ccb98a7693e24a7498200cd80c2e565d55f139a3039f7ed48dc448f2c4eb1f14242b6054ba3e696e9b76fb5b7d60d1a86c3bf576ac6e2d4 SHA512 87321aacc6dd25ce0442fe5ef161433bbb039c58b4c4424f94d893377a5f5ff7b4358ffef67162a94544452c2d49e3da6bcdd3799ac1d8ef86fc8263654c71ad
 EBUILD mu-1.0-r1.ebuild 1778 BLAKE2B 85c611bc38bb40c202d3b39fe2d8a2e0fc3ee1c1aa5a45c892d19a0c5986d7cd973f8699f5090c1754220db43c7a9dd0587862112b70cd192a75d16fdc487a8a SHA512 aa0fee0bdd2d8596cd1da4dcc11f70c0e5f73a03007777f36a0367964f8a1aae8cc7200fff1de374f8d7c3f9f8121a173ecda6f6b7f932a3a2ba5bba2c63f7a0
 EBUILD mu-1.3.5-r1.ebuild 1962 BLAKE2B 68dfb86a7ca8877c1ab359f3d82857809c2267aca5c49ef7666d86692f9d23522671cfdd454edb1217c613521ef0576a7053b6d14d64de9b2adc2c21885ea7ff SHA512 0bb512962ab230941b25ad7a962430c3a1c1cf8812405c78bed5cfbb31959aeac176a863b6014ea84acfd73dd14a539d04c2cb7de267ceaa8f41a6ba815b74cb
 EBUILD mu-1.3.6-r1.ebuild 2029 BLAKE2B 06f2f1e5c73faeef1e45e7b3331e1aa6354b092f8d9daa893871aed2d5f301373feb7832229fcd04552cf155863a1c62e74521df1d6d48bff19716a0330b62e6 SHA512 5b32ea81343b7735c48d31cd6eba23f3b865c39e3e181d7268ec17a8ae8f458e7d3bea45195fee30728b8031434ba529e9adfab8b2395c9ea06d57b4c7e56847
 EBUILD mu-1.3.6-r2.ebuild 2040 BLAKE2B 102104b3d404a8b50ee6696baae778b7b3804117882c9c73f1c83e7dcdc813c07b656f6c048c7adf99e4dbb7e4fd46e8453a8b703f811cc0440e454d9712478a SHA512 8e81d83618b663cc894fe8be870a0bb76e0f502e42c08f59a9dd7736fd0b38fda116db2b81e53b826994a63dd3c278221ba2c676b2da270ab1944d72f0b82373
 EBUILD mu-1.4.1.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
+EBUILD mu-1.4.4.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-1.4.4.ebuild b/net-mail/mu/mu-1.4.4.ebuild
new file mode 100644
index 000000000000..99919703af77
--- /dev/null
+++ b/net-mail/mu/mu-1.4.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs guile mug"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4
+	emacs? ( >=app-editors/emacs-24.4:* )
+	guile? ( >=dev-scheme/guile-2.2 )
+	mug? (
+		net-libs/webkit-gtk:4
+		x11-libs/gtk+:3
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable mug gtk)
+		$(use_enable mug webkit)
+		$(use_enable guile)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	dobin mu/mu
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		doinfo mu4e/mu4e.info
+	fi
+
+	doman man/mu-*.*
+
+	if use guile; then
+		  doinfo guile/mu-guile.info
+	fi
+
+	if use mug; then
+		  dobin toys/mug/mug
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/muchsync/Manifest b/net-mail/muchsync/Manifest
index 2f76d4306694..1697919f771d 100644
--- a/net-mail/muchsync/Manifest
+++ b/net-mail/muchsync/Manifest
@@ -1,7 +1,3 @@
-DIST muchsync-3.tar.gz 132310 BLAKE2B 6458304fd751b8bb030ecd268c98c7d50853b0288a436f5eef0544118a67be018a9344b523e7bbb99bcfb50239d2c34bbf08dd45ee9dfc626798f70b8b11f828 SHA512 54c0f53d6be55d294e0c4a9a7bf1a4f719b34b07e5754c77283baa996e47a40dfaa650cf1efe9107011487f88c7b8e25b3e779e68baaa877b6f1d2770a31a111
-DIST muchsync-4.tar.gz 132378 BLAKE2B 774222b87b4d116abf12bee76879d3c7d6fc1673ac2f0ab52b4287da3ccdabb6a15a52bd98b1eb097887831d4b2361799cb004bc6d5938fcc4a579acc0f192c4 SHA512 63b495d25e631b02f8c1b91f90a1ee1a01713d313bd1bf7303d0f8901e2a09a571e5c7b3c38a9896d7f17d71d2f730e7dbf982f3ff5968fecbe8affe8943fba8
 DIST muchsync-5.tar.gz 134107 BLAKE2B cc706aa650b7a2884df0b40c206e9c58f2d633d51e5b465bd11db0cda6ce32a959db045b468c38ab88179e4e8508631b488f869e7dbf4b2038a4e882e14bc7ae SHA512 0b892a145def56712a95a7212850b01f35be2ff434aa07a43badbb298194e8219efb28525063c66a3a53fabc109891631eb653fcb1b8934d5e9ef5480cb4ee4b
-EBUILD muchsync-3.ebuild 457 BLAKE2B fc3318f0496a554c2b9a0f37665725fad3734a8e0e1243bb0fd0549d3a62d632f5e27fc976340bda6f99613fb95fae04f95282cd36a3c9513f036b936f4caedf SHA512 3ffa4ec8491820d1d480cc56bf0c29564199ea63e90ba1a36baee4dcabda03b465c5a3c8787538fc7dfc0d8564d948fc0872fa7904e454e8f6ce4c8e858d092d
-EBUILD muchsync-4.ebuild 457 BLAKE2B fc3318f0496a554c2b9a0f37665725fad3734a8e0e1243bb0fd0549d3a62d632f5e27fc976340bda6f99613fb95fae04f95282cd36a3c9513f036b936f4caedf SHA512 3ffa4ec8491820d1d480cc56bf0c29564199ea63e90ba1a36baee4dcabda03b465c5a3c8787538fc7dfc0d8564d948fc0872fa7904e454e8f6ce4c8e858d092d
-EBUILD muchsync-5.ebuild 457 BLAKE2B ae65156ab42a611f0563fe144d4e8b28426de284f5299513f026133ad3b168d218c8b519aae58f0db57601a05a820002c51fa1a36b0419ea5bc1cfea838976fa SHA512 896cb24021525737ff7535ccd79b95d5bf92c8b367fa151c08c15aaab7afd464fa06713bd5f71cceb11596f71cdd05e08bf18430f4c5210135adaaee512ca0f4
-MISC metadata.xml 608 BLAKE2B 13d90b8b081c38fb22598b91243cc4a3fb8907537206a134cdd87220da28607bf8be367432038797a1cacc033a1b744027c9d7e1cd02102a0bf920a24c7ad93a SHA512 1943dce7f97545ba3899925b0bd7b39991bdfc2bfba95bd1ca84b9d50a7553a7ab345be8900723dcc56ef02a19d926aee0930c31c2365ad2cc6145335bd83c58
+EBUILD muchsync-5.ebuild 453 BLAKE2B 11ccea149f151df718b14193d4ccb04d7fec50961b8f5b56cd83df4461c5e74135cbceec7737bfd00a382494dd0ffcbec6ee30285cc3cd051b404a01765f45ff SHA512 c90aab62a4f57fafd404612fab4e1fbbea37faec76b1a0a1b6454813cfb01b7e3f64a9c4f5026aeb55b991ecc103bc85385902cd7fc9ad22fde5a905a3e5b790
+MISC metadata.xml 719 BLAKE2B a7666967c221dbb5cd6e9ed36c8762b7ee234778215b131135b4055c371d51f618b82d221ff2e15c8a3a811fec3999a7e40a3db517b6bc2a7057e67e76c133c7 SHA512 e6628b58c52919894747a4490a76d8e9e1a772b0be0d62effbfedd0d27afa0be0629d5555f6796eee663c511ee23b3a1a42aa66425c502f5ff0cc46e4e1d355c
diff --git a/net-mail/muchsync/metadata.xml b/net-mail/muchsync/metadata.xml
index 28ef87d6dd45..597bb2caf671 100644
--- a/net-mail/muchsync/metadata.xml
+++ b/net-mail/muchsync/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>aidecoe@gentoo.org</email>
-		<name>Amadeusz Żołnowski</name>
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		Muchsync brings notmuch to all of your computers by synchronizing your
diff --git a/net-mail/muchsync/muchsync-3.ebuild b/net-mail/muchsync/muchsync-3.ebuild
deleted file mode 100644
index 936b07cd0eee..000000000000
--- a/net-mail/muchsync/muchsync-3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Synchronizes mail messages and notmuch tags across machines"
-HOMEPAGE="http://www.muchsync.org/"
-SRC_URI="http://www.muchsync.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-db/sqlite:3
-	dev-libs/openssl:0=
-	dev-libs/xapian:=
-	net-mail/notmuch:=
-	"
-RDEPEND="${DEPEND}
-	net-misc/openssh
-	"
diff --git a/net-mail/muchsync/muchsync-4.ebuild b/net-mail/muchsync/muchsync-4.ebuild
deleted file mode 100644
index 936b07cd0eee..000000000000
--- a/net-mail/muchsync/muchsync-4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Synchronizes mail messages and notmuch tags across machines"
-HOMEPAGE="http://www.muchsync.org/"
-SRC_URI="http://www.muchsync.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-db/sqlite:3
-	dev-libs/openssl:0=
-	dev-libs/xapian:=
-	net-mail/notmuch:=
-	"
-RDEPEND="${DEPEND}
-	net-misc/openssh
-	"
diff --git a/net-mail/muchsync/muchsync-5.ebuild b/net-mail/muchsync/muchsync-5.ebuild
index d7d65ceaa7c0..06745b47f857 100644
--- a/net-mail/muchsync/muchsync-5.ebuild
+++ b/net-mail/muchsync/muchsync-5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.muchsync.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="dev-db/sqlite:3
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 9d5cf457d3a0..a830d466de5f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,6 +2,6 @@ AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45ad
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
-EBUILD notmuch-0.29.3-r1.ebuild 5023 BLAKE2B eb9f9fb40669d820c259875a3fe5a9ce6a1f002ae503c7d01b208e5a53081ee5ed6f09ee35b10b08ea7d0dd4c2bdcf145365d1553a2656bc651f5715d4509158 SHA512 acb37ef04a337e67ec1206f11b947d8335e267401ae7497791a128f526dd4b589267af7645990cefa0f50439a8ccfd28d342b455be22f0e28a258916ed55690a
+EBUILD notmuch-0.29.3-r1.ebuild 5019 BLAKE2B 8f9be696f72862207f3cc8556bd2fbe10e9848dedc7a0c383e3d52369bd1914a06439ee6f1167f76cc521bdd5dc7deccbedfb47979df3d785e09076671c694f9 SHA512 ae718ef39d4a8af974a31ae02b9c0752775a83ca3030eca377c5fda432448a2ab48025a05130aea911a7ec828ab85b1fcb5dff5ce1c419d4d88dd3b3fa2dde6d
 EBUILD notmuch-0.29.3.ebuild 5048 BLAKE2B cc5a91ae3793d7fa40614dcb67145c48197267ef2f9621b3b1946c8585391c012f5a0eaf7e7b3a281a7e6539fcf8d530922f2c9276bbe1705dbd351d76adcd73 SHA512 ce1a7c577618387b0b8cc80eff4ed6d74bd35062169082c0c22a1e8845d111b8fa161a8b8a2b098a5917006d62681e5d1208d08338fd67b59534ed07df13a84a
-MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
+MISC metadata.xml 1228 BLAKE2B 664ab0ca9f5e738137f8c30ce724330907fad02302e3350e9c90eaf2f4470e4bd207352b1bd4e81c9e31177e3d33b979ca3e81d2aaeb6c2d7cb0cd558f093e7a SHA512 f38609954d3924392d98c8a73917d3f896332997f07fac8cca2a1c35693c7080e7cb3d52fcb5478c7b4499cfc60855953a77eda18ac3fd7f9707623f524546ed
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index c91b250fcc97..e5089957cdab 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>aidecoe@gentoo.org</email>
-		<name>Amadeusz Żołnowski</name>
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="doc">Install API documentation</flag>
diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
index d43493b3fade..d2dc1e110e95 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index c6b5c9c42dc1..a3ba2f034b2c 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,7 +1,10 @@
 AUX offlineimap-6.5.3.1-darwin10.patch 361 BLAKE2B 3331f6bde79b55792d7fbb6d3183c363a7142bb8abbb25c13b8cfe2b7e652c366aa2002b9e9995d6cc2e197a34315556e5db4586012ccd24fdf6d3faa1352956 SHA512 2183ae09cb9ed489ea447180f7b50e9e023a4630f8612b829e84499257590e9bb99ac0aa65cb45073c4a1ed5d537151df451b35aeaa45b5a1eb9e063246e5a02
 AUX offlineimap-7.0.3-darwin10.patch 316 BLAKE2B 3f9adc406881e43462aee6764ef7aafc69a94f7e744722856da04448e68972c9942f8b6a8e4eba84c7fe714be6cc3b7de25424984f21b96df24e22d2eff333ff SHA512 b195392db8e39264891b91c855cc0b1cfeb76e7b0a22281e509c17d4ae07458e980f7810c223f2a835f01f4ba63c1f9592c934121e763bb01846f20c51013186
+AUX offlineimap-norfc6555.patch 1690 BLAKE2B 6eb0b7a4d65a07793c049cadaa64093e17eccef2a5553c3cd415da05c4d7f830e3936058f73cbea06325c1789faf2764289fec29a8939c391423bbbb04624267 SHA512 c99a36cee97a185f20d265235ad24d48db914925b0564105cf4f69e77eed2d40ad5474646a8f2356284b8e212675a56b8d29a51deafe6543ac892ff8c0c8ce22
 DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661ac5061eebfae5796dffb3a6e8767b54138328aa0a8ab5a1745ed0690809965ea76b9b8e66ef250936b0b72cd07e337 SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e
 DIST offlineimap-7.2.4.tar.gz 721887 BLAKE2B f5c7c8eb541167b3f0d46ee71be418d4697f89a1dc11a1c5c9840e5def09d108b7ab391d773dc79e0882ce0a9e21388e11217915112f476d384bf3018d5ea750 SHA512 837f822a08f5df59f5332c65b33e0186c215a633c5c17f08790f4c2128a4f6470a75eb02e883dd592b456dbc0ba2b32f670cb716eb602dd8a6bdf12ba2d72cd8
-EBUILD offlineimap-6.5.6.ebuild 2346 BLAKE2B f4cea6677350da94c785a4abcb4b52f0b4bc7acdb041a216a0775dea8bd0680f2b56ead87ebc99163b01a8fd27e6fd46f5043035904f2e5a575b554660e07b6d SHA512 4fef94705b37cc7f84d824a34baeaaaba1497f94f6f8f8bcb838c62aa0077a1f4fdd7d5e059d795b089b9603a0ee77befa8d90f2b604fe44436a0d910a751e7f
-EBUILD offlineimap-7.2.4-r1.ebuild 1681 BLAKE2B d5ceadd15b6c5c84b029d3886865d19a5a08ae26160bf7fbd51d685146407b9914ed9e394d5a69d14fe50e8488856721b2bb950b734294e3a5608a44b9c1a245 SHA512 e8956adf8a94eaa90251b060398d78a0b55cfb88b9cf2356fe2d951b912de2b2b08169a67dbb6d8d8587d35ff86a7269ef49afe14443c0fc9a1195aef6e78e36
-MISC metadata.xml 365 BLAKE2B 44c143951196526dbc7e8c23fe3719a33ecf633361b9aa5294dd4e61c1dd0aecca12159a33c3ef7e0706a5c57162f170559c44c554541754cf5049118c8d89c8 SHA512 ec19d9f99d945536a02dfd7d8c113c6a6337e80190ee60ab172ac9c248398f4faad49aabe4f56e5e4d5eb09ea35810a47ad263b8df59f7368e1f8bed6e780c2a
+DIST offlineimap-7.3.3.tar.gz 724141 BLAKE2B 01c382d46cd192fbe4779e84d9551f64c3bcb2765a2255ee337c14996f082914fab400b24e47141d5b3cd9308f374a73d5ab620089884be91c47c18f60b7d100 SHA512 89d09cd9c5c76a75e3d783ab2230f6b10dff25d660fe9f183d1df0c216167f242d57ff17ec91bbbe8c61c0a8c0d8dbd6fca8a129cecd522ff8457ab39ff81c83
+EBUILD offlineimap-6.5.6.ebuild 2347 BLAKE2B 5a0535c1cad8263f0fb22d317d23f5d67cc606314ba322e1922f73780d99f8a5dad8a5c8e2aba344abaf66ceeccb2a7256a8a01faa81586320423356b2255094 SHA512 0cb35c6bff320230aa10d8aa4c423b62a543d72a29e7bacd3bb3e4c0de55c8b535ee5047160ecc283370e54823e304648ce5c1ec3728609870c8edb857aa71a1
+EBUILD offlineimap-7.2.4-r1.ebuild 1682 BLAKE2B 6eb51c25cd1daf10a1f82150f3da06b8bb25a0a7d83eda15d642f45ea1888d1e585bc8cfba4a1bd3fad1b81eab987f90fa38b67aae47bbcaf72aeac4887d2189 SHA512 35838a018fb842a3e7a538c911f55e6a8cea748fc6f8ebe360cb0bc0aa6bc5d74e374deb1de69e51e2356b71011a3d0916123e342859e4bea3a2216a3b151c4f
+EBUILD offlineimap-7.3.3.ebuild 1656 BLAKE2B 496ade37ab2db56d76a8d6eb0fe51ac728ee23c4bd65d39d17cd710929fa3a12407e9253242cd7a27bb7236ddfcc3ce1e8ae5f700a80714aaee1924e8e9f5e18 SHA512 f602b93b3ced382b26dd7780edcbf6220241c9e426f49ac44b1af94916fa63c5bd1456652a51cf98fc9c2331f4d497418e459a0c555d56750e498edfbdd721d3
+MISC metadata.xml 757 BLAKE2B 4e7b25ebb3d378a521d10b7686e06dfe923c3358171ba5b27d620656de255d56d8e9e7e68a4eafc94882d2cec90adc67e2b321e150221a0e6b7f9a01d9df7175 SHA512 bee9128d083adea102eb1345f1df791abbc911ba3fadee32108830c50b3b173fc15fb2d305790d6d3d1a35913f7479cbb39d5a430d0702e07610cbb16356305e
diff --git a/net-mail/offlineimap/files/offlineimap-norfc6555.patch b/net-mail/offlineimap/files/offlineimap-norfc6555.patch
new file mode 100644
index 000000000000..b3cb1a9317f7
--- /dev/null
+++ b/net-mail/offlineimap/files/offlineimap-norfc6555.patch
@@ -0,0 +1,52 @@
+From 24931745105f389b03de2811cb9d62a450f0efe3 Mon Sep 17 00:00:00 2001
+From: Matt Smith <matt@offtopica.uk>
+Date: Fri, 1 May 2020 17:54:48 +0100
+Subject: [PATCH] Revert "implement Happy Eyeballs"
+
+This reverts commit 0d5496ba0a21aa6df5d10391af01d5017fb973bf.
+---
+ offlineimap/imaplibutil.py | 10 +---------
+ requirements.txt           |  1 -
+ 2 files changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py
+index 86b1cb9..6ebe8d8 100644
+--- a/offlineimap/imaplibutil.py
++++ b/offlineimap/imaplibutil.py
+@@ -19,7 +19,6 @@ import fcntl
+ import time
+ import subprocess
+ import threading
+-import rfc6555
+ import socket
+ import errno
+ import zlib
+@@ -79,15 +78,8 @@ class UsefulIMAPMixIn(object):
+     def open_socket(self):
+         """open_socket()
+         Open socket choosing first address family available."""
+-        if self.af == socket.AF_UNSPEC:
+-            # happy-eyeballs!
+-            return rfc6555.create_connection((self.host, self.port))
+-        else:
+-            return self._open_socket_for_af(self.af)
+-
+-    def _open_socket_for_af(self, af):
+         msg = (-1, 'could not open socket')
+-        for res in socket.getaddrinfo(self.host, self.port, af, socket.SOCK_STREAM):
++        for res in socket.getaddrinfo(self.host, self.port, self.af, socket.SOCK_STREAM):
+             af, socktype, proto, canonname, sa = res
+             try:
+                 # use socket of our own, possiblly socksified socket.
+diff --git a/requirements.txt b/requirements.txt
+index 1e2a2ae..3b1819e 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -2,4 +2,3 @@
+ six
+ gssapi[kerberos]
+ portalocker[cygwin]
+-rfc6555
+-- 
+2.26.2
+
diff --git a/net-mail/offlineimap/metadata.xml b/net-mail/offlineimap/metadata.xml
index 07cfd8325afd..8fdbbe751637 100644
--- a/net-mail/offlineimap/metadata.xml
+++ b/net-mail/offlineimap/metadata.xml
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>matt@offtopica.uk</email>
+    <name>Matt Smith</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+    OfflineIMAP is software that downloads your email mailbox(es) as local Maildirs.
+    OfflineIMAP will synchronize both sides via IMAP.
+  </longdescription>
   <use>
-    <flag name="sqlite"> Enable runtime support for sqlite mail status backend. </flag>
+    <flag name="sqlite">Enable runtime support for sqlite mail status backend.</flag>
   </use>
   <upstream>
     <remote-id type="github">OfflineIMAP/offlineimap</remote-id>
diff --git a/net-mail/offlineimap/offlineimap-6.5.6.ebuild b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
index 960a6e04aad2..7f098d1c0ca6 100644
--- a/net-mail/offlineimap/offlineimap-6.5.6.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
 HOMEPAGE="https://www.offlineimap.org/"
 SRC_URI="https://github.com/OfflineIMAP/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl sqlite"
diff --git a/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild b/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
index 505ce0297519..c5f9a5db2760 100644
--- a/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
+++ b/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
 HOMEPAGE="https://www.offlineimap.org/"
 SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
diff --git a/net-mail/offlineimap/offlineimap-7.3.3.ebuild b/net-mail/offlineimap/offlineimap-7.3.3.ebuild
new file mode 100644
index 000000000000..54c9f79d35ad
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-7.3.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,sqlite,ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="https://www.offlineimap.org/ https://github.com/offlineimap/offlineimap"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+	')"
+DEPEND="doc? ( app-text/asciidoc )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
+	"${FILESDIR}/${PN}-norfc6555.patch"
+)
+
+src_compile() {
+	distutils-r1_src_compile
+	use doc && emake -C docs man
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	use doc && doman docs/{offlineimap.1,offlineimapui.7}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+		elog "Sample configurations are in /usr/share/doc/${PF}/"
+		elog ""
+		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+		elog "display the server's cert fingerprint and require you to add it to the"
+		elog "configuration file to be sure it connects to the same server every"
+		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+		elog "check SSL server certificate) in cases where you have no CA cert."
+	fi
+}
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index d7d9e6c41512..5b431b4310ef 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,4 +1,4 @@
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
-EBUILD rss2email-3.11-r1.ebuild 673 BLAKE2B 12f6de4c368cce5d9da091cfd5598fb4a6679ed5563c23bdc7f33447e7fb85355b473999bad02153e72d2a065df43a2ca8e20df2a5fdc799b24d5548bb05a815 SHA512 6a9ed7d1bd25ca563f850afbee7bfed72c34e0b1ce1dcb0cea68dde29723bd448d3afe9c36ba4f405c0a5a69f5f33747d9784cae70e0dde09537c65d3e7174d9
+EBUILD rss2email-3.11-r1.ebuild 671 BLAKE2B 178aef70f7aa9a808c74420ad8fd27b95b05dbf39319442cd2e60ec13267b8ed68d98f44bdc416815e05c11fc10afdc7fd52c2028b266060ff87ea939f1562b8 SHA512 1f49dd95184dafb948b68fea7b9cb4ed8d3666743169fb5fbc52e2e661cc523b9dd33b7ecc6ddbdf2aae07fc5f812d85833e8fe59cdc246b949d4144addc828f
 EBUILD rss2email-3.11.ebuild 760 BLAKE2B 8eb9255668f8f949cd9f8439d40f2577d11ba6b9d6ac0f476adc445fa2a3fadc0c8f34a9ab21b6112271134c744028aad1b553737252e20cf9e9c0a2708c58f9 SHA512 83212470393f2a2368c22c35bb6acf7283cfec1f6fb81834afafec649fb89db11d3b1db0496b420bc0e1d6eb89a4feae0cde960f9144b1ead6dcec18026fdd2c
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.11-r1.ebuild b/net-mail/rss2email/rss2email-3.11-r1.ebuild
index 2459d85da411..4a4a59392144 100644
--- a/net-mail/rss2email/rss2email-3.11-r1.ebuild
+++ b/net-mail/rss2email/rss2email-3.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/feedparser-5.0.1[${PYTHON_USEDEP}]
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
index 717050e14016..fa73cecb0a6b 100644
--- a/net-mail/swaks/Manifest
+++ b/net-mail/swaks/Manifest
@@ -1,4 +1,6 @@
 AUX swaks-perl-5.18.patch 2139 BLAKE2B 03501cda36503a966a1d1d50b94b054d2aaa1584566a64a7e393e4d81fd0f8e456734e0b787723e7aec5caa55b08ab264da897b7bb8ead351250c7402e73e361 SHA512 f5d507e2b2812776f4a35e66a3ace3a9edb3d3c50fc7734304d48a278aa7c3fe725f363d14c61442d11a07e8266bab8ce486c4c9eaae2c5ec7e93484c5ffcb53
 DIST swaks-20130209.0.tar.gz 102227 BLAKE2B 4726da81869e137458f1a3776c51ae33215999bef56b1835cf8558166bd756a8186900b83c0bf32a81d1ab1cf23ec379061f4db78ae5efa51de7a6c1a69d0092 SHA512 bf3c639f2c227d8219d5bc98a3d3519886471168c16e38d036283eeb1bb786c80bb80a648637150b3eb1903ef0c0d01bc37fd7b4f55af66a20f7bef18067b118
+DIST swaks-20190914.0.tar.gz 120803 BLAKE2B 68731c22fbff5ece5c9589c3767afd6aa4fc781df8c6124a0f57d48a3dff8def31ccae1b043e78f7c066194cfe480a0edeb16e43fcd5e1b1aa75b05e65a2367e SHA512 3167435a73e7729d090cba2431d5828895c25154c36d92e0ebecd5c4e2430ca596d62bb3e6eb3b65eadabd52c8331fe3bb8a492cce3ad247fa113c0af9c67339
 EBUILD swaks-20130209.0-r1.ebuild 973 BLAKE2B 916ee1b50772d67a8453a5745a78da399c7868a11bf33fd9fffbc00295419950d45078e4fc5e3b66d439d32d7289059c40d367b12ac846404931587e212f5c81 SHA512 071d817f0d8b8e60be7c0c012baffbbfd99a1ff717351a750bca7e7fe539c886290c164965f2632f441181f84ca40990ef728fa4d7f08f7abdb25cce2ff62378
-MISC metadata.xml 332 BLAKE2B b960f18e2b0a3a2af9ad3d3658677a1ed89791a26b08be6c745c45e7c0464ade277706d13f3ab764b1b5e733288ef64f3c495286a6e2b4603f0887aa366181c1 SHA512 ae2b76541ea3053071a4cb76f4e423174333cd0666e8606818c2ca7d7f3ab8263bc4b42c781af64fede626f8e665fed7b7ca23c651ddf75c9f5c1a8839becf94
+EBUILD swaks-20190914.0.ebuild 893 BLAKE2B 40594f87773d93f89871ab6b23342877e8e5dcf53b497a024499e8222315c2b5cf55b63de7e6e2549a7369ff9df694057f33f34a2a1e99f2c33699c587118dde SHA512 8836c89d2cfb902ce75ebd9d95681b73729e43ed83eb9763227a0f082430383b8d265e346943c341558669b1741d3f7964a11aa056221ec1e93cd612ec04d540
+MISC metadata.xml 540 BLAKE2B a3271dc0ad82899ef2945c3d42eb2030f08f47d7ae8633d89fe03edfe6b26f36eee4c7da193730360a7e54fae8d1c853cd24012024f33a96debe34330877737e SHA512 a0275812c2941b91adb18befe36ffe5e87a2d4dad904b3c7988e88f0b9252105d4bd35a18259c0c777a5f533632e1d2bbeb28298b0c97e69ddcc902e4919167c
diff --git a/net-mail/swaks/metadata.xml b/net-mail/swaks/metadata.xml
index 24e041dfd196..e78c3a3b67ca 100644
--- a/net-mail/swaks/metadata.xml
+++ b/net-mail/swaks/metadata.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>"Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH" - a full-featured Perl script for testing SMTP servers.</longdescription>
+	<maintainer type="person">
+		<email>alarig@swordarmor.fr</email>
+		<name>Alarig Le Lay</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		"Swiss Army Knife SMTP; Command line SMTP testing, including TLS and
+		AUTH" - a full-featured Perl script for testing SMTP servers.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-mail/swaks/swaks-20190914.0.ebuild b/net-mail/swaks/swaks-20190914.0.ebuild
new file mode 100644
index 000000000000..13065ec2350a
--- /dev/null
+++ b/net-mail/swaks/swaks-20190914.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
+HOMEPAGE="https://www.jetmore.org/john/code/swaks"
+SRC_URI="https://www.jetmore.org/john/code/swaks/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="ssl"
+
+DEPEND=">=dev-lang/perl-5.8.8"
+
+RDEPEND="${DEPEND}
+		>=dev-perl/Net-DNS-0.65
+		ssl? ( >=dev-perl/Net-SSLeay-1.35 )
+		>=virtual/perl-MIME-Base64-3.07
+		>=virtual/perl-Digest-MD5-2.39
+		>=virtual/perl-Time-HiRes-1.97
+		>=virtual/perl-Time-Local-1.19
+		>=dev-perl/Authen-NTLM-1.02
+		>=dev-perl/Authen-DigestMD5-0.04
+		virtual/perl-Digest-SHA"
+
+src_compile() {
+	/usr/bin/pod2man -s 1 doc/ref.pod swaks.1 || die "man page compulation failed"
+}
+
+src_install() {
+	dobin swaks
+	doman swaks.1
+	dodoc README.txt doc/*.txt
+}