Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.
author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:11:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:11:03 +0100
commit: 2929788def9a92c1eb237eed93fbdb0c02838bbf (patch)
tree: 166b01591366d3479084ea774c888bc84aaa8d4f /net-mail
parent: ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030 (diff)
63 files changed, 1016 insertions, 408 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 83ce7c483b83..90027d669f2b 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/asmail/Manifest b/net-mail/asmail/Manifest
index 4488588265a2..2636fc1f5e01 100644
--- a/net-mail/asmail/Manifest
+++ b/net-mail/asmail/Manifest
@@ -1,4 +1,5 @@
 AUX asmail-2.1-ldflags.patch 584 BLAKE2B 58b53fadf6209149a74c65333d742f99c549abab08b87e577e7363ff3a2601dd0e78a9d23181676510d6194e9533eb6293c45c089ccb4dcd85955e7aaf0a6c93 SHA512 d3714a3b250b434cd742c6a72afd73c673194375240c2d3ab3f61999be6c36f07dee9ed8cb86220b559613a10a00431757ad95121aba16196ecbc719eb347dc9
 DIST asmail-2.1.tar.gz 271164 BLAKE2B 00972dcdfd74c717a665425cad17c59b01ec631725b79ccc3ed537232e61c5aef231ec4146491335caf2beb451e686359cb196d01f199c33ed16cd66c625e99f SHA512 1251c9f386c01c23673a6798eafd6a518a103da6d2ab78bb4e22c1107939423c44f555e331f79d1b5b509f271582de285481022ef32375b4267b1f3e398f67d8
-EBUILD asmail-2.1-r1.ebuild 1028 BLAKE2B 7d40195635adc3325f879b87dd82dc35acf20c9a3d897052c8d5ba389e029902e142daa8cd93c0796cd577634bdfe97441603a9033fa1469c11b90873aea1b22 SHA512 1416244e948b528aace379b34f4b0145ec07a6aa57c62d1c989cea30ed67a68b02875c3504c10322beb17c3d5a3e3428d0a6362a00f25af83ef0590f327d6814
+EBUILD asmail-2.1-r1.ebuild 1032 BLAKE2B f67037d5cff4b12d6510d7105075f67e3687ad4e3f583de9bd1c9b1af7724650f5968f05941a01b717e38af36f7879f685fb69069be143897bed728b7221ae07 SHA512 1a36b78f1acb96e003196db060b56bbe1f4eeb6a58ef8061d850dfce7234d46286e63e06ace9f40f84cd9aace56eab7425bce1bb9d7070c4b29afcea3d955caa
+EBUILD asmail-2.1.ebuild 971 BLAKE2B f752c17cd9b25f2aa1a7518f10b8a2afc6ee8cc4554e6bdb489b725f8d0334012f7ec48af39de4222f8c08f5ece411a35e223572c6994ea244f5de621154237c SHA512 bf8b2a347aa20843334ef774f75ee313aacbc6ef2421364e645e85f714d79bdedab6cf287257b5c77e6e021523e7ea8ce85536db4f2e3c3343bbdc4d5cb7c135
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/asmail/asmail-2.1-r1.ebuild b/net-mail/asmail/asmail-2.1-r1.ebuild
index 352f73df0041..0aaf3d03b700 100644
--- a/net-mail/asmail/asmail-2.1-r1.ebuild
+++ b/net-mail/asmail/asmail-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="jpeg libressl"
 
 RDEPEND="
diff --git a/net-mail/asmail/asmail-2.1.ebuild b/net-mail/asmail/asmail-2.1.ebuild
new file mode 100644
index 000000000000..3adcfa115c3b
--- /dev/null
+++ b/net-mail/asmail/asmail-2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="a small mail monitor similar to xbiff"
+HOMEPAGE="http://www.tigr.net"
+SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="jpeg"
+
+RDEPEND="dev-libs/openssl
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libICE
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_compile() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -i -e "/LIB/s/-lssl/-lssl -lcrypto/g" \
+		configure
+	tc-export CC
+	econf $(use_enable jpeg)
+	emake || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+
+	newman ${PN}.man ${PN}.1
+	newman ${PN}rc.man ${PN}rc.5
+
+	insinto /usr/share/${PN}/pixmaps
+	doins pixmaps/cloud-e/*.xpm
+
+	insinto /usr/share/${PN}
+	doins -r sounds
+
+	dodoc ${PN}rc.s* CHANGES *.txt README* TODO
+}
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 9e1d49260c31..5a29270224c7 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -3,5 +3,5 @@ AUX 0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda091
 AUX 0.90-head-1.patch 1201 BLAKE2B e9e0748772232855ed1ce0990d2b5438dca1b86a671a5bf70827e33795914a5099e648ef6047f3537db19c7fdbb456e45d20ea00e12331334230cf9b95aa7b53 SHA512 b8fd43218a6b396b848e5e827ad30ce406b2c3860abbedf359c7649e4cbedac96968726e0a910c4e9f563d48ec924873c96f315392be2b4bbd252767bdb5f6a9
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
 EBUILD checkpassword-0.90-r2.ebuild 882 BLAKE2B 6177e356923eb86ac3cec6e65156d5da8130565ae287afbf7562641bbf92cb61bf6c6dfb75dc8b11640ad014701eb5e29a2e41a716f99a3a940560779b53df81 SHA512 e6eafd2032a99adb107c27be8a832b97d20592610e31df380e9aa98657dcf0800c0fabdb8c88d0bc2a81030c8e78c7b75167cf4313955a33c85981874b36a781
-EBUILD checkpassword-0.90-r3.ebuild 855 BLAKE2B e10918d69b0b0d541edfb006119a366975e0100ee343072f3d4603c5267f3ea4ce5b31aa1c15a400e377ef97ae8260f0ace18ebb68ab3f82f97f400884ce3c06 SHA512 0edd1f66c2b48e1808acddd809ea9fbf4cc9eec9536db8c08e9abd68cb18d3879813c28985df93ac5c4de561bd2e6301d14f18cefa47c313f38a41b645df1d41
+EBUILD checkpassword-0.90-r3.ebuild 865 BLAKE2B 13744c934c9cb6246c5cf72621449962e5bdb846b8589e0a2fce6d55e05f99b70b8d4c7eddb9a05ebf46d27bb61b685989e361b66782e5260e32cc418b492cb3 SHA512 f25768e0eee923e2f622eedcf6947fd6cc2dee2da13351658b3f4d5dcabc856a2abc5e05a5c9714981bbddc5020e4948a29b518cee1c5062c682320b5c96daa3
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild b/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
index 7ed02b16fe94..c922f7d85009 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index 490d781c7e65..8e1ddb9cbcf5 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -2,5 +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-030_tgz.bin 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
-EBUILD cmd5checkpw-0.30-r1.ebuild 1681 BLAKE2B 05e02a28616bab7b30e6c0d3ea9c666c4bee8a7f6a211274b4d4a8d677893d70847f750b3a46be9d27104efe06571a308b45d37246d4f69201ffec15c9ef46a2 SHA512 c0cc5a4c0d9f5d41cf94855bba5c9c39986879d84a37d9a084c980f5fcbdae432d7a38f67a24e20418590a6f39db315c3c8f5657f59de4540e177db1f59f6ef2
+EBUILD cmd5checkpw-0.30-r1.ebuild 1691 BLAKE2B 44cde62fd8a67e245be82eb5bd59ec72339fd7297e94391121ad5984534bed4d826ad3489cb4fe49b4437e2ec1330e64c8b456b7e352c8f0bd0c432b18a0249f SHA512 894ae35b328b592e0ed390de95e434fe50e32e9b35fc875df049779376d323fcd2c72c2049a0e357b6e276aebaa03d8f68808606935dc03694022cf0f6117d48
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
index 69b9d8a9a79b..2f4090ea437f 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://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 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index d897f4668aa8..0f14fe89ef9d 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 5954 BLAKE2B fd04209d2bb501f6f183d629912a31c092c39353e34cba5289227886ba64cb6958e272b468572276633a04ecc6ec3dd250723877c953542fac0b6bf11a4b6bb8 SHA512 375231311469c78dc6060a34d229dfaa044cee815b9e68b8d891f4149e098bcf3c0181a41f5703b1b2a9d2c2126fde0b6b689c924cc97daa47647beae2c20116
+EBUILD cyrus-imapd-3.0.11.ebuild 5958 BLAKE2B bebdea64973b145dc0d0cd52501a8ada7cde9e6a718233b65d39cc1d51d44f53c940646ddf318c986cfcdce29bd31c8a50760c38fe5af709fd415a2e6de51d1c SHA512 0744dca8ba77808ca0b49181d8f1d3e1131e1d99a72166f23722e97b123b0ecd60f65f32a4b2e29d6ec4de6e3f9f7e9edd9de9e78abfe4716c59d3e92b497906
 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..50d4b5e4bfce 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
@@ -33,7 +33,7 @@ CDEPEND="
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
+			virtual/pam
 			>=net-mail/mailbase-1
 		)
 	perl? ( dev-lang/perl:= )
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..2a381e5de2d7 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
@@ -33,7 +33,7 @@ CDEPEND="
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
-			sys-libs/pam
+			virtual/pam
 			>=net-mail/mailbase-1
 		)
 	perl? ( dev-lang/perl:= )
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 6cae63a3b95f..43f7a4a8331b 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1,5 +1,4 @@
-AUX 0.71-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa59dd78d7a5dbd488c599bd18bc15e3e36e4a50ea156c77614eaa4f507b968b6906699fe40f958cd295 SHA512 0576644a2820a42cac44be9ba564b5043245cdb192a50115bafc871e3306945a657440c7e74d6a83796a33b964269f60ab1b3345b65cdc5ff2342e4f2cbaf9ab
+AUX 0.71-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b001353b1f5cdc8b5f73d507a8edab3f525b4c1407c02c0c0d11e09e96eaa5d041217da23f92aaef6c03e1 SHA512 1d4c1abde8eb0b4d6dd2254be29b685c922265ededa02a19010bc487e2e2013ef2df9a86a5dd797e0d7a30567cc18ae72324f2a67558633aae76262b2a9681a1
 DIST dot-forward-0.71.tar.gz 26352 BLAKE2B 9757d07adc796ad35c6426eed3c53eb87f784a1035ad6569a8130e62a04665bb9ac03c250be0e5cb22f122c7204197f736dfc748d468c980814d23bb7ad0069d SHA512 f37a30eabf3a7e7258bfbe9178218d053a5164a9698fbc34954eb8bd588fe2bbf61ffd85f5b817e3ce65d7c0efac1735b59b11faa4d425e2df4089769af94b8b
-EBUILD dot-forward-0.71-r3.ebuild 885 BLAKE2B 282322b069e1ac37136ac9f880c60c31deb4ddbc94af7e7b09913f0dff12305085216e94e30c1c80a616b3f227c6a5b91e1d1ffc20d0ca169fb2bd6a36d74d04 SHA512 b9a5531604996f9ff4c77b2c82d5d650a85712fb56412f4d231b73230d8da6f9ac51b8a7d17ae25b869041036d6f0f42fe3bb9e661db38ca16bcc4e3e22695ce
-EBUILD dot-forward-0.71-r4.ebuild 893 BLAKE2B 39cfccea8de5d3dc6fe1f8027bd0f5a00ece19937414dea4a72aef5bebfaeadfdf60f999af8d48d58d9dba18cfcc8bf590077c033f44e62f2198f6c8eadf72cf SHA512 a3b56d21341c100644230b7397e5660706c525323569944146ca801cb64d4125c92d8dccf9dce53b4f24dcc39eb598108524b8fdd9129fe91f45a3a44f5bc8d7
+EBUILD dot-forward-0.71-r3.ebuild 889 BLAKE2B efeb612f0ee9df04b189e547959479cda5dece1060c040f1d965b3a0c1ff182f26c1be48d7bdfbc8bfdd0c87d6c31a2ce6397be9be0b15902f407ae31bd08990 SHA512 ecaf17fd09fcab850a381a959656c026909d7d72a1bf9922363485d14def267263a5e472b2e29548cdd7ebdd0cf22b7ab2bb45557180816bbf301ad89d2c9e30
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild b/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
index de66be680c77..89f0a60f2ae3 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=0
 
-inherit eutils fixheadtails qmail
+inherit eutils fixheadtails
 
 DESCRIPTION="reads sendmail's .forward files under qmail"
 HOMEPAGE="http://cr.yp.to/dot-forward.html"
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 # See bug 97850
diff --git a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
deleted file mode 100644
index beacedb8e4d2..000000000000
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils fixheadtails qmail
-
-DESCRIPTION="reads sendmail's .forward files under qmail"
-HOMEPAGE="http://cr.yp.to/dot-forward.html"
-SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-# See bug 97850
-RESTRICT="test"
-
-DEPEND="
-	acct-group/nofiles
-	acct-group/qmail
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-errno.patch
-)
-
-DOCS=(
-	BLURB
-	CHANGES
-	FILES
-	INSTALL
-	README
-	TARGETS
-	THANKS
-	TODO
-)
-
-src_prepare() {
-	default
-
-	ht_fix_file Makefile
-}
-
-src_configure() {
-	qmail_set_cc
-}
-
-src_compile() {
-	emake prog
-}
-
-src_install() {
-	einstalldocs
-	doman *.1
-
-	insopts -o root -g qmail -m 755
-	insinto "${QMAIL_HOME}"/bin
-	doins dot-forward
-}
diff --git a/net-mail/dot-forward/files/0.71-errno.patch b/net-mail/dot-forward/files/0.71-errno.patch
index f0cd380019f8..4aca1b2b4e58 100644
--- a/net-mail/dot-forward/files/0.71-errno.patch
+++ b/net-mail/dot-forward/files/0.71-errno.patch
@@ -1,5 +1,5 @@
---- a/error.h	2003-03-05 15:42:51.000000000 -0500
-+++ b/error.h	2003-03-05 15:43:00.000000000 -0500
+--- error.h.orig	2003-03-05 15:42:51.000000000 -0500
++++ 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/dovecot/Manifest b/net-mail/dovecot/Manifest
index 97828937bd52..45a8b450796d 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,10 +3,7 @@ AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed
 DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4
 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.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
-DIST dovecot-2.3.8.tar.gz 7136958 BLAKE2B 2769169519f0fd9293178e8d200467bc5be0f362bc6bfb3dcc6cc74ed146ecf66dab7730013704b70f0cc75a87ee5e52994137cd63c7c12c56bddcea37cedd07 SHA512 f62439e2ea77ffb544a7752c07085582c5653c64671cb42dd7a7e5aa69eb87059c677aa1fa071efa1ddd2287ab621e9a264ec115be2aeb2f43ab4c685411eae3
-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.2.36.4.ebuild 8571 BLAKE2B ffeffe8820f4ec9ab54828e260753ee2e77c7821bc8096e10b008f087d1781c8163256586c025e8177b0b8bf341026a0f37fe5d60bdfb2e01d463dda1f1f6214 SHA512 635117634a2a0437f6ae76da65b4b7d1534de6de71e493af7a4458ebeca1fbefea67b3839db76a9d9ecea0c7a623858c0efad21cfaf3819b50c3cbdb856b4643
+EBUILD dovecot-2.3.7.2.ebuild 8683 BLAKE2B 8bacc9251f1e1d86f8020b1c97c795e4ec81aac310d87008442215b9a870cb2a68e1b945a43f8b9bee5f139765af813164b295e7f192ddeafbb832b35e81713f SHA512 da83951d85ae21fc43eb14731ad70d208091637bfecbd34a0b59e51e2792477ae7810339c1093359cdc32450d4bac284f11795089a33551481a29073fd270a26
 MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
diff --git a/net-mail/dovecot/dovecot-2.2.36.4.ebuild b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
index 921d9821bd4c..10ac4e23aa58 100644
--- a/net-mail/dovecot/dovecot-2.2.36.4.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
@@ -43,7 +43,7 @@ DEPEND="bzip2? ( app-arch/bzip2 )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam )
+	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index 271aecab0c4f..94332fa22de7 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -46,7 +46,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	lzma? ( app-arch/xz-utils )
 	lz4? ( app-arch/lz4 )
 	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam )
+	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
diff --git a/net-mail/dovecot/dovecot-2.3.8.ebuild b/net-mail/dovecot/dovecot-2.3.8.ebuild
deleted file mode 100644
index b32f3cabf59d..000000000000
--- a/net-mail/dovecot/dovecot-2.3.8.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# 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.8"
-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/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 3a4fceca802e..9acadadc0d0a 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -1,3 +1,6 @@
+DIST ezmlm-0.53.tar.gz 62693 BLAKE2B f417522da8d2b3ae7d0465e7226cd95dc85b55a397b61a6ce20df15544639377667a8912f7a26daf83e54fd3f26881c4e771409c98a640b7b94c7b6e3fef7461 SHA512 0dc1c64168428c531dbf78ca99582de4d4193d10bb38e87d3ee8f33f78083dc696bfd0681e3f2f690d7aa78b55b1b91c4ea6900c109406063445104826ff6d94
+DIST ezmlm-idx-6.0.0.tar.gz 659996 BLAKE2B bf5f7ac0a40d1167d42ef26c4b28f95899f5a72d4c969c975368f61902f5ce9b5721143c251cdcb70c58149e6d7eb28c834b26426d9611b4249a285b523c38d8 SHA512 547186a2e32f3861ef51a9012442e7d8b553d90f2af949bb51845c29178ee2a44760471852c7c23fbd241c14753f22357463c5d5f10b70eceb05603cc6d83d4a
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
-EBUILD ezmlm-idx-7.0.0-r3.ebuild 1424 BLAKE2B 00a21949859705e02af4eb3e66438b26b6ed06e59c1c6d6d8608238ed71eee7d45081a388274b8022d3cdd1f7f50c9b237be8cfea34a9d5065beaae7b48316e8 SHA512 b59d8990b956e52e3afcfcbd4d73d105c56f3bb781ee956ae54bc13fa1c30a683db93ab9182d96ffc87ebaedcf5dde5a7be68a4a5dd44cf9f2d8ba8c9ed131f6
+EBUILD ezmlm-idx-6.0.0.ebuild 1740 BLAKE2B 268ec06ad95ed38cdb4fe02d4c36a1a10f877603a6c629c67e205ab4664cf9dfeec45d1dd9998ebe382dce754105476db2dc951ebc7420951163c2c1d9090b16 SHA512 42ffd641cd6d754f898c6d66b4026b0ec5f6492ba52b4f6799b0ef60ff0b1050e86db44886cc487c263da1a7c1d575ec0cb33842d3c47ce9cb0db00cc8713bb3
+EBUILD ezmlm-idx-7.0.0-r3.ebuild 1429 BLAKE2B 9e5641fbaee2a744019f1fbf0882b51f27193e926facf733bb6d769b054cf91270ad1ff88304f4cad09158a1e8338664296987be248358ef39320cfd260caa43 SHA512 235a676ea6da184741f0c6d7241ac91b6489b60744673a02acef534bce02796aae3c021e3f98692f6e5f88345ff023ddcc856c80c301787d38e8338cce17f93a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
new file mode 100644
index 000000000000..d3490191fb35
--- /dev/null
+++ b/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+EZMLM_P=ezmlm-0.53
+
+inherit eutils fixheadtails
+
+DESCRIPTION="Simple yet powerful mailing list manager for qmail"
+HOMEPAGE="http://www.ezmlm.org"
+SRC_URI="http://cr.yp.to/software/${EZMLM_P}.tar.gz
+	http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+IUSE="mysql postgres"
+
+DEPEND="
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+RDEPEND="${DEPEND}
+	virtual/qmail"
+
+S="${WORKDIR}"/${EZMLM_P}
+
+pkg_setup() {
+	if use mysql && use postgres; then
+		die "cannot build mysql and pgsql support at the same time"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}"/${P}/* "${S}" || die
+	cd "${S}"
+
+	epatch "${S}"/idx.patch
+
+	ht_fix_file Makefile
+
+	echo /usr/bin > conf-bin
+	echo /usr/lib/ezmlm > conf-lib
+	echo /etc/ezmlm > conf-etc
+	echo /usr/share/man > conf-man
+	echo /var/qmail > conf-qmail
+
+	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
+	echo $(tc-getCC) ${CFLAGS} > conf-ld
+
+	# fix DESTDIR and skip cat man-pages
+	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
+		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
+		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
+		-i Makefile
+
+	# ezmlm-mktab-{my|pg}sql may or may not be made
+	sed -i -e "s/\(^.*mktab\)/?\1/" BIN
+}
+
+src_compile() {
+	emake it man || die "make failed"
+
+	if use mysql; then
+		emake mysql || die "make mysql failed"
+	elif use postgres; then
+		emake pgsql || die "make pgsql failed"
+	fi
+}
+
+src_install () {
+	dodir /usr/bin /usr/lib/ezmlm /etc/ezmlm /usr/share/man
+	dobin ezmlm-cgi
+
+	make DESTDIR="${D}" setup || die "make setup failed"
+}
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
index 1f0025826f86..a8b8d7a76fe3 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE="mysql postgres"
 
 DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/net-mail/fastforward/Manifest b/net-mail/fastforward/Manifest
new file mode 100644
index 000000000000..8238dd7c8f21
--- /dev/null
+++ b/net-mail/fastforward/Manifest
@@ -0,0 +1,4 @@
+AUX 0.51-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b001353b1f5cdc8b5f73d507a8edab3f525b4c1407c02c0c0d11e09e96eaa5d041217da23f92aaef6c03e1 SHA512 1d4c1abde8eb0b4d6dd2254be29b685c922265ededa02a19010bc487e2e2013ef2df9a86a5dd797e0d7a30567cc18ae72324f2a67558633aae76262b2a9681a1
+DIST fastforward-0.51.tar.gz 40659 BLAKE2B ec4fe86431fd2a6622f721cbb0c5417b36e2a12bd121e5138ed7b7a311e9359bb9a7866a8bc4515d370873c7c26a85d4f0a0400bf3692a2a6dc544c584bef688 SHA512 7206f72dc7bb42d7e0cc63980eda7bc2b93c7ca6639db810f6d28476ab58d3e4bb6e441f4eef2149c5fe933c2f9effe2f2b3101d02cf9f6e922a678e7466b132
+EBUILD fastforward-0.51-r1.ebuild 948 BLAKE2B 3fcac0cba656ac33719de240bfb00200b56d3abd4dcd546fb2075c2feef896a8b602a215d7af467d779122069355d6f26fa3304076a5d7de5a3d2fc8b45a1e1b SHA512 fc9b1a80f071bddf45729b8f34d750f30b48da7dcfdf24eb9e09af36c2ede9057c772f67fbdc76be0dae3fd51da0c87d7d6f7b77296f5a99cd6610c23003af73
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/fastforward/fastforward-0.51-r1.ebuild b/net-mail/fastforward/fastforward-0.51-r1.ebuild
new file mode 100644
index 000000000000..6aea058518e0
--- /dev/null
+++ b/net-mail/fastforward/fastforward-0.51-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils fixheadtails
+
+DESCRIPTION="handle qmail forwarding according to a cdb database"
+HOMEPAGE="http://cr.yp.to/fastforward.html"
+SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~ppc sparc x86"
+IUSE=""
+
+DEPEND="sys-apps/groff"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-errno.patch"
+	ht_fix_file Makefile
+
+	echo "gcc ${CFLAGS}" > conf-cc
+	echo "gcc" > conf-ld
+}
+
+src_compile() {
+	emake it || die
+}
+
+# make check is actually an install-check target, see bug #283177
+src_test() { :; }
+
+src_install() {
+	dodoc ALIASES BLURB CHANGES FILES INSTALL README SYSDEPS TARGETS
+	dodoc THANKS TODO VERSION
+	doman *.1
+
+	insopts -o root -g qmail -m 755
+	insinto /var/qmail/bin
+	doins fastforward newaliases newinclude printforward printmaillist \
+		setforward setmaillist
+}
diff --git a/net-mail/fastforward/files/0.51-errno.patch b/net-mail/fastforward/files/0.51-errno.patch
new file mode 100644
index 000000000000..4aca1b2b4e58
--- /dev/null
+++ b/net-mail/fastforward/files/0.51-errno.patch
@@ -0,0 +1,11 @@
+--- error.h.orig	2003-03-05 15:42:51.000000000 -0500
++++ error.h	2003-03-05 15:43:00.000000000 -0500
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
diff --git a/net-mail/fastforward/metadata.xml b/net-mail/fastforward/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-mail/fastforward/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index cdaa168bedad..34631019eba1 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -8,6 +8,6 @@ AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27f
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
 DIST fetchmail-6.4.0.rc4.tar.xz 1254560 BLAKE2B 9f80cd0f1aa4ecc215e370154069f9b5fab04c84b1a6c196e5911a1481732568d7e391e2098437217c893ee00900e8980a7e59328dacd4e3faaadcdd242a71b4 SHA512 1085668464534f39c7939fdbe845397ca7f9c709bb0f816655643cb5a7d4adcb63e32a534f10303c5366d786bd7fd4650fd960c21f0346a10e78860e11bbd6fd
-EBUILD fetchmail-6.3.26-r4.ebuild 2641 BLAKE2B d8613523a8325dfd7428d8dbdf9a03daea325cd3964abd269874885a07a9fa8fed07ed9f413aaa02250038dba6a59cbd7cdec26a93b81220ec35fe508e0a036b SHA512 921afff61fe1bb5ae117d77a7472d0e61d093b92bbe09a08a76d964b161882fefdec6dca090267d14e60e2374bbfc82177d271518ce9dcfeeefc61e63909d12c
-EBUILD fetchmail-6.4.0_rc4.ebuild 2619 BLAKE2B 5628979bf839a24d72ae6b37e3a18803a646e4355e411823023dee43e9cda6794649a0627e750b257704f6fb1f4f1b3c7b1d21fe74dd96c8d070884197a3e0f4 SHA512 5b58dd3bedf595822dfb7c7f577cbadec9ba2dc80903eec9f3d50a847a2c6b798ad135cd3c0c0049982f42b78a4f6049d9e1b2b12d70ae5ae9942c1d3f62be66
+EBUILD fetchmail-6.3.26-r4.ebuild 2651 BLAKE2B 37c23dd84e4a15d494370a816f902409c0c0845b30f7006166bfb049c29d5ca3dd21d498ccdd0258b9e6c6e52d46df999876b7feed55678bd62eb385f2043f82 SHA512 c91f4ee8a96b5c6e88761513eee5919c116f23e12af44bb880cf6e48a2a9b31847d6409279053900a3a28832c73abdeaa2406c28defc9ca3f65a69891f149aa3
+EBUILD fetchmail-6.4.0_rc4.ebuild 2629 BLAKE2B f1aa04c1239d4f0acb7883f628afc99d0bd47fe166f1bfee18bfec351652f9f20792de72b9d95bc8697781fa299077347e7747fbdc08aa379e25dc17cbf1750d SHA512 090bf0365767861d0c50de647070b87b1f71e0ae6f0088f25b0708ab994b25e9f8a5bbbe7514dddbc1074edf1157e39cab0d1fcd66014bace45dcf6708772e21
 MISC metadata.xml 431 BLAKE2B b8d0c68ff6274dadbcee2c3e51fdd524d026b5b5fbb20307949a190b8ac219a444f555b6c5420459932792fd02b2968d9b59c3bfb41252740bc7a191ce96c68a SHA512 b011852712d3310d0b9dd052215b514b4f2032ebf13733c49da7499207264524bb28231ca5d3309867f5154162c8b2f6dacc1a324b5f3f41c58818e04d705d46
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
index 3a46ab22e32a..2c4f7209dbd6 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r4.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r4.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 ~x86-fbsd ~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/fetchmail/fetchmail-6.4.0_rc4.ebuild b/net-mail/fetchmail/fetchmail-6.4.0_rc4.ebuild
index c88f69b5201d..c7094062242f 100644
--- a/net-mail/fetchmail/fetchmail-6.4.0_rc4.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.0_rc4.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 ~x86-fbsd ~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/gensig/Manifest b/net-mail/gensig/Manifest
new file mode 100644
index 000000000000..ea8ffe25ce82
--- /dev/null
+++ b/net-mail/gensig/Manifest
@@ -0,0 +1,3 @@
+DIST gensig-2.3.tar.gz 96744 BLAKE2B 11115494df5078ef34608115c29277010c4c5ec3642a0f32705719b3fda20c8a655c61589cdb0140bf14629c255cbeb163f7c2add4c29677eb2339b6085c4dd3 SHA512 2d54f85be472f94f0c5edccc1d84d3c140e8f91d8d9dd50f404ec3a9856c2a5a9f74e6f6e315243c4d5cc60c9a817c8c50501056c2327f65e3218952e6e44aec
+EBUILD gensig-2.3.ebuild 390 BLAKE2B 80af7c39df63085f1f258fb78263d606be8a6aff1ebd3c30fbcc8e48396b3daf6487e4203381616576a3fdd0e1304fbdbdc8879c7078de2966cefaf375e78d25 SHA512 d08e730520b0b71d217151d7ce86b1d2f23a6e386467da32e5c6d6080474c9e10e78e927bca0eee5c7faba53a61c015eef8c58cab219f7955f03c46a9ec9727f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/gensig/gensig-2.3.ebuild b/net-mail/gensig/gensig-2.3.ebuild
new file mode 100644
index 000000000000..19ef16d5b60b
--- /dev/null
+++ b/net-mail/gensig/gensig-2.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="Random ~/.signature generator"
+HOMEPAGE="http://www.geekthing.com/~robf/gensig/ChangeLog"
+SRC_URI="http://www.geekthing.com/~robf/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+DEPEND=""
+
+src_install () {
+	make DESTDIR=${D} install || die
+}
diff --git a/net-mail/gensig/metadata.xml b/net-mail/gensig/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-mail/gensig/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-mail/kuvert/Manifest b/net-mail/kuvert/Manifest
new file mode 100644
index 000000000000..0ca37124ee00
--- /dev/null
+++ b/net-mail/kuvert/Manifest
@@ -0,0 +1,3 @@
+DIST kuvert_2.0.4.tar.gz 118352 BLAKE2B 424968de1fc915c3858acb9c86fc9e90578db676502d0beae0d4c36217a53427884b79c24ffe2ef4f9e80b07a07a8aebf02a1b57271e6fb0b251210f4e439323 SHA512 01421ca8cf86de935040ecb7312833190e97bd99d3d3ab32356b1249df4e11eefa02cd9f0784d2c6c9135d065ee184b508efa55e5865d0b586f3267956611f1f
+EBUILD kuvert-2.0.4.ebuild 844 BLAKE2B 6d814a30b201d2cc227aae2913af43a114543f64475d49d85585bff589172a693bf0c1b3830b59cf101b28c0451c63e82401a2dcb736e47b72471520c325cc2d SHA512 80c5bc623b10af52c2c8363a62dd54528cc750681e4353a315c60aea25a466f0f2bbc271f0488c14ae9d6483691f5c798db0a27ab967c6721aa76e23495f9d66
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-mail/kuvert/kuvert-2.0.4.ebuild b/net-mail/kuvert/kuvert-2.0.4.ebuild
new file mode 100644
index 000000000000..18570068f804
--- /dev/null
+++ b/net-mail/kuvert/kuvert-2.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+
+DESCRIPTION="An MTA wrapper that automatically signs and/or encrypts
+outgoing mail"
+HOMEPAGE="http://www.snafu.priv.at/mystuff/kuvert/"
+SRC_URI="http://www.snafu.priv.at/mystuff/kuvert/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc"
+IUSE=""
+SLOT="0"
+
+S="${WORKDIR}/${PN}"
+
+DEPEND=""
+RDEPEND="app-crypt/gnupg
+	sys-apps/keyutils
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	dev-perl/Authen-SASL
+	dev-perl/File-Slurp
+	dev-perl/Net-Server-Mail
+	virtual/perl-IO
+	virtual/perl-File-Temp
+	virtual/perl-Time-HiRes
+	dev-lang/perl
+	virtual/perl-libnet
+	virtual/mta"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc dot-kuvert README THANKS TODO
+}
diff --git a/net-mail/kuvert/metadata.xml b/net-mail/kuvert/metadata.xml
new file mode 100644
index 000000000000..1b2becffa26c
--- /dev/null
+++ b/net-mail/kuvert/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index eb337735fe82..dc22a83471d6 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,5 +3,9 @@ AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
-EBUILD mailbase-1.5-r1.ebuild 884 BLAKE2B 0b8ca2501fe7f11f9112299804d7ed47bc895c4fa9eb9cfa27685c72a1a883b8e8d0d3f8af3f49283beadb1f638abc461b969168d3e35dbfa31721e837f4f203 SHA512 dbdd0888d7bfaf472f44044510bca8659ebbc3e33b68aaf50aab47b8cc9a6c54aca3701423a9b084a63d7b2c08a231667f3765ceada635e1ac377e06242a5366
+EBUILD mailbase-1.1.ebuild 1657 BLAKE2B ae93c9819b1e5bb8f8ede43955453d2f6aa68a306ebce97b611bb1b37abcbb12fe390c20a4db2c997f860c0b2b0db251052b12d6073e70c3ee1e40b7361139b5 SHA512 998ad423d34728fd24d0ff04d014568eba456775deedb1551e9c8e05a5993235347b0235975599e330e0545a84d8857ac84ce160fedc3bbb8d8062b908026932
+EBUILD mailbase-1.3.ebuild 1458 BLAKE2B 835a54fe1e299fd10342d6d890ef3436b91483a9e12cfc74d4291939c0a8bb1702f9467b9b9f0687a748915fdc3bdccefedaace530d96cb4d37108a474db3e7a SHA512 60cbbe72959a4b0f7f05080765257cdc18bde09c5444acf97d19b4bfbbe70eec3b6e110cbefc382db74d1506f551d9d5e919e8b927465c70fd6ac8a951eaaeb3
+EBUILD mailbase-1.4.ebuild 1482 BLAKE2B 81ae7a20ec4a3ae0e03d6b7ac1600f12784cbe8af947a3e4817d3f81319b3ab613f9838a3be1b5434da4824f7e334ca6929308e7cf71d54ec60be258b97b6f49 SHA512 024719cd733dbad2dd718367255d36688c3ca9c071807d8f2d13c6879d5539a456b64f11842fb73dd5236bc36bc7f0b41135cc1237d2d2037de2d761763a3565
+EBUILD mailbase-1.5-r1.ebuild 917 BLAKE2B a5e6583ba63d42c4abdb11d842763f0901f0711aa89918545e2b1bf78d456e7fe174e7be4015444fc925a17142affc040405b1c1759d3430a185f6d7ba97b11d SHA512 6da0509c46c811577d842b7a6ceac586cf77e5e94c3ffc31f8364a76b541d8108dbf3b5e697f8dd97b738e06e778aec77c0b6a3f7bbd45545a4f3f0f65113521
+EBUILD mailbase-1.5.ebuild 1482 BLAKE2B 4862a2824fb0c7f56ca4a0c7c443c0dfeb46824bd82fe144233efa397173d8620ba53d8ee9ba97d92bd7d368b694fec8645cd37d5216b6f707286595a35229d2 SHA512 001c7732c000d60fa3c336a1b57dc973c650814b6dba511d520d1977d67e9dc1f938d6d7c186109c8dd2f0dbe39bb541ab4a41ddc1e435e85ec88ef883ce1a46
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/mailbase-1.1.ebuild b/net-mail/mailbase/mailbase-1.1.ebuild
new file mode 100644
index 000000000000..89b5f81ff118
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit pam eutils user
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="pam"
+
+RDEPEND="pam? ( virtual/pam )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup mail 12
+	enewuser mail 8 -1 /var/spool/mail mail
+	enewuser postmaster 14 -1 /var/spool/mail
+}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases || die
+	insinto /etc
+	doins "${FILESDIR}"/mailcap || die
+
+	keepdir /var/spool/mail
+	fowners root:mail /var/spool/mail
+	fperms 03775 /var/spool/mail
+	dosym /var/spool/mail /var/mail
+
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p} || die
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p} || die
+		done
+	fi
+}
+
+get_permissions_oct() {
+	if [[ ${USERLAND} = GNU ]] ; then
+		stat -c%a "${ROOT}$1"
+	elif [[ ${USERLAND} = BSD ]] ; then
+		stat -f%p "${ROOT}$1" | cut -c 3-
+	fi
+}
+
+pkg_postinst() {
+	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
+		echo
+		ewarn "Your ${ROOT}var/spool/mail/ directory permissions differ from"
+		ewarn "  those which mailbase wants to set it to (03775)."
+		ewarn "  If you did not change them on purpose, consider running:"
+		ewarn
+		ewarn "    chown root:mail ${ROOT}var/spool/mail/"
+		ewarn "    chmod 03775 ${ROOT}var/spool/mail/"
+		echo
+	fi
+}
diff --git a/net-mail/mailbase/mailbase-1.3.ebuild b/net-mail/mailbase/mailbase-1.3.ebuild
new file mode 100644
index 000000000000..6a3ab7e4c86d
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam eutils user
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="pam"
+
+RDEPEND="pam? ( virtual/pam )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup mail 12
+	enewuser mail 8 -1 /var/spool/mail mail
+	enewuser postmaster 14 -1 /var/spool/mail
+}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	doins "${FILESDIR}"/mailcap
+
+	keepdir /var/spool/mail
+	fowners root:mail /var/spool/mail
+	fperms 03775 /var/spool/mail
+	dosym spool/mail /var/mail
+
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}
+
+get_permissions_oct() {
+	if [[ ${USERLAND} = GNU ]] ; then
+		stat -c%a "${ROOT}$1"
+	elif [[ ${USERLAND} = BSD ]] ; then
+		stat -f%p "${ROOT}$1" | cut -c 3-
+	fi
+}
+
+pkg_postinst() {
+	# bug 614396
+	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
+		einfo  "Fixing ${ROOT}var/spool/mail/ permissions"
+		chown root:mail "${ROOT}var/spool/mail/"
+		chmod 03775 "${ROOT}var/spool/mail/"
+	fi
+}
diff --git a/net-mail/mailbase/mailbase-1.4.ebuild b/net-mail/mailbase/mailbase-1.4.ebuild
new file mode 100644
index 000000000000..30ec0e15153c
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam user
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="pam"
+
+RDEPEND="pam? ( virtual/pam )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup mail 12
+	enewuser mail 8 -1 /var/spool/mail mail
+	enewuser postmaster 14 -1 /var/spool/mail
+}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	doins "${FILESDIR}"/mailcap
+	doman "${FILESDIR}"/mailcap.5
+
+	keepdir /var/spool/mail
+	fowners root:mail /var/spool/mail
+	fperms 03775 /var/spool/mail
+	dosym spool/mail /var/mail
+
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}
+
+get_permissions_oct() {
+	if [[ ${USERLAND} = GNU ]] ; then
+		stat -c%a "${ROOT}$1"
+	elif [[ ${USERLAND} = BSD ]] ; then
+		stat -f%p "${ROOT}$1" | cut -c 3-
+	fi
+}
+
+pkg_postinst() {
+	# bug 614396
+	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
+		einfo  "Fixing ${ROOT}/var/spool/mail/ permissions"
+		chown root:mail "${ROOT}/var/spool/mail/"
+		chmod 03775 "${ROOT}/var/spool/mail/"
+	fi
+}
diff --git a/net-mail/mailbase/mailbase-1.5-r1.ebuild b/net-mail/mailbase/mailbase-1.5-r1.ebuild
index e4aeaa32cbcb..8a212cf0d798 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r1.ebuild
@@ -10,14 +10,14 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 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 ~amd64-fbsd ~x86-fbsd"
 IUSE="pam"
 
 RDEPEND="
 	acct-group/mail
 	acct-user/mail
 	acct-user/postmaster
-	pam? ( sys-libs/pam )"
+	pam? ( virtual/pam )"
 
 S=${WORKDIR}
 
diff --git a/net-mail/mailbase/mailbase-1.5.ebuild b/net-mail/mailbase/mailbase-1.5.ebuild
new file mode 100644
index 000000000000..898d804dc88a
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam user
+
+DESCRIPTION="MTA layout package"
+SRC_URI=""
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="pam"
+
+RDEPEND="pam? ( virtual/pam )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup mail 12
+	enewuser mail 8 -1 /var/spool/mail mail
+	enewuser postmaster 14 -1 /var/spool/mail
+}
+
+src_install() {
+	dodir /etc/mail
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	doins "${FILESDIR}"/mailcap
+	doman "${FILESDIR}"/mailcap.5
+
+	keepdir /var/spool/mail
+	fowners root:mail /var/spool/mail
+	fperms 03775 /var/spool/mail
+	dosym spool/mail /var/mail
+
+	newpamd "${FILESDIR}"/common-pamd-include pop
+	newpamd "${FILESDIR}"/common-pamd-include imap
+	if use pam ; then
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}
+
+get_permissions_oct() {
+	if [[ ${USERLAND} = GNU ]] ; then
+		stat -c%a "${ROOT}$1"
+	elif [[ ${USERLAND} = BSD ]] ; then
+		stat -f%p "${ROOT}$1" | cut -c 3-
+	fi
+}
+
+pkg_postinst() {
+	# bug 614396
+	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
+		einfo  "Fixing ${ROOT}/var/spool/mail/ permissions"
+		chown root:mail "${ROOT}/var/spool/mail/"
+		chmod 03775 "${ROOT}/var/spool/mail/"
+	fi
+}
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index e6238904b96d..0defee44ee7a 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -13,6 +13,6 @@ AUX twomsg.at 2216 BLAKE2B 8a0ac15f6c2a8824406d9a74e14f3143e48b9fd7636732bfae918
 AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780e71224605d735722cb50ba078aa9747b286291d560d9b5e28393239995c1648407070db97 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
-EBUILD mailutils-3.4-r3.ebuild 3660 BLAKE2B ac65c1019674bb6489a6775158b0e17afdebc56891db99dcadf1b8c4827946aa03d7c1a7b8e482cbeb7a941ad40a4618a0c036e33067a1cab536bccee4346e17 SHA512 62d946a71308d6627e34ef323d5ebd8f5e582c2e537a25a477ebcb34571d74ed9b64be68a0576d90c7d060702d0e3f81e6b9e01d9ef9890d8578654f1d57dea0
-EBUILD mailutils-3.7.ebuild 3620 BLAKE2B 692e1d5ff2890aea3d0c2f5d17d8aebff9d9cb05ecbe3a33a4695f22e7757568e41f1b70212609308f31531654250ee7cf73f6ebe2b96df51d399af041026ed1 SHA512 d322ef09a238a7bcb9932cc501d45768bc8072afe563274dd557f79032f7413750d6585a142ecf59774f558161da9fe76744441d8d76346fe85ba6a634a640bf
+EBUILD mailutils-3.4-r3.ebuild 3659 BLAKE2B 2ebc7f7e7ade4bb105bdc048e9abdbf1760eda5ce61469389e9c75b3e417dc1cf99c8304aca16514f4f917ecbea7fcccec4f474828b57bf28dd3a79abfeac85d SHA512 6491a8647fa1d91013fc3e03f5195a488182997967fb90019f32c5bc7f8820f3db07e7bd10f4cb43788d28bfb517c8a52ad6969f3e79197bb6756cc4d003e6f0
+EBUILD mailutils-3.7.ebuild 3619 BLAKE2B acb7c1ca9fa7fabcb6713440bcfe7987b67179ccb687bf3b8247071a2cbf43a6852865362b9ea148c033b8587766bd575198a41001e25c9f823f7b12f9e75072 SHA512 434d96f09388488e44facf0bf973846ff3d324da5adbcc64335fd5f0da5b9a7367f7a35856e806e6c6e5e9c36ea624b84b96b80789648e8bf8652742a32c5891
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index ab5c356f37f0..a3180e98440c 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="!mail-client/nmh
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )
+	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
diff --git a/net-mail/mailutils/mailutils-3.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild
index 76cd4bd9c811..9a796c2d5cd8 100644
--- a/net-mail/mailutils/mailutils-3.7.ebuild
+++ b/net-mail/mailutils/mailutils-3.7.ebuild
@@ -35,7 +35,7 @@ RDEPEND="!mail-client/nmh
 	ldap? ( net-nds/openldap )
 	mysql? ( dev-db/mysql-connector-c )
 	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )
+	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( virtual/gsasl )
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index 638b360f6de4..bbd5220b6462 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,4 +1,4 @@
 AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b869040025951dbaf1f07345a95c9bc45d40f87c3ad9a83d6556421f805d65952f4f9d7588abed9bb5b25f SHA512 333d331433a0b43f414f83e51cad3502afb6f5b287967e55d0dedd90ac06955ccbcbe598a3dafe682c97a7ac4ecf501c0842ade940c0702fb797717e8844ffd4
 DIST poppassd-1.8.5.tar.gz 6054 BLAKE2B f97c908a3880aa9ddb76ce09f33046649dfa2d145c8d8d5b70f1a7b473ba2ba8901b62d8e0644187c5987e3c4c8257c8f2bee9504b98bf3d81035e0acda4522c SHA512 4d8d9c3b15b986bd34e5e459f654e8137019a2466b9fec001d9e61a3267b09f150c3faee8e6914d98742c7b3a7301271ba522ee6dff614cca97815a3ae241ae9
-EBUILD poppassd_ceti-1.8.5-r2.ebuild 908 BLAKE2B 2b20b468bb071291b0381f0928fb89c5b448e59d983cb453f0155387a3b232f806032f27e4e44ce174ec35f6e8e115de09127704b9d067be5be0bcc6a9fb86d7 SHA512 d46b73589cb8e0eb37d666504024b9ba85b14ec4121230d5564c7e8b5046b4010b57e0046ab451f784066d0aaad150517b657170998caaf56753f37b9a7010bd
+EBUILD poppassd_ceti-1.8.5-r2.ebuild 910 BLAKE2B f0cf814c91814de5ab0f0e587a5c1f865286642f90a06d58cc57eb95f190dc3b2b8bf629d3be947f5bd78936923ea99586af782990e40dd940f1fa241aecfb01 SHA512 004588261ef4a027c984bb8f776c98e08de981b8b9e243c21fdf14bc53e7410ba26db1c4556000ae7d42053fea1e7a87e85b7856e28ffb005d2a4a589f871652
 MISC metadata.xml 700 BLAKE2B fbfae81fc82399b6743b1955eaf992676f2b2ad855fd0cb4db28526a0a0fc548371bd2edc7cf8b4914c3b1d209ec39f4c4cdbf1222f00dafef772ee871f193d0 SHA512 2d790e5243bc98e89a52485b30ec59a5cf67405018a542428d050fcb1d005cc0d25d2942499c07d15f8b80c9b976aaccf05fff00d010c7f8563085350d7820bd
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
index 170e89cb3179..e10ef52802f7 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="sys-libs/pam"
+DEPEND="virtual/pam"
 
 RDEPEND="${DEPEND}
 	sys-apps/xinetd"
diff --git a/net-mail/qmail-lint/Manifest b/net-mail/qmail-lint/Manifest
new file mode 100644
index 000000000000..14b249225b1b
--- /dev/null
+++ b/net-mail/qmail-lint/Manifest
@@ -0,0 +1,3 @@
+DIST qmail-lint-0.55 13531 BLAKE2B 53257224dbf87d6537d9e0377d1bbb3f268db464c1291ed159fed82aec69b3f167b6f680ba914367bfe04c6e3763f680848b3523edb87a5c2ccec9e36bc05133 SHA512 d9f81df52f5587c1f4083789ec55795c1b9cfd896583f4bd910ec7fc542daa9da0a6cbe368d261071224981c5e731aa26560ef645a2c9ce64ae8563e9b6b28ec
+EBUILD qmail-lint-0.55.ebuild 563 BLAKE2B b51a3b3d685d0c2d4ae106391dee078c8ec3901a089f5b485e26d68e2933cd5000d85b45a6954e371e91797f7b742a48a160f9035a0def2ec19c9e1b372c5b57 SHA512 066cfa714148a3150a8b8c56544995253235314dba430e78cc9acc5c603404f674ce9f48f4842a48f66bd671ac85b7b838c7366fe8a23d99597f774af42cf7a3
+MISC metadata.xml 397 BLAKE2B 3f8244d0b47b10f0bcb588fb3f7d0636f40c95dbd95ca2361fdfbdf10b368467ac14a2fabff33795a03e334abefc15fcd182f7b793f290fea3933e8f5a4af48f SHA512 c2b97a33cf013b2353821b86a5e533ee1b6e0e2b2bf3494d4b7ef7a7301c0151985d53f17b342697744534f034929a479d8f1bc63a4ed14d999ce8b17f08abc7
diff --git a/net-mail/qmail-lint/metadata.xml b/net-mail/qmail-lint/metadata.xml
new file mode 100644
index 000000000000..b57523ef337c
--- /dev/null
+++ b/net-mail/qmail-lint/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+  <name>Robin H. Johnson</name>
+</maintainer>
+<longdescription>qmail-lint checks your qmail configuration for common
+    problems. Prints warning or error messages to stdout.  </longdescription>
+</pkgmetadata>
diff --git a/net-mail/qmail-lint/qmail-lint-0.55.ebuild b/net-mail/qmail-lint/qmail-lint-0.55.ebuild
new file mode 100644
index 000000000000..604dbc77c935
--- /dev/null
+++ b/net-mail/qmail-lint/qmail-lint-0.55.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="qmail-lint checks your qmail configuration for common problems"
+HOMEPAGE="http://www.qmail.org/"
+SRC_URI="mirror://qmail/${P}"
+
+LICENSE="qmail-nelson"
+SLOT="0"
+# Should run on all platforms without issue
+KEYWORDS="~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/qmail dev-lang/perl"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} ${PN}
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/net-mail/qmail-qsanity/Manifest b/net-mail/qmail-qsanity/Manifest
new file mode 100644
index 000000000000..e50f210d9bc7
--- /dev/null
+++ b/net-mail/qmail-qsanity/Manifest
@@ -0,0 +1,3 @@
+DIST qmail-qsanity-0.52 3888 BLAKE2B 41ef561890d16bc3ef828a05bb0273bd7a6183dc2d72c3b88ece1ed218a8dc3962791d4d7d8c2c16d97a5f01820ccba93ce0e999fc01a8d3434c9f33c42f3825 SHA512 fa0b9f9efc3138ab700d03fab4214b1f1e07eb03a812f0c74435c545ddb64d0a2e9b47bb3c063c16259c6f2e23ed2157d6316d6cabc820ad7f00dbf22ae4c0bb
+EBUILD qmail-qsanity-0.52.ebuild 562 BLAKE2B 1f262e275233c3a9dd325bd7db035ee122f81ae4905429301ba529f24d172da545bcf77e9def6af0bca8ec898c4c81a1b91008932fa71f2d5618b5fc28753b75 SHA512 771a6c8fb9559c3bdecc6fcff4401c188f24240e7d6c41a78cae4378e4090e4dcc4c3e4fa31cbbfd0f9284d3e9b5d03bc06ec301fe15e72496da2af99f81f78d
+MISC metadata.xml 509 BLAKE2B 1215bc847899983e679cc5090d8fc61089f30aa361dceb0b8c437ef734e3682277e3e58351e09eea32027f19264a7ae1ea2c976b849e56c875f8365787d05a61 SHA512 37810a279e6a0c895736c07fc6005f4937da4d9af40976aeff1fd51668a067556f67d3afb86caae3a567c152d1d1db9f5b171389e8892785805e581b7cb5b708
diff --git a/net-mail/qmail-qsanity/metadata.xml b/net-mail/qmail-qsanity/metadata.xml
new file mode 100644
index 000000000000..e611051e05a3
--- /dev/null
+++ b/net-mail/qmail-qsanity/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+  <name>Robin H. Johnson</name>
+</maintainer>
+<longdescription>qmail-qsanity checks your queue data structures for internal
+    consistency. If it finds any problems, it prints a warning to stderr. Plans
+    are to change it to generate shell commands which will correct the
+    problems.</longdescription>
+</pkgmetadata>
diff --git a/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
new file mode 100644
index 000000000000..fca9a037994b
--- /dev/null
+++ b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="qmail-qsanity checks your queue data structures for internal consistency"
+HOMEPAGE="http://www.qmail.org/"
+SRC_URI="mirror://qmail/${P}"
+
+LICENSE="qmail-nelson"
+SLOT="0"
+# Should run on all platforms without issue
+KEYWORDS="~hppa ~ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/qmail dev-lang/perl"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} ${PN}
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index a104d9c499da..2e0567d92a6d 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r1.ebuild 716 BLAKE2B 95494245c70d0a865d17d9563d14bb4331df637a846cc674c2ff4aa57cb8b00a7b55069f956776b7847f2ba5fdd6a4abc432378f1116f774a962262d5104f102 SHA512 10a24c65683ef07392226b98aba27f932c8dd4031876b495a17793c2cc1ce4817331445926b45326dfa1720479945dff33b45ebac6acf4b302088f2ce00b0f2a
+EBUILD queue-repair-0.9.0-r1.ebuild 726 BLAKE2B a3a9d2ca88e602154cd5035707c854ee24556e4cf3f5a71b17aeab50d88861b2df8df132dc7a3dc74c9bbaa88190ecd85c87e2328842da27ffadc0981d675099 SHA512 2b993f5d3f94b632654c24594fc174e5354c06b5a1122dbc606944c1e5c991b006ecaa0ff35dcbc1d84c9dd49b25c3b15e08643b5b9888298da817addb36f3ed
 MISC metadata.xml 466 BLAKE2B 521a85c974ed87b309ccbcd648599ffa3b20602a61654b164dd2b6b0f5cca7ac97716f211c9cef797604e842d6178c4c8345b2287dff3bac7a4c07072521b1ef SHA512 aa06f7e98e2c8e84edafa0a3662a7aa937389ede576f9fde6ae4ff5994faed83aee61b6f58d4a5b2db0d126a7a7f4b23fc7b4124eb4a5368511ebfa17856b17b
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index e885be14ff17..c53b8f26c1f0 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index fd95adacdc2e..203212341529 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -1,6 +1,6 @@
 AUX tpop3d-1.5.4-gold.patch 730 BLAKE2B e3f30e0aae7ca80c3834dbe63216bff73de20981ad7b02b062b3f13d61c83e4183d0228a065139d2be5b2792f2bf5001b1bede35b7382a57ff895e7fc9437955 SHA512 cf4b2ab8b6f51bf749e32a8204e850ef97426a6de14f3d5d5128725791838717b5b8cbcc4fb80a5534d6820200ebef50dde8d2e20e44133f029be3a2d72a57c6
 AUX tpop3d-1.5.4.init 607 BLAKE2B 8cc947bb35566f09236a5a6c06f6b1b8938d51f9dfe0ef3230507a5a6885bdee8eac11a3e90cdee52b24219cade824c45b15e5777a154a28b78167eaef6decce SHA512 004d2e5ca802ad7681c3f6392728602f54c13c6072d38b147be469e5f9ef09916f7c6c57af944c845e4b504f46fe4893323d5a125b7dc4bdfc2d479a5ee696e9
 DIST tpop3d-1.5.5.tar.gz 285027 BLAKE2B e8cc76040757a5c8931ee34b27a57c52889f3533b71a53c7a2fe589823129ce5972f2ddfa9ecdb46d7a04ac77e8d735c02b07cf7e8192135e4ebea6c392b38ab SHA512 918a057c62d7518613daa6335d8fd5a2553d278dc4d6adbcf5ba3caa3ba561587f1d9e18f564690383e91f3ee2e5120af919d2799b69e93bfe3a3b8ea4f5d7e6
-EBUILD tpop3d-1.5.5-r1.ebuild 2904 BLAKE2B ce1bf3a39f113223f195104569efc54d229e5a52846e0551ab4473ed1346a10d9fe0fb76ecff744ee31c8a993943358f6b216718a7e1e91b0034eddbdbc2906a SHA512 6a9131b9cafebf01b12efa3e136392ef1ffb5e3deddf36fb0e905cef91e6bd6e0af73dcc63bd335bc8391fbe14a70d9d3db04345da57a1a2e19c119050ca4e52
-EBUILD tpop3d-1.5.5.ebuild 2853 BLAKE2B 32a4478cf782de6f24548c56bdb089f7ea5db555b94042223d88b7b10d169022118b7b262f75fa23950782d721c4ce57f4c695ede9812e97b573e88e1fc03e20 SHA512 1424ce654a8b0b3bf8fc38857bcb8488be370473260d64d5ac0a224cab153be7d033b8c55c8525af02600a322e6fb13504101127a8a93fd1cc267e88ef05a6a2
+EBUILD tpop3d-1.5.5-r1.ebuild 2903 BLAKE2B 921bc1abc4ed97475adcb9f43d67d3d30385ac43ce4455dd7b43136b31429a407f21b512227b9544d22306ed05cac111da8865b23cfef1823641cc621da34206 SHA512 837a4b6fd6ed03ffe90c8ae46cc3efb0141280a59b9994c924b5512ad8713f07a432c2edada8988de68ee6a6ba92b2b0ea269991308148b92f56332d601810fd
+EBUILD tpop3d-1.5.5.ebuild 2855 BLAKE2B c7ba82c800af6620e89bae702a021ffc72074d8204164c88cda613ffbcbb0af3ce87ae29939f23ed7f54ed298006fe0acf04957a222e48d58912d0409de90bad SHA512 7ec27021a5b5a06e4a6e3186652a085226b63c896ee58afd85c6dd4fa9b733ffe349ae786a33b28f9856320516504967f79cfe714b1b02355f6d014dd23d328a
 MISC metadata.xml 560 BLAKE2B f0fabe58e865bfe72fc237eca7cba05badd40682b5a03e420a00c96460106743c10d700082522f379828be1000fd1302863ad7f975ace5786c8f312fb5c6053c SHA512 892cc588c2be8dce623ed1844a7680339ce36fdee74e16b99436925b2defec116b164926f3a000db186ca25a079f90352d73795561a6c361e0c65c8c22c92eaf
diff --git a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild b/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
index 1729f170b240..f467cb37e320 100644
--- a/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.5-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="sha1?		( >=dev-libs/openssl-0.9.6:0= )
 	mysql?		( dev-db/mysql-connector-c:0= )
 	postgres?	( dev-db/postgresql[server] )
 	perl?		( >=dev-lang/perl-5.6.1 )
-	pam?		( sys-libs/pam
+	pam?		( virtual/pam
 				  >=net-mail/mailbase-0.00-r8 )
 	tcpd?		( >=sys-apps/tcp-wrappers-7.6 )"
 
diff --git a/net-mail/tpop3d/tpop3d-1.5.5.ebuild b/net-mail/tpop3d/tpop3d-1.5.5.ebuild
index 5f58acad3914..8219ef297788 100644
--- a/net-mail/tpop3d/tpop3d-1.5.5.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -18,10 +18,10 @@ IUSE="authexternal debug flatfile gdbm ldap maildir mbox mysql offensive
 RDEPEND="sha1?		( >=dev-libs/openssl-0.9.6 )
 	ssl?		( >=dev-libs/openssl-0.9.6 )
 	ldap? 		( >=net-nds/openldap-2.0.7 )
-	mysql?  	( virtual/mysql )
+	mysql? 		( virtual/mysql )
 	postgres?	( dev-db/postgresql[server] )
 	perl?		( >=dev-lang/perl-5.6.1 )
-	pam? 		( sys-libs/pam
+	pam? 		( virtual/pam
 				  >=net-mail/mailbase-0.00-r8 )
 	tcpd?		( >=sys-apps/tcp-wrappers-7.6 )"
 
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index d45a8cac22ec..77e04e85d09b 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -6,12 +6,13 @@ AUX vpopmail-5.4.33-remove-unneeded-forward-declaration.patch 771 BLAKE2B 565944
 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-vdelivermail-add-static.patch 1017 BLAKE2B 279bd5c2b894268910a89d1df206289fce475df9b655febc27eca6f1ecf1ecd6bc55e250d0eeb5e86e89a5df0543a08af34b379888ecb4590b91ba62b521b9f2 SHA512 bcf80e30d5010decad135a84527985a29d61d054a0396af662f33bc4a63c3dc1dd0585e884376f25babf0ca263d2496991b16d1c215962a64597f4cd1cd50ca0
-AUX vpopmail-5.4.9-access.violation.patch 918 BLAKE2B ebf8c80ed2668d0bc96930493bd46788abf58d45defd5cb3ebcff0b67c0c31d7473b7dbf07c958366e18dc7ca56434a6e45b9bf7c9d920da993b8d51927df95a SHA512 6587d2a4ac7b6943b07db2334750db83aaf2e974053732696ad17846da29250a82ac91598f25f0cf1caafc731fdb89ec016e7ba6ff6f70ab269af3c0a15e80b5
+AUX vpopmail-5.4.9-access.violation.patch 922 BLAKE2B 038e5ee8483aceb521d2b8956af3fc2d166952d7ebba58960c247a90bda5ee73f2d33605c5e66f4ee667971a695251e1ef6b978d342bad9b4f34f0dfed0a6678 SHA512 eb9a37e3c2b5ad6faa9dcf8f07b240325ee2a3924dfc2abb3245972f8a892b7864f160c0475c1cbd3c5544f0844c20e20046b6a192b241bc8a3c90efe6797203
 AUX vpopmail-Maildir-dotmaildir-fix.sh 1346 BLAKE2B efc7c1e97c201e9f36c3b817538b87c5522b0b2b16b681e0bbbf77bdd8537634d56cbe29b7eb26d657d83fb696b0fc00724dea9d03f246794c5631f8c2ca7ce1 SHA512 201ad103157add727560bc1596042ae621d1645abf912aa3b3ec1af71aaf65dff92c967f000b7a126e9f2eb5e351838c78ffee855402d93bdcf89e96ebb0d0e9
 AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107edfca033126fb420420a9b1eb8866a53552df110e8dca8cced2d653181eb2a6dfc3c07e33a958d7f86ad4035285 SHA512 df7a99357d4673f9d5c4619d67e418a769b2ab72c95d0a7477f186bf15fc4d0f6bec93a64970660439c25573dc0cd2994f5f4aca335723eeaec6761a7838f332
-AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
-AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
+AUX vpopmail-lazy.patch 328 BLAKE2B 90cc8d6329e04348291df0ddeb5deb385f33cc7601b97fc6237233fcd51c12fccad824b609911aa3025912cd16a06fcc6c45dcc3390e190343f3ebf50e2b0619 SHA512 e89756acf8be564db00883f8e68a50bc96abb50b682a181c191f12c39f16ae4c71d5861fadc3279dd4a7e5ee5b513f502905da36006da583f239c396618133d6
+AUX vpopmail-vpgsql.patch 2670 BLAKE2B c295ed94b878f4f9cad64cc36647c470718043b889331c9eb94bfc762b4a6e317c7f35a7bbf0bc67569ec72533b3f25abdbbf1f5218cfa8af097b417cd4909e7 SHA512 45f516310f5cf47be7a297022b17e353d2794d156ece4d3b163747545379a018927fbf37b9986e8c939a987b07b13e959d8fd5322c23ce96b441f75cfe42448d
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r4.ebuild 7487 BLAKE2B 4c2c98e8045f81509a0f9bb1545dacd3faa13ff3babd339fc13669bd204266be2d3e0ded6a59996660f04aacfcc4469b33cae11f3cafa092ec4a157ef74cf6eb SHA512 b7fa9a8ebda554f1fb07c83100252594093877589173f22291fb1936e32768457d4326ab11f7ca84456e09082e54217e05635d6e66105bf87b2d82398c437a3f
+EBUILD vpopmail-5.4.33-r3.ebuild 9013 BLAKE2B 52cf5e2fd6d298bc6360e5438c9f3361c6a8e942e8c1f94ce555391de350860469016b54d4cd133b2e045bb8ecc2289e547d93af9b8efa41ebc10d1bf7ca7d9c SHA512 d0e9373f3a207130c8281c91b955f62cccd40d7ad61a523aa823610783f2b0f675bfab038857693ece63a12e6022f6a7a8d177be1469b38327aeadaaee9d93d1
+EBUILD vpopmail-5.4.33-r4.ebuild 8003 BLAKE2B c1795b13757f230db9a86833c8cea20f78214303ff4d5a7d3d11210494c464661da9ae1ea1802c87a12584d274584c73933128624ca2b50b201a5f7eee5acc0f SHA512 79b283d5c5f5fd3ac42b950c517e1bdc1c71fc5db570722fbc7001175473974d48bdd2f392fd33a0322b595dbc65e34e07b31d1f3511d8b05030c466330988aa
 EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 585b4301997bcc0a13c40143338e29f2a054773c7477f3106dfd4ae71f787c15152f1fb9e84cf123c71092c42e0e42e96857ac5cb2ff1d918c87ffcb6f7c30fe SHA512 04ffa6437901fdb9f7d5a7f445dd60ff5f443d8c69add9a26d28c01f777195ea4d7f57bfef988c1452553b15d9a4fb8057ace7b6a004382f71e836fa4b9f9fdc
 MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
index 5363267a21ae..ed7c62e76396 100644
--- a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
+++ b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
@@ -1,4 +1,4 @@
---- a/configure.in	2004-06-30 22:11:08.000000000 -0700
+--- a/configure.in.org	2004-06-30 22:11:08.000000000 -0700
 +++ b/configure.in	2004-08-22 16:45:36.279473008 -0700
 @@ -463,16 +463,16 @@
    if test ! -d $vpopmaildir
diff --git a/net-mail/vpopmail/files/vpopmail-lazy.patch b/net-mail/vpopmail/files/vpopmail-lazy.patch
index 7db04f8af460..4f4888ea6ba6 100644
--- a/net-mail/vpopmail/files/vpopmail-lazy.patch
+++ b/net-mail/vpopmail/files/vpopmail-lazy.patch
@@ -1,4 +1,4 @@
---- a/Makefile.am	2005-11-18 03:19:43.000000000 +0100
+--- a/Makefile.am.orig	2005-11-18 03:19:43.000000000 +0100
 +++ b/Makefile.am	2005-11-18 03:20:18.000000000 +0100
 @@ -33,6 +33,7 @@
  
diff --git a/net-mail/vpopmail/files/vpopmail-vpgsql.patch b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
index 941cd9708ae9..8869356c7e42 100644
--- a/net-mail/vpopmail/files/vpopmail-vpgsql.patch
+++ b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
@@ -1,4 +1,4 @@
---- a/vpgsql.c	2011-02-28 18:00:45.000000000 +0100
+--- a/vpgsql.c.2	2011-02-28 18:00:45.000000000 +0100
 +++ b/vpgsql.c	2011-08-06 05:46:49.959717911 +0200
 @@ -392,10 +392,10 @@
  #endif
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
new file mode 100644
index 000000000000..eca83681371d
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils fixheadtails qmail user
+
+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
+	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
+)
+DOCS=(
+	ChangeLog
+	doc/AUTHORS
+	doc/FAQ
+	doc/INSTALL
+	doc/README.activedirectory
+	doc/README.authvchkpw
+	doc/README.filelocking
+	doc/README.ipaliasdomains
+	doc/README.ldap
+	doc/README.maildrop
+	doc/README.mysql
+	doc/README.onchange
+	doc/README.oracle
+	doc/README.pgsql
+	doc/README.qmail-default
+	doc/README.quotas
+	doc/README.roamingusers
+	doc/README.spamassassin
+	doc/README.sybase
+	doc/README.vdelivermail
+	doc/README.vlimits
+	doc/README.vpopmaild
+	doc/README.vqmaillocal
+)
+HTML_DOCS=(
+	doc/doc_html/vpopmail5.abw
+	doc/doc_html/vpopmailapi.png
+	doc/doc_html/vpopmail.html
+	doc/man_html/clearopensmtp.html
+	doc/man_html/index.html
+	doc/man_html/vaddaliasdomain.html
+	doc/man_html/vadddomain.html
+	doc/man_html/vadduser.html
+	doc/man_html/vchkpw.html
+	doc/man_html/vconvert.html
+	doc/man_html/vdeldomain.html
+	doc/man_html/vdelivermail.html
+	doc/man_html/vdeluser.html
+	doc/man_html/vpasswd.html
+	doc/man_html/vpopbull.html
+	doc/man_html/vsetuserquota.html
+)
+
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
+
+pkg_setup() {
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+	upgradewarning
+}
+
+src_prepare() {
+	default
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am
+
+	# 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 -f "${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() {
+	vpopmail_set_homedir
+
+	local authopts
+	if use mysql; then
+		incdir=$(mysql_config --variable=pkgincludedir)
+		libdir=$(mysql_config --variable=pkglibdir)
+		authopts+=" --enable-auth-module=mysql"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
+		authopts+=" --enable-valias"
+		authopts+=" --disable-mysql-replication"
+		authopts+=" --enable-mysql-limits"
+	elif use postgres; then
+		libdir=$(pg_config --libdir)
+		incdir=$(pg_config --pkgincludedir)
+		authopts+=" --enable-auth-module=pgsql"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
+		authopts+=" --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() {
+	vpopmail_set_homedir
+
+	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
+
+	einstalldocs
+	rm -rf "${D}/${VPOP_HOME}"/doc
+	dosym \
+		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
+		"${VPOP_HOME}"/doc
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		dodir /etc
+		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
+		dosym \
+			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
+			"${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed -e '12d' -i "${D}"/etc/vpopmail.conf
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
+
+		# 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
+
+	einfo "Installing env.d entry"
+	dodir /etc/env.d
+	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
+		chown root:vpopmail /etc/vpopmail.conf
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	vpopmail_set_homedir
+
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	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
+
+	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
+		elog
+		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+		elog "MySQL tables:"
+		elog
+		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
+		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
+		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
+		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
+		elog
+	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-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
index 3cbfe467136a..4b291b713517 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils fixheadtails qmail
+inherit autotools eutils fixheadtails qmail user
 
 HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
 DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
@@ -38,7 +38,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
 )
 DOCS=(
-	ChangeLog
 	doc/.
 )
 HTML_DOCS=(
@@ -46,9 +45,23 @@ HTML_DOCS=(
 	man_html/.
 )
 
-VPOP_HOME="/var/vpopmail"
+# This makes sure the variable is set, and that it isn't null.
+VPOP_DEFAULT_HOME="/var/vpopmail"
+
+vpopmail_set_homedir() {
+	VPOP_HOME=$(egethome vpopmail)
+	if [[ -z "${VPOP_HOME}" ]]; then
+		eerror "vpopmail's home directory is null in passwd data!"
+		eerror "You probably want to check that out."
+		eerror "Continuing with default."
+		VPOP_HOME="${VPOP_DEFAULT_HOME}"
+	else
+		einfo "Setting VPOP_HOME to: $VPOP_HOME"
+	fi
+}
 
 pkg_setup() {
+	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
 	upgradewarning
 }
 
@@ -83,6 +96,8 @@ src_prepare() {
 }
 
 src_configure() {
+	vpopmail_set_homedir
+
 	local authopts
 	if use mysql; then
 		incdir=$(mysql_config --variable=pkgincludedir || die)
@@ -133,6 +148,8 @@ src_configure() {
 }
 
 src_install() {
+	vpopmail_set_homedir
+
 	emake DESTDIR="${D}" install
 	keepdir "${VPOP_HOME}"/domains
 
@@ -212,6 +229,8 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	vpopmail_set_homedir
+
 	elog "The vpopmail DATA will NOT be removed automatically."
 	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:11:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:11:03 +0100
commit	2929788def9a92c1eb237eed93fbdb0c02838bbf (patch)
tree	166b01591366d3479084ea774c888bc84aaa8d4f /net-mail
parent	ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030 (diff)