gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /mail-mta
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
43 files changed, 804 insertions, 623 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 74bb384a617b..bee3807e3616 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 61d974938973..0f6d71594815 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -3,5 +3,5 @@ AUX courier-init-r4 4965 BLAKE2B 09f29543599abfb6dd5df058f832e979bde471be3f9d293
 AUX norewrite.patch 489 BLAKE2B f4ed2e1af731811d8da96ee817335016c5ec9a77a53ccd194360e95804f71e7c7825511f1831f1575f77cec35d72f12d39c02f8d10524fc189ff64b8a1a7fb9b SHA512 e9e95bd5d1a78b510f6dd7e155999089f123eecfdc16d3b5005b00981a7b6d29827cdddc61035ed3c3edcf0b9907ddfbae76df6503a1a8ef26b4de43a02bfc8e
 AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d
 DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
-EBUILD courier-1.0.5.ebuild 9536 BLAKE2B 00bdb0181a195c8c48e83e5ffe35a5ebef79c6e654d24c070bad1dfe286dfd0f9212d0e0a9fbe94d452e4a4e2c0c79c8c613d582af3fb0f57abfe158586c6eca SHA512 38697b414a92dd38b978d67cc9c2beb84774ab6e3cfeef5c0814a6122631c33109c373ad92bfca5898aa143cb58a22ccbb65f58bdf83170b47f6475b2b086530
+EBUILD courier-1.0.5.ebuild 9537 BLAKE2B 6c633b6d7f99d85452e5bccc6c4b9bbddde1f2fb9d19a55b0acc311f470af8226e9f116a0d5ef92bb48dc97e35204727f5d1705e188f2fad0bfdcd0e4f95e6be SHA512 bf4a3a015b6c17f59226e1d085875bc26d5135c1aec9c36aa66f20b4f42454b18b6ffbd9899338ffa1b353ceb60990f78c31d38d84c7a2a5196813053fcbe2fd
 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 262c3e011cda..845fd449bf7f 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	dev-libs/libpcre
 	app-misc/mime-types
 	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	mysql? ( dev-db/mysql-connector-c )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	postgres? ( dev-db/postgresql:= )
diff --git a/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index a2337bf05578..209ef500298f 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -1,4 +1,3 @@
 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
+EBUILD esmtp-1.2-r1.ebuild 951 BLAKE2B da36778e6a7a8d7aef07e40b1c531417b6d407a1436fbd26f3339395de9af49bcb1396fdc071bd68b31f5c5a33670e0bb61aefe0e38544d550587af6dcf46ac1 SHA512 a838bcc48a221f4690bb237c192f90f90d717b23ab11c768791870e1c2983e85b339527b5154cf291027456e665743d1685e4ef9fa6d6a2973ab6ccac583368a
 MISC metadata.xml 242 BLAKE2B 041399005c131e6e66967025968669f0ddb0972aa213f52e81852518a0005b7c478debfb6bc182443bb6a35066ebd6d3049c99d7b8e4a6272fd95960504e4d74 SHA512 8d906d3c3f37a584908f69913417a2c54ef0cde2709d7f2f88d25b932bfa18f98014a34f83d9ebd73f0508e324747ee48f412d909a0423892069fa9f03b78f37
diff --git a/mail-mta/esmtp/esmtp-1.2-r1.ebuild b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
index bd1d86f7997a..8830d7452eb1 100644
--- a/mail-mta/esmtp/esmtp-1.2-r1.ebuild
+++ b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="libressl"
 
 CDEPEND="
diff --git a/mail-mta/esmtp/esmtp-1.2.ebuild b/mail-mta/esmtp/esmtp-1.2.ebuild
deleted file mode 100644
index 1f7558db2634..000000000000
--- a/mail-mta/esmtp/esmtp-1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="User configurable relay-only Mail Transfer Agent with a sendmail-like syntax"
-HOMEPAGE="http://esmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND="net-libs/libesmtp
-	dev-libs/openssl
-	sys-devel/flex"
-RDEPEND="net-libs/libesmtp
-	dev-libs/openssl
-	!mail-mta/courier
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "einstall failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO sample.esmtprc || die
-}
-
-pkg_postinst() {
-	elog "A sample esmtprc file has been installed in /usr/share/doc/${P}"
-}
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index f5b241786e66..3cefd7bc45ca 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -19,13 +19,16 @@ AUX exim.socket 139 BLAKE2B bb8281a98fdac1b52031d5250fd1e658bf5a2c32e24b49ed0daa
 AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076aefa1d023d47d5f7fe8b268f3308734f363ed9628cd8551ccac7fc369657e0fdf65507d2e6419f704c SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a
 DIST exim-4.92.1.tar.xz 1767976 BLAKE2B fb5bdb8762f16e30c43c7899e5fb5b459bb5e910458f970d20a5cb26cdde842d87a1f8150e4c0f9e931fa277e2f33a0fb8a6d478b5bf871d03a12ebd06c36d67 SHA512 fd43448db0aa5139f8b459322b95e258f232ac8a4bf21a19099c7768329ec20c344c4e0d8dd2e98c33a192a5f97d7666a746de2c87bdfb8da42c625c985d7e05
 DIST exim-4.92.2.tar.xz 1772688 BLAKE2B 618c70e26811d0e6d453a4b88ab1cdb9e337a9ca8ceec50aee665b1493c75157001483cf9721e3d57313a90910d2605717b2c4be4174c2897b3f992af01c1c26 SHA512 d27aca4d4e9df267b0afcbe7b3f74c9ca6e96e7e6eb4d2f86ff00b0e2234eaec90271405eb387a36a2e0d4ec5597b2920753f85318a5618ddbc8af475a7d81cd
+DIST exim-4.92.3.tar.xz 1773156 BLAKE2B 7866c23c862f5b5aadac709279f9ed376e526e90e8ca09d41c1789041ec0a3ecd48f8d2237e4d462e547efa2178babd5942d3142fef7419e16d1707fe23fa226 SHA512 ca6d6f50653502345511b683859b33aa02faa48454fb2100ff89fed3dcb8af8933e7bce68939365fdee42f96eec0c3b135cf748f4581e92a62be0f0ab093868a
 DIST exim-4.92.tar.xz 1767136 BLAKE2B 6c97578807073a782112218c65de460cc94f046d807eddc7330f2f67266c0ef341ded61050a16aca13c88e606a923a9e08033c8bfb618a7ef34b3d2ea6db32ca SHA512 62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31
 DIST exim-pdf-4.92.1.tar.xz 2038948 BLAKE2B 6624fb8930944f79e0c7e52a001727cfcff508ac69cb4107247201b8598d6e223cac7c7eda14c3102d0eabc151a547b6cc5ef11a6c4a830f31dfd88e24907c1d SHA512 437b868cd7dedae59e32b9245c8c1ca3375605eb4911846bc3508b627acf32c99bda644b3c3e84eb539a39b3c2cc4f83314eebe55160b3da617ccaec2f1623a2
 DIST exim-pdf-4.92.2.tar.xz 2039468 BLAKE2B 3542bb5d38267bb06728ada72cfa89f06027b917799e743a1764cb7568cf0ba4cdbc5b40738c3ae41c9540d348810b388d74ad315a201f2740a5a0b79e83f904 SHA512 da90354cd8133103f08b978dd0422fd1a00e5866cd3f40e523d06875fb8b31163d7fe9791f1cf81d15bc63b16fc7f6bb98cf28c3036d054464336c07245b3c91
+DIST exim-pdf-4.92.3.tar.xz 2039436 BLAKE2B 8d20e7f0ebfcb573d08b490737923afc2cd2d5837f5c91bd2f3e6b5e637d86a5d5a59123c57ba9219ead675c72bfc46351d5b705d9533fab80bedeeca8bdd580 SHA512 3245a627a924db92e5a50e842e096731d08284f757274b5083ea234707c493abd6f27a3b34a2025e3acff167260df0f4ebe68b9f5832920c5f22c258143ab43f
 DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547 SHA512 3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.92-r3.ebuild 13225 BLAKE2B 3ffd746469baaaaa28f0f82246adf6aae895b4ccd50ea01831a2303dd17874d2aa700306345827e37facf44772d7f6bc4fc19d8cd521a46cbbbb97c993adf3ea SHA512 2f638601cad3cfa2b7bfab588ffe2ba03cf35cd3b1d0511ba60cd67327f8d5ad98939c81784058799253602e72fb17ea11237e1638f2da7b2f9efaddac361c90
-EBUILD exim-4.92-r4.ebuild 13525 BLAKE2B 402675112b870144268e9be64b82fe691dfe9547fbc47442748949e6a9ab9e74a4133224913de5888098c346755ff0fe6d783cfb971ce991af9d550fdcf74d0b SHA512 6653b2746ec357e2def6121116a4d5575ba8652bd92524f54073c3930e45b1d284e71781985e0acd06a69b7002f679b1c7bf1f45fb96b37caaaf09583626e560
-EBUILD exim-4.92.1-r1.ebuild 13533 BLAKE2B d3c0b9419bf863bc12cd3bcee53f8680bceaedebb4696b75f8467ebc3814046b3c84256ef38d6299ab2247cd447c5af51f52b1b416ea87540582a13ff4ea925e SHA512 018c5a14cf2425fe98ad136c81d2f4f83dccc517efc16aa6ff53691b3b73833491a8ead9eb03d45688e78317e043f439fba92e0f19f500b428e56aa8df281356
-EBUILD exim-4.92.2.ebuild 13603 BLAKE2B 7f8979a2e1c5262648e9ab1d94924bcbdb609cd9553d9360d4695a6327417024b2bd91191b1afb6f3a57242e23e32a5641d7d145422c02d46be0983fdc70caf1 SHA512 a1c5efc15d399148db924bc30b44b171e4598e14450ff4b1b824e8efc732fe5edbf597a3afaa545ceaa7f0360eae46eff3c32f7efb8e5215285078aa81c2a21c
+EBUILD exim-4.92-r3.ebuild 13216 BLAKE2B 46b0b8653bd99e2848020ed22f34da97991d7866e7646c105975571b1791fa39c066dde7979be9c0bbdfeee59d02acaa38a9907ceada5043cd90b21288c47ee3 SHA512 1c3b1139eda7c9025d494d84e3bacccaa6dc035a5aeae1ef37111257bc815dc5f5d0527c75490b7d7dd922c71af77d0404ac2ceb4aa93dead1eef98193f578d7
+EBUILD exim-4.92-r4.ebuild 13516 BLAKE2B d6f8c5d976917427d69429214da392a88feb0dfc02659135f750a3e756318a0c2cfe225834abb43134a80f09824a0c4af4cd7fc858857fc96e5d26d62567252d SHA512 7312f4be9434d5dca279305bfcd32fad03599b3a7ac0e3a1ad8688fb70ab0af180a0431453766f4cde0caf3f81bc4e7045c5624046cb1b3278230be76c3f1f39
+EBUILD exim-4.92.1-r1.ebuild 13524 BLAKE2B ce29c505129bd02fa7e3fe77557fd848dc1a1d1573d5ba7ba089c41b214245f3e1c93e02677be111dfb4621e54f1b7e39b24c193fb7dafcb70b9359ab8f85bfe SHA512 ecc1aba36dbf26eec873892434b742af2854591eb079ac106bcbde32920125b265c13e9e9fc6f16d139006fd11944ae254a6678113ee5beeee62c10b5016a0c3
+EBUILD exim-4.92.2.ebuild 13594 BLAKE2B 64a842102130fcf5fc627a4d3b40d93e6884674c09ff6d672ff02fcb696929c8ad373cc7f298410412cd9359fdbb39ebd6e0177f732386532d9b3e50f8454581 SHA512 3c9072c2be2959c8bda171db71b48cc3d05bf22b2a149cb977308d5c805d7c6380ab2a9394466d530bbb6e02c221e4f64e7700494773f200a205208a3b08a4b0
+EBUILD exim-4.92.3.ebuild 13602 BLAKE2B 5975361db550a4b075734ee0ea534ec945ca1054d8fac35f027b44aed26833cea75fdd40cb56dc341c6575dfe3b3fa0ef612d0c8651427828a4cb3eea9642a62 SHA512 cf0b9c6ccbb9f352d3f4d8c49c7f0fc4981869809bb5ebfbc58634c01b0f1203f137d891f8307dc4cee0cba6f23bca1a3e974461c51e23da138a0f14821816f1
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.92-r3.ebuild b/mail-mta/exim/exim-4.92-r3.ebuild
index 90a6e8765fab..b47fb4d177e6 100644
--- a/mail-mta/exim/exim-4.92-r3.ebuild
+++ b/mail-mta/exim/exim-4.92-r3.ebuild
@@ -33,14 +33,14 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
 	dev-libs/libpcre
 	idn? ( net-dns/libidn:= net-dns/libidn2:= )
 	perl? ( dev-lang/perl:= )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/mail-mta/exim/exim-4.92-r4.ebuild b/mail-mta/exim/exim-4.92-r4.ebuild
index e63e0643c3e1..0cd959d5439e 100644
--- a/mail-mta/exim/exim-4.92-r4.ebuild
+++ b/mail-mta/exim/exim-4.92-r4.ebuild
@@ -34,14 +34,14 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
 	dev-libs/libpcre
 	idn? ( net-dns/libidn:= net-dns/libidn2:= )
 	perl? ( dev-lang/perl:= )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/mail-mta/exim/exim-4.92.1-r1.ebuild b/mail-mta/exim/exim-4.92.1-r1.ebuild
index 34e7b79bd72b..e2f8fdc93a81 100644
--- a/mail-mta/exim/exim-4.92.1-r1.ebuild
+++ b/mail-mta/exim/exim-4.92.1-r1.ebuild
@@ -34,14 +34,14 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
 	dev-libs/libpcre
 	idn? ( net-dns/libidn:= net-dns/libidn2:= )
 	perl? ( dev-lang/perl:= )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 85b2c048788a..d03e8297b764 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,14 +34,14 @@ HOMEPAGE="https://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
 	dev-libs/libpcre
 	idn? ( net-dns/libidn:= net-dns/libidn2:= )
 	perl? ( dev-lang/perl:= )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
new file mode 100644
index 000000000000..7b828027f63d
--- /dev/null
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	dmarc? ( dkim spf )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	spf? ( exiscan-acl )
+	srs? ( exiscan-acl )
+	!ssl? ( !dkim )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from repoman.
+
+COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
+	dev-libs/libpcre
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	gnutls? (
+		net-libs/gnutls:0=[pkcs11?]
+		dev-libs/libtasn1
+	)
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nis? (
+		elibc_glibc? (
+			net-libs/libtirpc
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc )
+	srs? ( mail-filter/libsrs_alt )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
+	"
+	# added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!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/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/exim-4.69-r1.27021.patch
+	"${FILESDIR}"/exim-4.92-localscan_dlopen.patch
+)
+
+S=${WORKDIR}/${P//rc/RC}
+
+src_prepare() {
+	# Legacy patches which need a respin for -p1
+	eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+	eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	eapply -p0 "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
+	eapply -p0 "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
+	eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	eapply -p2 "${FILESDIR}"/exim-4.92-fix-eval-expansion-32bit.patch #687554
+
+	if use maildir ; then
+		eapply "${FILESDIR}"/exim-4.20-maildir.patch
+	else
+		eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	default
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	local aliases="${EPREFIX}/etc/mail/aliases"
+	sed -i \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+		src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+	if use elibc_musl; then
+		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+	fi
+
+	local conffile="${EPREFIX}/etc/exim/exim.conf"
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
+		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile || die
+
+	# work on Local/Makefile from now on
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# if we use libiconv, now is the time to tell so
+	use !elibc_glibc && use !elibc_musl && \
+		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+	#
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
+	local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+	cat >> Makefile <<- EOC
+		USE_DB=yes
+		CFLAGS+=-I$(db_includedir ${DB_VERS})
+		DBMLIB=-l$(db_libname ${DB_VERS})
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				CFLAGS += -I"${EPREFIX}"/usr/include/tirpc
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+	else
+		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die
+	fi
+
+	#
+	# features
+	#
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+		sed -i \
+			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+			Makefile || die
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		echo "SUPPORT_TLS=yes" >> Makefile
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls" >> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# DANE
+	if use dane; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DANE=yes
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+	#
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SRS=yes
+			EXTRALIBS_EXIM += -lsrs_alt
+		EOC
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+	#
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
+		|| die "make failed"
+}
+
+src_install () {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc -r "${S}"/doc/.
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	pamd_mimic system-auth exim auth account
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit \
+		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit \
+		"${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit \
+		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
+		einfo "for using smtp auth."
+		einfo "Please create ${EROOT}/etc/exim/exim.conf from"
+		einfo "  ${EROOT}/etc/exim/exim.conf.dist."
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use srs && einfo "SRS support is experimental"
+	if use dmarc ; then
+		einfo "DMARC support is experimental.  See global settings to"
+		einfo "configure DMARC, for usage see the documentation at "
+		einfo "experimental-spec.txt."
+	fi
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	elog "The obsolete acl condition 'demime' is removed, the replacements"
+	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
+}
diff --git a/mail-mta/mini-qmail/Manifest b/mail-mta/mini-qmail/Manifest
deleted file mode 100644
index 6828c661e4f2..000000000000
--- a/mail-mta/mini-qmail/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 1.06-headers.patch 640 BLAKE2B 6dded7fbd55a779fa60378296819b7f24481ee65de174cc18015f2a0e56edcbe9756d40dc2af63d6651679b7dc73ef52088fb32f5381fc497985725335ad210c SHA512 09e684fe5ffd53acd2324b3975e9bc9a950b551d8fdb7a4d42f05697af411ef37a0851140c45e2e882fc890cf0fd28a77b46faacb428fb98dce22c5b15ff0b99
-AUX config-mini 961 BLAKE2B b6f89f19aa5a12b8d1dcc3df2db5409d59c892b06f58a6cc64063feb522b0ebce87d900627367f5723db6362be3ccc57f5defd6df89b3b2559a099d54c5b4ac0 SHA512 a98f18b0d705506e524d5959f296d9e47d44871b59cedb154cc0fb51283413f84ef2cf5db2786e3e4af7e1a80a55691437598b3ee8af014a4ae7ac8bccd60102
-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 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/mini-qmail/files/1.06-headers.patch b/mail-mta/mini-qmail/files/1.06-headers.patch
deleted file mode 100644
index 566babfa6290..000000000000
--- a/mail-mta/mini-qmail/files/1.06-headers.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/qmail-pw2u.c
-+++ b/qmail-pw2u.c
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "substdio.h"
---- a/qmail-qmtpd.c
-+++ b/qmail-qmtpd.c
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include "stralloc.h"
- #include "substdio.h"
- #include "qmail.h"
---- a/readwrite.h
-+++ b/readwrite.h
-@@ -1,7 +1,7 @@
- #ifndef READWRITE_H
- #define READWRITE_H
- 
--extern int read();
--extern int write();
-+#include <fcntl.h>
-+#include <unistd.h>
- 
- #endif
---- a/substdio.h
-+++ b/substdio.h
-@@ -1,6 +1,8 @@
- #ifndef SUBSTDIO_H
- #define SUBSTDIO_H
- 
-+#include <unistd.h>
-+
- typedef struct substdio {
-   char *x;
-   int p;
diff --git a/mail-mta/mini-qmail/files/config-mini b/mail-mta/mini-qmail/files/config-mini
deleted file mode 100644
index 009026e2c091..000000000000
--- a/mail-mta/mini-qmail/files/config-mini
+++ /dev/null
@@ -1,38 +0,0 @@
-
-case $# in
-  0|1|2|3|4)
-    echo 'config-mini: usage: config-mini me defaultdom plusdom idhost qmqpserver ...' 1>&2
-    exit 100
-    ;;
-  esac
-
-me="$1"; shift
-defaultdomain="$1"; shift
-plusdomain="$1"; shift
-idhost="$1"; shift
-
-echo Putting "$me" into control/me...
-echo "$me" > QMAIL/control/me
-chmod 644 QMAIL/control/me
-
-echo Putting "$defaultdomain" into control/defaultdomain...
-echo "$defaultdomain" > QMAIL/control/defaultdomain
-chmod 644 QMAIL/control/defaultdomain
-
-echo Putting "$plusdomain" into control/plusdomain...
-echo "$plusdomain" > QMAIL/control/plusdomain
-chmod 644 QMAIL/control/plusdomain
-
-echo Putting "$idhost" into control/idhost...
-echo "$idhost" > QMAIL/control/idhost
-chmod 644 QMAIL/control/idhost
-
-cp /dev/null QMAIL/control/qmqpservers
-for qmqpserver in "$@"
-  do
-    echo Putting "$qmqpserver" into control/qmqpservers...
-    echo "$qmqpserver" >> QMAIL/control/qmqpservers
-    chmod 644 QMAIL/control/qmqpservers
-  done
-
-exit 0
diff --git a/mail-mta/mini-qmail/metadata.xml b/mail-mta/mini-qmail/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/mail-mta/mini-qmail/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/mail-mta/mini-qmail/mini-qmail-1.06.ebuild b/mail-mta/mini-qmail/mini-qmail-1.06.ebuild
deleted file mode 100644
index 3bba7da48459..000000000000
--- a/mail-mta/mini-qmail/mini-qmail-1.06.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-GENQMAIL_PV=20080406
-
-inherit eutils qmail
-
-DESCRIPTION="a small null client that forwards mail via QMQP to a full qmail server"
-HOMEPAGE="
-	http://netqmail.org/
-	http://cr.yp.to/qmail/mini.html
-	http://qmail.org/
-"
-SRC_URI="mirror://qmail/netqmail-${PV}.tar.gz
-	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/maildrop
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp
-	!mail-mta/opensmtpd
-	${DEPEND}
-	"
-
-S="${WORKDIR}"/netqmail-${PV}
-
-src_unpack() {
-	genqmail_src_unpack
-
-	unpack netqmail-${PV}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-headers.patch
-
-	qmail_src_postunpack
-}
-
-src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1" qmail_src_compile #398135
-}
-
-# make check is actually an install-check target, see bug #364955
-src_test() { :; }
-
-qmail_base_install_hook() {
-	dosym qmail-qmqpc "${QMAIL_HOME}"/bin/qmail-queue
-	exeinto "${QMAIL_HOME}"/bin
-	doexe "${FILESDIR}"/config-mini
-}
-
-src_install() {
-	qmail_base_install
-	qmail_man_install
-	qmail_sendmail_install
-}
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 658271711abc..39c7fd303cac 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,10 +1,9 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.8.3.tar.xz 336120 BLAKE2B 4c58dc82e01135bc84176c25c65812414901f134a71aba5460675df3270f1d9dd3a706c66f5773315a38d63463f5c9eb68b584d6e5d0d5f0b1c23d6436d9a2b8 SHA512 c265991c0925d79b28a664ee6832316350d59d546f252989dafb8a517a8be1c496fcc85981325e5b381801a7bcb77e38dabdc12fc5be1bf49b9886a409a21819
-DIST msmtp-1.8.4.tar.xz 337292 BLAKE2B ac96dbd14cb5382563b995f2aff247c8ddf429dfa58ad6652ec3a3d05a98703a6c88a83d9e60ba3fb1d389682a6c0a653c5854f85258fe9d529674e61fbb146f SHA512 7c358ff6235802348f55f0359ad5f6a87fcd1cede9e6f95d603b0a6e7197527cf5c99be8c1f30b2c8fadf4fc56b0b8ac4962db0e57bb5bc522145c59637ed6ec
 DIST msmtp-1.8.5.tar.xz 338840 BLAKE2B 92971fae2e3ad4d324d89f6f41950e3d4c4d922dbda82867d0df5f7d2ef67de1b5a2d83fd779a53399ef54a1515bc648e16e8c9d437fc1863bfb669a079a31dc SHA512 16e85d714b15e07f96f5ed5bf32b0c97a970877c13cfb77b5df29f7ea075d4da899a58786dcd60ace049b1f15061f4bcf96fa7fd442413560066a6c17a60f9a8
+DIST msmtp-1.8.6.tar.xz 339732 BLAKE2B 3dc34bf23c935ea5f67df7e65b035771fd1475311311cca7097e71dac1c7b41a4c58497fd378a35a7f212b8a9b13e2dac6f20e0058d6f3491b52149d789b97d8 SHA512 9d3dd282ddfe2d67b67bb6d29412beebcd666d4ab8e90a664b7dd4b951714da0e3adba72dbe165617b1a170779bcd45e2e7bcf54d1d96fa97089686e71cbea66
 EBUILD msmtp-1.8.3.ebuild 3388 BLAKE2B d052cabf121e47bd8d804813d62ba463299d7dfe004bd85686775b6ad3e2d6527292cc50a934b57954d15ef1144aad4a415d76b7a205194a150c7f88f4d90f37 SHA512 33a6a5edb33b0c3e96766fc4d143537b7877b20e290507cb618a5ca214856c52fbdc09d81d731b72b71bb2c17ff67a4d3a0684bc90db23ed5bc5795d29fbd092
-EBUILD msmtp-1.8.4.ebuild 3395 BLAKE2B b786a7d3477fce4658fd2f8e9709cf073cc015a0860c418563b9636b91c2563861b0ee43f6cf87efc4158a6836e13f4b186eafc82a0a07284cefcf76b576b800 SHA512 e6f3d57e499819b687200013090ee96351e50febf55370be080d0777a482c727fd583fcb59edb824b9f46a0a907bd42af501ac856cc6d8684df0f1c5a76f619b
 EBUILD msmtp-1.8.5-r1.ebuild 3369 BLAKE2B 47d644318247557d2b72df85431f4793363c81438827548e189bc475ab8e60322a34915b4b95485c7600e6d05db0834169a759edfc49a1499029dbf428e8a1da SHA512 d2949537bff4d7ad06f9f4f265ea99126581e10aa92f1c8f5b4bdb51c05c1980a8b79d8c015d27059e8c9fe1464839b13bc10a33fb4c7b71b6b413a0814adf88
-EBUILD msmtp-1.8.5.ebuild 3393 BLAKE2B 9172045c24efd88eb8aa3cafc1aea1e9265f52ae1def86a2fa0a1030b0aa71a6b998c3f693b6df7bc4b149fc21bec25ac73e58c2973ad05c27299fbe4a7d0fc1 SHA512 4078e383f08999c8ec23729732dc4c5cc7e5e80229605965132847d85ca763e5ed2a69c454257104dc3c7af653728cdcc9b543ebd0dbf52587ecd94ad5adf641
+EBUILD msmtp-1.8.6.ebuild 3369 BLAKE2B 47d644318247557d2b72df85431f4793363c81438827548e189bc475ab8e60322a34915b4b95485c7600e6d05db0834169a759edfc49a1499029dbf428e8a1da SHA512 d2949537bff4d7ad06f9f4f265ea99126581e10aa92f1c8f5b4bdb51c05c1980a8b79d8c015d27059e8c9fe1464839b13bc10a33fb4c7b71b6b413a0814adf88
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.4.ebuild b/mail-mta/msmtp/msmtp-1.8.4.ebuild
deleted file mode 100644
index 94bbeb282bd5..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps multilib user
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-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"
-IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-		!<mail-mta/ssmtp-2.64-r2
-		!>=mail-mta/ssmtp-2.64-r2[mta]
-	)
-"
-
-BDEPEND="${DEPEND}
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-gai-idn
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls gnutls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dodir /usr/sbin
-		dosym ../bin/msmtp /usr/sbin/sendmail
-		dosym msmtp /usr/bin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_preinst() {
-	if use daemon ; then
-		enewuser msmtpd
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT%/}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/msmtp/msmtp-1.8.5.ebuild b/mail-mta/msmtp/msmtp-1.8.6.ebuild
index 4df45a184c6a..416ef1aa3cf1 100644
--- a/mail-mta/msmtp/msmtp-1.8.5.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit fcaps multilib user
+inherit fcaps multilib
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="https://marlam.de/msmtp/"
@@ -30,6 +30,10 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	net-mail/mailbase
+	daemon? (
+		acct-group/msmtpd
+		acct-user/msmtpd
+	)
 	mta? (
 		!mail-mta/courier
 		!mail-mta/esmtp
@@ -46,7 +50,7 @@ RDEPEND="${DEPEND}
 	)
 "
 
-BDEPEND="${DEPEND}
+BDEPEND="
 	doc? ( virtual/texi2dvi )
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
@@ -117,12 +121,6 @@ src_install() {
 	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
 }
 
-pkg_preinst() {
-	if use daemon ; then
-		enewuser msmtpd
-	fi
-}
-
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index b9efa372deed..5b935b7a442b 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -4,9 +4,10 @@ AUX 1.06-readwrite.patch 237 BLAKE2B a8c9af939378bb423c68aebdafeeb3ecb53def9e7d0
 AUX genqmail-20080406-ldflags.patch 455 BLAKE2B 9a820b3ed89ec74063076ac88933e14ee92776ed310b4e2e1f6ecb472fbf6ff6361c2cbe2cebcf2c8e2c9ca4a3d3a1611edcc601ab32bf2dcca8560e669678e9 SHA512 5579e6d60b4c71dca70163a832ef079a19abe815eeaa83b362edcccd4a2646c2cfb25d30cfab44c49b3b124c3b069c169b299d0f251495a15d0f785c3ef16e82
 AUX netqmail-1.06-ipme-multiple.patch 3694 BLAKE2B 53d1db0766a1720cf626210bd9272f2e5bbe310738c934ed8c3c0ffc7adb54ba8938af0d12771c77f59cada9d1c97f858cacfd86a4a0b0bcbb5c6c4e7d0d0d6e SHA512 08f26af9ecab24258956d20c8e7201bd4f3d55ce9f2793417ae3fa1ecae4e610eaa2fcfe01462ffa70f4974b5ee4969851c254ab051fe039dd2a8eb9fb8b8f5e
 AUX qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
-AUX use-new-path-for-functions.sh.patch 409 BLAKE2B 512bac6c1515cb7cdeb6a7ec849bb7cc7382da638db33f7e8def05ce08d5e668c98e4ebec4345a0441628aaa8b238ab15bd5869f3ddb7fd65c386355ab397814 SHA512 e751f7b5e5244ec627ab1ae55aa12a0324161943797255b96ef4b94525e99c8d2bdc9f3673d771fa6e623c6c40a60aee6fea1ac79f10e382a0db6149943d9304
+AUX use-new-path-for-functions.sh.patch 404 BLAKE2B 2481a3bedfd3ea78fd75e482401e71c4ab6b3ac85605af07a530953a271322dcfc2e3b15819e0e0a75fb6215c4bbbbf43b2321763dfd690acfd6f3d10dd4351e SHA512 00b7a7a16ae7c9350b8f9c0f814f7d08ddc510e53a943a1f2fa4d87f39587953b5861e8a848b541fa3050e68144c9dc5a3f11498e4f05d29f91fe2976988aa79
 DIST big-todo.103.patch 5546 BLAKE2B 34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554 SHA512 fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975
 DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
+DIST genqmail-20191010.tar.bz2 10063 BLAKE2B bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718 SHA512 8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b
 DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 BLAKE2B c9498d9ef5987f1f8eae77894a839708add2186bbd8b1d4a7df36b56e0345da9643b384bc3f575bdd87dae9571d7e22c9e09894fa5330910a2bf8679675e41b5 SHA512 ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41
 DIST netqmail-1.05-tls-smtpauth-20190114.patch 68060 BLAKE2B 46a887c23e09d6cb9fa9a5259c288cfd9dc8ce51f361d076794ebf754250a35e33787426cdd53989dc196ce4a3a61fd1e66896b2ff0368c98a4566d7bef6c517 SHA512 33cbf4d05c4212efecb23237c1b3fb67ef9a1543f11d81ac1c397416a4153af3d67e144686f1764d8b5e7ccbbbbd51044bbe51cf833c6ac779344048384cabc1
 DIST netqmail-1.06.tar.gz 260941 BLAKE2B f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a SHA512 de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
@@ -14,8 +15,7 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8
 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
-EBUILD netqmail-1.06-r2.ebuild 4097 BLAKE2B 2c7fbfb751b501114416dc47b29392fcc41eac16b9c7195946aea9f36f73004bb61c4d956da25d21d83be8b2330bbfb66b6bc297abb0db56510a6a12f06f7a8e SHA512 5b41dec6c172bc7f75500823bfe9ebc758a1fab8aceb3af363d78c4e3372dc0304138bf08c56d6c99b30675a21aff073ab7c9dfe77252490021866678e68d0a6
-EBUILD netqmail-1.06-r4.ebuild 4310 BLAKE2B ec5fb7dafdadc8eab94ce47819a07269af50481f75dc7aa071bc1ab7da9c84597ca527eb0946f4b19d853b2f4638b889d373bd860d676afba5210dc9c446ac20 SHA512 45e6b9a5bf5f480b62d6a1ba7600db545174da04f1c348766b590c0a94a485c006f77569e8af88a62ac47fbedd2ef916e96ffcc04d9fd3b035c704cc7053a0f9
-EBUILD netqmail-1.06-r6.ebuild 4485 BLAKE2B 039f3ca37cabc829e900b8a9c989e8db4be9631d4986caf99817e4f16b31c7818de322462cf3c9e6936fd9211d20187535eafbb1d459605725f5492a650e9141 SHA512 45a6aa69f81087f7d91e3d91666e7d1bc13a8dd2d6521b2330bec78ad6f518e1906714fd2dc183197446efb7551a4eba5e6bf70848b04706eaf99040c0c483e1
-EBUILD netqmail-1.06-r7.ebuild 4648 BLAKE2B b7694ae0a8d83c4b7ec5e3e7e71df9551114bf85f34b08862b0a5650413127d810756a6db55903903b1dedef626f06bb8e3c07de1ee3a62cfde313f0e8382b07 SHA512 fc13471b148ee1235a1c2e437629e835336f6f88ae66a3c2b93351ed67d6f0902a7754e1015467d91c45e7294a5f0ea8d343e741ab7f53259aa6e5e2283fb53f
+EBUILD netqmail-1.06-r4.ebuild 4309 BLAKE2B 0a1edcdbecbd803b48cbaeb753a4070478113f7b4eb6692b011ab0fb2576eee3b1df2fdfdbdc1bc8ace192548a3dce835a3381cd4cbda8eb5ff6f9b097708a82 SHA512 5c22b73b75638133594bd8e2afe9cc818037aff84c241391e983b26bab24fb513b26a635e31e8cd9e3adca308d06c44587c512dd1e0feff751edf595a2b844ce
+EBUILD netqmail-1.06-r8.ebuild 4595 BLAKE2B a0c4177a597c3dd47cd0c8279a1fb435e9f201c633c1d79542080e56b3c08fd818a301517de8726bd0a48d11e272222d6db3db52ad62bcd2e0ff3427da2f59f4 SHA512 86d397e43560c4dbe9aeed89c7a2f006cc4af2a11c036dbabe15d805e37d3b8bfe4d870ef48d77c982425ef6a8e259b39e6c10694b37b830be4db21f165aa95b
+EBUILD netqmail-1.06-r9.ebuild 4441 BLAKE2B a817d9964ff8b9be454da9dee960546b0ed319d22e96b1b65eb3ddc6c2186d890fee1aaa5ab3f84c5aeb9f36ee298eae78924375be805c1d52b4a9a0fe1c698d SHA512 2a583aaba4463dbcafadb4278ad5607ddfa89ef7178bc8b4d1b1b5b40b050436fb43b8a0a34f94f5f199abc4bc77e3b6b59b5c69f52e0cfde93872627884c3e5
 MISC metadata.xml 673 BLAKE2B ed2a0e5538649aad627dfc0e7c28753f62445d27ea7c27e78fe453eecc0b2b75e902060a1616fadbae59beddb0ff0d24dd6a35e8cd16423df15a8f92a9da1bd4 SHA512 14b27384c8af56fe2d30d12af1d455ce8db52a21848ffc3cfa15e784a459d54c071fd6f93bf467e2e3e1786e41f7207fff0cd77751dfb153373d249c2cd4509e
diff --git a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
index c107db0480f9..f275091da5db 100644
--- a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
+++ b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
@@ -1,4 +1,4 @@
---- a/genqmail-20080406/ssl/mkservercert.orig	2015-10-18 12:46:40.082559295 -0200
+--- a/genqmail-20080406/ssl/mkservercert	2015-10-18 12:46:40.082559295 -0200
 +++ b/genqmail-20080406/ssl/mkservercert	2015-10-18 12:49:03.749576181 -0200
 @@ -5,7 +5,7 @@
  # Based on mkimapdcert from courier-imap.
diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
deleted file mode 100644
index d0a6074fd8f8..000000000000
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20070417
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-QMAIL_TLS_CVE=vu555316.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
-HOMEPAGE="
-	http://netqmail.org
-	https://cr.yp.to/qmail.html
-	http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-	http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-	!vanilla? (
-		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-		ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
-	)
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
-REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
-RESTRICT="test"
-
-DEPEND="
-	!mail-mta/qmail
-	acct-group/nofiles
-	acct-group/qmail
-	acct-user/alias
-	acct-user/qmaild
-	acct-user/qmaill
-	acct-user/qmailp
-	acct-user/qmailq
-	acct-user/qmailr
-	acct-user/qmails
-	net-mail/queue-repair
-	ssl? ( dev-libs/openssl:0= )
-	sys-apps/groff
-"
-RDEPEND="
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	>=sys-apps/ucspi-tcp-0.88-r17
-	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-	virtual/daemontools
-	>=net-mail/dot-forward-0.71-r3
-	virtual/checkpassword
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	${DEPEND}
-"
-
-pkg_setup() {
-	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-		eerror
-		eerror "The QMAIL_PATCH_DIR variable for custom patches"
-		eerror "has been removed from ${PN}. If you need custom patches"
-		eerror "you should create a copy of this ebuild in an overlay."
-		eerror
-		die "QMAIL_PATCH_DIR is not supported anymore"
-	fi
-}
-
-src_unpack() {
-	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
-
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-exit.patch
-	epatch "${FILESDIR}"/${PV}-readwrite.patch
-	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
-	epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
-
-	ht_fix_file Makefile*
-
-	if ! use vanilla; then
-		# This patch contains relative paths and needs to be cleaned up.
-		sed 's~^--- ../../~--- ~g' \
-			<"${DISTDIR}"/${QMAIL_TLS_F} \
-			>"${T}"/${QMAIL_TLS_F}
-		use ssl        && epatch "${T}"/${QMAIL_TLS_F}
-		use ssl        && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
-		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
-
-		if use qmail-spp; then
-			if use ssl; then
-				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
-			else
-				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
-			fi
-			cd "${WORKDIR}"
-			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
-			cd -
-		fi
-	fi
-
-	qmail_src_postunpack
-
-	# Fix bug #33818 but for netqmail (Bug 137015)
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
-}
-
-src_compile() {
-	qmail_src_compile
-	use qmail-spp && qmail_spp_src_compile
-}
-
-src_install() {
-	qmail_src_install
-}
-
-pkg_postinst() {
-	qmail_queue_setup
-	qmail_rootmail_fixup
-	qmail_tcprules_build
-
-	qmail_config_notice
-	qmail_supervise_config_notice
-	elog
-	elog "If you are looking for documentation, check those links:"
-	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
-	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
-	elog "http://www.lifewithqmail.com/"
-	elog "  -- Life with qmail"
-	elog
-}
-
-pkg_preinst() {
-	qmail_tcprules_fixup
-}
-
-pkg_config() {
-	# avoid some weird locale problems
-	export LC_ALL=C
-
-	qmail_config_fast
-	qmail_tcprules_config
-	qmail_tcprules_build
-
-	use ssl && qmail_ssl_generate
-}
diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 913f34b6ea27..8d6b6afbb0b8 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"
diff --git a/mail-mta/netqmail/netqmail-1.06-r7.ebuild b/mail-mta/netqmail/netqmail-1.06-r8.ebuild
index 10a852843631..fd0fcf4bf94b 100644
--- a/mail-mta/netqmail/netqmail-1.06-r7.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r8.ebuild
@@ -66,12 +66,11 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	>=net-mail/dot-forward-0.71-r3
-	>=sys-apps/ucspi-tcp-0.88-r17
+	sys-apps/ucspi-tcp
 	virtual/checkpassword
 	virtual/daemontools
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+	ssl? ( sys-apps/ucspi-ssl )
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild b/mail-mta/netqmail/netqmail-1.06-r9.ebuild
index 196164f97d71..755e1c04b03e 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-GENQMAIL_PV=20080406
+GENQMAIL_PV=20191010
 QMAIL_SPP_PV=0.42
 
 QMAIL_TLS_PV=20190114
@@ -26,7 +26,7 @@ HOMEPAGE="
 	http://qmail.org
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
-	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
 	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
 	!vanilla? (
 		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
@@ -43,11 +43,10 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
-REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
 DEPEND="
-	!mail-mta/qmail
 	acct-group/nofiles
 	acct-group/qmail
 	acct-user/alias
@@ -57,34 +56,32 @@ DEPEND="
 	acct-user/qmailq
 	acct-user/qmailr
 	acct-user/qmails
+	net-dns/libidn2
 	net-mail/queue-repair
+	sys-apps/gentoo-functions
+	sys-apps/groff
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.1:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	sys-apps/gentoo-functions
-	sys-apps/groff
-	net-dns/libidn2
 "
-RDEPEND="
+RDEPEND="${DEPEND}
+	sys-apps/ucspi-tcp
+	virtual/checkpassword
+	virtual/daemontools
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	ssl? ( sys-apps/ucspi-ssl )
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
 	!mail-mta/mini-qmail
 	!mail-mta/msmtp[mta]
 	!mail-mta/nullmailer
+	!mail-mta/opensmtpd
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	>=sys-apps/ucspi-tcp-0.88-r17
-	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-	virtual/daemontools
-	>=net-mail/dot-forward-0.71-r3
-	virtual/checkpassword
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	${DEPEND}
+	!mail-mta/ssmtp[mta]
 "
 
 pkg_setup() {
@@ -105,41 +102,44 @@ src_unpack() {
 	unpack ${P}.tar.gz
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-exit.patch
-	epatch "${FILESDIR}"/${PV}-readwrite.patch
-	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
-	epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
-
-	ht_fix_file Makefile*
+PATCHES=(
+	"${FILESDIR}/${PV}-exit.patch"
+	"${FILESDIR}/${PV}-readwrite.patch"
+	"${DISTDIR}/${QMAIL_LARGE_DNS}"
+	"${FILESDIR}/${PV}-fbsd-utmpx.patch"
+	"${FILESDIR}/${P}-ipme-multiple.patch"
+)
 
+src_prepare() {
 	if ! use vanilla; then
 		if use ssl; then
 			# This patch contains relative paths and needs to be cleaned up.
-			sed 's~^--- ../../~--- ~g' \
+			sed 's~^--- \.\./\.\./~--- ~g' \
 				< "${DISTDIR}"/${QMAIL_TLS_F} \
 				> "${T}"/${QMAIL_TLS_F} || die
-			epatch "${T}"/${QMAIL_TLS_F}
-			epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+			PATCHES+=( "${T}/${QMAIL_TLS_F}"
+				"${DISTDIR}/${QMAIL_TLS_CVE}"
+				"${FILESDIR}/qmail-smtputf8.patch"
+			)
+		fi
+		if use highvolume; then
+			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
 		fi
-		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
 		if use qmail-spp; then
 			if use ssl; then
-				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
+				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
 			else
-				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
+				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
 			fi
-			cd "${WORKDIR}" || die
-			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
-			cd - || die
+			# make the patch work with "-p1"
+			sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die
+
+			PATCHES+=( "${SPP_PATCH}" )
 		fi
 	fi
 
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-	use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch
-	cd - || die
+	default
 
 	qmail_src_postunpack
 
@@ -151,7 +151,7 @@ src_prepare() {
 		einfo "Enabled CRAM_MD5 support"
 	fi
 
-	eapply_user
+	ht_fix_file Makefile*
 }
 
 src_compile() {
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index bae4fe9fefbf..46dd3526b627 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -2,6 +2,9 @@ AUX init.d-nullmailer-r4 976 BLAKE2B bef0e403a51808dcb1a6d08a5a06746e8f164b8d1e2
 AUX init.d-nullmailer-r5 1132 BLAKE2B 2ce6f056f336013fa8786523e3f32359ca5bbdd47343f2ef943b855569a9754d12f65e35ce4d49bf9425cf0d40b628d407b8f2064c0ddc0a742578a852c1c60f SHA512 34a31a53f5f7f1bec4b5cc25bd50e2928cd658360d8430256a5a80a87609a3858a2f2252fce0e5258ac85f1957286c9b449fb1ddb14ace2cfc0dc75cb53aefb9
 AUX init.d-nullmailer-r6 1180 BLAKE2B fdfc17abfac24faa184d9cfe8fe3597f09bfe258ca44c41db05d91e0a086c8b52ed12f722f0ce5ecf1b9b5b11fc420cf13cc9127b849150be87fdd7bce94d859 SHA512 951313ba50dacfbfef440ad32bb4196e276bbe9fb636f05d8e311bd7bfea8e89f135a8e48c9df797031517125c848421dddb41215553144e384d98587c74be8d
 AUX nullmailer-1.13-unistd.h.patch 867 BLAKE2B 758af8df9518938f930f4095ce71c7c088b2ebcbd6a2814a2eba91521d4507df50f3d92a526cbb8f2a94df4cc080ef115c4d1b81dd0a31fb20c3949961ef91d7 SHA512 0a46f6a10a380a3b5b1527d60eef768f2e1b94b2848c4d866bf3088f9b1592b3fc464c69d2559309adfae6fc8f46f3897585d736b37947239106090c3449aaf3
+AUX nullmailer-2.2-disable-dns-using-test.patch 895 BLAKE2B 5b37129452e13c526a391580fb4816bf81c0db7adbed56d2e51f2948fe43e67bb7e1167ebf1ed1d589194204942efc985f18e14e5d2cd495a20f6df051519fa3 SHA512 d16592477612a716a8883ada1f18c34a4add81cfcfdda252705090e1f0b59f22a9bda9fe26bf950a78e21b9a69d20662825461669db72269280b7f82a1f8f8d9
+AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac5db9dc1db1d8937f6773a26668444df71ffb3593d6da4d0a35f74b51d66c019a84e6ef146da12fe60bc5517f543adcc5984060feebe95b SHA512 fc3bbcd8accd5a37b8292c6fb3e935ab1cd35d4a67bb224eadf48ff54b3b00508d6496e3d40c4546a966ce5dd6c297822a4e76a6b9e69d0ce47dd4e0e3883e47
+AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
 AUX nullmailer.service 401 BLAKE2B cca2fbdad581638f52a59caea902ca5701ca69e8b0e4a7c8fd87b8bfe3b9c233422ed0d93c0c583778e25998758c70cdf1602e35316739fa27018a590e28c8a5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7
 AUX remotes.sample-1.13 969 BLAKE2B f973a3866a31b5d6bf1ac227340df4484b570039c7237a7c4e44516b2ca796c627cd00473f42e1c017865915cf8933f4d3df856ead3439d9e1e97bdded8bf81e SHA512 379d307dc28b60e759ebe701d43508b45bc66560879ba2baa30c11c0a57ff67e55151624b5dd67962cb72b22702d14c309f6b6be59a5dd2d030576cb691bcbc6
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
@@ -13,5 +16,5 @@ EBUILD nullmailer-1.13-r5.ebuild 4737 BLAKE2B 38fc205db2a05cabd46966d5ce3068e300
 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
-EBUILD nullmailer-2.2.ebuild 4091 BLAKE2B 58882188fdcb537b8c3937798cb2db5c6629d0a13681f2f99402481a7af1f2a5097f6877f590a4a637c3e22cab32229f78f882be565f8d59f06cdeadc589c999 SHA512 01e9258a7ad63a0abab3bbe342f8282a05da8486826520462efc6f7e48c1a1ae75f33b798572d555d6b1e4efd2e8c600e42009ecee0f498c0a56bc49024779f8
+EBUILD nullmailer-2.2.ebuild 4252 BLAKE2B a81f022f87622ad7e140b85f9b73cc74b78431675f9d288ac0b1fb6e2111417aeae36cbb3b325cb1d02c30bae1d434fdce3838f641d20d76d87b8a380c321667 SHA512 4487c594e807fee494215350801d87aa4c8341b67028e5396c44212ea5f9245ac751dc057425fd35408b5ecdf453a9c3428e541f363564c8c8b3379f809fb90f
 MISC metadata.xml 462 BLAKE2B 6bb4c3b64b2a26224d66df58a133e26bec2c8db7069f5f94b131c4b09387d707a8d5170f0581c9c5136e79af4b97b5f5c3ca4a649171497957ef4aef4312a2cd SHA512 d1370220b0d410947a347c71c9dca8070b3c4a28a82742f618f605be86099ffd37dce1a7d6ab706248eae290aaaf8de2df57c5b3c8f8e818464b9eb5d26d7719
diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch b/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch
new file mode 100644
index 000000000000..0c5939ab004f
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch
@@ -0,0 +1,26 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0006-Disable-DNS-using-test.patch
+
+From: David Bremner <david@tethera.net>
+Date: Wed, 31 Oct 2018 09:18:53 -0300
+Subject: Disable DNS using test.
+
+This is probably against policy, and causes build failures in pbuilder
+---
+ test/tests/protocols | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/tests/protocols b/test/tests/protocols
+index 52209d7..8f67b0a 100644
+--- a/test/tests/protocols
++++ b/test/tests/protocols
+@@ -28,8 +28,8 @@ do
+ 
+ 	stop server
+ 
+-	echo "Testing host not found error with $p."
+-	error 2 protocol $p --host=this.host.can.not.exist 3<$testmail
++#	echo "Testing host not found error with $p."
++#	error 2 protocol $p --host=this.host.can.not.exist 3<$testmail
+ 
+ 	echo "Testing connection refused error with $p."
+ 	error 7 protocol $p -p $port --host=localhost 3<$testmail
diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch b/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch
new file mode 100644
index 000000000000..f66a4841f4fb
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch
@@ -0,0 +1,57 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0007-disable-all-smtp-auth-tests.patch
+
+From: David Bremner <david@tethera.net>
+Date: Tue, 25 Dec 2018 08:18:35 +0900
+Subject: disable all smtp-auth tests
+
+These seem racy in ways that I haven't been able to completely nail down
+---
+ test/tests/smtp-auth | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/test/tests/smtp-auth b/test/tests/smtp-auth
+index 52e12d0..2dc736f 100644
+--- a/test/tests/smtp-auth
++++ b/test/tests/smtp-auth
+@@ -1,25 +1,25 @@
+ . functions
+ export HELOHOST=f.q.d.n
+ 
+-make-testmail
++# make-testmail
+ 
+-start server "tcpserver -1 ::0 0 sh $srcdir/test/authtest-smtp.sh $tmpdir/smtp-result"
+-catch-port server
++# start server "tcpserver -1 ::0 0 sh $srcdir/test/authtest-smtp.sh $tmpdir/smtp-result"
++# catch-port server
+ 
+-echo 'Testing auth success with smtp'
+-echo '250 OK' > $tmpdir/smtp-result
+-protocol smtp --host=localhost --port=$port --user=example --pass=example 3<$testmail
++# echo 'Testing auth success with smtp'
++# echo '250 OK' > $tmpdir/smtp-result
++# protocol smtp --host=localhost --port=$port --user=example --pass=example 3<$testmail
+ 
+-echo 'Testing auth login success with smtp'
+-echo $'350 Go ahead\n250 AUTH' > $tmpdir/smtp-result
+-protocol smtp --host=localhost --port=$port --user=example --pass=example --auth-login 3<$testmail
++# echo 'Testing auth login success with smtp'
++# echo $'350 Go ahead\n250 AUTH' > $tmpdir/smtp-result
++# protocol smtp --host=localhost --port=$port --user=example --pass=example --auth-login 3<$testmail
+ 
+-echo 'Testing auth temporary failure with smtp'
+-echo '450 No' > $tmpdir/smtp-result
+-error 16 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
++# echo 'Testing auth temporary failure with smtp'
++# echo '450 No' > $tmpdir/smtp-result
++# error 16 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
+ 
+-echo 'Testing auth permanent failure with smtp'
+-echo '550 No' > $tmpdir/smtp-result
+-error 20 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
++# echo 'Testing auth permanent failure with smtp'
++# echo '550 No' > $tmpdir/smtp-result
++# error 20 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
+ 
+-stop server
++# stop server
diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch b/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch
new file mode 100644
index 000000000000..8f721d8d8ccf
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch
@@ -0,0 +1,29 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0001-Remove-race-conditions-from-tests.patch
+
+From: Felix Lechner <felix.lechner@lease-up.com>
+Date: Sat, 2 Sep 2017 09:57:43 -0300
+Subject: Remove race conditions from tests
+
+Testing the qmqp protocol fails because the testing server cannot
+acquire the lock.  This is solved by waiting for the previous
+server to exit gracefully and clear the lock. Similarly, wait
+before removing temporary directories.
+
+Forwarded: no
+Last-Update: 2017-10-07
+---
+ test/tests/protocols | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/tests/protocols b/test/tests/protocols
+index 0309d12..52209d7 100644
+--- a/test/tests/protocols
++++ b/test/tests/protocols
+@@ -54,6 +54,7 @@ do
+ 	echo "Testing protocol failure with $p."
+ 	error 11 protocol $p -p $port --host=localhost 3<$testmail
+ 	stop server
++	wait
+ done
+ 
+ stop server
diff --git a/mail-mta/nullmailer/nullmailer-2.2.ebuild b/mail-mta/nullmailer/nullmailer-2.2.ebuild
index 178c1507ac2b..59e8c37fad7d 100644
--- a/mail-mta/nullmailer/nullmailer-2.2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2.ebuild
@@ -35,6 +35,12 @@ RDEPEND="
 	!mail-mta/ssmtp[mta(+)]
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test-racecondition.patch"
+	"${FILESDIR}/${P}-disable-dns-using-test.patch"
+	"${FILESDIR}/${P}-disable-smtp-auth-tests.patch"
+)
+
 pkg_setup() {
 	enewgroup nullmail 88
 	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 77f635bf66df..e3273da05d48 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -6,6 +6,6 @@ AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f
 DIST opensmtpd-6.4.0p1.tar.gz 718638 BLAKE2B 23c1c286a865efcbd16461ec8930f5325a6e164a58ceb7bbe0feb9088bcf615b7fd7e2eb6820bcde161864c476087b39c289c75ea5ca0b18c46710f9723b3dd7 SHA512 c60dbac857925041769104adae33393f526a328767e19bc78d06e45a13b7dd50f3eefdaa3811b8da330c24a670e98da74e18af5ac486266dade6255a6f3b5135
-EBUILD opensmtpd-6.0.3_p1-r1.ebuild 2212 BLAKE2B 95f84100d0fe2f277626682673af2a8fc2244bbe65fed568e77af0562117615e17b567ae1882b65aaf9ae55cf24b89f8d5fe08cdbb0b12e1339f9f7f1f8f13a2 SHA512 fa1ec0814e76537dafa599aa79ae7dfcbf56f766e3338d89f47a6c0ca7d34b020ce502d156028022a8408d3d35cfa35be5b11ecdc31272734a443434b66b439b
-EBUILD opensmtpd-6.4.0_p1.ebuild 2062 BLAKE2B aa407d9d5a94c1b3243cd6c9994b1698b1ea2449d52239d118a7c1071404055edea6e1e29fa2edfaf6c9629d63889d8f577ffc5857d060cf6bb4ae384c67df7e SHA512 e040f564469f5b50927d7a7c0e6e78e8d2cb206b9c5e26ba71fc562ec43f0857db04d21280857f2ee1960ecac4828b1aec1b0ae7dd2021787b171e1cdd4dfe55
+EBUILD opensmtpd-6.0.3_p1-r1.ebuild 2213 BLAKE2B 015734bb445633aa0bc6d62e3dd88948f8f72a1ca430a0a3000fe98c263f10f36f1653aea746fd6d5c4434403a97c08c7ffcd3c84dd083778c5750776067efa8 SHA512 b43bd968b921c33948bd90d30f261250bdad0e1f7913ccf7746c05a5e1ca9206052335fcd1486f8dee6944f231b00a68bc0ac082197c75d1d2b6cddcb78ad74f
+EBUILD opensmtpd-6.4.0_p1.ebuild 2063 BLAKE2B a92dfe9b7fa4ea5f743a2905a452c13fecbaf4e0fbe3850ae4592540d28ee253b21b380d59ea3a507ad16d27afa5474ec631d9885248c943f980ecb1121eac47 SHA512 0c3c4dbffea429af46334ceb4f183617d7e18fa80eb8cd80f6493e661b55ceef8ef8822884febd335ad848a77c23974f9b2d32b23617f93730e4c5cbd72aa384
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r1.ebuild
index 48e538cad47e..bd087d961d5c 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND="!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
 		elibc_musl? ( sys-libs/fts-standalone )
 		sys-libs/zlib
-		pam? ( virtual/pam )
+		pam? ( sys-libs/pam )
 		sys-libs/db:=
 		dev-libs/libevent
 		app-misc/ca-certificates
diff --git a/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
index e65261f47d5c..51dedcde092b 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="pam +mta"
 DEPEND="dev-libs/libressl
 		elibc_musl? ( sys-libs/fts-standalone )
 		sys-libs/zlib
-		pam? ( virtual/pam )
+		pam? ( sys-libs/pam )
 		sys-libs/db:=
 		dev-libs/libevent
 		app-misc/ca-certificates
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index f9aca3a598cf..1f7b84e60c40 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -12,9 +12,9 @@ DIST postfix-3.4.6.tar.gz 4571771 BLAKE2B e08b2e6c01fe54fcc7439182783190f4adb817
 DIST postfix-3.4.7.tar.gz 4572758 BLAKE2B 8d811293672fc2a1e0e3276fadd172d9e130a3e0b5ccbaf27ddf183a50f25ca9bbf5c0a28806bb1f79d5648c4de44edd8ee98192355077e29a0c69a2685878dc SHA512 2bc29a87a65c46d06b6fc51c4cdf22da773e63f19488871e040eba6250bf686eecc7de11e14224018c35b061e66e1759c69dc649d7388f724a58080195209e68
 DIST postfix-3.5-20190922.tar.gz 4618100 BLAKE2B a5b222fb7747ce074a54817c38d7515718e18b16bac1c76a4be0ddce2a2a215e8fc864fa840046d74098710bb7c910307f4a4ea24e91804e2190eae0fb26c295 SHA512 8ee18ead82e68a751f72bec31d31de748980e13a3c9c3d49c141fd3ad02b04a1b1386440f71fed40cefcc8d77a3d20ae8b36fa6f29f35d0a221b24472eff7979
 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.4.5-r1.ebuild 8985 BLAKE2B a59730210c3cb71aac658e50142122a035e987b335a62aa51cdd320513fe5da41b7dbb96cc052daa6a6ecf215b9a1a57a2770c38274374330aa47bdbfbaf7a34 SHA512 726ba0211a0fe817e927a1443c9fbb22503297cf4ff19a90b8b6472ad99adc3e6ca99cce5b45f73767ab2be162f43f2031c35f895c21c17a058dccc1a7af2609
-EBUILD postfix-3.4.6.ebuild 8994 BLAKE2B e6270859e157d29deb7e9d069b4fd305cc0b8bcba3b0023eaae7711360d5005cf7e6f4fbd63d1f0ec257de38cb211ff45836740662341e295fb17b281ba19d87 SHA512 500f3d61806129ce2b023992a93df0c89905e41a8a48a059c073b367e24dc2f63a5294eef9e25bedf857da48aa4880b7654b0872b13d5f744979f1c934911ab5
-EBUILD postfix-3.4.7.ebuild 8915 BLAKE2B 94099261f3f478dffc97d9cc32e0aec325955fb6836190d48e9faee9756f9cb3ae40fbbdd077fe69351f87242d2409ff12f3524eb8e50458dc00a91ab3df9f2f SHA512 82137b242e86f42aa13a6aeb99691f93104f8774db757dbc305beff638ed175c3167647e8c192138c589253002905f906d9cc9c2f1427f8c9303d915a0d9e96c
-EBUILD postfix-3.5_pre20190922.ebuild 8882 BLAKE2B c313a91bfbff1f40d0af0dd99cfa335f7329add56c335fd92de2431e706baefc5d18b0b12ed424ca009ac10b5cea5bf13502877e2ad06d25c82cb3ffdb26660e SHA512 347429b477460a2f0e88e36fb58b28e1a2238bb6a80a687f52c6f6facff464963f12199c325d7d01211b045161e52d34acdf967fd9052047602fd838e757bd93
+EBUILD postfix-2.10.9.ebuild 8729 BLAKE2B 70118c3d40415b33554420fc02d1eef03d4116dd196e39b46f584d6ca36998745ee4e4e8bde9721d0521c3c5654d98192a9955e8ee8e1915d01016db476bfa7f SHA512 42f0f15619c1d9143f00878a9335cd86cac5675ab395669222e6d2d449ec63bb573d670c6015c70257d28a5a4e6ad62d40fde30ef84fae5bc8db567ac6ab3de0
+EBUILD postfix-3.4.5-r1.ebuild 8976 BLAKE2B 8825ccc728a83cff1397e8864cd9c49f7d961dd17644537b8600f035fbc112f2c86b96f38e908a91e50f8fcca5a6a87126f4d9160c70b1e0c894b03aab94170f SHA512 77aebbef0215921e04cd73650b5d37a1e0f53bb251bcc8d189ab86ecb2d6f1a50a739c93839a92fefef41667537b3561bc738cfd2fb7bce2f1d4707ba074d142
+EBUILD postfix-3.4.6.ebuild 8985 BLAKE2B 9f97b796aaa6901751b93b5c87af8a444adf5aeaa0f5455b5e8a878439e5873205bc578c58c4e2c035539774f4c822182116a80c77df52e394145526cf116e95 SHA512 d5280081a7e717e73fb140dfafbef3cfe4ca796fb8a26b487419fbd9216985c8ec3a2729b27e0e8dae44523268b82d49f6bf18fb3cc0907046edb1e5ed076457
+EBUILD postfix-3.4.7.ebuild 8906 BLAKE2B 8d6543b946497233a19ce62afb91e7edfbf0c6b55b93fb45a5aaa440a7db25f2c1b72bbdc2fda8cc7b7041e6ccee43224015d856c6d00abd75ff30932993357c SHA512 74967d3298314fa2e8187d21808f63e72a21609306a8f197904f0e8109a510ac4db0a2f87e59c28d7d3725245ca7a6ccaace65fe4d6eb3da68c2f49bee9f0239
+EBUILD postfix-3.5_pre20190922.ebuild 8873 BLAKE2B cd049814e94a9289ef6925bf8bada301e161432290930bb6bd50c9a0370f1752b61a7f13abfecc7c25134f04731fecc367be5191d3e26a0e0915ca787c028210 SHA512 1f1078d635e36bdceb9299c8a1dc7e3bd6ac0fa7a50098c3c1f6ba6f3ae394a2836c076182cf326a97b145b6626a87f2e84ca04b936a783c469f4f5d580187cc
 MISC metadata.xml 1023 BLAKE2B f0bcd846c18bf1459ac85c75b6e41c90857d800d49b3efdffdd0106616e453869f43004c9a38395c71e2766b9b7f83b25a702b3b39d6264d83f79481b6cbba43 SHA512 2511ca5d5cc134afa04d1f596084eb2f7102c45e883edf3290c00b2f733b8a1a74ecddcd6b182381ac86da2616097c86a8acedeca199747b33e403b8488067b4
diff --git a/mail-mta/postfix/postfix-2.10.9.ebuild b/mail-mta/postfix/postfix-2.10.9.ebuild
index 9bfc6c311917..44058e81d3e5 100644
--- a/mail-mta/postfix/postfix-2.10.9.ebuild
+++ b/mail-mta/postfix/postfix-2.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,7 +28,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 	ldap? ( net-nds/openldap )
 	ldap-bind? ( net-nds/openldap[sasl] )
 	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/mail-mta/postfix/postfix-3.4.5-r1.ebuild b/mail-mta/postfix/postfix-3.4.5-r1.ebuild
index cc0aabbd9776..465e066c1ad1 100644
--- a/mail-mta/postfix/postfix-3.4.5-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.4.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
@@ -29,7 +29,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 	lmdb? ( >=dev-db/lmdb-0.9.11 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nis? ( net-libs/libnsl )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/mail-mta/postfix/postfix-3.4.6.ebuild b/mail-mta/postfix/postfix-3.4.6.ebuild
index 567efe8d5298..4a5c0d320d24 100644
--- a/mail-mta/postfix/postfix-3.4.6.ebuild
+++ b/mail-mta/postfix/postfix-3.4.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
@@ -29,7 +29,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 	lmdb? ( >=dev-db/lmdb-0.9.11 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nis? ( net-libs/libnsl )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/mail-mta/postfix/postfix-3.4.7.ebuild b/mail-mta/postfix/postfix-3.4.7.ebuild
index 2cd31c520af4..96be7c735d7e 100644
--- a/mail-mta/postfix/postfix-3.4.7.ebuild
+++ b/mail-mta/postfix/postfix-3.4.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
@@ -29,7 +29,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 	lmdb? ( >=dev-db/lmdb-0.9.11 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nis? ( net-libs/libnsl )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/mail-mta/postfix/postfix-3.5_pre20190922.ebuild b/mail-mta/postfix/postfix-3.5_pre20190922.ebuild
index 7e5bdb3906c9..267950e32ba9 100644
--- a/mail-mta/postfix/postfix-3.5_pre20190922.ebuild
+++ b/mail-mta/postfix/postfix-3.5_pre20190922.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
@@ -29,7 +29,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 	lmdb? ( >=dev-db/lmdb-0.9.11 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nis? ( net-libs/libnsl )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index cc3f0c8fb62f..3788661d093e 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,6 +1,6 @@
 DIST ssmtp-2.64-patches-3.tar.bz2 5128 BLAKE2B c41c6366a0cfc59a2bbb935d9edd209b439ec4512bc43e0eeadad944af03dad5e25cf03270f352edf3fed45f1f8ca082ccde775970cae8e48655de01d3a758c8 SHA512 140ca571705ee45ca2d6718b456ab028e3aaeb910a64230d8143a29de837eb3be8f16641f21f56f2c5112867512fabdc952886701d596f0bb303fc1524a1ad46
 DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e296031580f63ed489a9d2559cd8846761e78c6fdfc1a385e645f990bc739ce3cf3ad0d1c1a3006dd3bd60e4a38c4f4 SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a
 DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72
-EBUILD ssmtp-2.64-r2.ebuild 2959 BLAKE2B 562ffd4f68911f4cced133576f28def5e538f4987e1f5985d4c0557832da8d846c135d8a69dfa0a865255c7313f5a9866c4447e35438b37b8f644ff677a6e9ea SHA512 c9092d1f510608d22ae2853b119d4d88dfec514e6dad62eb76c9f5320b511392b676e2599419550f2a2341eac61b5537a75cb8d02cc49c17e6adbba990d0f96b
-EBUILD ssmtp-2.64-r3.ebuild 3041 BLAKE2B 71554ebcc5ed2451eac745610d349fd5c38f58290fa8aae43ded9acba5f179243b40a779783bc2687b1262711f057ad9f749ca9413888727226f67c0245c2387 SHA512 92ff95ad3b4fb3cd83cb77d718bf4713475b473ec39c5a0b28f1cef9d61bc6660a92491a68a64283013d9ee95fdd79f43b1785db15977a7b17b6cd3c597c01e1
+EBUILD ssmtp-2.64-r2.ebuild 2937 BLAKE2B 21561097f864cf943742f1e9f7366f24600c6a22b602a24b47527ba9c51a4c51a58bced8afe6294317e8af2347a203d84d2f525a85f7f819bdf5a7b3ce9faffa SHA512 010659558b26e2a51fb0c97395c68e1614dcc1df41ba924ef037b7ff3eea76d1886ad2f0a842c661a039336d8a53783268675f42d8e5a459043986c50887fd1e
+EBUILD ssmtp-2.64-r3.ebuild 3019 BLAKE2B d70bed926d7ef1b7e2bbaa7bc9a5bffc04bdb601a25239719823b5b9c4dace8410aaa1ee610d03cf398e66d98d12471d3070b37fb964380412df97b17286b891 SHA512 658a37336b701f950f6c0b1c972e8ca2dc42206f6b0b7cb050a27ccccc1c863ef06015795336eba35a40d691d61b15eea0cdfbce2001dce2b5277afc9ef2c249
 MISC metadata.xml 259 BLAKE2B eb59516b105b0fdc4b755c3852b714707dba4f5b414eb0eea763db68aa0c5d1971b55866972ef14f1e3e5bc81ccb66975a24b9292aa796edf02877d649a661f2 SHA512 3e7a5afefe4f2095be4347e56af64eef343bbb4920ef80a7d93c88111864e8993f899328af33e736324960d26f30939e29e001e90381548a353ee0089f96a766
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
index 37d8b85b8947..30b375ca20d5 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6 +ssl gnutls +mta"
 
 DEPEND="ssl? (
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
index 36d152423f81..3578fd7d685a 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6 libressl +ssl gnutls +mta"
 
 DEPEND="ssl? (
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /mail-mta
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)