gentoo resync : 18.11.2019

33 files changed, 642 insertions, 268 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 36703e7bac04..0d73a7960914 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/checkpassword-pam/Manifest b/net-mail/checkpassword-pam/Manifest
index ad10d1764432..64d3e636051b 100644
--- a/net-mail/checkpassword-pam/Manifest
+++ b/net-mail/checkpassword-pam/Manifest
@@ -1,4 +1,3 @@
 DIST checkpassword-pam-0.99.tar.gz 83751 BLAKE2B 398344f6ae8556a40db2d217fe38d20a6f0159bbc7750c3d4c115ca6a383dbfa9018af1f0f5404b34b349e998093307de333434ea0b9b176a9491a48f4d5c044 SHA512 d7c9cbeec7fb15c07dcc3c6e6b7f38884bdf0fd2fe31d3a38b2f6f58deec57716b5d65387b03cb858c1bf5fbb5dce88e0451bf1b866b88fbc17165100040baec
-EBUILD checkpassword-pam-0.99-r1.ebuild 437 BLAKE2B e6bbd35708827abf1da5aec1349980c7bdcf7f329be11c888da7e25360df341273cc8f0be10651c0ef70214f421dd78497ec4b2b7f7c146546d8cd1e4c15de6e SHA512 8278b572a0ceb90dcf60a3e336b34815bf4c730b8b34f2437851976d7744813916ae0133b88791daf32240f1408feb682967db3148a8ea037770e915fb16c5ee
-EBUILD checkpassword-pam-0.99.ebuild 475 BLAKE2B 95cefeb721350f31975af5a01701ea03b08e16cf221f9363c2ed7dfcce0e34717525a39ae4c883a52814ae711834388e157b231386575ac98282ca42ed8e8c5c SHA512 b1454e838bc9573919977084232094e98a317d11772ed181cfdc8d9a7c6bc2c494196ac11feec754ece7813f907bdce88459456217dcd4fc6a95762e2a2ebdb5
+EBUILD checkpassword-pam-0.99-r1.ebuild 433 BLAKE2B fc2fb4ac54621804e6436c1e19ab9c1895073aec2d49d4c8de4f5bce23a40c79f8d419b8dda8ae6f3a6ebbf129f3171f9aa4c6f30e407f2260f429bd7af76d2e SHA512 43958cbd1b9b5afbceca7065a19a8f728c0258ba579e42f85ef777dfa85da0d1b1db51b08a8df806cb87a5a465cdb1e975604d5ec1f1dbc3a1a07e87a899abed
 MISC metadata.xml 252 BLAKE2B dbe9a6c6c10ec16a5261653effdb4d744c1c8e6477eae5ad220f9add922d1321f7c7101596283cd8e68b20b6d9d5ed969518afcaf64e3fc047144bc2731bbb63 SHA512 75e23f3cd2f7515225a9c07df4ed31b0b6519b055bd4d793b83783a32b4b9745f76ae17054a0b6a91ba16975538b92e603e94c4934c25c8cb753c38a72a8edf9
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
index 51d3dd5ee404..da5f73d157ab 100644
--- a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/checkpasswd-pam/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~x86"
+KEYWORDS="alpha ~amd64 ~arm64 hppa ppc x86"
 
 DEPEND=">=sys-libs/pam-0.75"
 
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
deleted file mode 100644
index 5caf98593e7c..000000000000
--- a/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-DESCRIPTION="checkpassword-compatible authentication program w/pam support"
-HOMEPAGE="http://checkpasswd-pam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/checkpasswd-pam/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm64 hppa ppc x86"
-
-DEPEND=">=sys-libs/pam-0.75"
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS NEWS README
-}
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 18eb036a1430..fea9425a8fd9 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -3,6 +3,5 @@ AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7
 AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
 AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
-EBUILD checkpassword-0.90-r2.ebuild 880 BLAKE2B 836c292fe8f20d674faefea9b66b1095c16f3d80504fd0c9471c1eef86cb59ca1eabd4af5016e84540fd5e10916a179c6cc0299293743e5c59fb03b1d3a0504f SHA512 d358b40ac9e2cd7f54a5d7b22a86774bb161dc59673b7e90d3827937b7bb97a5906b0594c2a4f25a693382d0e7e539b7f5080e343dc7136372c8a52b7081e320
-EBUILD checkpassword-0.90-r4.ebuild 921 BLAKE2B 1453f63e3ce454bb2f9bf745522b036c1a185ac1bba4eeebdbf2101a59b948bc37c8e1911c30aea075cdde116a07d75a949b96eaed777180a2f1a343c5689b43 SHA512 add20ce927e3c921030810c47dfe55449e49d64eb31a8730c504abde5203a2713223ecd185539b63367143a6ab49b22051d5f776c0280bb40d3910fe60da028a
+EBUILD checkpassword-0.90-r4.ebuild 903 BLAKE2B dcfe4b86caa062fe2ec380c27ac32c6bf5fafef3c26eceaac59b70b862a791ef7eba6d44fe9d33a0f97bab42fcf7f31aee755634ebb55e551ea51480eea19c43 SHA512 6d7e6b444ffdc60021cc2a2aaa35079922d308e22d51e45676c545252e349ae55d8f00b9d17da8222a2107c335202ed2b372070afb66d2d82f16d72524becbad
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
deleted file mode 100644
index 5cd7a09218fc..000000000000
--- a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A uniform password checking interface for root applications"
-HOMEPAGE="https://cr.yp.to/checkpwd.html"
-SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="static"
-RESTRICT="mirror bindist"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-errno.patch
-	epatch "${FILESDIR}"/${PV}-head-1.patch
-
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	make || die "Error in make"
-}
-
-src_install() {
-	into /
-	dobin checkpassword || die
-	dodoc CHANGES README TODO VERSION FILES SYSDEPS TARGETS
-}
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
index e1691143b63e..4a7578dd6e97 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index afded25afe7e..b990e5bd0bd3 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -2,7 +2,5 @@ AUX euid_030.diff 1107 BLAKE2B 558ad9c23f2e4c48b22b0ccf520537a6eaad28592105ede40
 AUX poppasswd 84 BLAKE2B 0388cd039e50beb308e8791c3b490ca305bb6288f5971ed624fea1d80a8be916aeb1f99059b42aaeb948a7a4614a7746a74e7904703a9eb7824e3e98c1a4c05e SHA512 74eb9764b4c9fd251e9bb408d3ace9bcc30f9d638963cd5f385ee6c2c839f1de51b7f55c81d5e0111b568a308eea08185c8bcc965decf36a963b78bf4aea8671
 AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce311faff1fb0555d5b08543a9ce79347f953bfeef5c6b6585edd5474c538a2323d3e47048444b26 SHA512 e18cab4bb02b2bac945d1857f70d6f5faa2296205f09c228d87d16dffb43de129a59ef0054dd6c54f1db7448b47f46a385dc81ffe769dc87d182d81031920369
 DIST cmd5checkpw-0.30.tar.gz 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
-DIST cmd5checkpw-030_tgz.bin 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
-EBUILD cmd5checkpw-0.30-r1.ebuild 1683 BLAKE2B c14b9ee36f4c5be4eab365975648f0e2286e028c64862c917d8ba18805645104f6102f0853200a5b3ad3fb7905c264054a41573dafbe6c748005844e72a57674 SHA512 46834f85d4131762e680c3743680516ac3d832f60cd8dfaa69318221eebc912a4072241d98e62f76a70af8eb94ca96819229e468a633d34ed735bd9d6efe54ea
-EBUILD cmd5checkpw-0.30-r2.ebuild 1480 BLAKE2B a58f49cd3c7c30f5af0b7899f2f6237b395fdeda13c5b62a17376ff4ecbe1a936ddce3a693913dadd49a0bf36a4d7dbd26c2ac116c039f152d427a7f9bfdec63 SHA512 3c173271e13db3cf9709feb1c6b3023a8ea71662e2ea7fd31f80f9a4eaf5486d04f71c16c3dd7a2a500148aa7ecf52fa78058a44e257bf56b807d31f6210efc4
+EBUILD cmd5checkpw-0.30-r2.ebuild 1469 BLAKE2B 721a3a3adbabb37d64682a32ce6b408233e2b48c829073bf33fab34569c40929eea64628430629f7fa20faba941e78c8f7806444b18955006c5417b65eba2632 SHA512 1fcfa408df2b0396fde4e536918986834feff35c566ed30b4eead67c50e7c289e31b02a63e9ab67b2a8e3fe75c6faeb04b0cd3d85efdfbbff9074555e060e58e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
deleted file mode 100644
index a2ac986f5a2e..000000000000
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils fixheadtails user
-
-MY_VER="030"
-
-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"
-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=""
-RDEPEND=""
-
-pkg_setup() {
-	enewuser cmd5checkpw 212 -1 /dev/null bin
-	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
-}
-
-src_unpack() {
-	# The old code moved the file in DISTDIR, which is forbidden.
-	# It's read-only.
-	cd "${WORKDIR}"
-	rm -f ${PN}-${MY_VER}.tar.gz
-	ln -s "${DISTDIR}"/${PN}-${MY_VER}_tgz.bin ${PN}-${MY_VER}.tar.gz
-	unpack ./${PN}-${MY_VER}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}"/euid_${MY_VER}.diff
-	epatch "${FILESDIR}"/reloc.diff
-
-	sed -e 's:-c -g -Wall -O3:$(OPTCFLAGS):' -i Makefile
-
-	ht_fix_file Makefile
-}
-
-src_compile() {
-	emake OPTCFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	insinto /etc
-	doins "${FILESDIR}"/poppasswd
-
-	exeinto /bin
-	doexe cmd5checkpw
-	doman cmd5checkpw.8
-
-	fowners cmd5checkpw /etc/poppasswd /bin/cmd5checkpw
-	fperms 400 /etc/poppasswd
-	fperms u+s /bin/cmd5checkpw
-}
-
-pkg_postinst() {
-	chmod 400 "${ROOT}"/etc/poppasswd
-	chown cmd5checkpw "${ROOT}"/etc/poppasswd
-}
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
index 3a0b96995a45..44092352e1b7 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="acct-user/cmd5checkpw"
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index b3c2e7421a29..277acadccaa1 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -24,5 +24,5 @@ DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d
 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
 EBUILD courier-imap-4.17.3.ebuild 6794 BLAKE2B 5192299cd016549438abe0ffb2b7d92d50a8e596e9a1d9d4d9a3485550973d8a76aa3f9fa3c5752811ebb93e8ea50cd81e8bd50f9b8833c6fc74880babaa418e SHA512 103e22a47b18ea7a22a832505e9f540d28af0e9e5dc92205ff58a443689f96449c6597a62dc8ec35e48f4823bc522ce46a53b6f257df2533e2e777cba0ef46c4
 EBUILD courier-imap-4.18.2.ebuild 6855 BLAKE2B 7785146899c2e074ef31c28ab09800191b51d0c1178042893d60ac3b676134c8dfbf657244b91f4b498b6903ab3c620e64424c530f7a031db6c83e66de0d35f4 SHA512 2fbf7417926e900b7b5419eaf7962900056156c8cddd4449d43311840e76c117093806a1524826db41ef12cd60a37fa86600e5cfc71c5a2c682aa4122be61eee
-EBUILD courier-imap-5.0.7.ebuild 7194 BLAKE2B 66eba66501fc1a927ad794ac2fd99d3107c94588d42479a11fa1580c9562a709ec557b861b7a5c926bea40477c2ad7dda7872f0beecf8320fe22c60cfb37f554 SHA512 6a630d070dd470899bd4786e6072a4b00a2ed50a2d96d7896cd266ffb3ef3f93fb75703e92b68aa51bf239d06ed559efeea7dba89391fdc9d1dee7fd040a5619
+EBUILD courier-imap-5.0.7.ebuild 7192 BLAKE2B 87ee558602bc209bec59e5159fac9b0f2c319e8dbfe3bf2171824449c0218a189259d83a9d06cc00ee4492ecca6926381d54eaa987db25fc5f44b2977a9d5668 SHA512 71d22c0b8816546db53dafe211dac3a01103714279175de762ad9003399c9fa33a228db1a8d2f1a78b254e9d5239937ff184bc2e33aa02d3c9808a6eff78e299
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
index 96d532786d86..c7e330f658ff 100644
--- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/list-remote-forwards/Manifest b/net-mail/list-remote-forwards/Manifest
index d57ca6842db7..ff74a45e261d 100644
--- a/net-mail/list-remote-forwards/Manifest
+++ b/net-mail/list-remote-forwards/Manifest
@@ -1,3 +1,3 @@
 DIST list-remote-forwards-0.0.1.tar.gz 25869 BLAKE2B decfd8b5d4fcbd5e278f9c58f79687aa33cc91d4d4907ff7a29fe6b745ff49c073e3beaf2876ec071f4ed1099b4575cacb8194049add04c0aa8ebeff3338293e SHA512 b6d8c0e8a72e3dcbc62c00b291da99da6c37c853997c367eb60db128db327c1f862e9dc6d9ad4028aad2e0cec9acc96add28d85d4b22508e1fd00a65bb9b0317
-EBUILD list-remote-forwards-0.0.1-r1.ebuild 1002 BLAKE2B b73e136ea066bf2146fb5dbcfeaa13907f48674e6239609b96bc0cad32ca7a805fc13c44adbad7be85640159956669d489c73830c0fa96fd8139e4b0087700cd SHA512 32a9eff4dc5d3c3776bdac23f24e8f41000186aca6f479d3073321ad536b952f73a4b75f2ae26b99e3937504e95d4d0c2944a3875d7b9c298d16bfb985c28457
+EBUILD list-remote-forwards-0.0.1-r1.ebuild 994 BLAKE2B 390cc3ae12fb933b6fce5635908c31677a46486edfc288b936c57402679968c53dafca811ad053c992df1c4702feb8656863bec3bae17af9d1b8f9b36109802f SHA512 fb0b1a2f5026d2e178acd60c60bf9a0b8394f01f95ad3853dc163ad011c305d281b01a718e5e16b9cb8c208c7d9c67541c9709aae9ca0a59c914a2fc9d612d0e
 MISC metadata.xml 4175 BLAKE2B 183538e85d540850e8176fb6c2a6a24dd0dfddeac8bf9b9ee684b11ef8ddb54c58e5a0292f67e72c15264880fcd68d253b48c3ca70bf0b8110b9cc8d58438186 SHA512 a6cb86568d00776106d194639bfbabec5e753e8bcc5c4b1c2f50f25f1202865ea45a946e55de5bc41a79ad7a18c8d9442ec7e964065a1b00fa0c5937177ee9e4
diff --git a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
index 65c65475d57a..0c3763e369f5 100644
--- a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
+++ b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest
index 3956db47d3ae..4e0da5e59530 100644
--- a/net-mail/mailbox-count/Manifest
+++ b/net-mail/mailbox-count/Manifest
@@ -1,3 +1,3 @@
 DIST mailbox-count-0.0.2.tar.gz 20644 BLAKE2B 036d118f9c23d42e21de06405d2703e97017f35d618a90e77561d604441092b543a8ba03b50dee5a7c2a48c2b8c0d6e87c06c2338853d9c508de7b6ea9d86006 SHA512 98e39927382719295260c64bd5888244000dbbb3fbd7f6405dcffe78a4fc5f1dea7f8236542e58eb0118bb421c19225a8be0560b92c7688c0701418c7221d569
-EBUILD mailbox-count-0.0.2-r1.ebuild 829 BLAKE2B e51fb757e9b59f080554f53766ec649b6a58f83d2973fd5e3d409bd221ccb23a5bc19fca582ce5ba1b4819b0cba151c55f80e5be5ba03a70ce96a2e406e07232 SHA512 d3b85760e190f0d098dd16220a19bcd6de3338a8b0f7b340951045a454efd2c451688146c4409fcc292c33cda4d2411b91f29262dfd08be6590b034665bb3f0e
+EBUILD mailbox-count-0.0.2-r1.ebuild 821 BLAKE2B b9a4977bb2af16c294a8559ab466a568cae6e60192e9a3cbc7e69e590baa0f896d87b52a8e756f17ac47b0fa3b9756a64252a3a0f6cc18f4f0bda55b8c4a630c SHA512 3c6a241379adcc4d4892b6c44cc4bf889816fcaf9d48e9cbc96987f2e729eae734ef1020cb69d67d8042443638370cea44889bd20231f359c7ecd1f5b361ef74
 MISC metadata.xml 3288 BLAKE2B 15a60ecab50dad246513c9060e9cf73b4a00c4a6264085357c04461e83a262497780c831823fd54a94d2c2a2b10cd836c51632e24683bbc5d0541d657e383a4e SHA512 95bbd72ec2a640fc2f4d9b67ce8388edbf3b7e01e181bc874fd62d11fabc5858506c35e613bb9215e6732ae4c968ad87df3b93b917cded023691452d0368e8d9
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
index cd5c14db95a4..737684cfbc1f 100644
--- a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
+++ b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit haskell-cabal
 
 DESCRIPTION="Count mailboxes in a SQL database"
 HOMEPAGE="http://hackage.haskell.org/package/mailbox-count"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
index 868a5d743f5b..05ee14888368 100644
--- a/net-mail/pflogsumm/Manifest
+++ b/net-mail/pflogsumm/Manifest
@@ -1,4 +1,3 @@
 DIST pflogsumm-1.1.5.tar.gz 47130 BLAKE2B ef28092aeee7bdd478c697c58b4e8cc085f47fcd1b59713a3ed1288a646881809177edd5c1711c3dc0e19299dcf2c0d3f7f7eb9623011aa3a1995c8eae4c4f47 SHA512 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
-EBUILD pflogsumm-1.1.5-r1.ebuild 509 BLAKE2B 0ef13b4dd741fe59e9442b592a7813de59bcd9c98a62eef8e0e04108e71a57161ac6792e6062899247dada746be46dc25923e5ec99e25ff4d32f5e3a10c29f3f SHA512 48f751bef55bb466f66cf0c839bb065de720c6255be1488e65f6148bebe37398da046c16b462315717c23a1874075fa96186b36f3d1dbc86f16bb6930c523b17
-EBUILD pflogsumm-1.1.5.ebuild 512 BLAKE2B 435a02b0885e4e64cdb6ca93d6e19a682191306d11c8aa148fda39ac56284deaeb3f2572b9b3f62b6999949a0079425f73743328ef8a819ea6ac3f6716a64b51 SHA512 bfc240e6d1e229ac6f4ee86e2b693f246bbecc4dbfc1198431d68a7c8cf608eb6dffa169aabc9eea29c47b7e9af7f4b8d8fa4eded2295eb1e86c08e731f4efcc
+EBUILD pflogsumm-1.1.5-r1.ebuild 506 BLAKE2B cf4902bf5a79cbf8647e048790d69d65bc323f17ea07c1847ee2b036eb8b27e21fbe01027a1af0b64a7b0e3fc976f196a0cc09aa7d544cc4352b8050005921ee SHA512 ab35cdca59a5b63a9b2db06e3b9d57453e967a82af2290bec8486b7681b28e5a276e2cf7bbb8d1ded777355189d776ff70fe2426c9e3ae531b4e1c1fbaabdaf2
 MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
index a8f133c77c68..e47ed3e97164 100644
--- a/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
+++ b/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://jimsun.linxnet.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 
 RDEPEND="dev-lang/perl
 	dev-perl/Date-Calc"
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild
deleted file mode 100644
index 8d7d93a5f2af..000000000000
--- a/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Pflogsumm is a log analyzer for Postfix logs"
-HOMEPAGE="http://jimsun.linxnet.com/postfix_contrib.html"
-SRC_URI="http://jimsun.linxnet.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/Date-Calc"
-
-src_install() {
-	dodoc README ToDo ChangeLog pflogsumm-faq.txt
-	doman pflogsumm.1
-	dobin pflogsumm.pl
-}
diff --git a/net-mail/qmail-notify/Manifest b/net-mail/qmail-notify/Manifest
index e7075fed0633..dc14a3528dcd 100644
--- a/net-mail/qmail-notify/Manifest
+++ b/net-mail/qmail-notify/Manifest
@@ -1,5 +1,4 @@
 AUX qmail-notify.cron 80 BLAKE2B a580741c9dbba0a2bc00cf55ab83d432df569bc961ac0d463bd5c5f0008ee7eccc386817750041343c9a2da5b428ad15b059234595feaf31ba199d8e143cc199 SHA512 6242a426a601b9461ca1a79b14d2f850b963604de8291779001a2e18aeead5b7315664808968640de62b5615688a246451ba67f6bf05cc002d694d0c73836c23
 DIST qmail-notify-0.93.tar.gz 37923 BLAKE2B 17cc1c436d47d759593d564e23ccfb4ee1920eed8ba2038a3e68add3a0b64f717569ef9fed25b361e6038581a6a6d269f1cfb869acf593d2fa70159db61bc492 SHA512 b39ba70360fff69c40fa9421e94f6bba8b8f65aa85fa8e86580628de25f3d9cff26484909a71e50fd8ae8cd5198c194a43d00c2776132bfedac9c546a2628e4f
-EBUILD qmail-notify-0.93-r1.ebuild 856 BLAKE2B 2570f5d0b47adfd60ced21ea085cde39878b49c17bb40032ba0fae65a0a011914e56edf8e6fc15421d83f9b2677d5a8253a0d1274f2c771a103b72cfe74b34b4 SHA512 873cd6c6cd65c2cedeba00f1e2490fd99aada00601776217080f9107dbe258044e10dddca00954a7f1cadd81b1524ce23c6fbe3e84bb0024027355625332d100
-EBUILD qmail-notify-0.93-r2.ebuild 1022 BLAKE2B 7fbb6e7028bf9dc61793569c71a3a76d7268209d1c2a54c54c0534ccc69091a2a417c998c3e90d4cde74e8beda0f1989931b33b34d4c792ddf5cbf26d51ba899 SHA512 ae2a97ec8653330eada6073717c7850a463e5390789dec5dcabd34a5bcb9cb25e8fb9f320aa5a5d650378d9c22249d85ad6e4a4805e531cf0758cc77b2ec5e0f
+EBUILD qmail-notify-0.93-r2.ebuild 1019 BLAKE2B 3d4945ab7c486b62cd70b796ad5039698f3f0f47d746a79974d1a4de2e7d9a536b3e451f145c10f07faac4beaa725f945001bf9701f6352bd64d1569b4fa8e1e SHA512 3062a107c30bd4489fe6b1d76f5a92ead27dc53667b3c912c6ccce2510b4f5841eea4d749c09598047a02c787c1015bad193cc6d58b886438e2de01a51cad612
 MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
diff --git a/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild b/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
deleted file mode 100644
index 07575781f596..000000000000
--- a/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Delayed delivery notification for qmail"
-SRC_URI="http://untroubled.org/qmail-notify/archive/${P}.tar.gz"
-HOMEPAGE="http://untroubled.org/qmail-notify/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	virtual/cron
-	virtual/qmail
-"
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	emake || die
-}
-
-src_install () {
-	exeinto /usr/sbin
-	doexe qmail-notify
-
-	exeinto /etc/cron.hourly
-	doexe "${FILESDIR}"/qmail-notify.cron
-
-	dodoc README ANNOUNCEMENT TODO cron.hourly NEWS VERSION
-}
-
-pkg_postinst() {
-	echo
-	elog "Edit qmail-notify.cron in /etc/cron.hourly"
-	elog "to activate qmail-notify!"
-	echo
-}
diff --git a/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild b/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild
index 98b35abcccd0..83f5853ff50c 100644
--- a/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild
+++ b/net-mail/qmail-notify/qmail-notify-0.93-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://untroubled.org/qmail-notify/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index 975af38e506e..721fe77b5930 100644
--- a/net-mail/queue-fix/Manifest
+++ b/net-mail/queue-fix/Manifest
@@ -2,6 +2,5 @@ AUX queue-fix-1.4-errno.patch 505 BLAKE2B 06e1e44c8ca40c0c2594020bb2cde469da1789
 AUX queue-fix-1.4-stdlib.patch 926 BLAKE2B 62e8a37e118d4fa523a2b1c8d0752c0f6d1d82a242660a4246280f3dd74df694905c30ebfe807abf0c4834a391b13a2e5234b9e237bf20987ad438872ee0edd1 SHA512 8e0e021ebab88decd36a0ba2542315e7d3a0ed4ff1d18fc9242790f67a6f2441501d16087307788351d84e64574313fe731bfea968a034551b1086d642572db8
 DIST queue-fix-1.4.tar.gz 18486 BLAKE2B 3999632fb77955782f5bd5da4ee231d68faead75daef293b7cec9da086cb2a69bd8901efba5a3726c9f6047f6ae33060674f110dc479736ba7be8fe8c4253745 SHA512 b7e0ac070a409eff156b3803cc1bb78d1c800ae685d107b872bf5b022a8645d1ca55a5c3380f6bc82e99927df8dbf586b74af587e882938b9a7678b506c600e0
 DIST queue-fix-todo.patch 3056 BLAKE2B 92dae274431dac974e632bec94a1d0b84b652db197d4c80739a3f8da92e9f7f526b59659242456d99060859a35739e4ecfbd4e16d81892acea892de57218eb57 SHA512 78d79f1eaa8492fd9a14dc4a4d2adfaa8c0429a4faec32305f83ea1f16769b8d337fe732adc8cc0c33b909a19617862c9df999f2e938a6b845e15bc49ab5bfbe
-EBUILD queue-fix-1.4-r2.ebuild 957 BLAKE2B 4e5febe066c4ae05aa127e84f49444a85145ac4c76be450f7af8fe656a92be869b34e515183eb61817795fdb7763ada55da8d28da2ea9f101cd1d4f38467afc3 SHA512 a375db211da9618a3eb4d16a5adce1ccd471c278c4bdb9fa9f9dcc68976ba007b0999a94e5f0e5dcfb133afb0b03f8a653d7532e51fae9250ecae74858ae7356
-EBUILD queue-fix-1.4-r3.ebuild 991 BLAKE2B 3bcbf74ed85d418cb07c66ed46adf54537c3d0faaf3d8e017c0668963805e7a153289dd5faf4f6724cfd0937721967f3dabee804f2d753ebb523b2eafe076fd5 SHA512 c2e32bdd81f8fc563d6a9cf96c3615f3a862c7730f76376b4ef2a2a502703beb7ccb85420f01450f36d156ed1c050aa73652fb76d0ef02aca08c1d205d807fd5
+EBUILD queue-fix-1.4-r3.ebuild 980 BLAKE2B 428b76a9a597e2b42db3becf1755d6ce847af614511f68b85037d485cb2af86469edcc7da6bb0e219aa2292493a53607a2864dc602152feb3aba7356c0ba13cc SHA512 9ae821dba999ab9b2cd86dc31ae720b9724e4bcd39cb41b4dbf1f89c4517186fc3913f4e6d12a1ac6bfbf65d03c386f0cda8ec566206b655b55b3137d343d770
 MISC metadata.xml 523 BLAKE2B e5f67ee8e1333e03d8d205a54afa7cefcdf11f7c4f20cac94d68789fb4d1c90a73d2bdbdccb105cbb8b3737b091a6e4a96570ff0e089983375cd13d7e53b99cd SHA512 52c248a6450ebf03064f844d77465303e851444f2eccd2fab0867dc7d97bf003611c97f8a69634366644e2dbcdb2d8bd1396474ce7a5772e4cb3d8de35590685
diff --git a/net-mail/queue-fix/queue-fix-1.4-r2.ebuild b/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
deleted file mode 100644
index c1d6b3dcd795..000000000000
--- a/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs fixheadtails
-
-DESCRIPTION="Qmail Queue Repair Application with support for big-todo"
-HOMEPAGE="http://www.netmeridian.com/e-huss/"
-SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
-	mirror://qmail/queue-fix-todo.patch"
-
-LICENSE="all-rights-reserved public-domain" # includes code from qmail
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86"
-RESTRICT="mirror bindist"
-
-PDEPEND="virtual/qmail"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	epatch "${DISTDIR}"/queue-fix-todo.patch
-	sed -i 's/^extern int errno;/#include <errno.h>/' "${S}"/error.h
-	ht_fix_file "${S}"/Makefile*
-}
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	emake || die
-}
-
-src_install () {
-	into /var/qmail
-	dobin queue-fix || die
-	into /usr
-	dodoc README CHANGES
-}
diff --git a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
index 3b3b852d8449..3469cd9c2024 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
 
 LICENSE="all-rights-reserved public-domain" # includes code from qmail
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86"
 RESTRICT="mirror bindist"
 
 PDEPEND="virtual/qmail"
diff --git a/net-mail/t-prot/Manifest b/net-mail/t-prot/Manifest
index 853d17747d96..0adddb3d1dbb 100644
--- a/net-mail/t-prot/Manifest
+++ b/net-mail/t-prot/Manifest
@@ -1,3 +1,3 @@
 DIST t-prot-3.4.tar.gz 46066 BLAKE2B 8f29e0c59ac1529f797cc9970aef40fe09e1b3041e7e1b5405b68623058dec500f1f7a4d51b994e5a764ab92586e053698cd98fe3eec5ef7ceb50f8d05617486 SHA512 6c86c10e5b381b93cbaa9382f8bd2c94eeb9c8ecec092d83cfbda5f0eea5933fb85397b364ea58e08ef93e6a06198447f167f0850959ddf16b8a18d3fe8953f0
 EBUILD t-prot-3.4.ebuild 613 BLAKE2B a447e9a7c978b18449fc8a65570dae0be151c58bc73ca99ded6e93d753aa26179673fd7c86ee8715bfa2b9b8a5648d1277569777ac377ed3f81292494ce1c080 SHA512 fb725d47907233e4a920dc0c1e8bbf8e460056608bf59f959f0dccd592a0880be332bd237c347f20a94a2c058ef5e1286a30904625160977c3eb580ff7db6596
-MISC metadata.xml 814 BLAKE2B 80728aebe90f9f27629af84b57d440941f3d2e4684f95317cdc44e6f9c8e5d4814e7572a635e18a95af85f16e53df113a0e98d4dc4ed7bc35ab91d6479cfade8 SHA512 669e31f386cce6fbf01132748bca9e9c8f34ef1ad6b65c905f02347419f2f3d3310bbc7632f81b648426dde38edeeeddfece0eea82f69cdc3348feb1376964c9
+MISC metadata.xml 733 BLAKE2B 3e9cbe631e2cda0cc169c94114423f155f307b624b6418aac4fcd2e66ddfda6653e1c8c80b19c9cfb1d510878a815a74e91a140f89b65222f9af1ab63ed02490 SHA512 3ba44e3050e4fdf6edb5e45ec423d1d3c11a4580b24676bc94687dd6e0b9ab78e8f2e831a0da42b832acd30bc30583a08474155c3dcfc1b61c655e4b63b286b1
diff --git a/net-mail/t-prot/metadata.xml b/net-mail/t-prot/metadata.xml
index b759a0743950..fc8b75a728d4 100644
--- a/net-mail/t-prot/metadata.xml
+++ b/net-mail/t-prot/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription>
 		This program is a filter which shall improve the readability for messages
 		(emails and usenet postings) by *hiding* some annoying parts, e.g. mailing
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 68d8d4a407da..6eba9c42bc2a 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,10 +1,12 @@
 AUX 99vpopmail 64 BLAKE2B ab9b8b28494fa8093f1a72e582fc10787eb1f9814b860b1c03f4e336c6a8563b50b34fcc2c33d95e45703ebad5b8155d9575551c894af4e7c12b52748b526216 SHA512 8e9323006ddafae6e4ee8da2e0c9753ce11fd3f6e7c8bb6931ccc147ab6c9782c71d704222343be902f8784aa27a4425fd04a1f11cff5421dfc25fd76d3de953
+AUX vpopmail-5.4.33-check-crypt-return-value-for-NULL.patch 4034 BLAKE2B e45135fffe507f9c55fd2742ae68724694b9c29520059301c281f4a20ab5dbd26ac1f507166b6b4adef28f7435a71bc31de59eba171a7404e822acf5dd2dec41 SHA512 4f485c9ad927a92f7900545dcef7a875e151d403c14c22cb4fa5585aedc1effadf629df6e6cb0e5364cdf9451a71d3790c2297a0cc8a54518976adf1c50e421f
 AUX vpopmail-5.4.33-clean-up-calling-maildrop.patch 2382 BLAKE2B 06f7ab5f6fdbb0dbade353dce74b2be585ed5a3f1ea617491ee437838f80c38b90f9e2c1a3a89efa6f788f30228e8e7449d8fdaa9db59c26231b16b849ce3f80 SHA512 99053bf41e405b22a4594104d3fce6ed831c6f5b8f8870bde7eb0e780948990de36158d7af055d881639503be1b911106a91f1787d524fe9c84fd3ec5503b055
 AUX vpopmail-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch 3281 BLAKE2B 7eecc6c5dc2eef263d212ec6ca0534d0c00faeef04994e5410dbbff6e00beb7df249276fad928467b8cc87610d49666d9c63a629c87f8a07fb0ea5b35c298589 SHA512 1d170e611e914dc1ef5e7140b661558d93d2466fd310ebb50ecfcdadcb27cbfaa44b702ded5e02296835aea7c0a4c0d2de8ddf3cde236fe15a6fe0c37edb259a
 AUX vpopmail-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch 2150 BLAKE2B 44d3226b95e19b60516dbd2c4ace2ada5ec53ee1479f45544113e207da79b7152958d85f3b0511565e820732e49f32d73ce74ef253dd286a0f960e6b7cb39a92 SHA512 077d8b035f2ae33354c4c51d9d4c068b4de4d0f56c1a076667425c903707a39460c03b83ee9163cf8ef11b424bdb0ddcf2e716d0cfdbd3b50863069035d2a66b
 AUX vpopmail-5.4.33-remove-unneeded-forward-declaration.patch 771 BLAKE2B 565944744d74b6c4077cef4534aa01c50af21fdb1f2da11fc2baf4659b953516e2b017412cfc64d1d5a06f8e6f5d7355903787188ae24f3579e0ac0d2087e369 SHA512 e1e4b2f3d0d3c51b6341dc14583f336b86766885767c0188ee170e07979fdd6d59360d1942df6593e7f11dc043f49143dff98898cca4a55ba697b429f98eb123
 AUX vpopmail-5.4.33-strncat.patch 6266 BLAKE2B 98656fb8d963df082ec48fbf7918423c8aeeeab6aebaab295f819b213e09d20e7b786057bf2c2fcf0a276cf9fc65c10978957cdb37dbc7cee57c0ff3eef9e78f SHA512 831ec541a52fe5e72f97832927ce0c6b8a90c2954d715be1c088f5886bba6058b313e4364e164c0af90d1de90f0890f9a1b64d1985ef1d448ac34e5951b0a16b
 AUX vpopmail-5.4.33-unistd.patch 266 BLAKE2B 19dd429573f0b45b93cd35d522787029ba445c2f363a7a270ab1c547e4f0c2a7be89c287642a3e5e8d69ea59a82271aff271670d19d3850146e92a3389aa3dc8 SHA512 1cc6e6a067cabc004224c022af8c3ee90125a3b3daa9c346ca8a57962be30681a6181605624fc09a8992a7e3d3e7b3d8d6c0ce95095399c1a5dec798e9d6f6cd
+AUX vpopmail-5.4.33-use-proper-printf-format-strings.patch 9207 BLAKE2B 78d51e71fc29ede44e76109d43a0e4dc81458cb74c0873d33efdae33d7a99321e31839eff420654868f38b7e82677c345e276375fac3d9cf13ce54310e8235a3 SHA512 453887050002fb075046637b1ace82caeefd7c2a0f587403d24da0b9d0602a580d2d6595c2ea8af42f49fedd7c2168f9de46dd24f5aee0befab2ba0c7bb4e1c5
 AUX vpopmail-5.4.33-vdelivermail-add-static.patch 1017 BLAKE2B 279bd5c2b894268910a89d1df206289fce475df9b655febc27eca6f1ecf1ecd6bc55e250d0eeb5e86e89a5df0543a08af34b379888ecb4590b91ba62b521b9f2 SHA512 bcf80e30d5010decad135a84527985a29d61d054a0396af662f33bc4a63c3dc1dd0585e884376f25babf0ca263d2496991b16d1c215962a64597f4cd1cd50ca0
 AUX vpopmail-5.4.9-access.violation.patch 918 BLAKE2B ebf8c80ed2668d0bc96930493bd46788abf58d45defd5cb3ebcff0b67c0c31d7473b7dbf07c958366e18dc7ca56434a6e45b9bf7c9d920da993b8d51927df95a SHA512 6587d2a4ac7b6943b07db2334750db83aaf2e974053732696ad17846da29250a82ac91598f25f0cf1caafc731fdb89ec016e7ba6ff6f70ab269af3c0a15e80b5
 AUX vpopmail-Maildir-dotmaildir-fix.sh 1346 BLAKE2B efc7c1e97c201e9f36c3b817538b87c5522b0b2b16b681e0bbbf77bdd8537634d56cbe29b7eb26d657d83fb696b0fc00724dea9d03f246794c5631f8c2ca7ce1 SHA512 201ad103157add727560bc1596042ae621d1645abf912aa3b3ec1af71aaf65dff92c967f000b7a126e9f2eb5e351838c78ffee855402d93bdcf89e96ebb0d0e9
@@ -12,6 +14,7 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r4.ebuild 7613 BLAKE2B c2da7499b508a2a9896b1ec31435b095bda6984e2d2232ee472a24c0f623fff5b36b915e2cbd8dbf14bea2c0f64266e78db54be7d423a2c0ba4eaf2e160c8925 SHA512 87f8a7ad3b266148a87dfed4a432a422469e97deb97e43aacee6bfd6e2beb9229fe40b59322d78ed099b8a45dcd9c2ce79229c3649e404b9518115040eda99ef
-EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 585b4301997bcc0a13c40143338e29f2a054773c7477f3106dfd4ae71f787c15152f1fb9e84cf123c71092c42e0e42e96857ac5cb2ff1d918c87ffcb6f7c30fe SHA512 04ffa6437901fdb9f7d5a7f445dd60ff5f443d8c69add9a26d28c01f777195ea4d7f57bfef988c1452553b15d9a4fb8057ace7b6a004382f71e836fa4b9f9fdc
+EBUILD vpopmail-5.4.33-r4.ebuild 7633 BLAKE2B 10489cba302f017645c50b5fc1e50455c4a18ac80407e720f804e31a6f72c75ff6ebcc7257e818c617844635fe2252bb97cb30c26d60466e1a66c5215242776c SHA512 a94cee36d0803632634124a56bec6619889725a31b7383d816d1bbfa8bdf3661bf683a522391a34bf7f79249f577c0a120b9be1c2f9490b39b775aa9945460d4
+EBUILD vpopmail-5.4.33-r5.ebuild 7517 BLAKE2B 87f180f0ff4f1f76121cae28ce0d9eba40792e8038a09a7abe9e20a57ff4d7e51d5d9ef38a6f6338f9cd7d9e20147ddcf7a2fff02e2c527c88eaaa1e77b0f9b6 SHA512 daa486928665fbc90e56cf3702d5ba1c18cadbc8341ef624c489ef18eae68fed52a2d307691565e975c0560a85e3abf04160c99642c99f1b6f03e6730be00152
+EBUILD vpopmail-5.4.33.ebuild 7678 BLAKE2B 0784b6ac7398d33dd6cb4dfd067d4778568a24ca2a1b71fbc52ff541bcbe5878056c74560270f44f7da7edb7ddb17955a4320d79ebdb92945cfddaa3f68ae372 SHA512 d0e9c724e49dda58c838c98e40da28638b8c7e5063517c03d5f26a5d471427af0795ec32c0f8711e1ae37e0e6a851807640d1081f5e834daedd89d82e4e43365
 MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.33-check-crypt-return-value-for-NULL.patch b/net-mail/vpopmail/files/vpopmail-5.4.33-check-crypt-return-value-for-NULL.patch
new file mode 100644
index 000000000000..cfe5ce90e07f
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.4.33-check-crypt-return-value-for-NULL.patch
@@ -0,0 +1,146 @@
+From b3a21a4a6d7af3dc14417c89ec2ef2732a24939b Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Sat, 26 Oct 2019 18:14:13 +0200
+Subject: [PATCH 1/2] check crypt() return value for NULL
+
+Passing NULL to strcmp() would lead to a crash otherwise.
+---
+ vcdb.c    |  7 ++++++-
+ vchkpw.c  | 11 +++++++++--
+ vldap.c   |  8 +++++++-
+ vmysql.c  |  8 +++++++-
+ vpgsql.c  |  8 +++++++-
+ vsybase.c |  8 +++++++-
+ 6 files changed, 43 insertions(+), 7 deletions(-)
+
+diff --git a/vcdb.c b/vcdb.c
+index 55c1cb5..1bf9cd8 100644
+--- a/vcdb.c
++++ b/vcdb.c
+@@ -1160,7 +1160,12 @@ void vcdb_strip_char( char *instr )
+ 
+ int vauth_crypt(char *user,char *domain,char *clear_pass,struct vqpasswd *vpw)
+ {
++  const char *c;
+   if ( vpw == NULL ) return(-1);
+ 
+-  return(strcmp(crypt(clear_pass,vpw->pw_passwd),vpw->pw_passwd));
++  c = crypt(clear_pass,vpw->pw_passwd);
++
++  if ( c == NULL ) return(-1);
++
++  return(strcmp(c,vpw->pw_passwd));
+ }
+diff --git a/vchkpw.c b/vchkpw.c
+index d7d4351..a7c4b9e 100644
+--- a/vchkpw.c
++++ b/vchkpw.c
+@@ -607,6 +607,7 @@ void login_system_user()
+  struct spwd *spw;
+ #endif
+  struct passwd *pw;
++ const char *c;
+ 
+   if ((pw=getpwnam(TheUser)) == NULL ) {
+     snprintf(LogLine, sizeof(LogLine), "%s: system user not found %s:%s", 
+@@ -626,9 +627,15 @@ void login_system_user()
+     vchkpw_exit(22);
+   }
+ 
+-  if ( strcmp(crypt(ThePass,spw->sp_pwdp),spw->sp_pwdp) != 0 ) {
++  c = crypt(ThePass,spw->sp_pwdp);
++
++  if ( c == NULL ) vchkpw_exit(24);
++  if ( strcmp(c,spw->sp_pwdp) != 0 ) {
+ #else
+-  if ( strcmp(crypt(ThePass,pw->pw_passwd),pw->pw_passwd) != 0 ) {
++  c = crypt(ThePass,pw->pw_passwd);
++
++  if ( c == NULL ) vchkpw_exit(24);
++  if ( strcmp(c,pw->pw_passwd) != 0 ) {
+ #endif
+     if (ENABLE_LOGGING==1||ENABLE_LOGGING==2) {
+       snprintf(LogLine, sizeof(LogLine), "%s: system password fail %s:%s", 
+diff --git a/vldap.c b/vldap.c
+index 75329ef..5fcce99 100644
+--- a/vldap.c
++++ b/vldap.c
+@@ -1495,10 +1495,16 @@ void *safe_malloc (size_t siz) {
+ /***************************************************************************/
+ 
+ int vauth_crypt(char *user,char *domain,char *clear_pass,struct vqpasswd *vpw) {
++    const char *c;
++
+     if ( vpw == NULL )
+         return(-1);
+ 
+-    return(strcmp(crypt(clear_pass,vpw->pw_passwd),vpw->pw_passwd));
++    c = crypt(clear_pass,vpw->pw_passwd);
++
++    if ( c == NULL ) return(-1);
++
++    return(strcmp(c,vpw->pw_passwd));
+ }
+ 
+ /***************************************************************************/
+diff --git a/vmysql.c b/vmysql.c
+index 4215a39..c5173d9 100644
+--- a/vmysql.c
++++ b/vmysql.c
+@@ -1862,7 +1862,13 @@ int vdel_limits(const char *domain)
+ /************************************************************************/
+ int vauth_crypt(char *user,char *domain,char *clear_pass,struct vqpasswd *vpw)
+ {
++  const char *c;
++
+   if ( vpw == NULL ) return(-1);
+ 
+-  return(strcmp(crypt(clear_pass,vpw->pw_passwd),vpw->pw_passwd));
++  c = crypt(clear_pass,vpw->pw_passwd);
++
++  if ( c == NULL ) return(-1);
++
++  return(strcmp(c,vpw->pw_passwd));
+ }
+diff --git a/vpgsql.c b/vpgsql.c
+index c55b9e2..b5dd40b 100644
+--- a/vpgsql.c
++++ b/vpgsql.c
+@@ -1667,8 +1667,14 @@ void vcreate_vlog_table()
+ 
+ int vauth_crypt(char *user,char *domain,char *clear_pass,struct vqpasswd *vpw)
+ {
++	const char *c;
++
+ 	  if ( vpw == NULL ) return(-1);
+ 
+-	    return(strcmp(crypt(clear_pass,vpw->pw_passwd),vpw->pw_passwd));
++	c = crypt(clear_pass,vpw->pw_passwd);
++
++	if ( c == NULL ) return(-1);
++
++	    return(strcmp(c,vpw->pw_passwd));
+ }
+ 
+diff --git a/vsybase.c b/vsybase.c
+index c6d7234..26f7447 100644
+--- a/vsybase.c
++++ b/vsybase.c
+@@ -640,7 +640,13 @@ int vshow_ip_map( int first, char *ip, char *domain);
+ 
+ int vauth_crypt(char *user,char *domain,char *clear_pass,struct vqpasswd *vpw)
+ {
++  const char *c;
++
+   if ( vpw == NULL ) return(-1);
+ 
+-  return(strcmp(crypt(clear_pass,vpw->pw_passwd),vpw->pw_passwd));
++  c = crypt(clear_pass,vpw->pw_passwd);
++
++  if ( c == NULL ) return(-1);
++
++  return(strcmp(c,vpw->pw_passwd));
+ }
+-- 
+2.16.4
+
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.33-use-proper-printf-format-strings.patch b/net-mail/vpopmail/files/vpopmail-5.4.33-use-proper-printf-format-strings.patch
new file mode 100644
index 000000000000..a0967166c1cf
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.4.33-use-proper-printf-format-strings.patch
@@ -0,0 +1,217 @@
+From 8ebcfc44379708521c41193057bb1549a3c1a2eb Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Sat, 26 Oct 2019 18:25:12 +0200
+Subject: [PATCH 2/2] use proper printf format strings
+
+---
+ maildirquota.c  |  4 ++--
+ vlimits.c       |  8 ++++----
+ vlistlib.c      |  2 +-
+ vmoddomlimits.c |  8 ++++----
+ vpopmail.c      | 17 +++++++++--------
+ vpopmaild.c     | 20 ++++++++++----------
+ vusagec.c       |  2 +-
+ 7 files changed, 31 insertions(+), 30 deletions(-)
+
+diff --git a/maildirquota.c b/maildirquota.c
+index 1c3dd44..11a0ce3 100644
+--- a/maildirquota.c
++++ b/maildirquota.c
+@@ -400,7 +400,7 @@ static int maildirsize_read(const char *filename,	/* The filename */
+ 			first=0;
+ 			continue;
+ 		}
+-		sscanf(q, "%llu %llu", &n, &c);
++		sscanf(q, "%" PRIu64 " %" PRIu64 "", &n, &c);
+ 		*sizeptr += n;
+ 		*cntptr += c;
+ 		++ *nlines;
+@@ -806,7 +806,7 @@ int	n;
+ 		niov=2;
+ 	}
+ 
+-	sprintf(u.buf, "%llu %llu\n", maildirsize_size, maildirsize_cnt);
++	sprintf(u.buf, "%" PRIu64 " %" PRIu64 "\n", maildirsize_size, maildirsize_cnt);
+ 	iov[niov].iov_base=u.buf;
+ 	iov[niov].iov_len=strlen(u.buf);
+ 
+diff --git a/vlimits.c b/vlimits.c
+index af336d2..c4d76ba 100644
+--- a/vlimits.c
++++ b/vlimits.c
+@@ -480,10 +480,10 @@ int vlimits_write_limits_file(const char *dir, const struct vlimits *limits)
+         fprintf(fs, "maxforwards: %d\n", limits->maxforwards);
+         fprintf(fs, "maxautoresponders: %d\n", limits->maxautoresponders);
+         fprintf(fs, "maxmailinglists: %d\n", limits->maxmailinglists);
+-        fprintf(fs, "quota: %llu\n", limits->diskquota);
+-        fprintf(fs, "maxmsgcount: %llu\n", limits->maxmsgcount);
+-        fprintf(fs, "default_quota: %llu\n", limits->defaultquota);
+-        fprintf(fs, "default_maxmsgcount: %llu\n", limits->defaultmaxmsgcount);
++        fprintf(fs, "quota: %" PRIu64 "\n", limits->diskquota);
++        fprintf(fs, "maxmsgcount: %" PRIu64 "\n", limits->maxmsgcount);
++        fprintf(fs, "default_quota: %" PRIu64 "\n", limits->defaultquota);
++        fprintf(fs, "default_maxmsgcount: %" PRIu64 "\n", limits->defaultmaxmsgcount);
+         if (limits->disable_pop) fprintf(fs, "disable_pop\n");
+         if (limits->disable_imap) fprintf(fs, "disable_imap\n");
+         if (limits->disable_dialup) fprintf(fs, "disable_dialup\n");
+diff --git a/vlistlib.c b/vlistlib.c
+index 110a93e..cbb8242 100644
+--- a/vlistlib.c
++++ b/vlistlib.c
+@@ -488,7 +488,7 @@ void ezmlm_decode( listInfoType *LI ) {
+         if( (fs=fopen(TmpBuf, "r")) !=NULL ) {
+             if(fgets(TmpBuf2, sizeof(TmpBuf2), fs)) {
+                 Tmp = strtok( TmpBuf2, ":" );
+-                printf( "    First Token: %s Len: %d\n", Tmp, strlen( Tmp ));
++                printf( "    First Token: %s Len: %zu\n", Tmp, strlen( Tmp ));
+                 if( NULL != Tmp ) { 
+                    for(i=0; i<strlen(Tmp); i++) LI->SQLHost[i] = Tmp[i];
+                    LI->SQLHost[i] = (char) 0;
+diff --git a/vmoddomlimits.c b/vmoddomlimits.c
+index cff906a..7a9c8b8 100644
+--- a/vmoddomlimits.c
++++ b/vmoddomlimits.c
+@@ -207,10 +207,10 @@ int main(int argc, char *argv[])
+             printf ((limits.perm_defaultquota & VLIMIT_DISABLE_DELETE ? "DENY_DELETE  " :"ALLOW_DELETE ") );
+             
+             printf("\n");
+-            printf("Domain Quota: %llu MB\n", limits.diskquota);
+-            printf("Default User Quota: %llu bytes\n", limits.defaultquota);
+-            printf("Max Domain Messages: %llu\n", limits.maxmsgcount);
+-            printf("Default Max Messages per User: %llu\n", limits.defaultmaxmsgcount);
++            printf("Domain Quota: %" PRIu64 " MB\n", limits.diskquota);
++            printf("Default User Quota: %" PRIu64 " bytes\n", limits.defaultquota);
++            printf("Max Domain Messages: %" PRIu64 "\n", limits.maxmsgcount);
++            printf("Default Max Messages per User: %" PRIu64 "\n", limits.defaultmaxmsgcount);
+             return(vexit(0));
+         }
+                 
+diff --git a/vpopmail.c b/vpopmail.c
+index 3b6a3e5..c389c7c 100644
+--- a/vpopmail.c
++++ b/vpopmail.c
+@@ -31,6 +31,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <dirent.h>
++#include <inttypes.h>
+ #include <pwd.h>
+ #include "config.h"
+ #ifdef HAVE_ERR_H
+@@ -737,13 +738,13 @@ int vadduser( char *username, char *domain, char *password, char *gecos,
+ 
+   if (limits.defaultquota > 0) {
+     if (limits.defaultmaxmsgcount > 0)
+-      snprintf (quota, sizeof(quota), "%lluS,%lluC", limits.defaultquota,
++      snprintf (quota, sizeof(quota), "%" PRIu64 "S,%" PRIu64 "C", limits.defaultquota,
+         limits.defaultmaxmsgcount);
+     else
+-      snprintf (quota, sizeof(quota), "%lluS", limits.defaultquota);
++      snprintf (quota, sizeof(quota), "%" PRIu64 "S", limits.defaultquota);
+   } else {
+     if (limits.defaultmaxmsgcount > 0)
+-      snprintf (quota, sizeof(quota), "%lluC", limits.defaultmaxmsgcount);
++      snprintf (quota, sizeof(quota), "%" PRIu64 "C", limits.defaultmaxmsgcount);
+     else
+       strcpy (quota, "NOQUOTA");
+   }
+@@ -3822,11 +3823,11 @@ static char    tempquota[128];
+ 
+     if (quota_count == 0)
+       if (quota_size == 0) strcpy (tempquota, ""); /* invalid quota */
+-      else sprintf (tempquota, "%lluS", quota_size);
++      else sprintf (tempquota, "%" PRIu64 "S", quota_size);
+     else if (quota_size == 0)
+-      sprintf (tempquota, "%lluC", quota_count);
++      sprintf (tempquota, "%" PRIu64 "C", quota_count);
+     else
+-      sprintf (tempquota, "%lluS,%lluC", quota_size, quota_count);
++      sprintf (tempquota, "%" PRIu64 "S,%" PRIu64 "C", quota_size, quota_count);
+ 
+     return tempquota;
+ }
+@@ -4050,8 +4051,8 @@ int qnprintf (char *buffer, size_t size, const char *format, ...)
+ 					snprintf (n, sizeof(n), "%u", va_arg (ap, unsigned int));
+ 					break;
+ 
+-			    case 'S':
+-					snprintf(n, sizeof(n), "%llu", va_arg(ap, storage_t));
++				case 'S':
++					snprintf(n, sizeof(n), "%" PRIu64, va_arg(ap, storage_t));
+ 					break;
+ 					
+ 				case 'l':
+diff --git a/vpopmaild.c b/vpopmaild.c
+index f257a52..9cf2981 100644
+--- a/vpopmaild.c
++++ b/vpopmaild.c
+@@ -2280,13 +2280,13 @@ int get_limits()
+     mylimits.maxautoresponders); wait_write();
+   snprintf(WriteBuf,sizeof(WriteBuf), "max_mailinglists %d" RET_CRLF, 
+     mylimits.maxmailinglists); wait_write();
+-  snprintf(WriteBuf,sizeof(WriteBuf), "disk_quota %llu" RET_CRLF, 
++  snprintf(WriteBuf,sizeof(WriteBuf), "disk_quota %" PRIu64 RET_CRLF,
+     mylimits.diskquota); wait_write();
+-  snprintf(WriteBuf,sizeof(WriteBuf), "max_msgcount %llu" RET_CRLF, 
++  snprintf(WriteBuf,sizeof(WriteBuf), "max_msgcount %" PRIu64 RET_CRLF,
+     mylimits.maxmsgcount); wait_write();
+-  snprintf(WriteBuf,sizeof(WriteBuf), "default_quota %llu" RET_CRLF, 
++  snprintf(WriteBuf,sizeof(WriteBuf), "default_quota %" PRIu64 RET_CRLF,
+     mylimits.defaultquota); wait_write();
+-  snprintf(WriteBuf,sizeof(WriteBuf), "default_maxmsgcount %llu" RET_CRLF, 
++  snprintf(WriteBuf,sizeof(WriteBuf), "default_maxmsgcount %" PRIu64 RET_CRLF,
+     mylimits.defaultmaxmsgcount); wait_write();
+ 
+   if (mylimits.disable_pop) 
+@@ -2625,9 +2625,9 @@ int get_user_size()
+ 
+   snprintf(WriteBuf, sizeof(WriteBuf), "%s", RET_OK_MORE);
+   wait_write();
+-  snprintf(WriteBuf, sizeof(WriteBuf), "size %llu" RET_CRLF, bytes);
++  snprintf(WriteBuf, sizeof(WriteBuf), "size %" PRIu64 RET_CRLF, bytes);
+   wait_write();
+-  snprintf(WriteBuf, sizeof(WriteBuf), "count %llu" RET_CRLF, cnt);
++  snprintf(WriteBuf, sizeof(WriteBuf), "count %" PRIu64 RET_CRLF, cnt);
+   wait_write();
+   snprintf(WriteBuf, sizeof(WriteBuf), "%s", "." RET_CRLF);
+ 
+@@ -2680,9 +2680,9 @@ int get_domain_size()
+     } else {
+       snprintf(WriteBuf, sizeof(WriteBuf), "user %s@%s" RET_CRLF, tmpvpw->pw_name, domain);
+       wait_write();
+-      snprintf(WriteBuf, sizeof(WriteBuf), "size %llu" RET_CRLF, bytes);
++      snprintf(WriteBuf, sizeof(WriteBuf), "size %" PRIu64 RET_CRLF, bytes);
+       wait_write();
+-      snprintf(WriteBuf, sizeof(WriteBuf), "count %llu" RET_CRLF, cnt);
++      snprintf(WriteBuf, sizeof(WriteBuf), "count %" PRIu64 RET_CRLF, cnt);
+       wait_write();
+       totalbytes += (unsigned long)bytes;
+       totalcnt += (unsigned int)cnt;
+@@ -2691,9 +2691,9 @@ int get_domain_size()
+ 
+   snprintf(WriteBuf, sizeof(WriteBuf), "domain %s" RET_CRLF, domain);
+   wait_write();
+-  snprintf(WriteBuf, sizeof(WriteBuf), "size %llu" RET_CRLF, totalbytes);
++  snprintf(WriteBuf, sizeof(WriteBuf), "size %" PRIu64 RET_CRLF, totalbytes);
+   wait_write();
+-  snprintf(WriteBuf, sizeof(WriteBuf), "count %llu" RET_CRLF, totalcnt);
++  snprintf(WriteBuf, sizeof(WriteBuf), "count %" PRIu64 RET_CRLF, totalcnt);
+   wait_write();
+   snprintf(WriteBuf, sizeof(WriteBuf), "%s", "." RET_CRLF);
+ 
+diff --git a/vusagec.c b/vusagec.c
+index c32c2fe..5cc6dda 100644
+--- a/vusagec.c
++++ b/vusagec.c
+@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
+ 	  if (uusage == -1)
+ 		 printf("%s: No data available\n", argv[i]);
+ 	  else
+-		 printf("%s: %llu byte(s) in %llu file(s)\n", *(argv[i]) == '@' ? (argv[i] + 1) : argv[i], uusage, musage);
++		 printf("%s: %" PRIu64 " byte(s) in %" PRIu64 " file(s)\n", *(argv[i]) == '@' ? (argv[i] + 1) : argv[i], uusage, musage);
+    }
+ 
+    client_close(handle);
+-- 
+2.16.4
+
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
index fc5ea8ec4219..6e9edf574f83 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
@@ -17,6 +17,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 
 DEPEND="
 	acct-group/vpopmail
+	acct-user/vpopmail
 	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
new file mode 100644
index 000000000000..8041e1622084
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fixheadtails qmail
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="
+	acct-group/vpopmail
+	acct-user/vpopmail
+	virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:=[server] )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	"${FILESDIR}"/${PN}-lazy.patch
+	"${FILESDIR}"/${PN}-vpgsql.patch
+	"${FILESDIR}"/${PN}-double-free.patch
+	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
+	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
+	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
+	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
+	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
+	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
+	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
+)
+DOCS=(
+	ChangeLog
+	doc/.
+)
+HTML_DOCS=(
+	doc_html/.
+	man_html/.
+)
+
+VPOP_HOME="/var/vpopmail"
+
+pkg_setup() {
+	upgradewarning
+}
+
+src_prepare() {
+	default
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am || die
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+		configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	local -a authopts
+	if use mysql; then
+		incdir=$(mysql_config --variable=pkgincludedir || die)
+		libdir=$(mysql_config --variable=pkglibdir || die)
+		authopts+=( "--enable-auth-module=mysql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+			"--disable-mysql-replication"
+			"--enable-mysql-limits"
+		)
+	elif use postgres; then
+		libdir=$(pg_config --libdir || die)
+		incdir=$(pg_config --pkgincludedir || die)
+		authopts+=( "--enable-auth-module=pgsql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+		)
+	else
+		authopts+=( "--enable-auth-module=cdb" )
+	fi
+
+	econf ${authopts[@]} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	mv doc/doc_html/ doc/man_html/ . || die
+	einstalldocs
+	rm -r "${D}/${VPOP_HOME}"/doc || die
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		insinto /etc
+		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
+		dosym ../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
+
+	einfo "Installing env.d entry"
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf || die
+		chown root:vpopmail /etc/vpopmail.conf || die
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
+		ewarn
+		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+		ewarn "The internal structure of the mail storage has changed for"
+		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+		ewarn "to upgrade your system! (It can do conversions both ways)."
+		ewarn "You should be able to run it right away without any changes."
+		ewarn
+	fi
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		if has_version "<=net-mail/vpopmail-5.4.17"; then
+			elog
+			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+			elog "MySQL tables, please see the UPGRADE file in the documentation!"
+			elog
+		fi
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index e91114dbf411..a38b01a00823 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -16,6 +16,7 @@ IUSE="clearpasswd ipalias maildrop mysql spamassassin"
 
 DEPEND="
 	acct-group/vpopmail
+	acct-user/vpopmail
 	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( virtual/mysql )