gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /net-mail
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
87 files changed, 165 insertions, 4461 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4d2431c079f9..722a3b7abffc 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index 4ff0647de72e..d0a6429c5ee0 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -10,6 +10,5 @@ AUX unchecked-encrypted.patch 2022 BLAKE2B fc09850f9b4aeeccb5047086ff32add53347c
 AUX unescaped-left-brace.patch 2043 BLAKE2B 4755ef33bbb8961fc69cee4276546724f1fb5e89b92107baa4b2a5a7f1c6b0f611bb24a5184c7657496784343f3b7639dcbe41bdc70d26de4343576c30bebceb SHA512 3e2f18070a76624b260bdb11586abf79ae16f237d0e765a766ce770e35c8aab6afbda58589514b65a3afedfc9104f491c1e69e3201f764b6590b5f34cde9e745
 AUX will-bind-to-lines.patch 1077 BLAKE2B c96651f6a0b68a4b95eb571ecbe7a7002a20b765184d28ea21e32b96dcde67041bb03431674a9f51809a528f20e14e50337d2c1315a6e19f4bf5a2da5bcd11d4 SHA512 60a0844d7a6a17b7c79422e641660e20b69cf89844bcddf3356ff6a60b4c4ff2b2e90206248a5a5771e014edee2917eb47e83276a0e56aeb7f8dfd75d55190f4
 DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
-EBUILD amavis-logwatch-1.51.03-r3.ebuild 1191 BLAKE2B 24340243fd70ec8be31da53dead0e5de83faf88bbb2644bf17c063ee03e605cd009f7990bdd8479798c1959f1c58243de345bf52cf5007ba507f65aee0f3ff07 SHA512 f6d22402f6b81587d8d98696f345bbda89b3e4c1b312e2713affda611a1b4faec324aea02deec07f6ee65e447a7a5c17f2d5a8376c0ce6fb1009a4e75baabe15
-EBUILD amavis-logwatch-1.51.03-r5.ebuild 1421 BLAKE2B 8eeb314a2c0ca87504eb495846b46c5d797fa244a05f86ecb2f579649548ba46bd510b55a65d2897dbaa18c1a7503721c14cadd4f9c3d61bd469734104738d45 SHA512 e6e02eb3a13025820714e78f312b5cdf4c19a94eeb537780cad04e0992e942b1d391832e1812fc0f468ca53b2b9792bedbf1a7dc4e3b7f1aa118c49799c7dc80
+EBUILD amavis-logwatch-1.51.03-r5.ebuild 1419 BLAKE2B 473dacf0d49b067d0a6354c7026f54c9d8d320997ef7f2abeb2b4ac6a42f992235b64b213322f2e28995a1f338b97550a617913f8d84e7542488b351fde689a5 SHA512 bc2bf187d2165207c5ac62964444dcbcc994101bce9baa50dfec1798750bfe53ba2b38c5ef1152950ab2ec4529d08a82665c76dccc4a8f1d0c20ec6c02352fcd
 MISC metadata.xml 296 BLAKE2B 3c33a1b9c58306354a087f04e040a9c1e8cbeb17635a1f64f206de2ce47a226068adad992598588e4d1d916ce5eef5c39b6f3ec95ec92ea6807f6e4186522d71 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
deleted file mode 100644
index 79d11a94ef74..000000000000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/unescaped-left-brace.patch"
-	"${FILESDIR}/redundant-argument-to-sprintf.patch"
-	"${FILESDIR}/ignore-amavis-startup-notifications.patch"
-	"${FILESDIR}/ignore-utf8smtp-lines.patch"
-	"${FILESDIR}/unchecked-encrypted.patch"
-	"${FILESDIR}/file-libmagic-errors.patch"
-)
-
-src_prepare() {
-	default
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
index c7c607e6427a..17b9ad2d5afe 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 69a2cb86000d..1bc438a76ab5 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -12,9 +12,9 @@ DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c3
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
 DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a SHA512 f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960
 DIST cyrus-imapd-3.0.9.tar.gz 10771916 BLAKE2B cc483246c83ed55fa7d4e85aa8189852f2e6be23aff5bb478c2d2123e3d928cc8248e580c80c1474b2b3eea9aa1c0f8b3336f779e72e690d8d093e70993cd657 SHA512 d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738
-EBUILD cyrus-imapd-3.0.4.ebuild 5896 BLAKE2B 933086d8d6d45ec33a5a82a0a4a90b1c83848a9d59e39d2027da4ea52a28e9302040e39f61a28ef6112d012cd7bd4b9934506993cb2b8d6a1de75a15a59828d0 SHA512 e0ebe34958c93003798a045c64287dda83d97d1d829889f4601446567ac2f0334a03acd554f0cacdd86b90fbf167f13c020e5b3edbdf78f3d9f9a9d871ea140f
-EBUILD cyrus-imapd-3.0.5.ebuild 5944 BLAKE2B 43fa76c0bda73b8e67440692b3f5586c6bd4435a852c90c63b986db724eca95c12056182e6f52bbdab827aea004e75257a6bf7ff5b0d1ae66d54a865c5b22d5b SHA512 2e9f38bb940bf33982b5879e39106e195dadc47c75772951cfc077873c40d38bcbf479c42ab915b620c1d442d454fc8314f10a98400464f11d2798ced74fa536
-EBUILD cyrus-imapd-3.0.6.ebuild 5946 BLAKE2B 39e6abd36bcc447a79b6b6e34f051090237ee96996f00980e3f1ebf70fa66b1791ac2ad3ed42f1038ffcbf32a650b3d9e29b3d19e5aede7c960ce11d23377a7f SHA512 66fd355b5c1f3f1b99f96829de8f5d670edaaa0cc4129a8a08d8b30509b86104456fcb912f1a444bba2132d0724530b7978d1d9dab220a5cdfc906506583c8e1
-EBUILD cyrus-imapd-3.0.8-r1.ebuild 5818 BLAKE2B 552068a64832e0576e3ec639b588ed572b97c5ba0f33c12bd06af54afde4dd274d96642d014ffeeff2e36ad71753c1968031ca6bda696cb33f05ae5baab30614 SHA512 6db81146d2a2930f7b73e975130e61ba9da1c9e511ab8ff838c79a834732191dcb61376bea6e4db557d6921daad8e58f1af106c4be3730c5c8d91d86c3386f75
-EBUILD cyrus-imapd-3.0.9.ebuild 5951 BLAKE2B 555fd5360af28bf6163302399727986d47e829148cc5e8f9ef88a7b703be4378928d82d4ecf4143c8d0cd80dd20546fc2e52f9020b72312e6c71e28363bc6342 SHA512 74d3e09860e5dd723e6f8952d3de8048318f248e701eb314962240b1940c39019968bb432513fb5c136b876264e04ab2618674f449cb895eddc89948912406e1
+EBUILD cyrus-imapd-3.0.4.ebuild 5895 BLAKE2B b7913c9e8d1997ba5188ae736c53869e2121e7aa5d26f9308b8226f7e6b021d5306ef8e508952bc1334ebdfd93b00404bb0e650408c8527fc5508e330085dbce SHA512 14b4ff0f7834dfdd6ca4da827e5a9afddfcb8db8790136d3ed9e5330c305ae933f4ebfdbd8033ce69440cf9dad5a62c6395030c863e7808d616a3ee5f9384833
+EBUILD cyrus-imapd-3.0.5.ebuild 5943 BLAKE2B 0e6570961c66c54f1150ea3cc6fac6437acb570b66d2895b314574c3e1901db4bc51cbeccdc4ee651d2aeff7fc728e7e519730eff0f5ab3090f9bd68f2d48f54 SHA512 694fcd9df8774acc58661ab01791a8b0200ce8c3deefd1cbfd74a7d872a4c572700ff8f030726d3ea296c6653f3937d502884debf913253510f3f31ca54c7624
+EBUILD cyrus-imapd-3.0.6.ebuild 5945 BLAKE2B 3b3a342bdf6b7805eba36fa7cfdb72f951afbc1c4bb11d0784b0d2b40770c19c7e5171fcf7f1c2012f77be694fbc6bf9fe1199dc58bd2aa7f16234be04d78539 SHA512 6dfca67ca8b64662dfd3a1595ec0513053ed99300f6a22408d80ef3f32818e399515ca5e24dd41c62dd277f3a1c19e3cd3ac2fd06e6c612b28f67cc78fab1300
+EBUILD cyrus-imapd-3.0.8-r1.ebuild 5820 BLAKE2B adaf7a15b55682e6cb7e597a14d6e25767f07ebd66bc49c596b6821b93ebc63680469f850d92c4c2d8a640b2faa8138f6ca4522ef3c891ffe76f63dc1fa9d060 SHA512 4c194d305c2ac786df436056ed83f0aaff969ec8acc6c32ca6ec6bd265b806c569e038c17a8ecd4f3f49838cf79dca57b37e144984b123c5a544fde8312f46d8
+EBUILD cyrus-imapd-3.0.9.ebuild 5953 BLAKE2B 0efa93b675ad68ecf7852be147a99873eee64d0fdcaeaec5aa2ec7e3b4b4650e9f9d013f6a6cbbae4e9370bed85663e17fcb20112eb60ba1e5d74fcb488e62ef SHA512 3aa68647c13c4b0ca7f293965fa3fd3ce85822b25478dd79131432b840901f700d47a58b1bed670babb3d4095ef5660f0450de46e781d76e41956b3cc3a71329
 MISC metadata.xml 793 BLAKE2B 9cc25eb60bf75328abe6d1e06ff11074a1234ab404b4886868c73a34b265bdc189e61d21686f6dce56cdde932ef5bbbcff3a6705689ad8c12cb7ea08fe9c8f79 SHA512 b371032c270fd20385959cfcb4356f0258fce84b5f4d35f499225ae81beba6e3933c09e180c9b482358ae3c8447d25b30bc87c1671e24d94018ecae71658f655
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index 96e20cb3c078..6537bc8a8261 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools pam ssl-cert user
 MY_P=${P/_/}
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -214,7 +214,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	ewarn "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	ewarn "for upgrade instructions."
 	echo
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
index cac40e0b55c2..20d7ed75d760 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.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=6
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic pam ssl-cert user
 MY_P=${P/_/}
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -215,7 +215,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	ewarn "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	ewarn "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	ewarn "for upgrade instructions."
 	echo
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
index b5c209187c18..54e10fe359c1 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.6.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=6
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic pam ssl-cert user
 MY_P=${P/_/}
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -215,7 +215,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	einfo "for upgrade instructions."
 	echo
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
index 766fa2077b84..330e8d86ef24 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools flag-o-matic pam ssl-cert user
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -208,7 +208,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	einfo "for upgrade instructions."
 	echo
 }
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
index c6ba07699dff..e97e19d6192d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.9.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools flag-o-matic pam ssl-cert user
 
 DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
+HOMEPAGE="https://www.cyrusimap.org/"
 SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
@@ -212,7 +212,7 @@ pkg_postinst() {
 	fi
 
 	echo
-	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
 	einfo "for upgrade instructions."
 	echo
 }
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 86c01f16a5c0..6d9cdf1ac555 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,34 +1,11 @@
-AUX dovecot-10-ssl.patch 550 BLAKE2B 5317b802113e6dd711056684bb2de8167113c95ea28ea805fd3a1f688878505d02d85bd9ab69fc222cb2debdc1b5186f48f3c2cbea2f1df24714482939284f46 SHA512 7acc31dd4a3f51a9c13d590fd2803c2cb98c281e0595ca2a800539a143f89b95f923a3678beb0aa2b254a54385522329e0f3e1e8ba4c5852e7b51f8f111122a9
-AUX dovecot-glibc226.patch 2838 BLAKE2B 522fd7552faf88cba7c48f5074d264ca4450d1f72113eba9a7cf23317402b76a53874998bc0eb6cadb4580935dca061314b7c6bd355a6ce618c43465a7c8c5d2 SHA512 5ed7a19941cec35a8edace588bedac7d6d12903bf5ece2a224a61f021ae663352dd668c81cebe2c9b132fd0614998c77f1d19de2f48b2d3794c453b9ae333693
-AUX dovecot-glibc228.patch 1375 BLAKE2B 737b631f7171f265d8d549fe549785bf381de8d954b79193b0405d9ecde27078df77fa56be062c8160f803bc8e3806f6b4763e31a9b1642d00e14a6ad9c6c22b SHA512 1d49c173115dbf76936a2071918249a4909833a8f2fe852f0e1257e58d4b938894abf62d9f305f7008f2d180b827a7e8313f24375116369f6ed644e26fff4de8
 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
-AUX dovecot.init-r4 1499 BLAKE2B 9c05fd7da0409b0944b0204bdcd683ab889190effc8cb7b072dcab140f52e2f39336a344deb74b63ef184152604412ca4c2b3d79c3d63341386e7952c54b0a26 SHA512 8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09
-AUX dovecot.init-r5 1461 BLAKE2B 9ac7c6503f1e97c25e69d3be3e105d66fa16a63896adbf8042a0752204cff84a7f123b8706df6683f4c1bb019b02282642765c911f65c5427cc07fd824509a67 SHA512 7a092a92346854a4bfb8bd4a0b935e2a1c3fb3fd27be000b72e8963b435095ee6ae71e582927c9dac8efd842a1814a38d27ce3df04a8a9e5579a7345d9bac9b0
 AUX dovecot.init-r6 1573 BLAKE2B 7565a20d0677d6e380756627360e65703cd6a29982cb7e1c1d6ae51fe99ec33c00c1f04c471bb5741321369b8c0e4767eb69a83b9d38e2789bb3d7a79630ea04 SHA512 488a1213514f066fdc7b97e69a1a8336eb4c83054d138d94a63bc733a2163d0b316a6485bf1dde6c4caae92c7dc8d9bd58a4c723b6c0e81d4b130ebd91875baa
-DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
-DIST dovecot-2.2-pigeonhole-0.4.24.tar.gz 1808131 BLAKE2B e8a19b5c3b4876e71556e52ba6a984f6ed0abe93a222f692303fd41cd7a1e6e4e8fd0e5ab0821e9e179b595694752813689a07b428b2590582c3ca7dbb99a08f SHA512 2e21c95ece475ffcb78e5b5d4efa29e61471faf90b80b44a49963fb287de2784ebfb4c2b7ddfc66732fd073e9f02995d5950840336f6babe618b3d7d5166059f
-DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5ebffd6e2ad7878d47da808f81b2f21ab4de02495f6ca79453ab5867568afee7f2d9a0915601ceccf5c6a9581d38994c4d35f692e7 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2
-DIST dovecot-2.2.19.tar.gz 5256627 BLAKE2B 0b7fe57ced1b1f7eb5e29e8d6723d237cc107752286995d8e5f6857f24b45ab40c4a38b03935b228e8530c3b254509124a7b6ce4e0a8a9be0ea87f0c529db935 SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9
-DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055
-DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
-DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
-DIST dovecot-2.3-pigeonhole-0.5.3.tar.gz 1827329 BLAKE2B 0d484906022217b1082233e6a3a20c17bafc68b90ce1c5c956c714d111ffb9ab49a3794e199695bb61a1f3ad6bd46e56e63ee3c140cb01eaa7589ef7bd754b19 SHA512 8403b1976a915836ba875b96825446d46e0d8c7ff245ed1f2b014347fdc78a81f9ed6dbd05bd3b4f1f7072edc5e9a302201cdb375de44436adcbb83919f203f5
-DIST dovecot-2.3-pigeonhole-0.5.4.tar.gz 1831570 BLAKE2B d3e7dea3cdcc2b44476401046f6bd6a110a026d523ada2a898b5c99f509cfe37771dcfd31990139f5f4c1c6b405a9f27359cfd27a6e95525515a3aabb71538f8 SHA512 9c82cce7540f8ab66e2e370e0220c99048d6ac53ed680cd763e0b03d0200e2451cee4303ef97b87a16e7248e1c73b92ba91b47a2a20c75cb2cd62695a28046f3
+DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a SHA512 99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd
+DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5 SHA512 47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35
 DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc SHA512 21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94
-DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
-DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb09296af617530a4d5a89b4fc12055d006d1b283a4de076f27d59deb64324b96f28620958ad85c38197710c5decdf7 SHA512 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff
-DIST dovecot-2.3.4.1.tar.gz 6925073 BLAKE2B d8143bad01c107b68525d0cfc110e5bf4e3ffa0af49e7cafdfef263374e146a7ef6ed7107a7c5216c4b52da3640d7a9a80931c01d125d3852fa265171e4d4e09 SHA512 ff21aa0f0cae17dfa66617291688856727412defa48bad2b6be057cb509fbec1c2e134afbfee69929d06b8692a0fcbd8451671ba02860e1673ae1c9483c2c17e
-DIST dovecot-2.3.4.tar.gz 6924178 BLAKE2B 13e52a1b04036d58e68d762c9330dd5efedbf2421d658a8b657ca59e311b899a9b4a84fd754678ee67cd5b60f47b5a5ccd6a3fa08fafca7413c8b1e6ecd2fb51 SHA512 9e97eb08c319c417e8abcb430b3e6c87ed5aa820d6288656fdfd958ff34664f67202a66e4846763bfc85b309b116cea8012e49dab98b478c57974cc178a37a5a
 DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7 SHA512 e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a
-DIST dovecot-2.3.5.tar.gz 6970480 BLAKE2B 006f64ce87e3eff04f3df7689ba9caed0b6b4f83eef28ee8fc2bafcf4a90b0255bf3d0d5d6b32571de8eb339f720a4d7b6de7dd5e3bcf6d03ecc5d6fa679799c SHA512 10513c371aeadd52184daaf8dbb9a7559c6db55e34182bbb2c9539dae0897ddcc76f6fe2ce6a81c7ce0cb94c7f79438ae3bb0e7db8ed46615feb337b4078ecc6
-EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
-EBUILD dovecot-2.2.34.ebuild 8652 BLAKE2B 473b843fa61c17b3ce4474175aca83e9b5c76641853475de27a87b4a84f8101a5dea4c22a6aac0eb21b253ba9dcc8e139eec3283629f2f672d350144f71d3fdd SHA512 0eed64f5d2841aa46c727ed75ba5ff7ac4da8b3bee056990d327e36a8e951e85b70822271dc30dbb3ba80b599dd5442c4ad5efe7cd00440795437ba7218b47dc
-EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740
-EBUILD dovecot-2.3.2.1.ebuild 8781 BLAKE2B 8941937ad0e2351d3cbe5a0a0c9c213f4834dc521da6d3b4cdc89ae84c68de021675a9e5431bf397fd0e4bdc783ab4e9a5bc9f175670362bbef5e87be04f23b7 SHA512 1946fa62f751322c817c57eae7784ef9680a5a53da33785916fc3cfada3e67553153ba46caad9f38f3f654008bcf7d8f9098c250c8d750d1c7bcebad6dc8e98f
-EBUILD dovecot-2.3.3-r1.ebuild 8836 BLAKE2B 214e3df6d39beb54d30fb794b97368bea7555ec0e198a4d8d7f3379ad3a46514ee4bb326e33a853fc186c9ae88ea42d1870ef3a0ad0bff59ffe893d1a0bc9bdc SHA512 f83c6b24371de82172e256cd9f0f70ffcb903495316519eb9b4c1419b9d7d794749abcf0e8ad37fb9f96454f95d9d0743fffe8ced9513382c6413971eaae4c2b
-EBUILD dovecot-2.3.3.ebuild 8789 BLAKE2B 6ab8548635742ba2dc82fe4b06ee4438840ebcd1e2d4cbef4662e3fb42a74a10aed252e6e28ac6f56b60006f44c1fcd823373f86d4b06245e06a8ae3cb7b6cbd SHA512 466b7ef0098884c9ef885048337ac68aa9aa3f40ad9a2c5fa6231f3dfbc5909fa97128c2872c8e9fde6a9a2129a096cabb1e681e2dd5fa0ac3d9cf89912d2445
-EBUILD dovecot-2.3.4.1.ebuild 8799 BLAKE2B d5b1129e0f7c6563682e345a5d7575761b5a206caa2aca36c4e002b51e4357980a2f93ecbe3974b220b00b04dab49f141580d77825c2850fd2cc4ffe089c1fee SHA512 a164ab663313a9b8334112377349a2ae807140a27d5c618d5d69c30a926d2d2854696516a4f1d59f9d4b8154ccd116213ccf0f9aeb7e1ddc1ba6717e0c744978
-EBUILD dovecot-2.3.4.ebuild 8799 BLAKE2B c80a46f994df324b88f35b9e6514742d12b93aa49016c9b655d3ee90ac5d27d14d3e26da9dce440dd19b59f3dde9d115f9cc6fe90dc48f7800ecc9bfa3ae0987 SHA512 2d4f00a1ab7dcd716141df08002251f26571d153ef58036de0dba6f828f96b48c9402b91fd4dcb2f5310332ad9bd7b8596b334df348ab7365a75a957e82c8c57
-EBUILD dovecot-2.3.5.1.ebuild 8790 BLAKE2B 7934d5a974c8c1f1d238edb02fbaff82df00b740a5400057d1d4f4de505932c1e9ff245687a2742558c54b697ab35b9e366f2abbc9e1c528426c07766976d175 SHA512 3d5b366b16f8df9ba24902180eecffe4ef4b09a27186190dc8e5b81d7f14c9e54a9b0917cdaefe81ee80283b0784dd9474ab58a262fb0ae059d2364fb22a2fb9
-EBUILD dovecot-2.3.5.ebuild 8814 BLAKE2B 20510b5b6c93dcf98b396bba828d646e2957be0da1dd626fc8483fbfd5709ff5ce284bae6e2303c8441eb585a96f9656d0511fa288ce759dc959bd3ef8c90f0b SHA512 538968024f28527c502d6f4da58a46c938d65294f0191ff9af7237604db852f031fa1f6dd6cd81cd7e20d4eee401d536262618939d55ab6a887eaa0de4f2ba62
-MISC metadata.xml 1233 BLAKE2B 2b9193a6d3a417f28ab0ac92ed03315f2f97a43102ab9744e227d5054919b2f6be1b7073dfd50bcc88760a6e4854a16f12ed4fdb962c56491f4ac2147b2216af SHA512 4b73eee6867e764bb94a30cd05ee7bcac75f97eb623bc457d811a71d12ed500ac198acaba784c200f103179a58beb804796bf048c220ad7fcef4dc4d28a0b026
+DIST dovecot-2.3.5.2.tar.gz 6953228 BLAKE2B d3634ca0621349ed82c552b416bd633497ce9e4bdd5df30c2e35da1ab70a5934e2dda2b88ac6bbebeebc23918d9dcfb7a0976b1b51fba5eefd14327b2b2ea734 SHA512 041ec1c33c6accb5c89d96d7ab2f7dd59795f496c17faea1906e7977983e4a387aa855a238376515c09532731634d9d42e6d6be22659062855241847ea0213d5
+EBUILD dovecot-2.2.36.3.ebuild 8599 BLAKE2B ce60439de2676ad168bbb8355f61072019ea6ad4ef9e357b401bfced19b4d0d0f842926d83cf8e2348db460b1bb3dc7a5537b457835eedfe16e03a024fdfa65c SHA512 ed5940edaa0c1bf67065354f9e433901bc556a2c3db071d8c9d1c6a9ed02b86f151729c6ec5ece5a2924662d3ed8eaf1df19ce1979d325c03b932751b3921afe
+EBUILD dovecot-2.3.5.1.ebuild 8783 BLAKE2B d09a7e8b2545522a8f48939f46c586e537abcbe683f0ff790d82aae7d9be942dad171b5f6d94f3c8e9d85f1d0096f9c487cb4538297d0356fa20d2dc0f2abf76 SHA512 9b2a1a7dfedc3fb372b712ca0c0231ff2077632a42ce9722c4d369ffdaabd61b538e34da5523c5902f7a0f2d291d17c3739a0acfe19dba8b67e234b9df6d7b50
+EBUILD dovecot-2.3.5.2.ebuild 8785 BLAKE2B e733265849c5d7451f286d46ebee4c062b25f6b99d07928e9167a1c245ae203d9e0caf21bd51b9554e8079a503d977327ebddee23092e965493fac14f35c760d SHA512 5368dcc2ce883f5a7f13e45dfbc0dc1226827c851500f304dd9871f22a3ebb76d04d94c4472c2b535af9353291b394f9e97a5007883c8a35639a8c3604aa6fea
+MISC metadata.xml 941 BLAKE2B 8432d32315ba8c4ad55cdbc6cdfc85b9cbd2aab5928f8f3fbaa1e33093a272ee36abfaeb8d4e6f2a7658bdf9a9f481efe3ac18e5b5b901c74addc63979bcc312 SHA512 f8347117eb6039d0340ab53e0ccd82cd269a3f50d2747a780ccfee26b6e598347337f73b75c1e6f4f814c86918c4d0325c4c784a04a86b3d66ceb58bfe94d98d
diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild
deleted file mode 100644
index 0ce65014c0c1..000000000000
--- a/net-mail/dovecot/dovecot-2.2.19.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.9"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~sh"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10-ssl.patch"
-	epatch_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--runstatedir="${EPREFIX}/run" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		--with-icu \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.2.34.ebuild b/net-mail/dovecot/dovecot-2.2.34.ebuild
deleted file mode 100644
index 653f87bf402f..000000000000
--- a/net-mail/dovecot/dovecot-2.2.34.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.21"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-# Dovecot does not support building without ssl.  Force it for now
-REQUIRED_USE="ssl"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-	eapply_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--runstatedir="${EPREFIX}/run" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--with-icu \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.4.1.ebuild b/net-mail/dovecot/dovecot-2.2.36.3.ebuild
index 8bb0af3db632..9e06b4534ad0 100644
--- a/net-mail/dovecot/dovecot-2.3.4.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.36.3.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 # do not add a ssl USE flag.  ssl is mandatory
 SSL_DEPS_SKIP=1
-inherit autotools ssl-cert systemd user versionator
+inherit autotools eapi7-ver ssl-cert systemd user versionator
 
 MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.5.4"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.4.24.1"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
 else
@@ -17,34 +17,32 @@ else
 fi
 SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
 	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
 	)
 	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
 	) "
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
 HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
 
 IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
 
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
+DEPEND="bzip2? ( app-arch/bzip2 )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
 	lucene? ( >=dev-cpp/clucene-2.3 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
 	selinux? ( sec-policy/selinux-dovecot )
@@ -85,8 +83,7 @@ pkg_setup() {
 src_prepare() {
 	default
 	# bug 657108
-	# elibtoolize
-	eautoreconf
+	elibtoolize
 }
 
 src_configure() {
@@ -98,20 +95,17 @@ src_configure() {
 
 	# turn valgrind tests off. Bug #340791
 	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
 		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-rundir="${EPREFIX}/run/dovecot" \
 		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
 		--without-stemmer \
 		--disable-rpath \
-		--without-libbsd \
 		--with-icu \
 		--with-ssl \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
 		$( use_with bzip2 bzlib ) \
 		$( use_with caps libcap ) \
 		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
 		$( use_with ldap ) \
 		$( use_with lucene ) \
 		$( use_with lz4 ) \
@@ -135,7 +129,7 @@ src_configure() {
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
+			--localstatedir="${EPREFIX}/var" \
 			--enable-shared \
 			--with-dovecot="${S}" \
 			$( use_with managesieve )
@@ -283,7 +277,7 @@ src_install () {
 pkg_postinst() {
 	# Let's not make a new certificate if we already have one
 	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+	-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
 		einfo "Creating SSL	certificate"
 		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
 		install_cert /etc/ssl/dovecot/server
diff --git a/net-mail/dovecot/dovecot-2.2.36.ebuild b/net-mail/dovecot/dovecot-2.2.36.ebuild
deleted file mode 100644
index 86321f4a85d5..000000000000
--- a/net-mail/dovecot/dovecot-2.2.36.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.24"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-# Dovecot does not support building without ssl.  Force it for now
-REQUIRED_USE="ssl"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
-	eapply_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--with-icu \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.2.1.ebuild b/net-mail/dovecot/dovecot-2.3.2.1.ebuild
deleted file mode 100644
index 34b3f7e9aae7..000000000000
--- a/net-mail/dovecot/dovecot-2.3.2.1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.5.2"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=( "${FILESDIR}/${PN}-glibc226.patch" )
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	# elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.3-r1.ebuild
deleted file mode 100644
index 120949b5d430..000000000000
--- a/net-mail/dovecot/dovecot-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.5.3"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=( 
-	"${FILESDIR}/${PN}-glibc228.patch"
-	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	# elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r5 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.3.ebuild b/net-mail/dovecot/dovecot-2.3.3.ebuild
deleted file mode 100644
index 9d28a2916e95..000000000000
--- a/net-mail/dovecot/dovecot-2.3.3.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.5.3"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=( "${FILESDIR}/${PN}-glibc228.patch" )
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	# elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r5 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.4.ebuild b/net-mail/dovecot/dovecot-2.3.4.ebuild
deleted file mode 100644
index 3a9711794cda..000000000000
--- a/net-mail/dovecot/dovecot-2.3.4.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.5.4"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	# elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.5.1.ebuild b/net-mail/dovecot/dovecot-2.3.5.1.ebuild
index de094d57b6f8..f708782a71c8 100644
--- a/net-mail/dovecot/dovecot-2.3.5.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.5.1.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/dovecot/dovecot-2.3.5.ebuild b/net-mail/dovecot/dovecot-2.3.5.2.ebuild
index 0cac1f64056e..d180d778f29e 100644
--- a/net-mail/dovecot/dovecot-2.3.5.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.5.2.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 # do not add a ssl USE flag.  ssl is mandatory
 SSL_DEPS_SKIP=1
-inherit autotools ssl-cert systemd user versionator
+inherit autotools eapi7-ver ssl-cert systemd user
 
 MY_P="${P/_/.}"
 #MY_S="${PN}-ce-${PV}"
-major_minor="$(get_version_component_range 1-2)"
+major_minor="$(ver_cut 1-2)"
 sieve_version="0.5.5"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
@@ -86,8 +86,8 @@ pkg_setup() {
 src_prepare() {
 	default
 	# bug 657108
-	# elibtoolize
-	eautoreconf
+	elibtoolize
+	#eautoreconf
 }
 
 src_configure() {
diff --git a/net-mail/dovecot/files/dovecot-10-ssl.patch b/net-mail/dovecot/files/dovecot-10-ssl.patch
deleted file mode 100644
index 8173bacc0bc5..000000000000
--- a/net-mail/dovecot/files/dovecot-10-ssl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- doc/example-config/conf.d/10-ssl.conf	2014-12-08 07:58:21.000000000 +0000
-+++ doc/example-config/conf.d/10-ssl.conf	2014-12-08 08:02:19.000000000 +0000
-@@ -49,6 +49,12 @@
- #ssl_protocols = !SSLv2
- 
- # SSL ciphers to use
-+# ###############
-+# Added by Gentoo
-+# You are encouraged to change the cipher list to
-+#ssl_cipher_list = DEFAULT:!EXPORT:!LOW:!MEDIUM:!MD5
-+# if you are not required to support legacy mail clients.
-+# ###############
- #ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL
- 
- # Prefer the server's order of ciphers over client's.
diff --git a/net-mail/dovecot/files/dovecot-glibc226.patch b/net-mail/dovecot/files/dovecot-glibc226.patch
deleted file mode 100644
index adf1dd99aac8..000000000000
--- a/net-mail/dovecot/files/dovecot-glibc226.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 9a58361b08e1858e3bc7ea93934b7613261da476 Mon Sep 17 00:00:00 2001
-From: Timo Sirainen <timo.sirainen@dovecot.fi>
-Date: Mon, 9 Jul 2018 11:33:23 +0300
-Subject: [PATCH] m4: Enable rquota only if rpc/rpc.h exists
-
-It's been removed in glibc 2.26
----
- m4/quota.m4 | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/m4/quota.m4 b/m4/quota.m4
-index 5840e3af89..0695b1e021 100644
---- a/m4/quota.m4
-+++ b/m4/quota.m4
-@@ -7,8 +7,10 @@ AC_DEFUN([DOVECOT_RPCGEN], [
-   
-   have_rquota=no
-   if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
--    AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
--    have_rquota=yes
-+    AC_CHECK_HEADER([rpc/rpc.h], [
-+      AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
-+      have_rquota=yes
-+    ])
-   fi
-   AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
- ])
-From 5803ae4bbd420def0072e1660ea7061c0e5dbcb9 Mon Sep 17 00:00:00 2001
-From: Timo Sirainen <timo.sirainen@dovecot.fi>
-Date: Mon, 9 Jul 2018 11:39:59 +0300
-Subject: [PATCH] m4, quota: Support rquota using libtirpc
-
----
- m4/quota.m4                   | 13 ++++++++++---
- src/plugins/quota/Makefile.am |  3 ++-
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/m4/quota.m4 b/m4/quota.m4
-index 0695b1e021..d75af447e1 100644
---- a/m4/quota.m4
-+++ b/m4/quota.m4
-@@ -7,18 +7,25 @@ AC_DEFUN([DOVECOT_RPCGEN], [
-   
-   have_rquota=no
-   if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
--    AC_CHECK_HEADER([rpc/rpc.h], [
--      AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
-+    PKG_CHECK_MODULES(LIBTIRPC, libtirpc, [
-       have_rquota=yes
-+      QUOTA_LIBS="$QUOTA_LIBS \$(LIBTIRPC_LIBS)"
-+    ], [
-+      AC_CHECK_HEADER([rpc/rpc.h], [
-+	have_rquota=yes
-+      ])
-     ])
-   fi
-+  if test "$have_rquota" = yes; then
-+    AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
-+  fi
-   AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
- ])
- 
- AC_DEFUN([DOVECOT_QUOTA], [
-   AC_SEARCH_LIBS(quota_open, quota, [
-     AC_DEFINE(HAVE_QUOTA_OPEN,, [Define if you have quota_open()])
--    QUOTA_LIBS="-lquota"
-+    QUOTA_LIBS="$QUOTA_LIBS -lquota"
-   ])
-   AC_SUBST(QUOTA_LIBS)
- ])
-diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am
-index f220d4f075..ffebc67404 100644
---- a/src/plugins/quota/Makefile.am
-+++ b/src/plugins/quota/Makefile.am
-@@ -19,7 +19,8 @@ AM_CPPFLAGS = \
- 	-I$(top_srcdir)/src/lib-storage/index/imapc \
- 	-I$(top_srcdir)/src/lib-storage/index/maildir \
- 	-I$(top_srcdir)/src/lib-program-client \
--	-I$(top_srcdir)/src/doveadm
-+	-I$(top_srcdir)/src/doveadm \
-+	$(LIBTIRPC_CFLAGS)
- 
- NOPLUGIN_LDFLAGS =
- lib10_doveadm_quota_plugin_la_LDFLAGS = -module -avoid-version
diff --git a/net-mail/dovecot/files/dovecot-glibc228.patch b/net-mail/dovecot/files/dovecot-glibc228.patch
deleted file mode 100644
index 9549c12f6e8f..000000000000
--- a/net-mail/dovecot/files/dovecot-glibc228.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 63a74b9e8e0604486a15a879e7f1a27257322400 Mon Sep 17 00:00:00 2001
-From: Aki Tuomi <aki.tuomi@dovecot.fi>
-Date: Wed, 8 Aug 2018 12:33:20 +0300
-Subject: [PATCH] auth: mycrypt - include crypt.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes crypt usage on glibc-2.28
-
-Reported by Reuben Farrelly
-Patch provided by Thore Bödecker
----
- configure.ac       | 2 +-
- src/auth/mycrypt.c | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd545ebfdc..c5d8fae666 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -315,7 +315,7 @@ AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h \
-   quota.h sys/fs/quota_common.h \
-   mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
-   xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
--  sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h)
-+  sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h crypt.h)
- 
- CC_CLANG
- AC_CC_PIE
-diff --git a/src/auth/mycrypt.c b/src/auth/mycrypt.c
-index c49fcf842e..0bd00bc238 100644
---- a/src/auth/mycrypt.c
-+++ b/src/auth/mycrypt.c
-@@ -14,6 +14,9 @@
- #  define _XPG6 /* Some Solaris versions require this, some break with this */
- #endif
- #include <unistd.h>
-+#ifdef HAVE_CRYPT_H
-+# include <crypt.h>
-+#endif
- 
- #include "mycrypt.h"
- 
diff --git a/net-mail/dovecot/files/dovecot.init-r4 b/net-mail/dovecot/files/dovecot.init-r4
deleted file mode 100644
index 665aa0dc7333..000000000000
--- a/net-mail/dovecot/files/dovecot.init-r4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	before postfix
-	after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd 
-	use logger net
-}
-
-checkconfig() {
-	DOVECOT_INSTANCE=${SVCNAME##*.}
-	if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then
-		DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf
-	else
-		DOVECOT_CONF=/etc/dovecot/dovecot.conf
-	fi
-	if [ ! -e ${DOVECOT_CONF} ]; then
-		eerror "You will need an ${DOVECOT_CONF} first"
-		return 1
-	fi
-	if [ -x /usr/sbin/dovecot ]; then
-		DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} -a | grep '^base_dir = ' | sed 's/^base_dir = //')
-	else
-		eerror "dovecot not executable"
-		return 1
-	fi
-	DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/var/run/dovecot}
-	DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/dovecot \
-		--pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}"
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/dovecot \
-		--pidfile "${DOVECOT_PIDFILE}"
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
-	start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \
-		--pidfile "${DOVECOT_PIDFILE}"
-	eend $?
-}
diff --git a/net-mail/dovecot/files/dovecot.init-r5 b/net-mail/dovecot/files/dovecot.init-r5
deleted file mode 100644
index 8a98603d4b42..000000000000
--- a/net-mail/dovecot/files/dovecot.init-r5
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	before postfix
-	after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd 
-	use logger net
-}
-
-checkconfig() {
-	DOVECOT_INSTANCE=${SVCNAME##*.}
-	if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then
-		DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf
-	else
-		DOVECOT_CONF=/etc/dovecot/dovecot.conf
-	fi
-	if [ ! -e ${DOVECOT_CONF} ]; then
-		eerror "You will need an ${DOVECOT_CONF} first"
-		return 1
-	fi
-	if [ -x /usr/sbin/dovecot ]; then
-		DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} config -h base_dir)
-	else
-		eerror "dovecot not executable"
-		return 1
-	fi
-	DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/run/dovecot}
-	DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/dovecot \
-		--pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}"
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/dovecot \
-		--pidfile "${DOVECOT_PIDFILE}"
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
-	start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \
-		--pidfile "${DOVECOT_PIDFILE}"
-	eend $?
-}
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index 496575228ba5..d8223dea238d 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -7,14 +7,9 @@
         </maintainer>
   <use>
     <flag name="argon2">Add support for ARGON2 password schemes</flag>
-    <flag name="cydir">Add cydir storage support</flag>
     <flag name="managesieve">Add managesieve protocol support</flag>
-    <flag name="mdbox">Add mdbox storage support</flag>
-    <flag name="sdbox">Add sdbox storage support</flag>
     <flag name="sieve">Add sieve support</flag>
     <flag name="vpopmail">Add vpopmail support</flag>
-    <flag name="imapc">Add imap client storage support</flag>
-    <flag name="pop3c">Add pop3 client storage support</flag>
     <flag name="lucene">Add lucene full text search (FTS) support using <pkg>dev-cpp/clucene</pkg></flag>
     <flag name="lzma">Add support for lzma (de)compression</flag>
     <flag name="lz4">Add support for lz4 (de)compression</flag>
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index a8530bafca72..43da0eb16672 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,5 +1,6 @@
 AUX libpst-0.6.52-no-static-python-lib.patch 449 BLAKE2B c9d93e38a36485e23b8deaf3a91c8b6806db1526722a704ac3cf1eabd623ae3bf25aaf3a815d63b4b7873dd9a23f7399afe59dade5fa111db0e7ac3ba58f00fd SHA512 9cd44493406a58c522fdfe9423a7b15548af7e06332289c98fc1054822d209aa112d497622b3578531147934fd82335bf8c68cc8e371e31ef4716fb51cb26273
 AUX libpst-0.6.53-pkgconfig-static.patch 211 BLAKE2B 97d8939c3c81365a9100be4ceeacc8303fd2f07c4ece0af40af1bb8750174f6b994ce93089599956aa50b6ff3b17102e37cc16d5426a9b98675d910a7f0f80ff SHA512 eb8d95b07dc96435b7d753c1ea68dfb419867b7b092c3f243de9b5983af29ae368e7e5f3a4ea5a802c82c41a2096bd01564f7f74cd733ac038abb263b6ca4d1b
 DIST libpst-0.6.66.tar.gz 13836942 BLAKE2B f8ac86a2924576fc41aa7bb92a824748d858e9b6b42d3cc7e59959ca6377f458d7bcd738081a9547432f9153b839861f8c0fc5aa0a0c74b0447c2ab126b5bb64 SHA512 0d07b13554b9e009787ce651714281d21a4d38afae997bd87244690538bd18176ab74655c0a0646b1c475c916052d4295ffe749e6a03765450af7e9c8443dd86
-EBUILD libpst-0.6.66-r1.ebuild 1579 BLAKE2B 8fb4e52a48e432ab472fc72b95ce6a26989bc081a0acac8f22afe4392df913542dcd33018401cec8c7f675d9e0ae9c99a64dc4463ec98347b29aadc4f1a40581 SHA512 8636e108ed2614cba20c1647288fd7e7cf05314d619b48fc9fb832aca6651295122faf3ca61f1b9eb5073a8660d0d7af1237c3feec84de80225fa37f4a7ed485
+EBUILD libpst-0.6.66-r1.ebuild 1580 BLAKE2B 1f0172f84af5da8fa7560cfa3ba13e1c87ffea5f8fc2874a24757088091d9cc9f283e398fffbee122b969817f631577a50641717fa63b257954466dcae7c5afd SHA512 f8097fae146f23b2dc75c96cd76e62b97daeeb625c05e2087c186c450ecebfed8ffb3e8a74e21ca17aad2bcdd2d7011094dd968b980f5d7dc84f96da312ac9d1
+EBUILD libpst-0.6.66-r2.ebuild 1625 BLAKE2B 8a6464029534dea0d2190168d1220a02bdb2597f922c100346e5f44223c9f9b48965840f6d98b957cc6641b538543c4e8f248bbc759b31fafa1a34e2b0e1eceb SHA512 a004aa1612ba874ca3fa9c7948d7160c25c2238ebbc5a1ef314d7245f6aa04fd7df12bfeb7ba963253dbfaca9b2c10b036b60b470cc425e7740acbab19a302e9
 MISC metadata.xml 232 BLAKE2B 63277f4f8d2b807cb55686cc487bf534330a954fcb2e43dc24fe5cad241229545305bfd7517ab2b8a652f0ef89c93774f7636fe848145f29695575bd15100418 SHA512 bc3293101ebc8838fe7c3a9ba19bb540a8c5357d9181545dd460bc404637e469866428445b8340833b20cdd44b55ccf88ff97433bd88ba8ee8b7353ceb140b8a
diff --git a/net-mail/libpst/libpst-0.6.66-r1.ebuild b/net-mail/libpst/libpst-0.6.66-r1.ebuild
index 5f2f39862ea4..c1b99ee4ce99 100644
--- a/net-mail/libpst/libpst-0.6.66-r1.ebuild
+++ b/net-mail/libpst/libpst-0.6.66-r1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools python-single-r1
 
 DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+HOMEPAGE="https://www.five-ten-sg.com/libpst/"
+SRC_URI="https://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug dii doc python static-libs"
 
 RDEPEND="dii? ( media-gfx/imagemagick:=[png] )
-	python? ( >=dev-libs/boost-1.48:=[python]
+	python? ( <dev-libs/boost-1.70:=[python]
 		${PYTHON_DEPS} )
 	gnome-extra/libgsf:="
 DEPEND="${RDEPEND}
diff --git a/net-mail/libpst/libpst-0.6.66-r2.ebuild b/net-mail/libpst/libpst-0.6.66-r2.ebuild
new file mode 100644
index 000000000000..bb12628b7a30
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.66-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="https://www.five-ten-sg.com/libpst/"
+SRC_URI="https://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dii doc python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	gnome-extra/libgsf:=
+	dii? ( media-gfx/imagemagick:=[png] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# don't build the static python library
+	eapply "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	eapply "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	if ! use doc; then
+		sed -i -e "/SUBDIRS/s: html::" Makefile.am || die
+	fi
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eapply_user
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use_with python boost-python "boost_${EPYTHON/./}")
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index d8c61288c69e..e06658ee70c6 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -4,10 +4,8 @@ AUX mailman-2.1.14_rc1-directory-check.patch 786 BLAKE2B 24cde989fac774ecaea2707
 AUX mailman-2.1.9-icons.patch 555 BLAKE2B c000931d44321f0eb9fabdf1a49cfcd05b2c68a3809f302f9275eade918135bc231860cf9c2ab798827b9f1e5baf59a74cbaabc3787e95f3001426425ebf6de2 SHA512 caec3eb1abdb29e92ebd6a589f93870ffc91bbcc7bd2e0115e38f48ae0a31e564037a4a828395229ee238d215e72e19a31d53c8bca6c39a48b5c08a327e663a6
 AUX mailman.rc 488 BLAKE2B 76f35e4e1a5257b6aa058b0cea29cf53640322d436a195140cd71b7bc749d4205fc4555b611b1713663604c08ca929b3aa57d60355d8e9e5e9b7056b9dc1c5f1 SHA512 bb97f6fec48cf474be66c1aa73adc874ceaeee894acc3fad76f4b3f5e6f82dcd4238a6915de941fe87f815668dfb6c5ffe90926c5aaaddedf7dc06dfa4c1a126
 AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3ea55ef27d11daea102a1ecae30ddda095c1bbf1b175def17b9ad2db5a3e0b8e694ab02ed94a557e87 SHA512 c4a5532666afbebc5aa69463ec9b9eaa2dcb03fdd8fd62307920a4572d0c795c1d93478236240746018be617c0eec0fcfcc1c711e8810140fb8ffbc0a9b71009
-DIST mailman-2.1.26.tgz 9264592 BLAKE2B 04aad3d39724a01df313bebbb3b20bee0e991893f1a17342afb18f3fbe8099178260c176a6d3542a7bb82adee417105aac34783683b205bbb1377e65c982d598 SHA512 9662623beaf4653db809a4bd57cb8377ae5894d78ba7576cf2c555620daf2db79b01599e8445ef732f1e023e72deb16f51554a39226d59742ec73f9e6e7895b2
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
 DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb1c6fadb5d602c4e34e373ee7a0df0801e6b68b0816ee819f77caef33bbc4b8490df1c8f01fd2fb35664fd3757 SHA512 b09962ec99ca1ce1eafd40409a00f976dc47d82adb707313f4516400db6439af8597a1c4e30262fb228c102508ede688912480dbb1dcca9721bb0333693f1d85
-EBUILD mailman-2.1.26.ebuild 5835 BLAKE2B 4e5d1cb9f5f7ea8a1a6e2cf4bdf43844d4db46d1ef3922ed7f6966e5b7447975c305a81be37bdf3310255dc7b0aa7eae7a3118ddd5b1394c2a1adc205c81a97e SHA512 0ed97a6103dabe7475a788d0bd7163e1e16588137f3d4567f953e1657d1ba44610a2dd158202997e37ddea2fc2414c5cf4174943def1daefdcf06bfd5fb4e0da
-EBUILD mailman-2.1.29.ebuild 5833 BLAKE2B 5333375de0e639a590baa82cb59f8f48054b3c0035d55900f6f659066098173db92e8cf182a0af7e52c86a56b98f9e3c75bc4831b901efa915c7a5a863b4bf6e SHA512 d270fefc384c455196f848ecd8f74f5d94679f98ca2b3cb8268e259e1c98592acd6ffe3529fd045c2d40cc4f10d64b034403b4fc08c48287a0e6d44f656dfbf8
-EBUILD mailman-3.1.1.ebuild 1188 BLAKE2B 6271605c5bc4701a59ed960c62d472cf1c54ce8b9e7cb69dc186e2c7f1dac33eb974ed71fb3e51cbdbabd7c14088aa18b036463c218e3e0a0ad5cb4190a8396c SHA512 ba9ad78e647b12e3b6eb56d619ddeeddd2143c41f7c0b4e526ee917d23e9a1cc4db0c8d8bf3a28c0ac41fb1838500d0088cb5bb201938541b2ecca2e373e0fc8
+EBUILD mailman-2.1.29.ebuild 5832 BLAKE2B 68d8429399df0b719d06bf07e1fad7d06197448ef982a33c1cdff5c4a22cb0c7b13e53821d0c6ff2ff0ecc0a8b63897dd52861b055b745a3440504d2dedc4ca6 SHA512 ba1d579986222b1a5d1e4a6e01aad29afd6ce97b33e1836dc48c57bd5f8e24b4eb0144e751ce250dc6e7150885302a0a6fedeec62f519dd62d0221c81305de76
+EBUILD mailman-3.1.1.ebuild 1175 BLAKE2B 792fafc9caf1d8bfc6b67c7042e09d605101166c9471e3d61f0342239e0d463441122b325802b794fa13871373c1ce4968c769be40d4fccac8beb8e2a0af4faa SHA512 184e4cc446e80f449909410a5522a20198a1a645821044b189c989fcee14bfb889e6a1bd535bb5f50b57848354371933b176177e2f41b93e4a9cb3bbad6be5a0
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-2.1.26.ebuild b/net-mail/mailman/mailman-2.1.26.ebuild
deleted file mode 100644
index 7d21b70b7bac..000000000000
--- a/net-mail/mailman/mailman-2.1.26.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi
-	virtual/python-dnspython[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-S="${WORKDIR}/${P/_p/-}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
-}
-
-src_configure() {
-	econf \
-		--without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python="${PYTHON}"
-}
-
-src_install () {
-	emake "DESTDIR=${D}" doinstall
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
-	sed \
-		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
-		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
-		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
-		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler*
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
-
-	python_optimize "${D}/${INSTALLDIR}/bin/" \
-		"${D}/${INSTALLDIR}/Mailman/" \
-		"${D}/${INSTALLDIR}/Mailman/*"
-}
-
-pkg_postinst() {
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	echo
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	echo
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	echo
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	echo
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
diff --git a/net-mail/mailman/mailman-2.1.29.ebuild b/net-mail/mailman/mailman-2.1.29.ebuild
index 93a1812879a4..e6eaf2e1a7e4 100644
--- a/net-mail/mailman/mailman-2.1.29.ebuild
+++ b/net-mail/mailman/mailman-2.1.29.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.list.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="selinux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/mailman/mailman-3.1.1.ebuild b/net-mail/mailman/mailman-3.1.1.ebuild
index e8c5877caad4..296fa1c5bfab 100644
--- a/net-mail/mailman/mailman-3.1.1.ebuild
+++ b/net-mail/mailman/mailman-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_5 python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index e70ce5cdd424..ca019b118d44 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -15,8 +15,8 @@ AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.5.tar.xz 2742824 BLAKE2B ca14597114203234912cf4cfaa4c63e682561deb28d9d0825373c69de267c215d12b9db662cfd60024228e119433fb40a136d65cfd04385f881ba4b0384c8328 SHA512 6aa2de352be637295a8ab53207a8065f5c10655acc299ac0a2190937ec4decb515ac1044c9a7465b08764ca45be569012cce1046b40d748f6e4f31644f056a53
 DIST mailutils-3.6.tar.xz 2813412 BLAKE2B fa2cde98287f84745c1ccc213d2ee824857b9c64d493677ed817ae53d49576382d22784ad25faa644ca43528637ed629aa4e9a78a3b1040fd51658e54b369399 SHA512 f07b8dc570abf345d45439f4994173d2415f94d72291aac46528842e339aaa7925baf776ccfc8f8901cf0e08a13cbfdf09596dd6c448bf012af002ef5ce2fe0e
-EBUILD mailutils-3.4-r2.ebuild 3535 BLAKE2B 2270b2a23bbe9b55950a23415f5c3983f90e608d486207d88e5fa7ad468711372b8343e0532c5aa7777fee3c0ee8bea0509042db690999ca3cc18f0f3c9bcdbf SHA512 ae1ab694f81c90434083a2d180997c8397f9c859e1faa2585db9c8ce70e3f298c7ed78a744bb5a589b8a4773675f25b12f407c6583926a26b8204cf686e2d59e
+EBUILD mailutils-3.4-r2.ebuild 3534 BLAKE2B 1b0c89e319679cce912a36f7a1ffe92aaa91cded84a266f488b0a8b562f49e24b8c854e4a8ae2fe685c8eda5be7b1b8fe8c9f06ee353bed8352934550a1ab330 SHA512 e7039f88004a9a7924e845c5818c97d6feb58ae8d892112c6df33ad2bd638a02ade58815e7a5565cc1d5d7d7516931e5d18075a2aaffed25cb05cae6850f9b25
 EBUILD mailutils-3.4-r3.ebuild 3665 BLAKE2B 1a2a62f7403ad10f534fdfdf9898fb9e24467450fbcad54d0f3c0b7d4a289ed36d400cbf24a11ea92acc2e8f6a8a621dfbb7cebbb55b5d6c246ced31d6af0228 SHA512 1cb84032c3c433bad161c8412f5138719ac8a311f4e904b74a653ce0fbaa7f176f8dfd7cfdc676060a35c7a7808059a8f744949d7b7a1913d1f48d2766db2219
-EBUILD mailutils-3.5.ebuild 3434 BLAKE2B 6d9636f7562041f9c1fdf53e532812035912595f70c98460d3160e0dd808ae88e6727a0808aef674ce09f3bf022f0e50aace4eea6cfce92c38b3de59464a1a71 SHA512 7ff7fd774b22b3fbba05bf98511a98adac854803b86579613dc1d82eb1075c282989d420ba9658408f2b1fc721511fa95d6dfc792470404186e3641d3798e0d8
-EBUILD mailutils-3.6.ebuild 3660 BLAKE2B bda538c07797453de750ed28b1dbcf2bfdd4869378444c6a4c5c74df80d4fbd9e14a7c6cf872eacd5c3a1fa0601442803407290d5853f8c8f279f220be5c562c SHA512 e246a894134e92d7c579d1f00a52608dc79d1420886c7ae3669ccd77eb427f66ec5e7e7107e193916e852c6fcdb65ea1fc20e390522e4f1a6de8a34b3b3a7599
+EBUILD mailutils-3.5.ebuild 3432 BLAKE2B dd1a295f0776e886a98d0ba8a0a9e02a7cbdd72bc666c7b36d741a0d379069a3dda4e5e3f6c251b419f32c9bacd21bbc043cb4ac4084880a994e7e6a479ece94 SHA512 5c1690a79b99ef37fb8a30b7bcf0da5b62a418eb774962f303c4ee2d4619ddb75ed4dc3d1d514d110087517d4f35c4fa5f49e00a9a3dc686526fd734dca92702
+EBUILD mailutils-3.6.ebuild 3658 BLAKE2B 0d057e62a4d6b9fd57fcfda4fe23d90e24359cb2e8f74b7ba5433cddb1afe358439bd1d59d38c861f114318dd7896033f55d9c8a822428289568b78f68cab170 SHA512 2f67561308afea43378dfceaf157701775d2ae9703afeafb84bbfae2b720277e7bd79025aaab0c9a97b4aa298ded1d6f203899dc7d3947990a460580667a467e
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.4-r2.ebuild b/net-mail/mailutils/mailutils-3.4-r2.ebuild
index 459a10b5a305..00f17a8e4344 100644
--- a/net-mail/mailutils/mailutils-3.4-r2.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r2.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=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
 	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.5.ebuild b/net-mail/mailutils/mailutils-3.5.ebuild
index f09fc7f30b0d..8e882f408c46 100644
--- a/net-mail/mailutils/mailutils-3.5.ebuild
+++ b/net-mail/mailutils/mailutils-3.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 
diff --git a/net-mail/mailutils/mailutils-3.6.ebuild b/net-mail/mailutils/mailutils-3.6.ebuild
index 7360f6552ed9..37a366e3af83 100644
--- a/net-mail/mailutils/mailutils-3.6.ebuild
+++ b/net-mail/mailutils/mailutils-3.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 4b9c71558045..a1156675bc43 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -9,11 +9,11 @@ DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119
 DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7
 DIST notmuch-0.27.tar.gz 912583 BLAKE2B 75bb13e9666bd2898f58e5ecdd6a180d0da21188665f107857e6729f057525bb7c94832d140de8ff7b3fd31b51e33bcbe5b59d3fc09ba9a854c1c05499df762e SHA512 7c58c6fe5c3b43a979c3a439a24106417120726fd688b456d9084388ddd7c88ab1b6d99cd4676101f085d60bb37099631caa286b76588fcb041bb004ff325515
 DIST notmuch-0.28.3.tar.gz 921920 BLAKE2B 9b96a0cac8188bcaf9efab532721449c655fec4dac77c3eb327e576184cb430aa0fffc9ac74af82ad3ad80097afdda5c8accddbee7e5720d180c071d9dd2ef85 SHA512 dd3931b78cc27540e962f1fca5f4ebb1c04b2637a5761cda023f307fd9be4b5ddc2af26010330868c55200fa96b60b2a11b3b22d4c20d2a4a2d3787421ed85cf
-EBUILD notmuch-0.23.7.ebuild 4582 BLAKE2B 5e3d91233776f8bea407db340ad5ad083628f0d4d06849934e8dc78385acdb64bf2f9e1d804399636170f1524efc1b3d778a0ed5e4f2e32e01588b111947949f SHA512 abb5e69be4ee2405ec9e59683b040d7e6c2492403f3bff5d103cf2e957e9293a9f91b21a839d847e13f690b531c39b9e8df5eb6bf044e76ef26707800a47765e
-EBUILD notmuch-0.24.2.ebuild 4770 BLAKE2B 40bb192f400a0114976120b1b15294ce015d36637001e25a354aec5c686316e2045136091c71727ff003264be198780e132f7cce087310e5225a3a584d919a49 SHA512 d2a176d88df335783fcad6a397a44d6726c723f1d70fafafe986dadf138ba1410199a2b1347baf69d6589357c18931c1c9b791eb9437558ffb16afae9de3d654
-EBUILD notmuch-0.25.3.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62a1b6d5e8392458982e5d829dada98492cf778d46fe43d0df0618f7748d705d99f1c406683299c16f407b40c0d9 SHA512 76825642fd0d738345f2d9f2043d527c4d60d36b12cb5e44530af3190a9e7c760f1bd840744f8bec59b145a634d5207e7636413671b3914336acd881e0734623
-EBUILD notmuch-0.26.1.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
-EBUILD notmuch-0.26.2.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
-EBUILD notmuch-0.27.ebuild 4950 BLAKE2B b7b849221f3938f311063a3c09906e2294a9e6551669666277aa8eddc1aa3573d5559c94ab068d30f63ddbb7fdc3f0ee1e427c8718e6f4dfa53ea03ef6b64d36 SHA512 01dc2372a92c7c7d7fe1bf08265a81dda1794fab5a7657beab11816b0bed8a27277ea2de1e8123f132fe0afba980e60bb6639c61370e402dfdf3c9eda2d0a337
-EBUILD notmuch-0.28.3.ebuild 5038 BLAKE2B b56bdce9701f5eda443f5b94313aab994a2bf17c1b72db8b2950178fa518cf636b4fe46a9f82b0c412a2977645a5d5cdff0b55abb87a220dd28a49143f93ccb8 SHA512 ef727379c336e813e501d0695fc9eafe9b8132ecb30c30cd2fca81c7ae0f7b4d6e9f1eb9990cbb70091d512622049428227e87ac5180b61071118af9b95cb2df
+EBUILD notmuch-0.23.7.ebuild 4573 BLAKE2B 10251e488d1b9bbf03798726d168cb746178d6eb43ab8280dd8280d962300a32505e8e0a79aaeefc3b6a255830bcea1ab1a26e95a8d031b10a9379a0333e72f8 SHA512 437dfdebdb2f4105e1378c3202b77dee7c2443d59988c7dc8eee45a905012fecdfbcd90ada3a2fcb1099a7b8bd5febcc1b266f81b2fd5fe4658e5b4382144b5e
+EBUILD notmuch-0.24.2.ebuild 4763 BLAKE2B d6b6a5f62f624986286d504aed9e47b1c0380ca4d8d1de874be36d03aef542b45fd889a2cd97d264cf0defa22e9cbee676d9b4b6f6e2192c6a8dbc76287a9d86 SHA512 8e006a9da05e7556d505af790072fd96aff2f76d88866d9ad3dec66c13a1edf8e95f6522daef65bd4f15a16997c551892ac17e550a1faf2d176e721be7e2ed3a
+EBUILD notmuch-0.25.3.ebuild 4842 BLAKE2B b757474009732309b6f4301bd720766057ba10867616a44bbaa61f28179b02f3a04443ce5b5814f8d68df27d50b16e94d292ae1699a9bf7d0f327fc3103618ca SHA512 9b3f1df762c681c110da3f9aa62145a70abd07901a65a4fa70b4f229a2b1c788840585dcad532da5b998b52632fd5fd02c259c86127ed9931390d5c3c8d39e1b
+EBUILD notmuch-0.26.1.ebuild 4836 BLAKE2B 15cbffd571f2366e66a943929a378dda07072433794c7ed31596ac8a63c63752ed9e28a37f6892e47a9a8aa45c4651f43e4398e401bd49e3e3b8e46ea4dbec6d SHA512 5a670bdad5b8c72cd355a46543f10a68b9ff15f65cc698393f90bc484f1c8f5c746b4f52ee8906a96f7ddefb432b268d2da7d6d2735ebe7e06236a324fa5395d
+EBUILD notmuch-0.26.2.ebuild 4836 BLAKE2B 15cbffd571f2366e66a943929a378dda07072433794c7ed31596ac8a63c63752ed9e28a37f6892e47a9a8aa45c4651f43e4398e401bd49e3e3b8e46ea4dbec6d SHA512 5a670bdad5b8c72cd355a46543f10a68b9ff15f65cc698393f90bc484f1c8f5c746b4f52ee8906a96f7ddefb432b268d2da7d6d2735ebe7e06236a324fa5395d
+EBUILD notmuch-0.27.ebuild 4943 BLAKE2B 7c8ba36bc9f95c439eee7a08b25b4ee004a190f4eaa49010d934e4b48ac8cd81598e9b6aff0ac251b39c39bbc35dfbbf65774986744cc4e1f005a0cb331e9dec SHA512 ab053d2382569d82cffd8c654a660e22af0888e96e1de44877d1798247fe22dde04c29630dd1161a996062acda15aaa6f6da087bf67d284897b41c2e84c0466e
+EBUILD notmuch-0.28.3.ebuild 5092 BLAKE2B 84f7d8dcd9c0d301f0f96d52920d6767ddd8b146a9ed87f0b859ef40d5bb690c5784ae2f68368fc02dea10cac0631b116a526c61f1a7a5b258ad335d81c1b4c0 SHA512 e3f374fd1ed932491f12580a00e7a0cb238eb80d5b7473e927700341a497f0c2ed4191d2dc84f7bb742f3ef292787e0c2e724b06cf5d083302b3ace1090c654d
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.23.7.ebuild b/net-mail/notmuch/notmuch-0.23.7.ebuild
index 3e83fd65e556..a6bf7055ece7 100644
--- a/net-mail/notmuch/notmuch-0.23.7.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
diff --git a/net-mail/notmuch/notmuch-0.24.2.ebuild b/net-mail/notmuch/notmuch-0.24.2.ebuild
index 170d21be5c93..2c35142be76f 100644
--- a/net-mail/notmuch/notmuch-0.24.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.24.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
diff --git a/net-mail/notmuch/notmuch-0.25.3.ebuild b/net-mail/notmuch/notmuch-0.25.3.ebuild
index 13c9eda4da87..96cc26fe7566 100644
--- a/net-mail/notmuch/notmuch-0.25.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.25.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
diff --git a/net-mail/notmuch/notmuch-0.26.1.ebuild b/net-mail/notmuch/notmuch-0.26.1.ebuild
index bcf492e422d9..dba91fb9d2fb 100644
--- a/net-mail/notmuch/notmuch-0.26.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.26.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
diff --git a/net-mail/notmuch/notmuch-0.26.2.ebuild b/net-mail/notmuch/notmuch-0.26.2.ebuild
index bcf492e422d9..dba91fb9d2fb 100644
--- a/net-mail/notmuch/notmuch-0.26.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.26.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
diff --git a/net-mail/notmuch/notmuch-0.27.ebuild b/net-mail/notmuch/notmuch-0.27.ebuild
index 1a4cee2643a4..0f3d94a53257 100644
--- a/net-mail/notmuch/notmuch-0.27.ebuild
+++ b/net-mail/notmuch/notmuch-0.27.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
diff --git a/net-mail/notmuch/notmuch-0.28.3.ebuild b/net-mail/notmuch/notmuch-0.28.3.ebuild
index 9a03251ba48a..95e5689f032e 100644
--- a/net-mail/notmuch/notmuch-0.28.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
@@ -136,6 +136,8 @@ src_prepare() {
 }
 
 src_configure() {
+	python_setup  # for sphinx
+
 	local myeconfargs=(
 		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
@@ -151,6 +153,8 @@ src_configure() {
 }
 
 src_compile() {
+	python_setup  # for sphinx
+
 	V=1 default
 	bindings python distutils-r1_src_compile
 
diff --git a/net-mail/peephole/Manifest b/net-mail/peephole/Manifest
deleted file mode 100644
index a84db0abf54b..000000000000
--- a/net-mail/peephole/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX peephole-1.4-gcc4.patch 627 BLAKE2B 7e444ef16bc21c87b260bb61fd685361d3cdb4169a2950c5ee6aa175ceb413c49de0523f4f7cc72aa7506aea7375e8905a1f5eee72ab3e0e8733e471c7fa4d67 SHA512 831724e11a99fb6c3e6ff3ec636bdb54dc6498d934b2f296c70a47fef2f00deb46155ffb271e5253f2694aa580787c7d2d31ee3f0e782abfdd57b186f0dece25
-DIST peephole-1.5.tar.gz 351492 BLAKE2B 713792ec5633c32fa88b39745b5cd3dddc07f6abf0cd8b6a703fbe56a1db3c1a69d9ba3cd2e17530f140e7eab97cc2307f4548d97e26145c3939ed17cd7fc924 SHA512 d60377029f21513cf8bb1c0fc5a3be0bceb57a11275ec089c235a140e069e1bb6837d9b046539c4641d154e0ba93c2803e26887c0f399e401744b1145aec3b3b
-EBUILD peephole-1.5.ebuild 792 BLAKE2B 3d52d0b0458b9d8c406a1aced8e0100e7926f9ed4ffd154b4e7d0bc900dc16a3e398761dc7d3985ac2037654965a557ff841f7a22dad0e78faf5edc2d4e9fba3 SHA512 0aada597e8ebab5327bf8bd45354cc50cb454d268d2e73d982f93f042b63a54f3e337729ec1f72d06838c3810488fe7e1c358f028f7162dc1b091690e09ff4e9
-MISC metadata.xml 245 BLAKE2B 4e56571bf9d2ccc31fa1f0eb315ef8e616517884868c415e148f0c96f3a886c2f25ba0cc1203e4a831dd51c821b888a2b2bc6bf245948a13587101d9190ce756 SHA512 938867a7de048eb321af44de84a71cac6a98c768748abfe74c3bb23f36216fc218300c471d6ce537a5e349d1333b5df3be3d459beab8cf45c526ed67b0bf7c95
diff --git a/net-mail/peephole/files/peephole-1.4-gcc4.patch b/net-mail/peephole/files/peephole-1.4-gcc4.patch
deleted file mode 100644
index d73546da4b25..000000000000
--- a/net-mail/peephole/files/peephole-1.4-gcc4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --exclude='*.lo' --exclude=.libs --exclude=.deps --exclude=libtool --exclude=Makefile --exclude='*.o' --exclude='*.la' --exclude='config*' -Nru peephole-1.4.vanilla/src/grammar/local/local.c peephole-1.4/src/grammar/local/local.c
---- peephole-1.4.vanilla/src/grammar/local/local.c	2006-02-03 14:23:46.000000000 +0100
-+++ peephole-1.4/src/grammar/local/local.c	2006-02-03 14:25:13.000000000 +0100
-@@ -25,8 +25,8 @@
- static struct wm_local *parse_local(char *path, char *name)
- {
-   struct wm_config wmc = {
--    .wml NULL,
--    .path path
-+    NULL,
-+    path
-   };
- 
-   char rc[80];  // FIXME: possible buffer overflow...
diff --git a/net-mail/peephole/metadata.xml b/net-mail/peephole/metadata.xml
deleted file mode 100644
index 6b81b92ee3f1..000000000000
--- a/net-mail/peephole/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">peephole</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/peephole/peephole-1.5.ebuild b/net-mail/peephole/peephole-1.5.ebuild
deleted file mode 100644
index cb0997b2f423..000000000000
--- a/net-mail/peephole/peephole-1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A daemon that polls your POP servers, checking if there are messages from specific people"
-HOMEPAGE="http://peephole.sourceforge.net/"
-SRC_URI="mirror://sourceforge/peephole/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-0.9.7d-r1"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4-gcc4.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-pkg_postinst() {
-	elog "Before you can use peephole you must copy"
-	elog "/etc/skel/.peephole.providers and /etc/skel/.peepholerc"
-	elog "to your home dir and edit them to suit your needs."
-}
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index 37c220b9287e..ead631c44908 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -3,6 +3,5 @@ AUX multi-digit-enhanced-status.patch 1479 BLAKE2B b8364d035aa3662b539523ec63cf6
 AUX redundant-argument-to-sprintf.patch 1744 BLAKE2B d251a7e894dd4ebe09d61984a55ad2e7a0771310a88042da952c6e7d13b98952648e2da995e32cac92818e26d2df2e0d83f08a16fed093cfb07fe81187f5aaf6 SHA512 31e35603cee7c51ffe126ba0caeadbbca564694439101d92293d2163d3b674be552ac3e781d4b10fab11435d072bf3bb540e3070bd3a839dd6297fff02cf5b04
 AUX unescaped-left-brace.patch 1277 BLAKE2B 3dc055f3321b958cbe35e0e51336c64e41b4e71e4221ea025c6b4c86eff8af710652ab2f97bde52944ec17ba047039319356b338b10af6594dc50167811535df SHA512 dcfdb1fc7793fcf8a1e41fd890023c901bccff5c241601f99a5aef398fe35c1eae82d786064e189ef2113aad9d2081a67d8451d9c58ceefc78192e22ac5d3033
 DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
-EBUILD postfix-logwatch-1.40.03-r2.ebuild 1069 BLAKE2B 5b0a9903c7622e0033217d2c97c551d8dbe8443e8bc7e60712b945ae364699c4599ca4d96d0ae81c9c1ffbcc1a2f5e33b2adff5b33b2276a433ef4de8c9a8ebb SHA512 c92f554614484baba18a9a3e178e4a6d419f2c41cac23f951a518fd63513b8e9df278391441ec8ae2cf9c68f2923e274e3e436bbbf3761430a6c5d797635c5e7
-EBUILD postfix-logwatch-1.40.03-r3.ebuild 1117 BLAKE2B 07f78be6fa6e9cfc3881ce9259dfbaeb8884114cb41b0989e29e1065789050e6542e5f0ec3e4512a968243ce214561ad8399c8ac2c24510e4d400eeefecb4101 SHA512 fd1ad247b55224b115c00557bc1e23db90db9383bc39b1b27430539c8101d209050b2f292f42aca3737b06275b8ddee6a0a746ed487acefa6307cf7902b1b2cb
+EBUILD postfix-logwatch-1.40.03-r3.ebuild 1115 BLAKE2B 916b770926207ceed4a1359e645b2a5b98220d54e6039d6d7e0c95bab88b12f199093f0ef4ec3cb105b900ce09f56b78f9f6ec5693e57938f7e13f12a051ec66 SHA512 75bd802585e67646f40f7d1b2c2cb93e544e46aa1f6d2402783a902d82229e264975ee2ac499beb262be7d6ab28f4df911e51f629acf5ab2b44f18ae3702dac1
 MISC metadata.xml 304 BLAKE2B 48bc40ba602d100542b0515ce426fdab3846135079ef677b11c2024c14243d0d06ecd543c0040420bddd839c2043ca0de3223cb9a02135b5c398f825beafdaa4 SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
deleted file mode 100644
index f1ae6f1bf1c9..000000000000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/unescaped-left-brace.patch"
-	"${FILESDIR}/redundant-argument-to-sprintf.patch"
-	"${FILESDIR}/multi-digit-enhanced-status.patch"
-)
-
-src_prepare() {
-	default
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README ${PN}.conf-topn
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
index 1e6cf975500f..49ed6220090f 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/qpopper/Manifest b/net-mail/qpopper/Manifest
deleted file mode 100644
index 6450c41b9ea3..000000000000
--- a/net-mail/qpopper/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX qpopper-4.1-parallel-build.patch 468 BLAKE2B 5302f6843a528d8f1fa3a138b0ba5429270b28a989860b2fb3e3d8e78f3213cbd8676b689e6a33e391ed3581af60466fa2a37201c489fa156625b1f11bc115dc SHA512 d30ed1421a86e071e1babf7a4212bb72bffb5652f72ee3142e03a738d2ca5f62a261f6cdf998fb580bcef571215923ca150e0116c0bcc9776361364a0ec5ab85
-AUX qpopper-4.1.0-glibc.patch 510 BLAKE2B 79e0ba9d566f043025140a3325c5c36678d4402212e2575d155c10f56a6324149346166076dd30393bdba90ec4134467eef9c874b5dd36d0de1c6afc5889f04f SHA512 5136669fd4f82d927396297fe7f391b79efa4bd646bdc93bb949b9bbf155c07d1b62b6bc47e4818c188d008ce6ef98fb10e57b0bb77304fe686ca750895cd4aa
-AUX qpopper.conf 20457 BLAKE2B df105aacf36092be081639074f600d72e3b30c000a913a688276c4df3fcbfafbd19fa2fd0784164fa5de69497b2ce7c14cd29cb8eb2a7aa484ee519a6cd3dc69 SHA512 d7be7f0528b3059c1c09bcdef5dd519bfae82d1f63bd9316f5f1c86ca2df911a4e91ff87ec50ceb5e6b0e27a0b1f86dd2949800619df0a507f4bbb13a0d895b5
-AUX qpopper.init.d 411 BLAKE2B d9a57c16d531ba4964bd7a7693a92381faf86003e8b5c7be51688f8aa230c95c7c11425be897393dcf85883888c5681194b05325627dc16b92c93fa0b70c1c6e SHA512 06db8105e0e925b5b25a5024e6b4080e64317a0219d3db8e0a75fad1c8271d2aea3f38f7e44a07256a24a3354fb2bebc0a63ef22fc41381ad91239a540240aba
-AUX qpopper.xinetd 408 BLAKE2B bc3f7cc144d7900abf02371e03535150127c520b46f232f9bbde14f171ac1479e24b102b2064b3ed59725c67fd0ba79783fa21ebf932dcc8d3bc73abbbcc40fb SHA512 291c2ab21356210d415fae4816bfc9f295ebb47a75a4d523f81f0d14dd9380fe0ffceac53fa84f0491c68b7082d543f4c6f4e486ca818efc1fbc254ad5926458
-DIST qpopper4.1.0.tar.gz 1239530 BLAKE2B a82d0ae8cbb5e606b8e0f7f4902b6920e14f404fa78860d4a7e92e0ab9ac354d518aab39f4a32c9b095c9396995e186bde2315d17d9496a7c0231cb1452e1439 SHA512 01e3ac13fa446bded84628a29a23849f623d5e5f85fdb77126cc4c2e20785c658fbc3d8a356eafd9f0ed2e879c6b4f6a754b6b685ea51b784c2cd0458c389c8b
-EBUILD qpopper-4.1.0.ebuild 3079 BLAKE2B c435f2ede982c35443dba987bc301ab238eb38e6f109f640d47b17b6b24fcb331c5d9f6572ddc5f5afa4f190e9c923dadd376714b5c7dadc47e2c10b9de03891 SHA512 35963d36adda72f9af0904ebc8165cf2315203b25a3fb25ff590484e6f9f71cfc6d58610abc47b1aa4f442d99b1338ae361171bf18e00c97c3bc38b091547fa6
-MISC metadata.xml 344 BLAKE2B cb11b476c69d55cfe560994f31dfe8d68af9257e97ceb51ebacf4032bba64f3747b23b9fa7336bff2eeac22d608de02c9f018e7e781b5f028b8fab5dc2545e52 SHA512 0cbc3b5de7f221da5b12f61f196993db99a75e55d0e19ca27ea02e9cfa07262ba1a599236833f53b0cad74e266738cc3996b8225fcadf5e5422c6e4f07a8f190
diff --git a/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch b/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
deleted file mode 100644
index 16b0c3aff88d..000000000000
--- a/net-mail/qpopper/files/qpopper-4.1-parallel-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'popper/Makefile.in'
---- a/popper/Makefile.in	2011-09-11 13:29:01 +0000
-+++ b/popper/Makefile.in	2011-09-11 13:29:23 +0000
-@@ -212,7 +212,7 @@
- 	        -I${common_srcdir} ${common_dir}/libcommon.a \
- 	        ${LIBS} ${LDFLAGS}
- 
--popauth: ${POPAUTHOBJS} ${MISSING_OBJS}
-+popauth: ${POPAUTHOBJS} ${MISSING_OBJS} common_library
- 	${CC}  -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} \
- 	       ${DBM_LIBS} ${MISSING_OBJS} \
- 		${common_dir}/libcommon.a
-
diff --git a/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch b/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch
deleted file mode 100644
index 53e2c6234f9f..000000000000
--- a/net-mail/qpopper/files/qpopper-4.1.0-glibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-glibc-fix.diff:
---- qpopper4.1.0/popper/popper.h.orig	2011-05-30 21:13:40.000000000 +0200
-+++ qpopper4.1.0/popper/popper.h	2016-12-31 09:31:26.910604367 +0100
-@@ -313,7 +313,7 @@
- #if !( defined(BSD) && (BSD >= 199306) ) && !defined(__USE_BSD)
-    extern int              sys_nerr;
- #  ifndef FREEBSD
--     extern char         *   sys_errlist[];
-+     extern const char         * const  sys_errlist[];
- #    ifndef SYS_SIGLIST_DECLARED
- #      ifndef __linux__
-          extern char         *   sys_siglist[];
diff --git a/net-mail/qpopper/files/qpopper.conf b/net-mail/qpopper/files/qpopper.conf
deleted file mode 100644
index 8ce96875c520..000000000000
--- a/net-mail/qpopper/files/qpopper.conf
+++ /dev/null
@@ -1,679 +0,0 @@
-#---------------------------------------------------------------------
-# Sample Qpopper 4.0 configuration file.
-#
-# This file lists all Qpopper configuration file options.  To use,
-# copy the desired setting to your own configuration file, remove
-# the leading '#' and set the desired value.
-#
-#---------------------------------------------------------------------
-
-
-
-# An integer value for the number of seconds to announce in
-# the CAPA response for the server's minimum login delay.
-#
-# Default: 
-#
-# set announce-login-delay     =
-
-
-# An integer value for the number of days to announce in
-# the CAPA response for the server's maximum message
-# retention period.
-#
-# Default:
-#
-# set announce-expire          =
-
-
-# The full path to the bulletins directory.
-#
-# Default: /var/spool/bulls
-#
-# set bulldir                  = "/var/spool/bulls"
-
-
-# Set TRUE to permit sessions to continue even if the
-# bulletins database can't be accessed.  This permits
-# users to get their mail, but they might not see some
-# bulletins for a while, or at all.
-#
-# Only valid when compiled with '--enable-bulldb'.
-#
-# Default: false.
-#
-# set bulldb-nonfatal          = false
-
-
-# Sets the maximum number of attempts to lock the bulletins
-# database.  You normally do not need to adjust this.  This value
-# should only be changed if you know if your system has usleep(3C)
-# or not.  On systems with usleep(3C), this can be a large value
-# (the default is 75).  On systems without usleep(3C), this should
-# remain small (the default is 10).
-#
-# Only valid when compiled with '--enable-bulldb'.
-#
-# Default: 75 (10 on systems without usleep(3c)).
-#
-# set bulldb-max-tries         = 75
-
-
-# Sets clear text handling options.  Values are:
-#    o 'default'  Clear text passwords are permitted for all users,
-#                 except those in the APOP database
-#    o 'never'    Clear text passwords are never permitted
-#    o 'always'   Clear text passwords are always permitted
-#    o 'local'    Clear text passwords are permitted on the local
-#                 (127.*.*.*) loop back interface only
-#    o 'tls'      Clear text passwords are permitted when TLS/SSL
-#                 has been negotiated for the session
-#    o 'ssl'      Same as tls
-#
-# The 'tls' and 'ssl' values are only valid if '--with-openssl' or
-# '--with-sslplus' was used with ./configure.
-#
-# Default: default
-#
-# set clear-text-password      = default
-
-
-# Reads additional run-time options from the specified file.
-#
-#           Caution. There are no restrictions on which options may
-#           appear in files specified with the '-f' command-line flag
-#           or the 'config-file' configuration file option in files 
-#           chained from -f.  Be certain that the file specified with
-#           '-f' or in any files it chains to are not writable by
-#           users.
-#
-# Default: none
-#
-# set config-file              = /etc/mail/pop/qpopper.config
-
-
-# Enables debug logging.  Output is in syslog.  If this option is used,
-# it should be first, so that debug records are generated for subsequent
-# options.
-#
-# Only valid if ./configure was run with '--enable-debugging'
-#
-# Default: false
-#
-# set debug                    = false
-
-
-# Changes uppercase user names to lowercase.  This permits users to
-# configure their clients with user names in UPPER or MiXeD case.
-# They can then login, assuming their actual user name is all
-# lowercase.
-#
-# Default: false
-#
-# set downcase-user            = false
-
-
-# If '--with-drac' used with ./configure, this option specifies the DRAC 
-# host.
-#
-# Default: localhost
-#
-# set drac-host                = localhost
-
-
-# Enables Kerberos support.
-#
-# Only valid if ./configure run with '--enable-kerberos5'.
-#
-# Default: false
-#
-# set kerberos                 = false
-
-
-# Specifies the Kerberos service to use (same as the compile time
-# KERBEROS_SERVICE define). The default is rcmd, although the use of
-# pop is popular.
-#
-# Only valid if ./configure run with '--enable-kerberos5'.
-#
-# Default: rcmd
-#
-# set kerberos-service         = "rcmd"
-
-
-# Checks if mail lock needs to be refreshed every this many messages.
-#
-# You normally do not need to adjust this.  See "Performance" in the
-# Qpopper Administrator's Guide for more information.
-#
-# Default: 
-#
-# set mail-lock-check          =
-
-
-# Disables the reverse lookups on client IP addresses.
-#
-# Default: true
-#
-# set reverse-lookup           = true
-
-
-# Enables server mode by default.  See the Qpopper Administrator's
-# Guide for more information.
-#
-# Default: false
-#
-# set server-mode              = false
-
-
-# Enables statistics logging.  After each session ends, a statistics
-# record is  written to the log.  This record resembles the following
-# example: 'stats randy 0 0 1 385 randy.example.org 192.168.2.4' and
-# has the following meaning:
-#   Username: 'randy'
-#   Deleted messages: 0
-#   Deleted octets: 0
-#   Messages left on server: 1
-#   Octets left on server: 385
-#   Name of client machine: 'randy.example.org'
-#   IP address of client machine: '192.168.2.4'
-#
-# Default: false
-#
-# set statistics               = false
-
-
-# Sets the timeout for network reads.  Qpopper terminates the
-# connection with the client if no input is received in this
-# many seconds.  RFC 1939 states that this timeout must be
-# 600 seconds (10 minutes).  However, ideal settings in some
-# cases are between 30 and 120 seconds.  In other cases the 600
-# value is best, and sometimes a value in between is better.
-#
-# Default: 120
-#
-# set timeout                  = 120
-
-
-# Enables debug logging if '--enable-debugging' was used with
-# ./configure.  All debug and standard log records are written to
-# the specified file.  If this option is used, it should be first,
-# so that debug records are generated for subsequent options.
-#
-# If used without '--enable-debugging', redirects all log messages
-# to the specified file but does not enable debug logging.
-#
-# Default: none
-#
-# set tracefile                =
-
-
-# Reads additional run-time options from a file named
-# '.qpopper-options' in the user's home directory, if present.
-#
-# This file is normally owned by the user.
-#
-# Default: false
-#
-# set user-options             = false
-
-
-# Reads additional run-time options from a file named
-# 'username.qpopper-options' in the spool directory.
-#
-# This file should not be owned by nor writable by the user.
-#
-# Default: false
-#
-# set spool-options            = false
-
-
-# When updating the spool at the end of a session, this option
-# instructs Qpopper to rename the temporary file to the spool instead
-# of copying it.  This reduces I/O at session end by a third, but is
-# likely to break programs such as biff or the shell's mail check
-# feature.  Use this option only if such programs are not used.  It is
-# safest to only enable this option when users do not have shell
-# access to the mail server.
-#
-# See "Performance" in the Qpopper Administrator's Guide for more
-# information.
-#
-# Default: false
-#
-# set fast-update              = false
-
-
-# When set, domains are trimmed from user names before use.  For
-# example, if a user named 'maida' enters her login name in her POP
-# client as 'maida@example.org', Qpopper treats this as just 'maida'.
-#
-# Default: false
-#
-# set trim-domain              = false
-
-
-# Specifies TLS/SSL support.  The permitted values are:
-#    o 'default'         TLS/SSL is not supported
-#    o 'none'            Same as default
-#    o 'stls'            Enables support for the STLS command. This
-#                        permits TLS/SSL negotiations on the
-#                        standard (or any) port, allowing the same
-#                        port to be used by TLS/SSL and regular
-#                        clients.
-#    o 'alternate-port'  Enables alternate-port TLS/SSL.  Some older
-#                        clients require this. (The usual port for
-#                        alternate-port TLS/SSL with pop is 995.)
-#
-# Only valid when '--with-openssl' or '--with-sslplus' used with
-# ./configure
-#
-# Default: default
-#
-# set tls-support              = default
-
-
-# Specifies the permitted cipher suites.  See the OpenSSL documentation
-# for syntax.  You normally do not need to set this.
-#
-# Only valid when '--with-openssl' used with ./configure
-#
-# Default: 
-#
-# set tls-cipher-list          =
-
-
-# Restricts the version of TLS/SSL recognized in session negotiations.
-# You normally do not need to set this.  Supported values are:
-#    o 'default' (same as SSLv23)
-#    o 'SSLv2'   Forces Qpopper only to understand SSLv2 client hello
-#                messages.
-#    o 'SSLv3'   Forces Qpopper only to understand SSLv3 client hello
-#                messages.  This especially means that it does not
-#                understand SSLv2 client hello messages, which are
-#                widely used for compatibility reasons.
-#    o 'TLSv1'   Forces Qpopper only to understand TLSv1 client hello
-#                messages.  This especially means that it does not
-#                understand SSLv2 client hello messages, which are
-#                widely used for compatibility reasons.  It also does
-#                not understand SSLv3 client hello messages.
-#    o 'SSLv23'  Allows Qpopper to understand SSLv2, SSLv3, and TLSv1
-#                client hello messages.  This is the best choice when
-#                compatibility is a concern.  This is the default
-#                value.
-#    o 'all'     (same as SSLv23)
-#
-# Only valid when '--with-openssl' used with ./configure
-#
-# Default: default
-#
-# set tls-version              = default
-
-
-# Specifies the file containing the server's TLS/SSL certificate and
-# encrypted private key.
-#
-# Only valid if '--with-sslplus' used with ./configure.
-#
-# Default: none
-#
-# set tls-identity-file        =
-
-
-# Specifies the passphrase to decrypt the server's private key (in the
-# identify file).
-#
-# Only valid if '--with-sslplus' used with ./configure.
-#
-# Default: none
-#
-# set tls-passphrase           =
-
-
-# Specifies the file which contains the server's TLS/SSL certificate.
-# This file may also contain the server's unencrypted private key.
-#
-# Only valid if '--with-openssl' used with ./configure
-#
-# Default: none
-#
-#
-# set tls-server-cert-file     = /etc/mail/certs/cert.pem
-
-
-# Specifies a file which contains the server's TLS/SSL private key.
-# Note: This private key must not be encrypted.
-#
-# If the private key is contained in the same file as the certificate
-# (as specified with tls-server-cert-file), you do not need to set
-# this option.
-#
-# Only valid if '--with-openssl' used with ./configure
-#
-# Default: none
-#
-# set tls-private-key-file     =
-
-
-# When set, Qpopper writes a log record at the end of a session
-# containing the elapsed time for the session authentication,
-# initialization. and cleanup.
-#
-# Default: false
-#
-# set timing                   = false
-
-
-# When set, Qpopper checks for old .user.pop files in old locations
-# when hash-spool or homedirmail is used.  When reset, Qpopper skips
-# this check, which speeds things up.
-#
-# Default: true
-#
-# set check-old-spool-loc      = true
-
-
-# When set, Qpopper checks for and creates if needed the hashed spool
-# directories.  When reset, Qpopper doesn't check for or create the
-# hashed spool directories.  Set to false if you precreate the
-# directories.
-#
-# Default: true
-#
-# set check-hash-dir           = true
-
-
-# When set, Qpopper checks for expired passwords (if the platform
-# permits).  When reset, Qpopper omits this check.
-#
-# Default: true
-#
-# set check-password-expired   = true
-
-
-# Determines whether Qpopper updates the read/unread status of
-# messages (a feature relied on by some mail clients).  Also
-# determines if Qpopper saves the message's unique identifier
-# (UID) in the spool.
-#
-# When reset, it forces the UID for every message to be
-# recalculated, using more CPU but potentially less I/O.
-#
-# See the "Performance" section of the Qpopper Administrator's Guide
-# for more information.
-#
-# Default: true
-#
-# set update-status-headers    = true
-
-
-# Determines whether Qpopper enters update state when a session
-# aborts.  Resetting this option causes Qpopper to ignore any
-# deletions if the session is aborted.
-#
-# Note that RFC 1939, section 6 prohibits the default behavior,
-# but experience showed that otherwise users on noisy lines were
-# often unable to delete their mail.  Reset this option to inhibit
-# the default behavior, and obey RFC 1939, but watch for users who
-# download the same messages over and over, or whose spools fill up.
-#
-# Default: true
-#
-# set update-on-abort          = true
-
-
-# When set, Qpopper automatically and unconditionally deletes messages
-# that have been downloaded using the RETR command (the normal command
-# for accessing messages).
-#
-#       Caution: This option could result in lost mail.  Be sure to
-#       inform your users that the option is in effect before enabling.
-#
-# Default: false
-#
-# set auto-delete              = false
-
-
-# When set, Qpopper shows bulletins to users by groups (the group name
-# is the second dot-separated element in each bulletin's name). See
-# "Using Bulletins" in the Qpopper Administrator's Guide for more
-# information.  Use a group name of 'ALL' for all users.
-#
-# Default: false
-#
-# set group-bulletins          = false
-
-
-# When set to a 1 or 2, the subdirectory for the mail spools is
-# determined from the user name by either (1) hashing the first four
-# characters or (2) by using directories equal to the first letter and
-# the second letter (if any).  For example, if the spool directory is
-# '/var/mail', the spool file for user 'maida' would be:
-#       '/var/mail/maida'                hash-spool = 0
-#       '/var/mail/o/maida'              hash-spool = 1
-#       '/var/mail/m/a/maida'            hash-spool = 2
-#
-# See the "Performance" section of the Qpopper Administrator's Guide
-# for more information.
-#
-# Default: 0
-#
-# set hash-spool               = 0
-
-
-# To have the user's home directory be the spool location, set this
-# option to be the correct file name for the spool.
-#
-# Default: none
-#
-# set home-dir-mail            = ".mail"
-
-
-# When set, instructs Qpopper to generate message unique identifiers
-# (UIDs) using old (pre-3.x) style encoding.  This is useful only if
-# you also set 'update-status-headers' to false, have existing users
-# with old (pre-3.x) spool files, and you want to keep the UIDs the
-# same.
-#
-# Default: false
-#
-# set old-style-uid            = false
-
-
-# When set, Qpopper checks for and hides status messages created by
-# University of Washington software.
-#
-# Default: false
-#
-# set UW-kluge                 = false
-
-
-# When set, Qpopper keeps (does not delete) the '.user.pop' file (the
-# temporary drop file).  Normally this file is deleted when the
-# session ends.  Some sites like to retain it to determine the last
-# time a user has accessed his or her mail.
-#
-# Default: false
-#
-# set keep-temp-drop           = false
-
-
-# When set, causes server mode to be on for users who are members of
-# the specified group.  See the "Enabling Server Mode" and
-# "Performance" sections of the Qpopper Administrator's Guide for more
-# information.
-#
-# Default: none
-#
-# set group-server-mode        =
-
-
-# When set, causes server mode to be off for users who are members of
-# the specified group.  See the "Enabling Server Mode" and
-# "Performance" sections of the Qpopper Administrator's Guide for more
-# information.
-#
-# Default: none
-#
-# set group-no-server-mode     =
-
-
-# Specifies a file that permits only users listed in the file to have
-# Qpopper access.  The format is a list of user names, one per line.
-#
-# Default: none
-#
-# set auth-file                =
-
-
-# Specifies a file that denies access to users listed in the file.
-# The format is a list of user names, one per line.
-#
-# Default: none
-#
-# set nonauth-file             =
-
-
-# Set this option if you don't want Qpopper to display its version in
-# the POP protocol banner or CAPA IMPLEMENTATION response of
-# unauthenticated users.
-# Some sites believe this improves security since it avoids advertising
-# that an old version (perhaps with known vulnerabilities) is being
-# used.  Others feel is makes the site more likely to be attacked,
-# since it also avoids advertising when running a secure version.
-#
-# Default: false
-#
-# set shy                      = false
-
-
-# Set this to the full path to sendmail or other such program used to
-# submit new messages.  Qpopper uses this to implement XTND XMIT.
-#
-# The default is determined at compile time.  
-#
-#
-# set mail-command             = /usr/sbin/sendmail
-
-
-# Set this to the full path to the mail spool directory.
-#
-# The default is determined at compile time.  
-#
-# set spool-dir                = /var/spool/mail
-
-
-# If you do not want '.user.pop' (temporary drop files) to be in the
-# spool directory, set this to the full path to the directory to be
-# used for temp drop files.  Note that use of /tmp is not recommended,
-# because a system reboot will wipe out the files.  This could cause
-# lost mail.
-#
-# Default: spool directory
-#
-# set temp-dir                 =
-
-
-# The name of the temporary drop files.  You should not normally set
-# this option.
-#
-# Default: ".%s.pop"
-#
-# set temp-name                = ".%s.pop"
-
-
-# If you do not want user cache files to be in the same directory as
-# temporary drop files, set this to the full path to the directory for
-# cache files.  Note that use of /tmp is not recommended, because a
-# system reboot wipes out the files.
-#
-# Default: temp-dir
-#
-# set cache-dir                =
-
-
-# The name of the cache files.  You should not normally set this
-# option.
-#
-# Default: ".%s.cache"
-#
-# set cache-name               = ".%s.cache"
-
-
-# Specifies the maximum number of old bulletins seen by new users.
-#
-# Default: 1
-#
-# set max-bulletins            = 1
-
-
-# When set, Qpopper uses a method of opening lock files that may work
-# over NFS.  This has not been thoroughly tested, however.
-#
-# Default: false
-#
-# set no-atomic-open           = false
-
-
-# Qpopper sends network output to client in small chunks (for example,
-# line-by-line when sending a message).  By default, Qpopper
-# aggregates data to be sent to clients in large chunks.  This may be
-# faster or slower, depending on specifics of both the client and
-# server hardware and networking stacks as wel as network elements in
-# between (such as routers).  Also, some networking stacks do their
-# own aggregation.
-#
-# Under congested network conditions, larger packets increase the
-# incidence of lost packets and thus client or server timeouts,
-# leading to "POP timeout" or "EOF" errors.
-#
-# When TLS/SSL is in effect, smaller packets increase the overhead
-# needed to send data, which may result in worse performance.
-#
-# You can adjust the Qpopper behavior by setting this option.  The
-# values are:
-#    o 'default'  Always send large chunks
-#    o 'always'   Same as 'default'
-#    o 'never'    Never aggregate data into large chunks
-#    o 'tls'      Only aggregate data into large chunks when TLS/SSL
-#                 has been negotiated for the session 
-#    o 'ssl'      Same as 'tls'
-#
-# Default: default
-#
-# set chunky-writes            = default
-
-
-# Specifies the log facility that Qpopper uses.
-#
-# Note that this does not apply to popauth, nor to the daemon in
-# standalone mode.  These continue to use the compile-time default.
-#
-# Values are:
-#    o 'mail'    Qpopper logs to LOG_MAIL facility.
-#    o 'local0'  Qpopper logs to LOG_LOCAL0 facility.
-#    o 'local1'  Qpopper logs to LOG_LOCAL1 facility.
-#    o 'local2'  Qpopper logs to LOG_LOCAL2 facility.
-#    o 'local3'  Qpopper logs to LOG_LOCAL3 facility.
-#    o 'local4'  Qpopper logs to LOG_LOCAL4 facility.
-#    o 'local5'  Qpopper logs to LOG_LOCAL5 facility.
-#    o 'local6'  Qpopper logs to LOG_LOCAL6 facility.
-#    o 'local7'  Qpopper logs to LOG_LOCAL7 facility.
-#
-# Default: determined at compile time, usually LOG_LOCAL0 or
-# LOG_MAIL, depending on the operating system.
-#
-# set log-facility             = local1
-
-
-# When set, Qpopper logs successful authentications using the
-# specified string.  Within the string, an occurrence of '%0' is
-# replaced with the Qpopper version, '%1' with the user name, '%2'
-# with the user's host name, and '%3' with the user's IP address.
-#
-# Default: none, unless '--enable-log-login' used with ./configure,
-# in which case "(v%0) POP login by user /"%1/" at (%2) %3" is used.
-#
-# set log-login                = "(v%0) POP login by user /"%1/" at (%2) %3"
-
-
diff --git a/net-mail/qpopper/files/qpopper.init.d b/net-mail/qpopper/files/qpopper.init.d
deleted file mode 100644
index 45e55148ac10..000000000000
--- a/net-mail/qpopper/files/qpopper.init.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting qpopper"
-	start-stop-daemon --start --quiet --background \
-        --exec /usr/sbin/popper -- -f /etc/qpopper.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping qpopper"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/popper
-	eend $?
-}
diff --git a/net-mail/qpopper/files/qpopper.xinetd b/net-mail/qpopper/files/qpopper.xinetd
deleted file mode 100644
index 16cc899f42cc..000000000000
--- a/net-mail/qpopper/files/qpopper.xinetd
+++ /dev/null
@@ -1,16 +0,0 @@
-# default: off
-# description: The POP3 service allows remote users to access their mail \
-#              using an POP3 client such as Netscape Communicator, mutt, \
-#	       or fetchmail.
-service pop-3
-{
-	socket_type		= stream
-	wait			= no
-	user			= root
-	port			= 110
-	server			= /usr/sbin/popper
-	server_args		= -f /etc/qpopper.conf
-	log_on_success		+= USERID
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/net-mail/qpopper/metadata.xml b/net-mail/qpopper/metadata.xml
deleted file mode 100644
index caf9646ff227..000000000000
--- a/net-mail/qpopper/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="apop">Enables the pop.auth file in /etc/pop.auth</flag>
-    <flag name="mailbox">Enables mail spool file is in home directory ~/Mailbox</flag>
-  </use>
-</pkgmetadata>
diff --git a/net-mail/qpopper/qpopper-4.1.0.ebuild b/net-mail/qpopper/qpopper-4.1.0.ebuild
deleted file mode 100644
index 810e4e0da8c0..000000000000
--- a/net-mail/qpopper/qpopper-4.1.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert user
-
-MY_P=${PN}${PV}
-
-DESCRIPTION="A POP3 Server"
-HOMEPAGE="http://www.eudora.com/products/unsupported/qpopper/index.html"
-SRC_URI="ftp://ftp.qualcomm.com/eudora/servers/unix/popper/${MY_P}.tar.gz"
-
-LICENSE="qpopper GPL-2 ISOC-rfc"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gdbm mailbox pam ssl xinetd apop"
-
-DEPEND="virtual/mta
-	>=net-mail/mailbase-0.00-r8
-	xinetd? ( virtual/inetd )
-	gdbm? ( sys-libs/gdbm )
-	pam? ( >=sys-libs/pam-0.72 )
-	ssl? ( dev-libs/openssl:0 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1-parallel-build.patch
-	"${FILESDIR}"/${PN}-4.1.0-glibc.patch #532254
-)
-
-pkg_setup() {
-	use apop && enewuser pop
-}
-
-src_prepare() {
-	default
-	# Test dirs are full of binary craft. Drop it.
-	rm -rf ./mmangle/test || die
-	sed -i -e 's:-o popauth:& ${LDFLAGS}:' popper/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable !xinetd standalone) \
-		$(use_enable debug debugging)   \
-		$(use_with ssl openssl)         \
-		$(use_with gdbm)                \
-		$(use_with pam pam pop3)        \
-		$(use_enable apop apop /etc/pop.auth) \
-		$(use_enable mailbox home-dir-mail Mailbox) \
-		--disable-drac \
-		--enable-shy \
-		--enable-popuid=pop \
-		--enable-log-login \
-		--enable-specialauth \
-		--enable-spool-dir=/var/spool/mail \
-		--enable-log-facility=LOG_MAIL
-
-	if ! use gdbm; then
-		sed -i -e 's|#define HAVE_GDBM_H|//#define HAVE_GDBM_H|g' config.h || die "sed failed"
-	fi
-}
-
-src_install() {
-	if use apop; then
-		dosbin popper/popauth
-		fowners pop:root /usr/sbin/popauth
-		fperms 4110 /usr/sbin/popauth
-		doman man/popauth.8
-	fi
-
-	dosbin popper/popper
-	doman man/popper.8
-
-	insinto /etc
-	doins "${FILESDIR}/qpopper.conf"
-
-	if use ssl; then
-		sed -i -e 's:^# \(set tls-server-cert-file\).*:\1 = /etc/mail/certs/cert.pem:' \
-			   -e 's:^# \(set tls-support\).*$:\1 = stls:'\
-			"${D}/etc/qpopper.conf"
-	fi
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/qpopper.xinetd" pop-3
-	else
-		newinitd "${FILESDIR}/qpopper.init.d" qpopper
-	fi
-
-	HTML_DOCS="doc/LMOS-FAQ.html"
-	einstalldocs
-	dodoc doc/{Release.Notes,Changes}
-
-	docinto rfc
-	dodoc doc/rfc*.txt
-
-	insinto /usr/share/doc/${PF}
-	doins GUIDE.pdf
-}
-
-pkg_postinst () {
-	if use ssl; then
-		install_cert /etc/mail/certs/cert
-		chown root:mail /etc/mail/certs
-		chmod 660 /etc/mail/certs
-	fi
-	if use apop; then
-		elog "To authenticate the users with APOP "
-		elog "you have to follow these steps:"
-		elog ""
-		elog "1) initialize the authentication database:"
-		elog "   # popauth -init"
-		elog "2) new users can be added by root:"
-		elog "   # popauth -user <user>"
-		elog "   or removed:"
-		elog "   # popauth -delete <user>"
-		elog "   Other users can add themeselves or change their"
-		elog "   password with the command popauth"
-		elog "3) scripts or other non-interactive processes can add or change"
-		elog "   the passwords with the following command:"
-		elog "   # popauth -user <user> <password>"
-		elog ""
-	fi
-}
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index d4b4dab715b2..8314997aed1d 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -3,5 +3,5 @@ DIST rss2email-2.71.tar.gz 63268 BLAKE2B 56c4e2b59611ffcb0e7a9ff3558e6ed4da3f5ba
 DIST rss2email-3.10_pre20171001.tar.gz 162385 BLAKE2B 91ae17c43cca616750139b6d559fcfff50be682f70a932ae3e1e281c2a1ae0c31419d37ce7d8887b72873359f0ce29dfb03a1a7c19cfdc2fc945902110b6a3a1 SHA512 d0174489b1d5be9f18e720351f994a87ac0d6131fd23914deb1305223a022e3a741cf279c68c533e8dfe99112af334223354dcd145b38c09e32e16e1a80898ff
 DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
 EBUILD rss2email-2.71-r1.ebuild 1621 BLAKE2B 90f214d11231318e13fe6acffce72837a36c6a39b378e0eb60fc0cc0ab6626b5e589c35975a11f1ef596adca540995c22e3235f227a93568d0005af2e1d363c8 SHA512 c758468374d63600c7800453186f1ce42279090cd3e39c9dff35f6fdb26a7720758ea0610bfbf99d95d38b9bd204a36217a6a91805eb662f7fd62b1f7baada53
-EBUILD rss2email-3.10_pre20171001.ebuild 777 BLAKE2B 1d8ffd67fbdec8355f9a17fba45849f5298f8171b7ee9463cac6618374143ce9d02b913a1ac769fea9abae477df4f6717e986f4528117ab657b6fd45f68d9068 SHA512 3cb013bf016650b8a3c146f4c43ef48b67b5b1c59554dde54e72f82419e791d7ef35c247d8c5e8b58ad2b5c09711a5c4540c7c2eaf00949ef1bce2fd50981492
+EBUILD rss2email-3.10_pre20171001.ebuild 772 BLAKE2B d857de7cda75d2b8dee0754fb38766f6de250ca1dadbb9b3f89e7c40b352cd4abc16887919a0f5c82ae1511a15df2647580393ba9d649aa9024e2976c3262978 SHA512 ae9f03a4b150d80be8082d063b2d55b6e8e7d3c0cca9b0531a82191d79f596ed16fa9cb80bf7855c091ec06e3eecd33f31a3977a65355b310ceca743a904d29b
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild b/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
index a37eba22f8a2..5c87d0dcaab4 100644
--- a/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
+++ b/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/net-mail/up-imapproxy/Manifest b/net-mail/up-imapproxy/Manifest
deleted file mode 100644
index cb3689e25857..000000000000
--- a/net-mail/up-imapproxy/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX imapproxy.initd 394 BLAKE2B dd521d884a4811732754f4aa3b3b4ae64b6910d566fef362f59dba3db3dbf8d9514b323ef95539c8a32d8fe6ff5324f64deeeeef24b725a3d1e5f51957142e87 SHA512 ba5fe198d99d502c45acd45a5e65fbdccc5319b1080ebf9fe93d32a10a22328993f56c0a28a3d028b12781259dfe11ce1599598e9aae2017c613c8983ae1e9ae
-AUX imapproxyd.8 1984 BLAKE2B 3cf2f95f5fb14b0f898c2ba46b9b13fae203221c6c10524eef2887d2f157bd937d95e661d56a298ef1649dbfb0ff0b5b402f8d85c9d84cbc191f0d18caa0ac76 SHA512 1368e4843fb026943beb0e547c679c319aa90a834792f856e6f06dd8a91e8142a8fe93a622b4289ed2cea21c12875e6fa37678b71297dfd24a9d2cd6cad52268
-AUX pimpstat.8 836 BLAKE2B 6890143b89dc290be3973b758501d34463ac6b2e5326a4b8e5bb1c105b35617ca0f217750c2219195940dabfdb4b01eeb066648aeb795dd510d242c7de200ce0 SHA512 3fa58de9b9cdfaf4f9d3d04e5182ec1398e7d17fa505403266b16fa9ecf33736033b305a99addb81343450666b9f60afe8e905273ec4b8a34e8086fffb2aedcd
-AUX up-imapproxy-1.2.7-ldflags.patch 521 BLAKE2B 817e7f7cfe1d1ea08b6224e70fdbef4c94eedb74a2fd6a8d69cbf50fd5ef5cfb160da062cee67fc3bdaaf295d0df0f02a51b19e6bd3e58f7f8a432718d70c2d0 SHA512 56bed6cb49e0a7821ca40a9f73b586601f8e6c323266fb82065e3199df9d934fe4e60dfd386dbdf47b1fddeff9a678478d4f972fca715724aea801762dca0d45
-AUX up-imapproxy-1.2.7-tinfo.patch 555 BLAKE2B cddeb2467a0f7a038414026ad2f1cdd81444f9fbca4bc190d77b7ed674f22a0cb6a573dda010d26c0415035ce4603845f9abe695573967994d740655e873620c SHA512 e4cd2a72337481d4060a091a4540f70997e79863ceb999b9ee64c03042b020718939caabed20706ecb4b876a0cce078559468946c5e29a7afbc185dca70f983a
-DIST squirrelmail-imap_proxy-1.2.7.tar.bz2 111651 BLAKE2B 5d09f12617905eec60ae2fca42895f7bb7111db052a8c6d16f73ef6d6e1fbdc9efc33ff61b0f447f450e02bc862a6f10d6d1878bafc004081e4dde16cb2977fa SHA512 4b341fe5ea13241983c780ad2487ad5bd97136652b095f54ccf8f61d0f0818236d0d6e1005d46811cf3bd15896160fb172a40ae805ccc3ce7d6fc984099d2b2e
-EBUILD up-imapproxy-1.2.7.ebuild 1452 BLAKE2B 9f8b07bb54a7cabdbe2913394f0045b44876b64189e3099c69f85df584e79b9713e70996eba0f3e13fb4999291069825498a522099e32d868a349d10dadd11bf SHA512 617b7473ca0ba6bac5be4d719d022612c5435eacbe203c84205596fd4b09a78e4e7538580f4afab6e186441add8e6b9c78bfb804d4b9be6db54287dea81fa97d
-MISC metadata.xml 254 BLAKE2B f48e6c4e3b0eb13b72c3dc59fd212a08064ae47972010b53b5b784d8166b167a7794bae4eb3bfc78bb29bbba5fe38c3914fc7ebd93aa6eda8d2e2477fe6ea381 SHA512 802a663a720e850a7d8e03c857bd926a2f1799b8d9950901ca6b17104b29ff106ab6c74aeeb9a3b3ebb0d0d08c18cc5a245f83d93860c3519fc240f6dc929879
diff --git a/net-mail/up-imapproxy/files/imapproxy.initd b/net-mail/up-imapproxy/files/imapproxy.initd
deleted file mode 100644
index a95389027452..000000000000
--- a/net-mail/up-imapproxy/files/imapproxy.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use logger
-	need net
-}
-
-start() {
-	ebegin "Starting up-imapproxy"
-	start-stop-daemon --start --quiet --exec /usr/sbin/imapproxyd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping up-imapproxy"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/imapproxyd
-	eend $?
-}
diff --git a/net-mail/up-imapproxy/files/imapproxyd.8 b/net-mail/up-imapproxy/files/imapproxyd.8
deleted file mode 100644
index 1c70d9525756..000000000000
--- a/net-mail/up-imapproxy/files/imapproxyd.8
+++ /dev/null
@@ -1,64 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH IMAPPROXYD 8 "Mar 12, 2004" "Dave McMurtrie" "IMAP proxy daemon"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.SH NAME
-.B imapproxyd
-\- IMAP proxy daemon
-.SH SYNOPSIS
-.B imapproxyd
-.RI
-[
-.B -f
-.RI
-<config file name> ]
-.RI
-[
-.B -p
-.RI
-<pidfile name> ]
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B imapproxyd
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-UP-ImapProxy proxies IMAP transactions between an IMAP client and an IMAP 
-server. The general idea is that the client should never know that it is
-not talking to the real IMAP server, but ImapProxy caches server connections.
-.PP
-ImapProxy was written to compensate for webmail clients that are unable  to
-maintain persistent connections to an IMAP server. Most webmail clients
-need to log in to an IMAP server for nearly every single transaction; This
-behaviour can cause tragic performance problems on the IMAP server.
-ImapProxy tries to deal with this problem by leaving server connections
-open for a short time after a webmail client logs out. When the webmail
-client connects again, ImapProxy will determine if there is a cached 
-connection available and reuse it if possible.
-.BR
-.SH FILES
-By default, UP-ImapProxy reads /etc/imapproxy.conf on startup.
-This can be changed by using the 
-.I -f
-option
-.PP
-Unless foreground_mode has been enabled, UP-ImapProxy will write its PID to to
-a PID-file. It defaults to /var/run/imapproxy.pid, but can be overridden with
-the 
-.I -p
-option
-.SH SEE ALSO
-.BR pimpstat (8),
-.br
-.SH AUTHOR
-This manual page was written by Jose Luis Tallon
-.nh
-<jltallon@adv-solutions.net>,
-for the Debian GNU/Linux system (but may be used by others).
-
- 
diff --git a/net-mail/up-imapproxy/files/pimpstat.8 b/net-mail/up-imapproxy/files/pimpstat.8
deleted file mode 100644
index 2466e7ce2780..000000000000
--- a/net-mail/up-imapproxy/files/pimpstat.8
+++ /dev/null
@@ -1,27 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PIMPSTATS 8 "Mar 12, 2004" "Dave McMurtrie" "IMAP proxy daemon"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.SH NAME
- pimpstat \- UP-ImapProxy statistics
-.SH SYNOPSIS
-.B pimpstat
-.RI [options]
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B pimpstat
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.SH SEE ALSO
-.BR imapproxyd (8),
-.br
-.SH AUTHOR
-This manual page was written by Jose Luis Tallon
-.nh 
-<jltallon@adv-solutions.net>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch
deleted file mode 100644
index 4ba1b6b725e5..000000000000
--- a/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 98876519b581c0427b81d772f56b25ad3d0121df
-Author: Eray Aslan <eras@gentoo.org>
-Date:   Sun Jun 5 19:43:41 2011 +0300
-
-    respect LDFLAGS
-
-diff --git a/Makefile.in b/Makefile.in
-index 1b235b8..8ac1e4f 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -70,7 +70,7 @@ $(XYD_BIN): $(XYD_OBJ)
- 	$(CC) -o $@ $(XYD_OBJ) $(LDFLAGS) $(XYD_LIB)
- 
- $(TAT_BIN): $(TAT_OBJ)
--	$(CC) -o $@ $(TAT_OBJ) $(TAT_LIB)
-+	$(CC) -o $@ $(TAT_OBJ) $(LDFLAGS) $(TAT_LIB)
- 
- clean:
- 	rm -f ./src/core  $(XYD_OBJ) $(TAT_OBJ) $(XYD_BIN) $(TAT_BIN)
diff --git a/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch
deleted file mode 100644
index cbe19e8c0eb7..000000000000
--- a/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -121,12 +121,16 @@
- save_LIBS="$LIBS"
- LIB_CURSES=""
- AC_CHECK_LIB(curses, initscr, LIB_CURSES="-lcurses", [ curses_found=no ])
--if test "$curses_found" == no; then
-+if test "$curses_found" = no; then
-   AC_CHECK_LIB(ncurses, initscr, LIB_CURSES="-lncurses",
-  AC_ERROR([Can't compile without curses!!!]))
- fi
- 
- LIBS="$save_LIBS"
-+
-+AC_SEARCH_LIBS(stdscr, tinfo curses ncurses, [LIB_CURSES="$LIB_CURSES $ac_cv_search_stdscr"],
-+ AC_MSG_ERROR([Cannot find a library providing stdscr]))
-+
- AC_SUBST(LIB_CURSES)
- 
- 
diff --git a/net-mail/up-imapproxy/metadata.xml b/net-mail/up-imapproxy/metadata.xml
deleted file mode 100644
index a02624b0c88b..000000000000
--- a/net-mail/up-imapproxy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">squirrelmail</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
deleted file mode 100644
index accddba17434..000000000000
--- a/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Proxy IMAP transactions between an IMAP client and an IMAP server"
-HOMEPAGE="http://www.imapproxy.org/"
-SRC_URI="mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="kerberos ssl +tcpd"
-
-RDEPEND="sys-libs/ncurses
-	kerberos? ( virtual/krb5 )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-S=${WORKDIR}/squirrelmail-imap_proxy-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-ldflags.patch
-	epatch "${FILESDIR}/${P}"-tinfo.patch
-
-	sed -i \
-		-e 's:in\.imapproxyd:imapproxyd:g' \
-		README Makefile.in include/imapproxy.h || die
-
-	#buffer oveflow
-	#http://lists.andrew.cmu.edu/pipermail/imapproxy-info/2010-June/000874.html
-	sed -i \
-		-e "/define BUFSIZE/s/4096/8192/" \
-		-e "/define MAXPASSWDLEN/s/64/8192/" \
-		include/imapproxy.h
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_with kerberos krb5) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap)
-}
-
-src_install() {
-	dosbin bin/imapproxyd bin/pimpstat
-
-	insinto /etc
-	doins scripts/imapproxy.conf
-
-	newinitd "${FILESDIR}"/imapproxy.initd imapproxy
-
-	dodoc ChangeLog README README.known_issues
-	use ssl && dodoc README.ssl
-
-	doman "${FILESDIR}"/*.8
-}
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
deleted file mode 100644
index 78f9b2ae8c99..000000000000
--- a/net-mail/uw-imap/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX uw-imap-2004c-amd64-so-fix.patch 675 BLAKE2B bf4277baebd8b074fafc682245bded70ed94cbed3d95e6e4d208a9c7ad04dd3be10b9f79078d0eaad3fb4a05617ac67a8dbbe3c73a7bbfe5da9ac738e286131f SHA512 7275a7597e346e99e7d4f94423cdc4cfb947a5a93e6e29de8f15ede933dcdcb9a2e951f05e486d93a147bc5def842a089a94e2a9c63b4e841c92c39e7560b37b
-AUX uw-imap-ldflags.patch 1643 BLAKE2B 80be135395bdbb572f90262fc53f3edfa7524d97828d7f508e8f050498efc76d92fd97feb4f79744c21a0c964f681f32a5717c05b47a47214db8190c758576f2 SHA512 ae3739fe3574a5decf15ce35f51818c8707aa883688ac584ebaa9ba7073c8f0ff606e9a948ecb71a95b98ffb8b644be133f01b3aaeb1a1aefa67085741f2b405
-AUX uw-imap.xinetd 377 BLAKE2B 50c58f5e1536f48776102a4a94a73cb5be69535bbd5f6019965dea49ecca1d02ddd4be873fce41e23a91370524b6052db3ae6bd7ade446374ff1b59564b17519 SHA512 7575337158ba49788325bf304be1fe0be08dac37258c51cabf7106d2d935a4ca00a6218f22a44cae40c2da01aa5525552d5707e876ffd771e328c57d4e82d447
-AUX uw-imaps.xinetd 371 BLAKE2B 91ebf85c3040f89433720d762e913b67f4781f4abd5825974fdc2837ae17fae054444595af30bbff6046b5b9c9e4b8547e4fb9f1ce979a3c70a6717222d2224e SHA512 5962875a4a254a852582f3a71b7eb2861589a1d4592da8cefff0e945000ecd035a843c735a652adb647fc02aba93ffda6d6e3fadf7c69aefd86e440100301e58
-AUX uw-ipop2.xinetd 448 BLAKE2B 5147929370d0756b402a058ab1cb72c381c92d72af65ea5b31cc82d1db54a5322503468089b725ae562aa6436b96d69df281850b980d581c1df8f82807d98003 SHA512 f840d5e7ab234a5dbe3eedd2078aca0063324eba4257479fb8659497f91e3aec09e5394f057c904b380394f4987a065cb9e9206c613bb6cabf6d78474548b230
-AUX uw-ipop3.xinetd 357 BLAKE2B d5b89454f1a823e00f59cb2cfba33362b0b519a1cddd4adec483331a39329d36e1b5806f8447ac23b38313e109fa06cdd642dd703486662e7262bf081f0eaa79 SHA512 ccaaf4b6972ebcce8ece756562e51b1a0c752c50378930abb807ba878842d1afa8d88fecc091ee0f228149abdd3426fafa06bc882c3d684e44dabc4d0d32e347
-AUX uw-ipop3s.xinetd 357 BLAKE2B 78c781c560fb3f244b9c9d96dd58a5df2c10f05ffd22470f49c4e96e93c32e452238a6213a3239ab13a993e26e6ded1e70d1b2a9beb3d291dd487f5a4d91818c SHA512 f60eed919c76d1a4d6f4d4f75c9801003660602b13bbf6c850ddc33c0a1a2ff087454844bdfb1caa4bb8e5239cab8cfacf84bbda485c793f14199a510d71013a
-DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD uw-imap-2007f-r1.ebuild 4673 BLAKE2B e496d63c51f88d7f80a43df4e98fe3cab27b35e2786273c90ec699bbef5ee5bee63bb669c42b53372c592343812f9df1788bde0be652d7d4e5afb11bcc3d52c2 SHA512 1b94e2f04e3a9cb0f1c3b83f85abe7adedc65c542d86faca265acb2f0d5845a41809430b4ba313735ba05a20e08737a22cc81f3e97abcab6584d658fce9487b0
-EBUILD uw-imap-2007f.ebuild 4409 BLAKE2B ef3ac9764c0036547a7a839cbdb1b8a64b198ef8da3eb2cc844250125ce58e97db189ec7920ef6b2abcdff28034533b7e4fdbc928fa3051fc1aa03010bc3c2a2 SHA512 ad783b8a36af0a40358e45b974233011878dbd69421e5cb4faf2b6014706f4866aca0f36fab10248a054d35c6eadf687840eeb0091f7710146df78989964acb2
-MISC metadata.xml 270 BLAKE2B c017e0ce22899ab0019f4648c1e13d31e53014e0dd0258822ab4d243d64c79c7f5e250f2bd48fe81282785d065fd6f125ab07325f72c672cbd908e7c9c14d83a SHA512 0be9a2bde30dac6feb4cc1340577c017bdd74b91b38a280a645fdffa1bc0603e5377ccf2b0ceebcd6edb56450bc8d3cfa040f10a2268566b3a6f1d76cc4a2d5f
diff --git a/net-mail/uw-imap/files/uw-imap-2004c-amd64-so-fix.patch b/net-mail/uw-imap/files/uw-imap-2004c-amd64-so-fix.patch
deleted file mode 100644
index 1400fc254c6d..000000000000
--- a/net-mail/uw-imap/files/uw-imap-2004c-amd64-so-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN src/osdep/unix/Makefile src/osdep/unix/Makefile
---- src/osdep/unix/Makefile	2005-01-29 22:43:25.739341544 +0000
-+++ src/osdep/unix/Makefile	2005-01-29 22:43:50.375596264 +0000
-@@ -912,6 +912,9 @@
- 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
- 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
- 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
-+	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
-+	 >> ARCHIVE
- 	echo $(OS) > OSTYPE
- 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
- 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/net-mail/uw-imap/files/uw-imap-ldflags.patch b/net-mail/uw-imap/files/uw-imap-ldflags.patch
deleted file mode 100644
index 41bd0925ed14..000000000000
--- a/net-mail/uw-imap/files/uw-imap-ldflags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/Makefile b/Makefile
-index e6e4987..8acfe23 100644
---- a/Makefile
-+++ b/Makefile
-@@ -257,7 +257,7 @@ EXTRACFLAGS=
- 
- # Extra linker flags (additional/alternative libraries, etc.)
- 
--EXTRALDFLAGS=
-+EXTRALDFLAGS=${LDFLAGS}
- 
- 
- # Special make flags (e.g. to override make environment variables)
-diff --git a/src/mlock/Makefile b/src/mlock/Makefile
-index d425da8..9c3020b 100644
---- a/src/mlock/Makefile
-+++ b/src/mlock/Makefile
-@@ -36,7 +36,7 @@ CFLAGS = -O2 -pipe -march=core2
- all:	mlock
- 
- mlock:	mlock.o
--	$(CC) $(CFLAGS) -o mlock mlock.o
-+	$(CC) $(CFLAGS) ${LDFLAGS} -o mlock mlock.o
- 
- install: mlock
- 	chgrp mail mlock
-diff --git a/Makefile b/Makefile
-index 8acfe23..70f889d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -698,7 +698,7 @@ rebuild:
- 	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
- 	@$(TOUCH) SPECIALS
- 	$(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
--	 CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
-+	 CFLAGS="`$(CAT) CFLAGS`" LDFLAGS=${LDFLAGS} `$(CAT) SPECIALS`
- 
- rebuildclean:
- 	$(SH) -c '$(RM) rebuild || true'
-diff --git a/src/osdep/unix/Makefile b/src/osdep/unix/Makefile
-index ef1d059..a53318c 100644
---- a/src/osdep/unix/Makefile
-+++ b/src/osdep/unix/Makefile
-@@ -969,7 +969,7 @@ onceenv:
- 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
- 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
- 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
--	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
-+	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` `$(CAT) LDFLAGS` -shared \
- 	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
- 	 >> ARCHIVE
- 	echo $(OS) > OSTYPE
diff --git a/net-mail/uw-imap/files/uw-imap.xinetd b/net-mail/uw-imap/files/uw-imap.xinetd
deleted file mode 100644
index 959a45573bc1..000000000000
--- a/net-mail/uw-imap/files/uw-imap.xinetd
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: off
-# description: The IMAP service allows remote users to access their mail using \
-#              an IMAP client such as Mutt, Pine, fetchmail, or Netscape \
-#              Communicator.
-service imap2
-{
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/sbin/imapd
-	log_on_success		+= DURATION USERID
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/net-mail/uw-imap/files/uw-imaps.xinetd b/net-mail/uw-imap/files/uw-imaps.xinetd
deleted file mode 100644
index 8fb2f3500a78..000000000000
--- a/net-mail/uw-imap/files/uw-imaps.xinetd
+++ /dev/null
@@ -1,15 +0,0 @@
-# default: off
-# description: The IMAPS service allows remote users to access their mail \
-#	       using an IMAP client with SSL support such as Netscape \
-#	       Communicator or fetchmail.
-service imaps
-{
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/sbin/imapd
-	log_on_success		+= DURATION USERID
-	log_on_failure		+= USERID
-	disable			= yes
-}
-
diff --git a/net-mail/uw-imap/files/uw-ipop2.xinetd b/net-mail/uw-imap/files/uw-ipop2.xinetd
deleted file mode 100644
index 8a7ac2ae9b41..000000000000
--- a/net-mail/uw-imap/files/uw-ipop2.xinetd
+++ /dev/null
@@ -1,15 +0,0 @@
-# default: off
-# description: The POP2 service allows remote users to access their mail \
-#              using an POP2 client such as fetchmail.  In most cases, clients \
-#              support POP3 instead of POP2, so enabling this service is rarely \
-#              necessary.
-service pop-2
-{
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/sbin/ipop2d
-	log_on_success		+= USERID
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/net-mail/uw-imap/files/uw-ipop3.xinetd b/net-mail/uw-imap/files/uw-ipop3.xinetd
deleted file mode 100644
index 60acaf219cf2..000000000000
--- a/net-mail/uw-imap/files/uw-ipop3.xinetd
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: off
-# description: The POP3 service allows remote users to access their mail \
-#              using an POP3 client such as Netscape Communicator, mutt, \
-#	       or fetchmail.
-service pop-3
-{
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/sbin/ipop3d
-	log_on_success		+= USERID
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/net-mail/uw-imap/files/uw-ipop3s.xinetd b/net-mail/uw-imap/files/uw-ipop3s.xinetd
deleted file mode 100644
index a8b2ad19d971..000000000000
--- a/net-mail/uw-imap/files/uw-ipop3s.xinetd
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: off
-# description: The POP3 service allows remote users to access their mail \
-#              using an POP3 client such as Netscape Communicator, mutt, \
-#	       or fetchmail.
-service pop3s
-{
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/sbin/ipop3d
-	log_on_success		+= USERID
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/net-mail/uw-imap/metadata.xml b/net-mail/uw-imap/metadata.xml
deleted file mode 100644
index 8bfae6399cb2..000000000000
--- a/net-mail/uw-imap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="clearpasswd">Enables cleartext logins outside of SSL sessions</flag>
-  </use>
-</pkgmetadata>
diff --git a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
deleted file mode 100644
index 79b47d6e4377..000000000000
--- a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic ssl-cert multilib
-
-MY_P="imap-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="ipv6 +ssl kerberos clearpasswd"
-
-DEPEND="!net-libs/c-client
-	>=sys-libs/pam-0.72
-	>=net-mail/mailbase-0.00-r8[pam]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( app-crypt/mit-krb5 )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/uw-mailutils-${PV}
-	sys-apps/xinetd"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/dovecot
-	!mail-mta/courier
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd"
-
-REQUIRED_USE="!clearpasswd? ( ssl )"
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w "${S}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
-	epatch "${FILESDIR}/${PN}-ldflags.patch"
-
-	# no interactive build
-	sed -i -e "/read x; case/s/^/#/" Makefile || die
-	sed -i -e "/make noip6/s/.*/\t@echo/" Makefile || die
-
-	# Now we must make all the individual Makefiles use different CFLAGS,
-	# otherwise they would all use -fPIC
-	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-		src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-		src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-		|| die "sed failed patching Makefile FLAGS."
-
-	# Now there is only c-client left, which should be built with -fPIC
-	append-flags -fPIC
-
-	sed -i \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		src/osdep/unix/Makefile || die
-
-	sed -i \
-		-e "s/CC=cc/CC=$(tc-getCC)/" \
-		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
-		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
-		src/osdep/unix/Makefile || die
-
-	sed -i -e "s,GSSDIR=/usr/local,GSSDIR=/usr,g" \
-		src/osdep/unix/Makefile.gss || die
-
-	# Make the build system more multilib aware
-	sed \
-		-e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
-		-e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
-		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
-}
-
-src_compile() {
-	local mymake ipver ssltype target
-	ipver="IP=4"
-	target=lnp
-	use ipv6 && ipver="IP=6"
-	use kerberos && mymake="EXTRAAUTHENTICATORS=gss"
-	use kernel_FreeBSD && target=bsf
-	if use ssl ; then
-		if use clearpasswd ; then
-			ssltype=unix
-		else
-			ssltype=unix.nopwd
-		fi
-	else
-		ssltype=none
-	fi
-
-	emake -j1 SSLTYPE=${ssltype} ${target} ${mymake} ${ipver} EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mlock/mlock
-
-	dolib.so c-client/libc-client.so.1.0.0
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
-
-	insinto /usr/include/imap
-	doins src/c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.h
-	doins src/c-client/{env,fs,ftl,nl,tcp}.h
-	doins src/osdep/unix/env_unix.h
-	doins c-client/linkage.{c,h}
-
-	dolib.a c-client/c-client.a
-	dosym c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1
-	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# install headers - bug #375393
-	cp c-client/*.h "${D}"/usr/include/imap/ || die
-	cp c-client/linkage.c "${D}"/usr/include/imap/ || die
-	#exclude these dupes (can't do it before now due to symlink hell)
-	rm "${D}"/usr/include/imap/os_*.h
-
-	# gentoo config stuff
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/uw-imap.xinetd  imap
-	newins "${FILESDIR}"/uw-ipop2.xinetd ipop2
-	newins "${FILESDIR}"/uw-ipop3.xinetd ipop3
-	newins "${FILESDIR}"/uw-ipop3s.xinetd ipop3s
-	newins "${FILESDIR}"/uw-imaps.xinetd imaps
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/certs/imapd.pem && \
-			-e "${ROOT}"/etc/ssl/certs/imapd.key ]]; then
-			einfo "Creating SSL certificate for IMAP"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-IMAP Server}"
-			install_cert /etc/ssl/certs/imapd
-		fi
-		if ! [[ -e "${ROOT}"/etc/ssl/certs/ipop3d.pem && \
-			-e "${ROOT}"/etc/ssl/certs/ipop3d.key ]]; then
-			einfo "Creating SSL certificate for POP3"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-POP3 Server}"
-			install_cert /etc/ssl/certs/ipop3d
-		fi
-	fi
-}
diff --git a/net-mail/uw-imap/uw-imap-2007f.ebuild b/net-mail/uw-imap/uw-imap-2007f.ebuild
deleted file mode 100644
index 064833e3216c..000000000000
--- a/net-mail/uw-imap/uw-imap-2007f.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic ssl-cert
-
-MY_P="imap-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="ipv6 +ssl kerberos clearpasswd"
-
-DEPEND="!net-libs/c-client
-	>=sys-libs/pam-0.72
-	>=net-mail/mailbase-0.00-r8[pam]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( app-crypt/mit-krb5 )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/uw-mailutils-${PV}
-	sys-apps/xinetd"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-	!net-mail/dovecot
-	!mail-mta/courier
-	!net-mail/courier-imap
-	!net-mail/cyrus-imapd"
-
-REQUIRED_USE="!clearpasswd? ( ssl )"
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w "${S}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
-	epatch "${FILESDIR}/${PN}-ldflags.patch"
-
-	# no interactive build
-	sed -i -e "/read x; case/s/^/#/" Makefile || die
-
-	# Now we must make all the individual Makefiles use different CFLAGS,
-	# otherwise they would all use -fPIC
-	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-		src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-		src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-		|| die "sed failed patching Makefile FLAGS."
-
-	# Now there is only c-client left, which should be built with -fPIC
-	append-flags -fPIC
-
-	sed -i \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		src/osdep/unix/Makefile
-
-	sed -i \
-		-e "s/CC=cc/CC=$(tc-getCC)/" \
-		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
-		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
-		src/osdep/unix/Makefile
-
-	sed -i -e "s,GSSDIR=/usr/local,GSSDIR=/usr,g" \
-		src/osdep/unix/Makefile.gss
-
-	# no interactive build
-	sed -i -e "/make noip6/s/.*/\t@echo/" Makefile
-}
-
-src_compile() {
-	local mymake ipver ssltype target
-	ipver="IP=4"
-	target=lnp
-	use ipv6 && ipver="IP=6"
-	use kerberos && mymake="EXTRAAUTHENTICATORS=gss"
-	use kernel_FreeBSD && target=bsf
-	if use ssl ; then
-		if use clearpasswd ; then
-			ssltype=unix
-		else
-			ssltype=unix.nopwd
-		fi
-	else
-		ssltype=none
-	fi
-
-	emake -j1 SSLTYPE=${ssltype} ${target} ${mymake} ${ipver} EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mlock/mlock
-
-	dolib.so c-client/libc-client.so.1.0.0
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
-	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
-
-	insinto /usr/include/imap
-	doins src/c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.h
-	doins src/c-client/{env,fs,ftl,nl,tcp}.h
-	doins src/osdep/unix/env_unix.h
-	doins c-client/linkage.{c,h}
-
-	dolib.a c-client/c-client.a
-	dosym c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1
-	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# install headers - bug #375393
-	cp c-client/*.h "${D}"/usr/include/imap/ || die
-	cp c-client/linkage.c "${D}"/usr/include/imap/ || die
-	#exclude these dupes (can't do it before now due to symlink hell)
-	rm "${D}"/usr/include/imap/os_*.h
-
-	# gentoo config stuff
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/uw-imap.xinetd  imap
-	newins "${FILESDIR}"/uw-ipop2.xinetd ipop2
-	newins "${FILESDIR}"/uw-ipop3.xinetd ipop3
-	newins "${FILESDIR}"/uw-ipop3s.xinetd ipop3s
-	newins "${FILESDIR}"/uw-imaps.xinetd imaps
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/certs/imapd.pem && \
-			-e "${ROOT}"/etc/ssl/certs/imapd.key ]]; then
-			einfo "Creating SSL certificate for IMAP"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-IMAP Server}"
-			install_cert /etc/ssl/certs/imapd
-		fi
-		if ! [[ -e "${ROOT}"/etc/ssl/certs/ipop3d.pem && \
-			-e "${ROOT}"/etc/ssl/certs/ipop3d.key ]]; then
-			einfo "Creating SSL certificate for POP3"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-POP3 Server}"
-			install_cert /etc/ssl/certs/ipop3d
-		fi
-	fi
-}
diff --git a/net-mail/uw-mailutils/Manifest b/net-mail/uw-mailutils/Manifest
deleted file mode 100644
index b357d49f5881..000000000000
--- a/net-mail/uw-mailutils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX uw-mailutils-2004g.patch 1210 BLAKE2B 26b0c30fa9aaf35aed40ba84c9f4cc4bba757f05d2d8ebd29dd7dd8d06234cc2f5c2b7ca7509781fc67901881943c634956e18a1cd79a6f20e89822e5fdbe00a SHA512 af99ee3d05cdd81549d258d392bf6cf7948577b383ffc3a0314f39a86b36f48abd8194b91922dc40518ff6c61dd1d2258fd9281954222d67b667b8868569718c
-AUX uw-mailutils-ssl.patch 391 BLAKE2B f2555a5d65f2e447477909a3cc1d9456080900cc3ef8fca19730565e791e46ff22da6ac295fe2a4bd5e0d02a48d79d3c3275ea0df88c79e13b134b578162ff9a SHA512 4fcc9930209f728b901565cda00c2a4446a024bcf1abfe5928399f62bf5540f56ed449b6ff401db09eb53b61e4c6bfd4a97da2a67a2942ff8a4394530eadcffa
-DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
-EBUILD uw-mailutils-2007f.ebuild 1214 BLAKE2B 0a22765e242b781401783690c8a334c2ef9c2d4eccea2cdbc2b90ef79ced2a906a6702b007b31ab60e17f582702a3010fccc37ee9799cfe5b743dd1f28e68168 SHA512 248f92bbefba0912f1cf18fa4697e2f84981f11ed5a27859d5898e019f7d3f40cea0ef7125bf320140019117c0a1afe3ac11c52a85282866c3c493c969e30ecf
-MISC metadata.xml 277 BLAKE2B fa21bdeb42314f279aa459d59c02e6368ba90965035566f48e65283b393022dc21cc455c3bcf8aed410e8c980e374528dbaa9633faa51dbaf65d928ff7e3dfd9 SHA512 da7b71b73731acf8415dbc4e08ee8d3dbeff9058a179057f74932f1fb732c0c513febb617e66be1af0a723838a1589b11f64238e885433e7f6fb26e4dcb78af3
diff --git a/net-mail/uw-mailutils/files/uw-mailutils-2004g.patch b/net-mail/uw-mailutils/files/uw-mailutils-2004g.patch
deleted file mode 100644
index 320388357c1d..000000000000
--- a/net-mail/uw-mailutils/files/uw-mailutils-2004g.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- imap-2004g/Makefile	2005-04-30 22:50:20.000000000 +0200
-+++ imap-2004g-mailutil/Makefile	2005-10-06 13:21:14.000000000 +0200
-@@ -504,12 +504,7 @@
- 	$(TOOLS)/$@ "$(LN)" src/charset c-client
- 	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
- 	$(TOOLS)/$@ "$(LN)" src/mtest mtest
--	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
--	$(TOOLS)/$@ "$(LN)" src/imapd imapd
- 	$(TOOLS)/$@ "$(LN)" src/mailutil mailutil
--	$(TOOLS)/$@ "$(LN)" src/mlock mlock
--	$(TOOLS)/$@ "$(LN)" src/dmail dmail
--	$(TOOLS)/$@ "$(LN)" src/tmail tmail
- 	$(LN) $(TOOLS)/$@ .
- 
- build:	OSTYPE rebuild rebuildclean bundled
-@@ -540,13 +535,8 @@
- bundled:
- 	@echo Building bundled tools...
- 	$(CD) mtest;$(MAKE)
--	$(CD) ipopd;$(MAKE)
--	$(CD) imapd;$(MAKE)
- 	$(CD) mailutil;$(MAKE)
- 	@$(SH) -c '(test -f /usr/include/sysexits.h ) || make sysexitwarn'
--	$(CD) mlock;$(MAKE) || true
--	$(CD) dmail;$(MAKE) || true
--	$(CD) tmail;$(MAKE) || true
- 
- 
- sysexitwarn:
-@@ -559,7 +549,7 @@
- 
- clean:
- 	@echo Removing old processed sources and binaries...
--	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
-+	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest mailutil || true'
- 	$(CD) tools;$(MAKE) clean
- 
- 
diff --git a/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch b/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch
deleted file mode 100644
index 0214030e3ffa..000000000000
--- a/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- imap-2007e/src/osdep/unix/Makefile	2009-07-05 10:00:54.000000000 +0300
-+++ imap-2007e/src/osdep/unix/Makefile	2009-07-05 10:04:42.000000000 +0300
-@@ -54,8 +54,8 @@
- 
- # Extended flags needed for SSL.  You may need to modify.
- 
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
-+SSLDIR=/usr
-+SSLCERTS=/etc/ssl/certs
- SSLKEYS=$(SSLCERTS)
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
diff --git a/net-mail/uw-mailutils/metadata.xml b/net-mail/uw-mailutils/metadata.xml
deleted file mode 100644
index 38a99ababf02..000000000000
--- a/net-mail/uw-mailutils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Mail utilities common to University of Washington software packages.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
deleted file mode 100644
index 6939dbfc754f..000000000000
--- a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P="imap-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Mail utilities from the UW"
-HOMEPAGE="http://www.washington.edu/imap/"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="pam ssl"
-
-DEPEND="pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-	!<net-mail/uw-imap-${PV}"
-
-src_prepare() {
-	chmod -R ug+w "${S}"
-
-	epatch "${FILESDIR}/${PN}-2004g.patch"
-	epatch "${FILESDIR}/${PN}-ssl.patch"
-
-	# no interactive build
-	sed -i -e "/read x; case/s/^/#/" Makefile || die
-
-	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" \
-		src/mailutil/Makefile \
-		src/mtest/Makefile || die "sed failed patching Makefile CFLAGS."
-
-	append-flags -fPIC
-}
-
-src_compile() {
-	local port=slx
-	use elibc_FreeBSD && port=bsf
-	use pam && port=lnp
-	local ssltype=none
-	use ssl && ssltype=nopwd
-	emake -j1 "${port}" EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}" SSLTYPE="${ssltype}"
-}
-
-src_install() {
-	dobin mailutil/mailutil mtest/mtest
-	doman src/mailutil/mailutil.1
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /net-mail
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)