gentoo resync : 12.03.2021

15 files changed, 340 insertions, 71 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 3e96cc349386..7964cacad6ae 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
index b28dbb2c1fb6..63ea622b8199 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -1,5 +1,5 @@
 AUX altermime-0.3.10-MIME_headers-overflow.patch 521 BLAKE2B 9e327a28827aa90d761417d8143d36fde7d3098f3acb84e31af86c828bb1753e0af23fe96bcc97b27afd107da52aed951bab3b5b479f59b4e6e2e9ea3d4866f7 SHA512 5f2aa6dca9b4fc16e0aa2f5d12bfdbd989253cf6d8e66358f4e17a7ca764b523b6179ec43bf4eddc114e85668bbcc704029a83b1bff5a0c3130d810f84c6e91d
 AUX altermime-0.3.11-respect-flags.patch 571 BLAKE2B f740d18fe81026e27636f432f68cd08ec8ed73107cd60a44bf56bce2b21b5a9d6b549666a596e1651c979519df4dc40c9797ecfe28d36b43ecb96b5518451aef SHA512 b4b2d8372b26932cb7148e316fd748fe2e8a515e6725f4db3f87e34ab417a4eaa324bf03ce467dc3dda505b5f4013c004aee05a9903d87a4d310c69d2034ea9e
 DIST altermime-0.3.11.tar.gz 90244 BLAKE2B 5acd29ee3e5927b67de41db4f7cfbe606814ef6476340f26509b1823fcbfa6269c15e1d7e7936e948a7cb0f81b9a17b9a63c2333697707525bc62fd350a55f2a SHA512 561e36398bafcd888e912b6291ec76ead881bac86a7d0b8072753012d4c4557e67f608a9d43c968c6521e5f35bdf7b98e2c73ab811dadaaf13dcefe35c2d9e68
-EBUILD altermime-0.3.11.ebuild 610 BLAKE2B 632b33d6a56774b7329ddbd3c4511f0046e10faba8a8fb50db198f03392448e2b6e2be2e4163e9e8d482834dc1b463c5776250872bd3868c7268cafa4aae571e SHA512 ea626005cbf4d397587babd4f434cc8b4f302a77db38fa0f97e4178420392985f0fba3501eb7dc2e8f11486c1ca5e885dcd7dcadad37544b0bd51a6123bea605
+EBUILD altermime-0.3.11.ebuild 609 BLAKE2B 817ed51449e99653f880a5238d6a8c77525c9c3825bfd115cf2ec870ee862410363803b97ffd787b237ef3452545ab7698282be93e3c95a2bb0b2cee186694ac SHA512 d427111e48689051213ab5018f5cbccc9e4a51227b411956883f42323aa3554dfcdf19d84fe9d4850f820a0e6d7d4d26f3a581bb0cf46cbb4345bde7b500a0e9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/altermime/altermime-0.3.11.ebuild b/net-mail/altermime/altermime-0.3.11.ebuild
index 581483e965e0..8f58d7d6f7f8 100644
--- a/net-mail/altermime/altermime-0.3.11.ebuild
+++ b/net-mail/altermime/altermime-0.3.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
+DESCRIPTION="alterMIME is a small program which is used to alter your mime-encoded mailpacks"
 HOMEPAGE="https://pldaniels.com/altermime/"
 SRC_URI="https://www.pldaniels.com/altermime/${P}.tar.gz"
 
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index ec466da895ea..0c2dcd1822ac 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,10 +1,8 @@
 AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
 AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
-DIST automx2-2020.1.tar.bz2 49405 BLAKE2B 2c9b26300e32e613f622e0b3a39b7f408d22e22638d61da3c93f5d448fe3ebb325e9a0004e3351abed2c9e427373c42637e3539831c04cda8e65a4d1bba1773e SHA512 823e569eacedcf49d53f8ed623a75455e715e3d49186179927a0e10d3efe9823c336912789bbf3d7d2f9aba3053b601352c99bda4ffcc9a7b78e412c938cd91f
-DIST automx2-2020.2.tar.bz2 50740 BLAKE2B 394d26a06d23efe18a3c147f89660a9dbdde7edba078fd361f188738fdc28d36122aa8182e965bb8e3d69d4cbcd3cb784bc7722dd382d1fbee36213459b91fa1 SHA512 dce790c754fd089a15d0baf023a9cb2e04ebb42a4558fc91b06c2de2105f3e00f3675a555739ff1bc35166c98f6cecec62c95f18f4144e88ac6024eaa6f39abe
 DIST automx2-2021.0.tar.bz2 50912 BLAKE2B de6fe1ea6dd5223518683220ff1210baa68c30e67f9cd3aac1a965759cb0f72c1119427043579fb805f68457ac4062000cf8066b6fa6d7106f3ee7f777346a57 SHA512 3ca632cc71d64a9d9d434a7109ab0f55e23e3babb6c1734689f89e5a83c9daa6666af9ce09cb5a0c14256bd6e19f6c5339bd3b3398db7b2d70ff3c6114ddb428
-EBUILD automx2-2020.1-r1.ebuild 1051 BLAKE2B 2e2568827ebdeeacb4b498b8957194717a79ea42dfeff122ce147fb9265e5b3e8d1b3f59e48f6d57a18aac46926fa2a7f749694bc052bb530bcb51aac7935119 SHA512 fe8c8bed829328968351bf490542331dfba4438eac36b1788beb5a8cea57bbbec9d94c087ccdd81e5f9abd122448285fb2f75d0fefb2c97fe40eb5e7a517070b
-EBUILD automx2-2020.2.ebuild 1083 BLAKE2B 645fb871bcb0c972282a4bc9162a4a5b1d9790cb38ad6fd3d49aaac84e01ea58974f1c3ca313361dc49575df18cf229c4f4fe8eb80a28ff60ced96f3498cbf0e SHA512 3a60d200e101a70bd2e6c90f4a5083783c1eed24180e0a05a091d1605a0af3aee48ab051202ae5c24f66344713ae3bc80263b0cb4a39b3bd14bbe1e847e0b73e
+DIST automx2-2021.2.tar.gz 155311 BLAKE2B 6ace715e24a27a8e98f09920150bd5d6fef7567fa7c3884825140ea8eebebb1392dcfbfab2b5a464f7967adcf421af5997023a7d33f41036608948b59e58155f SHA512 89113d3a37ee66ae44f98d64480419e6c6b10662560a5319ca0f5522d6195a68f586ec94793c2212d859693a50455a8b43292dd859b912404b5abb2ddfc939b6
 EBUILD automx2-2021.0.ebuild 1082 BLAKE2B 42f2ba0ea10140ce614c0143e25d23f6ad3887aaa69c088c83cc37d2f5018b722992bb4ed58ec8c321f848401c56011c0abf9f72e57bf149322b9d762bf30616 SHA512 bf48dede575b1d0c1514006e3d708e9e25233c086608735e38fbb33d1745825d854df44cdba3dd96aaa71563fb78d27642e0d393381eefef51ea8f06041f7c74
-MISC metadata.xml 911 BLAKE2B 721adf43cdb2c39fc76f4f6d0343cb1445104999bdb5c39d401c40bb2d96233c0bafc5c985d9baf8a106ab41cf14f0eeb583546aa8155fe8303098b9b9a044ef SHA512 98544015829928e146f626a0ff212a4dd207828d210aa1202478e42b02a9e19e0ebf381c07ff18bc3b38309d48b057402e0f3ba87b1b600ccfb8639feda7f365
+EBUILD automx2-2021.2.ebuild 1202 BLAKE2B 9c0bfc55e76600f440068b509134b929eeb44a8177b89d88b2e5396efaf1ff21e41705206d0a0c8ba1bf8684c791c8392fef7f680c30d5e161dac4937378c349 SHA512 1dda69009c3d6e64827506316c1f7b5c347502c3aa89f0a37e0d61ee8dfaa074eb0227874286e17023c3128762e18b84bced2e17b4069f9e608726e4db44f0ee
+MISC metadata.xml 916 BLAKE2B 089615c8e6217368ffd85839d31792122f7b65e53ba286b704998258d82cbd43861291fd4b9b94b482173080f1b6d964b9c833935c5340445493404cea25a4aa SHA512 f0d1df0d663056e9389138c3481cfac3c25d924018f171d078f93791fc1fe349c46948224a37fa6b861eaa011abf222f09091dd58763b578d88a45d967eedc23
diff --git a/net-mail/automx2/automx2-2020.1-r1.ebuild b/net-mail/automx2/automx2-2020.1-r1.ebuild
deleted file mode 100644
index 9f1cb15d65fa..000000000000
--- a/net-mail/automx2/automx2-2020.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Email client autoconfiguration service"
-HOMEPAGE="https://automx.org/"
-SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="acct-user/automx2
-	dev-python/flask-migrate[${PYTHON_USEDEP}]
-	dev-python/ldap3[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}"
-
-python_prepare_all() {
-	sed -i -e "/('scripts'/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	export AUTOMX2_CONF="tests/unittest.conf"
-	${EPYTHON} -m unittest discover tests/ || die
-}
-
-python_install_all() {
-	if use doc; then
-		DOCS="*.adoc doc/*.adoc contrib/*sample.conf"
-		HTML_DOCS="doc/*.html doc/*.svg"
-	fi
-	sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}"
-	newconfd "${FILESDIR}/confd" "${PN}"
-	insinto /etc
-	newins "${FILESDIR}/conf" "${PN}.conf"
-	distutils-r1_python_install_all
-}
diff --git a/net-mail/automx2/automx2-2020.2.ebuild b/net-mail/automx2/automx2-2021.2.ebuild
index 7f3fa33fa4fd..66b5081f4c4d 100644
--- a/net-mail/automx2/automx2-2020.2.ebuild
+++ b/net-mail/automx2/automx2-2021.2.ebuild
@@ -1,25 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Email client autoconfiguration service"
 HOMEPAGE="https://automx.org/"
-SRC_URI="https://gitlab.com/automx/automx2/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
-BDEPEND="acct-user/automx2
+BDEPEND="acct-user/automx2"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-migrate[${PYTHON_USEDEP}]
-	dev-python/ldap3[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}"
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
 
 python_prepare_all() {
 	sed -i -e "/('scripts'/d" setup.py || die
diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml
index 6ec5f66d7767..bc7375ae95bc 100644
--- a/net-mail/automx2/metadata.xml
+++ b/net-mail/automx2/metadata.xml
@@ -18,11 +18,11 @@
 		(autoconfig) in one tool.
 	</longdescription>
 	<upstream>
-		<doc>https://gitlab.com/automx/automx2/blob/master/doc/automx2.adoc</doc>
+		<doc>https://github.com/rseichter/automx2/blob/master/doc/automx2.pdf</doc>
 		<maintainer>
 			<email>automx2@seichter.de</email>
 			<name>Ralph Seichter</name>
 		</maintainer>
-		<remote-id type="gitlab">automx/automx2</remote-id>
+		<remote-id type="github">rseichter/automx2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 6c464b650236..5f6f2a0f16cd 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -5,7 +5,10 @@ AUX dovecot-socket-name-too-long.patch 356 BLAKE2B ada5007b620cd5eef5a950d64add7
 AUX dovecot-unwind-generic.patch 645 BLAKE2B 6598abbd2819f7109d4caacbce5123b8810b93b623956561a12a749cbc582667caa160eac62305067db6037f820c8e1a8bd8a22da09a454afcb9e21209cc5fd3 SHA512 6ede0edd5bd6d1123ff1567886898eee5795baa549c610ba8a3567c0f8fee27d69028aaf8b6067c2f37b915a07e165aa0d6a2d5fb8314deffd61a187b18de4ae
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
 DIST dovecot-2.3-pigeonhole-0.5.13.tar.gz 1908839 BLAKE2B 37fbd9d9b41ca1893c19ac546dd9b272b361752c70eed0596bbb743cd8c30d942427d5814ab551bb39eb844c7bd05074bb49b11a6b81747e2fc535b0f9993f14 SHA512 fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3
+DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc
 DIST dovecot-2.3.13.tar.gz 7456073 BLAKE2B 6cf3e7d9c6cf90279e0d72782cca88a11617f3f08e3c27da7948f46b8796575e42c776323cd56bc4208474831d4480afcac35ebe0b74d99db40acd4cda2279be SHA512 758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95
+DIST dovecot-2.3.14.tar.gz 7483769 BLAKE2B bf2606ed64bef66fdeb165da65295031e692b7ba5186847c027adbd50093a9684b57eb724595c27838d91769e097ab2a82978ba845bf4e026dcfd78aa1372501 SHA512 69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103
 EBUILD dovecot-2.3.13-r1.ebuild 8570 BLAKE2B a4e47fa9966ba40e3a946b76b16c802cbb9e6cdf00ef9a7a7d0bdec0cbccb4378068047e23eeb2ed074fdffc1ce785bb0785a97e968032e65e4cd1047c73da70 SHA512 32493e86c673e825b0314cad476866c8515c511e13b975eeae1d3ddf6c2bbacf77ba34b69bd48d6d08dd1a52f53eb6d64ce1ee639f2c9154d678134ee9ccca40
 EBUILD dovecot-2.3.13-r100.ebuild 8826 BLAKE2B 69dad01a47d80c16364924fc530bfd03e7ac1682501e0dcbbd559a322dbc45808bf93088d9899cadbf8285e83686cfb0aadd9d3e353990381a6f949af9de3ab7 SHA512 f33a85cddba83aa39c27290740cacfcd82b3d0b46e8a103dcaba979d5524eef8c9dea619e3b293a5706ed2439d67ff632f7dfd1a1859b40cced632cdedd735d1
+EBUILD dovecot-2.3.14.ebuild 8732 BLAKE2B 0db42ad38c5a6601ad0b0dd6572f82f383949bda56958241fcb7fc3e6afa2e7831f6abd9155e80b02ecaf6203fc0cf4a59c409f6e0ef49b6ba01b3fae1996865 SHA512 c91c5babf6973aa919ccc623c231a5b363d78db82c48f85420286b0e9302a4e319c4696273a6a7bdae397b7ba11da2a18a6f32b374d718742ad9307d27227993
 MISC metadata.xml 1025 BLAKE2B 8b0f7c2bbb9cfd58d34cafaea132e3d52236f91db59e53a91c0816f12813311b9d9e6d19d2341a044a4a2af5ed961eec8417d0df6826a8cbb02dff528f3cb533 SHA512 0175bb9a54384bf69d99ace11ce8a76dcca1426e4a4edc3a3e6404a0dc1bed8f6912add47735d1924410dca2d80fcfa8c9cab4df4dc7ee25f4dcc1ec004f8665
diff --git a/net-mail/dovecot/dovecot-2.3.14.ebuild b/net-mail/dovecot/dovecot-2.3.14.ebuild
new file mode 100644
index 000000000000..e5ae2629b7c0
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.14.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.14"
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	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] )
+	rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
+	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 )
+	unwind? ( sys-libs/libunwind )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-autoconf-lua-version.patch
+	"${FILESDIR}/${PN}"-socket-name-too-long.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_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 LUAPC="${ELUA}" 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 unwind libunwind ) \
+		$( use_with zlib ) \
+		$( use_with zstd ) \
+		$( 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 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://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
+}
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index c3ca0e442b56..6779b9ac7e55 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -11,5 +11,5 @@ DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461
 EBUILD fetchmail-6.4.14.ebuild 2508 BLAKE2B b2c21ed178426350b000b112319ceb77f6779d84de0f94ea30dfc8c61c792f72c34ee1b9e52d6ff0d87edb1a367dad8df4ae07a282fa3ddc40ffbd22824c9996 SHA512 50dfb606ee5d4a151e0ef30288fe9db9ad6c709e57f6a16b115e2d3819b8da9e23def432c53e707e96861491c1ce5f44d68d476e40161e20c3ae38102b0f68f4
 EBUILD fetchmail-6.4.15.ebuild 2508 BLAKE2B b2c21ed178426350b000b112319ceb77f6779d84de0f94ea30dfc8c61c792f72c34ee1b9e52d6ff0d87edb1a367dad8df4ae07a282fa3ddc40ffbd22824c9996 SHA512 50dfb606ee5d4a151e0ef30288fe9db9ad6c709e57f6a16b115e2d3819b8da9e23def432c53e707e96861491c1ce5f44d68d476e40161e20c3ae38102b0f68f4
 EBUILD fetchmail-6.4.16.ebuild 2508 BLAKE2B b2c21ed178426350b000b112319ceb77f6779d84de0f94ea30dfc8c61c792f72c34ee1b9e52d6ff0d87edb1a367dad8df4ae07a282fa3ddc40ffbd22824c9996 SHA512 50dfb606ee5d4a151e0ef30288fe9db9ad6c709e57f6a16b115e2d3819b8da9e23def432c53e707e96861491c1ce5f44d68d476e40161e20c3ae38102b0f68f4
-EBUILD fetchmail-6.4.8.ebuild 2499 BLAKE2B 566de0e251273f1fda56763791e104c83bded450c91595fc759af89072d76ba9ccca16e6dc88d4045b5a7404ef28ad6199b0d2db81902efc34bacccec570a016 SHA512 864e3d202e843d6fe045e4f189af3a000e44c0696b95a01f069346c753362a07890d498549a7e497da4b5843fb9213628d302c7ce3d75576b34e64a032a3baf6
+EBUILD fetchmail-6.4.8.ebuild 2499 BLAKE2B 1463b4dd5a32dd4fe1be1a57ccabe4e6304910ec7f681e896945a55af403d5c42a5c23d50fea90049d018cefd1e2d1bb327c1d6849e4c3dc57e287c60945251a SHA512 4ff39a6cdfc621bd079fba2effd24066a56ef02118ddc00411296b69519d06907f59ba01f76292f3176ea1363b491d5a7bbbb793c621fb03e7eebdbd47deb75f
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index 9c20c407b40c..603849b9aa6d 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="tk"
 
-inherit python-single-r1 systemd toolchain-funcs autotools
+inherit python-single-r1 systemd toolchain-funcs autotools tmpfiles
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
 HOMEPAGE="https://www.fetchmail.info/"
@@ -88,7 +88,7 @@ src_install() {
 
 	systemd_dounit  "${FILESDIR}"/${PN}.service
 	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+	dotmpfiles "${FILESDIR}"/${PN}.conf
 
 	docinto contrib
 	local f
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index 3db3e09a064f..518a63097acd 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -1,5 +1,5 @@
 AUX mlmmj-1.2.19.0-listcontrol-customheaders.patch 1231 BLAKE2B 8726f9436c7536ae3cd3c2970fd73420d7ad3258d24aa893a6ec9a00439c3e854fb6e7c3dc671857a89c0196a81e9eb68fb51cee112101cec3c14a5ad36a46b3 SHA512 d6e55a1697ab44ea526c0f24930e0aebe088a9f6e2f6726b9557f350fb0b8f86b11441eea3c389593bbaa5e592c97c71b664dba8a3b4eaeb899e318e90d11114
 AUX mlmmj-1.3.0-gcc-10.patch 636 BLAKE2B 7b34596b4ec6e932f35a8b5135dd2fed611bd8432174544eb850856eb9389b1bc2687a0acceedc9780b0047e3d0ffec24187aad1a6b4158a3906f4886a94e7a0 SHA512 83446b655afe86a48e2d544fbf52cd6c688541d46f1f7b8e0eb59702a10474b4419eec3833e452e674d202782444e80e2bea4feed1c33d6e755eefebbe552bfa
 DIST mlmmj-1.3.0.tar.bz2 292519 BLAKE2B abaf5c7ad53034d2201a2d3ba6d7f99ca83f47ec83df59e12a90a7118fbbde941d5ed2d14864a4af1568f67e74ea082fbc70fc9e44390673b76377bb3679c817 SHA512 c704d89f8a96c0ffc751a744ffdefb5e4304ab74be89292f06ce0c337b8ff1cc5a91737c8b1bd96fe3e993338986fa42bf360cfefc508e1eac74ab88ffda2494
-EBUILD mlmmj-1.3.0.ebuild 1028 BLAKE2B 2c2623c9fd461716c53fb37759705b697c02d43569007e45796f4a175849b54dd4c7b6dbb66bc7707eb19add11732ea0211e5347e97f6c9c31a5303b1675e78f SHA512 6b5a961083a78dda6979a97efddf3181fd3cebc0a599d1df2468753f31344de9c0c7744b2cdffe44fb1da9c5bd66982426d0f669958af73a1411c5ba4487105f
+EBUILD mlmmj-1.3.0-r1.ebuild 1205 BLAKE2B ebaba612458649ab7a65f1e574704747139e1695f06f04f87cc462388cb522d630db06d5db716163fd664725a0c989a5b13b79fa9faa407cb610d98b51cb41f9 SHA512 a8649ed57dd47c71b06c5a105fb4a39f76222b7938f7de16c3fb60b712987f5b2cd258dc9d586e8d1a9305a795a0c529faf60b191744c231621a56c6c4a392c3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/mlmmj/mlmmj-1.3.0.ebuild b/net-mail/mlmmj/mlmmj-1.3.0-r1.ebuild
index 94c0519b7e98..388d0fce798c 100644
--- a/net-mail/mlmmj/mlmmj-1.3.0.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.3.0-r1.ebuild
@@ -1,26 +1,37 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="${PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="Mailing list managing made joyful"
 HOMEPAGE="http://mlmmj.org/"
 SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+
 DEPEND="virtual/mta"
-S="${WORKDIR}/${MY_P}"
 
-DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
+DOCS=( AUTHORS ChangeLog FAQ TODO TUNABLES UPGRADE )
+
 PATCHES=(
 	"${FILESDIR}"/mlmmj-1.2.19.0-listcontrol-customheaders.patch
 	"${FILESDIR}"/mlmmj-1.3.0-gcc-10.patch
 )
 
+src_prepare() {
+	default
+
+	# bug #259962
+	for file in $(find . -iname "*.cgi") ; do
+		sed -i -e "s:/usr/local/bin/:${EPREFIX}/usr/bin/:" "${file}" || die
+	done
+}
+
 src_configure() {
 	econf --enable-receive-strip
 }
@@ -33,6 +44,8 @@ src_install() {
 
 	insinto /usr/share/mlmmj
 	doins -r contrib/web/*
+
+	dodoc README.*
 }
 
 pkg_postinst() {
@@ -40,5 +53,5 @@ pkg_postinst() {
 	elog "- One for user subscribing/unsubscribing"
 	elog "- One for admin tasks"
 	elog "both available in a php and perl module."
-	elog "For more info have a look in /usr/share/mlmmj"
+	elog "For more info have a look in ${EROOT}/usr/share/mlmmj"
 }
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index e96ee871d4fb..72eb2b15371d 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,3 +1,3 @@
 DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
-EBUILD ytnef-1.9.3.ebuild 658 BLAKE2B b18e9a798fb203e9a7c611763c00a3e379cc1a75ed1a84825c4086a12ac9575ed16b83d2b93cbe247b7a75c02f146ae7a7bcf4631b638966102edb1755cdbe37 SHA512 bb2f7f25d8eafa0052a2293827c20049a14b25ec5781740bcc0616686bfced4519076451e993d8ca5311a351ba5ff21baade6c33d9a127f5f039a07199908cab
+EBUILD ytnef-1.9.3.ebuild 657 BLAKE2B 2ca3c10174b40b47539182a9d61bfc654201bdab5d84f7b888d11c8328a1cdbf5fb747406f5ac77e19ec24ba55a3ea3e673ee1e3eed2f608e026554a921e8fe9 SHA512 cb9bc40e5734c01c8073236dfcf4a080fdfd77c7ef4d68517cb22185d5fa61db03bd0ec2a973461358d182b95dd0a8c67156d48657f7b5d165c3c406fee40187
 MISC metadata.xml 338 BLAKE2B 788b29610ed73aba390c90c1b6ac4028d5f607e5f5d93dac1ccf945602ba2c0640574ac222761544a47761a40b300ee773aa710a5d2afa0dabe40da9461940cd SHA512 5239663e2ba3a103c1e331b53393658e47d29b2fa4daec1bdea8ff727c39196e6c44a62db613893b4ab7266878c75c0bda21bab9ca25d26fd796ffc44af5703e
diff --git a/net-mail/ytnef/ytnef-1.9.3.ebuild b/net-mail/ytnef/ytnef-1.9.3.ebuild
index ccdee16c4468..cb176694e938 100644
--- a/net-mail/ytnef/ytnef-1.9.3.ebuild
+++ b/net-mail/ytnef/ytnef-1.9.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Yeraze/ytnef"
 SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"