gentoo resync : 05.04.2019

31 files changed, 830 insertions, 64 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index d29d45f6fa93..5a844a0f6746 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index e9da0d0d24c0..77550f995adc 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -10,5 +10,5 @@ EBUILD courier-0.75.0-r1.ebuild 9430 BLAKE2B 7bb9c5b9fe5a8f50ec6c17a9c4b99e2e07a
 EBUILD courier-0.75.0.ebuild 9325 BLAKE2B 7103206f2ba73b4acc5097ab7e14595013c051042f64ec42b4a3c2b3430d7830638cef2386c38495fafbd8eb2002396b853a1eb43548fce6460541f3b8724823 SHA512 71aa350b36bb024805fd56adcb56b30a100d5cf0ce5da1bf14027dd51d8abf4d933a6153064e0f688b80019771e427d689d59bdc1e5839f600013c9fb8f5af18
 EBUILD courier-0.76.4.ebuild 9327 BLAKE2B 6daccaf5e311202f157887017b63e5e890595ed73a0c52cd87e1ddcf0b3d31666c4bbd443116868efe9b555661b94da8c575d1cb21dabf6c3fe64248f2488ec3 SHA512 91a9cf8f9f2953b97793e6c1fe3db0e3e0eeb81692a8604eef46736b58584235bff3194db8d4de2d062e4d90a267c2e578623f8a2c4e710b7092273096672a90
 EBUILD courier-0.78.2.ebuild 9326 BLAKE2B 67554fcb0129810772ff951205ea84f640fb24da44a2b65f87535b14069e58868f7c7c55e77f6533a5530710954eb4c3d8d5545191f190c13ca95b4f95da6628 SHA512 e4993a1480d23f2b75400626d9f5ba0ef5f212ed44181383ced92c3648ed99efe59d684128c55296240c80f85ff42d7161412856f7eea2754f319078278fcf0f
-EBUILD courier-1.0.5.ebuild 9568 BLAKE2B 6c6352a8ae5da1e371717b629e1ea7fef38b1542e1607ef7907b76f4337f145ef619582e61507a5d7b954dae4a08934f54aa66b347d1748c1dc485e0418ce182 SHA512 0c9b403af1f931e6dcf1d41a24951d01b43fc5f24ca98e01fce87f265e473a93282081e7062737e5479eebdcae38dda7cb0c67c7969d60f5f5591a2988027418
-MISC metadata.xml 860 BLAKE2B 7d4e6eed638b9c07079d56a5c195a27d77ede8f9be9400b2f7158214f6d065c836422ef64110e3ff580be7c1936ef6c470f4ed6ca7cbe6e2744487fd6bb637a2 SHA512 00c4c31649f17ac2fba94122762bcd4c2f9b57ad3117645c1f0607d6d214ecd6c9c789a7b2d48b1945472e38da49257ea2903b1abec3294cfecbc25ff4501c7e
+EBUILD courier-1.0.5.ebuild 9567 BLAKE2B 6b482278681225739557aba5080ececca263017e077592e3e4dfee9cec563078642132fc2950a219c16be6004fb6055a8ec4da3f74a2ba5c59659715c1376e3d SHA512 372b07ad49073ec8b5feb5ee08b5a58a713090dce71b7acbba8a650ada63ee4bda0d9d2a59f089f034266ff0ca709a84724dda70b685709caf4b8ab3d67c57fc
+MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index 14d7763dcf49..66a941947aa6 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
 REQUIRED_USE="?? ( gnutls libressl )"
diff --git a/mail-mta/courier/metadata.xml b/mail-mta/courier/metadata.xml
index 97214a9aee27..75242c9ef05d 100644
--- a/mail-mta/courier/metadata.xml
+++ b/mail-mta/courier/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
 	<longdescription>
 		Complete email package consisting of pop, imap, smtp, and fax
 		server and secure version of the above also.
diff --git a/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index 7043add35320..a2337bf05578 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -1,4 +1,4 @@
 DIST esmtp-1.2.tar.bz2 127921 BLAKE2B 09823dace39d3fa7d525b85e33e6e64497ef81a6e2b4b1f3682e0576511b845c7cdf50602d6b1acd6d777ca34581d3727a337ff8cb7e737f278983c06fc8773c SHA512 a1e7b56743ba32b1778bf02d0abcbdb5e6e3cb7d592c3a23a575789de60dfd62a307d4aef06860c9553cc492cdde0fff0a42de53e9d4e972587a10f609be4821
 EBUILD esmtp-1.2-r1.ebuild 957 BLAKE2B 645d07c7754b9d8d8e38b25cb73248deed84d8acb05be3bdc9c7b5a1f8f04ac320df7109d25f8745e1e57a33ed944c2b149006cd04620f80d258b651f748f8b7 SHA512 8f50a3516913e2a02535673490b105d9025d53c3b65dd8be25635d9485d0822a62f3d034ba6a71d02474c12750a2d12cccfc7bf1a8b41fe28f401b06ea11d553
 EBUILD esmtp-1.2.ebuild 945 BLAKE2B 71b5c373d09181fb49be459ba3c4fd156a792acf64aad62dc6e49c15229a40917ea4d77ee519066d13edb199be59b72acac1e44e14b3d0e226b31569bc2abe35 SHA512 fdfe550797f7381f2b76c382cf5f67c8b5e41402162772f1153cf44eaf08486f0dbe2ccbf668026e6bb692fd6752533f78dc3d559d1ce1ac9af17f3654b0ce48
-MISC metadata.xml 319 BLAKE2B c1943ce1aba19457da6687d06f1fba5b09da67458e64f0e0b743c1e42621ed78a2f84592da7e126826957108ac5f6053eaff4482f762c077f92428b66775f7c9 SHA512 e4d66ee7dbffe75806e0c558e8ccdb27775477051c56e813a9e1d494c971909bd6797e6e0e9986150c15f9ddf51c06cb73da4798f125ba57ea8ece83ecc5961c
+MISC metadata.xml 242 BLAKE2B 041399005c131e6e66967025968669f0ddb0972aa213f52e81852518a0005b7c478debfb6bc182443bb6a35066ebd6d3049c99d7b8e4a6272fd95960504e4d74 SHA512 8d906d3c3f37a584908f69913417a2c54ef0cde2709d7f2f88d25b932bfa18f98014a34f83d9ebd73f0508e324747ee48f412d909a0423892069fa9f03b78f37
diff --git a/mail-mta/esmtp/metadata.xml b/mail-mta/esmtp/metadata.xml
index 94a817aff74e..77af2ad8a6fa 100644
--- a/mail-mta/esmtp/metadata.xml
+++ b/mail-mta/esmtp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">esmtp</remote-id>
 	</upstream>
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 9a9f40c0bc29..0902b4639f5a 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -24,4 +24,4 @@ DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B d5966a27f980a2ceb31293d92049a6691a0826
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.91-r2.ebuild 13173 BLAKE2B f7ee40c7dbab94fd499c9fae38e385b2a937805ec340ec511c57d0e00e74f5075b0ced2ed35700af35e40702042612127155360b42529f5377eaee09da7c8fdb SHA512 5bc34da80791d5f5a482f31bdb425299a0201fc6e0d13076c63e92be678569bedab1356618662d7b463e96810b8d34de6462243eecc7c637d43bf7a5f1b0b7a3
 EBUILD exim-4.92.ebuild 13182 BLAKE2B 947890c468fee3f63aa65880eb6f0198b65aec14f118ad37274ad8c2e1eecca1bbaa0ff41744e60e904e4439740e7cb15ee120315b2c92b88420c09bfdbf9992 SHA512 e7f63ed0e99bd7780404ce6c6ef1ff6485449d602851196b7910ff8f07c17fcbc1dd7945075b33140cbe58a179f9227c18f116da164c8777a3bc7fd54d064021
-MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
+MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index 33a92fa00dac..62051142d87b 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>grobian@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
 	<longdescription>
 		Exim is a message transfer agent (MTA) developed at the University of
 		Cambridge for use on Unix systems connected to the Internet. It is
diff --git a/mail-mta/mini-qmail/Manifest b/mail-mta/mini-qmail/Manifest
index 75cc7e3f399c..6828c661e4f2 100644
--- a/mail-mta/mini-qmail/Manifest
+++ b/mail-mta/mini-qmail/Manifest
@@ -3,4 +3,4 @@ AUX config-mini 961 BLAKE2B b6f89f19aa5a12b8d1dcc3df2db5409d59c892b06f58a6cc6406
 DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
 DIST netqmail-1.06.tar.gz 260941 BLAKE2B f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a SHA512 de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
 EBUILD mini-qmail-1.06.ebuild 1344 BLAKE2B ac0232cc63216e224d26c453f979e699095f6210175176ee08f9d62166ec61c8e5ee162e55234ec85abead17a15560cc165f7bc92b91a0a58a20a8035b124806 SHA512 33bd6dccfb30fe2b7093f65f31324f1cb60219594579645236b7b753f6a6a8775e7c16a20caa684d31a1ad0cad8341c05ab0571b7f789fab25c73c82b9b410f4
-MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/mini-qmail/metadata.xml b/mail-mta/mini-qmail/metadata.xml
index 1c3bc7b3fcef..7a38bb900964 100644
--- a/mail-mta/mini-qmail/metadata.xml
+++ b/mail-mta/mini-qmail/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index d6f14bd0fb27..b1a71a6d4272 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -7,5 +7,5 @@ DIST msmtp-1.8.3.tar.xz 336120 BLAKE2B 4c58dc82e01135bc84176c25c65812414901f134a
 EBUILD msmtp-1.6.6-r1.ebuild 2973 BLAKE2B a2de4fd365a0ec85eab8334bf7c7087d57d91219c82921dd2adbb99b8985475dc50943ae95669f0a788cac0f9bb980b2b62faa96d28b2e1e16a91f4be8544420 SHA512 4ff1b8c2dd5d385a8915d0e1d8d1c6568cc98dde74a02aa83dd20c89c65ef1ceacfc544e6a488ac519b16582675a773dfb13fe7c6bed6f269e37dab7fc6abbd6
 EBUILD msmtp-1.6.8-r2.ebuild 2999 BLAKE2B f1d854c4a48b6f6bcb226c6e281413f0dc72132c8948f1a6cc64dcbc6f0e2640ba27f6141ef1011666ca43ca44389de729420524669c77437d1cdd73ffaef624 SHA512 91c41e3c8f3847e8cfd3687044a5ddb7d5faac89f96b5cca0488bc24f6470033b406449304df4e6ebf7ec954fbb6f3c9fa55d8e77a92fcfd79ab532b23d31735
 EBUILD msmtp-1.8.1-r1.ebuild 3395 BLAKE2B b786a7d3477fce4658fd2f8e9709cf073cc015a0860c418563b9636b91c2563861b0ee43f6cf87efc4158a6836e13f4b186eafc82a0a07284cefcf76b576b800 SHA512 e6f3d57e499819b687200013090ee96351e50febf55370be080d0777a482c727fd583fcb59edb824b9f46a0a907bd42af501ac856cc6d8684df0f1c5a76f619b
-EBUILD msmtp-1.8.3.ebuild 3395 BLAKE2B b786a7d3477fce4658fd2f8e9709cf073cc015a0860c418563b9636b91c2563861b0ee43f6cf87efc4158a6836e13f4b186eafc82a0a07284cefcf76b576b800 SHA512 e6f3d57e499819b687200013090ee96351e50febf55370be080d0777a482c727fd583fcb59edb824b9f46a0a907bd42af501ac856cc6d8684df0f1c5a76f619b
-MISC metadata.xml 463 BLAKE2B 111797850e3ea08adfbe2affc11aa24050e85e8d8ad516c4181fe7f74b43d7c2429c4bf1e7f389b7b1a050317ab2e351a80d5b3205ebe2e85424359a514fb9dd SHA512 c9bc80afca5b0783a37f1654f9535c420cf19543c3e74dfe42627e2fed9d28b5c2b35542859806607d36d1ff85411d7bdf4f67d46f8a779892cba22cd11ef5cb
+EBUILD msmtp-1.8.3.ebuild 3391 BLAKE2B f9f3d9f72461f9c59ab024d4d44e9c92aa37eb3b5ee80f6f98fb97472b96e32e353f6a973ca60b09de598c355fda7ac3a8494dca3124006531094918c973f8e5 SHA512 e6e5f56a6bf9b97767fd4a72c528807eb1928b134339b1bc4750b9e1be3c47cdd8d896fdae895fafcd69ed5c7d948695da3ff48f3a8350df84adcf70c6058c05
+MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml
index 472d3fa70d20..c45a974ebdfb 100644
--- a/mail-mta/msmtp/metadata.xml
+++ b/mail-mta/msmtp/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
 	</maintainer>
 	<use>
 		<flag name="daemon">Build/install msmtpd MTA daemon</flag>
diff --git a/mail-mta/msmtp/msmtp-1.8.3.ebuild b/mail-mta/msmtp/msmtp-1.8.3.ebuild
index 94bbeb282bd5..3b2ab6ac2f1d 100644
--- a/mail-mta/msmtp/msmtp-1.8.3.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 58ce89091295..7c250abd46be 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -18,4 +18,4 @@ EBUILD netqmail-1.06-r3.ebuild 4027 BLAKE2B dad4bdfce69b861637be5506b9d200918093
 EBUILD netqmail-1.06-r4.ebuild 4170 BLAKE2B 88d8467144b059b8e0b107ba5b12da1cb9317c6935a0b67f0edce9a2260a3192542435c8a7e9d85b60ac41548744040a051783f07a0c669d53edda9864351e98 SHA512 be362585dc8d28650be5204d29c27c40b25afb9a3cb5857df1c91b2b3450f7e623c0bd3aa739fada3113ae3a61a35b31f4f7ddf9477d9f56389541eb97875b20
 EBUILD netqmail-1.06-r5.ebuild 4308 BLAKE2B 745b2fe2507c845a376c03c85915a4a443ef21371f5e26339d3eec67ba3889ae8e603e9e9df01f2a6bfa0686f1069fd0e8acd24872e76813053c38f47251cc94 SHA512 929ebe1e12aa1d2acea7bf9136daa70008f701b7d3203a8157ca879380861e9d901991dafe740d2229635aa07cbc50fb0526a2318fa1bf26ffa559f5bae913e4
 EBUILD netqmail-1.06.ebuild 3297 BLAKE2B c6a5507c86bd219f4725044c4d2dbd717718d3db9db369d61c17b023d4d86da14648775c6d6d56b974fd611642ff7a19bb3b3d2558e0a15d6856765c2f2df8b9 SHA512 ae0d6e2ad2ff1f53c054d1f585990f4e4c00ee1ca0ff249ed5644d6fd84e9f1032ed18dafcee6ea843e336cb58c39c569bd210ccd7ee700b93bd386025e1a25b
-MISC metadata.xml 555 BLAKE2B 5f151e2b07d6c26b0d4445bb0577af01374934d94cdccc099e18730736f8d05829e287ad63b5cbd249e9e29d2fa99b50dd5c2100001e3369a5ef0b8963ba130e SHA512 dec725506e819558500bc86ce215370a6576bfe47baae06da3e12315fbd0395d2d8237d85e41996d6e5b11878bfe7ed2e1bbeb81061351b3bb9729749f702eba
+MISC metadata.xml 478 BLAKE2B d947af2777a19a9c422bf722a2755c00302885909dfcf3877624c3c3baf2f5bc13befdbd8865a9de246e3ea3ab446a0bb42d5f26febb5bc585393e66b76d214e SHA512 13a8e6e9fb1bb277d98625b6e87d03aea279802263806476ebb8057248e787eb6abbca5fc9b5f4855750f47b8281adefadc87fec7ef61cb2a1e74b0d8a0f346e
diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 7a28acdda64f..3bed043ffa57 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="authcram">Enable AUTHCRAM support</flag>
 		<flag name="gencertdaily">Generate SSL certificates daily instead of
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index f8f3107e0516..bae4fe9fefbf 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -7,9 +7,11 @@ AUX remotes.sample-1.13 969 BLAKE2B f973a3866a31b5d6bf1ac227340df4484b570039c723
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
 DIST nullmailer-1.13.tar.gz 205431 BLAKE2B e1eaa94262e3d4d202293d35f7ac610a3a2cb92e403b2fd8dff467788a4f4c0d3a1bbc27b47eeae9d1c493eb8d07c35e056ea7501ad92ec4addae694997561b4 SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7
 DIST nullmailer-2.0.tar.gz 249538 BLAKE2B 2340fd0b3e67be0061aedb2a1dc0466c88e1253691c955e960244f2ce330af6798bd43f21908a9f12ce9572489dd5c48288e65ae688cd73a8afedd4f7bb6a49e SHA512 2a7c914c5effcf796f987256ac68836f0ba875cc7f2da1aeb8f23767e15a556da168b8da5cc52d9f800986883bbdbcd49a9610ae220f463164a906c1d82fbce6
+DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
 DIST nullmailer-patches-1.13.tar.xz 8384 BLAKE2B 523547f8abf9b5d05938aad1e22e4195ee49cfe392c515df442a26d2cfb79f959c37e8f860fb196e99075aaa6fe437aaec182e1c1e2057d97cc32cba78a200d0 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c
 EBUILD nullmailer-1.13-r5.ebuild 4737 BLAKE2B 38fc205db2a05cabd46966d5ce3068e300564f7f96c4062ccb32bf148f4d935a540f81ec69bec79c92031b628a88066f6be8841935a831f20d8c343f1ac3dbce SHA512 e675c290a7d7033afd3cd2f32bac2dc24d87fba0f8deae0ed8ad424930c394c7de0c7ad2a3f5b57a016f071265659ce96c5e7924ab4e5b605a1b86da8d4e611a
 EBUILD nullmailer-2.0-r1.ebuild 3641 BLAKE2B 0f856d777485527c4b04ad21077c3646bb2106b69050100e20c663bf895ba1846759a423f23928fec9711ccd7595b8c74183e1d0e6eb51f1f82abc192b5f956d SHA512 bd858bf7830066e10c2ef859d8489a0ab124cb7873e327b14d011d286ab5cae94f4e80d86e64dfd13f1204580e6a57bf0495387f6dd361082a874db655bb69f6
 EBUILD nullmailer-2.0-r2.ebuild 3709 BLAKE2B 41275b774fa0bc2ee9ff1445eda2837b5f4c40cec834d96fc1f26b97d107cde93bef981d5214af5f0f7d3ce58c51c28ca69c2a86b0b4c195f736d7d16c5c842f SHA512 49a5f12cb2810f1d21dbd0cad4d92995a06a32b9e15ab1a341cad12f3afa924a2a47416d8bcf65df3f535b93343c35841386652b315a3ac4d73ab2d427c2ce16
 EBUILD nullmailer-2.0.ebuild 3644 BLAKE2B 0f498b234679f0690a9644d755a9c1cbcbb2cc2c0288b361bea7977644a993ecf61337ca4c1997c9d221f823fd9ddbc70ffaf5b315c99e8aa99041d7c1b845d2 SHA512 5ac17ea2d17a2967399bdfc87b749d1b152741191b801f6e4fec4a1f6ad1977a2cea9dbabf19a8f62e17a7a32c9d90271fbaa93cd68532a8e6ae41ba126af903
-MISC metadata.xml 453 BLAKE2B f84aa721f7600dc6a0163a961bf8bbd21ef8b2ec4fc3ac49c6999eeeabff6e2dc504847e28d45cfcdd3f0d018167354f68e58d3e41f8ec5a856cdb86d3540656 SHA512 4e2a68ce12e2297f2853cc378d307771fe930ab8d6178c277504ccb308aa8c680822c90218ea43a6ce953b87b314faf4f51b1897aade664b6ec0915906227ea3
+EBUILD nullmailer-2.2.ebuild 4091 BLAKE2B 58882188fdcb537b8c3937798cb2db5c6629d0a13681f2f99402481a7af1f2a5097f6877f590a4a637c3e22cab32229f78f882be565f8d59f06cdeadc589c999 SHA512 01e9258a7ad63a0abab3bbe342f8282a05da8486826520462efc6f7e48c1a1ae75f33b798572d555d6b1e4efd2e8c600e42009ecee0f498c0a56bc49024779f8
+MISC metadata.xml 462 BLAKE2B 6bb4c3b64b2a26224d66df58a133e26bec2c8db7069f5f94b131c4b09387d707a8d5170f0581c9c5136e79af4b97b5f5c3ca4a649171497957ef4aef4312a2cd SHA512 d1370220b0d410947a347c71c9dca8070b3c4a28a82742f618f605be86099ffd37dce1a7d6ab706248eae290aaaf8de2df57c5b3c8f8e818464b9eb5d26d7719
diff --git a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml
index 43c9702a40b8..110d077c53d1 100644
--- a/mail-mta/nullmailer/metadata.xml
+++ b/mail-mta/nullmailer/metadata.xml
@@ -1,13 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
+  <maintainer type="person">
+    <email>haubi@gentoo.org</email>
+    <name>Michael Haubenwallner</name>
   </maintainer>
   <upstream>
     <remote-id type="github">bruceg/nullmailer</remote-id>
diff --git a/mail-mta/nullmailer/nullmailer-2.2.ebuild b/mail-mta/nullmailer/nullmailer-2.2.ebuild
new file mode 100644
index 000000000000..178c1507ac2b
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-2.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic multilib systemd user
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer"
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-cygwin"
+IUSE="ssl test"
+
+DEPEND="
+	ssl? ( net-libs/gnutls:0= )
+	test? ( sys-apps/ucspi-tcp[ipv6] sys-process/daemontools )
+"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls:0= )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta(+)]
+	!mail-mta/netqmail
+	!mail-mta/opensmtpd[mta(+)]
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta(+)]
+"
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
+}
+
+src_prepare() {
+	default
+	sed -i.orig \
+		-e '/\$(localstatedir)\/trigger/d' \
+		"${S}"/Makefile.am || die
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.ac || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	sed \
+		-e "s#/usr/local#/usr#" \
+		-e 's:/usr/etc/:/etc/:g' \
+		-i doc/nullmailer-send.8 || die
+	eautoreconf
+}
+
+src_configure() {
+	# https://github.com/bruceg/nullmailer/pull/31/commits
+	append-lfs-flags #471102
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable ssl tls)
+}
+
+src_install() {
+	default
+
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-2.0 remotes
+
+	# This contains passwords, so should be secure
+	fperms 0640 /etc/nullmailer/remotes
+	fowners root:nullmail /etc/nullmailer/remotes
+
+	# daemontools stuff
+	dodir /var/spool/nullmailer/service{,/log}
+
+	insinto /var/spool/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/spool/nullmailer/service/run
+
+	insinto /var/spool/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/spool/nullmailer/service/log/run
+
+	# usability
+	dosym ../sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue,failed}
+	fperms 770 /var/log/nullmailer
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r6 nullmailer
+	systemd_dounit scripts/${PN}.service
+}
+
+pkg_postinst() {
+	if [[ ! -e ${EROOT}/var/spool/nullmailer/trigger ]]; then
+		mkfifo --mode=0660 "${EROOT}/var/spool/nullmailer/trigger" || die
+	fi
+	chown nullmail:nullmail \
+		"${EROOT}"/var/log/nullmailer \
+		"${EROOT}"/var/spool/nullmailer/{tmp,queue,failed,trigger} || die
+	chmod 770 \
+		"${EROOT}"/var/log/nullmailer \
+		"${EROOT}"/var/spool/nullmailer/{tmp,queue,failed} || die
+	chmod 660 "${EROOT}"/var/spool/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${EROOT}"/etc/nullmailer/remotes || die
+	chown root:nullmail "${EROOT}"/etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -e ${EROOT}/var/spool/nullmailer/trigger ]]; then
+		rm "${EROOT}/var/spool/nullmailer/trigger" || die
+	fi
+}
+
+pkg_config() {
+	if [[ ! -s ${EROOT}/etc/nullmailer/me ]]; then
+		einfo "Setting /etc/nullmailer/me"
+		hostname --fqdn > "${EROOT}/etc/nullmailer/me"
+		if [[ ! -s ${EROOT}/etc/nullmailer/me ]]; then
+			eerror "Got no output from 'hostname --fqdn'"
+		fi
+	fi
+	if [[ ! -s ${EROOT}/etc/nullmailer/defaultdomain ]]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		hostname --domain > "${EROOT}/etc/nullmailer/defaultdomain"
+		if [[ ! -s ${EROOT}/etc/nullmailer/me ]]; then
+			eerror "Got no output from 'hostname --domain'"
+		fi
+	fi
+	if ! grep -q '^[ \t]*[^# \t]' "${EROOT}/etc/nullmailer/remotes"; then
+		ewarn "Remember to tweak ${EROOT}/etc/nullmailer/remotes yourself!"
+	fi
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index da8307737492..a0be4cdd92eb 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -12,15 +12,19 @@ DIST postfix-2.10.9.tar.gz 3820525 BLAKE2B ed1fc10f016cdc63fe2b86c68cca270c98348
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
 DIST postfix-3.3.3.tar.gz 4429713 BLAKE2B 0699d9bdc0f3a5267f9cbe5dc3b6ddc2e83d1b984b07638913c8ba419a0c71135ccae6f434aa2c60f69ffe60356b7a7652a6d83c176b119cd2f9ab8374a32283 SHA512 9d04d48b5393c49c00ca62f0a24e21c9642f2b645431b66b532a559ad1b4d35c7581fec8bd1bb1a2d7b31b812b1cea3b29e0a0cbd6576bd377b2c810d27b7ec3
+DIST postfix-3.3.4.tar.gz 4429964 BLAKE2B 58812a75e7f8e2e89dce3dd8cb8b779c4b90995ce9d1885cec0fc475c8dc267741ea6c7af6e82fc80e3f71244964df9a5fe776c3b09e5e0cad1f59424dfab6b3 SHA512 fccc524167ea3b85f4fe0fc4ad8312f6d684c1900e7c5c355d4522513f74b588bbfcfd28074a8b69ce038982fcaa359abf585a296df4046184c7da6d0405d0ee
 DIST postfix-3.4.3.tar.gz 4581033 BLAKE2B b77aaf512a9987bd23d7a0cf4ae173fbc6d89721fde52521b2c20deb6d2c47a23ef55cd28404cb684c3057817e3f1f1b70c34ff8e4b2c0a8b889938ae74046db SHA512 8832f6701dd7b48439f888a332b492695caaadb04834bc54101a5f8b790e76cd5e6f6654732bfd651bdbd5793049b0e181d3ea31185d071681c8c855da5256a1
 DIST postfix-3.4.4.tar.gz 4581121 BLAKE2B a891b080737e39695a92fd92928cccdd093ba32a13a33c38e810d467e65f68cbe5a2d8d6423b85fbe2f749fef14b6d242988185d89031ed491b5dcd3ed535d38 SHA512 e8398486a41f79da3716024104c178083c80eba7e3eec7669f9dd986914637174423c0328bcc79393b2d21edae72304ca4a89d53083f21598657593d05a05d64
-DIST postfix-3.5-20190312.tar.gz 4571238 BLAKE2B 0056d18935cfe56c869e501d04b1cccd6a80ff82647e5308e420a7a252cd713ddc43e37765b69a65040dd91ba3937618d684a06b0f0e3a44627d2aec9d56348c SHA512 aff124a317e3a61c8c6ddbb749458895f9ed48cd86533ec53d2cc85f76bebb3e532407ac20cc3d5a58befab6f2564abdbe45bfc219c50c8d042ba81459970093
+DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94
+DIST postfix-3.5-20190330.tar.gz 4596058 BLAKE2B 0710881919361e6307902f287fb10fd26d27e2e51293b4a297191cd69687477e9e5e3e7bbe1c15ec2e440629eef78574705eda8fbf3e0b7f7440bcfe5ef33366 SHA512 d6e8e7bbc1a47aaa86105c3281c00ed3806e29cb33a27f062a25b92bbb557e8d022f873fb77be65dcf7c8c10c73ed91c61625641649d99a45dbf77c01eac3f85
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8728 BLAKE2B 6170156f1dded2c727b6e2979e45d9d8e6ad77ef456e4e7da8491b03cfabe7fda627f77dc6090ca7285891619f77c5d3546c45536b25356641f5fa37c23f27d4 SHA512 e59ed518a63a41937e1ff8e68fe811bb13abbefbb6c0ff8ab7655434e8f297a18e7da0adb61442f46e8cee87dcd680909be148f1d5f1f75525f2080819eaa75e
 EBUILD postfix-3.2.4.ebuild 8656 BLAKE2B 7c22ee0de6b4a85784f0b35144fc68b45581fe2a276203cd0c409eeb255c0d9661aff4b236223e8193083678a0d7f1e8953b9b0bcc2d860a39ff73410fc2ee92 SHA512 de2c2a2be293bce34e5714fc7b875cc1cad31cb3076ca7661bded16d1a6ff6ca47f793278929d67b05b9e5a61dd15dcd7acb490ab629aac6c63987e92785c70b
 EBUILD postfix-3.3.1-r1.ebuild 8406 BLAKE2B 0242059df542da99a0cf2c4d5e4e54da5cd2b714b0f3d826179d827d13d3d548c59aa7e9ae0a0ff0c9eed864553fcbda1c460d4b6f8f9fe68e135facd028ab5e SHA512 dd62306944ffc38a7fc3e8cd1020638176ea66ba3c80acbd0528ca87c332a34045e1480cb3866a7865a009c834056979188566cf9c93339fc38a463b542b5faf
 EBUILD postfix-3.3.3.ebuild 8773 BLAKE2B b2c44e759c9776ae2dcba5f39f6f792d7ed51a5761c8f6997e61c633460f39c22a5804895d47bf1d37b04ebc464d82f91ff763937942c6dc973adca24e1802b6 SHA512 cb8a5d0b2976c9f45f400e7b0930d8c96c02e077096ad9d8488cfde6a0a16c35642a0ffc03fed072ab25ff5931d8353a468e7b2a67f877e56786157d63ce8542
+EBUILD postfix-3.3.4.ebuild 8773 BLAKE2B b2c44e759c9776ae2dcba5f39f6f792d7ed51a5761c8f6997e61c633460f39c22a5804895d47bf1d37b04ebc464d82f91ff763937942c6dc973adca24e1802b6 SHA512 cb8a5d0b2976c9f45f400e7b0930d8c96c02e077096ad9d8488cfde6a0a16c35642a0ffc03fed072ab25ff5931d8353a468e7b2a67f877e56786157d63ce8542
 EBUILD postfix-3.4.3.ebuild 9226 BLAKE2B 050b4e4adf5fd36e1c5a08e5f1d2fe552e6552168b007bc65b61db7cbee5f7e177f2ca61833cf08cb6fc64873809c556695db0868040c4c47cb06201906924ef SHA512 f89b281fb6cbcdf4293ad66cc6f99a60ddb9e92d1f3d15c581e3a5a6222d0cbec2c8a8bceb1264c3d941964340834b7577b7cc9992f521c2331292ed099674ff
 EBUILD postfix-3.4.4.ebuild 9226 BLAKE2B 050b4e4adf5fd36e1c5a08e5f1d2fe552e6552168b007bc65b61db7cbee5f7e177f2ca61833cf08cb6fc64873809c556695db0868040c4c47cb06201906924ef SHA512 f89b281fb6cbcdf4293ad66cc6f99a60ddb9e92d1f3d15c581e3a5a6222d0cbec2c8a8bceb1264c3d941964340834b7577b7cc9992f521c2331292ed099674ff
-EBUILD postfix-3.5_pre20190312.ebuild 9231 BLAKE2B 208584694f14bedb37197a88b49a0d25cbc6fb5998a0c648bfb083c39d42d1dfa5cb1fd5592a5e0828e2b50764db29d6d9665b35ab588d7d1ce1f14dfcfe8df4 SHA512 831978dfe34d1dfe954ab5cf5d1cf2fee87989630d4743f47a23591476d98d2a6e37118ff2317aa087ca2a6bfa63ee45890714a5d0997e218faf7001caf26a81
-MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
+EBUILD postfix-3.4.5.ebuild 9226 BLAKE2B 050b4e4adf5fd36e1c5a08e5f1d2fe552e6552168b007bc65b61db7cbee5f7e177f2ca61833cf08cb6fc64873809c556695db0868040c4c47cb06201906924ef SHA512 f89b281fb6cbcdf4293ad66cc6f99a60ddb9e92d1f3d15c581e3a5a6222d0cbec2c8a8bceb1264c3d941964340834b7577b7cc9992f521c2331292ed099674ff
+EBUILD postfix-3.5_pre20190330.ebuild 9231 BLAKE2B 208584694f14bedb37197a88b49a0d25cbc6fb5998a0c648bfb083c39d42d1dfa5cb1fd5592a5e0828e2b50764db29d6d9665b35ab588d7d1ce1f14dfcfe8df4 SHA512 831978dfe34d1dfe954ab5cf5d1cf2fee87989630d4743f47a23591476d98d2a6e37118ff2317aa087ca2a6bfa63ee45890714a5d0997e218faf7001caf26a81
+MISC metadata.xml 1023 BLAKE2B f0bcd846c18bf1459ac85c75b6e41c90857d800d49b3efdffdd0106616e453869f43004c9a38395c71e2766b9b7f83b25a702b3b39d6264d83f79481b6cbba43 SHA512 2511ca5d5cc134afa04d1f596084eb2f7102c45e883edf3290c00b2f733b8a1a74ecddcd6b182381ac86da2616097c86a8acedeca199747b33e403b8488067b4
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index 6e056425f72c..fe1d9dcbdd67 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
+	<maintainer type="person">
+		<email>eras@gentoo.org</email>
+		<name>
+			Eray Aslan
+		</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>
+			William Hubbs
+		</name>
 	</maintainer>
 	<use>
 		<flag name="dovecot-sasl">Enable <pkg>net-mail/dovecot</pkg> protocol
diff --git a/mail-mta/postfix/postfix-3.3.4.ebuild b/mail-mta/postfix/postfix-3.3.4.ebuild
new file mode 100644
index 000000000000..629b2c828dba
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.3.4.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+	eapply "${FILESDIR}/${PN}-linux-5.patch"
+	eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
+		"${FILESDIR}/${PN}-libressl-runtime.patch" \
+		"${FILESDIR}/${PN}-libressl-eccurve.patch" \
+		"${FILESDIR}/${PN}-libressl-session-tickets.patch"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.4.5.ebuild b/mail-mta/postfix/postfix-3.4.5.ebuild
new file mode 100644
index 000000000000..6b1a50eca24e
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.4.5.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	if use libressl; then
+		die "LibreSSL patches are not yet available for postfix-3.4 releases."
+	fi
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+	# libressl support needs work for postfix-3.4
+	#eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
+	#	"${FILESDIR}/${PN}-libressl-runtime.patch" \
+	#	"${FILESDIR}/${PN}-libressl-eccurve.patch"
+	#	"${FILESDIR}/${PN}-libressl-session-tickets.patch"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	if has_version '<mail-mta/postfix-3.4'; then
+		elog
+		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
+		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
+		elog "Before backing out to an older Postfix version, edit the master.cf"
+		elog "file and remove the postlog entry."
+		elog
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.5_pre20190312.ebuild b/mail-mta/postfix/postfix-3.5_pre20190330.ebuild
index 719df87d4e80..719df87d4e80 100644
--- a/mail-mta/postfix/postfix-3.5_pre20190312.ebuild
+++ b/mail-mta/postfix/postfix-3.5_pre20190330.ebuild
diff --git a/mail-mta/qmail-ldap/Manifest b/mail-mta/qmail-ldap/Manifest
index 9815257ff374..58a94d97dbd3 100644
--- a/mail-mta/qmail-ldap/Manifest
+++ b/mail-mta/qmail-ldap/Manifest
@@ -8,4 +8,4 @@ DIST qmail-ldap-1.03-queue-custom-error.patch 2472 BLAKE2B 5d7cccdefc4f486ff8f84
 DIST qmail-ldap-1.03-spp-0.42.patch 13618 BLAKE2B 506a34d5f0b936bd41062d179eeb13d35cd82d40595f0d94e1c0bee14206242308b4be470af5d95b22ec361edbafc7e82789076a3dd011601f64800232f19e0b SHA512 3aecc004ccc34f1974a9d0d471add0424b3663fefa12a2a47b7312a73eb5ad6dba28cf075e73243c5740ee4a403b1e37f2a2cbe62c6c15cd3ea8e0b840e72021
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 EBUILD qmail-ldap-1.03-r8.ebuild 5689 BLAKE2B 9e9b689b8193437274d8da7d042723fe672e4370f64dc9a14445bd0fa79720b0b0b0b7913fdacc22f9423467529e99e21ab373da85a6a369ff94fd2c62b6bcf6 SHA512 7742cd5f66f9453cbf368ba1d9022c53c36943063c39dd3d8f474da900f1dab999fd430bb3e8dddfcb5cf1393c20d2d33c68de03b8061a11a56857026ecba456
-MISC metadata.xml 759 BLAKE2B 99513841dbef258ba285d1c7244ffd4e7e74c67fe8d29a8d463510651610c0b3f15b0b221fb7088f579df353eb484322c16abdc58796c5f23978189bad479948 SHA512 97caf06c635b1f639406cac7b9ff84910b8c7ad1147e2ab2b052d10d8841ace90fd3c978534d1203788a481b5763497dd1bf1155ae48053f57ab7ad0981b08c1
+MISC metadata.xml 682 BLAKE2B 3efe1354c554a19e634b0275267ab10d199d3820bface5625902f8f9499fdbd4a04b547364e0c91eb55959432579aec8d00d173262879b6fa38f9486c795ca8a SHA512 def8025bb911da21196e23d2f19dafaa581aa712524ec2ee43e5f9dd95924c57eac395d22be9275a2c02fee03d5c4fd3ae40c1e448b701ee3bb9aa7a8488803b
diff --git a/mail-mta/qmail-ldap/metadata.xml b/mail-mta/qmail-ldap/metadata.xml
index 1186ed7cef3d..7f6421c8f0b6 100644
--- a/mail-mta/qmail-ldap/metadata.xml
+++ b/mail-mta/qmail-ldap/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="cluster">Enable this if you want to have cluster support in
 			qmail-ldap</flag>
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index 72c11abb0fc7..8b970c710c88 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -12,4 +12,4 @@ DIST qpsmtpd-0.95.tar.gz 367400 BLAKE2B bd77d8f203f1adf5ad6671fcd958bd97c5321317
 EBUILD qpsmtpd-0.84-r2.ebuild 2114 BLAKE2B 914f684e033bf1a6dada8a27b11ed573f00959fbcafc23da6ea345a840c10a8b4f3927ae27c95b786dcb04ccdf21c637ed0c352dcbc349731e85b3fd39d42730 SHA512 9f692226f67cf179f5c238c1a92db515605597d62a01b5ad0040960546184cb20c676b7b5efbb35cf26f0e9d875473af9ba31a00b4b50122703b1386ad206c35
 EBUILD qpsmtpd-0.95.ebuild 2231 BLAKE2B f42d3b7061e2a922ea2d89d644b4ab22591eb04334a339d1ab4414d31368a7a0b928ab41e2bae6e1c8501fe4341f7fc27ca5a316bb54d5758c7e1009a0db390c SHA512 78676d88efb2cc4924e55e76a9f9fb1f15deb3a74a7760546953f07db1d10d6827dc5028fe6f28e544123422279318dc2b27c0f47f9bb38ce4bad89919215973
 EBUILD qpsmtpd-9999.ebuild 1924 BLAKE2B 9c9277853ef23a3d8c71acfa972679a1e3228ed1b721e43b7722d22e535436c96549cb9112724a632c46546aa955fb69f61d38445951b2b00a457dbb52e105b2 SHA512 f91d624d6b2cdaef054e95131dcbd456ee1036aec1a83540c2c3e46bbaa22d5291cb298dd6f2d9d235aa53b5f76718b0ccfd776ec117ee034a1cbf608ffeaca9
-MISC metadata.xml 469 BLAKE2B fd31eba525ceee07dfb9e6547e309d9e697cecc22f5099f671267834539f3cebc17e427da57f4eced4014905016839f9ecb8995ca3250c21e671ef840cd362bd SHA512 d78cfa5db252e2957c22d76a779e9fd64f821d49c1eac7454c9d86ed8579ee90fba45a9d75e7d44f256f8c0bf25c357c2df9c1d870be16b54d519a47eeb692dd
+MISC metadata.xml 377 BLAKE2B 8bbb87961e42890dfbe28cfcaf4dec032314a0eaefbcabc063706606ef8cedbf95cad32958f2789da6aeee564c7fa0d690ef15f491cd8cd220d03ec5943140e0 SHA512 14a288d1baefa7a16d7977bb91c341a7a70b6f29c3617e2fb3b24bbe5f6c378b428664138ee630cf6d94a0613a687d385adacc4e73f6c1531c82c9e63d0db95b
diff --git a/mail-mta/qpsmtpd/metadata.xml b/mail-mta/qpsmtpd/metadata.xml
index de132d22fea8..c2cf860bc2ad 100644
--- a/mail-mta/qpsmtpd/metadata.xml
+++ b/mail-mta/qpsmtpd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>net-mail@gentoo.org</email>
-        <name>Net-Mail</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <use>
         <flag name="postfix">create user with permissions for proper postfix interaction</flag>
     </use>
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index efd545095940..3d0ea8ec9590 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -12,4 +12,4 @@ AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a
 DIST sendmail.8.14.9.tar.gz 2114293 BLAKE2B 51c24478724a1dd87e3bbda0bf0e8c9c64bc8f36eaa624752eda50942520a4f19262d2c8cebbb0a02467bb3f49e1e7edd78a69f0327effa3834e4234b289f04c SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424
 EBUILD sendmail-8.14.9-r1.ebuild 7110 BLAKE2B bb8f35fdfc6a63c590445984a3ac1fca444106af6cfe0199d1293d63dab6fd39fecbe25e658b8cb626df6ebb08855c645d9ea58b64341797aca775fb05e0c660 SHA512 1a64fb6d117712ff0371663db3bf514f5e1e5b09d033e4539159385aa8adf52adffefdaddd0d7a084b6991a373470c4f795f850a5ecca7b1bc7d1305f18c1782
 EBUILD sendmail-8.14.9.ebuild 7038 BLAKE2B 61e6ba9e7b36ae1dfc4e733cd201c50c8655a57184e8d092a9282bbb8db33d636622978df6241897ef8246cb21d5f13a9536313898b937e51753aeec3654719b SHA512 1039f0200eb87e2c5c8f0416f0a512584932bd21bb1f3b7aeb8cef7c8b9e779c7ff4c376018eaa89a1105057a38d6ce063b291e0cec612dc3fc8f1a583b224f1
-MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/metadata.xml b/mail-mta/sendmail/metadata.xml
index 1c3bc7b3fcef..7a38bb900964 100644
--- a/mail-mta/sendmail/metadata.xml
+++ b/mail-mta/sendmail/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index fffc0b79b25d..cc3f0c8fb62f 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -3,4 +3,4 @@ DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e
 DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72
 EBUILD ssmtp-2.64-r2.ebuild 2959 BLAKE2B 562ffd4f68911f4cced133576f28def5e538f4987e1f5985d4c0557832da8d846c135d8a69dfa0a865255c7313f5a9866c4447e35438b37b8f644ff677a6e9ea SHA512 c9092d1f510608d22ae2853b119d4d88dfec514e6dad62eb76c9f5320b511392b676e2599419550f2a2341eac61b5537a75cb8d02cc49c17e6adbba990d0f96b
 EBUILD ssmtp-2.64-r3.ebuild 3041 BLAKE2B 71554ebcc5ed2451eac745610d349fd5c38f58290fa8aae43ded9acba5f179243b40a779783bc2687b1262711f057ad9f749ca9413888727226f67c0245c2387 SHA512 92ff95ad3b4fb3cd83cb77d718bf4713475b473ec39c5a0b28f1cef9d61bc6660a92491a68a64283013d9ee95fdd79f43b1785db15977a7b17b6cd3c597c01e1
-MISC metadata.xml 341 BLAKE2B d8030e5f1afc6521cbd32bfa5d1a02b06f5d161bf2130dfc38855733cd519ca31b630c2d8dc57784a35a05ce95bb7fda1765ea6fc3666160d8a0c26d89884500 SHA512 68ab75d2293915559f73ad87f7a6b6b0533795a0e79cea2aa835cba84cbcbfbeb3ea9e3bc02e71028431e2e2022936041b75ca2e0beb749ba49afd8f134f6a92
+MISC metadata.xml 259 BLAKE2B eb59516b105b0fdc4b755c3852b714707dba4f5b414eb0eea763db68aa0c5d1971b55866972ef14f1e3e5bc81ccb66975a24b9292aa796edf02877d649a661f2 SHA512 3e7a5afefe4f2095be4347e56af64eef343bbb4920ef80a7d93c88111864e8993f899328af33e736324960d26f30939e29e001e90381548a353ee0089f96a766
diff --git a/mail-mta/ssmtp/metadata.xml b/mail-mta/ssmtp/metadata.xml
index 9b3d1228bf01..f7077a6abf8d 100644
--- a/mail-mta/ssmtp/metadata.xml
+++ b/mail-mta/ssmtp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="mta">Install symlinks for sendmail-compatible MTA.</flag>
   </use>