gentoo resync : 15.12.2019

67 files changed, 720 insertions, 569 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 0d73a7960914..f4c0847087f4 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index 5a962f6c58ab..01e116ed394d 100644
--- a/net-mail/autorespond/Manifest
+++ b/net-mail/autorespond/Manifest
@@ -2,6 +2,6 @@ AUX autorespond-2.0.5-no-include-bounce.patch 1185 BLAKE2B 275a35692afc5101dca27
 DIST autorespond-2.0.4.tar.gz 7884 BLAKE2B 35b682ecb4de27c4db97f6594e49d05305ff5017e8e6c56bb44d51712a24a21ab70cd242a0a0c1fd5da4c8ed7f2d5efc548b5f2d59ab16ace929a90509a930ef SHA512 0bde01482a1bf16f5c4e478fad8a36ef6a34dd3a753edfdea0787381380c50ab5a95b94e0464dd874cb1a666f9dfb196de55506503bbb589dd5974867298fc62
 DIST autorespond-2.0.5.tar.gz 9707 BLAKE2B c0e9f85e23d2b3a5168a33695370583c9844ab47e196822d1bceb0543878085de7595b37323ae5134d6d98ff0864a1865fce4498f0f4b9464398b0cc2062d1e7 SHA512 c27565962677654251062538a76ebc0f5402cb8b0027352060e6aa51871be27c0e32c6898be7cee72d2a80680b79d1ce7bf23249abfb486a851d73005ef7e7bb
 DIST autorespond_2.0.4-1.diff.gz 2637 BLAKE2B 6bb2e7567a9376296bd1e0b323e07892099d004ed3e2497d605b001486e1d3d33f7d3378bce48979c7b4dfa9a7a6aef863172ccb4e442ef1e837230f91b96220 SHA512 ef9ffc46c885d644b6f20107c03f0ed68ded577499d8b05ecae217fa43c6053de4a68666cd78a059d19ae1181b101a7de93f1d2ec0956dee7478e43c06b772b6
-EBUILD autorespond-2.0.4.ebuild 675 BLAKE2B 4f3db5ee8831696f3752c809fe69604c4709433e64c8556d9e91fed732828c4b9c91f7df37806ce2fcf119fe675d51aa9aaab6a5f76e648552e350e9169f72b8 SHA512 80775b2c0b8a7241c5e948cabcbd67a357111d1872a120fdf7c4959a06af7c56b3911dfd58d8cd573255695ad9b6309aed3c0728ae8ee18722d69992bd35e8af
-EBUILD autorespond-2.0.5.ebuild 814 BLAKE2B adb62ca10516818fa207ccf9ebdefcfef2c809f01a57fca1bca4bfb69202e5d53400988a2bf4312dab98af1fd76ac274e1c1c574220b5763abfa1edffef6d4d2 SHA512 09d67fb302ff577588d668bbd9b8153f8f1d7925ddc15800275ae3c6e48310c40faee615cb8577da86fa0ccd93bf62c1318088650407a00a6b8d3335fc2dacbc
+EBUILD autorespond-2.0.4.ebuild 646 BLAKE2B ee8943a7cdd3ed890bbd85546fcd82ccb34b2dbfa9cccb9e3053bc8d5857f5f2c98bd68daf4e1e739b445721d16172d1bf9ae1b9810af2dfa7cdccf7f0c8c5fd SHA512 126933c6ee615bb01edde97cb98651eddd405d47e8b95a290f3a5c6b6ca2b76a61dea326e76522a6ab38036abdf0e538f014b67e37fff9838768c3b3ee306808
+EBUILD autorespond-2.0.5.ebuild 785 BLAKE2B bdab2b95893a4525f6b080a81310e8695ef8ff0434f21db5b27ffe4056e811c5bf6078d7e6d6de34c036a392f102520ce96dfc093b22339133e51a7dffaf253e SHA512 bea6b4a537a05d774bc72df1cc9493f8d550be94090bb8a62d7dc203d57cb47a0b0d436f7089a26935c40a2a5dda4f0de7d2801029b01fe7e037d358e16e44d4
 MISC metadata.xml 306 BLAKE2B d2773e404b4ba6a3ca9afaa342780161b8842710a844056970d9d57bfa36b245b8a711f529f5ceb61ee70dc0aa8cec33f8d52ce3b83ce6fc7ab0aabbe21df019 SHA512 c1a07f6fac6f13c3a0c9adacede02bb664a09d8e93e954dcb2cacaa3690ff93783e717019be0cdee715036f7aab179c18384163556ca28798a297efed70ebd5d
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index 94509c8a81be..d3be500ebcd5 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -19,12 +19,12 @@ PATCHES=(
 DOCS=( README help_message qmail-auto ChangeLog )
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
+	emake CFLAGS="${CFLAGS}"
 }
 
 src_install () {
 	into /var/qmail
-	dobin autorespond || die "dobin failed"
+	dobin autorespond
 	doman *.1
 	einstalldocs
 }
diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild
index 813522f4365b..5e32640b6e10 100644
--- a/net-mail/autorespond/autorespond-2.0.5.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.5.ebuild
@@ -18,12 +18,12 @@ PATCHES=(
 DOCS=( README help_message qmail-auto )
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
+	emake CFLAGS="${CFLAGS}"
 }
 
 src_install () {
 	into /var/qmail
-	dobin autorespond || die "dobin failed"
+	dobin autorespond
 	doman *.1
 	einstalldocs
 }
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index fea9425a8fd9..0f84b13809a7 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -1,4 +1,3 @@
-AUX 0.90-head-1.patch 1201 BLAKE2B e9e0748772232855ed1ce0990d2b5438dca1b86a671a5bf70827e33795914a5099e648ef6047f3537db19c7fdbb456e45d20ea00e12331334230cf9b95aa7b53 SHA512 b8fd43218a6b396b848e5e827ad30ce406b2c3860abbedf359c7649e4cbedac96968726e0a910c4e9f563d48ec924873c96f315392be2b4bbd252767bdb5f6a9
 AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7df279e163dfc0c4a84d4ed8083af51d91658bfe44df640a45dc18654477cd7341e7c703c3108d6e3343a16ebdadf1e8 SHA512 67b2764ad73cc6773e59d0335aa5a3b03e3620cd4421f51ad7e17c68abeffc2a481d728dc6850f232190e91cffaf1e83904cd3b94e33647193e0b2ea6105c3a2
 AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
 AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
diff --git a/net-mail/checkpassword/files/0.90-head-1.patch b/net-mail/checkpassword/files/0.90-head-1.patch
deleted file mode 100644
index 08e54297de4e..000000000000
--- a/net-mail/checkpassword/files/0.90-head-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur checkpassword-0.90.orig/Makefile checkpassword-0.90/Makefile
---- checkpassword-0.90.orig/Makefile	2003-09-03 12:06:23.225291952 -0400
-+++ checkpassword-0.90/Makefile	2003-09-03 12:06:29.578326144 -0400
-@@ -22,7 +22,7 @@
- 
- auto_home.c: \
- auto-str conf-home
--	./auto-str auto_home `head -1 conf-home` > auto_home.c
-+	./auto-str auto_home `head -n 1 conf-home` > auto_home.c
- 
- auto_home.o: \
- compile auto_home.c
-@@ -91,7 +91,7 @@
- choose: \
- warn-auto.sh choose.sh conf-home
- 	cat warn-auto.sh choose.sh \
--	| sed s}HOME}"`head -1 conf-home`"}g \
-+	| sed s}HOME}"`head -n 1 conf-home`"}g \
- 	> choose
- 	chmod 755 choose
- 
-@@ -166,7 +166,7 @@
- warn-auto.sh conf-ld
- 	( cat warn-auto.sh; \
- 	echo 'main="$$1"; shift'; \
--	echo exec "`head -1 conf-ld`" \
-+	echo exec "`head -n 1 conf-ld`" \
- 	'-o "$$main" "$$main".o $${1+"$$@"}' \
- 	) > load
- 	chmod 755 load
-diff -ur checkpassword-0.90.orig/print-cc.sh checkpassword-0.90/print-cc.sh
---- checkpassword-0.90.orig/print-cc.sh	2003-09-03 12:06:23.227291648 -0400
-+++ checkpassword-0.90/print-cc.sh	2003-09-03 12:06:34.308607032 -0400
-@@ -1,4 +1,4 @@
--cc="`head -1 conf-cc`"
-+cc="`head -n 1 conf-cc`"
- systype="`cat systype`"
- 
- cat warn-auto.sh
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index b990e5bd0bd3..63da9e870007 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -3,4 +3,5 @@ AUX poppasswd 84 BLAKE2B 0388cd039e50beb308e8791c3b490ca305bb6288f5971ed624fea1d
 AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce311faff1fb0555d5b08543a9ce79347f953bfeef5c6b6585edd5474c538a2323d3e47048444b26 SHA512 e18cab4bb02b2bac945d1857f70d6f5faa2296205f09c228d87d16dffb43de129a59ef0054dd6c54f1db7448b47f46a385dc81ffe769dc87d182d81031920369
 DIST cmd5checkpw-0.30.tar.gz 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
 EBUILD cmd5checkpw-0.30-r2.ebuild 1469 BLAKE2B 721a3a3adbabb37d64682a32ce6b408233e2b48c829073bf33fab34569c40929eea64628430629f7fa20faba941e78c8f7806444b18955006c5417b65eba2632 SHA512 1fcfa408df2b0396fde4e536918986834feff35c566ed30b4eead67c50e7c289e31b02a63e9ab67b2a8e3fe75c6faeb04b0cd3d85efdfbbff9074555e060e58e
+EBUILD cmd5checkpw-0.30-r3.ebuild 1502 BLAKE2B 24c68fd6903d4db526612b4b66b6d6fdee68474a0083fe37b8d2af93d2804bbc8a458954f25b9f8c5ab97ee681bd04d11ff12c24cf56c336d74d1d5c9374dbb8 SHA512 1582add7c5c0be47de9c452e244c7173882fc22876b452468c9ffdfde97c0cad9584f457b4d70a421e8ae55b3952ba6c063b22df2490a2d4dde3bfdf0ef35c85
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
new file mode 100644
index 000000000000..38ddd2149fda
--- /dev/null
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.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-group/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 640 -o root -g cmd5checkpw
+	doins "${FILESDIR}"/poppasswd
+
+	exeinto /usr/bin
+	exeopts -o root -g cmd5checkpw -m 2755
+	doexe cmd5checkpw
+
+	doman cmd5checkpw.8
+	einstalldocs
+}
+
+pkg_postinst() {
+	chmod 640 "${EROOT}"/etc/poppasswd || die
+	chown root:cmd5checkpw "${EROOT}"/etc/poppasswd || die
+}
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index d897f4668aa8..570d6b163c9f 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -6,6 +6,6 @@ AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc7771393
 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f
 DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a SHA512 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
 DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06 SHA512 058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
-EBUILD cyrus-imapd-3.0.10-r1.ebuild 5955 BLAKE2B 888675ec39e65a93965a7a9c3197c400c896ebdc80521db3a2a084c4a34adb9afe1f3ba86b65d1786a042c6c4d46f03615a91bed161563e6d35ff595b096f534 SHA512 fbc2a43dec6427cfba3201e3cb736653685a6f497b8c1e48abbf296858d880be9c78adb9180e65d36127f58b95f662f390123c7b80589f81511d8c67d6486a6b
-EBUILD cyrus-imapd-3.0.11.ebuild 5959 BLAKE2B a736a7f8a6f7a94f19ff8de4395cfedec2e4c582f55ee43e7a2b022a504a59983be5752949b116bc5643142c61ec57f7265b98b0605a99b2f38bfb1d2b8533be SHA512 5a76353fd2c038f7839f274f934422d2ae6220daa8babfebcbe299f6192e8ac5429ded0c5f2cce85ea5b81e8f15f2a282132871580a35813a91ab73c2e4ecac6
+EBUILD cyrus-imapd-3.0.10-r1.ebuild 5982 BLAKE2B bf66be0f1d2d3ecec9f8f8becfe3f30e670a578dd2134d5286c94cfaea66e4d6dc3401ded3d62de117930f8cf82495bf720532f72335ed697187b01fc68c2a2f SHA512 176f44ce62781cd4390a22c800f64b4eb09cab36c707ada066c52a623b508b28bb5797c9fbc6cced5424ae0846edfa5991453fa162676115b1ec5da9d5773dfb
+EBUILD cyrus-imapd-3.0.11.ebuild 5986 BLAKE2B 88c0ee292037ad25157cb3a3cfcfeace9057aa945cfc57c121dfc6e068c072061a0ca8f94b439fac8dca84ebe2728a9f67b0fa8849b4ba284afa19cac00dc30a SHA512 286cb4d0d755b3ade98ce722ba4c684c7f4424a015f9d2f162fb0dfd6a31c8f2d98dff65306b449ad47730791e76b45dcb86edc44e7df9f7ca5b9525d31a4b83
 MISC metadata.xml 677 BLAKE2B d1172bd68328762c6f54a337b9c7587bb430caf74a9b343bc747363de8508f856f3d6ed6ad2ef89c99dacb2b08528f72101fa73c1107f7b6adeb82a49a24f3e5 SHA512 e6e10b820ce521fc2bb51dc7e8bcbbc669055f9cdcc595801e0ad461bfbb7bc01125047caec84788b355f2dc30502bace67cf948647255e366a49963a52b0095
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
index b2ba1c3eae19..855c2e53448b 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.10-r1.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	sys-libs/zlib:0=
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
index 4fe6676ef6dc..5f70b01ab23e 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	sys-libs/zlib:0=
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 97828937bd52..c1103d622e86 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -4,9 +4,12 @@ DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126b
 DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d
 DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60
 DIST dovecot-2.3-pigeonhole-0.5.8.tar.gz 1857780 BLAKE2B a1b86c7757238c4bfb6ec4aec5e152eedf482923ec34728cae7d9faccd6ad395f0c60b0cc5f86abee314f80de89d09796bbf0446e08e5bc46ad0191c0456e077 SHA512 ddf009c755cc87c362ddf1c17ac1403b0f6a504b039efef3244f2d5bd4d3963fb25baaaa4d98c089b3e8bddd4675d131765fee5499d9aaf01015e44f7d631d2d
+DIST dovecot-2.3-pigeonhole-0.5.9.tar.gz 1897060 BLAKE2B 73b9abd0a7ea9468f7880fdd0d0471c5825f341c7297807c404ce50a8792f821d2599840ce9eb2705a118a0ee078aafad9f4f6eb64a02fbcb3b0f89c00042ada SHA512 1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8
 DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
 DIST dovecot-2.3.8.tar.gz 7136958 BLAKE2B 2769169519f0fd9293178e8d200467bc5be0f362bc6bfb3dcc6cc74ed146ecf66dab7730013704b70f0cc75a87ee5e52994137cd63c7c12c56bddcea37cedd07 SHA512 f62439e2ea77ffb544a7752c07085582c5653c64671cb42dd7a7e5aa69eb87059c677aa1fa071efa1ddd2287ab621e9a264ec115be2aeb2f43ab4c685411eae3
+DIST dovecot-2.3.9.2.tar.gz 7182306 BLAKE2B 942718ebdb7c447096895fc4309dea930ff87166f06be3365c6463e2aed95bb2620a5e45a8ce260df647593d9d2cef1d2a3ba3aa0afb397dac81653f9a4fd519 SHA512 36e8270bfa33e2bd6aa89017e65c7d1650c494c79ff297759a4b01c026aebcfdf5b1b542d4357e1f9dc2bb8169ef67064f0699b17ca36d658deb70b4c800b253
 EBUILD dovecot-2.2.36.4.ebuild 8572 BLAKE2B c5900ba2365ac280429b669a91f4cfc537f689c9fc9d52d3bd62a170467278ddd4736c2ba850ed1f97f775eb9fd132047bf9ea84625d3665270b83ab380c2931 SHA512 8c48542c6bd7831aca19b38b3af1c220cc43f1b9a1db22ce44d2c9c9f8f44a1387cb4e0b8ced38304e1e6b790c6ab81473f418f14ca922dbd50554e9190c596e
 EBUILD dovecot-2.3.7.2.ebuild 8684 BLAKE2B 8f660cbe9a2f12c077d301167700ad9da9ee47491d33208279f1ba9516ec5e215e3c8fc23ecba65e769ff4846b01574c4254671b23ad1f56aeafa69077e07725 SHA512 8c8ec87757307bf05f754defc080dcd3d56db79f17de7962d1868275925e896282db3877d4948557c94b6d29732cba2d74105642931b0876579392abef468986
 EBUILD dovecot-2.3.8.ebuild 8558 BLAKE2B 7aa5ef722151554d553c69c02aa8c38622306561acf87dd02d0f84d32121f3d527f13b7aaf45656aa7055594ba15ba45f4933ccd82456eb8276ab39bc64a4222 SHA512 a5448124ac35c0d660998f1de3d2209d1e7b6d6bdc6de4e1811b8572aa19b4aa41aad01f4741cc6ef9abcc66b051ffec9fd106be8c31772781d3e74f0a46042e
+EBUILD dovecot-2.3.9.2.ebuild 8558 BLAKE2B 8079b41d7d4a3e96aa36ee7e2a83a95142e0d54cd7a633211ba3d80fbb97f68edc65d559497b64c2cf912ed4d42b27e6f9bfd963ed1f13ad1bae6d05dd5df45c SHA512 2c8845baa6064cc79533f24a83bba84f322681710b76a9900e2b644d312db90c162155d2aa8ed2b40616dd7b22c6dd9f8d4a6fe7349eecb31831e35e498b2dec
 MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
diff --git a/net-mail/dovecot/dovecot-2.3.9.2.ebuild b/net-mail/dovecot/dovecot-2.3.9.2.ebuild
new file mode 100644
index 000000000000..6a614a62c190
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.9.2.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools ssl-cert systemd
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.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}/${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? ( dev-db/mysql-connector-c:0= )
+	pam? ( sys-libs/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:0= )
+	suid? ( acct-group/mail )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase"
+
+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
+}
+
+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 "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/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 /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 https://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index fc59ac1152ee..608fb766e947 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -9,5 +9,5 @@ AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3
 DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
 DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
 EBUILD fetchmail-6.3.26-r4.ebuild 2641 BLAKE2B d8613523a8325dfd7428d8dbdf9a03daea325cd3964abd269874885a07a9fa8fed07ed9f413aaa02250038dba6a59cbd7cdec26a93b81220ec35fe508e0a036b SHA512 921afff61fe1bb5ae117d77a7472d0e61d093b92bbe09a08a76d964b161882fefdec6dca090267d14e60e2374bbfc82177d271518ce9dcfeeefc61e63909d12c
-EBUILD fetchmail-6.4.1.ebuild 2615 BLAKE2B e5f3a9723edea70a0ace444822cfeda62dfa13e1b0eb690ba6ebd2a8ee70290db0704418d97ac7224da8f6e7533a13c62590415578eca29e7726451160d52a66 SHA512 fd262ca8b69a8953cc3916a68e4c34e1cfb57d8fd0c80a7b60a0b14193520e228f68f9dccffed802283d66866b95f27d965796da0e75ebfbc30d77cf89d88309
+EBUILD fetchmail-6.4.1.ebuild 2607 BLAKE2B 666e51bbc0e5b8974d696780ebdbd2608ef4bbb5c4733319048b7da0d479a919881ec4ef0ab396228f77dbaa69a713476ab5b4ac0967040f1d2e27c585a5b3b6 SHA512 f897bd069427577ad4888de5f61fdb64755f6649d9d8be94eab141704cb6738d6bfad07f8c20b837d538930fa2f99d63fc5fcb31b5e0b90f503aa3f722b5caf3
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.1.ebuild b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
index 99acf72a14c3..1a737af6ba7f 100644
--- a/net-mail/fetchmail/fetchmail-6.4.1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest
index ceb6ad80b3a1..62bb7e43628c 100644
--- a/net-mail/grepmail/Manifest
+++ b/net-mail/grepmail/Manifest
@@ -1,5 +1,5 @@
 AUX 5.30.33-fix_nonexistent_mailbox_test.patch 1138 BLAKE2B ebcc4958fc773f4ee0d1156f6ffbb722fc985d641c5e9b4a7fb1f12de90faf85808c74719271b99159572f86244aba2ef98adeffc106392f22e636d12738bede SHA512 88c3123ea5031a9d925cf8c7464b53290a4015faf43b2ef5a0543698d8374e45b93291bf1eefe636b52ba4a8d1a9ebf2dc3a9261572bfd5bcc9f16f1671e8969
 AUX 5.30.33-midnight.patch 560 BLAKE2B 4b2d085dc8f334f1ec1a9949ef91524791c841a5bb6b92a69c90d87ec62aaa4280558e8a57112b6d085beb34551a1b42662ae6a5311ffc5f60da6d5b9b8520c3 SHA512 41ce56d0a2371bcc527f997825530e87ad0199c78605ea72567255cb985158fa56e669aeea966a547ccd970231bda1a5da783320fda1568642890e9832c69775
 DIST grepmail-5.3033.tar.gz 536791 BLAKE2B 400cc3c30a291f6075d343522a4f506997e3328c2adda2cfa7d4449052ce5bd6112fc06a44f8359def6358c716422b5c33353c7247dd6b5cf6c5a0502a2c34d6 SHA512 58fb63c42b534ba32d8224753cd11701adc3ab6eeca838753982cd6fdc46c05142eeb34106ae585b48698c299648cc2e0135215900ce28dd7c84921c8ad7831f
-EBUILD grepmail-5.30.33-r2.ebuild 1015 BLAKE2B add2f2f4ad29f860dbc624906243604326a763fb044a170cdf870c041fed1a87b31e4ce687df0453cdc4e5c490a3d3cf3fa87c33445276e63172ef5fda298459 SHA512 6fb30c9cec98ed542e23cefde7a4083504cc8d218c03614b9aa08c6d04642095c10e0a2417ba39e2f57e234b98b037f8b3dda85e39ada685ba2002a7ecaa9f02
+EBUILD grepmail-5.30.33-r2.ebuild 1039 BLAKE2B d906e5707d8704752811797b7964aa63732aaeb369d209e237247c7ad1d66d2667a7ce1df70bbfb959148698e3ab8ffa2ba3a8f51b496049c505f3822c413c31 SHA512 9582058ef44dd1dfea0cf0230a7ad66be28dededcdaa2f2b5590d3168d41c176ad1ddb893596d97fd1cc699320a2e488b1a0555a1be5ea9074d4b02957ae36e0
 MISC metadata.xml 245 BLAKE2B 19ec7bd1e78a5b18685dff3959c1abd4fe2a737141ef33877820a472c5f9e4a2655108429c0f524956f10c4abd50522be56b85115c1af62b3ac67ba6accc0574 SHA512 fbe7cff14777362e70e446a04fa791b26b45fdc4d8416fc8fc4a234120570bf5368b97a56c0c9c7c033b799848475ba71a19d4431241c002141ec10f96c5ca3e
diff --git a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
index 78f9e267c1b3..c02c6360e139 100644
--- a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
+++ b/net-mail/grepmail/grepmail-5.30.33-r2.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
@@ -16,6 +16,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Inline
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 4332e64fa276..55d51e5b4577 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,5 +1,5 @@
 DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd5cf3e5dea69cad8fa485424a5d8b89d1e2024f34a688bfb018724b05bf8e5e57ab5338c9973b78d203d4b SHA512 c99d8c4549d781252192e07dfb89adbae6daae5a4f4c94de692c4289848ba8599c2b0aeb28bac69313e6828995eac32acf3fbc76b1695c6464c6339236cdb341
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
 EBUILD lbdb-0.41.ebuild 1362 BLAKE2B 87f3eaca4b680eb27ff7f24287317973a9aa93f95ebfe4a7770f5f73b4327f2ac6391084eb75aff85159fe73caacb19ea4fe8d1f459e405c0600be5a256b6077 SHA512 b483dfd7dd5207045a648283f1b7eda49aca430dac9a54001baf253856a277e6f358951b8d9268573716471b89440d26c338b4e7b5ec42ebf06f9b4f3505c029
-EBUILD lbdb-0.47.ebuild 1460 BLAKE2B 97d7aa58fdf3f8890b4469d434e995767f3d1ddb7ce96af59a3b1a50e70366c06f3df08f82034fabf6791b6802e610e4687aebbc69b4183ce92e181456a7d857 SHA512 c2f9ddef4676ed5dc67cf25888a671ee7577fc65d7dd5aaa0d5263eedc960937732a11a444d6f29bf8618673a70867676974a84d7d3976f8480fee949fd63c8b
+EBUILD lbdb-0.47.ebuild 1487 BLAKE2B 119517d253102a3b292c99b77e9ab0adebc4c49b079bbb1b18ac1260f0914a76c862124775c281fd5ecf84e8ba1f53c9adc65cf93f792a03cd1130ee4d455a3f SHA512 9d4a7e9972397cb2e0209ffa64df80b26d179b449ece8b6659016a8351ac0a88558f2b1badaeaf57d8fb1f87eac377260a7df05b74726607eada9d477ad7ad89
 MISC metadata.xml 452 BLAKE2B fb14006c0ff46ee5b6e9c72682db885497f93a3b48e6852c87128a2b17b91a0459ccdb2d5fe94cf2e26459c9176251f79ac18ec31d3f03cf060c0ea2f8294c5f SHA512 38c22e435ea247d967a8d04092be6f0195436db16fc03d7fd7aa3cd0fe0f3dbfbda3ffe6a58cb7e8a5d1dfb18fb0a048b7d525300bd265a7d0522dc91d991a79
diff --git a/net-mail/lbdb/lbdb-0.47.ebuild b/net-mail/lbdb/lbdb-0.47.ebuild
index c5adc17be89a..7ac9a150cc56 100644
--- a/net-mail/lbdb/lbdb-0.47.ebuild
+++ b/net-mail/lbdb/lbdb-0.47.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
@@ -12,6 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="GPL-2"
 IUSE="abook bbdb crypt evo finger ldap pda test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-libs/libvformat
 	evo? ( mail-client/evolution )
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index 1a968640a011..50f8a9e0834f 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,6 +1,5 @@
 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 1580 BLAKE2B 1f0172f84af5da8fa7560cfa3ba13e1c87ffea5f8fc2874a24757088091d9cc9f283e398fffbee122b969817f631577a50641717fa63b257954466dcae7c5afd SHA512 f8097fae146f23b2dc75c96cd76e62b97daeeb625c05e2087c186c450ecebfed8ffb3e8a74e21ca17aad2bcdd2d7011094dd968b980f5d7dc84f96da312ac9d1
 EBUILD libpst-0.6.66-r2.ebuild 1623 BLAKE2B 24092e687f6e8da4659ee80956e3b08c4644766a2c7de499c1c2bd9a741833e6d6a5b091138b0d3adc54f51596e056958dce4aedb587cd42f7b06e3172ef8ea8 SHA512 78852ca61e348a201ce8a9b86c71428806129ece63faad87aeb27261c0af5d9f0e22b11f906f0019478d63ad05ee2d3fd5a2093ada9ee6d20ef1940db42bcf7c
 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
deleted file mode 100644
index c1b99ee4ce99..000000000000
--- a/net-mail/libpst/libpst-0.6.66-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-RDEPEND="dii? ( media-gfx/imagemagick:=[png] )
-	python? ( <dev-libs/boost-1.70:=[python]
-		${PYTHON_DEPS} )
-	gnome-extra/libgsf:="
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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
-	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use python && echo --with-boost-python=boost_python-${EPYTHON#python})
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-mail/list-remote-forwards/Manifest b/net-mail/list-remote-forwards/Manifest
index ff74a45e261d..a7ff3c8d5134 100644
--- a/net-mail/list-remote-forwards/Manifest
+++ b/net-mail/list-remote-forwards/Manifest
@@ -1,3 +1,5 @@
+AUX list-remote-forwards-0.0.1-ghc84.patch 978 BLAKE2B 295f2ca369794739da3ff45bf6a5ca57b102942c93b8dd8c4e99d9a70906a469c761aa0fdbe50311d6e56d5bb0725610dd473c49152f4cdd3462cd2da2a8418d SHA512 4f9addb938b14590d98e4e17e6764987ebe4192d7492de1ce2c917881ec20ecd15898988c223dac695ed8f71d7b2fe74f8b798a52960f215fd4c9c9a02c9a72e
 DIST list-remote-forwards-0.0.1.tar.gz 25869 BLAKE2B decfd8b5d4fcbd5e278f9c58f79687aa33cc91d4d4907ff7a29fe6b745ff49c073e3beaf2876ec071f4ed1099b4575cacb8194049add04c0aa8ebeff3338293e SHA512 b6d8c0e8a72e3dcbc62c00b291da99da6c37c853997c367eb60db128db327c1f862e9dc6d9ad4028aad2e0cec9acc96add28d85d4b22508e1fd00a65bb9b0317
 EBUILD list-remote-forwards-0.0.1-r1.ebuild 994 BLAKE2B 390cc3ae12fb933b6fce5635908c31677a46486edfc288b936c57402679968c53dafca811ad053c992df1c4702feb8656863bec3bae17af9d1b8f9b36109802f SHA512 fb0b1a2f5026d2e178acd60c60bf9a0b8394f01f95ad3853dc163ad011c305d281b01a718e5e16b9cb8c208c7d9c67541c9709aae9ca0a59c914a2fc9d612d0e
+EBUILD list-remote-forwards-0.0.1-r2.ebuild 1101 BLAKE2B 6e632191a0332dd74eb6d0edd5c922577ecd70b3d6c91031cb9ec4b96a1ba548560534cd243bd785f3d7d8c3f2f92701a2435d0134849391a72b52bc7e170b22 SHA512 2997d82a3c25e21ef173231fa4e52afee4acf6c175e76fedf695b564ab614370b770057d7e84f3dd4ee5632b350a03914e9a7d9c6a52e77a519717fc387b7f65
 MISC metadata.xml 4175 BLAKE2B 183538e85d540850e8176fb6c2a6a24dd0dfddeac8bf9b9ee684b11ef8ddb54c58e5a0292f67e72c15264880fcd68d253b48c3ca70bf0b8110b9cc8d58438186 SHA512 a6cb86568d00776106d194639bfbabec5e753e8bcc5c4b1c2f50f25f1202865ea45a946e55de5bc41a79ad7a18c8d9442ec7e964065a1b00fa0c5937177ee9e4
diff --git a/net-mail/list-remote-forwards/files/list-remote-forwards-0.0.1-ghc84.patch b/net-mail/list-remote-forwards/files/list-remote-forwards-0.0.1-ghc84.patch
new file mode 100644
index 000000000000..bf21a42d5973
--- /dev/null
+++ b/net-mail/list-remote-forwards/files/list-remote-forwards-0.0.1-ghc84.patch
@@ -0,0 +1,26 @@
+--- a/src/OptionalConfiguration.hs
++++ b/src/OptionalConfiguration.hs
+@@ -31,2 +31,3 @@ import System.IO.Error ( catchIOError )
+ import MxList ( MxList(..) )
++import qualified Data.Semigroup as S
+ 
+@@ -59,2 +60,19 @@ merge_maybes (Just _) (Just y) = Just y
+ 
++instance S.Semigroup OptionalConfiguration where
++  cfg1 <> cfg2 =
++    OptionalConfiguration
++      (merge_maybes (database cfg1) (database cfg2))
++      (merge_maybes (domain_query cfg1) (domain_query cfg2))
++      all_excluded_mx
++      (merge_maybes (forward_query cfg1) (forward_query cfg2))
++      (merge_maybes (host cfg1) (host cfg2))
++      (merge_maybes (password cfg1) (password cfg2))
++      (merge_maybes (port cfg1) (port cfg2))
++      (merge_maybes (username cfg1) (username cfg2))
++    where
++      -- Use only the latter exclude_mx if there are any.
++      all_excluded_mx =
++        exclude_mx $ if (null (get_mxs $ exclude_mx cfg2))
++                     then cfg1
++                     else cfg2
+ 
diff --git a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
new file mode 100644
index 000000000000..783e292e6dec
--- /dev/null
+++ b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.4
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="List all remote forwards for mail accounts stored in a database"
+HOMEPAGE="http://hackage.haskell.org/package/list-remote-forwards"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Ambiguous packages: dns-3.0.2 resolv-0.1.1.1
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	>=dev-haskell/cmdargs-0.10
+	>=dev-haskell/configurator-0.2
+	>=dev-haskell/dns-1.4
+	>=dev-haskell/hdbc-2.4
+	>=dev-haskell/hdbc-postgresql-2.3
+	>=dev-haskell/hdbc-sqlite3-2.3
+	>=dev-haskell/missingh-1.2
+	>=dev-haskell/tasty-0.8
+	>=dev-haskell/tasty-hunit-0.8
+	>=dev-haskell/tasty-quickcheck-0.8
+	>=dev-lang/ghc-7.6.1
+	test? ( >=dev-haskell/doctest-0.9
+		>=dev-haskell/filemanip-0.3.6 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ghc84.patch
+)
+
+src_install() {
+	haskell-cabal_src_install
+	doman "${S}/doc/man1/${PN}.1"
+}
diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest
index 4e0da5e59530..5aeb89853e75 100644
--- a/net-mail/mailbox-count/Manifest
+++ b/net-mail/mailbox-count/Manifest
@@ -1,3 +1,5 @@
+AUX mailbox-count-0.0.2-ghc84.patch 905 BLAKE2B d786519b6c9bcebd0c2d5719e469b2d3be2553b46ae58878ba47b7720111355b64c31e67f95a84b99dd482e7c88b81426eb35da3938937a030e31e5577cdc290 SHA512 046b2a6a185ee43823bc1b4906d3b3f79a4785e61b2c8c856cf0426dfc3de7dc59be9ab981f5b0a76c2eb4528c6f15a5c4672cb266de69bc299cf0aa4e6e8bb2
 DIST mailbox-count-0.0.2.tar.gz 20644 BLAKE2B 036d118f9c23d42e21de06405d2703e97017f35d618a90e77561d604441092b543a8ba03b50dee5a7c2a48c2b8c0d6e87c06c2338853d9c508de7b6ea9d86006 SHA512 98e39927382719295260c64bd5888244000dbbb3fbd7f6405dcffe78a4fc5f1dea7f8236542e58eb0118bb421c19225a8be0560b92c7688c0701418c7221d569
 EBUILD mailbox-count-0.0.2-r1.ebuild 821 BLAKE2B b9a4977bb2af16c294a8559ab466a568cae6e60192e9a3cbc7e69e590baa0f896d87b52a8e756f17ac47b0fa3b9756a64252a3a0f6cc18f4f0bda55b8c4a630c SHA512 3c6a241379adcc4d4892b6c44cc4bf889816fcaf9d48e9cbc96987f2e729eae734ef1020cb69d67d8042443638370cea44889bd20231f359c7ecd1f5b361ef74
+EBUILD mailbox-count-0.0.2-r2.ebuild 931 BLAKE2B c8d77610209bc30e992e1daa1eac40870c86de575f4fb116fb1a6d77015395fa6f3dec228018c20ce2055dfa97e5c9a78f0fd95fe5bd3fb2bc057df6e996a186 SHA512 207abfda7a3f50a7ee18b44461887bcb5b7680bc29d5fea864d564293ae271158b93261e22e1ebbfd990ed3df0102d7cacdb0861338c92c48e0ffd6ada2fe7b0
 MISC metadata.xml 3288 BLAKE2B 15a60ecab50dad246513c9060e9cf73b4a00c4a6264085357c04461e83a262497780c831823fd54a94d2c2a2b10cd836c51632e24683bbc5d0541d657e383a4e SHA512 95bbd72ec2a640fc2f4d9b67ce8388edbf3b7e01e181bc874fd62d11fabc5858506c35e613bb9215e6732ae4c968ad87df3b93b917cded023691452d0368e8d9
diff --git a/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch b/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch
new file mode 100644
index 000000000000..5257a10a3ac3
--- /dev/null
+++ b/net-mail/mailbox-count/files/mailbox-count-0.0.2-ghc84.patch
@@ -0,0 +1,24 @@
+--- a/src/OptionalConfiguration.hs
++++ b/src/OptionalConfiguration.hs
+@@ -27,3 +27,3 @@ import System.FilePath ( (</>) )
+ import System.IO.Error ( catchIOError )
+-
++import qualified Data.Semigroup as S
+ 
+@@ -65,2 +65,16 @@ merge_maybes (Just _) (Just y) = Just y
+ --
++
++instance S.Semigroup OptionalConfiguration where
++  -- | Combine @cfg1@ and @cfg2@, giving precedence to @cfg2@.
++  cfg1 <> cfg2 =
++    OptionalConfiguration
++      (merge_maybes (database cfg1) (database cfg2))
++      (merge_maybes (detail cfg1) (detail cfg2))
++      (merge_maybes (detail_query cfg1) (detail_query cfg2))
++      (merge_maybes (host cfg1) (host cfg2))
++      (merge_maybes (password cfg1) (password cfg2))
++      (merge_maybes (port cfg1) (port cfg2))
++      (merge_maybes (summary_query cfg1) (summary_query cfg2))
++      (merge_maybes (username cfg1) (username cfg2))
++
+ instance Monoid OptionalConfiguration where
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild
new file mode 100644
index 000000000000..275709ed0d99
--- /dev/null
+++ b/net-mail/mailbox-count/mailbox-count-0.0.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.2
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Count mailboxes in a SQL database"
+HOMEPAGE="http://hackage.haskell.org/package/mailbox-count"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Could not find module ‘Paths_mailbox_count’
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	>=dev-haskell/cmdargs-0.10
+	>=dev-haskell/configurator-0.2
+	>=dev-haskell/hdbc-2.4
+	>=dev-haskell/hdbc-postgresql-2.3
+	>=dev-haskell/hdbc-sqlite3-2.3
+	>=dev-haskell/missingh-1.2
+	>=dev-haskell/tasty-0.8
+	>=dev-haskell/tasty-hunit-0.8
+	>=dev-lang/ghc-7.6.1
+	test? ( >=dev-haskell/doctest-0.9
+		>=dev-haskell/filemanip-0.3.6 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ghc84.patch
+)
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 59ca0c886685..7d1f10173a9e 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,14 +1,13 @@
-AUX 0.29.1-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
 AUX 0.29.2-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
+AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
 AUX 0001-Use-loopback-IP-address-rather-than-name.patch 2100 BLAKE2B c949840e8f25a7730b895aa4bd71003ddbc239dfaeb28ec20158b48bb8de29babb5d6e3badeeee601a1037f080349a57d0a4da5ac9dfe226234fdfc223e60bff SHA512 35ee1baee61d773f9c21ef8fc8f3703347a9cb7a4bbc9cd3fe733dd91cf5c0b06716f25ced78d3d34d9725f0cbd8916a71e415b5d2cbdd58936546a9d09288ce
 AUX 0002-Fix-jobserver-unavailable-warning.patch 813 BLAKE2B 092eaecce7cf8beccb8e314fb818a3af4e5009009ed4d0d1fdfc1a526621f1df386c021d57ec02d6af2b4d98f1738875f054cf32e9a5f4fca310c282f85e6b0d SHA512 f1ffce7811f68e404118ad0147269c8d959d748e2e368d66dfe7eae5e995f1c405daf6ba6f45e9122c7aa249da190e54cd54b7c732a9d122e0c604454a53fce4
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
-DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8
 DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3
-EBUILD notmuch-0.28.4.ebuild 5090 BLAKE2B 8987d5ca0226b9a8093a3e1d0c48cbd24272a4f5aa1e41833ea9cd10cb02fed6199181116700cb0cb025301460397d5cca6300e7c33ddb84aac54c8476c332bd SHA512 971f6d3a84f360f8e4bfe161017fb79c58918610752344dff99bc9872fb303b14e172e2224e52c32130742b1e74e97ec879b5e1b0cef2a7e386b2f7eef4156b5
-EBUILD notmuch-0.29.1-r1.ebuild 5060 BLAKE2B 9c5c20a1fd7fe68f8b72d1908e5f688bb94dfef43140c20788add3588e75010b7ffbd5e873235831ce603f8ee19305b1373fff9167be0e5799393d6b6fdd0bd5 SHA512 5e3cbf9f25359d230c8d163538fab95edbe8b981498d53443a00a758b8f6591a3d50e70d2248dd56955c70050ccc70f187857424d2a2b2c904c31ad3be5072f5
-EBUILD notmuch-0.29.1.ebuild 5078 BLAKE2B 1ce583fa29f9fc24fd6977be64adc74878250c19b9120ab9c7c23e2204c8986b6a73380b9cd36664e51c91af470046c8d0b14049dc494836ba9d4757fea5e176 SHA512 5d3830c6292b98a8c34ef07eb876dab47ed2ff0ec492abbae56b0f28f235a2879931a22868926b2985cd8e28202c736cb104055b766fa651a622730e898a973a
-EBUILD notmuch-0.29.2.ebuild 5060 BLAKE2B 9c5c20a1fd7fe68f8b72d1908e5f688bb94dfef43140c20788add3588e75010b7ffbd5e873235831ce603f8ee19305b1373fff9167be0e5799393d6b6fdd0bd5 SHA512 5e3cbf9f25359d230c8d163538fab95edbe8b981498d53443a00a758b8f6591a3d50e70d2248dd56955c70050ccc70f187857424d2a2b2c904c31ad3be5072f5
+DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
+EBUILD notmuch-0.28.4.ebuild 5118 BLAKE2B 571fb8bf2619241d8b24f1af87d18cd437cedc23c9c340856b512f6df203d2c2f2889c3319ceb01ed841612b887517582e1a28748cf1be572363efc83782c3f6 SHA512 95486adaaa02ce45e4925320f474656f538444ed09d1d8c751b58417f1b91b48c1fcc18aca1e95eb785e49911955a2065d7122b06c3378153626904c24094d38
+EBUILD notmuch-0.29.2.ebuild 5088 BLAKE2B 80999ae44c35ea41913df030e1323a16f25e7db87ff90ee5fee9963b662fdb5bcf07fc6dffa3785d55d8735bb81be5445c02709eb517d6a25e41834be1c290ca SHA512 75e8f6eb068e4811f322513892048872cfd331d3833ac80cd6ba76877b1f0594e6b1b21c0c3eb40ea252273802ead766b0c70121a0f764e22fdda3205197cb55
+EBUILD notmuch-0.29.3.ebuild 5088 BLAKE2B 80999ae44c35ea41913df030e1323a16f25e7db87ff90ee5fee9963b662fdb5bcf07fc6dffa3785d55d8735bb81be5445c02709eb517d6a25e41834be1c290ca SHA512 75e8f6eb068e4811f322513892048872cfd331d3833ac80cd6ba76877b1f0594e6b1b21c0c3eb40ea252273802ead766b0c70121a0f764e22fdda3205197cb55
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/files/0.29.1-0001-Use-loopback-IP-address-rather-than-name.patch b/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch
index e47224695953..e47224695953 100644
--- a/net-mail/notmuch/files/0.29.1-0001-Use-loopback-IP-address-rather-than-name.patch
+++ b/net-mail/notmuch/files/0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch
diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index fa6fbf55ee13..578ec430d1c5 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -26,6 +26,8 @@ REQUIRED_USE="
 	"
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="
 	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
diff --git a/net-mail/notmuch/notmuch-0.29.1.ebuild b/net-mail/notmuch/notmuch-0.29.1.ebuild
deleted file mode 100644
index 951f0faad9e3..000000000000
--- a/net-mail/notmuch/notmuch-0.29.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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_5,3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
-
-DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
-HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
-
-LICENSE="GPL-3"
-# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
-# meant to be binary backward compatible.
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
-REQUIRED_USE="
-	nmbug? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python valgrind )
-	"
-IUSE="crypt doc emacs mutt nmbug python test valgrind"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-3.0.3:3.0
-	>=dev-libs/xapian-1.4.8:=
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=virtual/emacs-23 )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	test? (
-		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
-		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
-	)
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	mutt? (
-		dev-perl/File-Which
-		dev-perl/Mail-Box
-		dev-perl/MailTools
-		dev-perl/String-ShellQuote
-		dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Path
-		virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser
-	)
-	"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
-	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
-
-bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
-		popd || die
-	fi
-
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-}
-
-src_unpack() {
-	unpack "${P}".tar.xz
-	if use test; then
-		mkdir -p "${S}"/test/test-databases || die
-		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -lnsl -lsocket   # non-autoconf configure
-	fi
-}
-
-src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
-		--bashcompletiondir="$(get_bashcompdir)"
-		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
-		--without-desktop
-		--without-ruby
-		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with emacs)
-		$(use_with doc api-docs)
-	)
-	tc-export CC CXX
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_setup  # for sphinx
-
-	V=1 default
-	bindings python distutils-r1_src_compile
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		emake notmuch-mutt.1
-		popd || die
-	fi
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			rm -r html/_sources || die
-			rm html/{objects.inv,.buildinfo} || die
-			mkdir -p ../html && mv html ../html/python || die
-			popd || die
-		}
-		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
-	fi
-}
-
-src_test() {
-	pax-mark -m notmuch
-	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
-	pax-mark -ze notmuch
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		doman doc/_build/man/man?/*.?
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use nmbug; then
-		dobin devel/nmbug/nmbug
-		dobin devel/nmbug/notmuch-report
-	fi
-
-	if use mutt; then
-		pushd contrib/notmuch-mutt || die
-		dobin notmuch-mutt
-		doman notmuch-mutt.1
-		insinto /etc/mutt
-		doins notmuch-mutt.rc
-		dodoc README-mutt
-		popd || die
-	fi
-
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
-}
-
-pkg_preinst() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
-		elog ""
-		elog "  source /etc/mutt/notmuch-mutt.rc"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
index f96e581b17a2..e845830282d8 100644
--- a/net-mail/notmuch/notmuch-0.29.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.2.ebuild
@@ -26,6 +26,8 @@ REQUIRED_USE="
 	"
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="
 	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
diff --git a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index f96e581b17a2..e845830282d8 100644
--- a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -26,6 +26,8 @@ REQUIRED_USE="
 	"
 IUSE="crypt doc emacs mutt nmbug python test valgrind"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="
 	!!<app-shells/bash-completion-1.9
 	>=dev-libs/glib-2.22:2
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index f852149d874e..c28427edab4a 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -2,6 +2,6 @@ AUX offlineimap-6.5.3.1-darwin10.patch 361 BLAKE2B 3331f6bde79b55792d7fbb6d3183c
 AUX offlineimap-7.0.3-darwin10.patch 316 BLAKE2B 3f9adc406881e43462aee6764ef7aafc69a94f7e744722856da04448e68972c9942f8b6a8e4eba84c7fe714be6cc3b7de25424984f21b96df24e22d2eff333ff SHA512 b195392db8e39264891b91c855cc0b1cfeb76e7b0a22281e509c17d4ae07458e980f7810c223f2a835f01f4ba63c1f9592c934121e763bb01846f20c51013186
 DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661ac5061eebfae5796dffb3a6e8767b54138328aa0a8ab5a1745ed0690809965ea76b9b8e66ef250936b0b72cd07e337 SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e
 DIST offlineimap-7.2.4.tar.gz 721887 BLAKE2B f5c7c8eb541167b3f0d46ee71be418d4697f89a1dc11a1c5c9840e5def09d108b7ab391d773dc79e0882ce0a9e21388e11217915112f476d384bf3018d5ea750 SHA512 837f822a08f5df59f5332c65b33e0186c215a633c5c17f08790f4c2128a4f6470a75eb02e883dd592b456dbc0ba2b32f670cb716eb602dd8a6bdf12ba2d72cd8
-EBUILD offlineimap-6.5.6.ebuild 2381 BLAKE2B f7ec4774682b618458484be57ba484d41d4c9df17517ce00ee1c8198a49580afba304d48371dd464d477698039edbfcb47dc93fee20239fa45780a248809b207 SHA512 083714ce7939b4d7c214bcde3e74ac8bb2050406c35f21ef2d5d5d658afbe6bdf84ff1dab87623e1c50c90cab2e7634a3c3590e91599e4217b55be09a1f1f5be
-EBUILD offlineimap-7.2.4.ebuild 1639 BLAKE2B b97d8f3c6249086a47c6d628d055918db8298fedf9c5ba85b67b0df22c4a79456a399a3e247d19fe190537339b232c627b476c2bc8f732051e1e0ea940e98157 SHA512 a4a9177eaae725f07912a733164bf872aca4879cc9adb58ec35b8fb1aa5303279b2af3b1df9d37ae78ac6e8f3a4128fb2a03d14d92db332840240265319441ab
+EBUILD offlineimap-6.5.6.ebuild 2346 BLAKE2B f4cea6677350da94c785a4abcb4b52f0b4bc7acdb041a216a0775dea8bd0680f2b56ead87ebc99163b01a8fd27e6fd46f5043035904f2e5a575b554660e07b6d SHA512 4fef94705b37cc7f84d824a34baeaaaba1497f94f6f8f8bcb838c62aa0077a1f4fdd7d5e059d795b089b9603a0ee77befa8d90f2b604fe44436a0d910a751e7f
+EBUILD offlineimap-7.2.4.ebuild 1643 BLAKE2B d847579f2285e1b76c7eae04d210bdb616f6da87ae123638157eeba6f9239da47595fd7aa1d27cde8f07a9413d8060934303f29e623135933c4edb185f3795c8 SHA512 15567462de5706d735d0a9e17a6ef6648fadbcab97067a36cf2a61ecdedfed955f2ec62afa22aa8fe8e7211d0d231fa852fe10cdc070319b339589ec0bf731a1
 MISC metadata.xml 365 BLAKE2B 44c143951196526dbc7e8c23fe3719a33ecf633361b9aa5294dd4e61c1dd0aecca12159a33c3ef7e0706a5c57162f170559c44c554541754cf5049118c8d89c8 SHA512 ec19d9f99d945536a02dfd7d8c113c6a6337e80190ee60ab172ac9c248398f4faad49aabe4f56e5e4d5eb09ea35810a47ad263b8df59f7368e1f8bed6e780c2a
diff --git a/net-mail/offlineimap/offlineimap-6.5.6.ebuild b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
index 8c7b027d79a2..960a6e04aad2 100644
--- a/net-mail/offlineimap/offlineimap-6.5.6.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
@@ -47,7 +47,7 @@ src_install() {
 	dodoc offlineimap.conf offlineimap.conf.minimal
 	if use doc ; then
 		cd docs
-		doman offlineimap.1 || die "installing manpage failed"
+		doman offlineimap.1
 	fi
 }
 
diff --git a/net-mail/offlineimap/offlineimap-7.2.4.ebuild b/net-mail/offlineimap/offlineimap-7.2.4.ebuild
index 401eb0958288..cb75e15af026 100644
--- a/net-mail/offlineimap/offlineimap-7.2.4.ebuild
+++ b/net-mail/offlineimap/offlineimap-7.2.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
index 05ee14888368..c3c02029a1f0 100644
--- a/net-mail/pflogsumm/Manifest
+++ b/net-mail/pflogsumm/Manifest
@@ -1,3 +1,5 @@
+AUX pflogsumm-bdat.patch 691 BLAKE2B d7d9fef9d668a4f58387ada96505c9174cd1ee0137883969c817357f8c2875c226c44d3f464f7f37b6519104f7b3cdf9a22c5e7c9670732e83663847b3892b12 SHA512 a87606d6b37cfdadb4b6035a941a21d71d7e729fbbdec20df4bbfb9d671baeedef944b2946428979dcfba614929e2556b34e49a931e16903c6c238904c79b66d
 DIST pflogsumm-1.1.5.tar.gz 47130 BLAKE2B ef28092aeee7bdd478c697c58b4e8cc085f47fcd1b59713a3ed1288a646881809177edd5c1711c3dc0e19299dcf2c0d3f7f7eb9623011aa3a1995c8eae4c4f47 SHA512 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
 EBUILD pflogsumm-1.1.5-r1.ebuild 506 BLAKE2B cf4902bf5a79cbf8647e048790d69d65bc323f17ea07c1847ee2b036eb8b27e21fbe01027a1af0b64a7b0e3fc976f196a0cc09aa7d544cc4352b8050005921ee SHA512 ab35cdca59a5b63a9b2db06e3b9d57453e967a82af2290bec8486b7681b28e5a276e2cf7bbb8d1ded777355189d776ff70fe2426c9e3ae531b4e1c1fbaabdaf2
+EBUILD pflogsumm-1.1.5-r2.ebuild 565 BLAKE2B d3001db0d38c04accd780d08d02009bc73d68281c24c0d7080a90bb5f9d5c10163aaa55e8a778b8d8960954ac3f3807b128970a97d9ec469203e0b844e9dd6dc SHA512 b6bac8d1fbcababf5002a6ea893b0f8e730b09822475c22bb3b85a35a76fd3860ae7483b73dc3630f58477ca924c82ade7267a24a6da24fd73cc8060c97b0c5e
 MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/net-mail/pflogsumm/files/pflogsumm-bdat.patch b/net-mail/pflogsumm/files/pflogsumm-bdat.patch
new file mode 100644
index 000000000000..fa27b260ac89
--- /dev/null
+++ b/net-mail/pflogsumm/files/pflogsumm-bdat.patch
@@ -0,0 +1,13 @@
+diff --git a/pflogsumm.pl b/pflogsumm.pl
+index 31de5bd..b3bedf9 100755
+--- a/pflogsumm.pl
++++ b/pflogsumm.pl
+@@ -1650,7 +1650,7 @@ sub proc_smtpd_reject {
+     # Next: get the reject "reason"
+     $rejReas = $rejRmdr;
+     unless(defined($opts{'verbMsgDetail'})) {
+-	if($rejTyp eq "RCPT" || $rejTyp eq "DATA" || $rejTyp eq "CONNECT") {	# special treatment :-(
++	if($rejTyp eq "RCPT" || $rejTyp eq "DATA" || $rejTyp eq "BDAT" || $rejTyp eq "CONNECT") {	# special treatment :-(
+ 	    # If there are "<>"s immediately following the reject code, that's
+ 	    # an email address or HELO string.  There can be *anything* in
+ 	    # those--incl. stuff that'll screw up subsequent parsing.  So just
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.5-r2.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..8f70f3e92a53
--- /dev/null
+++ b/net-mail/pflogsumm/pflogsumm-1.1.5-r2.ebuild
@@ -0,0 +1,24 @@
+# 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 )
+PATCHES=( "${FILESDIR}/${PN}-bdat.patch" ) # Bug 699976
+
+src_install() {
+	default
+	doman pflogsumm.1
+	dobin pflogsumm.pl
+}
diff --git a/net-mail/pop-before-smtp/Manifest b/net-mail/pop-before-smtp/Manifest
index 386b408bfbb7..f121a80ba14d 100644
--- a/net-mail/pop-before-smtp/Manifest
+++ b/net-mail/pop-before-smtp/Manifest
@@ -1,4 +1,4 @@
 AUX pop-before-smtp.init 613 BLAKE2B 3afc3d71e3c21b8f9d6d9066883f90b0b0f2bd0a9bf3934e77a86370872a33cd38ecf3eb0c424e6d7aa81ceaa6cea15348537f7f74da36d50bd0e237dbfcac16 SHA512 5018ab8d4acf4bd58c635f029c32ee691462836da37b75afd7e26873b0f0e94969a18cdbd77e69aeb7aa32e5ab08b2c3b644939799e3601367ab0380423516ca
 DIST pop-before-smtp-1.42.tar.gz 40612 BLAKE2B 44e43be5abf9f1b98ae553f3f782747e5b26a54d03fcaef33b60d05fc757439c6b7c7e00fa972a76bfe0fa4dc7e86751b7f3edd946c209b1fd00a8502ceb22b2 SHA512 54556509dcd51025519deb1253e0860c23e2862061992781c79606af00d6db493a5b3b1ca505f609f6a157918b19e959568dc138cc926f8886bec54cf9b404ea
-EBUILD pop-before-smtp-1.42.ebuild 1046 BLAKE2B 43243147fe12546a684d236e2fc94095e66094031a7b944097ab3019a8fdb01d24f0198cd462342ffb80b018a453316cfc4f6c7a834bedd828072778a3a23de2 SHA512 7278763ed2538654edcff1451a4c204951bb54f9339e6fbbfb8cf470ab1a13bd7b585dd84b0ae6111dd58346fedb842686c455cf14c6d0bcad0a62d5a88e893f
+EBUILD pop-before-smtp-1.42.ebuild 972 BLAKE2B c811c34ca173de1d4dedbe4a3b767993f69709e9c4f978d71f9a819c7b6086289c539b50ba9de6882dfb27ef26eec237810994aa70a4fff604967423464a2acf SHA512 9d6801d41b5ae5f13600c284430d4f064a8a8bf25ac5a84f564765ae845e288525306afea1b16c45480f7c20dbe16397a3fd24eab83a9d38839e53b6ee07da02
 MISC metadata.xml 245 BLAKE2B 3d5de245eda58e732472f2263b8c5fc684e0e08a02785faab3a1000330ba68645ba430d94078b6389416f9c68762281cdc13df617f5ad6f0e6a76723d321834c SHA512 c1ef9f4751b9cc88c5a98477014b5ebb726572a0efc21dfd3e03c9c7d7b895adcc10e4f07025d45e92e86122be408de589128248c866fe26bd8b458810aa0d94
diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
index 89c00b0fa817..4c233e12778f 100644
--- a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
+++ b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
@@ -26,10 +26,9 @@ src_prepare() {
 }
 
 src_install() {
-	dosbin pop-before-smtp || die "dosbin failed"
+	dosbin pop-before-smtp
 	dodoc README ChangeLog TODO contrib/README.QUICKSTART
 	insinto /etc
-	doins pop-before-smtp-conf.pl || die "doins failed"
-	newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp \
-		|| die "newinitd failed"
+	doins pop-before-smtp-conf.pl
+	newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp
 }
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index bdcf5582dbf8..b89e7eaea379 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,6 +1,4 @@
 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
-EBUILD poppassd_ceti-1.8.7.ebuild 1680 BLAKE2B b0ae22e7f2be91092223c055f6f2e775c6383ffffd6934aebd64f9fc187bf4deb79636d2d5ad031ea9ab1d9acc317a2f6bfff9cfcb21f2c5ae425639381159de SHA512 4cb0d8d1ce80429bdf900c3a8eabd4428420e040288fd88f4874336e2e95a8fd11807fb9950c2246b12420c9c9cff790cbf5764a62e34ba8727e3217655bef97
+EBUILD poppassd_ceti-1.8.7.ebuild 1678 BLAKE2B bb77369d9c5ed2ec923a00c5813a16d6c55f92e429d16011d20398ee95f6999137ad3e9f4b43f72d927ec85faf3dcb58cef203e9d4cc4f5f63bc1ba6b4ca788a SHA512 93fc50a9205e0a543e2d9d729b6450a3b736079a83061fd912e491c2d5dd1149658ec2d8d4349ccea6f183f40837b143a724649d8e2a861695126895dc96c521
 MISC metadata.xml 914 BLAKE2B b6b5348eee4b5a213c13a382ae0294a25497fda65f48e8e4cacd327631357101b1509484936dc0fe0935279245b7fcc4cf15e062b333a73e281a7f793d5e016e SHA512 d1e4a0a72c157bb94ac240987b0b568b9212981f7727383eb28995f2f80e2d5f9ac0eaabbf36fd076f4237ebd84ec8e804238f92f583a63e963f1c4a20e4acf7
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
deleted file mode 100644
index 170e89cb3179..000000000000
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs pam portability
-
-MY_PN="poppassd"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Password change daemon with PAM support"
-HOMEPAGE="http://echelon.pl/pubs/poppassd.html"
-SRC_URI="http://echelon.pl/pubs/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-libs/pam"
-
-RDEPEND="${DEPEND}
-	sys-apps/xinetd"
-
-src_compile() {
-	$(tc-getCC) -c ${CFLAGS} ${MY_PN}.c || die "Compile failed."
-	$(tc-getCC) ${LDFLAGS} -o poppassd ${MY_PN}.o -lpam $(dlopen_lib) || die "Linking failed."
-}
-
-src_install() {
-	dodoc README
-
-	pamd_mimic_system poppassd auth account password
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/poppassd.xinetd poppassd
-
-	insinto /usr/sbin
-	insopts -o root -g bin -m 500
-	doins poppassd || die "Install failed."
-}
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
index 2ec3e4e92f26..0e359ed3991f 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/kravietz/${MY_PN}/releases/download/v${PV}/${MY_P}.t
 # added upstream after 1.8.7:
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="sys-libs/pam"
 RDEPEND="${DEPEND}"
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 0524615e9c75..893e231d3315 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -3,6 +3,6 @@ AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d
 AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
 DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.15-r1.ebuild 2341 BLAKE2B f79f4ab948b150e15b21a9e40b5537cf24dab2069d6616a3be2258e55d830cafe7648c085bc78c8e5ab8fb3b6ad48e5f3aec630d4ce0180e3531d8b26251b23d SHA512 8e00182cac1a77768d6eff31ebde4ce59e3d199f788bb6e59eeed181f63e515625ea12ea7bcaa3d2dc6f3ce0e8ef9405d0e1361f03accdfbea0e7c28e07e9a57
-EBUILD qmailadmin-1.2.16.ebuild 2759 BLAKE2B 73689e59456e0f63e6d1cf1c58159883061f851ce392f19e9a6bf3640b80c3d00789e5e328ec774b08de2b722f7f5e567277d6889787ac5a9ad4dfb248952c68 SHA512 606397c31e347fbec59dc3be0199b4b67e5e7b985f0dc3fbeea0bd86b477464286d12a2ea8accd3e5aa7db69f5a5256112d80d726dff8161aa12b2a1e19cb806
+EBUILD qmailadmin-1.2.15-r1.ebuild 2246 BLAKE2B f9222d5410b26e1364bb03998df08fed2a044f2379ad6439f9d6184d87c46d685ad392166867662db6820ddf6257f796f41c0fb682673e8a5d516babd691e64e SHA512 a0eabd6ddfd93a28e23c3058bb3c96e179ca57e766140538c0f98af29406a7c03810dbe4c34b5988377f0040860cd8b32d6abf64ee0dbf791a6ad4a272780ffc
+EBUILD qmailadmin-1.2.16.ebuild 2667 BLAKE2B 9df98d6418ba6e6f378a36954c2c5683f2c2528439771cf4ebc6bae839f50798e4e5515a8df78a3ab729d4fb2201b3dfe194d997a1e01610cdf2a10db47b6d3f SHA512 8ed4fbba0e38a639573746cc4382d4b3156252c7a3f16bf97d9082624934f8776549ae2532c399cf31eb093eae808dad98a53b9d43166bf40f88bf7fe1436a51
 MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
index ddd66ac34bfb..3e99cdd3a1a7 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -1,13 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit qmail eutils webapp autotools
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
+inherit qmail webapp autotools
 
 MY_P=${P/_rc/-rc}
 
@@ -20,24 +16,27 @@ SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="amd64 arm ~hppa ia64 ppc s390 sh sparc x86"
 IUSE="maildrop"
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
 
-DEPEND="virtual/qmail
+RDEPEND="virtual/qmail
 	>=net-mail/vpopmail-5.4.33
 	net-mail/autorespond
 	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+DEPEND=${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-	epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
-	epatch "${FILESDIR}"/${PN}-1.2.15-quota-security.patch
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eapply "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
+	eapply "${FILESDIR}"/${PN}-1.2.15-quota-security.patch
+	eapply_user
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# Pass spam stuff through $@ so we get the quoting right
 	if use maildrop ; then
 		set -- --enable-modify-spam \
@@ -68,19 +67,17 @@ src_compile() {
 		--enable-maxaliasesperpage=50 \
 		--enable-vpopuser=vpopmail \
 		--enable-vpopgroup=vpopmail \
-		"$@" \
-		|| die "econf failed"
-
-	emake || die "make failed"
+		"$@"
 }
 
 src_install() {
 	webapp_src_preinst
 
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
-		TRANSLATORS NEWS FAQ README contrib/*
+	local DOCS=(
+		AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS
+		NEWS FAQ README contrib/*
+	)
+	default
 
 	webapp_src_install
 }
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
index c3001ee6b8eb..95b5cf72f3a2 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -1,13 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit qmail eutils webapp autotools
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
+inherit qmail webapp autotools
 
 MY_P=${P/_rc/-rc}
 
@@ -20,22 +16,25 @@ SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE="maildrop"
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
 
 DEPEND="virtual/qmail
 	>=net-mail/vpopmail-5.4.33
 	net-mail/autorespond
 	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+DEPEND=${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eapply_user
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# Pass spam stuff through $@ so we get the quoting right
 	if use maildrop ; then
 		set -- --enable-modify-spam \
@@ -66,27 +65,25 @@ src_compile() {
 		--enable-maxaliasesperpage=50 \
 		--enable-vpopuser=vpopmail \
 		--enable-vpopgroup=vpopmail \
-		"$@" \
-		|| die "econf failed"
-
-	emake || die "make failed"
+		"$@"
 }
 
 src_install() {
 	webapp_src_preinst
 
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
-		TRANSLATORS NEWS FAQ README contrib/*
+	local DOCS=(
+		AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS
+		NEWS FAQ README contrib/*
+	)
+	default
 
 	webapp_src_install
 
 	# CGI needs to be able to read /etc/vpopmail.conf
 	# Which is 0640 root:vpopmail, as it contains passwords
 	cgi=/usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/qmailadmin
-	fowners root:vpopmail $cgi
-	fperms g+s $cgi
+	fowners root:vpopmail ${cgi}
+	fperms g+s ${cgi}
 }
 
 pkg_postinst() {
diff --git a/net-mail/qmailanalog/Manifest b/net-mail/qmailanalog/Manifest
index f1761f1e9a3d..1d26f4af6d41 100644
--- a/net-mail/qmailanalog/Manifest
+++ b/net-mail/qmailanalog/Manifest
@@ -1,5 +1,5 @@
-AUX 0.70-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b001353b1f5cdc8b5f73d507a8edab3f525b4c1407c02c0c0d11e09e96eaa5d041217da23f92aaef6c03e1 SHA512 1d4c1abde8eb0b4d6dd2254be29b685c922265ededa02a19010bc487e2e2013ef2df9a86a5dd797e0d7a30567cc18ae72324f2a67558633aae76262b2a9681a1
+AUX 0.70-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa59dd78d7a5dbd488c599bd18bc15e3e36e4a50ea156c77614eaa4f507b968b6906699fe40f958cd295 SHA512 0576644a2820a42cac44be9ba564b5043245cdb192a50115bafc871e3306945a657440c7e74d6a83796a33b964269f60ab1b3345b65cdc5ff2342e4f2cbaf9ab
 AUX tai64nfrac.c 1461 BLAKE2B bf9c933a5916c578dfbf9fa3c9a02de188b40e376f545a9706fecaee14fc4270af90f1d1fa7f6b7035b23fb4cf0abf8cb701f17469c7bd95bd232a81ea1d5d93 SHA512 0febee72c3a0328f651134105e6c9c7db1f2822458fa873694cad9807847a9a1bfb7d91a3f7a7ecbb99564515d001e10f2829f70b9a8e768d26764c0ab408be4
 DIST qmailanalog-0.70.tar.gz 28416 BLAKE2B 771a9d9cad36f770c1b9032808a5252e8cada6ebed311272e5d2cf7a34449ec9e59c9c032a1c165103535a6eeca03331f56d8a484c171308c9fee49f8b4b2f12 SHA512 0a4991a9ac13b64494b15a6ad42df1bee273a7a3c5ead923450d5516d747989e80e3a0f88e29203dce24dc833cc3bb46d5935633f67bed547f27ac22ad866f3d
-EBUILD qmailanalog-0.70-r1.ebuild 1274 BLAKE2B 7841b141664a87dfe241afff877d9784d40b475e989120ce7d55a45df927f613d2183e933b3a684a793baf0a42db035ea798f6861884631f4775b54dc479f97c SHA512 d62555a3962ddde1f27a12f86e809f04ab2631094d31966eddeaff187b61ba8bcbe7430f8befbf1044a6bf34f4c412972144f87bc9b52089d36badbcd986789b
+EBUILD qmailanalog-0.70-r1.ebuild 1303 BLAKE2B d0dd17109e237dea41303329eb6400c5a50752cbbcf710718d57f9860aecbac5542f3461bd32cb72f6bea808adf92d984137d42619060d61c0f6c5ffc7e45a76 SHA512 2530613d2e8bba33d29f2b681718b089dc16127a7f2f9cf61659c0c3bf5eb0d66a578b73fa23635bf78166f56d35455ddba8716eac1ec70c455250d09aaca893
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qmailanalog/files/0.70-errno.patch b/net-mail/qmailanalog/files/0.70-errno.patch
index 4aca1b2b4e58..f0cd380019f8 100644
--- a/net-mail/qmailanalog/files/0.70-errno.patch
+++ b/net-mail/qmailanalog/files/0.70-errno.patch
@@ -1,5 +1,5 @@
---- error.h.orig	2003-03-05 15:42:51.000000000 -0500
-+++ error.h	2003-03-05 15:43:00.000000000 -0500
+--- a/error.h	2003-03-05 15:42:51.000000000 -0500
++++ b/error.h	2003-03-05 15:43:00.000000000 -0500
 @@ -1,7 +1,7 @@
  #ifndef ERROR_H
  #define ERROR_H
diff --git a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
index efdab855bc16..5e085af316f0 100644
--- a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
+++ b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils fixheadtails toolchain-funcs
+inherit fixheadtails toolchain-funcs
 
 DESCRIPTION="collection of tools to help you analyze qmail's activity record"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
@@ -16,20 +16,22 @@ IUSE=""
 
 DEPEND="sys-apps/groff"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-errno.patch
+src_prepare() {
+	eapply_user
+	eapply "${FILESDIR}"/${PV}-errno.patch
 	ht_fix_file auto_home.c.do default.do Makefile
 }
 
-src_compile() {
-	echo "/var/qmail" > conf-home
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+src_configure() {
+	echo "/var/qmail" > conf-home || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
 
-	emake || die
-	$(tc-getCC) ${CFLAGS} "${FILESDIR}"/tai64nfrac.c -o tai64nfrac || die
+src_compile() {
+	default
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
+		"${FILESDIR}"/tai64nfrac.c -o tai64nfrac || die
 }
 
 src_test() { :; }
@@ -38,11 +40,10 @@ src_install() {
 	doman matchup.1 xqp.1 xsender.1 xrecipient.1 columnt.1
 	dodoc MATCHUP ACCOUNTING BLURB
 
-	insopts -o root -g qmail -m 755
-	insinto /var/qmail/bin
-	into /var/qmail
-	dobin columnt ddist deferrals failures matchup recipients rhosts
-	dobin rxdelay senders successes suids xqp xrecipient xsender
-	dobin zddist zdeferrals zfailures zoverall zrecipients zrhosts
-	dobin zrxdelay zsenders zsendmail zsuccesses zsuids tai64nfrac
+	exeopts -o root -g qmail -m 755
+	exeinto /var/qmail/bin
+	doexe columnt ddist deferrals failures matchup recipients rhosts
+	doexe rxdelay senders successes suids xqp xrecipient xsender
+	doexe zddist zdeferrals zfailures zoverall zrecipients zrhosts
+	doexe zrxdelay zsenders zsendmail zsuccesses zsuids tai64nfrac
 }
diff --git a/net-mail/qtools/Manifest b/net-mail/qtools/Manifest
index f9e057909d7e..1fc24b0d20c7 100644
--- a/net-mail/qtools/Manifest
+++ b/net-mail/qtools/Manifest
@@ -1,5 +1,5 @@
 AUX qtools-0.56-errno.patch 291 BLAKE2B c204bc9a9c210b849f9a4978a7f19e94ecb9e46991a710dd58d9375b332e062f527b6ac274f9c2bc6d1037395e0f17afd920927400c4f72997e491c90b434770 SHA512 ca8fc0fc14724a1dfc9931e24071f0b72ba8bdc3c13c3dc84a597b73e92541043526a288ceb2e260dfb8ab8ce4f970b6505b323458817e499188cc4c6680ba22
 AUX qtools-0.56-head.patch 2117 BLAKE2B 2d0468547e2d67b65be1a8448c9b89f2e2a4ee307a79c47957f465d20671b947ef322af65ac94185cd39a9d98450d517d715c25f182eaab184286cda3d9685bc SHA512 0701bfa739cb163f4463b5ffb1a0242027400fd38e27e2533915f2698712177421f38d9d5b7a02caf1c23ade31bf02ce9236f18e522b688b6adc71af15b32a87
 DIST qtools-0.56.tar.gz 37748 BLAKE2B f4bb79259d2ceb99f21ec87dcc8dac6dca740a9bb1fb723f0393384996e51cdd0a56b92c066161dbcd75adf6d1e008041b5bfdf4abe7534279f504ed2c318111 SHA512 2016ca4f77fc370f6caac56f447325461018dff1f8a61fad305744578f0c26f0495c26d6cba6a8a9d5c86c6ef86635edd69705e9af88f70477a3f6ed121e6085
-EBUILD qtools-0.56.ebuild 1152 BLAKE2B 715cd8c69088fa24f6422702b1f4ec5469c421aa69145cc3ae1361a043956d99e9ebef9b7b7498c3e592c7bdb786d00ec01aedb61076104ed65f52e35aa4d639 SHA512 93675737debc6a1a2d97578f759d5c79a72bc10c1ada2a1e8fcf89c0fbb4406e0928c225bee75d95427424fa9b89ece8ea24b10e23c79addcb8f5f6a1e22b506
+EBUILD qtools-0.56.ebuild 1076 BLAKE2B 976f40d338bee88313856a7d4948099df3825c8f0c8c5bb1087eaf5b5cd7b0cf0bfb667903239e806d8b2a2ea5651114abf20d59b5329840a7f0082a27ba310a SHA512 c383d5433c61f78151b2d4aac0947d037dc8900bf523aae6db479b6229db761f3d09648a02049d54d6141064721537223d65fa5df5cb4bf02cfe85ad376b7893
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qtools/qtools-0.56.ebuild b/net-mail/qtools/qtools-0.56.ebuild
index 7251ba3d40ef..b5c83062f98b 100644
--- a/net-mail/qtools/qtools-0.56.ebuild
+++ b/net-mail/qtools/qtools-0.56.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=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Utilities for use with qmail, typically as part of .qmail command processing"
 HOMEPAGE="http://www.superscript.com/qtools/intro.html"
@@ -15,28 +15,24 @@ KEYWORDS="alpha ~amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-errno.patch
-	epatch "${FILESDIR}"/${P}-head.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-head.patch
+)
 
-src_compile() {
+src_configure() {
 	use static && LDFLAGS="${LDFLAGS} -static"
 	export CC="$(tc-getCC)"
-	echo "${CC} ${CFLAGS}" > conf-cc
-	echo "${CC} ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
-	emake || die "emake failed"
+	echo "${CC} ${CFLAGS}" > conf-cc || die
+	echo "${CC} ${LDFLAGS}" > conf-ld || die
+	echo "/usr" > conf-home || die
 }
 
 src_install() {
-	into /usr
 	dobin 822addr 822body 822bodyfilter 822fields 822headerfilter \
-		  822headerok 822headers checkaddr checkdomain \
-		  condtomaildir filterto ifaddr iftoccfrom replier \
-		  replier-config tomaildir
+		822headerok 822headers checkaddr checkdomain \
+		condtomaildir filterto ifaddr iftoccfrom replier \
+		replier-config tomaildir
 
 	dodoc BAPVERSION CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 }
diff --git a/net-mail/relay-ctrl/Manifest b/net-mail/relay-ctrl/Manifest
index c38081f9942e..f4d73dc4cee8 100644
--- a/net-mail/relay-ctrl/Manifest
+++ b/net-mail/relay-ctrl/Manifest
@@ -1,4 +1,4 @@
 AUX authenticated.c-relayfixup.diff 702 BLAKE2B c597a6dbf6fc7161caa769aafc3938bcc5ca14ac6ef3da176b04dbf62bb7832059816e603f9600394cbd7225d1c5d9ec30829f41a4b00da3d0e9d2ac6805c60e SHA512 2515f2b5a43e5bae900ef0f419d7f9fb95953e39ebaee524efd8952e0764d82507483b08279866426cd84c6c8524a57cd51b8cf439a6dfbfca3da3e5d3fb0089
 DIST relay-ctrl-3.1.1.tar.gz 35046 BLAKE2B 91e4ce0f1f6ce5933f64e0d60407004d409474180f42bf40632bdb3bce1f3f974abdb597d34ab7ee4113e041323bd55965ce57f271fe79cfb8c56972fe8612b4 SHA512 738a001f6a058809955f04664919f261ff1a0bfc280ec5e805b870baf448b27664e1b376dd078100a2847e38248eb16651e23812f00609a437893e7b1dc9102c
-EBUILD relay-ctrl-3.1.1-r2.ebuild 2045 BLAKE2B f74e8c277f235e1f9f9cab0aa164b4a44516d85287f073717915b5d2442feb202a18056ee3336e97a50470c2b02ffc1038bbd85052e86d7a26ac12effae973cc SHA512 53cf00e0c9b101c2b0032932f7caf82c26631a2220e1242a0ab3fa2d11ed66026e94d6990d9c65caae78f2ab89dfacb894b4923933641d979adc3e65cc95f71a
+EBUILD relay-ctrl-3.1.1-r2.ebuild 2094 BLAKE2B 30a58a02ba1c68387251dafd38eb942aaea325224ae97f6b50a70c8d4ebdab3f18720c634afcb9fb004ec2ed1453ae672a6fe300a7dd8d654435cbf30ad8be40 SHA512 cfc96e7dabc169c21d7bf64a00e51a8a8565d16f13e4a59cbadc5508243d9d514b4e8d5dffb232fd29392e5132cbed787e2d586eec460dd4359e7ab0da84bb92
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
index f953a7df796b..9a9a53077df7 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.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=0
+EAPI=7
 
-inherit eutils toolchain-funcs fixheadtails
+inherit toolchain-funcs fixheadtails
 
 DESCRIPTION="SMTP Relaying Control designed for qmail & tcpserver"
 HOMEPAGE="http://untroubled.org/relay-ctrl/"
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="sys-apps/ucspi-tcp
-	 virtual/daemontools"
+	virtual/daemontools"
 
 RELAYCTRL_BASE="/var/spool/relay-ctrl"
 # this is relative to RELAYCTRL_BASE
@@ -24,20 +24,19 @@ RELAYCTRL_STORAGE="allow"
 RELAYCTRL_CONFDIR="/etc/relay-ctrl"
 RELAYCTRL_BINDIR="/usr/bin"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	eapply_user
 	ht_fix_file "${S}"/Makefile
-	epatch "${FILESDIR}"/authenticated.c-relayfixup.diff
+	eapply "${FILESDIR}"/authenticated.c-relayfixup.diff
 }
 
-src_compile() {
-	myCC="$(tc-getCC)"
-	echo "${myCC} ${CFLAGS}" > conf-cc
-	echo "${myCC} ${LDFLAGS}" > conf-ld
-	emake || die
+src_configure() {
+	local myCC="$(tc-getCC)"
+	echo "${myCC} ${CFLAGS}" > conf-cc || die
+	echo "${myCC} ${LDFLAGS}" > conf-ld || die
 }
 
-src_install () {
+src_install() {
 	exeinto ${RELAYCTRL_BINDIR}
 	doexe relay-ctrl-age relay-ctrl-allow relay-ctrl-check relay-ctrl-send relay-ctrl-udp relay-ctrl-chdir
 
@@ -52,16 +51,22 @@ src_install () {
 	dodir ${RELAYCTRL_CONFDIR}
 
 	# tell it our storage dir
-	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR
+	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \
+		> ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
 	# default to 30 minutes
-	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY
+	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
 
 	dodir /etc/cron.hourly
-	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" >${D}/etc/cron.hourly/relay-ctrl-age
+	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \
+		> "${D}"/etc/cron.hourly/relay-ctrl-age
 	fperms 755 /etc/cron.hourly/relay-ctrl-age
 }
 
 pkg_postinst() {
-	[ -d /usr/lib/courier-imap/authlib ] && ln -sf /usr/bin/relay-ctrl-allow /usr/lib/courier-imap/authlib/relay-ctrl-allow
-	elog "Please see the instructions in /usr/share/doc/${PF}/README for setup instructions with Courier-IMAP and Qmail"
+	if [[ -d /usr/lib/courier-imap/authlib ]]; then
+		ln -sf /usr/bin/relay-ctrl-allow \
+			/usr/lib/courier-imap/authlib/relay-ctrl-allow
+	fi
+	elog "Please see the instructions in /usr/share/doc/${PF}/README"
+	elog "for setup instructions with Courier-IMAP and Qmail"
 }
diff --git a/net-mail/renattach/Manifest b/net-mail/renattach/Manifest
index 559ab002c60a..17647b057f68 100644
--- a/net-mail/renattach/Manifest
+++ b/net-mail/renattach/Manifest
@@ -1,3 +1,3 @@
 DIST renattach-1.2.4.tar.gz 112566 BLAKE2B 566675e22b35857f3e328cc3f70805b5ce74e7c156f3bfd3aec7d1b217818763b3e12ea5c4c575e98962db2a23cfcf3672348aca321dcb754c907f59fca728eb SHA512 f46aa714d794e8b1c7ff98c1a4210ed9cb83cfa6811d1724c782f25c4c250ab22dd9ff98966e821559cd0f6781ecd491bc2c260cd8f4ff64f678ef59b8cb4ad6
-EBUILD renattach-1.2.4-r1.ebuild 520 BLAKE2B 47497ed3af2df0746ffd68df1f0ef15eac5e699b2a3973414d7c15b4a595efbcad73e280a1dac2b296e44bc58f2c6bcc29a13953ca7f99386c6dd7c65d2b8e15 SHA512 b9794d11def726cb792ebbba7b439cd2c3633af06bd437d676d691152f6be2611297cd12ba3b127e647400f8dfa1e32763855ed6cc278a377f33172fc85c511c
+EBUILD renattach-1.2.4-r1.ebuild 506 BLAKE2B 013fa070103a918fda5c3a2e73d287368143610471a00aaebd2e3fe1b03efdb063447993587712a7f702e54b2bfa3db5bb50ac21d64d5c369be8cd61a74d1a71 SHA512 d84eada2746a4b9f2c9fb8b8959e9b1642b6c3bca179cb8d51ebe7eb813d10030c92b081c28858a5b75858faa72e5af55934b4417d5df2b503771059d2ba0ef8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/renattach/renattach-1.2.4-r1.ebuild b/net-mail/renattach/renattach-1.2.4-r1.ebuild
index d89611b23f15..229c8450c7cc 100644
--- a/net-mail/renattach/renattach-1.2.4-r1.ebuild
+++ b/net-mail/renattach/renattach-1.2.4-r1.ebuild
@@ -13,9 +13,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_install () {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	mv "${D}"/etc/renattach.conf.ex "${D}"/etc/renattach.conf || die
 
-	dodoc AUTHORS ChangeLog README NEWS || die
+	dodoc AUTHORS ChangeLog README NEWS
 }
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 2887fbfdf7a6..8854b72dfcf1 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -4,7 +4,7 @@ DIST rss2email-3.10.tar.gz 64230 BLAKE2B 1f41b47c9d48be0c8eff9c4223b1bddcee73956
 DIST rss2email-3.10_pre20171001.tar.gz 162385 BLAKE2B 91ae17c43cca616750139b6d559fcfff50be682f70a932ae3e1e281c2a1ae0c31419d37ce7d8887b72873359f0ce29dfb03a1a7c19cfdc2fc945902110b6a3a1 SHA512 d0174489b1d5be9f18e720351f994a87ac0d6131fd23914deb1305223a022e3a741cf279c68c533e8dfe99112af334223354dcd145b38c09e32e16e1a80898ff
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
 DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
-EBUILD rss2email-2.71-r1.ebuild 1607 BLAKE2B a0e69e478f16725053bb8bfdc195c4be5165dd5039a4a59cccb39886ed4914cb690428b40e920978f9c3111389e4c819fa9e6110bef3af65eaa45195fba9b401 SHA512 e35e6f5cb45092227df9d25456ab79d56922b5208d0875fef35f6ae4f1536e33619ab4d1473a5c8cc01854bdefcd574cd915a87fba171e73feca08dbe11b2bec
+EBUILD rss2email-2.71-r1.ebuild 1579 BLAKE2B 65ba774e855288a8c949c7e401311d7ce65c905f7bcc3406ed639eb13655811c050f67643635381d72fa0969397bf6cfdc82ea7f0522a3dd81d04afffd3e62b3 SHA512 5eab69777125d94098a8df7b2bb4ab65b885e37743a4ba734cc4008852180f1ca6fe8fdb87e94a0e0497583636560e9777ce29138acc097d9db2dd018a4f775d
 EBUILD rss2email-3.10.ebuild 861 BLAKE2B 9f5d398489d761afa3ad3eca70cf814b8417bf48a3c2787e0cec6a05cad409d1bb7928a9d8e518ce13d59c92b388b3be211f83a33795319dc27af97cd759d21f SHA512 e090b36d7e579feab70de7b48d1db13f153521ff4ccf04a74f1272db2697786ebef3c6387f3ec826d7e18b37653d1f44f58526e16c2e6868d726a6156ccb09a0
 EBUILD rss2email-3.10_pre20171001.ebuild 772 BLAKE2B d857de7cda75d2b8dee0754fb38766f6de250ca1dadbb9b3f89e7c40b352cd4abc16887919a0f5c82ae1511a15df2647580393ba9d649aa9024e2976c3262978 SHA512 ae9f03a4b150d80be8082d063b2d55b6e8e7d3c0cca9b0531a82191d79f596ed16fa9cb80bf7855c091ec06e3eecd33f31a3977a65355b310ceca743a904d29b
 EBUILD rss2email-3.11.ebuild 766 BLAKE2B cdc3b6267366f764faa2880b2f5e82f45a220a398f4de0065760b422c180ad697c702853c7155d1952121709ac3e4d1082860fe94f611d3a73d813305504ed49 SHA512 d4b9ad6595c2b33eb7ca08df9c3bc3be5b190ef7752b4238b4ff899a9076bdbdfe043d22781b132369c483e099758d23144834db3790399882ad47417dc7b642
diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild
index 1fbb40b32186..215277e290fb 100644
--- a/net-mail/rss2email/rss2email-2.71-r1.ebuild
+++ b/net-mail/rss2email/rss2email-2.71-r1.ebuild
@@ -50,10 +50,10 @@ src_install() {
 	python_foreach_impl my_install
 
 	insinto /etc/${PN}
-	doins config.py.example || die
+	doins config.py.example
 
-	dodoc CHANGELOG readme.html || die
-	doman r2e.1 || die
+	dodoc CHANGELOG readme.html
+	doman r2e.1
 
 	# Replace r2e wrapper
 	cat <<-"EOF" >r2e
@@ -64,5 +64,5 @@ src_install() {
 		exec python2 "${SITE_PACKAGES}"/rss2email/main.py "${CONF_DIR}"/feeds.dat $*
 	EOF
 
-	dobin r2e || die
+	dobin r2e
 }
diff --git a/net-mail/sendEmail/Manifest b/net-mail/sendEmail/Manifest
index 910529595426..c0c83b498c5e 100644
--- a/net-mail/sendEmail/Manifest
+++ b/net-mail/sendEmail/Manifest
@@ -1,6 +1,6 @@
 AUX 1.56-overzealous-verify-mode-check.patch 683 BLAKE2B b3b6de3432516007c7c6c8410d99bf51faa36d21b25b60217c1fc5302a21706980cc90e0b0d4f9d12aac3d03850a329cbedb1bf972d49f4972518ebc3063ff7b SHA512 472843ceaf90fb427d626abc4b8484b279d8613ccd39a57a72f689da2f73615a3080a22322ad5cd95d7a8ae10eede7fdb7b51246d810ad066a52b6d2f1498cd0
 AUX 1.56-overzealous-version-check.patch 668 BLAKE2B c05d17287b8b8960022d495769cb459a01af66f09b39ccdcab3a21f5b22f1a2fd78f65643d435614d0a3a5fc87c9ab94d3b5c53c6c45ddc4c22aee5a1cccae18 SHA512 51d43760d0f6bf8905a0c82a5e0a44035246a332e00ae472e3b37725e29fe461beb808f4d74542659e1a7998fbde30c24d4156770058d914b1c08934d5d6884c
 DIST sendEmail-v1.56.tar.gz 29740 BLAKE2B 443e80e0dcc500f8fed843749a504a0064f3cec9845cbb6d40e6c49d5a29dbf1874e2e03bbfaf6d511049addd9b3ed26170143dea966087575ad0ab61874c50b SHA512 0ee208857d6ffa4b9e0eecea0a94decf6d3935041fad23a084fba195f2016a18f3409086eefa8c35fb5dd01697eb29e4af0607754bf1c52bef727b8b670242fd
-EBUILD sendEmail-1.56-r1.ebuild 670 BLAKE2B d18c2dd11f7de6841ee14cd0b874a4f099a77c2b636b6e0c536746e3c36c1e5a3301275fb85639570cf05ee465b612a9d19af06a56e3b602a91dd5db52018228 SHA512 2562b5f8a99943bc60c629e508d03e01afc72cdd963bfb2e9c8567f23b3179986985371bd5e9fce3438c5ff9e6bd3f3615aa688fa6a81b036b503cf950956ea2
-EBUILD sendEmail-1.56-r2.ebuild 729 BLAKE2B 1e60a3ff11577e335b33a9102befe5fe5f9100145c54408fd466bca8cd2275a60d2573b101cd9bdd2e0fee3a7c15b8e856c58674ca1590d221774b1735942ba6 SHA512 38ae9913a053deeabbd4450b91df03d2f801d3cad8036d3bd0184b364f858cad8b81786e95ea51dccd9c654a84a567a0dd17755a7bf6d6de093d4267070c5024
+EBUILD sendEmail-1.56-r1.ebuild 626 BLAKE2B fdf6f94ba202217a5cde09328fb66172db6d5021904700248ff5a7755065139f809316f1414d895c44ae5eef887707f985306b56767525e366ae7352c3f126f8 SHA512 2202dcf199c12594e4b8bf77a3e4e7eeb8ca24075249d8f16fca6e6bfa99f5e3382e799c100c4eda0d6b0874a20ec50c0f22e4c93d0ebe199e8f80be3dd1865c
+EBUILD sendEmail-1.56-r2.ebuild 685 BLAKE2B 2c545aec355b5630b954b901c274c7bc60819a7e3ea695e01f55424839aba4ede354f1bf2ca061ed4a3e9d67074788600a9418d71fc31505c729fc0f2753327b SHA512 a6a295c2e1d232e8fbbe9a73b3b3235c1f75a89aa8aa395fbd7b8fda3c4b8e8b21bd28727a590f4fe22b6a19edfd3824bc046aeb044ac82139793ecaefd0b4c3
 MISC metadata.xml 689 BLAKE2B db187f3a6d6dcedcaa0663b47292173ba69945905800205b7a9e9b468e2313c9ce1c69f36ceb6ad838d47073158d5781b5836f4b3f5b42f3fb7200c957c461cf SHA512 61fa434f59304fa18e844d02a363c5fa68e33755108523f9dc27ee9cb7199bcc69113c37d1fb3c5e6503dc36614b75d00aa38a20aec46a39d0577e4965352ea7
diff --git a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
index 65f4ff4912fc..acc2cc71391d 100644
--- a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
+++ b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
@@ -23,6 +23,6 @@ PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" )
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	dobin sendEmail || die "failed to install sendEmail script"
+	dobin sendEmail
 	dodoc CHANGELOG  README  TODO
 }
diff --git a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
index aaa924980ff6..8b8af8e7a317 100644
--- a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
+++ b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
@@ -24,6 +24,6 @@ PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch"
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	dobin sendEmail || die "failed to install sendEmail script"
+	dobin sendEmail
 	dodoc CHANGELOG  README  TODO
 }
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
index 8e11e4166627..717050e14016 100644
--- a/net-mail/swaks/Manifest
+++ b/net-mail/swaks/Manifest
@@ -1,4 +1,4 @@
 AUX swaks-perl-5.18.patch 2139 BLAKE2B 03501cda36503a966a1d1d50b94b054d2aaa1584566a64a7e393e4d81fd0f8e456734e0b787723e7aec5caa55b08ab264da897b7bb8ead351250c7402e73e361 SHA512 f5d507e2b2812776f4a35e66a3ace3a9edb3d3c50fc7734304d48a278aa7c3fe725f363d14c61442d11a07e8266bab8ce486c4c9eaae2c5ec7e93484c5ffcb53
 DIST swaks-20130209.0.tar.gz 102227 BLAKE2B 4726da81869e137458f1a3776c51ae33215999bef56b1835cf8558166bd756a8186900b83c0bf32a81d1ab1cf23ec379061f4db78ae5efa51de7a6c1a69d0092 SHA512 bf3c639f2c227d8219d5bc98a3d3519886471168c16e38d036283eeb1bb786c80bb80a648637150b3eb1903ef0c0d01bc37fd7b4f55af66a20f7bef18067b118
-EBUILD swaks-20130209.0-r1.ebuild 1010 BLAKE2B 6a5ec222698c1e10d71798b33b7340a62d130dad67e02442ce4e3365b7727f69767f07dca19360a11477b97b1db57c8fc857e552d9fc9700e1b1038de85722c9 SHA512 9ef336029b8e2d2e7f3f10726e2f96d7dfca90b4fa6896e9dfb0e8de59d3c0397c9bc680802d32a33693ad378c1850d5b39254223d30fd0e4c4f1f102ee82002
+EBUILD swaks-20130209.0-r1.ebuild 973 BLAKE2B 916ee1b50772d67a8453a5745a78da399c7868a11bf33fd9fffbc00295419950d45078e4fc5e3b66d439d32d7289059c40d367b12ac846404931587e212f5c81 SHA512 071d817f0d8b8e60be7c0c012baffbbfd99a1ff717351a750bca7e7fe539c886290c164965f2632f441181f84ca40990ef728fa4d7f08f7abdb25cce2ff62378
 MISC metadata.xml 332 BLAKE2B b960f18e2b0a3a2af9ad3d3658677a1ed89791a26b08be6c745c45e7c0464ade277706d13f3ab764b1b5e733288ef64f3c495286a6e2b4603f0887aa366181c1 SHA512 ae2b76541ea3053071a4cb76f4e423174333cd0666e8606818c2ca7d7f3ab8263bc4b42c781af64fede626f8e665fed7b7ca23c651ddf75c9f5c1a8839becf94
diff --git a/net-mail/swaks/swaks-20130209.0-r1.ebuild b/net-mail/swaks/swaks-20130209.0-r1.ebuild
index cfbd70a84663..069127b07c96 100644
--- a/net-mail/swaks/swaks-20130209.0-r1.ebuild
+++ b/net-mail/swaks/swaks-20130209.0-r1.ebuild
@@ -35,7 +35,7 @@ src_compile() {
 }
 
 src_install() {
-	newbin swaks swaks || die "newbin failed"
-	doman swaks.1 || die
-	dodoc README doc/*.txt || die
+	newbin swaks swaks
+	doman swaks.1
+	dodoc README doc/*.txt
 }
diff --git a/net-mail/vacation/Manifest b/net-mail/vacation/Manifest
index 63af6264d25f..f172ecb71d7c 100644
--- a/net-mail/vacation/Manifest
+++ b/net-mail/vacation/Manifest
@@ -1,3 +1,3 @@
 DIST vacation-1.2.7.0.tar.gz 63849 BLAKE2B d2f2737677b0fe075041bac0a32b6f5f57d072040448b61416e7fee98e7d4184bbd22e25734ed5e4deeabb0d0c32953821d383c9d16cf79b325fa7f261956333 SHA512 50473777fa5d36c1b7ab438e1072a56298f8155c7aaa8f8d8daaa1dee5f85f54a7b17903c416e67dbac734368b1cdbbc599cd9aa58132b0ecb145ae8e058e97d
-EBUILD vacation-1.2.7.0.ebuild 853 BLAKE2B c6cafd7768e1cd844d9b4c7b97a03914278d6dc200a667a48647866fc87a96b793f01c146f2a776d221d5fad92a97afde61b9c1de6e3b5e3b14af181201b6f7b SHA512 18db109406292bcaecd4f677c5761d3eea36d4398b445850b88a12cb8de987b9f9518c4db0354ff46bf82b819b7aecc9d9bd391bb895b68088f27fed2bf61b7a
+EBUILD vacation-1.2.7.0.ebuild 683 BLAKE2B f82fdc4a3a3f25949694b8ad41b30d0a5a2abdd0ef6fc5bc453b363b395d39f890a8430cd503e365f0753fdafe29bbcf4d0807d3bc9c441356cefc9407e338f0 SHA512 33690a825953a6f9d6a3328ba7e2ec3ce0e27250cc8d41a5574aad96eec5a028c823b016af0bc267298f5b493e3c91755d9230747fa1ff9b0cae00d5570278a1
 MISC metadata.xml 250 BLAKE2B d0daf7c0246f1ceb0d3323e9c0a24dcd85198cbd2a1cee896efc79add248a7ecd4d84a47d82d4681d44adb831285c82aedab58d1ad4aff0337deaf39c8df5de3 SHA512 eb1ce5a9aee93887dfd2e2492529a60e4b95b9dbf2dd1bb49cfa4cc00cc1388fe8c2d7f0c51a9155df1b0f7f04035aca2e3320ead405517e3da2d34914515c1e
diff --git a/net-mail/vacation/vacation-1.2.7.0.ebuild b/net-mail/vacation/vacation-1.2.7.0.ebuild
index a564b6285344..89462f5392f1 100644
--- a/net-mail/vacation/vacation-1.2.7.0.ebuild
+++ b/net-mail/vacation/vacation-1.2.7.0.ebuild
@@ -1,38 +1,34 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="automatic mail answering program"
 HOMEPAGE="http://vacation.sourceforge.net/"
 SRC_URI="mirror://sourceforge/vacation/${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 x86"
 SLOT="0"
-IUSE=""
 
-RDEPEND="virtual/mta
-	sys-libs/gdbm"
-DEPEND="${RDEPEND}
-	!mail-mta/sendmail"
+RDEPEND="!mail-mta/sendmail
+	sys-libs/gdbm
+	virtual/mta"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
 
-	sed -i -e "s:install -s -m:install -m:" Makefile
-	sed -i -e "s:-Xlinker:${LDFLAGS} -Xlinker:" Makefile
+	sed -i -e "s:install -s -m:install -m:" \
+		-e "s:-Xlinker:${LDFLAGS} -Xlinker:" Makefile || die
 }
 
 src_compile () {
-	emake CC=$(tc-getCC) ARCH=$(tc-arch-kernel) CFLAGS="${CFLAGS} -DMAIN" || die "emake failed."
+	emake CFLAGS="${CFLAGS} -DMAIN"
 }
 
 src_install () {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	emake BINDIR="${D}/usr/bin" MANDIR="${D}usr/share/man/man" install || die \
-	"make install failed"
+	emake BINDIR="${ED}/usr/bin" MANDIR="${ED}/usr/share/man/man" install
 }
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index 60d23e8f9755..f91c30918315 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 291 BLAKE2B 2d02039a95ecf734d6dd284fcd65911c9f38db8a2165d1bd4289a9927a3a3c847a99991c1301a5d6d9d485ccd06794dddf73f57dabee47dcb3ed01ff9a0f7f72 SHA512 27c4b4314b29547e3a485340086186c31d0d5ede249631738227ffdecd64c500baf7c3ee6852b02e18176376f0717c35ad3445b5a2bc684e82772eca27be2786
 DIST vqadmin-2.3.7.tar.gz 153678 BLAKE2B 3906c449d89e2747d10b9a4afdce14da7b41fdaca760d41b0374bfdd6a8dd2f756597b4bbdabb4d03b89806936e1550f069b7675dd2ef7486f235e497191bf94 SHA512 c427dc4b1e30926b0d3774bd0d296bf78a98037c566a82fa790f7a25d1fac64a80172498fd6342e93514108e42fdec0ebf1a76029546e43100ebcae5b845ef88
-EBUILD vqadmin-2.3.7.ebuild 1386 BLAKE2B 71a7b6f8fdebf9d97575466a41578dc5910c3261439352dc47f84734a715c892fcfe88c845e4d5face3626cffa38d813e41ae2dcd4ec7ad6c874bd5194b32f62 SHA512 8892ed129d7b5f9354b2686288bef513926275e3a645fc81322802b596eb1796b96185614b055e98ee0c219e5920b2cdd0c215613660ea42bf1e1f59561a7791
+EBUILD vqadmin-2.3.7.ebuild 1284 BLAKE2B f2571d4917460b4cd228f2e017e3be490c95c31d16fcf37ea6f84e04c54e014359c1e9cb9697c70cced17a45f98004ba96f6aa3a0c4fe621e0345ddabc79dde4 SHA512 aa6c5d2549605c30ad235fba49cac03069a95895d540aef11386510fbc70bd77dc4c40cc2880a0bd3d77b966b3028fe0862fb9fb07c72464a9ba441f7f045485
 MISC metadata.xml 357 BLAKE2B f681f656d61cbf1c78616f26f8746b29a5f76234344fc9b79e29b5f83c91829385751301bcde12dbb12e16e476ecc69e28ef4144c531829bc4432ca8e41fd667 SHA512 82473567cbefa523ec0fcee697d7b5d30b184dedc7a73fa6e49a7958a3355ba22118d572908c3ceffecf821b234053310e56e5f2b4f6e7fd66c9a23248974791
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
index 71d0578aaaac..50516805cf56 100644
--- a/net-mail/vqadmin/vqadmin-2.3.7.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit webapp eutils autotools qmail
+inherit webapp autotools qmail
 
-DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin"
+DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains"
 HOMEPAGE="http://www.inter7.com/index.php?page=vqadmin"
 SRC_URI="http://www.inter7.com/vqadmin/${P}.tar.gz"
 
@@ -20,9 +20,8 @@ DEPEND="virtual/qmail
 RDEPEND="${DEPEND}
 	net-mail/qmailadmin"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
 
 	# fixes for sane webapp integration
 	sed -i \
@@ -30,18 +29,15 @@ src_unpack() {
 		-e "s|/images/vqadmin/|/vqadmin/|g" \
 		-e "s|/cgi-bin/vqadmin/|/cgi-bin/|g" \
 		-e "s|vqadmin\.cgi|vqadmin|g" \
-		*.h *.c html/*.html
+		*.h *.c html/*.html || die
 }
 
-src_compile() {
-	econf ${myopts} \
+src_configure() {
+	econf \
 		--enable-qmaildir="${QMAIL_HOME}" \
 		--enable-vpopuser=vpopmail \
 		--enable-vpopgroup=vpopmail \
-		--enable-cgibindir="${MY_CGIBINDIR}" \
-	|| die "econf failed"
-
-	emake || die "make failed"
+		--enable-cgibindir="${MY_CGIBINDIR}"
 }
 
 src_install () {