gentoo (leap year) resync : 29.02.2020

70 files changed, 547 insertions, 304 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9b98a3638f4a..ba7735eb5f15 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
index 1bdab528bb68..b28dbb2c1fb6 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -1,5 +1,5 @@
 AUX altermime-0.3.10-MIME_headers-overflow.patch 521 BLAKE2B 9e327a28827aa90d761417d8143d36fde7d3098f3acb84e31af86c828bb1753e0af23fe96bcc97b27afd107da52aed951bab3b5b479f59b4e6e2e9ea3d4866f7 SHA512 5f2aa6dca9b4fc16e0aa2f5d12bfdbd989253cf6d8e66358f4e17a7ca764b523b6179ec43bf4eddc114e85668bbcc704029a83b1bff5a0c3130d810f84c6e91d
 AUX altermime-0.3.11-respect-flags.patch 571 BLAKE2B f740d18fe81026e27636f432f68cd08ec8ed73107cd60a44bf56bce2b21b5a9d6b549666a596e1651c979519df4dc40c9797ecfe28d36b43ecb96b5518451aef SHA512 b4b2d8372b26932cb7148e316fd748fe2e8a515e6725f4db3f87e34ab417a4eaa324bf03ce467dc3dda505b5f4013c004aee05a9903d87a4d310c69d2034ea9e
 DIST altermime-0.3.11.tar.gz 90244 BLAKE2B 5acd29ee3e5927b67de41db4f7cfbe606814ef6476340f26509b1823fcbfa6269c15e1d7e7936e948a7cb0f81b9a17b9a63c2333697707525bc62fd350a55f2a SHA512 561e36398bafcd888e912b6291ec76ead881bac86a7d0b8072753012d4c4557e67f608a9d43c968c6521e5f35bdf7b98e2c73ab811dadaaf13dcefe35c2d9e68
-EBUILD altermime-0.3.11.ebuild 611 BLAKE2B 320eaa4e7e8c3baa1f5f8faaf688f04018cf2e58f4dc1064b5c76817d9d542ed3fc7ce631f1de9f96cef53dce3741321637c7e011bdc77afc9878b5b4521b629 SHA512 9aff9bdf4b250794905423cf049e037ac36b0399f2bd2731477dbb21600199a965c0aff78f3f72393d95d110dd7f3506575a40ac780ebb2d160d4ed85b829b3f
+EBUILD altermime-0.3.11.ebuild 610 BLAKE2B 632b33d6a56774b7329ddbd3c4511f0046e10faba8a8fb50db198f03392448e2b6e2be2e4163e9e8d482834dc1b463c5776250872bd3868c7268cafa4aae571e SHA512 ea626005cbf4d397587babd4f434cc8b4f302a77db38fa0f97e4178420392985f0fba3501eb7dc2e8f11486c1ca5e885dcd7dcadad37544b0bd51a6123bea605
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/altermime/altermime-0.3.11.ebuild b/net-mail/altermime/altermime-0.3.11.ebuild
index 1e09d54ec526..581483e965e0 100644
--- a/net-mail/altermime/altermime-0.3.11.ebuild
+++ b/net-mail/altermime/altermime-0.3.11.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
@@ -24,7 +24,7 @@ src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
-src_install () {
+src_install() {
 	dobin altermime
 	dodoc CHANGELOG README
 }
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index 6cefc645cad8..9a2c75ac0dab 100644
--- a/net-mail/autorespond/Manifest
+++ b/net-mail/autorespond/Manifest
@@ -2,6 +2,6 @@ AUX autorespond-2.0.5-no-include-bounce.patch 1185 BLAKE2B 275a35692afc5101dca27
 DIST autorespond-2.0.4.tar.gz 7884 BLAKE2B 35b682ecb4de27c4db97f6594e49d05305ff5017e8e6c56bb44d51712a24a21ab70cd242a0a0c1fd5da4c8ed7f2d5efc548b5f2d59ab16ace929a90509a930ef SHA512 0bde01482a1bf16f5c4e478fad8a36ef6a34dd3a753edfdea0787381380c50ab5a95b94e0464dd874cb1a666f9dfb196de55506503bbb589dd5974867298fc62
 DIST autorespond-2.0.5.tar.gz 9707 BLAKE2B c0e9f85e23d2b3a5168a33695370583c9844ab47e196822d1bceb0543878085de7595b37323ae5134d6d98ff0864a1865fce4498f0f4b9464398b0cc2062d1e7 SHA512 c27565962677654251062538a76ebc0f5402cb8b0027352060e6aa51871be27c0e32c6898be7cee72d2a80680b79d1ce7bf23249abfb486a851d73005ef7e7bb
 DIST autorespond_2.0.4-1.diff.gz 2637 BLAKE2B 6bb2e7567a9376296bd1e0b323e07892099d004ed3e2497d605b001486e1d3d33f7d3378bce48979c7b4dfa9a7a6aef863172ccb4e442ef1e837230f91b96220 SHA512 ef9ffc46c885d644b6f20107c03f0ed68ded577499d8b05ecae217fa43c6053de4a68666cd78a059d19ae1181b101a7de93f1d2ec0956dee7478e43c06b772b6
-EBUILD autorespond-2.0.4.ebuild 647 BLAKE2B e2b108d2a101dfe215eb4cb727738c9b5b0c6d29be8b78a670c1385520064e2f2217a2f611530dcc957033cae0fc4f169b36750d68286ca5d7a87325299b1506 SHA512 e638ad2a3fe1ced55d7cea412c2dc6f81e70d29451831282785884af1f545f83527a43c4ee9d0959444f52964e8810ae3a92341fb48c7ffc7f80d957f1e79f39
-EBUILD autorespond-2.0.5.ebuild 785 BLAKE2B bdab2b95893a4525f6b080a81310e8695ef8ff0434f21db5b27ffe4056e811c5bf6078d7e6d6de34c036a392f102520ce96dfc093b22339133e51a7dffaf253e SHA512 bea6b4a537a05d774bc72df1cc9493f8d550be94090bb8a62d7dc203d57cb47a0b0d436f7089a26935c40a2a5dda4f0de7d2801029b01fe7e037d358e16e44d4
+EBUILD autorespond-2.0.4.ebuild 646 BLAKE2B 8ac31048730e22ddab0ee863e49eaac4020c92e812b79698edfc5e5b85aab1a2147e919e90511f5f1f3e227094d00420a035510d7f10002f87bf7276d8bfaee0 SHA512 6133d36dc460951a737a33a70dcdf6860ebd8ae86f194c7aefd415ba40eee3399891767c49a7a8270e9deadc79af363adf7045dbf7097d553cf0bc9efa5e6737
+EBUILD autorespond-2.0.5.ebuild 784 BLAKE2B e35c8a796928f29b6c58aa0d70120c098ea95225126dba5de48b684868fff647ff2f26233832ff4e6bc0d00697225f29adfc2aff2ef908eb95bd0e65c74c562a SHA512 3703a0ef1b4c78d0eaba7d0f81d13ccc48186cac6205b6e687f6298a7664c98a8ddc79e53270669a94246670e227798eb3e3d010be9ebcac579455620b7c7424
 MISC metadata.xml 306 BLAKE2B d2773e404b4ba6a3ca9afaa342780161b8842710a844056970d9d57bfa36b245b8a711f529f5ceb61ee70dc0aa8cec33f8d52ce3b83ce6fc7ab0aabbe21df019 SHA512 c1a07f6fac6f13c3a0c9adacede02bb664a09d8e93e954dcb2cacaa3690ff93783e717019be0cdee715036f7aab179c18384163556ca28798a297efed70ebd5d
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index 3bb578554277..a4c094b9d870 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -22,7 +22,7 @@ src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }
 
-src_install () {
+src_install() {
 	into /var/qmail
 	dobin autorespond
 	doman *.1
diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild
index 5e32640b6e10..5f8e4a3be0db 100644
--- a/net-mail/autorespond/autorespond-2.0.5.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.5.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
@@ -21,7 +21,7 @@ src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }
 
-src_install () {
+src_install() {
 	into /var/qmail
 	dobin autorespond
 	doman *.1
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 4246e338c5dd..696044e1204d 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -6,7 +6,7 @@ DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c
 DIST dovecot-2.3-pigeonhole-0.5.9.tar.gz 1897060 BLAKE2B 73b9abd0a7ea9468f7880fdd0d0471c5825f341c7297807c404ce50a8792f821d2599840ce9eb2705a118a0ee078aafad9f4f6eb64a02fbcb3b0f89c00042ada SHA512 1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8
 DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
 DIST dovecot-2.3.9.3.tar.gz 7181682 BLAKE2B 3ef9c50ea2b9d2f8a5d953e373baaf5d880ae4c93dbe773ce267784ded207fb338959a334aa12a449f8d39eb51284318de317d8953a56a0f7f016199769be809 SHA512 e39dc825a03f009928b67d01747bb70487fbec155e6be5109037db67b78301aa761db432f7355e96d927abf30c68f0116a5f2cf518b9eebf7f5c7806ac00ae41
-EBUILD dovecot-2.2.36.4.ebuild 8588 BLAKE2B 36a1005bdb192a348b8b7475d8cc93e24f413fc3d951aa359b918bb1179bad9f034a8ca98c6a591c54140d6df6881973ae358845504bdd6487fab4e01a3b7216 SHA512 d45bf6352e481954fd7f7ab5736517329bf54e2270245258333fff78374aa26dd762f6ffaa49b7319010705e38097c228771f0a1ca1b1dd95ca2face448878bb
-EBUILD dovecot-2.3.7.2.ebuild 8699 BLAKE2B 9158711f6c69b008438ae35bb17896bd02b699764337b3574e629acfd5aad5cefcb6a967b3588b3cb0037522c5823c60679e222be6db774be3869715326d17ea SHA512 411da28afbaf6c4ab5ec6bf5beba97d35cff902f66f8e3fee00ebec5ded4dc9a98432dde64873c7e6a79a7e6957d12fd164c665661a4b81f60df8fe44652cd72
-EBUILD dovecot-2.3.9.3.ebuild 8566 BLAKE2B e088c58ff1f8ea8f783fa0e7c3d928100a4756e3763c730beeea67d76b9f1c0f22753ef9e851cdf7e4285586b93227a0966967215a3afd6e67aa314d7d1cfab2 SHA512 aacadf794ff7cb1311a59e935b1a362e4421d12aeb7d58c68e3711f878636d981ee1af38de682c5cb8b57b906cda4d0c41219274a152ea4f8200565c6bac582d
+EBUILD dovecot-2.2.36.4.ebuild 8587 BLAKE2B 008c029409bc73b5d13cbf76be6c76ec4ac893635e9748133f57241c90035ae05d94004e5103040366095e48a7c186366d769ed843e43359f8e770b03218e25e SHA512 79404a802ecdd3605fc0363b22d3f09af28cfc92b3c2b7af55af2f338c147e017284445b11ddd3ed8364bd5ac901dcd456d11667566d36c319166950e86ebbd4
+EBUILD dovecot-2.3.7.2.ebuild 8698 BLAKE2B 62ddf55a53bc1bdc30cfc7fefbd0a78ed8f933d4a416710271d0673a38e099d55b06b9f63c34a6864f83f309315f3ed6651d8cd3a17e604ac8a4c372d9dd2822 SHA512 41e1e9c5f8f1816c0d88064d8846f822e6ee31d31acadc359e77a6f7b842c44fc443423c2d9ad85994843c5cbbc6f2e14fd38bdd835af942e42a8f7bd33211f2
+EBUILD dovecot-2.3.9.3.ebuild 8565 BLAKE2B a570a2baad3a3b8dc21849cad1fa2541ebcca1bdc2d225a031f70bf3192a0ddecd37c4b9b9077ddc77ae845b058a97c95ef48ae00f588d23ab0013c44634ef40 SHA512 5ee3345fd40b5df7bb7e186e2064b7d37367edfe80d5ca95732fef7d9fb0d96feb8920d6dc07e35ed05055fbd9d8c292b7dea6f493dc63d9f499f45195c86da8
 MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
diff --git a/net-mail/dovecot/dovecot-2.2.36.4.ebuild b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
index e6d570d9eaae..6c62c9508e1c 100644
--- a/net-mail/dovecot/dovecot-2.2.36.4.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
@@ -152,7 +152,7 @@ src_test() {
 	fi
 }
 
-src_install () {
+src_install() {
 	default
 
 	# insecure:
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index c9370c405ef2..6f324140362b 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -156,7 +156,7 @@ src_test() {
 	fi
 }
 
-src_install () {
+src_install() {
 	default
 
 	# insecure:
diff --git a/net-mail/dovecot/dovecot-2.3.9.3.ebuild b/net-mail/dovecot/dovecot-2.3.9.3.ebuild
index 1b1866c7d404..c66623c54652 100644
--- a/net-mail/dovecot/dovecot-2.3.9.3.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.9.3.ebuild
@@ -151,7 +151,7 @@ src_test() {
 	fi
 }
 
-src_install () {
+src_install() {
 	default
 
 	# insecure:
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 3a4fceca802e..ae987a5d5800 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -1,3 +1,3 @@
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
-EBUILD ezmlm-idx-7.0.0-r3.ebuild 1424 BLAKE2B 00a21949859705e02af4eb3e66438b26b6ed06e59c1c6d6d8608238ed71eee7d45081a388274b8022d3cdd1f7f50c9b237be8cfea34a9d5065beaae7b48316e8 SHA512 b59d8990b956e52e3afcfcbd4d73d105c56f3bb781ee956ae54bc13fa1c30a683db93ab9182d96ffc87ebaedcf5dde5a7be68a4a5dd44cf9f2d8ba8c9ed131f6
+EBUILD ezmlm-idx-7.0.0-r3.ebuild 1423 BLAKE2B 4f6a84b02abd79a9c467327d79afc26b97b32a2290d21f79c8fef34edcc8f17026edcb294575a1ac7c31e61030e4ebd270ac97d6a281654762014b27221177b7 SHA512 ba54c966d2dccc584cb29c7f8d9334a9a9c83c0ba528023c762892b14ac5f54371dcc67efaccb34e94db6fd412a7d479eba62824517b01bbc60baacc168a707d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
index 1f0025826f86..be9e1266ac47 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.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
@@ -48,7 +48,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
 	dobin ezmlm-{cgi,checksub,import,rmtab}
 
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 3fe793ea5d90..7880d066bb35 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,14 +1,12 @@
-AUX fetchmail-6.3.26-libressl.patch 3948 BLAKE2B fa277ad3aa70d83f258be80a17b69d977c6c523eb37a305a7c82659231eff6ce6f63e3b7a4ccd4fe487f6a3bd163711f3ea3e338406fcec4ec8955a32007af91 SHA512 3d2aa5f7c388ae89d3ea701e4f83b9a477f31e39df13a6e84ede11be6a003f7b9e483f8439b3eaf27256f72cf7f9279d3f999f69f4cf210cb5d15ab124283389
 AUX fetchmail-6.3.26-python-optional.patch 255 BLAKE2B ff13ec04926ae8362acea31c37719e9bc59599ad98f0ba8792d25101371984d38b2ea5ea9672a5b23b2600e743d6d57a718d3967f1c79dcb393c4f8757a58741 SHA512 7ac620a695d681278ed91f2f45a55822e5adfb0657c65be3edf09eb5259173e298cf509d1d7df7905bf2cb914b4869cca9cd0627dc0527a048edd9e9bd2a775d
-AUX fetchmail-6.3.26-tests.patch 344 BLAKE2B 7ebe51bf9253f14c64763c375e6bf213dd4ef3857780ceda2093ce7d576d6cd99e88e2ca00f424fca3f2aebc01cf8a09c9a6c758ec4b78232af1e9d628288c90 SHA512 bf049e35af40f10f386dbfc6aa95082c650bc5802f13d0f4d3f77d925cf5120b8166b7718e5321b99f26a1dc8fbeaddc42872dda7adbd57962ce04950ad373b2
 AUX fetchmail.conf 38 BLAKE2B 8458d0709652038a9a4661d68154ed87269aa3b9d07abb1a04645fe5acdfbee2c197b81356430e74ab63685c2f2f7003def4ca4a7f2ca04146abc42f4d91cafc SHA512 f6e3eb409a1d88bcfb02012491fdbbf859803dbee45998879525fd35a2377bae95504da8aafcb24bcc2e695e15c96f6ec6f7e6521d28012370a4ec5e2a25a351
 AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398ab3104c5180a321a2cff386d4a50fbc24bacd00a001052b3076b6fa5f3c831e48ecc2ce95b8ca27b1 SHA512 4dacd025d76a22c991c6dabe7c3d5b33b49348e83534d4de300a1b0d55a62dc0195e19065cb0a3a5da72f50700e7b92d4579be795a899f680e2a8be7dd508532
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
-DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
 DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
-EBUILD fetchmail-6.3.26-r4.ebuild 2642 BLAKE2B 666e66fb9d3dff9291b4cdd9e8f8dd4524e16aef2d17b8b4b6451b145b2befca701ca1d4db0e6761e61eacb2d3866d8af3039c601061f723e74bc5c9701249b6 SHA512 fd972903d3736ba4402ff07c802889d62c01a6f749bc60fd5bad74266f14082736a2a53d5f42991a5a9c156b2ea6d26b7ea6b79e66c7573376a07e4a7a2021b3
+DIST fetchmail-6.4.2.tar.xz 1261472 BLAKE2B 11d00eeef39ceda6374a66909e2f8815c2f22ac7321ccd47eff8387e71056a8094c616f903ac0502a0a0a18929c11d4102d116229f6f875f413e026735040190 SHA512 8ec62a5df81b9b8c5e5479d35a10aded22aca74f671cded339dc7ae1c78d8a8638dfe4f04be35334184b5b27f3fb857402dc5b587cca8ede3f5b9b268b37edc1
 EBUILD fetchmail-6.4.1-r3.ebuild 2429 BLAKE2B 5e089f5b9bdc9371e6701dfe48e140df30a38cae1ebc89c4032e030737c316f622632c31fa3d7f1f55c4461cc0a7127674191a5f3f94955e32474a3161e64490 SHA512 4d3a571f7943f2d8d3cde6a35ff71ac6ef41ed36f12d1fd18d81a9efbdb8e463d9e8be6d92459503ca7c4494af4e8f132e877a3cb809f9c72ac220f5a82aae2e
 EBUILD fetchmail-6.4.1.ebuild 2606 BLAKE2B 4597ff6bd5653d6b075498fc4a2175b3d0695ca2934734bc4565152c7f868b211116274aad9a61b7c57120e1d9a2101244aefec54bb3f9da7f721148c4889750 SHA512 6c852431b6d438067247f5368cc8e7966a986223485faeb667dd31be756a3570738a6e19685dafd0050c89caa3ac34471603f43f6b7f1df9d67f1173597b0640
+EBUILD fetchmail-6.4.2.ebuild 2521 BLAKE2B 109bae40d435d854f994ceee21217697487bc5c0ac1a27076faab03c9540aab696fb225dcf0b1519250b1767b51f0b3a9fe97e9b2b094b2082fd41b89c416315 SHA512 3426247247809415e7105e66aa48fa06a874754098e00a76b287254b9234def9d7dcac0d68e57bd338bf3fac19f8470345defc82ecba3170b94823e24631f7cc
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild b/net-mail/fetchmail/fetchmail-6.4.2.ebuild
index 29bd0e833e52..109bd30c3ec1 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="tk"
 
-inherit python-single-r1 user systemd toolchain-funcs autotools
+inherit python-single-r1 systemd toolchain-funcs autotools
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
 HOMEPAGE="http://www.fetchmail.info/"
@@ -13,23 +14,29 @@ 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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="ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:= )
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
 		libressl?  ( dev-libs/libressl:= )
 	)
 	kerberos? (
 		virtual/krb5
-		!libressl? ( >=dev-libs/openssl-0.9.6:= )
+		!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} )"
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	sys-devel/flex
@@ -38,15 +45,11 @@ DEPEND="${RDEPEND}
 DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
 HTML_DOCS="*.html"
 PATCHES=(
-	"${FILESDIR}"/${P}-python-optional.patch
-	"${FILESDIR}"/${P}-tests.patch
-	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
 )
+S=${WORKDIR}/${P/_/.}
 
 pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
 	use tk && python-single-r1_pkg_setup
 }
 
@@ -78,11 +81,6 @@ src_compile() {
 }
 
 src_install() {
-	# fetchmail's homedir (holds fetchmail's .fetchids)
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 700 /var/lib/${PN}
-
 	default
 
 	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch
deleted file mode 100644
index dbbed876d600..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.3.26-libressl.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- a/configure.ac	2013-04-23 16:51:10.000000000 -0400
-+++ b/configure.ac	2016-01-30 00:14:01.114090572 -0500
-@@ -803,6 +803,7 @@
- 
- case "$LIBS" in *-lssl*)
- 	AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>])
-+	AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>])
- 	;;
- esac
- 
---- a/po/de.po	2013-04-23 17:33:52.000000000 -0400
-+++ b/po/de.po	2016-01-30 00:25:00.255287974 -0500
-@@ -8,8 +8,8 @@
- msgstr ""
- "Project-Id-Version: fetchmail 6.3.26\n"
- "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
--"POT-Creation-Date: 2013-04-23 23:24+0200\n"
--"PO-Revision-Date: 2013-04-23 23:33+0200\n"
-+"POT-Creation-Date: 2015-01-16 20:42+0100\n"
-+"PO-Revision-Date: 2016-01-30 00:23-0500\n"
- "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
- "Language-Team: Deutsch <de@li.org>\n"
- "Language: \n"
-@@ -3198,20 +3198,24 @@
- msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL"
- 
- #: socket.c:913
--msgid "Your operating system does not support SSLv2.\n"
--msgstr "Ihr Betriebssystem unterstützt SSLv2 nicht.\n"
-+msgid "Your OpenSSL version does not support SSLv2.\n"
-+msgstr "Ihre OpenSSL-Version unterstützt SSLv2 nicht.\n"
- 
--#: socket.c:923
-+#: socket.c:920
-+msgid "Your OpenSSL version does not support SSLv3.\n"
-+msgstr "Ihre OpenSSL-Version unterstützt SSLv3 nicht.\n"
-+
-+#: socket.c:928
- #, c-format
- msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
- msgstr ""
- "Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung (SSLv23).\n"
- 
--#: socket.c:1022
-+#: socket.c:1027
- msgid "Certificate/fingerprint verification was somehow skipped!\n"
- msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n"
- 
--#: socket.c:1039
-+#: socket.c:1044
- msgid ""
- "Warning: the connection is insecure, continuing anyways. (Better use --"
- "sslcertck!)\n"
-@@ -3219,11 +3223,11 @@
- "Warnung: Die Verbindung ist unsicher, mache trotzdem weiter. (Nehmen Sie "
- "lieber --sslcertck!)\n"
- 
--#: socket.c:1081
-+#: socket.c:1086
- msgid "Cygwin socket read retry\n"
- msgstr "Cygwin-Socket-Lese-Wiederholung\n"
- 
--#: socket.c:1084
-+#: socket.c:1089
- msgid "Cygwin socket read retry failed!\n"
- msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n"
- 
---- a/fetchmail.c	2013-04-23 16:00:45.000000000 -0400
-+++ b/fetchmail.c	2016-01-30 00:16:26.104294447 -0500
-@@ -54,6 +54,10 @@
- #define ENETUNREACH   128       /* Interactive doesn't know this */
- #endif /* ENETUNREACH */
- 
-+#ifdef SSL_ENABLE
-+#include <openssl/ssl.h>	/* for OPENSSL_NO_SSL2 and ..._SSL3 checks */
-+#endif
-+
- /* prototypes for internal functions */
- static int load_params(int, char **, int);
- static void dump_params (struct runctl *runp, struct query *, flag implicit);
-@@ -263,6 +267,12 @@
- #ifdef SSL_ENABLE
- 	"+SSL"
- #endif
-+#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0
-+	"-SSLv2"
-+#endif
-+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0
-+	"-SSLv3"
-+#endif
- #ifdef OPIE_ENABLE
- 	"+OPIE"
- #endif /* OPIE_ENABLE */
---- a/socket.c	2013-04-23 16:00:45.000000000 -0400
-+++ b/socket.c	2016-01-30 00:28:26.718678785 -0500
-@@ -907,14 +907,19 @@
- 	_ssl_context[sock] = NULL;
- 	if(myproto) {
- 		if(!strcasecmp("ssl2",myproto)) {
--#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0
-+#if (HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0) && (0 == OPENSSL_NO_SSL2 + 0)
- 			_ctx[sock] = SSL_CTX_new(SSLv2_client_method());
- #else
--			report(stderr, GT_("Your operating system does not support SSLv2.\n"));
-+			report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n"));
- 			return -1;
- #endif
- 		} else if(!strcasecmp("ssl3",myproto)) {
-+#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0) && (0 == OPENSSL_NO_SSL3 + 0)
- 			_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
-+#else
-+			report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n"));
-+			return -1;
-+#endif
- 		} else if(!strcasecmp("tls1",myproto)) {
- 			_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
- 		} else if (!strcasecmp("ssl23",myproto)) {
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch b/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch
deleted file mode 100644
index 691f34814eaa..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.3.26-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -45,7 +47,7 @@
- check_PROGRAMS=
- 
- TESTS=			t.smoke t.validate-xhtml10 t.validate-xhtml t.x509_name_match
--TESTS_ENVIRONMENT=	srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" $(SHELL)
-+TESTS_ENVIRONMENT=	srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)"
- 
- if NEED_TRIO
- noinst_LIBRARIES+=	libtrio.a
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 472200303803..2b879adb2267 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,4 +1,4 @@
 DIST isync-1.3.1.tar.gz 311868 BLAKE2B e7eae36407873b8f9f3c4e9a827e719aefa608994f5a48a93779207148123c7b796f6aa8ad8157f5eb9e863c5845889ad595d23570f12a0520fe997f8282158c SHA512 59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2
-EBUILD isync-1.3.1.ebuild 847 BLAKE2B da908a26f1d0afcf55304c26833e816ffeec41aaa6fce5d5a47e6a86e6092dcfa0a775fbd959599522d8f092c614787fb3fe59d308bbb5b28c7f8ddd7ace20bf SHA512 db8cb458e1af7b1a2b3e7794adc99e47d5474fe868840237001ab3d4b9dde4da7c838e310a1626bc0616549594d9f6682997693c880df572a33a47cd1384aeee
-EBUILD isync-9999.ebuild 849 BLAKE2B ad7c0cd7fa2f4b2d6efea4de7743b2173d513cf78d247a684787a97b433435d28d3468964699f543cda45d69c96a2a8dbdb59a580d52db50933efb2bc7f122d9 SHA512 981add2caff2810e074a8b0944d3ee59bd9ab35976baa4d436a0e16e145422a6aaa7c42efd162927db4129191027c6781d0f457faf25e8cd05c436541f579dff
+EBUILD isync-1.3.1.ebuild 845 BLAKE2B 5ebdb96732a4cf424dee5bb149b939748cec6b0324bd1f0ee9b65124499357c22a5f30116973848150807c4fb5f2e74d8f0a803612927bd96f57a759968cb97b SHA512 ad2cd3affdaf1697188ce60d2d00934f0315b3f1fc4041923e18f95451bd481f95601e3810529cc9b9f5e877dc974a8bee242fed8090b16beaa054e869f22d49
+EBUILD isync-9999.ebuild 847 BLAKE2B 48d95904f5ffdaae8199b0a122adcb497129faef094cec4fce61f969def88b23b0b58860e6ea3fc11d64459ddfc3b389afa692b037977c25e3438942e59e83c9 SHA512 993d8e67255b4c2044cabb1d7a85eaaf248816e9d88d399b2f2b292fbcb85ae3697fceee191efa28caaabc2b5dcf733f795101d0c4bf272ba504ab7940c704e5
 MISC metadata.xml 295 BLAKE2B 018d8692cf8398f0fe616b81594313139e4a2e8d07724fcca621ae325b0ecef76bed8c9142847483240cb5b597c936600152ce92ead3de8ebc66c74e7fd89039 SHA512 74a5fc01fe3cf7826ba041fb90bb6aeb3c1a1e4ba8f3807a17a3defc08d5e2f507f88ac52a458b9707fa5a877dd3f63210227a7637fcd35574c09e073896457f
diff --git a/net-mail/isync/isync-1.3.1.ebuild b/net-mail/isync/isync-1.3.1.ebuild
index dbd86955dbcb..83a9098db3da 100644
--- a/net-mail/isync/isync-1.3.1.ebuild
+++ b/net-mail/isync/isync-1.3.1.ebuild
@@ -31,12 +31,12 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 "
 
-src_prepare () {
+src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
-src_configure () {
+src_configure() {
 	econf \
 		$(use_with ssl) \
 		$(use_with sasl) \
diff --git a/net-mail/isync/isync-9999.ebuild b/net-mail/isync/isync-9999.ebuild
index a9663859bf83..c9d9c4a0112f 100644
--- a/net-mail/isync/isync-9999.ebuild
+++ b/net-mail/isync/isync-9999.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=6
@@ -31,12 +31,12 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 "
 
-src_prepare () {
+src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
-src_configure () {
+src_configure() {
 	econf \
 		$(use_with ssl) \
 		$(use_with sasl) \
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 55d51e5b4577..2d45c9933b20 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,5 +1,5 @@
 DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd5cf3e5dea69cad8fa485424a5d8b89d1e2024f34a688bfb018724b05bf8e5e57ab5338c9973b78d203d4b SHA512 c99d8c4549d781252192e07dfb89adbae6daae5a4f4c94de692c4289848ba8599c2b0aeb28bac69313e6828995eac32acf3fbc76b1695c6464c6339236cdb341
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
-EBUILD lbdb-0.41.ebuild 1362 BLAKE2B 87f3eaca4b680eb27ff7f24287317973a9aa93f95ebfe4a7770f5f73b4327f2ac6391084eb75aff85159fe73caacb19ea4fe8d1f459e405c0600be5a256b6077 SHA512 b483dfd7dd5207045a648283f1b7eda49aca430dac9a54001baf253856a277e6f358951b8d9268573716471b89440d26c338b4e7b5ec42ebf06f9b4f3505c029
-EBUILD lbdb-0.47.ebuild 1487 BLAKE2B 119517d253102a3b292c99b77e9ab0adebc4c49b079bbb1b18ac1260f0914a76c862124775c281fd5ecf84e8ba1f53c9adc65cf93f792a03cd1130ee4d455a3f SHA512 9d4a7e9972397cb2e0209ffa64df80b26d179b449ece8b6659016a8351ac0a88558f2b1badaeaf57d8fb1f87eac377260a7df05b74726607eada9d477ad7ad89
+EBUILD lbdb-0.41.ebuild 1358 BLAKE2B ea4aab82df8950ae3881c4b9568fa142abfea76527e61f4772e8c74d6908d7ac3e70bd898f8839b9bc811ea7eb574747bb5398aae6705f60bbe2c9552c7fcdc6 SHA512 763463673da26cc678b93468702a3629a3294316bbfee7144616338359919a0611241a171f3676c021faf9b3b78ab3065dd1407fe134c535348d9901653cac4e
+EBUILD lbdb-0.47.ebuild 1486 BLAKE2B bc5c6fb4a8f77c2b0ac77753c86e17ed85ce8dd414562209bfc9036a07f2671c757caee88263d1088f5617a06907114e6f1a7ccddbabea745b6c3bc2382f5c9b SHA512 ec769f976f1435e89b078008297784e1d2cc612eebff969e5b3ab60a11c3475a8ee147540df7cb3c0788edae06b73d29cc64001bf92ec4a4b4421ac8065a757a
 MISC metadata.xml 452 BLAKE2B fb14006c0ff46ee5b6e9c72682db885497f93a3b48e6852c87128a2b17b91a0459ccdb2d5fe94cf2e26459c9176251f79ac18ec31d3f03cf060c0ea2f8294c5f SHA512 38c22e435ea247d967a8d04092be6f0195436db16fc03d7fd7aa3cd0fe0f3dbfbda3ffe6a58cb7e8a5d1dfb18fb0a048b7d525300bd265a7d0522dc91d991a79
diff --git a/net-mail/lbdb/lbdb-0.41.ebuild b/net-mail/lbdb/lbdb-0.41.ebuild
index 9bc42cb1b34a..82bcdb4c6e0f 100644
--- a/net-mail/lbdb/lbdb-0.41.ebuild
+++ b/net-mail/lbdb/lbdb-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,7 +44,7 @@ src_configure() {
 		--libdir=/usr/$(get_libdir)/lbdb
 }
 
-src_install () {
+src_install() {
 	emake install_prefix="${D}" install
 	dodoc README TODO debian/changelog
 }
diff --git a/net-mail/lbdb/lbdb-0.47.ebuild b/net-mail/lbdb/lbdb-0.47.ebuild
index 7ac9a150cc56..1d0c6752cfca 100644
--- a/net-mail/lbdb/lbdb-0.47.ebuild
+++ b/net-mail/lbdb/lbdb-0.47.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
@@ -50,7 +50,7 @@ src_configure() {
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/lbdb
 }
 
-src_install () {
+src_install() {
 	emake install_prefix="${D}" install
 	dodoc README TODO debian/changelog
 }
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index cdb95cc6de04..a8031aa30e12 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -8,8 +8,8 @@ AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3e
 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
-EBUILD mailman-2.1.29-r3.ebuild 5864 BLAKE2B 20091d601c3fb374a327b65503f1ec42552b0defadc5ccbac49c3b70cf72b1156a480f70cd6a607c843ad0ef2b7564b6d494433ded7ac1108bc0db07f4ad7b92 SHA512 7fec7675d2f2eabf1916190f38b565c4cee30f67fdd4e2e444e734546bd64af15ae6f19d999b494b39a0a07a387f974694993b101632b5daa5e619be7afee770
-EBUILD mailman-2.1.29-r4.ebuild 6037 BLAKE2B 7bf9d06db3efb0961fbcb8b66a3a9fa379ea40f7a78eaf5ec292faaa2c20743defa55612f24e707141e00977a12ed664de8b4dd90e324ede26936169272494c2 SHA512 634d49d59182a3f82f08e76335b6666daad9c1679830789b0be999f0a423f1ae1d4c7374a10393844f711407cd9c948cb980687b738d8b7fd8ef76c9b61df3e3
+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
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-2.1.29-r3.ebuild b/net-mail/mailman/mailman-2.1.29-r3.ebuild
index 98954d73b404..f4b289046d8c 100644
--- a/net-mail/mailman/mailman-2.1.29-r3.ebuild
+++ b/net-mail/mailman/mailman-2.1.29-r3.ebuild
@@ -67,7 +67,7 @@ src_configure() {
 		--with-python="${PYTHON}"
 }
 
-src_install () {
+src_install() {
 	emake "DESTDIR=${D}" doinstall
 
 	insinto /etc/apache2/modules.d
diff --git a/net-mail/mailman/mailman-2.1.29-r4.ebuild b/net-mail/mailman/mailman-2.1.29-r4.ebuild
index ed0fc12b55eb..82228bd9d94c 100644
--- a/net-mail/mailman/mailman-2.1.29-r4.ebuild
+++ b/net-mail/mailman/mailman-2.1.29-r4.ebuild
@@ -70,7 +70,7 @@ src_configure() {
 		--with-python="${PYTHON}"
 }
 
-src_install () {
+src_install() {
 	emake "DESTDIR=${D}" doinstall
 
 	insinto /etc/apache2/modules.d
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 7e2e0d6f3901..e0a73850b736 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -4,9 +4,11 @@ AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb9967
 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
+AUX mailutils-3.8-fno-common.patch 652 BLAKE2B 696761bb11c568fee6c809896702db9fcda70bfbff2404f5140ca137b9bd5742e96f3690ee5c097f21d5e76003cc1236936051a58fdc8cb547d017222029612a SHA512 220263cf3ba348114eb7f21454f70dfb03b8fa50d0d72d986bdcb7e10b873e8c549c4322ef78c4c06d91363caa1a0daeeafce02db22180019f5760a86e752516
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX nohdr.at 1032 BLAKE2B 3c18d35edc0b6a8481fa7fd8ef110734da5d79ad3ac4a1e251dd020585832b0e5704a9f6928d150aaaa28abf77eaa1120752eb9b2de6d97b52f3110531be6ab9 SHA512 d244044d0ccc00b23cf01235904b880e3d1e74ab2741dc41c4ab82217b019cb32d3dadae69c73c635bceabb80bccc3db5f3176a1039ee40f365277a102739eb1
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
@@ -15,7 +17,7 @@ AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780
 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
-EBUILD mailutils-3.4-r3.ebuild 3662 BLAKE2B 3671df829bdf811154e73ce0c30191dd222ca81b7a268ba257d5674fbc6d69afd6971b6a7ea28808bc9d14142817b34374bb48e3f1a2a01f6ec6337e76d4e7ee SHA512 95678a06c29dc5d70b3c693222d97831234823d6f9cf5b3846f56e45f1f28e8ec781415ffffd989a3be76ac5eb7caa30d28b7e1487323d394ee0a4bc18e5d55a
-EBUILD mailutils-3.7.ebuild 3663 BLAKE2B b5f29c6693291d34c53dc96a8d9a295fef01ebbb3ddfb735f426429afb22629d50a7e5a256a53d7932fcd3b13213584aae2e9dc772a44019baa1260ccd76677a SHA512 fcff9aa636c2eabc7bbbf1183ea19043c78fffdb52f67eb13c05cd43cccb24b2931f2b7a80405ce62369bbdd81f9a4b7fa6ae832f32cb62a1a277dcd7c646a4f
-EBUILD mailutils-3.8.ebuild 3710 BLAKE2B 5cc541646e30943e1f0e2b9b56a5b24da3554677740ee73eceb44866ca035688eb44a5867460929e576099bf7b4ba6949add17c2449c3dbb6dfc1868342b89f8 SHA512 87a0960a81cd5bf7b6caf3cf9e5afd31d6830d3d24caa40f3e981e30d2dd6de0b931d5f7e8acddab7d9f72ea39c44e6f36e02904d1b05cbdbaab365cbb5a3964
+EBUILD mailutils-3.4-r3.ebuild 3711 BLAKE2B b2ea34e03fa594c9492660edab9dfae80d11da036bcd64d12be5f375b9f49c847e57ffd517af14859cb99942eee13d6046855e700bfb28a0367a24386d36a157 SHA512 ec068b220296a0ba43feb24f2859dde417c3e8ce6aad66a80e98bf9b429f871a703c6a19c00185a857a47c28b7369167e685fc4868bfa303412d26944dc164c8
+EBUILD mailutils-3.7.ebuild 3704 BLAKE2B 7bcfa3e918b18352dda1e232c06ae304f7ec773927e45cd54b4606cbe96c969277077f659a7d7b3082604067d1c300662535db99e881f3399353d9d030a71dd4 SHA512 6a2d9ffa39b13ce2dc4e3933256e525e27c19984a5d85eb1372df5b14f507a093ad64b5b5c0151f1878c8966c7623824984d729143cdfe8eddc22fb4d8735620
+EBUILD mailutils-3.8.ebuild 3745 BLAKE2B 9d00ee5224b0f96fc27f09ed288d3a83ef827d60b534d5ca0d96670e227c87e3103f53ad0131cb2192f8734699049fe94124df712caecb5cb48e8b06f08a4d88 SHA512 5be7cff9e9dbb63e5ce2bb5e5c69025008847bdd7bf36d29b4452abd7d110595489876f25bf590494523c27a93a44e8b54dd0d44e6214508c608813dfa1c4581
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.4-fno-common.patch b/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
new file mode 100644
index 000000000000..d981ae6891a8
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.4-fno-common.patch
@@ -0,0 +1,11 @@
+--- 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/mailutils-3.8-fno-common.patch b/net-mail/mailutils/files/mailutils-3.8-fno-common.patch
new file mode 100644
index 000000000000..c7aa72df10e8
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.8-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/imap4d/imap4d.h
++++ b/imap4d/imap4d.h
+@@ -229,8 +229,6 @@ extern struct mu_tls_config global_tls_conf;
+ extern int test_mode;
+ extern int silent_expunge;
+ 
+-int tls_available;
+-
+ /* Input functions */
+ extern mu_stream_t iostream;
+ extern int  io_untagged_response (int, const char *, ...) MU_PRINTFLIKE(2,3);
+--- a/lib/tcpwrap.h
++++ b/lib/tcpwrap.h
+@@ -17,7 +17,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/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index 509c103ba016..c3edc69e6726 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -56,8 +56,10 @@ 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"
+	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
diff --git a/net-mail/mailutils/mailutils-3.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild
index f565cbc30a7b..344b83bfb471 100644
--- a/net-mail/mailutils/mailutils-3.7.ebuild
+++ b/net-mail/mailutils/mailutils-3.7.ebuild
@@ -51,8 +51,11 @@ 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" )
+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
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index a0eac2746bf2..010b4f58138b 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -52,10 +52,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 
 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-fix-tests.patch" \
-	)
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+	"${FILESDIR}"/${PN}-3.6-underlinking.patch
+	"${FILESDIR}"/${PN}-3.8-fix-tests.patch
+	"${FILESDIR}"/${PN}-3.8-fno-common.patch
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index 501f5c105179..a3f2ff50ede4 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -1,4 +1,4 @@
 AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
 DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
-EBUILD mboxgrep-0.7.9-r1.ebuild 565 BLAKE2B bfea9bcbd817323d54fa9a2aed66b8d801680a71f93c0cbc48073b7a3c8448ea13854eecc0b9989191de211e468560d92fd82ea1492fbfc9e3a37d3065eedff5 SHA512 4357b906fc48816a3c4310615b2a76377547ebf61cd2dfe51d2274e1d93c7e013ce14a38e8a16c754be81ba1bdc7deb357637d24dfcae6cea7d21c670e7bd19e
+EBUILD mboxgrep-0.7.9-r1.ebuild 561 BLAKE2B d3e18ee1d573f6d9187d1897c0d28c4d4a9b31217a4f0c3baa723a250482c2b371fda8c01d95c13c22feec8796d3dcedf919046f831d68efb30d4b826ef53b53 SHA512 ebbb369bcd0974941e37c657b1d3e943e10436538bd35b5058f4ee9a6b0f7653851be962675e89da9f7258664f6aacb3cbfac718615dcfc616a4d508d821c4ca
 MISC metadata.xml 245 BLAKE2B 4b93589a8a73efb60967e4ba0102a586cd02498c0deeeeecc02dca9b11feddfe6842b90d19157d74daf909d124161b73f10f12f46ec4e2989dd2648b6b703c70 SHA512 bcd6489344b1d3d87ddea6a9a7ea086bc2cb3e22c6c3697e408c7df6818cf41abd2f5365dacd91fd4f5e66638b32e4ddd51604ee273ee5adfb7eb4e60f44d867
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
index 3f990709627a..a2e8ff7afb6e 100644
--- a/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -21,7 +21,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 }
 
-src_install () {
+src_install() {
 	emake \
 		prefix="${D}"/usr \
 		mandir="${D}"/usr/share/man \
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index b3f2bf61d720..12be24fe3332 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -2,5 +2,5 @@ AUX metamail-2.7.45.3-CVE-2006-0709.patch 1900 BLAKE2B 8261d06b58fd84d2e35b7a2e4
 AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e8631e2447b77758155431355c804543afa509fba81627cb6e2d93af5e9e6e0d7853a82afb12a657c8afc970c1f6b768dd10394 SHA512 077ad34f5d7664ef9824b623c17d9828b64aa63045f854b4b65567a35bf6fd1d5753d6d3186e3a7d6b63c2854f23cb566911c6bc4dc0904ad7d035229b2543e4
 DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
 DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
-EBUILD metamail-2.7.53.3-r2.ebuild 1679 BLAKE2B 8f2ffec4445805fb4be10167a2eae58743d8fcfbf4d427157dbbe601ac50f8240de3dd12352935a89ec7493c9214ab1bdcc2ab876d4b3e04e21e3e2227538893 SHA512 3502d2ac16331b3bc703a84ebab29d43cc08579037a6bf050d58ac39cda27541db4e47fa244ae7ea0fb9f4256d23d3d3c8e11c3df914ef94b6755731bf4b820b
+EBUILD metamail-2.7.53.3-r2.ebuild 1678 BLAKE2B d58959c9828e99113ff43fa5b144059166dcbadb189368870baf2e04a418b8b4742d3f350be7968973a1b4a150ba47e79d8e8d63910c2849b44354de38ad0446 SHA512 2a6684c2217d92b2b591c4c8b92ca572fc10e2ac3f5df993b1fdbca589083735cba4c83834ac46513b16ba007f9ed731da2f98324f27ad33d285fefd9647893e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
index c45999980639..55fb5c01c455 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -58,7 +58,7 @@ src_compile() {
 	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	dodoc CREDITS README
 	rm man/mmencode.1
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
index d35c93a8cfea..a85409155382 100644
--- a/net-mail/mpack/Manifest
+++ b/net-mail/mpack/Manifest
@@ -7,5 +7,5 @@ AUX mpack-1.6-munpack.patch 1341 BLAKE2B 9c1a41f1d1e6db8b80369818effc56556d1c2b7
 AUX mpack-1.6-paths.patch 2729 BLAKE2B aa0cf351e69b2b041ea14c84c651275cf6e2cc8953d18363e7e9fe58c1d8a54aef0ff028ddfe47452dafb2c2c9c4af37d104f5f8a58f6fef106197bfaa1500ca SHA512 918a1f25e5f224d34f2e1b44aae7683b5d31b384d6e124de88c1fe661e42ef5d88810d7380bc4e298a2d7efe152f0da5cfc3b3028c65a3f2a337511d3384fcf7
 AUX mpack-1.6-usage.patch 721 BLAKE2B 9631aed898a8f95fb3e70f29c82994d0f1abcb935c106074c014a56f59f39df46fe6aea5b9eef0e58bfb25d5c9d4084126b88eb1117d8ca124746058b334bc52 SHA512 e07f72e6a0d037f788829904050bbee9f1c8c722a6b363b8a95ab012dda99b952e36bd7a9772a63d22ff4da34fdd44ead8d42db510e8c340f3410b3cd0d52b1a
 DIST mpack-1.6.tar.gz 179850 BLAKE2B d6b79e8514633fd0bfd1c04b167ba1d1a030cf5407dae30ba2a45e3d30157b66955808aed40a5163737c0242349d05f53c27ada920676cf3d7b81a00e7bd5059 SHA512 9bff0d2753d78288e428a20c8cbb4596bd9862de4da7f42176731ce5fd459b15883d758f9b1ec7d4e1281cc1aeaaa046cec54aeb0997a7ffed74de07edd84714
-EBUILD mpack-1.6-r4.ebuild 845 BLAKE2B 0e9f569170bfd111bc961e4b355ff26a16fbf0e2b854ea20e3f2910b79e5646e9afdfe6209fc258b9f159b59548c91dc6a8fcccd2d4f4cc88b86bf63f3128b60 SHA512 9d5ee1be67c280dd97ef38e8b48686b3a633c4dd740d8a64995708bc4e971dd428ea29034209d00bb47ae91faaa7add14128769021b3bab6b19bc6a0d447590d
+EBUILD mpack-1.6-r4.ebuild 841 BLAKE2B a54ea46f9a497853c2e34036c0771600f0b24697eb1b930f4b361656a3144c8bf12a1307ae581c3e06339a68975d0fe503f1459db25c9b023053449577f01911 SHA512 9b4d358f2e70c43758a831fd1c310d6330792fc674ac3757c4bf503d2905ba0ceacd7575a4b4673143411423711f370fe713d932d409971784f1f8c3147b9dac
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/mpack/mpack-1.6-r4.ebuild b/net-mail/mpack/mpack-1.6-r4.ebuild
index d3411787bb6c..cdc76aa564c7 100644
--- a/net-mail/mpack/mpack-1.6-r4.ebuild
+++ b/net-mail/mpack/mpack-1.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	dodoc README.* Changes
 }
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index bfc7d379dd4f..49553e8acff4 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,12 @@
+AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e
 DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
 DIST mu-1.3.5.tar.gz 2305222 BLAKE2B ff6025cf053d7c2880855ec32953a2881ce8bc7d468082f13e45e7684dd41bd7906cbc9a619fd27bd4860bb953e4a547c3d22ea9a7fb4c645825c755ee33b5f9 SHA512 5d7eccec296affbe6e2e31d2204672f8ecac43f1a0c93673f983378fcf7ad8a050662097ec58603251eed31b499054d6c453a2a4e2c70dfdd896c430559b95c0
 DIST mu-1.3.6.tar.gz 2305653 BLAKE2B b9a556c1b374e0b72b6b0c40beba581dc3fe0e0a654a881db3a47582481ef00831e18bcd771e24b231ef843e97f14f7401ad8d041c077617b865f1fa971d1a0f SHA512 c889dc3fc1b7f1333f2adc3891f23ea8977c77ac6af532fec37c6570b4fbb2ce8dda0776568d61dedfa34f0519bb5bba89b90002503c3191a0d633ecfb9d5c87
-EBUILD mu-0.9.18-r2.ebuild 1972 BLAKE2B 9a067e58cefb3ee4fdfe352c4100d455312eaf33ab3792d402f2730978c13cd1b41ddd38b459d6792a35cb629a966b7f8144bf802e7a410c095729b7290a1a4b SHA512 8c72f67087d93a57d193632f23d741ef540218c3a53d9bd28f08f385e387a4aef2695a8a045b3287fe4c131aced8c5d8289086ea48ab4b2a4ea9452b39d6d401
-EBUILD mu-1.0.ebuild 1975 BLAKE2B c8334faad346b75d5ade8eb9e346a8c79f2f5b854955fcb2cd5cbc3c9bbd441a08fb5f252273edcd6039ca481044615e3fbb06001fe482d2584f2347cfbfdfab SHA512 f8083db03299d2bacb27555ed727353fc22c2555d3c9ce5d3cf6d827a233a31d1b318678681e42b60785e5492953c1728012291f513771266085bc258edec96f
-EBUILD mu-1.3.5.ebuild 2105 BLAKE2B b60ee9cb2abfc3059b16f4d6a94ac484d4fb5124e06a087a05b075fcdfd51810c64d7db5b433282a62917fc295afbf480148f64d7e806ca084a1e39bd11ec2a2 SHA512 e5e66dc9a5287bb0e9d08c4da1caba35f63a6d24dfa2db293f6d8c46cdbf22029276a760668522e22dfd9935d749b224dfa5ac6b3da0ffd207a1cda33f10b5e6
-EBUILD mu-1.3.6.ebuild 2172 BLAKE2B 01583bc9ea1ec928a34082416b5e5d93bd30a80e9201e23c4ae776c39b76b499e4b36aacf1045585efc477675d7df223910853cf63ae84535450eb9a44a868be SHA512 0bcde3e77f99f7a28da6df51a4ea496212a574a05dc68eeef3503d2a88015741a4224bc55f4cdbe189f0f3ab786a6f7f860f7864232e85ebc69339f40b5bc4d3
+EBUILD mu-0.9.18-r3.ebuild 1773 BLAKE2B c11a826bcf373fa116b225a9e84505b56129e8e3ac1b12dfb8946eef21ac062a854be111f871e7a835959cfdcc7b766950fb41ce49986ba12f850f3185805453 SHA512 cef4a8ccf07a5cd1181b5ffde3e8ed7d38d37a35af49fc3b38ccacaa7df901983f2b108ba1e72789232321f723cb9d14d450b5efbba52f2a37a3f84bf9d0d358
+EBUILD mu-1.0-r1.ebuild 1776 BLAKE2B 48bdc1543bf0cca1d64e7d63e2e51d5d1b0ac87d5560314bf1548edee12b49c7d073ccf2fc813d0eefd351dd242577b291c18938c84333ba1e90f0925338de8d SHA512 1838adf12f3944ca1402106e210d1459bc19eee5fc28428a9b903e700705842bf084d00f55235ab65d6d7b952822e80df9e151264ab25419f57361fe1117fd48
+EBUILD mu-1.3.5-r1.ebuild 1960 BLAKE2B 721f6f318267d356e987f504f21ced0c96a819e70ad4abcd4b7875f06fe551895592ae403d29600089f0fa58689c5325e564508d8e357c2443b88bc44296006e SHA512 2a0c244fc44c7cc72a9713562c5ff282ca04c5791df5c4a96b5ef587b9f73968698d5ce1574bd68a8f3bbbfb8a711fb21a2b78d5579fe59f144db078a32e774f
+EBUILD mu-1.3.6-r1.ebuild 2027 BLAKE2B 6d1f1ee8e1ec3fb72eee193fe464e641662656ff62f4027be0151f781cc7126c7e49e45dedd5c66d363951a9a51170e886407b5a7b0d42dab28f87ce3baf34d5 SHA512 cd1d7d25e22ae25f2914e255b2a5404ad5bcb4effd53780bf6a774c304938d1b165a0bddc7ca3b03848f31928507bb7a785125c7d0155c76abd08d3ed5d995b7
+EBUILD mu-1.3.6-r2.ebuild 2038 BLAKE2B 2518184e5c7baa06a905db7b843dd5de5dafda4f03bd4b0279a1feb83b8b6f17f7edb04e5e2d49dd8dcf94030191cc2965fa7169e873f6a742d8102b4e30cead SHA512 b2c02b16604bc77a0fdba274b8d66f44f30d3373f6544f8ef43ba3493b42a35ac94f9a999f855df935cbfde38c97930b41146d36af22f290ace5cde2499fd515
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/files/70mu-gentoo-autoload.el b/net-mail/mu/files/70mu-gentoo-autoload.el
new file mode 100644
index 000000000000..d868bf30334c
--- /dev/null
+++ b/net-mail/mu/files/70mu-gentoo-autoload.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mu4e "mu4e" nil t)
diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r3.ebuild
index 1384e4bd776e..e8f78f993833 100644
--- a/net-mail/mu/mu-0.9.18-r2.ebuild
+++ b/net-mail/mu/mu-0.9.18-r3.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=6
@@ -14,14 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="emacs"
 
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
 DEPEND="
 	dev-libs/gmime:2.6
 	dev-libs/xapian
 	dev-libs/glib:2
-	emacs? ( >=app-editors/emacs-23.1:* )
-	!net-mail/mailutils"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
 
 SITEFILE="70mu-gentoo.el"
@@ -33,14 +30,13 @@ src_prepare() {
 
 src_configure() {
 	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
 	econf --disable-guile \
 		--disable-gtk \
 		--disable-webkit \
 		$(use_enable emacs mu4e)
 }
 
-src_install () {
+src_install() {
 	dobin mu/mu
 	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
 	if use emacs; then
@@ -55,7 +51,7 @@ src_install () {
 		  man/mu-view.1 man/mu.1
 }
 
-src_test () {
+src_test() {
 	# Note: Fails with parallel make
 	emake -j1 check
 }
diff --git a/net-mail/mu/mu-1.0.ebuild b/net-mail/mu/mu-1.0-r1.ebuild
index 67c1fb0dd25e..8a21040cf96c 100644
--- a/net-mail/mu/mu-1.0.ebuild
+++ b/net-mail/mu/mu-1.0-r1.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=6
@@ -14,14 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs"
 
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
 DEPEND="
 	dev-libs/gmime:2.6
 	dev-libs/xapian
 	dev-libs/glib:2
-	emacs? ( >=app-editors/emacs-23.1:* )
-	!net-mail/mailutils"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 RDEPEND="${DEPEND}"
 
 SITEFILE="70mu-gentoo.el"
@@ -33,14 +30,13 @@ src_prepare() {
 
 src_configure() {
 	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
 	econf --disable-guile \
 		--disable-gtk \
 		--disable-webkit \
 		$(use_enable emacs mu4e)
 }
 
-src_install () {
+src_install() {
 	dobin mu/mu
 	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
 	if use emacs; then
@@ -55,7 +51,7 @@ src_install () {
 		  man/mu-view.1 man/mu.1
 }
 
-src_test () {
+src_test() {
 	# Note: Fails with parallel make
 	emake -j1 check
 }
diff --git a/net-mail/mu/mu-1.3.5.ebuild b/net-mail/mu/mu-1.3.5-r1.ebuild
index 3e40b2e3d546..41476616e4fa 100644
--- a/net-mail/mu/mu-1.3.5.ebuild
+++ b/net-mail/mu/mu-1.3.5-r1.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
@@ -14,15 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs guile"
 
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
 DEPEND="
 	dev-libs/gmime:3.0
 	>=dev-libs/xapian-1.4
 	dev-libs/glib:2
 	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.0 )
-	!net-mail/mailutils"
+	guile? ( >=dev-scheme/guile-2.0 )"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -43,7 +40,7 @@ src_configure() {
 		$(use_enable guile)
 }
 
-src_install () {
+src_install() {
 	dobin mu/mu
 	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
 	if use emacs; then
@@ -63,7 +60,7 @@ src_install () {
 	fi
 }
 
-src_test () {
+src_test() {
 	# Note: Fails with parallel make
 	emake -j1 check
 }
diff --git a/net-mail/mu/mu-1.3.6.ebuild b/net-mail/mu/mu-1.3.6-r1.ebuild
index dc9ae87483e0..fdbb2fb3c2bd 100644
--- a/net-mail/mu/mu-1.3.6.ebuild
+++ b/net-mail/mu/mu-1.3.6-r1.ebuild
@@ -24,11 +24,7 @@ DEPEND="
 		net-libs/webkit-gtk:4
 		x11-libs/gtk+:3
 	)"
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-RDEPEND="
-	${DEPEND}
-	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 SITEFILE="70mu-gentoo.el"
diff --git a/net-mail/mu/mu-1.3.6-r2.ebuild b/net-mail/mu/mu-1.3.6-r2.ebuild
new file mode 100644
index 000000000000..27f87d5b69a2
--- /dev/null
+++ b/net-mail/mu/mu-1.3.6-r2.ebuild
@@ -0,0 +1,95 @@
+# 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="http://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.0 )
+	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 README.org 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-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
+		man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
+		man/mu-mkdir.1 man/mu-query.7 man/mu-remove.1 \
+		man/mu-script.1 man/mu-server.1 man/mu-verify.1 \
+		man/mu-view.1 man/mu.1
+
+	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 "http://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/pop2imap/Manifest b/net-mail/pop2imap/Manifest
index 0e5967aaf9fd..96948e22ba6c 100644
--- a/net-mail/pop2imap/Manifest
+++ b/net-mail/pop2imap/Manifest
@@ -1,5 +1,5 @@
 DIST pop2imap-1.18.tgz 20059 BLAKE2B 022eacdf48ca65f1f62372cbf3b63ca45906e8433d2797be3e7e49c0a72b85ef8ebf4466eef75d4643e1bdf1da32f83b1aa55744c910ca3e7dce143b49e3c836 SHA512 8b3a41cc2c7f9b51890d2ba19897f0b1576a027f0f3443fb3fcfeec9beecd797cba383ad83f0b56abb8e79625ad52b25fda20b94dc80cc11ddfe60550809a86f
 DIST pop2imap-1.21.tgz 10920 BLAKE2B 6f35fc081aa2b27854aaeec191d9d084fbe063e647fc2042ff8a0670dd4420442e1d2da747b6c5ea05481c25751f8f5f774b0afef4d9007e09a15c879585a7e2 SHA512 8f49ce6ee0dbb71699ec83415f3002f752975eaa39c70ccdc0f2e62ab2791a29d483e1159c2ef035c411fe5e351b9c99845ba2451e95fd3331c3bfb03b8a061e
-EBUILD pop2imap-1.18.ebuild 581 BLAKE2B f1a05dac7c9e0b1cb4e8bd81a4ab5f1ffdef3998712fd4585fba7ff96ea0eb5fbb0aba8931b3baa1fa8bf3d0151368919cb5a4b9af22eb470d3df875fe8f8fed SHA512 bab7703af78173a494d20a3f78e2933b0b461609c52bfbee569fdddaa28e73c47e8a94dc5cf49f4dfaf6e56c023fd7c36da69ccb4464cbd7186f38c90c1bad36
-EBUILD pop2imap-1.21.ebuild 590 BLAKE2B 81092223b6bb4b633bbc7359c42ed0801c52d60c52adf6a585cf654ba48e3b6b9bc70a9e63e65f141bbdffe2c30ce6bbd4d55bd2ecfc06277cac641abe8b108b SHA512 333d243a5b599f805710ba2418a869cc9df1cccea6d7159998b7764a57a7626a994b8470b8279551b8da0c8025f2d5d6f46757f350db0b8ff4ad2f853e571e63
+EBUILD pop2imap-1.18.ebuild 579 BLAKE2B 0d480a17454def29ff077fc94d1014ee8e61320ef9b3237a2bfaf0197cb8f3d0109c1e1e8c8706014d06c9e71bba11a78689fcd763d73a50c44d7d4b554cae93 SHA512 217c7022b15474df98b44a2bc669873a1280ef5342ef584af086e6b37caec8c95df27bf6b16eae044b426da6204e118e235ac847e37dadfbc72674f12d313673
+EBUILD pop2imap-1.21.ebuild 588 BLAKE2B c4601c2cea0cb9a05e18c610929bb959183a65763c15efa214446b2ffed78d1e8795898c1e2ae4750b851d2d2a8a826f2a94ebaf8cfcbd098b362c76e50335fa SHA512 60d0cb21eef13c53685f3c7faea1ba50d8ff2b4dc6c2f256b1c6d0de7cc1ba92d9d867f7b78d31138cc3597aca146ddb97b465bfeec584f52be6dc3b313fd192
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/pop2imap/pop2imap-1.18.ebuild b/net-mail/pop2imap/pop2imap-1.18.ebuild
index 4da06b095bcc..6f6a40519685 100644
--- a/net-mail/pop2imap/pop2imap-1.18.ebuild
+++ b/net-mail/pop2imap/pop2imap-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -20,7 +20,7 @@ RDEPEND="dev-lang/perl
 	dev-perl/Date-Manip
 	dev-perl/IO-Socket-SSL"
 
-src_install(){
+src_install() {
 	dobin pop2imap
 	dodoc ChangeLog README VERSION
 }
diff --git a/net-mail/pop2imap/pop2imap-1.21.ebuild b/net-mail/pop2imap/pop2imap-1.21.ebuild
index 5122fc25d855..541e50751c7a 100644
--- a/net-mail/pop2imap/pop2imap-1.21.ebuild
+++ b/net-mail/pop2imap/pop2imap-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ RDEPEND="dev-lang/perl
 	dev-perl/Date-Manip
 	dev-perl/IO-Socket-SSL"
 
-src_install(){
+src_install() {
 	dobin pop2imap
 	dodoc ChangeLog README VERSION
 }
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index b4ca3a50bb3c..a493a37c7049 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -2,5 +2,5 @@ AUX popa3d-initrc 368 BLAKE2B ff43e20de31313409b7e9930c397cc4585a500ea6d2372206b
 DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b701231fdff0f18f9cfec4c732e2c2b1b857a01c12671afc510e24860554157bd990be917662ab5dadb9512683da831b4c6 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3
 DIST popa3d-0.6.3-vname-2.diff.gz 947 BLAKE2B 1a64b8de2cbda4757a670aee61e4665bd394f4128763119feacacbdc4921c7a0c128050b3f15f369c4fdea68cc4c595ab1eb48e729a119e1078d4cfd6f874092 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a
 DIST popa3d-1.0.2.tar.gz 32848 BLAKE2B 1f0af2f1f12ec255f3f42eb54087f7c4859beee49d55cae60f32b4f5a58a0062c7cd5eae3690d778f3d7f7bea6678fe937b4864a2a7586c12837edf19df57fdf SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906
-EBUILD popa3d-1.0.2-r1.ebuild 4985 BLAKE2B fc04eca9148d30f46ca3cb848e28c15d328561a5b0a4589a499dacb06b81bce85bcad3dcfd0c770c8d13dd90f764858328e7ea2a70f4d494564a4f406ef417ca SHA512 b760666182894426255af5f097741e5f65be9c5f84f1713c3f5d6c4510a8f4c45093c8e4fe1f1f457d1db29d9dd28635c7574168fc7e91ff7b40e0319c476d3c
+EBUILD popa3d-1.0.2-r1.ebuild 4983 BLAKE2B b3ea49f848ca15431a95b310d90abe748da6f515c100ce80446eda738c20b936634b9bee77a04d297b5e88b8958db1052764689bd5dfa82f3a6506365ae84ad8 SHA512 30f4c2f68b089612ab014a9904c7e26a055496b7b4443b92c55fc442601a20ca0553662d3dd81c334afeb4eb485b3fa64e41d361b053d2ad511db768af58ba11
 MISC metadata.xml 239 BLAKE2B b8712a639b5f9e4930e561ad2a617e565a1545f1b1b5425e69ba50b1e0175b5fa57b1aa73105a4dd078b5ea6c004dcc4c957f0059a916d06f5c8fe3e58b27c6f SHA512 bd8159d0c8ebc2a64c436fd818bb145da92a22daafd11876898af61a4395781c8442e3ee96d21a970f17b629763a121518c36baf822d67b70383b11f43ef3395
diff --git a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
index 6ef18a842976..a668854c980e 100644
--- a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
+++ b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -83,7 +83,7 @@ pkg_setup() {
 	enewuser popa3d -1 -1 -1 popa3d
 }
 
-src_prepare(){
+src_prepare() {
 	epatch "${DISTDIR}"/popa3d-0.6.3-vname-2.diff.gz
 	use maildir && epatch "${DISTDIR}"/popa3d-0.5.9-maildir-2.diff.gz
 }
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index 543f1a3a7b29..540236cf027b 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,6 +1,6 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
-EBUILD qmail-autoresponder-0.97-r3.ebuild 1407 BLAKE2B b40aa4c0b7125ea264447953fd761305bdc28d4adb950b9eb170975ce6a4d47aebae95077a1cafab7dd7032fe6837b791f23692de54e8f355f1dd2e77254fe9c SHA512 fc1fe4dc31f789502094e9f64e3369812bd883a66ecd75837ffe48cda9ba7c6195328f70205fa6acb6172e5d5a369eb3ab0c3d41ea873912f09c3359b52015f3
-EBUILD qmail-autoresponder-2.0.ebuild 1018 BLAKE2B 8318b4e6ed59736d28ef5abf37e8f52a1cfe6b236f0f9dfee3ee4535e2dbae2a2e5b8028ff710dcd9325ab8f46b322334f9f6a5bf7165e71bff6b41b14ccb315 SHA512 5318cb60a7f57345dcf16b4ea00bdbea0fca485683c8dc378f9d1eea8847eb68a98ec1b4bcafc3f7fa4a4e059d9d02a452b97a2752fecd45d3fa147d49fe0a4a
+EBUILD qmail-autoresponder-0.97-r3.ebuild 1406 BLAKE2B e082b2a9e243a603dfbc6a08fc2e2a9e8fdd0cc2c514c9f7b93c1816c86e139840beb4674196b60b90d75b49aa950c51c738141797efad6b0f820bc89c726c11 SHA512 4666213d742305e2ceef434ee30bf623f2ea973a208e4991e6072a267802cd478d296cf677a8f5d20656010e356c940f967c73369ddfc26eb28c2093e7322c1e
+EBUILD qmail-autoresponder-2.0.ebuild 1017 BLAKE2B 24ae7c5046738aea9bc4064d17fc6afe52c352e6273978d61b9b3950a92a206499c62c68e0744bcf6c98f620532e1a22f7c1a9c05c1270f9ce19870fb0825f2f SHA512 9bf3f1a7d173af62eb4777e33087910ed695088066470fb88e021c6cd808411f35226129ee8984daaa6f155d0ced7c140b8e19b45b5d6bd6bf8dd2ad3544a384
 MISC metadata.xml 415 BLAKE2B ce1cf3c127835055f2555ab5488f2fb9bf9858711fb6e5be022ee924c53876f3baa97c9a71c3f5993ca71ffd9a6caa5c0a5a804a0aa326eaf3293363dfc657c4 SHA512 d0735db9241b2f5c46d4a2f8e1e2d0b2afe8baa94ec633e474a83a61f894146e1727799f9e59d6efb986c207c4cb6893a130424497db132b89ea2ea1a2ebfeef
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
index 628f1cb559a0..a3bfc4346de2 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -42,7 +42,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	dobin qmail-autoresponder
 	doman qmail-autoresponder.1
 	if use mysql; then
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild
index 623cf77ed841..1fdf92e79e0d 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.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
@@ -32,7 +32,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	dobin qmail-autoresponder
 	doman qmail-autoresponder.1
 	if use mysql; then
diff --git a/net-mail/qmail-notify/Manifest b/net-mail/qmail-notify/Manifest
index dc14a3528dcd..61ed865ad7a7 100644
--- a/net-mail/qmail-notify/Manifest
+++ b/net-mail/qmail-notify/Manifest
@@ -1,4 +1,4 @@
 AUX qmail-notify.cron 80 BLAKE2B a580741c9dbba0a2bc00cf55ab83d432df569bc961ac0d463bd5c5f0008ee7eccc386817750041343c9a2da5b428ad15b059234595feaf31ba199d8e143cc199 SHA512 6242a426a601b9461ca1a79b14d2f850b963604de8291779001a2e18aeead5b7315664808968640de62b5615688a246451ba67f6bf05cc002d694d0c73836c23
 DIST qmail-notify-0.93.tar.gz 37923 BLAKE2B 17cc1c436d47d759593d564e23ccfb4ee1920eed8ba2038a3e68add3a0b64f717569ef9fed25b361e6038581a6a6d269f1cfb869acf593d2fa70159db61bc492 SHA512 b39ba70360fff69c40fa9421e94f6bba8b8f65aa85fa8e86580628de25f3d9cff26484909a71e50fd8ae8cd5198c194a43d00c2776132bfedac9c546a2628e4f
-EBUILD qmail-notify-0.93-r2.ebuild 1019 BLAKE2B 3d4945ab7c486b62cd70b796ad5039698f3f0f47d746a79974d1a4de2e7d9a536b3e451f145c10f07faac4beaa725f945001bf9701f6352bd64d1569b4fa8e1e SHA512 3062a107c30bd4489fe6b1d76f5a92ead27dc53667b3c912c6ccce2510b4f5841eea4d749c09598047a02c787c1015bad193cc6d58b886438e2de01a51cad612
+EBUILD qmail-notify-0.93-r2.ebuild 1018 BLAKE2B 9a1d219cc5667211bd82116c359152d9048c125311dbb5ffdb723ab99904f0f6a98519143d43bb9f56a80d3d53786924ea0e1e13844a6045739ee170c5512bac SHA512 9be2604be01da08790ff36b63da07df39b74d088517dab0f76ed34c952fb08781c87d616e091e9df95442060d4586f4d762ee758e786501a9dce4e8dce39dd35
 MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
diff --git a/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild b/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild
index 83f5853ff50c..9fc864f17f3b 100644
--- a/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild
+++ b/net-mail/qmail-notify/qmail-notify-0.93-r2.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
@@ -28,7 +28,7 @@ src_prepare() {
 	sed -e "#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i Makefile || die 'Patching Makefile failed.'
 }
 
-src_install () {
+src_install() {
 	exeinto /usr/sbin
 	doexe qmail-notify
 
diff --git a/net-mail/qmrtg/Manifest b/net-mail/qmrtg/Manifest
index ade1fd242bc0..dff7fec54a42 100644
--- a/net-mail/qmrtg/Manifest
+++ b/net-mail/qmrtg/Manifest
@@ -2,5 +2,5 @@ AUX mrtg.cfg.patch 3510 BLAKE2B 4d0d7e94b8ae7ce708056b4880b8b0eadc0ce55913d07ce8
 AUX qmrtg-2.1-TAI_STR_LEN.patch 215 BLAKE2B 9400a5219c9b156207aa573ae8e278b36cd1c73dbe4fd96f3e44a57054315c18b3a1a3db873f372fb994e1667ddebbc96ba9b601c0b91ec7bf8ef1e22dac884c SHA512 027bb8b3d7cc1a3714f482a396a5ecb17ebc401f8fa8491cc4f326c92ad64d2708165ad1462adcddd278c757daba50d4d72c9bfed99283bd308adc29e162532c
 AUX qmrtg.conf.sample.patch 544 BLAKE2B 65797ad17d5939f368bc9cb5070a2bbcef9a4197fc64cb3afeb2670082026efdceb46fa29069022ad11110ff75caeeddd41484c83c5651c56a688b4b86d3d015 SHA512 c667fb5be05b2356782f2fe96d8b3eef1a3bdc6a8b74dfe6254f5718400cd6527baf6cee1badd0e96db26d2f5d2f160e1b47cbfb41baffcb8c79d959333d5cd7
 DIST qmrtg-2.1.tar.gz 97255 BLAKE2B f01904f19418a9a008629b743a47513e29243c9e90feb9960be60c3db2b29b6a8f48f745b1e72510f18655f59493d4e3b36c239271632e586e61bd65440a51cb SHA512 22d7ed55d22af74a62f3974f3d55edbdd08aab2db256cb0866dae566ec7f58eb5ae6ffeaa77ba571cf06eb6cf55a62720534408cb80bf95cecdbe587024259fb
-EBUILD qmrtg-2.1-r2.ebuild 825 BLAKE2B 2aad425bbff9c3be2d8a1e0886c70fd0c142bc575019569d4c703dadce5c3dddfc2a2fdd5c3b117aff0fc5153ed568983f7e24f2a3fdcf800867f982b3ec47ec SHA512 266ac2763c96a11ee3264b111d769616e3ccce4da0ec0dfcb895ba871dcc897dc08d8335153b27db1d3aac32bccb82d7547f8671ab20cbc154ab18e5c38eb24f
+EBUILD qmrtg-2.1-r2.ebuild 824 BLAKE2B 8fc060cf84403398798ee69103983463961bdf83c454b0b28222126ebd1690e625a64e186d252326143a9a97cd19b300f4aed66e4c55c97e7cf0000914d3ae74 SHA512 07de8e1f38827ded29b9bb2315985ec8d69934b40279190854c5034289075bade3e69cb11318ddcf8251bfc418ae1d5896e37ae92320db052437b6934f4ac5bd
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-mail/qmrtg/qmrtg-2.1-r2.ebuild b/net-mail/qmrtg/qmrtg-2.1-r2.ebuild
index 76d25064d2e2..63631c3a3098 100644
--- a/net-mail/qmrtg/qmrtg-2.1-r2.ebuild
+++ b/net-mail/qmrtg/qmrtg-2.1-r2.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 
 DOCS=( INSTALL.txt )
 
-src_install () {
+src_install() {
 	default
 
 	keepdir /var/lib/qmrtg
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index e37930fc8a9c..49c022c3300a 100644
--- a/net-mail/queue-fix/Manifest
+++ b/net-mail/queue-fix/Manifest
@@ -2,5 +2,5 @@ AUX queue-fix-1.4-errno.patch 505 BLAKE2B 06e1e44c8ca40c0c2594020bb2cde469da1789
 AUX queue-fix-1.4-stdlib.patch 926 BLAKE2B 62e8a37e118d4fa523a2b1c8d0752c0f6d1d82a242660a4246280f3dd74df694905c30ebfe807abf0c4834a391b13a2e5234b9e237bf20987ad438872ee0edd1 SHA512 8e0e021ebab88decd36a0ba2542315e7d3a0ed4ff1d18fc9242790f67a6f2441501d16087307788351d84e64574313fe731bfea968a034551b1086d642572db8
 DIST queue-fix-1.4.tar.gz 18486 BLAKE2B 3999632fb77955782f5bd5da4ee231d68faead75daef293b7cec9da086cb2a69bd8901efba5a3726c9f6047f6ae33060674f110dc479736ba7be8fe8c4253745 SHA512 b7e0ac070a409eff156b3803cc1bb78d1c800ae685d107b872bf5b022a8645d1ca55a5c3380f6bc82e99927df8dbf586b74af587e882938b9a7678b506c600e0
 DIST queue-fix-todo.patch 3056 BLAKE2B 92dae274431dac974e632bec94a1d0b84b652db197d4c80739a3f8da92e9f7f526b59659242456d99060859a35739e4ecfbd4e16d81892acea892de57218eb57 SHA512 78d79f1eaa8492fd9a14dc4a4d2adfaa8c0429a4faec32305f83ea1f16769b8d337fe732adc8cc0c33b909a19617862c9df999f2e938a6b845e15bc49ab5bfbe
-EBUILD queue-fix-1.4-r3.ebuild 981 BLAKE2B 99eca07e15c5a13518fd992479671c54fefd415dc5b8c1eedaaf077ebddd781d5a93e2a566f85d526f47678b1dbc8bb8837fee270a4dbde97ef0491352f77848 SHA512 069a86bad3cb62061f167fb190d30f5f65e400b6776bdeca737ceacf8081fe48ed7814cbb23a43a02a25b6e8d41b3650cee6a98577bb3c955534bae4e7dff8ab
+EBUILD queue-fix-1.4-r3.ebuild 980 BLAKE2B 16e90931ff631597297b8b23b488c08de0e94ac5b9b7750b6d557f706622ea86a2d3bbd014fe24229c71b552cf2ace7389f7b2b34cc4e61634af690632c3b845 SHA512 d6efb471cdf9c852b2dab1dbf6bf20dcf1adb3bd1360a9035d00844e0eb278976345d09b7ffd142d9e38285cac7602585cb93f63b529926a214132bcaa46843f
 MISC metadata.xml 523 BLAKE2B e5f67ee8e1333e03d8d205a54afa7cefcdf11f7c4f20cac94d68789fb4d1c90a73d2bdbdccb105cbb8b3737b091a6e4a96570ff0e089983375cd13d7e53b99cd SHA512 52c248a6450ebf03064f844d77465303e851444f2eccd2fab0867dc7d97bf003611c97f8a69634366644e2dbcdb2d8bd1396474ce7a5772e4cb3d8de35590685
diff --git a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
index 9f37b02f1994..d0cfb8c6a89d 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -34,7 +34,7 @@ src_configure() {
 	sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i make-makelib.sh || die
 }
 
-src_install () {
+src_install() {
 	dobin queue-fix
 
 	einstalldocs
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index f81bab953018..1afb826fcadb 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r1.ebuild 714 BLAKE2B b878e2c4b2ca36b0dc827296d0880a9bd8a40a8e570dc6a03ef15787743ad9c9b6fafb95254ada37aa404c1e33d3b2c7c14eb06e384c02ec4123344017171748 SHA512 5d8d176d20305bccb216bdf84fe6e592f371a9a12231c613f8b366ffe42c8d4acf37cc9caf37c025da887e8348447f19c2e235357e496c4b9471d1fc0b80d35d
+EBUILD queue-repair-0.9.0-r1.ebuild 713 BLAKE2B 695eb694288aca6fba5d940f5e53a6bb4f8a6c32eb85a18ed7615830d2c3f914fb0ec85ef70b522a7f679bd6d10c13c0179beaec491a3870e57d0c5a9d75009e SHA512 32d2fba2ed9a1c9cf872c8643912ab106a2059a4bffabf8e569de38f4e6f8ff003fff608f42c994ddb74baa9ff8e459706451a09b343efa4a59a7e191da1ac87
 MISC metadata.xml 466 BLAKE2B 521a85c974ed87b309ccbcd648599ffa3b20602a61654b164dd2b6b0f5cca7ac97716f211c9cef797604e842d6178c4c8345b2287dff3bac7a4c07072521b1ef SHA512 aa06f7e98e2c8e84edafa0a3662a7aa937389ede576f9fde6ae4ff5994faed83aee61b6f58d4a5b2db0d126a7a7f4b23fc7b4124eb4a5368511ebfa17856b17b
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index 7c47c65e2858..e62635a6cac0 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( BLURB TODO CHANGELOG )
 
-src_install () {
+src_install() {
 	python_newscript queue_repair.py queue-repair.py
 	dosym queue-repair.py /usr/bin/queue-repair
 	einstalldocs
diff --git a/net-mail/renattach/Manifest b/net-mail/renattach/Manifest
index 17647b057f68..91a919210725 100644
--- a/net-mail/renattach/Manifest
+++ b/net-mail/renattach/Manifest
@@ -1,3 +1,3 @@
 DIST renattach-1.2.4.tar.gz 112566 BLAKE2B 566675e22b35857f3e328cc3f70805b5ce74e7c156f3bfd3aec7d1b217818763b3e12ea5c4c575e98962db2a23cfcf3672348aca321dcb754c907f59fca728eb SHA512 f46aa714d794e8b1c7ff98c1a4210ed9cb83cfa6811d1724c782f25c4c250ab22dd9ff98966e821559cd0f6781ecd491bc2c260cd8f4ff64f678ef59b8cb4ad6
-EBUILD renattach-1.2.4-r1.ebuild 506 BLAKE2B 013fa070103a918fda5c3a2e73d287368143610471a00aaebd2e3fe1b03efdb063447993587712a7f702e54b2bfa3db5bb50ac21d64d5c369be8cd61a74d1a71 SHA512 d84eada2746a4b9f2c9fb8b8959e9b1642b6c3bca179cb8d51ebe7eb813d10030c92b081c28858a5b75858faa72e5af55934b4417d5df2b503771059d2ba0ef8
+EBUILD renattach-1.2.4-r1.ebuild 502 BLAKE2B 1af7be1b6460660056df6ecaa62154e462e304d85034cae3648f00cd77b27c4fdcfcfb335e2f1bec842b0c24f01c41f615e3baeb03d643006ab8649d06cc774f SHA512 080a69f2e29dcc0666dc219cea47d7e297d48f55d5656a1f9808d429635081c5ff4354bdfc4a6e7cf9aa433a8c85f2567265b4062e741c06ae9c36334fdeba75
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/renattach/renattach-1.2.4-r1.ebuild b/net-mail/renattach/renattach-1.2.4-r1.ebuild
index 229c8450c7cc..b03935f66fb7 100644
--- a/net-mail/renattach/renattach-1.2.4-r1.ebuild
+++ b/net-mail/renattach/renattach-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	mv "${D}"/etc/renattach.conf.ex "${D}"/etc/renattach.conf || die
diff --git a/net-mail/vacation/Manifest b/net-mail/vacation/Manifest
index a5a6d08f85a3..e38707b14d62 100644
--- a/net-mail/vacation/Manifest
+++ b/net-mail/vacation/Manifest
@@ -1,3 +1,3 @@
 DIST vacation-1.2.7.0.tar.gz 63849 BLAKE2B d2f2737677b0fe075041bac0a32b6f5f57d072040448b61416e7fee98e7d4184bbd22e25734ed5e4deeabb0d0c32953821d383c9d16cf79b325fa7f261956333 SHA512 50473777fa5d36c1b7ab438e1072a56298f8155c7aaa8f8d8daaa1dee5f85f54a7b17903c416e67dbac734368b1cdbbc599cd9aa58132b0ecb145ae8e058e97d
-EBUILD vacation-1.2.7.0.ebuild 684 BLAKE2B 1c66eeac0279ac35313da4208cb4d64d72dacb1ae3061e3cddaf035798c547bad4a11e14031f538b9529ee68d4a65dd697cde80bd07113990fbf91cdc4e3d082 SHA512 e38e1cf44d093309c85b925f008b07aa7e9f02222d3b3e2b1a8eb4b0a7118fecabb838b9bc2fb7b711d82781fb353708c3c2968da13108fcdba4c22a1e3900e3
+EBUILD vacation-1.2.7.0.ebuild 682 BLAKE2B 8f70beb052b53c6a08ae54561880142df9602d701e2261864c0730a6bc5241156e717d676e2d1616d7fadc8a8ba89a2c7153b4d6996f10647bf0136f6875de95 SHA512 e899fe9360e582e80458a84381033bb5e923991d18c6315cb4e1a767089a9398caa2866ab77123611b5bf7483b54b0472958819d0e610e2b1b17ca8269cb1eef
 MISC metadata.xml 250 BLAKE2B d0daf7c0246f1ceb0d3323e9c0a24dcd85198cbd2a1cee896efc79add248a7ecd4d84a47d82d4681d44adb831285c82aedab58d1ad4aff0337deaf39c8df5de3 SHA512 eb1ce5a9aee93887dfd2e2492529a60e4b95b9dbf2dd1bb49cfa4cc00cc1388fe8c2d7f0c51a9155df1b0f7f04035aca2e3320ead405517e3da2d34914515c1e
diff --git a/net-mail/vacation/vacation-1.2.7.0.ebuild b/net-mail/vacation/vacation-1.2.7.0.ebuild
index 09a54e91cc78..99cd4e75fca9 100644
--- a/net-mail/vacation/vacation-1.2.7.0.ebuild
+++ b/net-mail/vacation/vacation-1.2.7.0.ebuild
@@ -25,10 +25,10 @@ src_prepare() {
 		-e "s:-Xlinker:${LDFLAGS} -Xlinker:" Makefile || die
 }
 
-src_compile () {
+src_compile() {
 	emake CFLAGS="${CFLAGS} -DMAIN"
 }
 
-src_install () {
+src_install() {
 	emake BINDIR="${ED}/usr/bin" MANDIR="${ED}/usr/share/man/man" install
 }
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 6eba9c42bc2a..a5952eaef5e0 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -14,7 +14,8 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r4.ebuild 7633 BLAKE2B 10489cba302f017645c50b5fc1e50455c4a18ac80407e720f804e31a6f72c75ff6ebcc7257e818c617844635fe2252bb97cb30c26d60466e1a66c5215242776c SHA512 a94cee36d0803632634124a56bec6619889725a31b7383d816d1bbfa8bdf3661bf683a522391a34bf7f79249f577c0a120b9be1c2f9490b39b775aa9945460d4
-EBUILD vpopmail-5.4.33-r5.ebuild 7517 BLAKE2B 87f180f0ff4f1f76121cae28ce0d9eba40792e8038a09a7abe9e20a57ff4d7e51d5d9ef38a6f6338f9cd7d9e20147ddcf7a2fff02e2c527c88eaaa1e77b0f9b6 SHA512 daa486928665fbc90e56cf3702d5ba1c18cadbc8341ef624c489ef18eae68fed52a2d307691565e975c0560a85e3abf04160c99642c99f1b6f03e6730be00152
+EBUILD vpopmail-5.4.33-r5.ebuild 7513 BLAKE2B 9e2615d960bfc6d3cc88bdf1417e5825c1273c0b2b9a97d383c140ae1d72c0767cd093b563fbf8cf10036be98f69694652b236cf786ea1862e75c327b0cd05c8 SHA512 cece7550f49d235599875d7ee1d090a8bb5db49d90f4ef6b0aff54010e36ba93b7f9b9ba66c2389f84092c752c6657c2003123293d2af7bcd3eeecb77c0b1c22
+EBUILD vpopmail-5.4.33-r6.ebuild 7522 BLAKE2B fe99e39321e6f8cd240b2f498f4a0f50c5a0bc1e5ab426e4c99e5cc3a84a62f89e2fd09eb1c2802192796ff18c0ba1dcb5d3ba7aa5a98a65ada679ff563827ad SHA512 f0f2d3c9ca81f44c6a6d1000a285621caed73b5d1809f75cd4138346b6e9702cebc765f9c39dd5d52eaebd7b11b37f63aaee22638adaac48bf254d22d5986ef1
+EBUILD vpopmail-5.4.33-r7.ebuild 7541 BLAKE2B d342aa606fe1031a30b7fc7706a9cf9cc0af523e6a46571da5c7328ca711266e082d5e00f7be8b3f8d5157258f8d5ac5cf5e2d01689184bbdcf50c05cc404ca4 SHA512 2f526978a1586a3ab8b6c213b91cda1dd24d89b7386f8264538c406864f7d53e0b4cde7fb568e152118d45cb45f541fb1ac101e68298c12fa009283c41f1931d
 EBUILD vpopmail-5.4.33.ebuild 7678 BLAKE2B 0784b6ac7398d33dd6cb4dfd067d4778568a24ca2a1b71fbc52ff541bcbe5878056c74560270f44f7da7edb7ddb17955a4320d79ebdb92945cfddaa3f68ae372 SHA512 d0e9c724e49dda58c838c98e40da28638b8c7e5063517c03d5f26a5d471427af0795ec32c0f8711e1ae37e0e6a851807640d1081f5e834daedd89d82e4e43365
 MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index 8041e1622084..46dde6bd5e1a 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.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="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
new file mode 100644
index 000000000000..6baa607e05c2
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fixheadtails qmail
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="
+	acct-group/vpopmail
+	acct-user/vpopmail
+	virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( <dev-db/postgresql-9999:=[server] )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	"${FILESDIR}"/${PN}-lazy.patch
+	"${FILESDIR}"/${PN}-vpgsql.patch
+	"${FILESDIR}"/${PN}-double-free.patch
+	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
+	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
+	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
+	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
+	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
+	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
+	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
+)
+DOCS=(
+	ChangeLog
+	doc/.
+)
+HTML_DOCS=(
+	doc_html/.
+	man_html/.
+)
+
+VPOP_HOME="/var/vpopmail"
+
+pkg_setup() {
+	upgradewarning
+}
+
+src_prepare() {
+	default
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am || die
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+		configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	local -a authopts
+	if use mysql; then
+		incdir=$(mysql_config --variable=pkgincludedir || die)
+		libdir=$(mysql_config --variable=pkglibdir || die)
+		authopts+=( "--enable-auth-module=mysql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+			"--disable-mysql-replication"
+			"--enable-mysql-limits"
+		)
+	elif use postgres; then
+		libdir=$(pg_config --libdir || die)
+		incdir=$(pg_config --pkgincludedir || die)
+		authopts+=( "--enable-auth-module=pgsql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+		)
+	else
+		authopts+=( "--enable-auth-module=cdb" )
+	fi
+
+	econf ${authopts[@]} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	mv doc/doc_html/ doc/man_html/ . || die
+	einstalldocs
+	rm -r "${D}/${VPOP_HOME}"/doc || die
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		insinto /etc
+		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
+		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
+
+	einfo "Installing env.d entry"
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf || die
+		chown root:vpopmail /etc/vpopmail.conf || die
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
+		ewarn
+		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+		ewarn "The internal structure of the mail storage has changed for"
+		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+		ewarn "to upgrade your system! (It can do conversions both ways)."
+		ewarn "You should be able to run it right away without any changes."
+		ewarn
+	fi
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		if has_version "<=net-mail/vpopmail-5.4.17"; then
+			elog
+			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+			elog "MySQL tables, please see the UPGRADE file in the documentation!"
+			elog
+		fi
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index 6e9edf574f83..ceca711c4a4f 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils fixheadtails qmail
+inherit autotools fixheadtails qmail
 
 HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
 DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
@@ -21,7 +21,7 @@ DEPEND="
 	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:=[server] )
+	postgres? ( dev-db/postgresql:= )
 	spamassassin? ( mail-filter/spamassassin )"
 RDEPEND="${DEPEND}"
 
@@ -37,6 +37,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
 	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
 	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
+	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
+	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
 )
 DOCS=(
 	ChangeLog
@@ -57,7 +59,7 @@ src_prepare() {
 	default
 
 	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am
+		>>"${S}"/Makefile.am || die
 
 	# fix maildir paths
 	sed -i -e 's|Maildir|.maildir|g' \
@@ -70,7 +72,7 @@ src_prepare() {
 		vdelivermail.c vpopbull.c vqmaillocal.c || die
 
 	# automake/autoconf
-	mv -f "${S}"/configure.{in,ac} || die
+	mv "${S}"/configure.{in,ac} || die
 	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
 		configure.ac || die
 
@@ -84,30 +86,32 @@ src_prepare() {
 }
 
 src_configure() {
-	local authopts
+	local -a authopts
 	if use mysql; then
 		incdir=$(mysql_config --variable=pkgincludedir || die)
 		libdir=$(mysql_config --variable=pkglibdir || die)
-		authopts+=" --enable-auth-module=mysql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-		authopts+=" --disable-mysql-replication"
-		authopts+=" --enable-mysql-limits"
+		authopts+=( "--enable-auth-module=mysql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+			"--disable-mysql-replication"
+			"--enable-mysql-limits"
+		)
 	elif use postgres; then
 		libdir=$(pg_config --libdir || die)
 		incdir=$(pg_config --pkgincludedir || die)
-		authopts+=" --enable-auth-module=pgsql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
+		authopts+=( "--enable-auth-module=pgsql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+		)
 	else
-		authopts+=" --enable-auth-module=cdb"
+		authopts+=( "--enable-auth-module=cdb" )
 	fi
 
-	econf ${authopts} \
+	econf ${authopts[@]} \
 		--sysconfdir=${VPOP_HOME}/etc \
 		--enable-non-root-build \
 		--enable-qmaildir=${QMAIL_HOME} \
@@ -124,6 +128,7 @@ src_configure() {
 		--enable-auth-logging \
 		--enable-log-name=vpopmail \
 		--enable-qmail-ext \
+		--enable-onchange-script \
 		--disable-tcpserver-file \
 		--disable-roaming-users \
 		$(use_enable ipalias ip-alias-domains) \
@@ -145,23 +150,18 @@ src_install() {
 	mv doc/doc_html/ doc/man_html/ . || die
 	einstalldocs
 	rm -r "${D}/${VPOP_HOME}"/doc || die
-	dosym \
-		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/ || die) \
-		"${VPOP_HOME}"/doc
 
 	# create /etc/vpopmail.conf
 	if use mysql; then
 		insinto /etc
 		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
-		dosym \
-			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf || die) \
-			"${VPOP_HOME}"/etc/vpopmail.mysql
+		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
 
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf || die
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
 
 		# lock down perms
 		fperms 640 /etc/vpopmail.conf
@@ -170,11 +170,10 @@ src_install() {
 
 	insinto "${VPOP_HOME}"/etc
 	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
 	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
 
 	einfo "Installing env.d entry"
-	dodir /etc/env.d
 	doenvd "${FILESDIR}"/99vpopmail
 
 	einfo "Locking down vpopmail permissions"
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index f91c30918315..5a532a5d1342 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 291 BLAKE2B 2d02039a95ecf734d6dd284fcd65911c9f38db8a2165d1bd4289a9927a3a3c847a99991c1301a5d6d9d485ccd06794dddf73f57dabee47dcb3ed01ff9a0f7f72 SHA512 27c4b4314b29547e3a485340086186c31d0d5ede249631738227ffdecd64c500baf7c3ee6852b02e18176376f0717c35ad3445b5a2bc684e82772eca27be2786
 DIST vqadmin-2.3.7.tar.gz 153678 BLAKE2B 3906c449d89e2747d10b9a4afdce14da7b41fdaca760d41b0374bfdd6a8dd2f756597b4bbdabb4d03b89806936e1550f069b7675dd2ef7486f235e497191bf94 SHA512 c427dc4b1e30926b0d3774bd0d296bf78a98037c566a82fa790f7a25d1fac64a80172498fd6342e93514108e42fdec0ebf1a76029546e43100ebcae5b845ef88
-EBUILD vqadmin-2.3.7.ebuild 1284 BLAKE2B f2571d4917460b4cd228f2e017e3be490c95c31d16fcf37ea6f84e04c54e014359c1e9cb9697c70cced17a45f98004ba96f6aa3a0c4fe621e0345ddabc79dde4 SHA512 aa6c5d2549605c30ad235fba49cac03069a95895d540aef11386510fbc70bd77dc4c40cc2880a0bd3d77b966b3028fe0862fb9fb07c72464a9ba441f7f045485
+EBUILD vqadmin-2.3.7.ebuild 1283 BLAKE2B ff524234541acfd0a556512b075dfa90075002ada24ae36e91ef786f4d7875e813a438a054e82f199b2de1c5135900ecf55a54e4bc63f9fab058cc8984067268 SHA512 fbf17af20d0e77d6197f2245148a78bab01eb0722b7e43d6bd1be9ca01ce1fd42be07a6db0beb1daaaaf2514a314467362b67db9e553e8e85879007d1020d362
 MISC metadata.xml 357 BLAKE2B f681f656d61cbf1c78616f26f8746b29a5f76234344fc9b79e29b5f83c91829385751301bcde12dbb12e16e476ecc69e28ef4144c531829bc4432ca8e41fd667 SHA512 82473567cbefa523ec0fcee697d7b5d30b184dedc7a73fa6e49a7958a3355ba22118d572908c3ceffecf821b234053310e56e5f2b4f6e7fd66c9a23248974791
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
index 50516805cf56..3acb964ec3b8 100644
--- a/net-mail/vqadmin/vqadmin-2.3.7.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.7.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
@@ -40,7 +40,7 @@ src_configure() {
 		--enable-cgibindir="${MY_CGIBINDIR}"
 }
 
-src_install () {
+src_install() {
 	webapp_src_preinst
 
 	insinto /usr/share/${PN}