gentoo resync : 30.05.2020

23 files changed, 638 insertions, 958 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index c07af5b8f906..9a1b57830e97 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 0bbc3531b4ec..eb428fbd0191 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -7,6 +7,7 @@ AUX exim-4.76-crosscompile.patch 462 BLAKE2B de78322f93760cef0d5a768b8be6c723f00
 AUX exim-4.80-spool-mail-group.patch 946 BLAKE2B a3b6783b77823c5a8373623d16b85e2ba209b419b6724f307c46bf961bc5195690453208cdd40e45bc36e5a070892414c7737a97fa04e653e78050c153c59079 SHA512 24f30e9a9d90dc0f1fe8b3db26f8bc2649182b4e78110dc28a9c0f3a3feb7589f923144a4f1c54a1c46ff8cfe40826a1f2212787753be752f4d15a72d54a143b
 AUX exim-4.93-CVE-2020-12783.patch 2469 BLAKE2B b4a98d5d5c45756ea8da01cb18bae40b6d242076557e80cc79dfd2d3d21b96f9860c2a6b17433a849e631504b8669a281b1ae3d0a67f6d599b631df03e54a630 SHA512 5efc5fb8375cdd560d8efe414094751c875a3dd363c93d8228248440e3c269348d54e039c52d311113d2a62a8d0016d1ad0e44314350ea6a5e3c59a9d66af58a
 AUX exim-4.93-as-needed-ldflags.patch 6013 BLAKE2B 2de473f089a36cabd5481020524dcb2efb7a5681b224608a8454aebc70e07f7776fe812f02fa5d81fb80b25bc2cc154924953d173d65664b1e576176a01191b9 SHA512 df6c18a7d092d9069dd6d4177154681197de86ab41dbd399055ad663cbd0c7da149f8bbcb7c888965851475ee2cf891dc934f1d5ad7a4ea3dc46a54ece582418
+AUX exim-4.93-fno-common.patch 767 BLAKE2B cd66b56d88badd97c1d081c3458adf294352b9f34dc0faee820d75ed4b97be8a5f313c4ba46ea08d4c3ba4744badf3759393bea1455a3e7fc04d80939d5ec49e SHA512 5fc5cab9091296e0bc7665e9e08f5232decef4585c7504abab104a8a7cf1c69aee4f535f1e1214b94aeb856b8f5620c42608f35e7c7ff26667de88a8719bd301
 AUX exim-4.93-localscan_dlopen.patch 9585 BLAKE2B 02b11e75c94d70a787973e89dc329fc006b263d4411ccfb177acf596fd3832cc471004394cf126a9299b62113dc25fcf61bff9bb63d39c19f60ca7203c732be3 SHA512 5de142c1da26cd60e9e05de25e7c7de1f338591b3d73ea9ff151dc446ca45a2361841a28776e9680e77183f2071a7cac68063d5f83e79257b7b4a4884e1e9110
 AUX exim-4.93-radius.patch 2791 BLAKE2B 94edcc141e9ed4b8f669298fc9af5e2fdc2835488567917721c7061835e7d7980c3944cb21b2cdb46041be7e8f93d57fc4d26cda0aa9583b98a594ee6c11260a SHA512 8393bddb5f85879e6fb3e4a8272df8583d99600f5ef25abbcea429743e9e396248e47c2dabeba7c6178d2a4d21f82ae68cde92a50bcb9598370bd0b3d8bc220f
 AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
@@ -20,5 +21,5 @@ AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076ae
 DIST exim-4.93.0.4.tar.xz 1804696 BLAKE2B 721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e SHA512 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
 DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca SHA512 929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.93.0.4-r1.ebuild 13958 BLAKE2B 83f81ea89be60289fbc7a6b8f486cee5de7d8104cb5b92cf50b247bfe1dd5546176bce8e15ef37ceb3c852a2b5a7b2464760f270a264b7195eb502991a0ec168 SHA512 0b0b43a6557d52c10f24d7864b46ff7d2a65566450016efb7d101af4367344a5686bb4ffaed031721e7e06a969062057153e5a0fa871736d181f72b205107944
+EBUILD exim-4.93.0.4-r1.ebuild 14020 BLAKE2B 2d97b3d39774320271507fdf50f93d9dac88bdaa54b0d8387b2baeb6fff6baee9bc4185b86591f12053f3210b18514f027a6de9a103daad81d871fee837a9c7e SHA512 382c09462376ff6a156ede33316585c38e93a4e5474271f06bd141be20567af2df4e0a26539a219d09cd3b760a754dfc187fd75c712637cc60723b5d2e7f5526
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
index cb68569b7c84..19d13cef361f 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -116,6 +116,7 @@ src_prepare() {
 	eapply     "${FILESDIR}"/exim-4.93-localscan_dlopen.patch
 	eapply -p2 "${FILESDIR}"/exim-4.93-radius.patch # 720364
 	eapply     "${FILESDIR}"/exim-4.93-CVE-2020-12783.patch # 722484
+	eapply     "${FILESDIR}"/exim-4.93-fno-common.patch # 723430
 
 	if use maildir ; then
 		eapply "${FILESDIR}"/exim-4.20-maildir.patch
diff --git a/mail-mta/exim/files/exim-4.93-fno-common.patch b/mail-mta/exim/files/exim-4.93-fno-common.patch
new file mode 100644
index 000000000000..c5fff1c6720c
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.93-fno-common.patch
@@ -0,0 +1,16 @@
+Fix -fno-common linking
+
+Bug: https://bugs.gentoo.org/723430
+Bug: https://bugs.exim.org/show_bug.cgi?id=2577
+
+--- exim-4.93.0.4/src/globals.h
++++ exim-4.93.0.4/src/globals.h
+@@ -342,7 +342,7 @@
+ extern BOOL    allow_domain_literals;  /* As it says */
+ extern BOOL    allow_mx_to_ip;         /* Allow MX records to -> ip address */
+ #ifdef EXPERIMENTAL_ARC
+-struct arc_set *arc_received;	       /* highest ARC instance evaluation struct */
++extern struct arc_set *arc_received;	       /* highest ARC instance evaluation struct */
+ extern int     arc_received_instance;  /* highest ARC instance number in headers */
+ extern int     arc_oldest_pass;        /* lowest passing instance number in headers */
+ extern const uschar *arc_state;	       /* verification state */
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 04ba575761c8..f57b6812d1e5 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,8 +1,12 @@
 AUX 1.06-exit.patch 551 BLAKE2B 77a928b1aff304bce5b5df69d067e1271f6ce5ecf0342486d4c8dcbb3546f1a19cdf758a3af3ebbc24d02d3e924a05dceaf7ab6c27605f662df4ec66fc80067b SHA512 9623d4c045d1399ca035ad49f82e50a344529edffaf7c0e2f1015fe0958dfaf8814462a70b944403203d84b86852e8a01f6a3c4688228b45443258dc908e9236
 AUX 1.06-fbsd-utmpx.patch 1902 BLAKE2B 8c2a278e10ed48db89b76c7005655f6e7707ee4e61d9cbfdcfbd3b7f335450131eecb810b1bc92fd49243ae03ab7f94384bf9078115f01bcf625d8c87d624040 SHA512 c1267365a1199aa5041cc75769e838cfacddd82e1f6dddcc99d86f4b4fc901d8604abdab96a86479109f2278970d88249d8013115dfb89d3e2cfa0e823a01a86
 AUX 1.06-readwrite.patch 237 BLAKE2B a8c9af939378bb423c68aebdafeeb3ecb53def9e7d050272e6f669c4d99d938a10a268420b1cf7e699146b3f71bb75c461e45f3f0905b9ccd3371572947aafca SHA512 4cfb7991f2b30740d007a655743e77f5271ebefb4ed31ceb44d10ee53168eec713bbe64ff3616c372851c5fe1f04e57601dc83a27f1ce9cccdd0e2fbc942b550
+AUX netqmail-1.06-CVE-2005-1513.patch 2362 BLAKE2B 9fa61890284f6ef84de6c0781ccad4bc998865785a7ce3bb5ce2b6fa6d3d84a65718262d009d72cb787609272b830b87ba19c393cbfecf91721b018185a72fee SHA512 0f0a6c72b3479e44f105f629599a08f55baa03d7794075baaea20897079888fb14dcac0227a280f9dd91d1d62e8b05984383e150e61d40c674131a105dfad762
+AUX netqmail-1.06-CVE-2005-1514.patch 972 BLAKE2B 464f62fb87e3aa7580e850a3210f3b606e24e9e586cdceca4c3b3270f0e073a020db457d4efce27ad500e89b30c3c73192d48305ac6aa53e21951f6e6429dff3 SHA512 7b6cd95ff2e1f238877b2208440808dd28fccdbeb1b87cc827c92e1fb433b2e829a21eadce9e1cab07da4a2838a2ee391850bd451ce775004fb1fcb4bd3fafd9
+AUX netqmail-1.06-CVE-2005-1515.patch 1820 BLAKE2B 05bef22814dea4925e04f9cf5533d97c7c102184ff0cc026ae57f09c9f20ac750c73b390680383278f2bb78bb76872f5b412a70f90e133ad5b01edf6bfad6fd4 SHA512 83da821b37abf34b36e36cf95ea07624d7d2e4780328e2e0c1a2580dcbb1b0f38f41b8106217d4277b7576a3b065bd1dd35da979817e36d4b2e4a904687b300e
 AUX netqmail-1.06-any-to-cname.patch 3242 BLAKE2B ea216ecf0d2f3fd4decc92d4826559438edc9764b6910c8ef328863f4c94a1b6af57b1619a74ffd67eb09ae2725a24e53ff75cc24d2aa7896f6bb39392840ed4 SHA512 9f2fea79807d1f6da0494c992993217809f2fda2b00847ed7af7ea73e81fc421c26a14fcae7d77783e2c15be425159f5fba3f20e6c3d88e67134ec0678d3a4cd
 AUX netqmail-1.06-ipme-multiple.patch 3694 BLAKE2B 53d1db0766a1720cf626210bd9272f2e5bbe310738c934ed8c3c0ffc7adb54ba8938af0d12771c77f59cada9d1c97f858cacfd86a4a0b0bcbb5c6c4e7d0d0d6e SHA512 08f26af9ecab24258956d20c8e7201bd4f3d55ce9f2793417ae3fa1ecae4e610eaa2fcfe01462ffa70f4974b5ee4969851c254ab051fe039dd2a8eb9fb8b8f5e
+AUX netqmail-1.06-overflows.patch 5874 BLAKE2B d54f69a8696612ef542de8fadbc36463b56fdcb756d9d6e606440586533fb7929e755c1cf64d9cb88f7c8503bfd36b356b2e003c26e3b074889b1b897c75141e SHA512 dfd34f5005c33fdcce6be90765420c485c89e282cc5db4d667f254f7cc83112f08b99a93c4f520a7380c60fa5c0944a183bf5455b6d51f5fbb66e9bac899c196
 AUX qmail-smtputf8-crlf-fix.patch 397 BLAKE2B 3ca4abcb9f1c1604828c31f358a6da3b3f9734a76d736b1dacada786e69ef010bdb0254d8106c82859ad66f21e1f81249db5f49984116ac84e7c719770999306 SHA512 b6e8060ef00464f429bc8b6d47d294c8e021ddef1991b7cf212a277f375872672d7f4ef799d93f1913fcb9260cb6d74049e6e9978aa43b59228e6c0c067cd87b
 AUX qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 DIST big-todo.103.patch 5546 BLAKE2B 34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554 SHA512 fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975
@@ -14,4 +18,5 @@ DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d32
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 EBUILD netqmail-1.06-r12.ebuild 4558 BLAKE2B 9adfc66473fb61f908cb90f881fa3f23341df3d2e734e997164c3d6151fc540db39efd6680c289c0f86e3d78ba1fdc49e8f6ba2ef325562ffbf177024af2d3fa SHA512 736fab292b62cd258357a612159485adf80681e1244aa9057d8eb7b8ec2069b5538654653f9ca5d4132139151dcb935c54a9e8395a8aa0517e2f92654ab0d4f5
+EBUILD netqmail-1.06-r13.ebuild 4716 BLAKE2B caa266393bebd340fe69c0db66340b5b58545da63d0118f6dabf247f0f8dd887b394fd1900b5e808499d410fc31ab9e24d602164f9c1b62450958c0e8032607c SHA512 99d405d30686b2fd603b2d93acac021057305aa369a536494232f2499901005b43dde2483de79024a7c4328d2e3a901e3f217699ec66b6edcaa40fa2df6e2c13
 MISC metadata.xml 720 BLAKE2B 9bd0209a0db8075a22507fb63fa9f045959323da3b4c53e3d9da9d412fd39ff3576dc29c6d2af9db949e5fee4e98e166bbc41ce1d48ba0f8964e85fbe99728bb SHA512 57330a6fa33d3c65b0fe1289f89d356bebca6e7c8ba47cb5edfe53cd74938646ca60e3d001facab1fa5c4071fee7c3a8e0ad2ba2b4604aea3a8525c391991715
diff --git a/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1513.patch b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1513.patch
new file mode 100644
index 000000000000..58af5a9cee11
--- /dev/null
+++ b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1513.patch
@@ -0,0 +1,66 @@
+From bb92ea678c2a2a524d2ee6e9d598275a659168d2 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Mon, 11 May 2020 18:30:13 +0200
+Subject: [PATCH 3/4] mimimum fix for CVE-2005-1513
+
+The first allocation at the tail of the function is not changed as that
+one starts with a small number of elements and grows only on
+subsequent call.s
+---
+ gen_allocdefs.h | 27 ++++++++++++++++++++++-----
+ 1 file changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/gen_allocdefs.h b/gen_allocdefs.h
+index 783a9b1..0588441 100644
+--- a/gen_allocdefs.h
++++ b/gen_allocdefs.h
+@@ -4,24 +4,41 @@
+ #define GEN_ALLOC_ready(ta,type,field,len,a,i,n,x,base,ta_ready) \
+ int ta_ready(x,n) register ta *x; register unsigned int n; \
+ { register unsigned int i; \
++  unsigned int nlen; \
+   if (x->field) { \
+     i = x->a; \
+     if (n > i) { \
+-      x->a = base + n + (n >> 3); \
+-      if (alloc_re(&x->field,i * sizeof(type),x->a * sizeof(type))) return 1; \
++      unsigned int nnum; \
++      if (__builtin_add_overflow(base, n, &nlen)) \
++        return 0; \
++      if (__builtin_add_overflow(nlen, n >> 3, &nlen)) \
++        return 0; \
++      if (__builtin_mul_overflow(nlen, sizeof(type), &nnum)) \
++        return 0; \
++      x->a = nlen; \
++      if (alloc_re(&x->field,i * sizeof(type),nnum)) return 1; \
+       x->a = i; return 0; } \
+     return 1; } \
+   x->len = 0; \
+   return !!(x->field = (type *) alloc((x->a = n) * sizeof(type))); }
+ 
+ #define GEN_ALLOC_readyplus(ta,type,field,len,a,i,n,x,base,ta_rplus) \
+-int ta_rplus(x,n) register ta *x; register unsigned int n; \
++int ta_rplus(x,n) register ta *x; unsigned int n; \
+ { register unsigned int i; \
+   if (x->field) { \
+     i = x->a; n += x->len; \
++    if (__builtin_add_overflow(n, x->len, &n)) \
++      return 0; \
+     if (n > i) { \
+-      x->a = base + n + (n >> 3); \
+-      if (alloc_re(&x->field,i * sizeof(type),x->a * sizeof(type))) return 1; \
++      unsigned int nlen, nnum; \
++      if (__builtin_add_overflow(base, n, &nlen)) \
++        return 0; \
++      if (__builtin_add_overflow(nlen, n >> 3, &nlen)) \
++        return 0; \
++      if (__builtin_mul_overflow(nlen, sizeof(type), &nnum)) \
++        return 0; \
++      x->a = nlen; \
++      if (alloc_re(&x->field,i * sizeof(type),nnum)) return 1; \
+       x->a = i; return 0; } \
+     return 1; } \
+   x->len = 0; \
+-- 
+2.26.1
+
diff --git a/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1514.patch b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1514.patch
new file mode 100644
index 000000000000..3876c290b676
--- /dev/null
+++ b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1514.patch
@@ -0,0 +1,39 @@
+From dc617a2f2d31e4c448b806791b3f8736cf9d1ffb Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Tue, 12 May 2020 20:06:38 +0200
+Subject: [PATCH 2/4] fix possible signed integer overflow in commands()
+ (CVE-2005-1514)
+
+Fix it as suggested by the Qualys Security Advisory team.
+---
+ commands.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/commands.c b/commands.c
+index b0d3f61..90a50c9 100644
+--- a/commands.c
++++ b/commands.c
+@@ -10,16 +10,17 @@ int commands(ss,c)
+ substdio *ss;
+ struct commands *c;
+ {
+-  int i;
++  unsigned int i;
+   char *arg;
+ 
+   for (;;) {
+     if (!stralloc_copys(&cmd,"")) return -1;
+ 
+     for (;;) {
++      int j;
+       if (!stralloc_readyplus(&cmd,1)) return -1;
+-      i = substdio_get(ss,cmd.s + cmd.len,1);
+-      if (i != 1) return i;
++      j = substdio_get(ss,cmd.s + cmd.len,1);
++      if (j != 1) return j;
+       if (cmd.s[cmd.len] == '\n') break;
+       ++cmd.len;
+     }
+-- 
+2.26.1
+
diff --git a/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1515.patch b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1515.patch
new file mode 100644
index 000000000000..f1df70022e17
--- /dev/null
+++ b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1515.patch
@@ -0,0 +1,64 @@
+From 5540e1b47ac043033e6661b4e04dcaf958db0110 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Mon, 11 May 2020 18:55:11 +0200
+Subject: [PATCH 1/4] fix signedness wraparound in substdio_put()
+ (CVE-2005-1515)
+
+---
+ qmail.c   |  2 +-
+ substdo.c | 14 ++++++++------
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/qmail.c b/qmail.c
+index 186c092..7c86a04 100644
+--- a/qmail.c
++++ b/qmail.c
+@@ -61,7 +61,7 @@ void qmail_fail(qq) struct qmail *qq;
+   qq->flagerr = 1;
+ }
+ 
+-void qmail_put(qq,s,len) struct qmail *qq; char *s; int len;
++void qmail_put(qq,s,len) struct qmail *qq; char *s; unsigned int len;
+ {
+   if (!qq->flagerr) if (substdio_put(&qq->ss,s,len) == -1) qq->flagerr = 1;
+ }
+diff --git a/substdo.c b/substdo.c
+index fb616f7..bccf0d6 100644
+--- a/substdo.c
++++ b/substdo.c
+@@ -7,7 +7,7 @@ static int allwrite(op,fd,buf,len)
+ register int (*op)();
+ register int fd;
+ register char *buf;
+-register int len;
++register unsigned int len;
+ {
+   register int w;
+ 
+@@ -55,16 +55,18 @@ register int len;
+ int substdio_put(s,buf,len)
+ register substdio *s;
+ register char *buf;
+-register int len;
++register unsigned int len;
+ {
+-  register int n;
++  register unsigned int n = s->n; /* how many bytes to write in next chunk */
+  
+-  n = s->n;
+-  if (len > n - s->p) {
++  /* check if the input would fit in the buffer without flushing */
++  if (len > n - (unsigned int)s->p) {
+     if (substdio_flush(s) == -1) return -1;
+     /* now s->p == 0 */
+     if (n < SUBSTDIO_OUTSIZE) n = SUBSTDIO_OUTSIZE;
+-    while (len > s->n) {
++    /* as long as the remainder would not fit into s->x write it directly
++     * from buf to s->fd. */
++    while (len > (unsigned int)s->n) {
+       if (n > len) n = len;
+       if (allwrite(s->op,s->fd,buf,n) == -1) return -1;
+       buf += n;
+-- 
+2.26.1
+
diff --git a/mail-mta/netqmail/files/netqmail-1.06-overflows.patch b/mail-mta/netqmail/files/netqmail-1.06-overflows.patch
new file mode 100644
index 000000000000..d9932df972c4
--- /dev/null
+++ b/mail-mta/netqmail/files/netqmail-1.06-overflows.patch
@@ -0,0 +1,223 @@
+From e8a1e037afc8729bd65d4bda36dedf444f301c0f Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Mon, 11 May 2020 18:30:13 +0200
+Subject: [PATCH 4/4] fix additional length overflows
+
+---
+ Makefile        |  6 +++---
+ alloc.c         | 21 ++++++++++++++-------
+ qmail-local.c   |  3 ++-
+ qmail-pop3d.c   |  3 ++-
+ quote.c         | 10 +++++++++-
+ stralloc_catb.c |  8 +++++++-
+ stralloc_opyb.c |  8 +++++++-
+ substdo.c       |  4 ++--
+ 8 files changed, 46 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0f0e31a..4b592c6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1673,7 +1673,7 @@ qsutil.h
+ 	./compile qsutil.c
+ 
+ quote.o: \
+-compile quote.c stralloc.h gen_alloc.h str.h quote.h
++compile quote.c stralloc.h gen_alloc.h str.h quote.h error.h
+ 	./compile quote.c
+ 
+ rcpthosts.o: \
+@@ -1965,7 +1965,7 @@ compile stralloc_cat.c byte.h stralloc.h gen_alloc.h
+ 	./compile stralloc_cat.c
+ 
+ stralloc_catb.o: \
+-compile stralloc_catb.c stralloc.h gen_alloc.h byte.h
++compile stralloc_catb.c stralloc.h gen_alloc.h byte.h error.h
+ 	./compile stralloc_catb.c
+ 
+ stralloc_cats.o: \
+@@ -1982,7 +1982,7 @@ gen_allocdefs.h
+ 	./compile stralloc_eady.c
+ 
+ stralloc_opyb.o: \
+-compile stralloc_opyb.c stralloc.h gen_alloc.h byte.h
++compile stralloc_opyb.c stralloc.h gen_alloc.h byte.h error.h
+ 	./compile stralloc_opyb.c
+ 
+ stralloc_opys.o: \
+diff --git a/alloc.c b/alloc.c
+index c661453..3ab5f6f 100644
+--- a/alloc.c
++++ b/alloc.c
+@@ -1,7 +1,6 @@
++#include <stdlib.h>
+ #include "alloc.h"
+ #include "error.h"
+-extern char *malloc();
+-extern void free();
+ 
+ #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
+ #define SPACE 4096 /* must be multiple of ALIGNMENT */
+@@ -11,15 +10,23 @@ static aligned realspace[SPACE / ALIGNMENT];
+ #define space ((char *) realspace)
+ static unsigned int avail = SPACE; /* multiple of ALIGNMENT; 0<=avail<=SPACE */
+ 
++static char *m_alloc(unsigned int n)
++{
++  char *x = malloc(n);
++  if (!x) errno = error_nomem;
++  return x;
++}
++
+ /*@null@*//*@out@*/char *alloc(n)
+ unsigned int n;
+ {
+-  char *x;
+-  n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */
++  if (n >= SPACE)
++    return m_alloc(n);
++  /* Round it up to the next multiple of alignment. Could overflow if n is
++   * close to 2**32, but by the check above this is already ruled out. */
++  n = ALIGNMENT + n - (n & (ALIGNMENT - 1));
+   if (n <= avail) { avail -= n; return space + avail; }
+-  x = malloc(n);
+-  if (!x) errno = error_nomem;
+-  return x;
++  return m_alloc(n);
+ }
+ 
+ void alloc_free(x)
+diff --git a/qmail-local.c b/qmail-local.c
+index 6fec288..f5e33fd 100644
+--- a/qmail-local.c
++++ b/qmail-local.c
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
+ #include "readwrite.h"
+ #include "sig.h"
+ #include "env.h"
+@@ -633,7 +634,7 @@ char **argv;
+      i = j + 1;
+     }
+ 
+- recips = (char **) alloc((numforward + 1) * sizeof(char *));
++ recips = (char **) calloc(numforward + 1, sizeof(char *));
+  if (!recips) temp_nomem();
+  numforward = 0;
+ 
+diff --git a/qmail-pop3d.c b/qmail-pop3d.c
+index 0ca4f9c..1916433 100644
+--- a/qmail-pop3d.c
++++ b/qmail-pop3d.c
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
+ #include "commands.h"
+ #include "sig.h"
+ #include "getln.h"
+@@ -131,7 +132,7 @@ void getlist()
+   if (maildir_scan(&pq,&filenames,1,1) == -1) die_scan();
+  
+   numm = pq.p ? pq.len : 0;
+-  m = (struct message *) alloc(numm * sizeof(struct message));
++  m = (struct message *) calloc(numm, sizeof(struct message));
+   if (!m) die_nomem();
+  
+   for (i = 0;i < numm;++i) {
+diff --git a/quote.c b/quote.c
+index 659cfcd..73b7214 100644
+--- a/quote.c
++++ b/quote.c
+@@ -1,3 +1,4 @@
++#include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+ #include "quote.h"
+@@ -23,8 +24,15 @@ stralloc *sain;
+  char ch;
+  int i;
+  int j;
++ unsigned int nlen;
+ 
+- if (!stralloc_ready(saout,sain->len * 2 + 2)) return 0;
++ /* make sure the size calculation below does not overflow */
++ if (__builtin_mul_overflow(sain->len, 2, &nlen) ||
++     __builtin_add_overflow(nlen, 2, &nlen)) {
++   errno = error_nomem;
++   return 0;
++ }
++ if (!stralloc_ready(saout,nlen)) return 0;
+  j = 0;
+  saout->s[j++] = '"';
+  for (i = 0;i < sain->len;++i)
+diff --git a/stralloc_catb.c b/stralloc_catb.c
+index 67dbcc0..a315810 100644
+--- a/stralloc_catb.c
++++ b/stralloc_catb.c
+@@ -1,13 +1,19 @@
+ #include "stralloc.h"
+ #include "byte.h"
++#include "error.h"
+ 
+ int stralloc_catb(sa,s,n)
+ stralloc *sa;
+ char *s;
+ unsigned int n;
+ {
++  unsigned int i;
+   if (!sa->s) return stralloc_copyb(sa,s,n);
+-  if (!stralloc_readyplus(sa,n + 1)) return 0;
++  if (__builtin_add_overflow(n, 1, &i)) {
++    errno = error_nomem;
++    return 0;
++  }
++  if (!stralloc_readyplus(sa,i)) return 0;
+   byte_copy(sa->s + sa->len,n,s);
+   sa->len += n;
+   sa->s[sa->len] = 'Z'; /* ``offensive programming'' */
+diff --git a/stralloc_opyb.c b/stralloc_opyb.c
+index ac258b3..8a6f305 100644
+--- a/stralloc_opyb.c
++++ b/stralloc_opyb.c
+@@ -1,12 +1,18 @@
+ #include "stralloc.h"
+ #include "byte.h"
++#include "error.h"
+ 
+ int stralloc_copyb(sa,s,n)
+ stralloc *sa;
+ char *s;
+ unsigned int n;
+ {
+-  if (!stralloc_ready(sa,n + 1)) return 0;
++  unsigned int i;
++  if (__builtin_add_overflow(n, 1, &i)) {
++    errno = error_nomem;
++    return 0;
++  }
++  if (!stralloc_ready(sa,i)) return 0;
+   byte_copy(sa->s,n,s);
+   sa->len = n;
+   sa->s[n] = 'Z'; /* ``offensive programming'' */
+diff --git a/substdo.c b/substdo.c
+index bccf0d6..ad7232a 100644
+--- a/substdo.c
++++ b/substdo.c
+@@ -38,9 +38,9 @@ register substdio *s;
+ int substdio_bput(s,buf,len)
+ register substdio *s;
+ register char *buf;
+-register int len;
++register unsigned int len;
+ {
+-  register int n;
++  register unsigned int n;
+  
+   while (len > (n = s->n - s->p)) {
+     byte_copy(s->x + s->p,n,buf); s->p += n; buf += n; len -= n;
+-- 
+2.26.1
+
diff --git a/mail-mta/netqmail/netqmail-1.06-r13.ebuild b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
new file mode 100644
index 000000000000..ae21c36a52c5
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENQMAIL_PV=20191010
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20190114
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+QMAIL_SMTPUTF8='qmail-smtputf8.patch'
+
+inherit qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+	http://netqmail.org
+	https://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
+	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+	!vanilla? (
+		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		ssl? (
+			https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
+			http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+			https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
+		)
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+RESTRICT="test"
+
+DEPEND="
+	acct-group/nofiles
+	acct-group/qmail
+	acct-user/alias
+	acct-user/qmaild
+	acct-user/qmaill
+	acct-user/qmailp
+	acct-user/qmailq
+	acct-user/qmailr
+	acct-user/qmails
+	net-dns/libidn2
+	net-mail/queue-repair
+	sys-apps/gentoo-functions
+	sys-apps/groff
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+RDEPEND="${DEPEND}
+	sys-apps/ucspi-tcp
+	virtual/checkpassword
+	virtual/daemontools
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	ssl? (
+		pop3? ( sys-apps/ucspi-ssl )
+	)
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nullmailer
+	!mail-mta/opensmtpd
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+"
+
+pkg_setup() {
+	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+		eerror
+		eerror "The QMAIL_PATCH_DIR variable for custom patches"
+		eerror "has been removed from ${PN}. If you need custom patches"
+		eerror "see 'user patches' in the portage manual."
+		eerror
+		die "QMAIL_PATCH_DIR is not supported anymore"
+	fi
+}
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	unpack ${P}.tar.gz
+}
+
+PATCHES=(
+	"${FILESDIR}/${PV}-exit.patch"
+	"${FILESDIR}/${PV}-readwrite.patch"
+	"${DISTDIR}/${QMAIL_LARGE_DNS}"
+	"${FILESDIR}/${PV}-fbsd-utmpx.patch"
+	"${FILESDIR}/${P}-ipme-multiple.patch"
+	"${FILESDIR}/${P}-any-to-cname.patch"
+	"${FILESDIR}/${P}-CVE-2005-1513.patch"
+	"${FILESDIR}/${P}-CVE-2005-1514.patch"
+	"${FILESDIR}/${P}-CVE-2005-1515.patch"
+	"${FILESDIR}/${P}-overflows.patch"
+)
+
+src_prepare() {
+	if ! use vanilla; then
+		if use ssl; then
+			# This patch contains relative paths and needs to be cleaned up.
+			sed 's~^--- \.\./\.\./~--- ~g' \
+				< "${DISTDIR}"/${QMAIL_TLS_F} \
+				> "${T}"/${QMAIL_TLS_F} || die
+			PATCHES+=( "${T}/${QMAIL_TLS_F}"
+				"${DISTDIR}/${QMAIL_TLS_CVE}"
+				"${FILESDIR}/qmail-smtputf8.patch"
+				"${FILESDIR}/qmail-smtputf8-crlf-fix.patch"
+			)
+		fi
+		if use highvolume; then
+			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
+		fi
+
+		if use qmail-spp; then
+			if use ssl; then
+				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
+			else
+				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
+			fi
+			# make the patch work with "-p1"
+			sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die
+
+			PATCHES+=( "${SPP_PATCH}" )
+		fi
+	fi
+
+	default
+
+	qmail_src_postunpack
+
+	# Fix bug #33818 but for netqmail (Bug 137015)
+	if ! use authcram; then
+		einfo "Disabled CRAM_MD5 support"
+		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
+	else
+		einfo "Enabled CRAM_MD5 support"
+	fi
+
+	ht_fix_file Makefile*
+}
+
+src_compile() {
+	qmail_src_compile
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+}
+
+pkg_postinst() {
+	qmail_queue_setup
+	qmail_rootmail_fixup
+	qmail_tcprules_build
+
+	qmail_config_notice
+	qmail_supervise_config_notice
+	elog
+	elog "If you are looking for documentation, check those links:"
+	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
+	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
+	elog "http://www.lifewithqmail.com/"
+	elog "  -- Life with qmail"
+	elog
+}
+
+pkg_preinst() {
+	qmail_tcprules_fixup
+}
+
+pkg_config() {
+	# avoid some weird locale problems
+	export LC_ALL=C
+
+	qmail_config_fast
+	qmail_tcprules_config
+	qmail_tcprules_build
+
+	use ssl && qmail_ssl_generate
+}
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index f2100833a1cf..c69952bc34f6 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -2,6 +2,6 @@ AUX smtpd.initd 231 BLAKE2B a4991c9226daa2289cb20238dcee0dad8b4ff83474327649b61c
 AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec4ca9b240880ef63da3f27e4fb8b653af4ae413ca42cdeb343e1f4e737b7e6258c0d338223d SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
-DIST opensmtpd-6.6.4p1.tar.gz 790754 BLAKE2B 18cc19569ae764eff3d672cbfb87df7bd00afcce93705ad128e935c0a47a246c3a6166fca7b6f844c0dd5e728492d8aeb7e0f8a8c1f5a756bf356ae9afb80852 SHA512 267307c91f4fcf21624b0897dfb1f5638b77da7b8d9a02211d734ed2cc5bd39ea7542ae7f200255e2945518fbe7609a0e5aa4e5c6dcb8146014f08b3845c108b
-EBUILD opensmtpd-6.6.4_p1.ebuild 1998 BLAKE2B 6d24269e834350693240f9a0cbbd702994b027102cbaa26c7a98653e2e6f89e3a80fff36c3386a669475520e8b9bdf79f348deb062b6b71f6e88ed6fbf15c2b1 SHA512 bd9791a7fcec94ecc29835942089abb61bdce74e1d442e27072b6c544c505d43d8417dcc1a27a599be1684ec3e0f228e05d3f4bc68a2f78ddeb719683897eece
+DIST opensmtpd-6.7.1p1.tar.gz 859364 BLAKE2B 5b4002e8f15ab31810c9a4ccf22a0efc240f9db8bd14b8bb78aedf853b9c9db77cc4d6602a8d4b8d73904682cb1b345cb34aee69d10152d5be5cdf8d6cd37b96 SHA512 403952e77b360f42d8dc8ae7cd7faeced831b9e37bffd7c67d338b7208f7471d50f3594c3475a9282d18cb17435efd305ec8c05f89eaeab5d363ddb1c4d54a2e
+EBUILD opensmtpd-6.7.1_p1.ebuild 1784 BLAKE2B 50af3b85d09db18c422ab39e8d0e3f6a1872ac38c8fed758e1556a9ca67249cb3d6bfc5db1d94c339887da4c8d8f94e1875fbb94dc2cc1e4b4c4d6fb3377c6d3 SHA512 928dff7a3ada63838ee5a697e65aaefdefb876e2141cf8242a25a66bc71e73c8026abc13995bcc6b8a8f3d619db234107467e1843ee22634ef5e8379e3d5eb7c
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
index 143540cb4f1c..115b05b5c443 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
@@ -71,11 +71,3 @@ src_install() {
 		ln -s --relative "${ED}"/usr/sbin/smtpctl "${ED}"/usr/$(get_libdir)/sendmail || die
 	fi
 }
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from version 6.0, note that the"
-	ewarn "configuration syntax has changed, and config files"
-	ewarn "now live in /etc/smtpd instead of /etc/opensmtpd."
-	ewarn
-}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index a279abf80573..b03e10ba2937 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,19 +1,13 @@
-AUX postfix-gcc10.patch 2236 BLAKE2B 4f8426b7b5a119166e0bcbc8402244568d5e8ba85a623d9d34d5ff8dfa5a7fb589f7f92b243c7af85f0ede77e6f7bf3221e3ae2d7492cf1deba0274e8785d38a SHA512 594d6673846f9ea68639297e0402107c6746984acfcd3d1fc922440765736bc8b430ffba7e1e0b5d3432c2737b430dac3f7df5b80f8ec031351db9cd1ef93332
-AUX postfix-glibc230.patch 870 BLAKE2B 5151298b690bcb742c9dee07da11a63e0c96cf0905c648efb9b114462aad1a8355c84be869dde54248c1eedc84f18503ce5af7a9e7fd163c81d642934c87a03c SHA512 930c492f90ae3f3c29ee002efdb717a745df787e064ef4ba6fa28c4c5bd7fef2ef91fbdb3705ed5c81c24053d52103d3969b2d73260aa5d1ccb9654ced401aea
 AUX postfix-libressl-certkey.patch 436 BLAKE2B fc9a949e8499163010b117971fc817d070f3eb74371fddbcf1cebae51276eaa30da0e8d9aaad24f775971b5ea54f3df35142bbb66d984245674e6e88728992da SHA512 b3913b1158d1fa46868b9f3ed13a2a464abd5d8f4acabc594c0c19bb3134028231503fa05dcb70b8ca0fcaefae30ea45b6e715d3545c5820b70272367e1127b5
 AUX postfix-libressl-server.patch 446 BLAKE2B bd07df754cb0d943dfd3483272399b3271471f09ce9c7062f3ad6ee27fed80b714144b9227ec1e91e66e1d7f8766952534662d512bf3e3a89156632cfc4b72bf SHA512 19eaca88239ab6b7ba5dc3ce36ccaae0ad2994dcfa17fbe2e03a9731d2016398dbebb4068f4ebab6c65a389bc7fa8c27b2e8e447cb9a550da5e0ee9c22879854
 AUX postfix.rc6.2.7 2107 BLAKE2B 291d9e02ffdac79a1c7c64febc5674321e675de341b468ba0bcad63b0a57420d68d4c6f56aac7b8c970137b73c9b9b9d56e5f3d10b461636164d3316fd20c566 SHA512 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592
 AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d38f195227190b73cf0fb41cd68a86e97cfe844cc7f9f095cba0a17afe9ce7c8697e0aa30f5faecde6 SHA512 04b475040b153f488a9358567ff9ee2eb8f263c619dadc23c837d17c19106041296e3652bcaded2be0c7c8b9eee7fd5f2ad55bed3e7f9b3a4bf9655f4762d563
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
-DIST postfix-3.4.10.tar.gz 4573370 BLAKE2B 57ed51539de2c06bdc8d5105ab28b06d9d9ae782255971571c57310b54e187ef5da5191b7145ada81863e247a72fcc576e571848f5ad7ad720afb06ac77c2cf3 SHA512 b337fff8212bfec100d4f415ddb04a4539fad31c7cb555a37e778e7807d70a2a6879ac6d79af96a0593c23189cfaf65e5021fd4e8d39c641ccaabdd06cb7daad
-DIST postfix-3.4.9.tar.gz 4573241 BLAKE2B 6f6bd977d4670328aa89a296c0d92d7022a85e289b5197ad46f80e0fb88af565ca93f2affab50c742dd05010aa9a9ea2a68264c07f986ad39a6c1d7d6dec8300 SHA512 9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991
-DIST postfix-3.5.0.tar.gz 4609501 BLAKE2B 476520658c64ea2ee8b04896196d83bd2955613a6c2f80c66f8483ff5872bfe4480bf624485be80005c5eb1d73478fc59b90ee5eb44f903da324d5d261124d33 SHA512 7633687c8f9fb4f7204443dda66c1234b8ae121ae750916b23ea7cd16f2fd5944c0e4541c51cbdeb66f51437e3186433bbb9d2b1f538002a3c8aaeb6ddbfe154
 DIST postfix-3.5.1.tar.gz 4609587 BLAKE2B 94b06ed536417ca72729d93f03d4fa2dce602508e4c5816ad902740d4203ad3df66d7380ea41859ab75ab327c0f53bc2bbaf09ba45fe83490d02808426a6253d SHA512 9c091cda6c2d54fefc7093736f69dc60dc4d9d2d858260bde1430427bc49caa59f81aea7a992b9764998a4edaaa015ddd50392b8f0a1bccd15f52b563887a698
-DIST postfix-3.6-20200511.tar.gz 4643850 BLAKE2B 1226d0582966fe2494e43a6608ab0b890c6e78fe9a784dece3bb3a55592a37cddbf2bff382b5266df373e501c589eb4be6f9fa3c464c576d899ff85669f98024 SHA512 bf2b5840f06ec87abb4383d166825fc26451e35735c33b57dd465cf64250b659b7bba8c35b27846e66a6dce93dbd339488d43e45e30af96044ad09864cab9f56
-EBUILD postfix-3.4.10.ebuild 8940 BLAKE2B f0e8378164c42ddbda74d5eb0742e510603f33a8241110b9a02dc2e4c89979c4cf8966a7acff065a29fc884c5770a2a8bbc5429e07f9bad7f5df0a2092083334 SHA512 c071a9601a57107a3a22fcb0ee47484706bf23f53492fcc18c271829bc97509da8edb26ab7a245b8992a0e48bd77dc111e39262d75bbb999a3a3a9e958dd910e
-EBUILD postfix-3.4.9.ebuild 8935 BLAKE2B fcca6dbae7d9ffb6d5397b1c70b23869bc2c4e33d12e840b380a3405278ac6576b8e8bf8138ab6b38aace484b91d3091e46eeb6f3eb2941b3d21853f3389586d SHA512 b89a403c4ab6c14174c2474787e8b9bc9a3b4307475a8b29cb0a224f3c536a0356c0477dd4fbc54e756701d59fe5eb394bcd43a20219b67e49fd7f40b4b43641
-EBUILD postfix-3.5.0.ebuild 8835 BLAKE2B 783402f5b3fb51890afbba59bb042fdfc26726804ede9d523882f759c870fbfcb63a66463100bc8bb5d21e1030c59a887de263239b4e0f9e37f38fd2383ddef7 SHA512 db14226c5259442c15a3c0ef3ec9bb6b00e331840df15764e6eec2f9bb8d6d93475334924445f31e1b8d1460da9d3c24f07f94809e5dea11149e6c7d0e6781ef
-EBUILD postfix-3.5.1.ebuild 8835 BLAKE2B 783402f5b3fb51890afbba59bb042fdfc26726804ede9d523882f759c870fbfcb63a66463100bc8bb5d21e1030c59a887de263239b4e0f9e37f38fd2383ddef7 SHA512 db14226c5259442c15a3c0ef3ec9bb6b00e331840df15764e6eec2f9bb8d6d93475334924445f31e1b8d1460da9d3c24f07f94809e5dea11149e6c7d0e6781ef
-EBUILD postfix-3.6_pre20200511.ebuild 8117 BLAKE2B 1468eefc69666723812aa440b38bfa6913c63b8044b221a6369ae7006a14ebc3968bb0df91103c7daa97864986acdf9f8cf836c495a424b4b33594747dc58847 SHA512 af5af7b2a8ddd2cd769ed4b56942cbdae05d01afadc9ccaa0ab575f80fd4973f407af2e82b129a575ac7f36a5c4a5114949bd849eef0e29fa073e2610207fbcf
+DIST postfix-3.5.2.tar.gz 4611518 BLAKE2B 4bdf1876c6e210644541fb4fad6ecc4aad2f95afc1d3b7aa30c79e4ca8d2e1c24ad5541f235b8fea91b9831b9b967d6234aae3084938e334bc11a5777004134b SHA512 04e37c4542952dba0f3e44f10775c0bedf343e6382df14a9c43ebc80c005c3f6de68a4e7a7469f32ae74b8e50d10c089d4930eac0cd2e2a9ff1bd8d7481b3a76
+DIST postfix-3.6-20200523.tar.gz 4644882 BLAKE2B 1c001559b55c1818c03530a975dd47293bba5ccc02a94b60cc0d6fd34400e1b0a7c88a1f8b76d2ccb63cf4a8a8fc0713ec767babe42b9c60013fc8036585ea3a SHA512 60a2d5f9fefe1792b6dfaf5dd8d7677690d24dc1f2a90e8691778dd1af6f300f12beaa0e7e8ec90380b12afe047d08a79bcf76b6c14b864e4103c6549c13e71e
+EBUILD postfix-3.5.1.ebuild 8830 BLAKE2B 5da9e3002be93402fa4b5d767bec9ee1e17571d492a776244210a98b639df1546cd01009348a7c8d1686d0408bdc07175afdc4fe420b55f898e83eb6ba91a440 SHA512 c121bd5ecca3a74d9dad9caf43cd44884f787bb27c146300f730c57590a24007d18a3cd04cea20a22db0e22ef44d355f549514d7a1c1bba6c865749972c90e5d
+EBUILD postfix-3.5.2.ebuild 8835 BLAKE2B 783402f5b3fb51890afbba59bb042fdfc26726804ede9d523882f759c870fbfcb63a66463100bc8bb5d21e1030c59a887de263239b4e0f9e37f38fd2383ddef7 SHA512 db14226c5259442c15a3c0ef3ec9bb6b00e331840df15764e6eec2f9bb8d6d93475334924445f31e1b8d1460da9d3c24f07f94809e5dea11149e6c7d0e6781ef
+EBUILD postfix-3.6_pre20200523.ebuild 8117 BLAKE2B 1468eefc69666723812aa440b38bfa6913c63b8044b221a6369ae7006a14ebc3968bb0df91103c7daa97864986acdf9f8cf836c495a424b4b33594747dc58847 SHA512 af5af7b2a8ddd2cd769ed4b56942cbdae05d01afadc9ccaa0ab575f80fd4973f407af2e82b129a575ac7f36a5c4a5114949bd849eef0e29fa073e2610207fbcf
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/files/postfix-gcc10.patch b/mail-mta/postfix/files/postfix-gcc10.patch
deleted file mode 100644
index cd263c5eedb0..000000000000
--- a/mail-mta/postfix/files/postfix-gcc10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/src/global/mail_params.h	2020-01-21 10:52:36.025753878 +0300
-+++ b/src/global/mail_params.h	2020-01-21 10:53:11.173763126 +0300
-@@ -3983,23 +3983,23 @@
- 
- #define VAR_TLSP_CLNT_USE_TLS		"tlsproxy_client_use_tls"
- #define DEF_TLSP_CLNT_USE_TLS		"$" VAR_SMTP_USE_TLS
--bool    var_tlsp_clnt_use_tls;
-+extern bool    var_tlsp_clnt_use_tls;
- 
- #define VAR_TLSP_CLNT_ENFORCE_TLS	"tlsproxy_client_enforce_tls"
- #define DEF_TLSP_CLNT_ENFORCE_TLS	"$" VAR_SMTP_ENFORCE_TLS
--bool    var_tlsp_clnt_enforce_tls;
-+extern bool    var_tlsp_clnt_enforce_tls;
- 
- #define VAR_TLSP_CLNT_LEVEL		"tlsproxy_client_level"
- #define DEF_TLSP_CLNT_LEVEL		"$" VAR_SMTP_TLS_LEVEL
--char   *var_tlsp_clnt_level;
-+extern char   *var_tlsp_clnt_level;
- 
- #define VAR_TLSP_CLNT_PER_SITE		"tlsproxy_client_per_site"
- #define DEF_TLSP_CLNT_PER_SITE		"$" VAR_SMTP_TLS_PER_SITE
--char   *var_tlsp_clnt_per_site;
-+extern char   *var_tlsp_clnt_per_site;
- 
- #define VAR_TLSP_CLNT_POLICY		"tlsproxy_client_policy"
- #define DEF_TLSP_CLNT_POLICY		"$" VAR_SMTP_TLS_POLICY
--char   *var_tlsp_clnt_policy;
-+extern char   *var_tlsp_clnt_policy;
- 
-  /*
-   * SMTPD "reject" contact info.
---- a/src/smtpd/smtpd_expand.h	2014-12-07 03:35:34.000000000 +0200
-+++ b/src/smtpd/smtpd_expand.h	2020-01-21 11:30:10.270425259 +0300
-@@ -18,7 +18,7 @@
-  /*
-   * External interface.
-   */
--VSTRING *smtpd_expand_filter;
-+extern VSTRING *smtpd_expand_filter;
- void    smtpd_expand_init(void);
- const char *smtpd_expand_lookup(const char *, int, void *);
- int     smtpd_expand(SMTPD_STATE *, VSTRING *, const char *, int);
---- a/src/trivial-rewrite/trivial-rewrite.h	2014-10-06 18:02:16.000000000 +0300
-+++ b/src/trivial-rewrite/trivial-rewrite.h	2020-01-21 11:29:36.411409526 +0300
-@@ -23,7 +23,7 @@
-  /*
-   * Connection management.
-   */
--int     server_flags;
-+extern int     server_flags;
- 
-  /*
-   * rewrite.c
---- a/src/postconf/postconf.h	2018-02-19 04:43:29.000000000 +0300
-+++ b/src/postconf/postconf.h	2020-01-21 11:29:07.851401023 +0300
-@@ -152,7 +152,7 @@
-   * Lookup table for master.cf entries. The table is terminated with an entry
-   * that has a null argv member.
-   */
--PCF_MASTER_ENT *pcf_master_table;
-+extern PCF_MASTER_ENT *pcf_master_table;
- 
-  /*
-   * Line-wrapping support.
diff --git a/mail-mta/postfix/files/postfix-glibc230.patch b/mail-mta/postfix/files/postfix-glibc230.patch
deleted file mode 100644
index 23a869bd8d48..000000000000
--- a/mail-mta/postfix/files/postfix-glibc230.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/dns/dns_str_resflags.c	2016-05-15 18:20:14.000000000 +0300
-+++ b/src/dns/dns_str_resflags.c	2019-05-03 17:29:16.000000000 +0300
-@@ -52,18 +52,28 @@
- static const LONG_NAME_MASK resflag_table[] = {
-     "RES_INIT", RES_INIT,
-     "RES_DEBUG", RES_DEBUG,
-+#ifdef RES_AAONLY
-     "RES_AAONLY", RES_AAONLY,
-+#endif
-     "RES_USEVC", RES_USEVC,
-+#ifdef RES_PRIMARY
-     "RES_PRIMARY", RES_PRIMARY,
-+#endif
-     "RES_IGNTC", RES_IGNTC,
-     "RES_RECURSE", RES_RECURSE,
-     "RES_DEFNAMES", RES_DEFNAMES,
-     "RES_STAYOPEN", RES_STAYOPEN,
-     "RES_DNSRCH", RES_DNSRCH,
-+#ifdef RES_INSECURE1
-     "RES_INSECURE1", RES_INSECURE1,
-+#endif
-+#ifdef RES_INSECURE2
-     "RES_INSECURE2", RES_INSECURE2,
-+#endif
-     "RES_NOALIASES", RES_NOALIASES,
-+#ifdef RES_USE_INET6
-     "RES_USE_INET6", RES_USE_INET6,
-+#endif
- #ifdef RES_ROTATE
-     "RES_ROTATE", RES_ROTATE,
- #endif
diff --git a/mail-mta/postfix/postfix-3.4.10.ebuild b/mail-mta/postfix/postfix-3.4.10.ebuild
deleted file mode 100644
index 96e414111102..000000000000
--- a/mail-mta/postfix/postfix-3.4.10.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( >=dev-libs/libressl-2.9.1:0= )
-	)"
-
-RDEPEND="${DEPEND}
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-libressl-certkey.patch"
-	"${FILESDIR}/${PN}-libressl-server.patch"
-	"${FILESDIR}/${PN}-glibc230.patch"
-	"${FILESDIR}/${PN}-gcc10.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	if has_version '<mail-mta/postfix-3.4'; then
-		elog
-		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
-		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
-		elog "Before backing out to an older Postfix version, edit the master.cf"
-		elog "file and remove the postlog entry."
-		elog
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.4.9.ebuild b/mail-mta/postfix/postfix-3.4.9.ebuild
deleted file mode 100644
index 57e4d8c2f258..000000000000
--- a/mail-mta/postfix/postfix-3.4.9.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( >=dev-libs/libressl-2.9.1:0= )
-	)"
-
-RDEPEND="${DEPEND}
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-libressl-certkey.patch"
-	"${FILESDIR}/${PN}-libressl-server.patch"
-	"${FILESDIR}/${PN}-glibc230.patch"
-	"${FILESDIR}/${PN}-gcc10.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	if has_version '<mail-mta/postfix-3.4'; then
-		elog
-		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
-		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
-		elog "Before backing out to an older Postfix version, edit the master.cf"
-		elog "file and remove the postlog entry."
-		elog
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.5.1.ebuild b/mail-mta/postfix/postfix-3.5.1.ebuild
index 15887b8c8b9a..646b4e9c0863 100644
--- a/mail-mta/postfix/postfix-3.5.1.ebuild
+++ b/mail-mta/postfix/postfix-3.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-3.5.0.ebuild b/mail-mta/postfix/postfix-3.5.2.ebuild
index 15887b8c8b9a..15887b8c8b9a 100644
--- a/mail-mta/postfix/postfix-3.5.0.ebuild
+++ b/mail-mta/postfix/postfix-3.5.2.ebuild
diff --git a/mail-mta/postfix/postfix-3.6_pre20200511.ebuild b/mail-mta/postfix/postfix-3.6_pre20200523.ebuild
index fc79ce127b82..fc79ce127b82 100644
--- a/mail-mta/postfix/postfix-3.6_pre20200511.ebuild
+++ b/mail-mta/postfix/postfix-3.6_pre20200523.ebuild
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index 4cfde11328c5..f0b337e095ee 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,7 +1,5 @@
-DIST protonmail-bridge-1.2.3-1.x86_64.rpm 52847419 BLAKE2B 604a1990ced2f9e64e99aad7f729ac48750f2b620036c7e953cc9b16e25187f201d2a148bb03a03bcf48fc72db3faefedd8102a4c099dca2c9c71e766804a6cc SHA512 98a92d1365baac975e3007a4a8d920aa8b5d0166d9c69deb4c9dd4f96cb314a5a60fb7bd43c35c33c89419b63dba5e4dc1526cf8518a0f6db4e3315b4eb8a420
-DIST protonmail-bridge-1.2.5-1.x86_64.rpm 53088686 BLAKE2B af9085e0e0c66894f9c0a8c38a42a0afb32ec17cecd14b89f7d0a5c896aebf3047ba03f6b15aecff7834063166f31351c4b7b32d707e87f8673fa3c1c91b6f69 SHA512 982279b4a8032224b086d98f4e009c4b6423b8696c557c156f044322673b2e6524aab975a7fb527a4a525f7116fbd74af55e5ff75305e404438b18a9e75b657c
 DIST protonmail-bridge-1.2.6-1.x86_64.rpm 54560899 BLAKE2B 3f1cd39a5415119e81949ff8c8c6df6a8f64c1a1565ce169c8c1999cc34e9d977677a3cc5539bc2a6de4199792941f5676c86a29bab28a3db667aa62503ff57d SHA512 6ba00aaa99e2faff401017e5471670642f5bcb56b98b38a9e21427c1b4dc1e824a3062805dfdb717ae6d9f994c59f9967f4736e14dad0eb13c456251d96b2928
-EBUILD protonmail-bridge-bin-1.2.3.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762
-EBUILD protonmail-bridge-bin-1.2.5.ebuild 11704 BLAKE2B 6dc32db81e7ff15122dd9aeee03ada34c0d9fcbb84a1c20cce62f5b9461483d847d3ef9eb67875d95349b624f1a747bf8a7ec2597676aa78fb6026e9ed9ddc09 SHA512 8f41c1174f6c7e88131e40c9edfffee09f8b23cee769da57e61afb22e6bb298d8019c309c57fc64145a862381d9e019a80f00a4b407eaac99b077c70d49316b1
+DIST protonmail-bridge-1.2.7-1.x86_64.rpm 54243603 BLAKE2B 90e1ab6dd2fee33e817eb800d32cce430b3f2d7341e8db6d5b7d68ebef72f655571eb4afdefa20758f8dc351230cefb84391ece075ec691cd537189de392c021 SHA512 063c602dd0b1d64d6dee846cbb1d737ed845c70175c8f4dd8b5ac96f5fe37fb6253ffcb89349f13d2cc5c49a6df416da6e5fcd9f71ebe88bf9633872186b8f44
 EBUILD protonmail-bridge-bin-1.2.6.ebuild 11798 BLAKE2B ace2d6bb0667b283a5c92600be2932068244e48b2ac29acdc12c75af5948a277d1e32cc51d3aa1e2c77982e07ce163913d537a9d26376abf800c1e3d01d8d149 SHA512 631ba09fa87d05082f9d50c30e134f1e20a79f1368885a179f37075544db7e70d0139325c345588c47e9acd63881d54d9f324cb73efe39a92cefc42f968ef190
+EBUILD protonmail-bridge-bin-1.2.7.ebuild 11798 BLAKE2B ace2d6bb0667b283a5c92600be2932068244e48b2ac29acdc12c75af5948a277d1e32cc51d3aa1e2c77982e07ce163913d537a9d26376abf800c1e3d01d8d149 SHA512 631ba09fa87d05082f9d50c30e134f1e20a79f1368885a179f37075544db7e70d0139325c345588c47e9acd63881d54d9f324cb73efe39a92cefc42f968ef190
 MISC metadata.xml 477 BLAKE2B 8d29a65220a234802a25b8979e598393883a4e905ed6b114297801b93f82212165749f8317791459314afe1c59c6f5a7c2e871bc85637387bc3decae250cec21 SHA512 7d081e416b0bf6b91e6ba69a1de51c35839ff1512ab3c93be3f161ab5e6a4a554d58549460bb7fb73e1dbaf44f76b673067f0f33c4d775143f500416e096f0bc
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.3.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.3.ebuild
deleted file mode 100644
index f3a5ead03295..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://protonmail.com/bridge/"
-SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
-
-RESTRICT="bindist mirror"
-
-LICENSE="MIT protonmail-bridge-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/glib:2
-	media-sound/pulseaudio[glib]
-	sys-apps/dbus
-	virtual/opengl
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXi
-"
-BDEPEND="dev-util/patchelf"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	# Some bogus files got into package.
-	rm -rf usr/lib/.build-id
-
-	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
-	cd "${S}/usr/lib/protonmail/bridge" || die
-	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
-
-	rm "lib/libQt53DCore.so.5" || die
-	rm "lib/libQt53DExtras.so.5" || die
-	rm "lib/libQt53DInput.so.5" || die
-	rm "lib/libQt53DLogic.so.5" || die
-	rm "lib/libQt53DQuick.so.5" || die
-	rm "lib/libQt53DQuickExtras.so.5" || die
-	rm "lib/libQt53DQuickInput.so.5" || die
-	rm "lib/libQt53DQuickRender.so.5" || die
-	rm "lib/libQt53DRender.so.5" || die
-	rm "lib/libQt5Concurrent.so.5" || die
-	rm "lib/libQt5Gamepad.so.5" || die
-	rm "lib/libQt5QuickParticles.so.5" || die
-	rm "plugins/audio/libqtaudio_alsa.so" || die
-	rm "plugins/audio/libqtmedia_pulse.so" || die
-	rm "plugins/bearer/libqconnmanbearer.so" || die
-	rm "plugins/bearer/libqgenericbearer.so" || die
-	rm "plugins/bearer/libqnmbearer.so" || die
-	rm "plugins/canbus/libqtpeakcanbus.so" || die
-	rm "plugins/canbus/libqtsocketcanbus.so" || die
-	rm "plugins/canbus/libqttinycanbus.so" || die
-	rm "plugins/designer/libqquickwidget.so" || die
-	rm "plugins/designer/libqwebengineview.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
-	rm "plugins/gamepads/libevdevgamepad.so" || die
-	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
-	rm "plugins/generic/libqevdevmouseplugin.so" || die
-	rm "plugins/generic/libqevdevtabletplugin.so" || die
-	rm "plugins/generic/libqevdevtouchplugin.so" || die
-	rm "plugins/generic/libqtuiotouchplugin.so" || die
-	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
-	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
-	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
-	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
-	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
-	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
-	rm "plugins/iconengines/libqsvgicon.so" || die
-	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
-	rm "plugins/mediaservice/libgstcamerabin.so" || die
-	rm "plugins/mediaservice/libgstmediacapture.so" || die
-	rm "plugins/mediaservice/libgstmediaplayer.so" || die
-	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
-	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
-	rm "plugins/platforms/libqeglfs.so" || die
-	rm "plugins/platforms/libqlinuxfb.so" || die
-	rm "plugins/platforms/libqminimal.so" || die
-	rm "plugins/platforms/libqminimalegl.so" || die
-	rm "plugins/platforms/libqoffscreen.so" || die
-	rm "plugins/platforms/libqvnc.so" || die
-	rm "plugins/platformthemes/libqgtk3.so" || die
-	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
-	rm "plugins/position/libqtposition_geoclue.so" || die
-	rm "plugins/position/libqtposition_positionpoll.so" || die
-	rm "plugins/printsupport/libcupsprintersupport.so" || die
-	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
-	rm "plugins/qmltooling/libqmldbg_local.so" || die
-	rm "plugins/qmltooling/libqmldbg_messages.so" || die
-	rm "plugins/qmltooling/libqmldbg_native.so" || die
-	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
-	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_server.so" || die
-	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
-	rm "plugins/renderplugins/libscene2d.so" || die
-	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
-	rm "plugins/sensors/libqtsensors_generic.so" || die
-	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
-	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
-	rm "plugins/sqldrivers/libqsqlite.so" || die
-	rm "plugins/sqldrivers/libqsqlmysql.so" || die
-	rm "plugins/sqldrivers/libqsqlpsql.so" || die
-	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
-	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
-	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
-	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
-	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
-	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
-	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
-	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
-	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
-	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
-	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
-	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
-	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
-	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
-	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
-	rm "qml/QtLocation/libdeclarative_location.so" || die
-	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
-	rm "qml/QtNfc/libdeclarative_nfc.so" || die
-	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
-	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
-	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
-	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
-	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
-	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
-	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
-	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
-	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
-	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
-	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
-	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
-	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
-	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
-	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
-	rm "qml/QtScxml/libdeclarative_scxml.so" || die
-	rm "qml/QtSensors/libdeclarative_sensors.so" || die
-	rm "qml/QtTest/libqmltestplugin.so" || die
-	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
-	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
-	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
-	rm "qml/QtWebView/libdeclarative_webview.so" || die
-	rm "lib/libQt5MultimediaGstTools.so.5" || die
-	rm "lib/libQt5OpenGL.so.5" || die
-	rm "lib/libQt5QuickWidgets.so.5" || die
-	rm "lib/libQt5EglFsKmsSupport.so.5" || die
-	rm "plugins/position/libqtposition_serialnmea.so" || die
-	rm "plugins/webview/libqtwebview_webengine.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
-	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
-	rm "plugins/canbus/libqtpassthrucanbus.so" || die
-	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
-	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
-	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
-
-	default
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR usr "${D}"/ || die "Failed to copy files"
-
-	dosym "protonmail-bridge" "/usr/bin/${PN}"
-
-	insinto /etc/revdep-rebuild
-	newins - "50-${PN}" <<-EOF
-		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
-	EOF
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.5.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.7.ebuild
index eff632ea197c..a1f688318f2d 100644
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.5.ebuild
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit rpm
+inherit rpm xdg-utils
 
 DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
 HOMEPAGE="https://protonmail.com/bridge/"
@@ -238,3 +238,11 @@ src_install() {
 		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
 	EOF
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}