gentoo resync : 10.11.2019

45 files changed, 399 insertions, 464 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 0e6d9342c8c9..36703e7bac04 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
index 324dec771d21..1bdab528bb68 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -1,5 +1,5 @@
-AUX altermime-0.3.10-MIME_headers-overflow.patch 517 BLAKE2B 7068fe265834b345d7c008d4a3edb379aef7b2eb7bf56f782392bbcf8138008ac81dd7366f09cbae8b06a20fbca22bb895791d95f807db735c02eeb4d7761e46 SHA512 4123acf331afb19b4b4591edd2ac2f28ce81a7b5956928905153d2eef1293ca292f3768e0c547bbe55cc5d45750ef6df4dacbe56b1afef65968e613e27adc23d
-AUX altermime-0.3.11-respect-flags.patch 606 BLAKE2B 7b5b364b5727fde682a4bd53c26e4fc3f490a43f37955d7cc53b39375fcdc1868340743ce6e811e926e5285e07ab82652f854f5a654551a8c82d32a00e2e7323 SHA512 d3160df483a57d7fad6070d4270d2741273a738e1afad3e8fa95d1c8af990ca304bfe4ad43f162799aa82b2162d88aaebad3285eada29a2fc118c595a771fa4a
+AUX altermime-0.3.10-MIME_headers-overflow.patch 521 BLAKE2B 9e327a28827aa90d761417d8143d36fde7d3098f3acb84e31af86c828bb1753e0af23fe96bcc97b27afd107da52aed951bab3b5b479f59b4e6e2e9ea3d4866f7 SHA512 5f2aa6dca9b4fc16e0aa2f5d12bfdbd989253cf6d8e66358f4e17a7ca764b523b6179ec43bf4eddc114e85668bbcc704029a83b1bff5a0c3130d810f84c6e91d
+AUX altermime-0.3.11-respect-flags.patch 571 BLAKE2B f740d18fe81026e27636f432f68cd08ec8ed73107cd60a44bf56bce2b21b5a9d6b549666a596e1651c979519df4dc40c9797ecfe28d36b43ecb96b5518451aef SHA512 b4b2d8372b26932cb7148e316fd748fe2e8a515e6725f4db3f87e34ab417a4eaa324bf03ce467dc3dda505b5f4013c004aee05a9903d87a4d310c69d2034ea9e
 DIST altermime-0.3.11.tar.gz 90244 BLAKE2B 5acd29ee3e5927b67de41db4f7cfbe606814ef6476340f26509b1823fcbfa6269c15e1d7e7936e948a7cb0f81b9a17b9a63c2333697707525bc62fd350a55f2a SHA512 561e36398bafcd888e912b6291ec76ead881bac86a7d0b8072753012d4c4557e67f608a9d43c968c6521e5f35bdf7b98e2c73ab811dadaaf13dcefe35c2d9e68
-EBUILD altermime-0.3.11.ebuild 633 BLAKE2B 24405404b4ebc4efeca6ef66d2e22c214d79ac44c83819e22b60ea691a5b1b0fed19ea57f04cbe869a469c025a518204afac0a138264ce21bf022beacac7b0d9 SHA512 1f52184026958350e05c37360e72dd8db923639f2daa886b99917f1b279b9bf15e16cf288730437e9a6ce6bdeeaf7c0a02453b1784332b21260a52c1f1fedd11
+EBUILD altermime-0.3.11.ebuild 611 BLAKE2B 320eaa4e7e8c3baa1f5f8faaf688f04018cf2e58f4dc1064b5c76817d9d542ed3fc7ce631f1de9f96cef53dce3741321637c7e011bdc77afc9878b5b4521b629 SHA512 9aff9bdf4b250794905423cf049e037ac36b0399f2bd2731477dbb21600199a965c0aff78f3f72393d95d110dd7f3506575a40ac780ebb2d160d4ed85b829b3f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/altermime/altermime-0.3.11.ebuild b/net-mail/altermime/altermime-0.3.11.ebuild
index 9d8ff8c549ae..1e09d54ec526 100644
--- a/net-mail/altermime/altermime-0.3.11.ebuild
+++ b/net-mail/altermime/altermime-0.3.11.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
-SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
-HOMEPAGE="http://pldaniels.com/altermime/"
+HOMEPAGE="https://pldaniels.com/altermime/"
+SRC_URI="https://www.pldaniels.com/altermime/${P}.tar.gz"
+
+KEYWORDS="amd64 ppc x86"
 
 LICENSE="Sendmail"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.3.10-MIME_headers-overflow.patch \
-		"${FILESDIR}"/${P}-respect-flags.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.10-MIME_headers-overflow.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch b/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
index bca39afba7f2..8d169e4bcf71 100644
--- a/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
+++ b/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/320785
 
---- MIME_headers.c
-+++ MIME_headers.c
+--- a/MIME_headers.c
++++ b/MIME_headers.c
 @@ -2243,7 +2243,7 @@
  		{
  			if (MIMEH_DNORMAL) LOGGER_log("%s:%d:MIME_parse_contentlocation:DEBUG: filename = %s\n", FL, p);
diff --git a/net-mail/altermime/files/altermime-0.3.11-respect-flags.patch b/net-mail/altermime/files/altermime-0.3.11-respect-flags.patch
index 9f114ca17491..f870414a2f6d 100644
--- a/net-mail/altermime/files/altermime-0.3.11-respect-flags.patch
+++ b/net-mail/altermime/files/altermime-0.3.11-respect-flags.patch
@@ -1,5 +1,5 @@
---- altermime-0.3.11.orig/Makefile
-+++ altermime-0.3.11/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -9,7 +9,7 @@
  #								opposite of a disclaimer.
  ALTERMIME_OPTIONS=-DALTERMIME_PRETEXT
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 0f3c48e8317d..18eb036a1430 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -4,5 +4,5 @@ AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03
 AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
 EBUILD checkpassword-0.90-r2.ebuild 880 BLAKE2B 836c292fe8f20d674faefea9b66b1095c16f3d80504fd0c9471c1eef86cb59ca1eabd4af5016e84540fd5e10916a179c6cc0299293743e5c59fb03b1d3a0504f SHA512 d358b40ac9e2cd7f54a5d7b22a86774bb161dc59673b7e90d3827937b7bb97a5906b0594c2a4f25a693382d0e7e539b7f5080e343dc7136372c8a52b7081e320
-EBUILD checkpassword-0.90-r4.ebuild 922 BLAKE2B 999e0746fb92e3824da9c642d084ee0bd486f0cea0e4583667a0f20e553ce0c92498f18388867d465438986c6fb8418909fee648a358dd07712727ef9d26bd68 SHA512 ae143516e179bbc0a33edec9e2ba4926d22913b4b9e0ba8e6ff978eaf1d29e613bac7e255fa2774665cba1bcb6baddb1889e46bf33df5971860e002d08dd7590
+EBUILD checkpassword-0.90-r4.ebuild 921 BLAKE2B 1453f63e3ce454bb2f9bf745522b036c1a185ac1bba4eeebdbf2101a59b948bc37c8e1911c30aea075cdde116a07d75a949b96eaed777180a2f1a343c5689b43 SHA512 add20ce927e3c921030810c47dfe55449e49d64eb31a8730c504abde5203a2713223ecd185539b63367143a6ab49b22051d5f776c0280bb40d3910fe60da028a
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
index 1680029cd0a6..e1691143b63e 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index 490d781c7e65..afded25afe7e 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -1,6 +1,8 @@
 AUX euid_030.diff 1107 BLAKE2B 558ad9c23f2e4c48b22b0ccf520537a6eaad28592105ede409b691bc8078645f2b7028730d1267e0951b1df54b35cf644ffe8655105ba7779cdd8274c2fea7a6 SHA512 648ded406e4818ba50597b010cedfae6436e3bbcf0c0e9a982b9656211fea7533dbc759434bade78f4df63e64231529ce4713bdf504244f3fe2e93c8bb5f995f
 AUX poppasswd 84 BLAKE2B 0388cd039e50beb308e8791c3b490ca305bb6288f5971ed624fea1d80a8be916aeb1f99059b42aaeb948a7a4614a7746a74e7904703a9eb7824e3e98c1a4c05e SHA512 74eb9764b4c9fd251e9bb408d3ace9bcc30f9d638963cd5f385ee6c2c839f1de51b7f55c81d5e0111b568a308eea08185c8bcc965decf36a963b78bf4aea8671
 AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce311faff1fb0555d5b08543a9ce79347f953bfeef5c6b6585edd5474c538a2323d3e47048444b26 SHA512 e18cab4bb02b2bac945d1857f70d6f5faa2296205f09c228d87d16dffb43de129a59ef0054dd6c54f1db7448b47f46a385dc81ffe769dc87d182d81031920369
+DIST cmd5checkpw-0.30.tar.gz 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
 DIST cmd5checkpw-030_tgz.bin 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
-EBUILD cmd5checkpw-0.30-r1.ebuild 1681 BLAKE2B 05e02a28616bab7b30e6c0d3ea9c666c4bee8a7f6a211274b4d4a8d677893d70847f750b3a46be9d27104efe06571a308b45d37246d4f69201ffec15c9ef46a2 SHA512 c0cc5a4c0d9f5d41cf94855bba5c9c39986879d84a37d9a084c980f5fcbdae432d7a38f67a24e20418590a6f39db315c3c8f5657f59de4540e177db1f59f6ef2
+EBUILD cmd5checkpw-0.30-r1.ebuild 1683 BLAKE2B c14b9ee36f4c5be4eab365975648f0e2286e028c64862c917d8ba18805645104f6102f0853200a5b3ad3fb7905c264054a41573dafbe6c748005844e72a57674 SHA512 46834f85d4131762e680c3743680516ac3d832f60cd8dfaa69318221eebc912a4072241d98e62f76a70af8eb94ca96819229e468a633d34ed735bd9d6efe54ea
+EBUILD cmd5checkpw-0.30-r2.ebuild 1480 BLAKE2B a58f49cd3c7c30f5af0b7899f2f6237b395fdeda13c5b62a17376ff4ecbe1a936ddce3a693913dadd49a0bf36a4d7dbd26c2ac116c039f152d427a7f9bfdec63 SHA512 3c173271e13db3cf9709feb1c6b3023a8ea71662e2ea7fd31f80f9a4eaf5486d04f71c16c3dd7a2a500148aa7ecf52fa78058a44e257bf56b807d31f6210efc4
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
index 69b9d8a9a79b..a2ac986f5a2e 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
@@ -8,8 +8,8 @@ inherit eutils fixheadtails user
 MY_VER="030"
 
 DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode"
-SRC_URI="http://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin"
-HOMEPAGE="http://www.fehcom.de/qmail/smtpauth.html"
+SRC_URI="https://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin"
+HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
 
 LICENSE="public-domain RSA"
 SLOT="0"
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
new file mode 100644
index 000000000000..3a0b96995a45
--- /dev/null
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fixheadtails
+
+MY_VER=$(ver_rs 1- "")
+
+DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode"
+SRC_URI="https://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin -> ${P}.tar.gz"
+HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
+
+LICENSE="public-domain RSA"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="acct-user/cmd5checkpw"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if has_version "<net-mail/cmd5checkpw-0.30"; then
+		ewarn
+		ewarn "this version is in NO WAY COMPATIBLE with cmd5checkpw-0.2x"
+		ewarn "it actually receives the authentication credentials"
+		ewarn "in a different order then the old implementation"
+		ewarn "see bug #100693 for details"
+		ewarn "this version IS needed by >=qmail-1.03-r16"
+		ewarn
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/euid_${MY_VER}.diff
+	"${FILESDIR}"/reloc.diff
+)
+
+src_prepare() {
+	default
+
+	ht_fix_file Makefile
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -o cmd5checkpw"
+}
+
+src_install() {
+	insinto /etc
+	insopts -m 400 -o cmd5checkpw
+	doins "${FILESDIR}"/poppasswd
+
+	exeinto /usr/bin
+	exeopts -o cmd5checkpw -m 4755
+	doexe cmd5checkpw
+
+	doman cmd5checkpw.8
+	einstalldocs
+}
+
+pkg_postinst() {
+	chmod 400 "${EROOT}"/etc/poppasswd || die
+	chown cmd5checkpw "${EROOT}"/etc/poppasswd || die
+}
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 4617bcf85bd6..b3c2e7421a29 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -24,5 +24,5 @@ DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d
 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
 EBUILD courier-imap-4.17.3.ebuild 6794 BLAKE2B 5192299cd016549438abe0ffb2b7d92d50a8e596e9a1d9d4d9a3485550973d8a76aa3f9fa3c5752811ebb93e8ea50cd81e8bd50f9b8833c6fc74880babaa418e SHA512 103e22a47b18ea7a22a832505e9f540d28af0e9e5dc92205ff58a443689f96449c6597a62dc8ec35e48f4823bc522ce46a53b6f257df2533e2e777cba0ef46c4
 EBUILD courier-imap-4.18.2.ebuild 6855 BLAKE2B 7785146899c2e074ef31c28ab09800191b51d0c1178042893d60ac3b676134c8dfbf657244b91f4b498b6903ab3c620e64424c530f7a031db6c83e66de0d35f4 SHA512 2fbf7417926e900b7b5419eaf7962900056156c8cddd4449d43311840e76c117093806a1524826db41ef12cd60a37fa86600e5cfc71c5a2c682aa4122be61eee
-EBUILD courier-imap-5.0.7.ebuild 7188 BLAKE2B ff61f0cb4f433bf6a01c0628be6b6589377a7123ac9403d43d9e624e17938fc2dd9df2e414f02142286f790dbef34fe65bac7341009ab469752415907e024058 SHA512 72bbaec82a1e9a1efefd54eb56c847d4956a43432775429adc0a3790ee09df56ca4fc3e8c7c6ba3337b2946b8fe1c8947867f7e764417204b271b56a9c8f629a
+EBUILD courier-imap-5.0.7.ebuild 7194 BLAKE2B 66eba66501fc1a927ad794ac2fd99d3107c94588d42479a11fa1580c9562a709ec557b861b7a5c926bea40477c2ad7dda7872f0beecf8320fe22c60cfb37f554 SHA512 6a630d070dd470899bd4786e6072a4b00a2ed50a2d96d7896cd266ffb3ef3f93fb75703e92b68aa51bf239d06ed559efeea7dba89391fdc9d1dee7fd040a5619
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
index 3e50fab88482..96d532786d86 100644
--- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
@@ -10,13 +10,13 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
 
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
 
 CDEPEND="
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls[tools] )
 	!gnutls? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 70232695063b..911022a28d6d 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1,5 +1,4 @@
 AUX 0.71-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa59dd78d7a5dbd488c599bd18bc15e3e36e4a50ea156c77614eaa4f507b968b6906699fe40f958cd295 SHA512 0576644a2820a42cac44be9ba564b5043245cdb192a50115bafc871e3306945a657440c7e74d6a83796a33b964269f60ab1b3345b65cdc5ff2342e4f2cbaf9ab
 DIST dot-forward-0.71.tar.gz 26352 BLAKE2B 9757d07adc796ad35c6426eed3c53eb87f784a1035ad6569a8130e62a04665bb9ac03c250be0e5cb22f122c7204197f736dfc748d468c980814d23bb7ad0069d SHA512 f37a30eabf3a7e7258bfbe9178218d053a5164a9698fbc34954eb8bd588fe2bbf61ffd85f5b817e3ce65d7c0efac1735b59b11faa4d425e2df4089769af94b8b
-EBUILD dot-forward-0.71-r3.ebuild 885 BLAKE2B 282322b069e1ac37136ac9f880c60c31deb4ddbc94af7e7b09913f0dff12305085216e94e30c1c80a616b3f227c6a5b91e1d1ffc20d0ca169fb2bd6a36d74d04 SHA512 b9a5531604996f9ff4c77b2c82d5d650a85712fb56412f4d231b73230d8da6f9ac51b8a7d17ae25b869041036d6f0f42fe3bb9e661db38ca16bcc4e3e22695ce
-EBUILD dot-forward-0.71-r4.ebuild 885 BLAKE2B 71f732bf7bf4eb4f58fc6aecdf6834a7ede2a68a1431f391fa3484dfe7dd2ca98a705f14b2c674cb6aba0463ed852c65432ed193f57597a7a6add0135770bbd1 SHA512 3b59aeb5ebdba1c152a693153fcc13cc81b89b6f026df382627e2536cc60cac73ec6fac2c873adffe1fc447e250f1d29a8c8275eab522ae5c6b32e0d3849d47d
+EBUILD dot-forward-0.71-r4.ebuild 881 BLAKE2B 2762cb51f5b7c1f3431c3fd048eee6829d3a9be0e884ffbf8981855549f44b4020228811c88a610c499d178b2cdb5536b821655da038aabe365b7e5116e04dcf SHA512 f3c74f36ed2ceed3a1916263c0689f5e6cc9b57a60b4c66879ccbee51188264dfc8cf459992ea55c8ff30e50c63e7a159d016f51dac535da2c53e08cbeaad865
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild b/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
deleted file mode 100644
index de66be680c77..000000000000
--- a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils fixheadtails qmail
-
-DESCRIPTION="reads sendmail's .forward files under qmail"
-HOMEPAGE="http://cr.yp.to/dot-forward.html"
-SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# See bug 97850
-RESTRICT="test"
-
-DEPEND="
-	acct-group/nofiles
-	acct-group/qmail
-"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-errno.patch
-
-	ht_fix_file Makefile
-
-	qmail_set_cc
-}
-
-src_compile() {
-	emake prog || die
-}
-
-src_install() {
-	dodoc BLURB CHANGES FILES INSTALL README SYSDEPS TARGETS THANKS
-	dodoc TODO VERSION
-	doman *.1
-
-	insopts -o root -g qmail -m 755
-	insinto "${QMAIL_HOME}"/bin
-	doins dot-forward || die
-}
diff --git a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
index 7a478903befe..052a8455d217 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 # See bug 97850
diff --git a/net-mail/hotwayd/Manifest b/net-mail/hotwayd/Manifest
deleted file mode 100644
index 4b3a0523e616..000000000000
--- a/net-mail/hotwayd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX hotwayd.xinetd 787 BLAKE2B d2fc421cfc38281b81e8df0f93c474e27c7af8081b6997f02bf90492e987f1ee4b4070eaa3641ca8cb6f0de8e21a7a2b2530bd6756c5b7b506952b3358ae0b08 SHA512 04122ea44e1dc2eafae42b6203664085b8c2068cea7afdbff44478e4ed415a69a1490cd2679961fa477c1cb1d9ab639469bc5bb71673b1d500ffbd27cb6bd6bb
-DIST hotwayd-0.8.4.tar.bz2 161274 BLAKE2B 213b029a4b49332e748c8ec94e7a6860592c282c82e452e5bed285d568b38387cfca2bd305762934343a0b3140da14d98782d49e7715d1a388e8e0736d02e4ca SHA512 df965964c8186e51bd2b09f4a99919443efe1ee2e828d0bdd905383813069a45e4b6b321ace969b3071a0d83ad21a1b4f76cd4ba57f89e13a6569d8b65bd8efc
-EBUILD hotwayd-0.8.4.ebuild 2029 BLAKE2B 13f55bb5114e0c7506f2d531d30d927babd8a9f8809e324b7d22a49ce723d47cfc47e56a7738030c9172035940acac6124de5519855ab8bff5a6f43190f6ee15 SHA512 e7ad4ecac55678234cdf500b861aa29fcfd8133ec6af2c84619e823be9e13c49db52f0019df2d48f9ebe4cecd82d90837b5314e7434faa72e68887b76c802899
-MISC metadata.xml 323 BLAKE2B 810b75fca91bd4075cb42cee5f4aa6096f0ec393781c6311227a8ea8d0e46289662b73f9fa63208b34e5a96b781fb7fbd680be0b9f4843a1153ea75f460180b0 SHA512 bea2b376842ee5ef92d5b4ed58cf7566e3e4e41886e4e34431a7ad8240158e65567381703af0c64856bee960736b7fbfe6903fd14cb08da8616a6b463e1cd5ae
diff --git a/net-mail/hotwayd/files/hotwayd.xinetd b/net-mail/hotwayd/files/hotwayd.xinetd
deleted file mode 100644
index 65947585fa77..000000000000
--- a/net-mail/hotwayd/files/hotwayd.xinetd
+++ /dev/null
@@ -1,25 +0,0 @@
-# default: off
-# description: hotway daemon
-#   - By default it listens to port 1100, so please adjust settings in your
-#     clients
-#   - By default it only allows access from localhost.
-#   - Also all xinetd entries do not start by default.
-#     One should manually enable the entries that one wants by
-#     changing the value of "disable = yes" to "disable = no".
-#   - Restart xinetd after changing anything in this file:
-#     # /etc/init.d/xinetd restart
-
-service hotwayd
-{
-        only_from               = localhost
-	socket_type		= stream
-	wait			= no
-	user			= nobody
-	port			= 1100
-	server			= /usr/sbin/hotwayd
-	#server_args		= -p http://proxy:8080 -u proxy_user -q proxy_password
-	log_on_success		+= USERID
-	log_on_failure		+= USERID
-	disable			= yes
-	type			= unlisted
-}
diff --git a/net-mail/hotwayd/hotwayd-0.8.4.ebuild b/net-mail/hotwayd/hotwayd-0.8.4.ebuild
deleted file mode 100644
index 8775da3e0b53..000000000000
--- a/net-mail/hotwayd/hotwayd-0.8.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Hotmail to pop3 daemon"
-HOMEPAGE="http://hotwayd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hotwayd/${P}.tar.bz2"
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-
-IUSE="smtp"
-
-DEPEND="virtual/inetd
-	dev-libs/libxml2
-	smtp? ( >=dev-libs/cyrus-sasl-2 )"
-
-hotmail_greed_warning() {
-	echo
-	ewarn "WARNING:"
-	ewarn "Since Hotmail started to charge for WebDAV access, you need a Hotmail Plus"
-	ewarn "(or equivalent MSN) account to keep using hotwayd. More info:"
-	ewarn "http://www.boolean.ca/hotpop/"
-	ewarn "https://sourceforge.net/forum/forum.php?thread_id=1277989&forum_id=80217"
-	echo
-	ebeep 3
-	epause 10
-}
-
-pkg_setup() {
-	hotmail_greed_warning
-}
-
-src_install () {
-	# The original make install is broken, since it also tries to install
-	# the libghttp files. This is not needed, since this library is statically
-	# linked into the executable.
-	# Lets just copy the (one) file manually...
-	dosbin hotwayd
-	if use smtp; then
-		dosbin hotsmtpd/hotsmtpd
-		insinto /etc/xinetd.d
-		sed -i -e 's:^disable = no:disable = yes:' hotsmtpd/hotsmtpd.xinetd
-		newins hotsmtpd/hotsmtpd.xinetd hotsmtpd
-	fi
-
-	dodoc AUTHORS NEWS README
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/${PN}.xinetd ${PN}
-}
-
-pkg_postinst () {
-	hotmail_greed_warning
-	echo
-	elog " By default daemons that use xinetd are not started automatically in gentoo"
-	elog " To activate do the following steps: "
-	elog " - Edit the file /etc/xinetd.d/hotwayd and change disable "
-	elog "   from yes to no "
-	elog " - Restart xinetd with \`/etc/init.d/xinetd restart\` "
-	elog
-	if use smtp; then
-		elog "You chose to install hotsmtpd, a SMTP proxy for hotmail. Please"
-		elog "Configure /etc/xinetd.d/hotsmtpd and restart xinetd to start using it."
-		elog
-	fi
-	elog "Set your e-mail applications to use port 1100 for receiving email."
-	if use smtp; then
-		elog "Use port 2500 for sending email."
-	fi
-}
diff --git a/net-mail/hotwayd/metadata.xml b/net-mail/hotwayd/metadata.xml
deleted file mode 100644
index 7ed5da265af3..000000000000
--- a/net-mail/hotwayd/metadata.xml
+++ /dev/null
@@ -1,11 +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="smtp">Build SMTP proxy (hotsmtpd)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">hotwayd</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-mail/mailsync/Manifest b/net-mail/mailsync/Manifest
deleted file mode 100644
index a38c7e36d344..000000000000
--- a/net-mail/mailsync/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mailsync_5.2.1.orig.tar.gz 139967 BLAKE2B 9790e573c50b3482829f76752069c6895058108b7f635c6d76086bffe8a50522a5e3e5fc3db2337a791556e206cb323d922aeb0ae3e4ed4fbf2bbf3d80933c15 SHA512 9282cbb6a4ed70ac003ceeace933fda92da3fd6f5bf1058016c138cd81f29918c59ceed615a8f05761f3fd1b32c5b04a0087116cbb75ecf56b8d66ab2c47d14b
-EBUILD mailsync-5.2.1.ebuild 456 BLAKE2B 39d9e86246822c9e0742139f12bf32bbd64fb75d90d372c0eaf86e8e1e009f3d11153e9b90f60dc0dcfa3e08ea433661167de46ae9e1c382ec8c5e39d23dcec4 SHA512 0580915aa301fdd03d5280234857c5da49b2b2e9b46fb7b03f5c2114c54ca7409d0a26a643c3815e09c13fc0c64f6081c3ce18c70f0a62d77b877d22e4ea49fb
-MISC metadata.xml 250 BLAKE2B e54d3c6468265f3c973aa5eeae4b2874dbbeab3ab4cc19a653f83754574d3e63ca297a467e7eba95227da2115cbf885a968b20f90f04e85bae3b862cc848a180 SHA512 f38705b1534ff0688b01691619751e677d83884dea0c3ef7bb30aaec126ef34da08a7454a680d2a0f50265c92c03e98cb4bd10f639a9c6b07972a2ccde21b649
diff --git a/net-mail/mailsync/mailsync-5.2.1.ebuild b/net-mail/mailsync/mailsync-5.2.1.ebuild
deleted file mode 100644
index 9a557c2a01d0..000000000000
--- a/net-mail/mailsync/mailsync-5.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A mailbox synchronizer"
-HOMEPAGE="http://mailsync.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-IUSE=""
-
-DEPEND="virtual/imap-c-client"
-
-src_install() {
-	make DESTDIR=${D} install pkgdocdir=/usr/share/doc/${P} || die
-	doman doc/mailsync.1
-}
diff --git a/net-mail/mailsync/metadata.xml b/net-mail/mailsync/metadata.xml
deleted file mode 100644
index 356ee5f8af86..000000000000
--- a/net-mail/mailsync/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">mailsync</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 8ee5c76d0ddf..d016b390bb94 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -6,6 +6,7 @@ AUX mailutils-3.4-MH-testsuite.patch 2077 BLAKE2B d9a85a3fe025fb9e3fa240abd901f8
 AUX mailutils-3.4-fix-endianness.patch 2871 BLAKE2B e868b624d10ff62fc7508ce66309d9aeec5f66582c9090771d5a132e0f2541943cadd63c37f91f2191145161d336e6e62ede42922f14c4219f3ee768bc6fdfdb SHA512 e219a11c060505d61a7ae14e24c4edeee2f0fbf5a824571c5a497b4702374a1776a2307f3702921a42551c7a229c1739a54d1f2f14b37d896a965712d8ebb2ef
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
 AUX mailutils-3.6-underlinking.patch 368 BLAKE2B d578b46b45bba39fe8b776abfa4394e3adc10c2f811ed4d20fe7a8cf7b2442ebd040dd8a8c5c9023e1f9b635e252cade01ecb08b898bf8e4e2da97e5349497ba SHA512 a958be77edbd01af80f824c70b5f85fde526eadfd58db2476317d44b1d48fb2c2a90c84e49204a84f9efee91c51c33275f6c8254eecd84fa2681c84230b42173
+AUX mailutils-3.8-fix-tests.patch 1254 BLAKE2B 68fc23fc1a6cc98fd5cc6f50afec22373cba028a8b5c81472a843b00d390cb93b7e3194cb8ecd6274552d0610137286bbbac2d33c548b93f2c8c18cc39cf2775 SHA512 2de6971a0811e2501c55a45bf72c80010c81f347178219fa75725cdfc3263f77cc42fd2d8a9209055e889ea8d6eb918a8fc5d86c3fd7f1ac6d5c387bd6f4dbe5
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX nohdr.at 1032 BLAKE2B 3c18d35edc0b6a8481fa7fd8ef110734da5d79ad3ac4a1e251dd020585832b0e5704a9f6928d150aaaa28abf77eaa1120752eb9b2de6d97b52f3110531be6ab9 SHA512 d244044d0ccc00b23cf01235904b880e3d1e74ab2741dc41c4ab82217b019cb32d3dadae69c73c635bceabb80bccc3db5f3176a1039ee40f365277a102739eb1
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
@@ -13,6 +14,8 @@ AUX twomsg.at 2216 BLAKE2B 8a0ac15f6c2a8824406d9a74e14f3143e48b9fd7636732bfae918
 AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780e71224605d735722cb50ba078aa9747b286291d560d9b5e28393239995c1648407070db97 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
+DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
 EBUILD mailutils-3.4-r3.ebuild 3650 BLAKE2B 972e90060cbf607310a6e6c9013b89457db2cd6da30832dc120f6d7e26170b5d49d2202db4f22094098d9259281f6e141a3d8a4c0a16bde16b5e0275470d2a94 SHA512 16712f9a64c8e5a5db643fdbb1d47306274912444fdd21b6dc56acf6c27a3cca7d73a0fa1cea700a6bdd82e86dd630a95e8f02848401cc16bba96b2e7b146aff
 EBUILD mailutils-3.7.ebuild 3652 BLAKE2B 144b8d194988dbad0ae23d8a2037ca10941991c92ae2ae4613cb5c505066945e2794f7aca836b8f6c0e6a523a13ddf7bda4f418b8d03d227535de5c74f857598 SHA512 4f4e8c13f62cde56b0a665f98ae476579d9d799bf5b8201d1a305508effcc5e9554718cafd2b90e0f60968372021a4e10d3a441e810f1bf6cd6b280f12470a75
+EBUILD mailutils-3.8.ebuild 3699 BLAKE2B 818d250d80f81905277a53a82d68d4cc0549c102288e10a0ced3cb5f42e0500728efd55e3ca3c2f1b80c04d5bed8884216234b5c447c273dd853d6594cf17bdc SHA512 84e90646d9158deb86b9061d669a0f36b15c9126c290dd8e48624b7979087689e38030d1150ab45b1a6c2991453285209889f9efa1a958521144564ed2a7f258
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch b/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
new file mode 100644
index 000000000000..90808d883226
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
@@ -0,0 +1,48 @@
+commit 2fe205b5e0b025200150c62581283e99598a80a6
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Fri Nov 8 10:57:43 2019 +0300
+
+    save mailboxes as mbox for make test
+    
+    when default mailbox scheme is chosen as maildir, mda tests fail with
+    messages like:
+    
+            sed: read error on spool/root: Is a directory
+    
+    make sure we save the test mailboxes as mbox
+    
+    Signed-off-by: Eray Aslan <eras@gentoo.org>
+
+diff --git a/mda/tests/forward.at b/mda/tests/forward.at
+index 96170ad6a..75a9d6966 100644
+--- a/mda/tests/forward.at
++++ b/mda/tests/forward.at
+@@ -19,7 +19,7 @@ AT_KEYWORDS([maidag forward])
+ 
+ m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
+ mailbox {
+-  mailbox-pattern "$(pwd)/spool/\${user}";
++  mailbox-pattern "mbox:$(pwd)/spool/\${user}";
+ }  
+ 
+ mailer {
+diff --git a/mda/tests/mda.at b/mda/tests/mda.at
+index 6623fb623..083e7c318 100644
+--- a/mda/tests/mda.at
++++ b/mda/tests/mda.at
+@@ -16,7 +16,7 @@
+ 
+ m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
+ mailbox {
+-  mailbox-pattern "$(pwd)/spool/\${user}";
++  mailbox-pattern "mbox:$(pwd)/spool/\${user}";
+ }  
+ EOF
+ ])
+@@ -56,4 +56,4 @@ cat spool/root
+ 
+ AT_CLEANUP
+ 
+-m4_popdef([TESTMDA_CONF])
+\ No newline at end of file
++m4_popdef([TESTMDA_CONF])
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
new file mode 100644
index 000000000000..b3f820b13cc4
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( virtual/emacs )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5-add-include.patch" \
+	"${FILESDIR}/${PN}-3.6-underlinking.patch" \
+	"${FILESDIR}/${PN}-3.8-fix-tests.patch" \
+	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
index 51e84d62b58c..868a5d743f5b 100644
--- a/net-mail/pflogsumm/Manifest
+++ b/net-mail/pflogsumm/Manifest
@@ -1,3 +1,4 @@
 DIST pflogsumm-1.1.5.tar.gz 47130 BLAKE2B ef28092aeee7bdd478c697c58b4e8cc085f47fcd1b59713a3ed1288a646881809177edd5c1711c3dc0e19299dcf2c0d3f7f7eb9623011aa3a1995c8eae4c4f47 SHA512 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
+EBUILD pflogsumm-1.1.5-r1.ebuild 509 BLAKE2B 0ef13b4dd741fe59e9442b592a7813de59bcd9c98a62eef8e0e04108e71a57161ac6792e6062899247dada746be46dc25923e5ec99e25ff4d32f5e3a10c29f3f SHA512 48f751bef55bb466f66cf0c839bb065de720c6255be1488e65f6148bebe37398da046c16b462315717c23a1874075fa96186b36f3d1dbc86f16bb6930c523b17
 EBUILD pflogsumm-1.1.5.ebuild 512 BLAKE2B 435a02b0885e4e64cdb6ca93d6e19a682191306d11c8aa148fda39ac56284deaeb3f2572b9b3f62b6999949a0079425f73743328ef8a819ea6ac3f6716a64b51 SHA512 bfc240e6d1e229ac6f4ee86e2b693f246bbecc4dbfc1198431d68a7c8cf608eb6dffa169aabc9eea29c47b7e9af7f4b8d8fa4eded2295eb1e86c08e731f4efcc
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/net-mail/pflogsumm/metadata.xml b/net-mail/pflogsumm/metadata.xml
index 7a38bb900964..1b662aaef98c 100644
--- a/net-mail/pflogsumm/metadata.xml
+++ b/net-mail/pflogsumm/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..a8f133c77c68
--- /dev/null
+++ b/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Pflogsumm is a log analyzer for Postfix logs"
+HOMEPAGE="https://jimsun.linxnet.com/postfix_contrib.html"
+SRC_URI="https://jimsun.linxnet.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Date-Calc"
+
+DOCS=( ChangeLog pflogsumm-faq.txt README ToDo )
+
+src_install() {
+	default
+	doman pflogsumm.1
+	dobin pflogsumm.pl
+}
diff --git a/net-mail/popick/Manifest b/net-mail/popick/Manifest
deleted file mode 100644
index cf186c486a14..000000000000
--- a/net-mail/popick/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST popick-0.1.tar.gz 4000 BLAKE2B d3a0c1a2af6cce4c70e8c4d9fff45bea3949338e87f32bea58039751fcc7beac6c1f4cf8dd989d375d3916e0be9fa836f53677cf54e0564643518fb0f593f168 SHA512 973c20e2f56f2a49ad1164ddd530344375150362c2e083717cf2034e7851938de9c71300f41164cd2b3687b68db70e66bef268af650556ede5fb74ce7705dcca
-EBUILD popick-0.1.ebuild 800 BLAKE2B 708dd936e0b07ef276a876c9df6da5face798d4b090c7516356bdc15940ba3f8a8c7c86944fef4e6d19a9e633a6df83f79f06439bccf1afb43655866ded9316b SHA512 83a6f12f500768f1ee8ada7bad19674cbd19a551ccc0312030ba131dc7b49c1cdcafa8366a67eabca5112c9f193da36df4e3664824920bf0396d3827237a1455
-MISC metadata.xml 298 BLAKE2B ef725f639026697bab4e287e02cb13a5713e33f7397fa93bc56c99e1adc69167a346eb2a6c01ec905bb461f5d820b52dc0a5c1129846687db69a26ed453981d7 SHA512 570f7a45150cf50c9f5a1c55cfa0118bda7ba711d4533715e5feb52b06ecabb447b6391b268789421ece1a04361da180cd23a03648ebe96b3dfb0dd3f107503e
diff --git a/net-mail/popick/metadata.xml b/net-mail/popick/metadata.xml
deleted file mode 100644
index 49b7128e9f11..000000000000
--- a/net-mail/popick/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription>An interactive, curses-based POP3 mail deleter that allows you to match messages with regexes.</longdescription>
-</pkgmetadata>
diff --git a/net-mail/popick/popick-0.1.ebuild b/net-mail/popick/popick-0.1.ebuild
deleted file mode 100644
index e379d982e0a5..000000000000
--- a/net-mail/popick/popick-0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="POP3 mailbox deleter using regular expressions to match message headers and delete messages"
-HOMEPAGE="http://www.topfx.com"
-SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/Curses-UI
-	virtual/perl-Getopt-Long"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv popick.pl popick || die "Renaming popick.pl to popick"
-	sed -i -e 's:/usr/local:/usr:g' $(grep -rl /usr/local *) || die "sed /usr/local failed"
-}
-
-src_compile() {
-	# No compiling needed :)
-	pod2man popick > popick.1 || die "Generating manpage failed"
-}
-
-src_install() {
-	dobin popick
-	doman popick.1
-}
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index 638b360f6de4..bdcf5582dbf8 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,4 +1,6 @@
 AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b869040025951dbaf1f07345a95c9bc45d40f87c3ad9a83d6556421f805d65952f4f9d7588abed9bb5b25f SHA512 333d331433a0b43f414f83e51cad3502afb6f5b287967e55d0dedd90ac06955ccbcbe598a3dafe682c97a7ac4ecf501c0842ade940c0702fb797717e8844ffd4
 DIST poppassd-1.8.5.tar.gz 6054 BLAKE2B f97c908a3880aa9ddb76ce09f33046649dfa2d145c8d8d5b70f1a7b473ba2ba8901b62d8e0644187c5987e3c4c8257c8f2bee9504b98bf3d81035e0acda4522c SHA512 4d8d9c3b15b986bd34e5e459f654e8137019a2466b9fec001d9e61a3267b09f150c3faee8e6914d98742c7b3a7301271ba522ee6dff614cca97815a3ae241ae9
+DIST poppassd-ceti-1.8.7.tar.xz 71400 BLAKE2B ca26f7298a8f679c595a9cd66622f1e8ddeff80a7b1655df91a7a15668337112113806d0aef788a374c483cbc957e765b178428d839da2c853ebf87e16039548 SHA512 d50549a4f6bdd9eac7fa74a7787e47dbffff14da883d4e8e23e24802883761c1a392b8a7fbffe5fa726845f48b3b33e0dbc1743ad2d689a4d396c91d0a42f8f1
 EBUILD poppassd_ceti-1.8.5-r2.ebuild 908 BLAKE2B 2b20b468bb071291b0381f0928fb89c5b448e59d983cb453f0155387a3b232f806032f27e4e44ce174ec35f6e8e115de09127704b9d067be5be0bcc6a9fb86d7 SHA512 d46b73589cb8e0eb37d666504024b9ba85b14ec4121230d5564c7e8b5046b4010b57e0046ab451f784066d0aaad150517b657170998caaf56753f37b9a7010bd
-MISC metadata.xml 700 BLAKE2B fbfae81fc82399b6743b1955eaf992676f2b2ad855fd0cb4db28526a0a0fc548371bd2edc7cf8b4914c3b1d209ec39f4c4cdbf1222f00dafef772ee871f193d0 SHA512 2d790e5243bc98e89a52485b30ec59a5cf67405018a542428d050fcb1d005cc0d25d2942499c07d15f8b80c9b976aaccf05fff00d010c7f8563085350d7820bd
+EBUILD poppassd_ceti-1.8.7.ebuild 1680 BLAKE2B b0ae22e7f2be91092223c055f6f2e775c6383ffffd6934aebd64f9fc187bf4deb79636d2d5ad031ea9ab1d9acc317a2f6bfff9cfcb21f2c5ae425639381159de SHA512 4cb0d8d1ce80429bdf900c3a8eabd4428420e040288fd88f4874336e2e95a8fd11807fb9950c2246b12420c9c9cff790cbf5764a62e34ba8727e3217655bef97
+MISC metadata.xml 914 BLAKE2B b6b5348eee4b5a213c13a382ae0294a25497fda65f48e8e4cacd327631357101b1509484936dc0fe0935279245b7fcc4cf15e062b333a73e281a7f793d5e016e SHA512 d1e4a0a72c157bb94ac240987b0b568b9212981f7727383eb28995f2f80e2d5f9ac0eaabbf36fd076f4237ebd84ec8e804238f92f583a63e963f1c4a20e4acf7
diff --git a/net-mail/poppassd_ceti/metadata.xml b/net-mail/poppassd_ceti/metadata.xml
index c0132d24d724..362411c161c7 100644
--- a/net-mail/poppassd_ceti/metadata.xml
+++ b/net-mail/poppassd_ceti/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>mmogilvi+gnto@zoho.com</email>
+    <name>Matthew Ogilvie</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     Provides a daemon for changing passwords over the network. This feature
     is commonly used for TCP loopback password changing from web scripting
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
new file mode 100644
index 000000000000..2ec3e4e92f26
--- /dev/null
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam readme.gentoo-r1
+
+# Long ago it was just "poppassd", but upstream now seems to have
+# settled on "poppassd-ceti" (instead of "poppassd_ceti" or no suffix).
+MY_PN="poppassd-ceti"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Password change daemon with PAM support"
+HOMEPAGE="https://github.com/kravietz/poppassd-ceti"
+SRC_URI="https://github.com/kravietz/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz"
+
+# Strictly speaking the "or later version" clarification was only
+# added upstream after 1.8.7:
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+FORCE_PRINT_ELOG=1  # possibly remove in the next bump
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="poppassd is installed, but has to be run as root to work.
+
+Most commonly a front end would require sys-apps/xinetd and connect to
+port 106: For this, edit /etc/xinetd.d/poppassd, install sys-apps/xinetd,
+and start the xinetd service.
+
+Alternatively, a front end may be able to run it directly (if already
+root), or might use app-admin/sudo.  To use sudo, you'll need to configure
+/etc/sudoers with something similar to:
+
+    apache ALL=(ALL)       NOPASSWD: /usr/sbin/poppassd
+
+See also README.md.bz2 for related configuration and security
+considerations.
+"
+
+src_install() {
+	dodoc README.md
+	readme.gentoo_create_doc
+
+	pamd_mimic_system poppassd auth account password
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/poppassd.xinetd poppassd
+
+	exeinto /usr/sbin
+	exeopts -o root -g bin -m 500
+	doexe poppassd
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-mail/qlogtools/Manifest b/net-mail/qlogtools/Manifest
index 8b343e48c0d6..1348de9a64e9 100644
--- a/net-mail/qlogtools/Manifest
+++ b/net-mail/qlogtools/Manifest
@@ -1,5 +1,4 @@
 AUX qlogtools-3.1-errno.patch 348 BLAKE2B 4a2e1e525a071792f934a7640b0199c7292e08a2c5964f6268c7e5bab945c09d84f09371860311288fb48f7baa24f3d9ad93d57d6e2109a0856e60ef1c0723c3 SHA512 5f9e49aba6e01d5712ceadd8f2a0e3e03bdb2d1cb0c6cc4de7e6b54ef99aff0daa14a93fbeb0557ca9fdb6b75edaf4d0b24ad2b41971fc4f330435ab74ed48f8
 DIST qlogtools-3.1.tar.gz 20868 BLAKE2B bb248aef33e8f8d083956e621437e530c0a7adfe95a8c87503ca7813d756238b54873044777c9d4f362c3c75af24f58c67b8e1fca82724ea8843986fddd4d457 SHA512 aa080114d543d70879b091e3c1d4ddf7a3c1eaf0848c7215fb291e0dac49070833917f66bf02012bcfb1c5df63dadd0ab8c1c1642e5e1c4dd3c34c88bf2751e7
 EBUILD qlogtools-3.1-r1.ebuild 870 BLAKE2B a05e7f0d51497d1241886978ac7f198e5e0c4be85593583d8ff096a381964f43fb0e2186170ccfafb3899bb75860632e611c18e006f8468d4f10858798f2f104 SHA512 d794a2f524dbc0fbbd0f66ccde36239d1d691fd4d4fc0975020eb782310feb43879e2ff6091f2223e9e3c2787d7abee6348c18224f737f415fa1116ad0c5878d
-EBUILD qlogtools-3.1.ebuild 936 BLAKE2B 135ac5fd08b4d0cfe8eba0366541eebd5302b4a4b2da0125d70341c2b00c4b6c43f2bffadb41fd55eea11786efbc9d3b632098a9847a24bf7d7a5e073706c9d8 SHA512 d7ead31344a41e8009b1d710aa6a3f41d6d5dc0f0198227c8874e1e0e543385600228181d024af2833d2eca05d975fec9fad234aed1dff38346c34b48318a9c3
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qlogtools/qlogtools-3.1.ebuild b/net-mail/qlogtools/qlogtools-3.1.ebuild
deleted file mode 100644
index 8c15e308860b..000000000000
--- a/net-mail/qlogtools/qlogtools-3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Qmail Log processing tools"
-HOMEPAGE="http://untroubled.org/qlogtools/"
-SRC_URI="http://untroubled.org/qlogtools/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-text/multitail"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-p1 -d ${P}" epatch "${FILESDIR}"/qlogtools-3.1-errno.patch
-}
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man/" > conf-man
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/
-	./installer || die "Installer failed"
-	dodoc ANNOUNCEMENT FILES NEWS README TARGETS VERSION
-}
-
-pkg_postinst() {
-	elog "Please see /usr/share/doc/${PF}/README for configuration information"
-}
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index 4838eda7ed5b..3c615812cd26 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,3 +1,3 @@
 DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
-EBUILD qmhandle-1.3.2.ebuild 678 BLAKE2B 5177e5f603d724cd3d3835b5fcd81373ffe50fa045730c2d5fb7f372fe01a06bc9afc2d1897c6192ab0c3e4e2c0707d37a384ecccfbcd6f26af6ec634d9ef575 SHA512 deba6d7414d689720c11726f2fc7a5d06d9eeffea06b120f6d72c64a576b38d3f663089e9aeb89c958cbf31eef573aaf9caff5d13dfd0527b8091665dad380bf
+EBUILD qmhandle-1.3.2.ebuild 659 BLAKE2B f5f1c88f08bb70b18c50d75b5c96b901883742a028dacd7c1c3bb39216ab8d859960694713d5e7380b1e41aabad80e71ca800092376cdadac3003066e61ae9e2 SHA512 945d9c184a896dd8c13c2a371c13c000583f60785be44b6a5db4c08b82ba2e1dbcb918456513b4260709c2699a64d2799973485f02bb5b3c303da89a0638d59d
 MISC metadata.xml 651 BLAKE2B 9ccf8ab79b762d85da5c18ef6797e024ca9b9d83a4a83a8b2938073e59fa0bf47ec785415eac661c043e0b52de656e6d53107f445789d3d6b029120401180c3b SHA512 0beb930e70f222cbfd47d27c407fb51c1043f84cc5937c3082e55fe512208e3d2ae774255d41e2e43284e574fec994c84cfdafe46c017730a400d0247a50fafb
diff --git a/net-mail/qmhandle/qmhandle-1.3.2.ebuild b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
index ca310ec47ede..b335ed852a20 100644
--- a/net-mail/qmhandle/qmhandle-1.3.2.ebuild
+++ b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Qmail message queue tool"
 HOMEPAGE="http://qmhandle.sourceforge.net/"
@@ -20,16 +18,15 @@ RDEPEND="virtual/qmail
 "
 DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed \
 		-e 's|/usr/local/bin/svc|/usr/bin/svc|g' \
 		-e 's|/service/qmail-deliver|/var/qmail/supervise/qmail-send|g' \
-		-i qmHandle
+		-i qmHandle || die "Fixing qmHandle failed"
+	eapply_user
 }
 
 src_install() {
 	dodoc README HISTORY
-	dobin qmHandle || die "dobin failed"
+	dobin qmHandle
 }
diff --git a/net-mail/spamcup/Manifest b/net-mail/spamcup/Manifest
deleted file mode 100644
index f7c4c6bbd8e8..000000000000
--- a/net-mail/spamcup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spamcup-1.09.tar.gz 6801 BLAKE2B c19c1904d6c2f8f0c7b66ba6fd28a9591ecf95470dcfedbeb7e96376498c66e994ad44fdb407b076243d1efa5ee4c50cdf821f8888f269d6c9ed8d8da4d12f51 SHA512 a43a194b7f90fd4ca9a444cba0d42b7a87284842fa2bba6bbd5e2bc2bf8e5aed17de5ba6fbfd7c439fcd40fd0f9233d989ba7abf4d907d857f9c72f2c3bb0504
-EBUILD spamcup-1.09.ebuild 611 BLAKE2B 1eb2a73698e33f5ddf30894f4d92567fdee5f02021df52ccd907a3b7e18404d4ff562832c88d7f5f569bf7d160b9c32a31206cd467d107076e1adf7ecdf85900 SHA512 6792473a6daa49cf5fe248ae5383f78677c19c544e95fbc648865572f355bf85b415c0b8a696d65364ca1d0ffe59907b485f1169b27611dbeff149fb0edebe50
-MISC metadata.xml 244 BLAKE2B 72d38f9d89ced95e1eb4246a5a24e654cba4c2e6408d890c0920542816a3b9363cc30903b50e187d1bfd742bb35100e681fdb1c6e8133d4cc2d3594d9bf9721a SHA512 7642c4bc265938695d1007e2a83fe3f3b01930c05354e4607e0011f7d5abd4d0a68b866153877a5407ff28be7381f278a4ebd5aded924919199af70091d591bb
diff --git a/net-mail/spamcup/metadata.xml b/net-mail/spamcup/metadata.xml
deleted file mode 100644
index ae3e25185e2b..000000000000
--- a/net-mail/spamcup/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">spamcup</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/spamcup/spamcup-1.09.ebuild b/net-mail/spamcup/spamcup-1.09.ebuild
deleted file mode 100644
index 051d61595daf..000000000000
--- a/net-mail/spamcup/spamcup-1.09.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="This script does the same you would do when you report spam with your browser in Spamcop.net"
-HOMEPAGE="https://sourceforge.net/projects/spamcup/"
-SRC_URI="mirror://sourceforge/spamcup/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.0
-	dev-perl/Getopt-ArgvFile
-	dev-perl/HTML-Form
-	>dev-perl/libwww-perl-6"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dodir /usr/bin
-	dobin spamcup.pl || die "dobin failed"
-
-	dodoc ChangeLog INSTALL
-}
diff --git a/net-mail/yosucker/Manifest b/net-mail/yosucker/Manifest
deleted file mode 100644
index ab1a70f3618f..000000000000
--- a/net-mail/yosucker/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST YoSucker-pr73.tar.gz 43581 BLAKE2B 1ec4793100401eebc3d18e133ed679af8cb338be1bc7ebb47a7814727717e055f8346c496a3db59d153835bfc14a9f2f0531431bafcaa51be910656d29279f64 SHA512 a6010b0cf04c12a6ba8aed294c5613f5c17bc7dd25b3beb90f748f40418c3cd3f52089888e879ac81e271a135efff661ec9b3e03dd9aa8c8b8b500816f235f3b
-DIST YoSucker-pr77.tar.gz 44703 BLAKE2B dbe3bd5002ce9e75b249dda30cfe00f684b9a321f223576eec36c7fd154910ee46ea6656aa55633c0a2f7fe6edbac576035dc89bf04e22f8e43943e634995742 SHA512 ac69ef919d602681b1812727ac1de2f2a6f158b1204bae803ce936d5db0ae16816ac778146ffd9fc886a31c1736779bfbc7c9c548e94722fd07f8e8b63139265
-EBUILD yosucker-73.ebuild 981 BLAKE2B 21e279518724474f76ee7e500fe3ff40d69667014b66a8b00dce40de18cb9c1bb1f1ffe1fbefd31a0d6ef45e7f74e9adcd27b86b567be035e5587f05db9fa33a SHA512 738236f1c3d50e49d2a0c3c0c71efd5e9093076ae9689fec4fc621a83ccfdd016f117989369249a0c5444d430fbf7a9870bdb740dfb6e34c6e0574dd3dd62ca3
-EBUILD yosucker-77.ebuild 946 BLAKE2B 7a013def50a2dbff7fd079d486b6efb283e669de4515aaeac9d1eb466cd9cf4904f003fa6489eebe6c8eb1bb7d500640832a8735808ad6ffce6314e03d11479e SHA512 7dfd8a2b0b9c5d67bec58b7a28a9c4e617347e8dccb54e533c2632425b7fcc1621be21fe201d194f34337dde2ec28561017090635d02b490c7d3aab46d685142
-MISC metadata.xml 457 BLAKE2B 5cccedd7c71a0cca01a9cf04ea802e344e515d6b3a82545dcf651ba04948435e44259dea4ecd638b9c94977880561993addb6f3401b378eb83091aac94971b7d SHA512 fd940bb934a9a9876e086511981a8b535795457ddf90d2254af9731550eec1eee8a842c137e05bac34cee94275b1fc92d808f782ece157d1f4d61c7716146517
diff --git a/net-mail/yosucker/metadata.xml b/net-mail/yosucker/metadata.xml
deleted file mode 100644
index be4835642693..000000000000
--- a/net-mail/yosucker/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		YoSucker allows you to download Yahoo mail to a local file or pipe it to procmail. It suppourts multiple accounts, encrypted passwords, transaction safe writes, and more.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">yosucker</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/yosucker/yosucker-73.ebuild b/net-mail/yosucker/yosucker-73.ebuild
deleted file mode 100644
index 6ee2efa7493b..000000000000
--- a/net-mail/yosucker/yosucker-73.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="YoSucker-pr${PV}"
-S=${WORKDIR}/${MY_P}
-IUSE=""
-DESCRIPTION="Downloads mail from a Yahoo! webmail account to a local mail spool, an mbox file, or to procmail"
-SRC_URI="mirror://sourceforge/yosucker/${MY_P}.tar.gz"
-HOMEPAGE="http://yosucker.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-SLOT="0"
-
-DEPEND="dev-lang/perl
-		dev-perl/TermReadKey
-		virtual/perl-Digest-MD5
-		dev-perl/IO-Socket-SSL
-		virtual/perl-MIME-Base64"
-
-RDEPEND=""
-
-src_install() {
-	dobin bin/*
-	mv utils/README utils/README.utils
-	dodoc docs/*
-	insinto /usr/share/doc/${P}/conf
-	doins conf/*
-	dolib lib/sputnik.pm
-
-}
-
-pkg_postinst() {
-	echo
-	draw_line
-	ewarn "The Yahoo! Mail interface has changed!!"
-	ewarn "If you have been using previous versions of YoSucker, you may need to"
-	ewarn "log in to Yahoo! Mail  manually before it works again."
-	draw_line
-	echo
-}
diff --git a/net-mail/yosucker/yosucker-77.ebuild b/net-mail/yosucker/yosucker-77.ebuild
deleted file mode 100644
index 347cf4f9cd1c..000000000000
--- a/net-mail/yosucker/yosucker-77.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="YoSucker-pr${PV}"
-S=${WORKDIR}/${MY_P}
-IUSE=""
-DESCRIPTION="Downloads mail from a Yahoo! webmail account to a local mail spool, an mbox file, or to procmail"
-SRC_URI="mirror://sourceforge/yosucker/${MY_P}.tar.gz"
-HOMEPAGE="http://yosucker.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-SLOT="0"
-
-DEPEND="dev-lang/perl
-		dev-perl/TermReadKey
-		virtual/perl-Digest-MD5
-		dev-perl/IO-Socket-SSL
-		virtual/perl-MIME-Base64"
-
-RDEPEND=""
-
-src_install() {
-	dobin bin/*
-	mv utils/README utils/README.utils
-	dodoc docs/*
-	insinto /usr/share/doc/${P}/conf
-	doins conf/*
-	dolib lib/sputnik.pm
-
-}
-
-pkg_postinst() {
-	echo
-	ewarn "The Yahoo! Mail interface has changed!!"
-	ewarn "If you have been using previous versions of YoSucker, you may need to"
-	ewarn "log in to Yahoo! Mail  manually before it works again."
-	echo
-}